eoss-mobiles 0.2.49 → 0.2.51

package/lib/checkbox.js

@@ -1807,7 +1807,22 @@ var axios_ajax = function ajax(url) {
     if (config.url.search('mecp/overtime') !== -1 || config.url.search('mecp/leave') !== -1 || config.url.search('contractext') !== -1 || config.url.search('getSysParam') !== -1) {
       delete config.headers.deviceId;
     }
-
+    var accessToken = util["a" /* default */].getStorage('accessToken');
+    var tenantId = util["a" /* default */].getStorage('tenantId');
+    var authorization = util["a" /* default */].getStorage('authorization') || util["a" /* default */].getStorage('token');
+    var deviceId = util["a" /* default */].getStorage('deviceId');
+    if (accessToken) {
+      config.headers['X-Coos-Client-Access-Token'] = accessToken;
+    }
+    if (tenantId) {
+      config.headers['X-Coos-Client-Tenant-Id'] = tenantId;
+    }
+    if (authorization) {
+      config.headers['Authorization'] = authorization;
+    }
+    if (deviceId) {
+      config.headers['deviceId'] = deviceId;
+    }
     return config;
   }, function (error) {
     return Promise.error(error);

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=68ecda84&
+// 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 render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -314,6 +314,8 @@ var render = function () {
                       model: _vm.newValue,
                       loading: _vm.newLoading,
                       type: _vm.type,
+                      timePeriod: _vm.timePeriod,
+                      timePeriodValue: _vm.timePeriodValue,
                     },
                     on: {
                       cancel: _vm.onCancel,
@@ -343,7 +345,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/date/src/main.vue?vue&type=template&id=68ecda84&
+// CONCATENATED MODULE: ./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/date-time.vue?vue&type=template&id=df431e74&
 var date_timevue_type_template_id_df431e74_render = function () {
@@ -676,8 +678,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=0e79ab78&
-var date_pickervue_type_template_id_0e79ab78_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=14b63295&
+var date_pickervue_type_template_id_14b63295_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -685,7 +687,8 @@ var date_pickervue_type_template_id_0e79ab78_render = function () {
     "van-datetime-picker",
     _vm._b(
       {
-        attrs: { "show-toolbar": "" },
+        ref: "emDatePicker",
+        attrs: { "show-toolbar": "", filter: _vm.filter },
         on: {
           cancel: _vm.onCancel,
           confirm: _vm.onConfirm,
@@ -711,11 +714,11 @@ var date_pickervue_type_template_id_0e79ab78_render = function () {
     2
   )
 }
-var date_pickervue_type_template_id_0e79ab78_staticRenderFns = []
-date_pickervue_type_template_id_0e79ab78_render._withStripped = true
+var date_pickervue_type_template_id_14b63295_staticRenderFns = []
+date_pickervue_type_template_id_14b63295_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/date/src/date-picker.vue?vue&type=template&id=0e79ab78&
+// CONCATENATED MODULE: ./packages/date/src/date-picker.vue?vue&type=template&id=14b63295&
 
 // 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&
 //
@@ -733,6 +736,8 @@ date_pickervue_type_template_id_0e79ab78_render._withStripped = true
 //
 //
 //
+//
+//
 
 /* harmony default export */ var date_pickervue_type_script_lang_js_ = ({
   name: 'DatePicker',
@@ -740,6 +745,14 @@ date_pickervue_type_template_id_0e79ab78_render._withStripped = true
     model: {
       type: [String, Array, Object, Date],
       default: ''
+    },
+    timePeriod: {
+      type: Boolean,
+      default: false
+    },
+    timePeriodValue: {
+      type: [String, Number],
+      default: 'AM'
     }
   },
   data: function data() {
@@ -759,11 +772,23 @@ date_pickervue_type_template_id_0e79ab78_render._withStripped = true
     }
   },
   methods: {
+    filter: function filter(type, options) {
+      if (type === 'hour' && this.$attrs.type === 'datehour' && this.timePeriod) {
+        return ['上午', '下午'];
+      }
+      return options;
+    },
     onCancel: function onCancel() {
       this.$emit('cancel');
     },
     onConfirm: function onConfirm(value) {
-      this.$emit('confirm', value);
+      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);
     },
     onChange: function onChange(picker) {
       this.$emit('change', picker);
@@ -782,8 +807,8 @@ date_pickervue_type_template_id_0e79ab78_render._withStripped = true
 
 var date_picker_component = Object(componentNormalizer["a" /* default */])(
   src_date_pickervue_type_script_lang_js_,
-  date_pickervue_type_template_id_0e79ab78_render,
-  date_pickervue_type_template_id_0e79ab78_staticRenderFns,
+  date_pickervue_type_template_id_14b63295_render,
+  date_pickervue_type_template_id_14b63295_staticRenderFns,
   false,
   null,
   null,
@@ -857,6 +882,11 @@ var date_picker_component = Object(componentNormalizer["a" /* default */])(
 //
 //
 //
+//
+//
+//
+//
+//
 
 
 
@@ -877,7 +907,8 @@ var date_picker_component = Object(componentNormalizer["a" /* default */])(
       newDefaultIndex: 0,
       isOnConfirm: false,
       count: 0,
-      pickerValue: ''
+      pickerValue: '',
+      timePeriodText: ''
     };
   },
 
@@ -946,6 +977,14 @@ var date_picker_component = Object(componentNormalizer["a" /* default */])(
     clearable: {
       type: Boolean,
       default: false
+    },
+    timePeriod: {
+      type: Boolean,
+      default: false
+    },
+    timePeriodValue: {
+      type: [String, Number],
+      default: 'AM'
     }
   },
 
@@ -1031,18 +1070,24 @@ var date_picker_component = Object(componentNormalizer["a" /* default */])(
       this.getValFun(this.lastValue);
       this.showPicker = false;
     },
-    onConfirm: function onConfirm(value) {
+    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('confirm', value);
+      this.$emit('confirm', value, this.timePeriodText);
     },
     getValue: function getValue(val) {
       var type = this.type;
 
+      var timePeriodText = '';
+      if (this.timePeriod && (this.timePeriodText || this.timePeriodValue)) {
+        console.log('进来了');
+        timePeriodText = (this.timePeriodText || this.timePeriodValue) == 'AM' ? '上午' : '下午';
+      }
       var value = '';
       if (!this.value && !val && this.value == undefined) return;
       if (val && typeof val == 'string') {
@@ -1081,7 +1126,7 @@ var date_picker_component = Object(componentNormalizer["a" /* default */])(
       } else if ((type === 'datetime' || type === 'datetimeSecond') && newValue != 'Invalid Date') {
         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 ? ' ' : '日 ') + h + (this.joinStr ? ' ' : '时');
+        value = y + (this.joinStr || '年') + m + (this.joinStr || '月') + d + (this.joinStr ? ' ' : '日 ') + (this.timePeriod ? timePeriodText : h + (this.joinStr ? ' ' : '时'));
       } else if (type === 'year' && newValue != 'Invalid Date') {
         value = y + (this.joinStr ? '' : '年');
       }
@@ -1090,7 +1135,6 @@ var date_picker_component = Object(componentNormalizer["a" /* default */])(
     handlePicker: function handlePicker() {
       if (this.disabled || this.readonly) return;
       this.showPicker = true;
-
       this.$emit('showPicker');
     }
   }