eoss-mobiles 0.2.52 → 0.2.54

package/lib/date.js

@@ -199,7 +199,7 @@ function normalizeComponent(
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// 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=22c800c0&
+// 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=57ffad94&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -216,7 +216,7 @@ var render = function () {
               readonly: "",
               clickable: "",
               label: _vm.label,
-              value: _vm.pickerValue,
+              value: _vm.pickerValue || "",
               "label-align": _vm.labelAlign,
               "input-align": _vm.inputAlign,
               "label-width": _vm.labelWidth,
@@ -237,7 +237,15 @@ var render = function () {
         [
           _c("template", { slot: "input" }, [
             _vm.pickerValue
-              ? _c("span", [_vm._v(_vm._s(_vm.pickerValue))])
+              ? _c(
+                  "span",
+                  {
+                    style:
+                      "color:" +
+                      (_vm.disabled || _vm.readonly ? "#c8c9cc" : ""),
+                  },
+                  [_vm._v(_vm._s(_vm.pickerValue) + " ")]
+                )
               : _c("span", { staticStyle: { color: "#c8c9cc" } }, [
                   _vm._v(
                     _vm._s(
@@ -345,7 +353,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/date/src/main.vue?vue&type=template&id=22c800c0&
+// CONCATENATED MODULE: ./packages/date/src/main.vue?vue&type=template&id=57ffad94&
 
 // 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&
 var date_timevue_type_template_id_df431e74_render = function () {
@@ -678,8 +686,8 @@ var component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var date_time = (component.exports);
-// 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=14b63295&
-var date_pickervue_type_template_id_14b63295_render = function () {
+// 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=7b158890&
+var date_pickervue_type_template_id_7b158890_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -714,11 +722,11 @@ var date_pickervue_type_template_id_14b63295_render = function () {
     2
   )
 }
-var date_pickervue_type_template_id_14b63295_staticRenderFns = []
-date_pickervue_type_template_id_14b63295_render._withStripped = true
+var date_pickervue_type_template_id_7b158890_staticRenderFns = []
+date_pickervue_type_template_id_7b158890_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/date/src/date-picker.vue?vue&type=template&id=14b63295&
+// CONCATENATED MODULE: ./packages/date/src/date-picker.vue?vue&type=template&id=7b158890&
 
 // 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&
 //
@@ -743,7 +751,7 @@ date_pickervue_type_template_id_14b63295_render._withStripped = true
   name: 'DatePicker',
   props: {
     model: {
-      type: [String, Array, Object, Date],
+      type: [String, Array, Object, Date, Boolean],
       default: ''
     },
     timePeriod: {
@@ -751,7 +759,7 @@ date_pickervue_type_template_id_14b63295_render._withStripped = true
       default: false
     },
     timePeriodValue: {
-      type: [String, Number],
+      type: [String, Number, Boolean],
       default: 'AM'
     }
   },
@@ -785,8 +793,6 @@ date_pickervue_type_template_id_14b63295_render._withStripped = true
       var timePeriod = void 0;
       if (this.$attrs.type === 'datehour' && this.timePeriod) {
         timePeriod = this.$refs.emDatePicker.$children[0].$children[0].$children[3]._data.currentIndex == 0 ? 'AM' : 'PM';
-
-        console.log(this.$refs.emDatePicker.$children[0].$children[0].$children[3]._data.currentIndex);
       }
       this.$emit('confirm', value, timePeriod);
     },
@@ -807,8 +813,8 @@ date_pickervue_type_template_id_14b63295_render._withStripped = true
 
 var date_picker_component = Object(componentNormalizer["a" /* default */])(
   src_date_pickervue_type_script_lang_js_,
-  date_pickervue_type_template_id_14b63295_render,
-  date_pickervue_type_template_id_14b63295_staticRenderFns,
+  date_pickervue_type_template_id_7b158890_render,
+  date_pickervue_type_template_id_7b158890_staticRenderFns,
   false,
   null,
   null,
@@ -887,6 +893,10 @@ var date_picker_component = Object(componentNormalizer["a" /* default */])(
 //
 //
 //
+//
+//
+//
+//
 
 
 
@@ -899,6 +909,7 @@ var date_picker_component = Object(componentNormalizer["a" /* default */])(
       showPicker: false,
       newLoading: false,
       changeValue: true,
+      firstShow: true,
       newValueKey: '',
       newValue: '',
       lastValue: '',
@@ -908,6 +919,7 @@ var date_picker_component = Object(componentNormalizer["a" /* default */])(
       isOnConfirm: false,
       count: 0,
       pickerValue: '',
+      timeText: '',
       timePeriodText: ''
     };
   },
@@ -931,7 +943,7 @@ var date_picker_component = Object(componentNormalizer["a" /* default */])(
     },
     // 绑定值
     value: {
-      type: [String, Array, Object, Date, Number],
+      type: [String, Array, Object, Date, Number, Boolean],
       default: ''
     },
     // 展示标题
@@ -983,7 +995,7 @@ var date_picker_component = Object(componentNormalizer["a" /* default */])(
       default: false
     },
     timePeriodValue: {
-      type: [String, Number],
+      type: [String, Number, Boolean],
       default: 'AM'
     }
   },
@@ -1008,14 +1020,19 @@ var date_picker_component = Object(componentNormalizer["a" /* default */])(
   },
 
   mounted: function mounted() {
-    this.lastValue = this.value;
+    var _this = this;
+
+    this.$nextTick(function () {
+      _this.lastValue = _this.value;
+    });
   },
 
   methods: {
     handleClear: function handleClear() {
       this.pickerValue = '';
+      this.timeText = '';
       this.lastValue = '';
-      this.$emit('input', this.pickerValue);
+      this.$emit('input', this.timePeriod && this.type === 'datehour' ? this.timeText : this.pickerValue);
     },
     onChange: function onChange(picker) {
       this.$emit('change', picker);
@@ -1071,13 +1088,14 @@ var date_picker_component = Object(componentNormalizer["a" /* default */])(
       this.showPicker = false;
     },
     onConfirm: function onConfirm(value, timePeriod) {
+
       this.showPicker = false;
       this.timePeriodText = timePeriod;
       this.pickerValue = this.getValue(value);
       this.isOnConfirm = true;
       this.lastValue = value;
       this.changeValue = false;
-      this.$emit('input', this.pickerValue);
+      this.$emit('input', this.timePeriod && this.type === 'datehour' ? this.timeText : this.pickerValue);
       this.$emit('confirm', value, this.timePeriodText);
     },
     getValue: function getValue(val) {
@@ -1085,7 +1103,6 @@ var date_picker_component = Object(componentNormalizer["a" /* default */])(
 
       var timePeriodText = '';
       if (this.timePeriod && (this.timePeriodText || this.timePeriodValue)) {
-        console.log('进来了');
         timePeriodText = (this.timePeriodText || this.timePeriodValue) == 'AM' ? '上午' : '下午';
       }
       var value = '';
@@ -1127,6 +1144,9 @@ var date_picker_component = Object(componentNormalizer["a" /* default */])(
         value = y + (this.joinStr || '年') + m + (this.joinStr || '月') + d + (this.joinStr ? ' ' : '日 ') + h + (this.joinStr ? ':' : '时') + minute + (this.joinStr ? type === 'datetimeSecond' ? ':' : '' : '分') + (type === 'datetimeSecond' ? s + (this.joinStr ? '' : '秒') : '');
       } else if (type === 'datehour' && newValue != 'Invalid Date') {
         value = y + (this.joinStr || '年') + m + (this.joinStr || '月') + d + (this.joinStr ? ' ' : '日 ') + (this.timePeriod ? timePeriodText : h + (this.joinStr ? ' ' : '时'));
+        if (this.timePeriod && type === 'datehour') {
+          this.timeText = y + (this.joinStr || '年') + m + (this.joinStr || '月') + d + (this.joinStr ? '' : '日 ');
+        }
       } else if (type === 'year' && newValue != 'Invalid Date') {
         value = y + (this.joinStr ? '' : '年');
       }
@@ -1134,6 +1154,10 @@ var date_picker_component = Object(componentNormalizer["a" /* default */])(
     },
     handlePicker: function handlePicker() {
       if (this.disabled || this.readonly) return;
+      if (this.firstShow) {
+        this.lastValue = this.value;
+      }
+      this.firstShow = false;
       this.showPicker = true;
       this.$emit('showPicker');
     }

package/lib/eoss-mobile.common.js

@@ -4301,8 +4301,8 @@ var selector_tree_component = normalizeComponent(
 )
 
 /* harmony default export */ var selector_tree = (selector_tree_component.exports);
-// 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-field.vue?vue&type=template&id=ef77a3f6&
-var selector_fieldvue_type_template_id_ef77a3f6_render = function () {
+// 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-field.vue?vue&type=template&id=e58694a8&
+var selector_fieldvue_type_template_id_e58694a8_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4315,7 +4315,11 @@ var selector_fieldvue_type_template_id_ef77a3f6_render = function () {
         _vm._b(
           {
             class: { "hide-label": _vm.hideLabel },
-            attrs: { readonly: "", clickable: "", "right-icon": "arrow" },
+            attrs: {
+              readonly: "",
+              clickable: "",
+              "right-icon": _vm.disabled || _vm.readonly ? "" : "arrow",
+            },
             on: {
               click: function ($event) {
                 _vm.clickTree()
@@ -4461,11 +4465,11 @@ var selector_fieldvue_type_template_id_ef77a3f6_render = function () {
     1
   )
 }
-var selector_fieldvue_type_template_id_ef77a3f6_staticRenderFns = []
-selector_fieldvue_type_template_id_ef77a3f6_render._withStripped = true
+var selector_fieldvue_type_template_id_e58694a8_staticRenderFns = []
+selector_fieldvue_type_template_id_e58694a8_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/selector/src/selector-field.vue?vue&type=template&id=ef77a3f6&
+// CONCATENATED MODULE: ./packages/selector/src/selector-field.vue?vue&type=template&id=e58694a8&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/selector-field.vue?vue&type=script&lang=js&
 //
@@ -4718,8 +4722,8 @@ selector_fieldvue_type_template_id_ef77a3f6_render._withStripped = true
 
 var selector_field_component = normalizeComponent(
   src_selector_fieldvue_type_script_lang_js_,
-  selector_fieldvue_type_template_id_ef77a3f6_render,
-  selector_fieldvue_type_template_id_ef77a3f6_staticRenderFns,
+  selector_fieldvue_type_template_id_e58694a8_render,
+  selector_fieldvue_type_template_id_e58694a8_staticRenderFns,
   false,
   null,
   null,
@@ -4886,8 +4890,8 @@ selector_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var selector = (selector_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/field/src/main.vue?vue&type=template&id=099f12b6&
-var mainvue_type_template_id_099f12b6_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/field/src/main.vue?vue&type=template&id=36d09e5a&
+var mainvue_type_template_id_36d09e5a_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -5004,11 +5008,11 @@ var mainvue_type_template_id_099f12b6_render = function () {
     1
   )
 }
-var mainvue_type_template_id_099f12b6_staticRenderFns = []
-mainvue_type_template_id_099f12b6_render._withStripped = true
+var mainvue_type_template_id_36d09e5a_staticRenderFns = []
+mainvue_type_template_id_36d09e5a_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/field/src/main.vue?vue&type=template&id=099f12b6&
+// CONCATENATED MODULE: ./packages/field/src/main.vue?vue&type=template&id=36d09e5a&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/field/src/main.vue?vue&type=script&lang=js&
 //
@@ -5076,6 +5080,7 @@ mainvue_type_template_id_099f12b6_render._withStripped = true
 //
 //
 //
+//
 
 /* harmony default export */ var field_src_mainvue_type_script_lang_js_ = ({
   name: 'EmInput',
@@ -5251,8 +5256,8 @@ mainvue_type_template_id_099f12b6_render._withStripped = true
 
 var field_src_main_component = normalizeComponent(
   packages_field_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_099f12b6_render,
-  mainvue_type_template_id_099f12b6_staticRenderFns,
+  mainvue_type_template_id_36d09e5a_render,
+  mainvue_type_template_id_36d09e5a_staticRenderFns,
   false,
   null,
   null,
@@ -5554,8 +5559,8 @@ radio_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_radio = (radio_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/picker/src/main.vue?vue&type=template&id=19aea2bf&
-var mainvue_type_template_id_19aea2bf_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/picker/src/main.vue?vue&type=template&id=8ae7f90c&
+var mainvue_type_template_id_8ae7f90c_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -5583,7 +5588,8 @@ var mainvue_type_template_id_19aea2bf_render = function () {
                     : _vm.placeholder
                     ? _vm.placeholder
                     : "请选择" + _vm.label,
-                  "right-icon": "arrow",
+                  disabled: _vm.disabled || _vm.readonly,
+                  "right-icon": _vm.disabled || _vm.readonly ? "" : "arrow",
                 },
                 on: { click: _vm.handlePicker },
               },
@@ -5604,7 +5610,7 @@ var mainvue_type_template_id_19aea2bf_render = function () {
                   disabled: _vm.disabled || _vm.readonly,
                   "label-width": _vm.labelWidth,
                   hideLabel: _vm.hideLabel,
-                  "right-icon": "arrow",
+                  "right-icon": _vm.disabled || _vm.readonly ? "" : "arrow",
                 },
                 on: { click: _vm.handlePicker },
               },
@@ -5824,11 +5830,11 @@ var mainvue_type_template_id_19aea2bf_render = function () {
     1
   )
 }
-var mainvue_type_template_id_19aea2bf_staticRenderFns = []
-mainvue_type_template_id_19aea2bf_render._withStripped = true
+var mainvue_type_template_id_8ae7f90c_staticRenderFns = []
+mainvue_type_template_id_8ae7f90c_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/picker/src/main.vue?vue&type=template&id=19aea2bf&
+// CONCATENATED MODULE: ./packages/picker/src/main.vue?vue&type=template&id=8ae7f90c&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/picker/src/main.vue?vue&type=script&lang=js&
 var src_mainvue_type_script_lang_js_extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
@@ -5959,6 +5965,7 @@ var mainvue_type_script_lang_js_typeof = typeof Symbol === "function" && typeof
 //
 //
 //
+//
 
 
 
@@ -6389,8 +6396,8 @@ var mainvue_type_script_lang_js_typeof = typeof Symbol === "function" && typeof
 
 var picker_src_main_component = normalizeComponent(
   packages_picker_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_19aea2bf_render,
-  mainvue_type_template_id_19aea2bf_staticRenderFns,
+  mainvue_type_template_id_8ae7f90c_render,
+  mainvue_type_template_id_8ae7f90c_staticRenderFns,
   false,
   null,
   null,
@@ -7998,8 +8005,8 @@ empty_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var empty = (empty_src_main);
-// 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=22c800c0&
-var mainvue_type_template_id_22c800c0_render = function () {
+// 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=57ffad94&
+var mainvue_type_template_id_57ffad94_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -8015,7 +8022,7 @@ var mainvue_type_template_id_22c800c0_render = function () {
               readonly: "",
               clickable: "",
               label: _vm.label,
-              value: _vm.pickerValue,
+              value: _vm.pickerValue || "",
               "label-align": _vm.labelAlign,
               "input-align": _vm.inputAlign,
               "label-width": _vm.labelWidth,
@@ -8036,7 +8043,15 @@ var mainvue_type_template_id_22c800c0_render = function () {
         [
           _c("template", { slot: "input" }, [
             _vm.pickerValue
-              ? _c("span", [_vm._v(_vm._s(_vm.pickerValue))])
+              ? _c(
+                  "span",
+                  {
+                    style:
+                      "color:" +
+                      (_vm.disabled || _vm.readonly ? "#c8c9cc" : ""),
+                  },
+                  [_vm._v(_vm._s(_vm.pickerValue) + " ")]
+                )
               : _c("span", { staticStyle: { color: "#c8c9cc" } }, [
                   _vm._v(
                     _vm._s(
@@ -8140,11 +8155,11 @@ var mainvue_type_template_id_22c800c0_render = function () {
     1
   )
 }
-var mainvue_type_template_id_22c800c0_staticRenderFns = []
-mainvue_type_template_id_22c800c0_render._withStripped = true
+var mainvue_type_template_id_57ffad94_staticRenderFns = []
+mainvue_type_template_id_57ffad94_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/date/src/main.vue?vue&type=template&id=22c800c0&
+// CONCATENATED MODULE: ./packages/date/src/main.vue?vue&type=template&id=57ffad94&
 
 // 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&
 var date_timevue_type_template_id_df431e74_render = function () {
@@ -8474,8 +8489,8 @@ var date_time_component = normalizeComponent(
 )
 
 /* harmony default export */ var date_time = (date_time_component.exports);
-// 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=14b63295&
-var date_pickervue_type_template_id_14b63295_render = function () {
+// 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=7b158890&
+var date_pickervue_type_template_id_7b158890_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -8510,11 +8525,11 @@ var date_pickervue_type_template_id_14b63295_render = function () {
     2
   )
 }
-var date_pickervue_type_template_id_14b63295_staticRenderFns = []
-date_pickervue_type_template_id_14b63295_render._withStripped = true
+var date_pickervue_type_template_id_7b158890_staticRenderFns = []
+date_pickervue_type_template_id_7b158890_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/date/src/date-picker.vue?vue&type=template&id=14b63295&
+// CONCATENATED MODULE: ./packages/date/src/date-picker.vue?vue&type=template&id=7b158890&
 
 // 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&
 //
@@ -8539,7 +8554,7 @@ date_pickervue_type_template_id_14b63295_render._withStripped = true
   name: 'DatePicker',
   props: {
     model: {
-      type: [String, Array, Object, Date],
+      type: [String, Array, Object, Date, Boolean],
       default: ''
     },
     timePeriod: {
@@ -8547,7 +8562,7 @@ date_pickervue_type_template_id_14b63295_render._withStripped = true
       default: false
     },
     timePeriodValue: {
-      type: [String, Number],
+      type: [String, Number, Boolean],
       default: 'AM'
     }
   },
@@ -8581,8 +8596,6 @@ date_pickervue_type_template_id_14b63295_render._withStripped = true
       var timePeriod = void 0;
       if (this.$attrs.type === 'datehour' && this.timePeriod) {
         timePeriod = this.$refs.emDatePicker.$children[0].$children[0].$children[3]._data.currentIndex == 0 ? 'AM' : 'PM';
-
-        console.log(this.$refs.emDatePicker.$children[0].$children[0].$children[3]._data.currentIndex);
       }
       this.$emit('confirm', value, timePeriod);
     },
@@ -8603,8 +8616,8 @@ date_pickervue_type_template_id_14b63295_render._withStripped = true
 
 var date_picker_component = normalizeComponent(
   src_date_pickervue_type_script_lang_js_,
-  date_pickervue_type_template_id_14b63295_render,
-  date_pickervue_type_template_id_14b63295_staticRenderFns,
+  date_pickervue_type_template_id_7b158890_render,
+  date_pickervue_type_template_id_7b158890_staticRenderFns,
   false,
   null,
   null,
@@ -8683,6 +8696,10 @@ var date_picker_component = normalizeComponent(
 //
 //
 //
+//
+//
+//
+//
 
 
 
@@ -8695,6 +8712,7 @@ var date_picker_component = normalizeComponent(
       showPicker: false,
       newLoading: false,
       changeValue: true,
+      firstShow: true,
       newValueKey: '',
       newValue: '',
       lastValue: '',
@@ -8704,6 +8722,7 @@ var date_picker_component = normalizeComponent(
       isOnConfirm: false,
       count: 0,
       pickerValue: '',
+      timeText: '',
       timePeriodText: ''
     };
   },
@@ -8727,7 +8746,7 @@ var date_picker_component = normalizeComponent(
     },
     // 绑定值
     value: {
-      type: [String, Array, Object, Date, Number],
+      type: [String, Array, Object, Date, Number, Boolean],
       default: ''
     },
     // 展示标题
@@ -8779,7 +8798,7 @@ var date_picker_component = normalizeComponent(
       default: false
     },
     timePeriodValue: {
-      type: [String, Number],
+      type: [String, Number, Boolean],
       default: 'AM'
     }
   },
@@ -8804,14 +8823,19 @@ var date_picker_component = normalizeComponent(
   },
 
   mounted: function mounted() {
-    this.lastValue = this.value;
+    var _this = this;
+
+    this.$nextTick(function () {
+      _this.lastValue = _this.value;
+    });
   },
 
   methods: {
     handleClear: function handleClear() {
       this.pickerValue = '';
+      this.timeText = '';
       this.lastValue = '';
-      this.$emit('input', this.pickerValue);
+      this.$emit('input', this.timePeriod && this.type === 'datehour' ? this.timeText : this.pickerValue);
     },
     onChange: function onChange(picker) {
       this.$emit('change', picker);
@@ -8867,13 +8891,14 @@ var date_picker_component = normalizeComponent(
       this.showPicker = false;
     },
     onConfirm: function onConfirm(value, timePeriod) {
+
       this.showPicker = false;
       this.timePeriodText = timePeriod;
       this.pickerValue = this.getValue(value);
       this.isOnConfirm = true;
       this.lastValue = value;
       this.changeValue = false;
-      this.$emit('input', this.pickerValue);
+      this.$emit('input', this.timePeriod && this.type === 'datehour' ? this.timeText : this.pickerValue);
       this.$emit('confirm', value, this.timePeriodText);
     },
     getValue: function getValue(val) {
@@ -8881,7 +8906,6 @@ var date_picker_component = normalizeComponent(
 
       var timePeriodText = '';
       if (this.timePeriod && (this.timePeriodText || this.timePeriodValue)) {
-        console.log('进来了');
         timePeriodText = (this.timePeriodText || this.timePeriodValue) == 'AM' ? '上午' : '下午';
       }
       var value = '';
@@ -8923,6 +8947,9 @@ var date_picker_component = normalizeComponent(
         value = y + (this.joinStr || '年') + m + (this.joinStr || '月') + d + (this.joinStr ? ' ' : '日 ') + h + (this.joinStr ? ':' : '时') + minute + (this.joinStr ? type === 'datetimeSecond' ? ':' : '' : '分') + (type === 'datetimeSecond' ? s + (this.joinStr ? '' : '秒') : '');
       } else if (type === 'datehour' && newValue != 'Invalid Date') {
         value = y + (this.joinStr || '年') + m + (this.joinStr || '月') + d + (this.joinStr ? ' ' : '日 ') + (this.timePeriod ? timePeriodText : h + (this.joinStr ? ' ' : '时'));
+        if (this.timePeriod && type === 'datehour') {
+          this.timeText = y + (this.joinStr || '年') + m + (this.joinStr || '月') + d + (this.joinStr ? '' : '日 ');
+        }
       } else if (type === 'year' && newValue != 'Invalid Date') {
         value = y + (this.joinStr ? '' : '年');
       }
@@ -8930,6 +8957,10 @@ var date_picker_component = normalizeComponent(
     },
     handlePicker: function handlePicker() {
       if (this.disabled || this.readonly) return;
+      if (this.firstShow) {
+        this.lastValue = this.value;
+      }
+      this.firstShow = false;
       this.showPicker = true;
       this.$emit('showPicker');
     }
@@ -8947,8 +8978,8 @@ var date_picker_component = normalizeComponent(
 
 var date_src_main_component = normalizeComponent(
   packages_date_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_22c800c0_render,
-  mainvue_type_template_id_22c800c0_staticRenderFns,
+  mainvue_type_template_id_57ffad94_render,
+  mainvue_type_template_id_57ffad94_staticRenderFns,
   false,
   null,
   null,
@@ -22783,7 +22814,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src = __webpack_exports__["default"] = ({
-  version: '0.2.52',
+  version: '0.2.54',
   install: install,
   Button: packages_button,
   ButtonGroup: button_group,

package/lib/field.js

@@ -199,7 +199,7 @@ function normalizeComponent(
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/field/src/main.vue?vue&type=template&id=099f12b6&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/field/src/main.vue?vue&type=template&id=36d09e5a&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -321,7 +321,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/field/src/main.vue?vue&type=template&id=099f12b6&
+// CONCATENATED MODULE: ./packages/field/src/main.vue?vue&type=template&id=36d09e5a&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/field/src/main.vue?vue&type=script&lang=js&
 //
@@ -389,6 +389,7 @@ render._withStripped = true
 //
 //
 //
+//
 
 /* harmony default export */ var mainvue_type_script_lang_js_ = ({
   name: 'EmInput',