diff --git a/examples/main.js b/examples/main.js index 5db7503..edc9c99 100644 --- a/examples/main.js +++ b/examples/main.js @@ -2,13 +2,15 @@ import Vue from 'vue' import App from '../src/App.vue' //基于element组件封装,引入element组件库 -import { Input, Select, Option, OptionGroup, DatePicker } from 'element-ui'; +import { Input, Select, Option, OptionGroup, DatePicker ,Tabs,TabPane} from 'element-ui'; import 'element-ui/lib/theme-chalk/index.css'; Vue.use(Input); Vue.use(Select); Vue.use(OptionGroup); Vue.use(Option); Vue.use(DatePicker); +Vue.use(Tabs); +Vue.use(TabPane); // 导入组件库 import erp_element_ui from '../packages' diff --git a/packages/agDatePicker/src/index.vue b/packages/agDatePicker/src/index.vue index 55f6256..581cb0f 100644 --- a/packages/agDatePicker/src/index.vue +++ b/packages/agDatePicker/src/index.vue @@ -3,7 +3,7 @@ class="ag-date-picker" v-model="dateArr" v-bind="attrs" - @change="dataChange" + v-on="inputListeners" /> @@ -18,12 +18,12 @@ export default { props: { value: { type: Array, - default: () => [], + default: () => [null, null], }, }, data() { return { - dateArr: ["", ""], + dateArr: [null, null], }; }, computed: { @@ -103,6 +103,21 @@ export default { ...this.$attrs, }; }, + // 所有父级事件 + inputListeners() { + return Object.assign({}, this.$listeners, { + input: (value) => { + let date1 = ""; + let date2 = ""; + + if (!isEmpty(value) && value.length === 2 && value[0] && value[1]) { + date1 = `${value[0]} 00:00:00`; + date2 = `${value[1]} 23:59:59`; + } + this.$emit("input", [date1, date2]); + }, + }); + }, }, watch: { value: { @@ -123,18 +138,7 @@ export default { deep: true, }, }, - methods: { - dataChange(val) { - let date1 = ""; - let date2 = ""; - - if (!isEmpty(val) && val.length === 2 && val[0] && val[1]) { - date1 = `${val[0]} 00:00:00`; - date2 = `${val[1]} 23:59:59`; - } - this.$emit("input", [date1, date2]); - }, - }, + methods: {}, }; diff --git a/packages/agTabs/src/index.vue b/packages/agTabs/src/index.vue index c6de7d6..325e17d 100644 --- a/packages/agTabs/src/index.vue +++ b/packages/agTabs/src/index.vue @@ -1,23 +1,43 @@ - + + + + + + + - - \ No newline at end of file diff --git a/src/App.vue b/src/App.vue index 00dd606..b36ee98 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,17 +1,22 @@