meixioacomponent 2.0.66 → 2.0.68

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meixioacomponent",
-  "version": "2.0.66",
+  "version": "2.0.68",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/packages/components/base/baseDrawer/index.vue

@@ -73,7 +73,7 @@ export default {
     return {
       open: false,
       useResize: null,
-      ignoreList: ['tInputNumber-select__list', 'tInputNumber-popup','tInputNumber-dialog__wrap'],
+      ignoreList: ["guide-content-wrap", "base-guide-overlay", 'tInputNumber-select__list', 'tInputNumber-popup', 'tInputNumber-dialog__wrap', 't-select__list', 't-popup', 't-dialog__wrap'],
       showCloseButton: false
     };
   },

package/packages/components/base/tDateRangePicker/tDateRangePicker.vue

@@ -1,18 +1,24 @@
 <template>
-  <date-range-picker v-model="module"
-                     v-bind="$attrs"
-                     @blur="onBlur"
-                     @change="onChange"
-                     @confirm="onConfirm"
-                     @focus="onFocus"
-                     @input="onInput"
-                     @pick="onPick"
-                     enableTimePicker
-                     @preset-click="onPresetClick"
-                     :presets="computedPresets"
-                     :readonly="_readonly"
-                     :disabled="_disabled"
-  />
+  <div>
+    <date-range-picker
+        ref="refByDateRangePicker"
+        v-model="module"
+        v-bind="$attrs"
+        @blur="onBlur"
+        @change="onChange"
+        :onConfirm="onConfirm"
+        @focus="onFocus"
+        @input="onInput"
+        @pick="onPick"
+        enableTimePicker
+        @preset-click="onPresetClick"
+        :presets="computedPresets"
+        :readonly="true"
+        :disabled="_disabled"
+        :popupProps=popupProps
+        :clearable="_clearable"
+    />
+  </div>
 </template>
 
 
@@ -24,7 +30,19 @@ import {getEndOfDayTimestamp, getStartOfDayTimestamp} from "../../../utils/utils
 export default {
   name: "tDateRangePicker",
   data() {
-    return {}
+    return {
+      popupVisible: false,
+      popupProps: {
+        visible: this._popupVisible,
+        onVisibleChange: (value) => {
+          console.log('onVisibleChange');
+          console.log(value);
+          if (this._readonly) return;
+          this.popupProps.visible = value;
+
+        }
+      }
+    }
   },
   props: {
     value: {
@@ -33,15 +51,23 @@ export default {
         return []
       }
     },
-    enableTimePicker:{
-      type:Boolean,
-      default:true
+    enableTimePicker: {
+      type: Boolean,
+      default: true
     }
   },
   components: {},
   created() {
   },
   computed: {
+    _popupVisible: {
+      get() {
+        return this.popupVisible;
+      },
+      set(val) {
+        this.popupVisible = val;
+      }
+    },
     module: {
       set(val) {
         this.$emit('input', val);
@@ -72,35 +98,50 @@ export default {
     },
     _readonly: {
       get() {
-        return !!(this.$attrs.disabled || this.$attrs.readonly);
+        return this.$attrs.disabled || this.$attrs.readonly;
       }
     },
     _disabled: {
       get() {
         return false;
       }
+    },
+    _clearable: {
+      get() {
+        if (this._readonly) return false;
+        return !!this.$attrs.clearable;
+
+      }
     }
   },
   methods: {
     onBlur(event) {
+      if (this._readonly) return;
       this.$emit('blur', event);
     },
     onChange(event) {
+      if (this._readonly) return;
       this.$emit('change', event);
     },
     onConfirm(event) {
+      if (this._readonly) return;
+      this.popupProps.visible = false;
       this.$emit('confirm', event);
     },
     onFocus(event) {
+      if (this._readonly) return;
       this.$emit('focus', event);
     },
     onInput(event) {
+      if (this._readonly) return;
       this.$emit('input', event);
     },
     onPick(event) {
+      if (this._readonly) return;
       this.$emit('pick', event);
     },
     onPresetClick(event) {
+      if (this._readonly) return;
       this.$emit('preset-click', event);
     }
   }