bi-eleme 2.4.2 → 2.4.4

package/lib/super-date.js

@@ -304,7 +304,7 @@ module.exports = require("bi-eleme/lib/utils/vue-popper");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/.store/vue-loader@15.11.1/node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/.store/vue-loader@15.11.1/node_modules/vue-loader/lib??vue-loader-options!./packages/super-date/src/picker.vue?vue&type=template&id=5b9d0655
+// CONCATENATED MODULE: ./node_modules/.store/vue-loader@15.11.1/node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/.store/vue-loader@15.11.1/node_modules/vue-loader/lib??vue-loader-options!./packages/super-date/src/picker.vue?vue&type=template&id=54fb4006
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -374,7 +374,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/super-date/src/picker.vue?vue&type=template&id=5b9d0655
+// CONCATENATED MODULE: ./packages/super-date/src/picker.vue?vue&type=template&id=54fb4006
 
 // EXTERNAL MODULE: external "vue"
 var external_vue_ = __webpack_require__(7);
@@ -799,6 +799,12 @@ var pickervue_type_script_lang_js_validator = function validator(val) {
         return [];
       }
     },
+    selectableDynamicDays: {
+      type: Array,
+      default: function _default() {
+        return [];
+      }
+    },
     needTime: Boolean
   },
 
@@ -821,7 +827,6 @@ var pickervue_type_script_lang_js_validator = function validator(val) {
 
   watch: {
     pickerVisible: function pickerVisible(val) {
-      console.log('🚀 ~ val:', val);
       if (this.readonly || this.pickerDisabled) return;
       if (val) {
         this.showPicker();
@@ -844,7 +849,6 @@ var pickervue_type_script_lang_js_validator = function validator(val) {
       handler: function handler(val) {
         if (this.picker) {
           this.picker.value = this.mergeDateAndTime(this.value);
-          console.log('🚀 ~ this.mergeDateAndTime(this.value):', this.mergeDateAndTime(this.value).date);
         }
       }
     },
@@ -868,7 +872,6 @@ var pickervue_type_script_lang_js_validator = function validator(val) {
 
   computed: {
     returnedValue: function returnedValue() {
-      console.log('🚀 ~ returnedValue:');
       var formattedValue = formatAsFormatAndType(this.parsedValue, this.format, this.type, this.rangeSeparator);
 
       // 分离日期和时间
@@ -1075,7 +1078,6 @@ var pickervue_type_script_lang_js_validator = function validator(val) {
       }
     },
     blur: function blur() {
-      console.log('blur');
       this.refInput.forEach(function (input) {
         return input.blur();
       });
@@ -1121,7 +1123,6 @@ var pickervue_type_script_lang_js_validator = function validator(val) {
         var value = this.parseString(this.displayValue);
         if (value) {
           this.picker.value = value;
-          console.log('🚀 ~ value:', value);
           if (this.isValidValue(value)) {
             this.emitInput(value);
             this.userInput = null;
@@ -1154,7 +1155,6 @@ var pickervue_type_script_lang_js_validator = function validator(val) {
         this.userInput = [this.formatToString(value), this.displayValue[1]];
         var newValue = [value, this.picker.value && this.picker.value[1]];
         this.picker.value = newValue;
-        console.log('🚀 ~ newValue:', newValue);
         if (this.isValidValue(newValue)) {
           this.emitInput(newValue);
           this.userInput = null;
@@ -1167,7 +1167,6 @@ var pickervue_type_script_lang_js_validator = function validator(val) {
         this.userInput = [this.displayValue[0], this.formatToString(value)];
         var newValue = [this.picker.value && this.picker.value[0], value];
         this.picker.value = newValue;
-        console.log('🚀 ~ newValue:', newValue);
         if (this.isValidValue(newValue)) {
           this.emitInput(newValue);
           this.userInput = null;
@@ -1234,11 +1233,11 @@ var pickervue_type_script_lang_js_validator = function validator(val) {
       }
       this.pickerVisible = this.picker.visible = true;
       this.picker.selectableDays = this.selectableDays;
+      this.picker.selectableDynamicDays = this.selectableDynamicDays;
       this.updatePopper();
 
       // 转换parsedValue为包含date、time、type和dynamicRange字段的对象格式
       this.picker.value = this.mergeDateAndTime(this.value);
-      console.log('🚀 ~ this.mergeDateAndTime(this.value):', this.mergeDateAndTime(this.value));
       this.picker.resetView && this.picker.resetView();
 
       this.$nextTick(function () {
@@ -1307,7 +1306,6 @@ var pickervue_type_script_lang_js_validator = function validator(val) {
         var date = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
         var visible = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
 
-        console.log('🚀🚀🚀🚀🚀🚀🚀 ~ date:', date);
         _this2.userInput = null;
         _this2.pickerVisible = _this2.picker.visible = visible;
         _this2.emitInput(date);
@@ -1344,9 +1342,7 @@ var pickervue_type_script_lang_js_validator = function validator(val) {
       }
     },
     emitChange: function emitChange(val) {
-      console.log('🚀 ~ val:', val);
       // determine user real change only
-      console.log('🚀 ~ valueEquals(val, this.valueOnOpen):', valueEquals(val, this.valueOnOpen));
       if (!valueEquals(val, this.valueOnOpen)) {
         this.$emit('change', val);
         this.valueOnOpen = val;
@@ -1398,8 +1394,8 @@ var component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var picker = (component.exports);
-// CONCATENATED MODULE: ./node_modules/.store/vue-loader@15.11.1/node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/.store/vue-loader@15.11.1/node_modules/vue-loader/lib??vue-loader-options!./packages/super-date/src/panel/date-range.vue?vue&type=template&id=184ddbf5
-var date_rangevue_type_template_id_184ddbf5_render = function () {
+// CONCATENATED MODULE: ./node_modules/.store/vue-loader@15.11.1/node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/.store/vue-loader@15.11.1/node_modules/vue-loader/lib??vue-loader-options!./packages/super-date/src/panel/date-range.vue?vue&type=template&id=2936a8ba
+var date_rangevue_type_template_id_2936a8ba_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -2108,11 +2104,11 @@ var date_rangevue_type_template_id_184ddbf5_render = function () {
     ]
   )
 }
-var date_rangevue_type_template_id_184ddbf5_staticRenderFns = []
-date_rangevue_type_template_id_184ddbf5_render._withStripped = true
+var date_rangevue_type_template_id_2936a8ba_staticRenderFns = []
+date_rangevue_type_template_id_2936a8ba_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/super-date/src/panel/date-range.vue?vue&type=template&id=184ddbf5
+// CONCATENATED MODULE: ./packages/super-date/src/panel/date-range.vue?vue&type=template&id=2936a8ba
 
 // EXTERNAL MODULE: external "bi-eleme/lib/mixins/locale"
 var locale_ = __webpack_require__(6);
@@ -4235,7 +4231,7 @@ var date_rangevue_type_script_lang_js_calcDefaultValue = function calcDefaultVal
     }, _ref['timeUserInput'] = {
       min: null,
       max: null
-    }, _ref.dynamicRange = [0, 0], _ref.dynamicTypeLeft = 'past', _ref.dynamicTypeRight = 'past', _ref.selectableDays = [], _ref.needTime = false, _ref;
+    }, _ref.dynamicRange = [0, 0], _ref.dynamicTypeLeft = 'past', _ref.dynamicTypeRight = 'past', _ref.selectableDays = [], _ref.selectableDynamicDays = [], _ref.needTime = false, _ref;
   },
 
 
@@ -4345,12 +4341,17 @@ var date_rangevue_type_script_lang_js_calcDefaultValue = function calcDefaultVal
       return daysDiff > this.selectableDays[0] || daysDiff < this.selectableDays[1];
     },
     dynamicDisabledDate: function dynamicDisabledDate(time) {
-      return Object(date_util_["getDaysDiff"])(time) < 3;
+      if (!Array.isArray(this.selectableDynamicDays) || this.selectableDynamicDays.length !== 2 || !this.selectableDynamicDays.every(function (v) {
+        return typeof v === 'number';
+      })) {
+        return false;
+      }
+      var daysDiff = Object(date_util_["getDaysDiff"])(time);
+      return daysDiff > this.selectableDynamicDays[0] || daysDiff < this.selectableDynamicDays[1];
     },
     initDate: function initDate() {
       var newVal = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.value;
 
-      console.log('🚀 ~ newVal:', newVal);
       try {
         if (!newVal) {
           this.minDate = null;
@@ -4400,18 +4401,15 @@ var date_rangevue_type_script_lang_js_calcDefaultValue = function calcDefaultVal
           } else if (this.panelType === 'dynamic' && Array.isArray(dynamicRange) && dynamicRange.length === 2) {
             this.dynamicRange = Array.from(dynamicRange);
             if (typeof dynamicRange[0] === 'string') {
-              console.log('用了defaultTime');
               this.dynamicTypeLeft = 'specific';
               this.dynamicValue = Object(date_util_["modifyWithTimeString"])(new Date(dynamicRange[0]), this.defaultTime[0]);
 
               this.minDate = Object(date_util_["modifyWithTimeString"])(new Date(dynamicRange[0]), this.defaultTime[0]);
             } else {
-              console.log('用了defaultTime');
               this.dynamicTypeLeft = 'past';
               this.dynamicValue = Object(date_util_["modifyWithTimeString"])(Object(date_util_["setDaysDiff"])(new Date(), this.dynamicRange[0]), this.defaultTime[0]);
               this.minDate = Object(date_util_["modifyWithTimeString"])(Object(date_util_["setDaysDiff"])(new Date(), this.dynamicRange[0]), this.defaultTime[0]);
             }
-            console.log('用了defaultTime');
             this.handleDynamicRange(this.dynamicRange[1]);
             this.dynamicDate = Object(date_util_["formatDate"])(this.dynamicValue, 'yyyy-MM-dd');
             this.maxDate = Object(date_util_["modifyWithTimeString"])(Object(date_util_["setDaysDiff"])(new Date(), this.dynamicRange[1]), this.defaultTime[1]);
@@ -4525,7 +4523,6 @@ var date_rangevue_type_script_lang_js_calcDefaultValue = function calcDefaultVal
       }
     },
     handleTimeChange: function handleTimeChange(value, type) {
-      console.log('🚀 ~ value:', value);
       var parsedValue = Object(date_util_["parseDate"])(value, this.timeFormat);
       if (parsedValue) {
         if (type === 'min') {
@@ -4756,8 +4753,8 @@ var date_rangevue_type_script_lang_js_calcDefaultValue = function calcDefaultVal
 
 var date_range_component = Object(componentNormalizer["a" /* default */])(
   panel_date_rangevue_type_script_lang_js,
-  date_rangevue_type_template_id_184ddbf5_render,
-  date_rangevue_type_template_id_184ddbf5_staticRenderFns,
+  date_rangevue_type_template_id_2936a8ba_render,
+  date_rangevue_type_template_id_2936a8ba_staticRenderFns,
   false,
   null,
   null,
@@ -4768,7 +4765,6 @@ var date_range_component = Object(componentNormalizer["a" /* default */])(
 /* harmony default export */ var date_range = (date_range_component.exports);
 // CONCATENATED MODULE: ./packages/super-date/src/picker/date-picker.js
 
-console.log('🚀 ~ Picker:', picker);
 
 
 /* harmony default export */ var date_picker = ({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bi-eleme",
-  "version": "2.4.2",
+  "version": "2.4.4",
   "description": "A Component Library for Vue.js.from element-ui@2.15.10",
   "main": "lib/element-ui.common.js",
   "files": [

package/packages/super-date/src/panel/date-range.vue

@@ -504,6 +504,7 @@ export default {
       dynamicTypeLeft: 'past', // specific | past
       dynamicTypeRight: 'past', // today | yesterday | past
       selectableDays: [],
+      selectableDynamicDays: [],
       needTime: false
     }
   },
@@ -604,10 +605,13 @@ export default {
       return daysDiff > this.selectableDays[0] || daysDiff < this.selectableDays[1]
     },
     dynamicDisabledDate(time) {
-      return getDaysDiff(time) < 3
+      if (!Array.isArray(this.selectableDynamicDays) || this.selectableDynamicDays.length !== 2 || !this.selectableDynamicDays.every((v) => typeof v === 'number')) {
+        return false
+      }
+      const daysDiff = getDaysDiff(time)
+      return daysDiff > this.selectableDynamicDays[0] || daysDiff < this.selectableDynamicDays[1]
     },
     initDate(newVal = this.value) {
-      console.log('🚀 ~ newVal:', newVal)
       try {
         if (!newVal) {
           this.minDate = null
@@ -652,18 +656,15 @@ export default {
           } else if (this.panelType === 'dynamic' && Array.isArray(dynamicRange) && dynamicRange.length === 2) {
             this.dynamicRange = Array.from(dynamicRange)
             if (typeof dynamicRange[0] === 'string') {
-              console.log('用了defaultTime')
               this.dynamicTypeLeft = 'specific'
               this.dynamicValue = modifyWithTimeString(new Date(dynamicRange[0]), this.defaultTime[0])
 
               this.minDate = modifyWithTimeString(new Date(dynamicRange[0]), this.defaultTime[0])
             } else {
-              console.log('用了defaultTime')
               this.dynamicTypeLeft = 'past'
               this.dynamicValue = modifyWithTimeString(setDaysDiff(new Date(), this.dynamicRange[0]), this.defaultTime[0])
               this.minDate = modifyWithTimeString(setDaysDiff(new Date(), this.dynamicRange[0]), this.defaultTime[0])
             }
-            console.log('用了defaultTime')
             this.handleDynamicRange(this.dynamicRange[1])
             this.dynamicDate = formatDate(this.dynamicValue, 'yyyy-MM-dd')
             this.maxDate = modifyWithTimeString(setDaysDiff(new Date(), this.dynamicRange[1]), this.defaultTime[1])
@@ -776,7 +777,6 @@ export default {
     },
 
     handleTimeChange(value, type) {
-      console.log('🚀 ~ value:', value)
       const parsedValue = parseDate(value, this.timeFormat)
       if (parsedValue) {
         if (type === 'min') {

package/packages/super-date/src/picker/date-picker.js

@@ -1,5 +1,4 @@
 import Picker from '../picker'
-console.log('🚀 ~ Picker:', Picker)
 import DateRangePanel from '../panel/date-range'
 
 export default {

package/packages/super-date/src/picker.vue

@@ -370,6 +370,10 @@ export default {
       type: Array,
       default: () => []
     },
+    selectableDynamicDays: {
+      type: Array,
+      default: () => []
+    },
     needTime: Boolean
   },
 
@@ -391,7 +395,6 @@ export default {
 
   watch: {
     pickerVisible(val) {
-      console.log('🚀 ~ val:', val)
       if (this.readonly || this.pickerDisabled) return
       if (val) {
         this.showPicker()
@@ -413,7 +416,6 @@ export default {
       handler(val) {
         if (this.picker) {
           this.picker.value = this.mergeDateAndTime(this.value)
-          console.log('🚀 ~ this.mergeDateAndTime(this.value):', this.mergeDateAndTime(this.value).date)
         }
       }
     },
@@ -437,7 +439,6 @@ export default {
 
   computed: {
     returnedValue() {
-      console.log('🚀 ~ returnedValue:')
       const formattedValue = formatAsFormatAndType(this.parsedValue, this.format, this.type, this.rangeSeparator)
 
       // 分离日期和时间
@@ -650,7 +651,6 @@ export default {
     },
 
     blur() {
-      console.log('blur')
       this.refInput.forEach((input) => input.blur())
     },
 
@@ -696,7 +696,6 @@ export default {
         const value = this.parseString(this.displayValue)
         if (value) {
           this.picker.value = value
-          console.log('🚀 ~ value:', value)
           if (this.isValidValue(value)) {
             this.emitInput(value)
             this.userInput = null
@@ -732,7 +731,6 @@ export default {
         this.userInput = [this.formatToString(value), this.displayValue[1]]
         const newValue = [value, this.picker.value && this.picker.value[1]]
         this.picker.value = newValue
-        console.log('🚀 ~ newValue:', newValue)
         if (this.isValidValue(newValue)) {
           this.emitInput(newValue)
           this.userInput = null
@@ -746,7 +744,6 @@ export default {
         this.userInput = [this.displayValue[0], this.formatToString(value)]
         const newValue = [this.picker.value && this.picker.value[0], value]
         this.picker.value = newValue
-        console.log('🚀 ~ newValue:', newValue)
         if (this.isValidValue(newValue)) {
           this.emitInput(newValue)
           this.userInput = null
@@ -818,11 +815,11 @@ export default {
       }
       this.pickerVisible = this.picker.visible = true
       this.picker.selectableDays = this.selectableDays
+      this.picker.selectableDynamicDays = this.selectableDynamicDays
       this.updatePopper()
 
       // 转换parsedValue为包含date、time、type和dynamicRange字段的对象格式
       this.picker.value = this.mergeDateAndTime(this.value)
-      console.log('🚀 ~ this.mergeDateAndTime(this.value):', this.mergeDateAndTime(this.value))
       this.picker.resetView && this.picker.resetView()
 
       this.$nextTick(() => {
@@ -885,7 +882,6 @@ export default {
 
       this.picker.$on('dodestroy', this.doDestroy)
       this.picker.$on('pick', (date = '', visible = false) => {
-        console.log('🚀🚀🚀🚀🚀🚀🚀 ~ date:', date)
         this.userInput = null
         this.pickerVisible = this.picker.visible = visible
         this.emitInput(date)
@@ -921,9 +917,7 @@ export default {
     },
 
     emitChange(val) {
-      console.log('🚀 ~ val:', val)
       // determine user real change only
-      console.log('🚀 ~ valueEquals(val, this.valueOnOpen):', valueEquals(val, this.valueOnOpen))
       if (!valueEquals(val, this.valueOnOpen)) {
         this.$emit('change', val)
         this.valueOnOpen = val

package/src/index.js

@@ -212,7 +212,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '2.4.2',
+  version: '2.4.4',
   locale: locale.use,
   i18n: locale.i18n,
   install,