eoss-mobiles 0.1.96 → 0.1.98

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,10 +1,10 @@
1
1
  ## 更新日志
2
2
 
3
- ### 0.1.95
3
+ ### 0.1.96
4
4
 
5
5
  - 2023-12-14
6
6
  - fix:<br/>1. selector 组件新增属性show-tree只展示选择树、新增tree-icon插槽 自定义左侧图标<br/>2. table 组件样式优化
7
- - 版本号:0.1.95
7
+ - 版本号:0.1.96
8
8
  - 2023-12-08
9
9
  - fix:<br/>1. input 组件新增属性required-position必填图标展示的位置<br/>2. form 组件优化验证表格<br/>3. table 组件样式优化
10
10
  - 版本号:0.1.90
package/README.md CHANGED
@@ -6,13 +6,13 @@ eoss-mobile will stay with Vue 2.x
6
6
  npm publish —registry=https://repo.wisesoft.net.cn/repository/sge-hosted-npm/
7
7
  ## Install
8
8
  ```shell
9
- npm i eoss-mobile
9
+ npm i eoss-mobiles
10
10
  ```
11
11
 
12
12
  ## Quick Start
13
13
  ``` javascript
14
14
  import Vue from 'vue'
15
- import EsUi from 'eoss-mobile'
15
+ import EsUi from 'eoss-mobiles'
16
16
 
17
17
  Vue.use(EsUi)
18
18
 
@@ -21,7 +21,7 @@ import {
21
21
  Select,
22
22
  Button
23
23
  // ...
24
- } from 'eoss-mobile'
24
+ } from 'eoss-mobiles'
25
25
 
26
26
  Vue.component(Select.name, Select)
27
27
  Vue.component(Button.name, Button)
package/lib/date.js CHANGED
@@ -199,7 +199,7 @@ function normalizeComponent(
199
199
  // ESM COMPAT FLAG
200
200
  __webpack_require__.r(__webpack_exports__);
201
201
 
202
- // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/date/src/main.vue?vue&type=template&id=1bee63b7&
202
+ // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/date/src/main.vue?vue&type=template&id=277dbcef&
203
203
  var render = function () {
204
204
  var _vm = this
205
205
  var _h = _vm.$createElement
@@ -233,7 +233,13 @@ var render = function () {
233
233
  "em-input",
234
234
  _vm.$attrs,
235
235
  false
236
- )
236
+ ),
237
+ [
238
+ _c("template", { slot: "input" }, [
239
+ _c("span", [_vm._v(_vm._s(_vm.pickerValue))]),
240
+ ]),
241
+ ],
242
+ 2
237
243
  ),
238
244
  _c(
239
245
  "van-popup",
@@ -270,22 +276,23 @@ var render = function () {
270
276
  })
271
277
  : _c(
272
278
  "EmDatePicker",
273
- _vm._g(
274
- _vm._b(
275
- {
276
- attrs: {
277
- "show-toolbar": "",
278
- model: _vm.newValue,
279
- loading: _vm.newLoading,
280
- type: _vm.type,
281
- },
282
- on: { cancel: _vm.onCancel, confirm: _vm.onConfirm },
279
+ _vm._b(
280
+ {
281
+ attrs: {
282
+ "show-toolbar": "",
283
+ model: _vm.newValue,
284
+ loading: _vm.newLoading,
285
+ type: _vm.type,
283
286
  },
284
- "EmDatePicker",
285
- _vm.$attrs,
286
- false
287
- ),
288
- _vm.$listeners
287
+ on: {
288
+ cancel: _vm.onCancel,
289
+ confirm: _vm.onConfirm,
290
+ change: _vm.onChange,
291
+ },
292
+ },
293
+ "EmDatePicker",
294
+ _vm.$attrs,
295
+ false
289
296
  ),
290
297
  [
291
298
  _vm._l(_vm.$slots, function (index, name) {
@@ -305,7 +312,7 @@ var staticRenderFns = []
305
312
  render._withStripped = true
306
313
 
307
314
 
308
- // CONCATENATED MODULE: ./packages/date/src/main.vue?vue&type=template&id=1bee63b7&
315
+ // CONCATENATED MODULE: ./packages/date/src/main.vue?vue&type=template&id=277dbcef&
309
316
 
310
317
  // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/date/src/date-time.vue?vue&type=template&id=df431e74&
311
318
  var date_timevue_type_template_id_df431e74_render = function () {
@@ -638,31 +645,32 @@ var component = Object(componentNormalizer["a" /* default */])(
638
645
  )
639
646
 
640
647
  /* harmony default export */ var date_time = (component.exports);
641
- // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/date/src/date-picker.vue?vue&type=template&id=37ed8112&
642
- var date_pickervue_type_template_id_37ed8112_render = function () {
648
+ // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/date/src/date-picker.vue?vue&type=template&id=0e79ab78&
649
+ var date_pickervue_type_template_id_0e79ab78_render = function () {
643
650
  var _vm = this
644
651
  var _h = _vm.$createElement
645
652
  var _c = _vm._self._c || _h
646
653
  return _c(
647
654
  "van-datetime-picker",
648
- _vm._g(
649
- _vm._b(
650
- {
651
- attrs: { "show-toolbar": "" },
652
- on: { cancel: _vm.onCancel, confirm: _vm.onConfirm },
653
- model: {
654
- value: _vm.newValue,
655
- callback: function ($$v) {
656
- _vm.newValue = $$v
657
- },
658
- expression: "newValue",
655
+ _vm._b(
656
+ {
657
+ attrs: { "show-toolbar": "" },
658
+ on: {
659
+ cancel: _vm.onCancel,
660
+ confirm: _vm.onConfirm,
661
+ change: _vm.onChange,
662
+ },
663
+ model: {
664
+ value: _vm.newValue,
665
+ callback: function ($$v) {
666
+ _vm.newValue = $$v
659
667
  },
668
+ expression: "newValue",
660
669
  },
661
- "van-datetime-picker",
662
- _vm.$attrs,
663
- false
664
- ),
665
- _vm.$listeners
670
+ },
671
+ "van-datetime-picker",
672
+ _vm.$attrs,
673
+ false
666
674
  ),
667
675
  [
668
676
  _vm._l(_vm.$slots, function (index, name) {
@@ -672,11 +680,11 @@ var date_pickervue_type_template_id_37ed8112_render = function () {
672
680
  2
673
681
  )
674
682
  }
675
- var date_pickervue_type_template_id_37ed8112_staticRenderFns = []
676
- date_pickervue_type_template_id_37ed8112_render._withStripped = true
683
+ var date_pickervue_type_template_id_0e79ab78_staticRenderFns = []
684
+ date_pickervue_type_template_id_0e79ab78_render._withStripped = true
677
685
 
678
686
 
679
- // CONCATENATED MODULE: ./packages/date/src/date-picker.vue?vue&type=template&id=37ed8112&
687
+ // CONCATENATED MODULE: ./packages/date/src/date-picker.vue?vue&type=template&id=0e79ab78&
680
688
 
681
689
  // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/date/src/date-picker.vue?vue&type=script&lang=js&
682
690
  //
@@ -725,6 +733,9 @@ date_pickervue_type_template_id_37ed8112_render._withStripped = true
725
733
  },
726
734
  onConfirm: function onConfirm(value) {
727
735
  this.$emit('confirm', value);
736
+ },
737
+ onChange: function onChange(picker) {
738
+ this.$emit('change', picker);
728
739
  }
729
740
  }
730
741
  });
@@ -740,8 +751,8 @@ date_pickervue_type_template_id_37ed8112_render._withStripped = true
740
751
 
741
752
  var date_picker_component = Object(componentNormalizer["a" /* default */])(
742
753
  src_date_pickervue_type_script_lang_js_,
743
- date_pickervue_type_template_id_37ed8112_render,
744
- date_pickervue_type_template_id_37ed8112_staticRenderFns,
754
+ date_pickervue_type_template_id_0e79ab78_render,
755
+ date_pickervue_type_template_id_0e79ab78_staticRenderFns,
745
756
  false,
746
757
  null,
747
758
  null,
@@ -806,6 +817,10 @@ var date_picker_component = Object(componentNormalizer["a" /* default */])(
806
817
  //
807
818
  //
808
819
  //
820
+ //
821
+ //
822
+ //
823
+ //
809
824
 
810
825
 
811
826
 
@@ -849,7 +864,7 @@ var date_picker_component = Object(componentNormalizer["a" /* default */])(
849
864
  },
850
865
  // 绑定值
851
866
  value: {
852
- type: [String, Array, Object, Date],
867
+ type: [String, Array, Object, Date, Number],
853
868
  default: ''
854
869
  },
855
870
  // 展示标题
@@ -918,6 +933,9 @@ var date_picker_component = Object(componentNormalizer["a" /* default */])(
918
933
  },
919
934
 
920
935
  methods: {
936
+ onChange: function onChange(picker) {
937
+ this.$emit('change', picker);
938
+ },
921
939
  getValFun: function getValFun(val) {
922
940
  var _that = this;
923
941
  if (_that.isOnConfirm) return;
@@ -944,7 +962,7 @@ var date_picker_component = Object(componentNormalizer["a" /* default */])(
944
962
  if (type != 'year') {
945
963
  date = date.replace('年', '/');
946
964
  } else {
947
- date = date.replace('年', '');
965
+ date = date.replace(this.joinStr || '年', '');
948
966
  }
949
967
  if (type == 'year-month') {
950
968
  date = date.replace('月', '');
@@ -975,7 +993,7 @@ var date_picker_component = Object(componentNormalizer["a" /* default */])(
975
993
  this.lastValue = value;
976
994
  this.changeValue = false;
977
995
  this.$emit('input', this.pickerValue);
978
- if (this.type === 'datetimeSecond') this.$emit('confirm');
996
+ this.$emit('confirm', value);
979
997
  },
980
998
  getValue: function getValue(val) {
981
999
  var type = this.type;
@@ -984,8 +1002,7 @@ var date_picker_component = Object(componentNormalizer["a" /* default */])(
984
1002
  if (!this.value && !val && this.value == undefined) return;
985
1003
  if (val && typeof val == 'string') {
986
1004
  return val;
987
- }
988
- if (this.value && typeof this.value == 'string') {
1005
+ } else if (this.value && typeof this.value == 'string' && val && typeof val == 'string') {
989
1006
  return this.value;
990
1007
  }
991
1008
  var newValue = new Date(val || this.value);
@@ -1021,7 +1038,7 @@ var date_picker_component = Object(componentNormalizer["a" /* default */])(
1021
1038
  } else if (type === 'datehour' && newValue != 'Invalid Date') {
1022
1039
  value = y + (this.joinStr || '年') + m + (this.joinStr || '月') + d + (this.joinStr ? ' ' : '日 ') + h + (this.joinStr ? ' ' : '时');
1023
1040
  } else if (type === 'year' && newValue != 'Invalid Date') {
1024
- value = y + (this.joinStr ? '' : '年');
1041
+ value = y + (this.joinStr || '年');
1025
1042
  }
1026
1043
  return value;
1027
1044
  },
@@ -668,8 +668,8 @@ mainvue_type_template_id_5a850d32_render._withStripped = true
668
668
 
669
669
  // CONCATENATED MODULE: ./packages/selector/src/main.vue?vue&type=template&id=5a850d32&
670
670
 
671
- // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/selector-tree.vue?vue&type=template&id=51394ef5&
672
- var selector_treevue_type_template_id_51394ef5_render = function () {
671
+ // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/selector-tree.vue?vue&type=template&id=6e05ca06&
672
+ var selector_treevue_type_template_id_6e05ca06_render = function () {
673
673
  var _vm = this
674
674
  var _h = _vm.$createElement
675
675
  var _c = _vm._self._c || _h
@@ -826,11 +826,11 @@ var selector_treevue_type_template_id_51394ef5_render = function () {
826
826
  1
827
827
  )
828
828
  }
829
- var selector_treevue_type_template_id_51394ef5_staticRenderFns = []
830
- selector_treevue_type_template_id_51394ef5_render._withStripped = true
829
+ var selector_treevue_type_template_id_6e05ca06_staticRenderFns = []
830
+ selector_treevue_type_template_id_6e05ca06_render._withStripped = true
831
831
 
832
832
 
833
- // CONCATENATED MODULE: ./packages/selector/src/selector-tree.vue?vue&type=template&id=51394ef5&
833
+ // CONCATENATED MODULE: ./packages/selector/src/selector-tree.vue?vue&type=template&id=6e05ca06&
834
834
 
835
835
  // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/tree.vue?vue&type=template&id=78c0d4dd&
836
836
  var treevue_type_template_id_78c0d4dd_render = function () {
@@ -3158,6 +3158,10 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
3158
3158
  // type: String, // 父id或者是空
3159
3159
  // default: 'root'
3160
3160
  // },
3161
+ url: {
3162
+ type: String,
3163
+ default: ''
3164
+ },
3161
3165
  param: {
3162
3166
  type: Object,
3163
3167
  default: function _default() {
@@ -3692,10 +3696,8 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
3692
3696
  });
3693
3697
  this.newParam.selecttype = this.newTabs[this.selectIndex].param.selecttype;
3694
3698
  utils_http({
3695
- url: this.baseUrl ? this.baseUrl + selectObject : selectObject,
3699
+ url: this.url ? this.url : this.baseUrl ? this.baseUrl + selectObject : selectObject,
3696
3700
  params: _extends({
3697
- // pid: this.pid,
3698
- // depId:this.depId,
3699
3701
  objType: this.objType,
3700
3702
  namelike: this.namelike,
3701
3703
  selecttype: this.tabs,
@@ -3894,8 +3896,8 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
3894
3896
 
3895
3897
  var selector_tree_component = normalizeComponent(
3896
3898
  src_selector_treevue_type_script_lang_js_,
3897
- selector_treevue_type_template_id_51394ef5_render,
3898
- selector_treevue_type_template_id_51394ef5_staticRenderFns,
3899
+ selector_treevue_type_template_id_6e05ca06_render,
3900
+ selector_treevue_type_template_id_6e05ca06_staticRenderFns,
3899
3901
  false,
3900
3902
  null,
3901
3903
  null,
@@ -6636,8 +6638,8 @@ empty_src_main.install = function (Vue) {
6636
6638
  };
6637
6639
 
6638
6640
  /* harmony default export */ var empty = (empty_src_main);
6639
- // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/date/src/main.vue?vue&type=template&id=1bee63b7&
6640
- var mainvue_type_template_id_1bee63b7_render = function () {
6641
+ // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/date/src/main.vue?vue&type=template&id=277dbcef&
6642
+ var mainvue_type_template_id_277dbcef_render = function () {
6641
6643
  var _vm = this
6642
6644
  var _h = _vm.$createElement
6643
6645
  var _c = _vm._self._c || _h
@@ -6670,7 +6672,13 @@ var mainvue_type_template_id_1bee63b7_render = function () {
6670
6672
  "em-input",
6671
6673
  _vm.$attrs,
6672
6674
  false
6673
- )
6675
+ ),
6676
+ [
6677
+ _c("template", { slot: "input" }, [
6678
+ _c("span", [_vm._v(_vm._s(_vm.pickerValue))]),
6679
+ ]),
6680
+ ],
6681
+ 2
6674
6682
  ),
6675
6683
  _c(
6676
6684
  "van-popup",
@@ -6707,22 +6715,23 @@ var mainvue_type_template_id_1bee63b7_render = function () {
6707
6715
  })
6708
6716
  : _c(
6709
6717
  "EmDatePicker",
6710
- _vm._g(
6711
- _vm._b(
6712
- {
6713
- attrs: {
6714
- "show-toolbar": "",
6715
- model: _vm.newValue,
6716
- loading: _vm.newLoading,
6717
- type: _vm.type,
6718
- },
6719
- on: { cancel: _vm.onCancel, confirm: _vm.onConfirm },
6718
+ _vm._b(
6719
+ {
6720
+ attrs: {
6721
+ "show-toolbar": "",
6722
+ model: _vm.newValue,
6723
+ loading: _vm.newLoading,
6724
+ type: _vm.type,
6720
6725
  },
6721
- "EmDatePicker",
6722
- _vm.$attrs,
6723
- false
6724
- ),
6725
- _vm.$listeners
6726
+ on: {
6727
+ cancel: _vm.onCancel,
6728
+ confirm: _vm.onConfirm,
6729
+ change: _vm.onChange,
6730
+ },
6731
+ },
6732
+ "EmDatePicker",
6733
+ _vm.$attrs,
6734
+ false
6726
6735
  ),
6727
6736
  [
6728
6737
  _vm._l(_vm.$slots, function (index, name) {
@@ -6738,11 +6747,11 @@ var mainvue_type_template_id_1bee63b7_render = function () {
6738
6747
  1
6739
6748
  )
6740
6749
  }
6741
- var mainvue_type_template_id_1bee63b7_staticRenderFns = []
6742
- mainvue_type_template_id_1bee63b7_render._withStripped = true
6750
+ var mainvue_type_template_id_277dbcef_staticRenderFns = []
6751
+ mainvue_type_template_id_277dbcef_render._withStripped = true
6743
6752
 
6744
6753
 
6745
- // CONCATENATED MODULE: ./packages/date/src/main.vue?vue&type=template&id=1bee63b7&
6754
+ // CONCATENATED MODULE: ./packages/date/src/main.vue?vue&type=template&id=277dbcef&
6746
6755
 
6747
6756
  // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/date/src/date-time.vue?vue&type=template&id=df431e74&
6748
6757
  var date_timevue_type_template_id_df431e74_render = function () {
@@ -7072,31 +7081,32 @@ var date_time_component = normalizeComponent(
7072
7081
  )
7073
7082
 
7074
7083
  /* harmony default export */ var date_time = (date_time_component.exports);
7075
- // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/date/src/date-picker.vue?vue&type=template&id=37ed8112&
7076
- var date_pickervue_type_template_id_37ed8112_render = function () {
7084
+ // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/date/src/date-picker.vue?vue&type=template&id=0e79ab78&
7085
+ var date_pickervue_type_template_id_0e79ab78_render = function () {
7077
7086
  var _vm = this
7078
7087
  var _h = _vm.$createElement
7079
7088
  var _c = _vm._self._c || _h
7080
7089
  return _c(
7081
7090
  "van-datetime-picker",
7082
- _vm._g(
7083
- _vm._b(
7084
- {
7085
- attrs: { "show-toolbar": "" },
7086
- on: { cancel: _vm.onCancel, confirm: _vm.onConfirm },
7087
- model: {
7088
- value: _vm.newValue,
7089
- callback: function ($$v) {
7090
- _vm.newValue = $$v
7091
- },
7092
- expression: "newValue",
7091
+ _vm._b(
7092
+ {
7093
+ attrs: { "show-toolbar": "" },
7094
+ on: {
7095
+ cancel: _vm.onCancel,
7096
+ confirm: _vm.onConfirm,
7097
+ change: _vm.onChange,
7098
+ },
7099
+ model: {
7100
+ value: _vm.newValue,
7101
+ callback: function ($$v) {
7102
+ _vm.newValue = $$v
7093
7103
  },
7104
+ expression: "newValue",
7094
7105
  },
7095
- "van-datetime-picker",
7096
- _vm.$attrs,
7097
- false
7098
- ),
7099
- _vm.$listeners
7106
+ },
7107
+ "van-datetime-picker",
7108
+ _vm.$attrs,
7109
+ false
7100
7110
  ),
7101
7111
  [
7102
7112
  _vm._l(_vm.$slots, function (index, name) {
@@ -7106,11 +7116,11 @@ var date_pickervue_type_template_id_37ed8112_render = function () {
7106
7116
  2
7107
7117
  )
7108
7118
  }
7109
- var date_pickervue_type_template_id_37ed8112_staticRenderFns = []
7110
- date_pickervue_type_template_id_37ed8112_render._withStripped = true
7119
+ var date_pickervue_type_template_id_0e79ab78_staticRenderFns = []
7120
+ date_pickervue_type_template_id_0e79ab78_render._withStripped = true
7111
7121
 
7112
7122
 
7113
- // CONCATENATED MODULE: ./packages/date/src/date-picker.vue?vue&type=template&id=37ed8112&
7123
+ // CONCATENATED MODULE: ./packages/date/src/date-picker.vue?vue&type=template&id=0e79ab78&
7114
7124
 
7115
7125
  // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/date/src/date-picker.vue?vue&type=script&lang=js&
7116
7126
  //
@@ -7159,6 +7169,9 @@ date_pickervue_type_template_id_37ed8112_render._withStripped = true
7159
7169
  },
7160
7170
  onConfirm: function onConfirm(value) {
7161
7171
  this.$emit('confirm', value);
7172
+ },
7173
+ onChange: function onChange(picker) {
7174
+ this.$emit('change', picker);
7162
7175
  }
7163
7176
  }
7164
7177
  });
@@ -7174,8 +7187,8 @@ date_pickervue_type_template_id_37ed8112_render._withStripped = true
7174
7187
 
7175
7188
  var date_picker_component = normalizeComponent(
7176
7189
  src_date_pickervue_type_script_lang_js_,
7177
- date_pickervue_type_template_id_37ed8112_render,
7178
- date_pickervue_type_template_id_37ed8112_staticRenderFns,
7190
+ date_pickervue_type_template_id_0e79ab78_render,
7191
+ date_pickervue_type_template_id_0e79ab78_staticRenderFns,
7179
7192
  false,
7180
7193
  null,
7181
7194
  null,
@@ -7240,6 +7253,10 @@ var date_picker_component = normalizeComponent(
7240
7253
  //
7241
7254
  //
7242
7255
  //
7256
+ //
7257
+ //
7258
+ //
7259
+ //
7243
7260
 
7244
7261
 
7245
7262
 
@@ -7283,7 +7300,7 @@ var date_picker_component = normalizeComponent(
7283
7300
  },
7284
7301
  // 绑定值
7285
7302
  value: {
7286
- type: [String, Array, Object, Date],
7303
+ type: [String, Array, Object, Date, Number],
7287
7304
  default: ''
7288
7305
  },
7289
7306
  // 展示标题
@@ -7352,6 +7369,9 @@ var date_picker_component = normalizeComponent(
7352
7369
  },
7353
7370
 
7354
7371
  methods: {
7372
+ onChange: function onChange(picker) {
7373
+ this.$emit('change', picker);
7374
+ },
7355
7375
  getValFun: function getValFun(val) {
7356
7376
  var _that = this;
7357
7377
  if (_that.isOnConfirm) return;
@@ -7378,7 +7398,7 @@ var date_picker_component = normalizeComponent(
7378
7398
  if (type != 'year') {
7379
7399
  date = date.replace('年', '/');
7380
7400
  } else {
7381
- date = date.replace('年', '');
7401
+ date = date.replace(this.joinStr || '年', '');
7382
7402
  }
7383
7403
  if (type == 'year-month') {
7384
7404
  date = date.replace('月', '');
@@ -7409,7 +7429,7 @@ var date_picker_component = normalizeComponent(
7409
7429
  this.lastValue = value;
7410
7430
  this.changeValue = false;
7411
7431
  this.$emit('input', this.pickerValue);
7412
- if (this.type === 'datetimeSecond') this.$emit('confirm');
7432
+ this.$emit('confirm', value);
7413
7433
  },
7414
7434
  getValue: function getValue(val) {
7415
7435
  var type = this.type;
@@ -7418,8 +7438,7 @@ var date_picker_component = normalizeComponent(
7418
7438
  if (!this.value && !val && this.value == undefined) return;
7419
7439
  if (val && typeof val == 'string') {
7420
7440
  return val;
7421
- }
7422
- if (this.value && typeof this.value == 'string') {
7441
+ } else if (this.value && typeof this.value == 'string' && val && typeof val == 'string') {
7423
7442
  return this.value;
7424
7443
  }
7425
7444
  var newValue = new Date(val || this.value);
@@ -7455,7 +7474,7 @@ var date_picker_component = normalizeComponent(
7455
7474
  } else if (type === 'datehour' && newValue != 'Invalid Date') {
7456
7475
  value = y + (this.joinStr || '年') + m + (this.joinStr || '月') + d + (this.joinStr ? ' ' : '日 ') + h + (this.joinStr ? ' ' : '时');
7457
7476
  } else if (type === 'year' && newValue != 'Invalid Date') {
7458
- value = y + (this.joinStr ? '' : '年');
7477
+ value = y + (this.joinStr || '年');
7459
7478
  }
7460
7479
  return value;
7461
7480
  },
@@ -7479,8 +7498,8 @@ var date_picker_component = normalizeComponent(
7479
7498
 
7480
7499
  var date_src_main_component = normalizeComponent(
7481
7500
  packages_date_src_mainvue_type_script_lang_js_,
7482
- mainvue_type_template_id_1bee63b7_render,
7483
- mainvue_type_template_id_1bee63b7_staticRenderFns,
7501
+ mainvue_type_template_id_277dbcef_render,
7502
+ mainvue_type_template_id_277dbcef_staticRenderFns,
7484
7503
  false,
7485
7504
  null,
7486
7505
  null,
@@ -18281,7 +18300,7 @@ if (typeof window !== 'undefined' && window.Vue) {
18281
18300
  }
18282
18301
 
18283
18302
  /* harmony default export */ var src = __webpack_exports__["default"] = ({
18284
- version: '0.1.96',
18303
+ version: '0.1.98',
18285
18304
  install: install,
18286
18305
  Button: packages_button,
18287
18306
  ButtonGroup: button_group,