mali-ui-plus 1.0.122 → 1.0.124

package/lib/mali-ui-plus.common.js

@@ -10669,7 +10669,7 @@ var GlobalConfig = {
 ;// CONCATENATED MODULE: ./node_modules/vxe-table/es/tools/log.js
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("4.4.2-beta.8", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("4.4.4", "] ").concat(conf.i18n(message, params));
 }
 function outLog(type) {
   return function (message, params) {
@@ -10874,7 +10874,7 @@ var ColumnInfo = /** @class */function () {
     return this.field || (this.type ? "type=".concat(this.type) : null);
   };
   ColumnInfo.prototype.update = function (name, value) {
-    // 不支持双向的属性
+    // 不支持直接修改的属性
     if (name !== 'filters') {
       if (name === 'field') {
         // 兼容旧属性
@@ -11233,12 +11233,20 @@ function isColumnInfo(column) {
 function createColumn($xetable, options, renderOptions) {
   return isColumnInfo(options) ? options : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.reactive)(new ColumnInfo($xetable, options, renderOptions));
 }
-function watchColumn(props, column) {
+function watchColumn($xetable, props, column) {
   Object.keys(props).forEach(function (name) {
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(function () {
       return props[name];
     }, function (value) {
       column.update(name, value);
+      if ($xetable) {
+        if (name === 'filters') {
+          $xetable.setFilter(column, value);
+          $xetable.handleUpdateDataQueue();
+        } else if (['visible', 'fixed', 'width', 'minWidth', 'maxWidth'].includes(name)) {
+          $xetable.handleRefreshColumnQueue();
+        }
+      }
     });
   });
 }
@@ -12270,7 +12278,7 @@ var config = new VXETableConfig();
 var v = 'v4';
 var VXETable = {
   v: v,
-  version: "4.4.2-beta.8",
+  version: "4.4.4",
   setup: setup,
   interceptor: interceptor,
   renderer: renderer,
@@ -12746,8 +12754,8 @@ var tableFilterHook = {
        */
       setFilter: function (fieldOrColumn, options) {
         var column = handleFieldOrColumn($xetable, fieldOrColumn);
-        if (column && column.filters && options) {
-          column.filters = toFilters(options);
+        if (column && column.filters) {
+          column.filters = toFilters(options || []);
         }
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
       },
@@ -22627,7 +22635,15 @@ var validatorHook = {
                   }
                 } else {
                   var isArrType = type === 'array';
-                  var hasEmpty = isArrType || xe_utils_default().isArray(cellValue_1) ? !xe_utils_default().isArray(cellValue_1) || !cellValue_1.length : eqEmptyValue(cellValue_1);
+                  var isArrVal = xe_utils_default().isArray(cellValue_1);
+                  var hasEmpty = true;
+                  if (isArrType || isArrVal) {
+                    hasEmpty = !isArrVal || !cellValue_1.length;
+                  } else if (xe_utils_default().isString(cellValue_1)) {
+                    hasEmpty = eqEmptyValue(cellValue_1.trim());
+                  } else {
+                    hasEmpty = eqEmptyValue(cellValue_1);
+                  }
                   if (required ? hasEmpty || validErrorRuleValue(rule, cellValue_1) : !hasEmpty && validErrorRuleValue(rule, cellValue_1)) {
                     validRuleErr = true;
                     errorRules.push(new Rule(rule));
@@ -23736,7 +23752,7 @@ var columnProps = {
     var column = cell.createColumn($xetable, props);
     column.slots = slots;
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.provide)('$xegrid', null);
-    watchColumn(props, column);
+    watchColumn($xetable, props, column);
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.onMounted)(function () {
       assemColumn($xetable, refElem.value, column, colgroup);
     });
@@ -23791,7 +23807,7 @@ dynamicApp.component('VxeTableColumn', column);
     column.children = [];
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.provide)('xecolgroup', xecolumn);
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.provide)('$xegrid', null);
-    watchColumn(props, column);
+    watchColumn($xetable, props, column);
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.onMounted)(function () {
       assemColumn($xetable, refElem.value, column, colgroup);
     });
@@ -28529,7 +28545,15 @@ function getResetValue(value, resetValue) {
                 }
               } else {
                 var isArrType = type === 'array';
-                var hasEmpty = isArrType || xe_utils_default().isArray(itemValue_1) ? !xe_utils_default().isArray(itemValue_1) || !itemValue_1.length : eqEmptyValue(itemValue_1);
+                var isArrVal = xe_utils_default().isArray(itemValue_1);
+                var hasEmpty = true;
+                if (isArrType || isArrVal) {
+                  hasEmpty = !isArrVal || !itemValue_1.length;
+                } else if (xe_utils_default().isString(itemValue_1)) {
+                  hasEmpty = eqEmptyValue(itemValue_1.trim());
+                } else {
+                  hasEmpty = eqEmptyValue(itemValue_1);
+                }
                 if (required ? hasEmpty || validErrorRuleValue(rule, itemValue_1) : !hasEmpty && validErrorRuleValue(rule, itemValue_1)) {
                   errorRules.push(new form_Rule(rule));
                 }
@@ -32111,6 +32135,10 @@ var orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
       mergeList: [],
       // 合并表尾数据的对象集
       mergeFooterList: [],
+      // 刷新列标识，当列筛选被改变时，触发表格刷新数据
+      upDataFlag: 0,
+      // 刷新列标识，当列的特定属性被改变时，触发表格刷新列
+      reColumnFlag: 0,
       // 初始化标识
       initStore: {
         filter: false,
@@ -33581,7 +33609,7 @@ var orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
             var emptyBlockElem = emptyBlockRef ? emptyBlockRef.value : null;
             if (isNodeElement(wrapperElem)) {
               if (customMaxHeight) {
-                wrapperElem.style.maxHeight = "".concat(fixedType ? customMaxHeight - headerHeight - (showFooter ? 0 : scrollbarHeight) : customMaxHeight - headerHeight, "px");
+                wrapperElem.style.maxHeight = "".concat(fixedType ? customMaxHeight - headerHeight - (showFooter ? 0 : scrollbarHeight) : customMaxHeight - headerHeight - footerHeight, "px");
               } else {
                 if (customHeight > 0) {
                   wrapperElem.style.height = "".concat(fixedType ? (customHeight > 0 ? customHeight - headerHeight - footerHeight : tableHeight) - (showFooter ? 0 : scrollbarHeight) : customHeight - headerHeight - footerHeight, "px");
@@ -37318,6 +37346,12 @@ var orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
         tablePrivateMethods.analyColumnWidth();
         return tableMethods.refreshColumn();
       },
+      handleUpdateDataQueue: function () {
+        reactData.upDataFlag++;
+      },
+      handleRefreshColumnQueue: function () {
+        reactData.reColumnFlag++;
+      },
       preventEvent: function (evnt, type, args, next, end) {
         var evntList = VXETable.interceptor.get(type);
         var rest;
@@ -38378,6 +38412,20 @@ var orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(tableColumnFlag, function () {
       tablePrivateMethods.analyColumnWidth();
     });
+    (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(function () {
+      return reactData.upDataFlag;
+    }, function () {
+      (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(function () {
+        tableMethods.updateData();
+      });
+    });
+    (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(function () {
+      return reactData.reColumnFlag;
+    }, function () {
+      (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(function () {
+        tableMethods.refreshColumn();
+      });
+    });
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(function () {
       return props.showHeader;
     }, function () {
@@ -42051,6 +42099,9 @@ const MlWeekPickervue_type_script_lang_ts_setup_true_hoisted_1 = {
 const MlWeekPicker_exports_ = MlWeekPickervue_type_script_lang_ts_setup_true;
 
 /* harmony default export */ var MlWeekPicker = (MlWeekPicker_exports_);
+// EXTERNAL MODULE: ./node_modules/dayjs/dayjs.min.js
+var dayjs_min = __webpack_require__(5743);
+var dayjs_min_default = /*#__PURE__*/__webpack_require__.n(dayjs_min);
 ;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js!./node_modules/ts-loader/index.js??clonedRuleSet-41.use[2]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./components/ml-date-range-picker/MlDateRangePicker.vue?vue&type=script&lang=ts&setup=true
 
 
@@ -42061,6 +42112,7 @@ const MlDateRangePickervue_type_script_lang_ts_setup_true_hoisted_1 = {
 
 
 
+
 /* harmony default export */ var MlDateRangePickervue_type_script_lang_ts_setup_true = (/*#__PURE__*/(0,external_commonjs_vue_commonjs2_vue_root_Vue_.defineComponent)({
   __name: 'MlDateRangePicker',
   props: {
@@ -42095,6 +42147,10 @@ const MlDateRangePickervue_type_script_lang_ts_setup_true_hoisted_1 = {
       type: Boolean,
       default: false
     },
+    shortcuts: {
+      type: Boolean,
+      default: true
+    },
     readonly: {
       type: Boolean,
       default: null
@@ -42113,12 +42169,70 @@ const MlDateRangePickervue_type_script_lang_ts_setup_true_hoisted_1 = {
     const $xeformiteminfo = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.inject)('$xeformiteminfo', null);
     const mlForm = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.inject)('mlForm', null);
     const selectVals = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)([]);
+    const currDate = xe_utils_default().toStringDate(xe_utils_default().toDateString(Date.now(), 'yyyy-MM-dd'));
+    const defaultShortcuts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)([{
+      text: '昨日',
+      onClick(picker) {
+        picker.emit('pick', [dayjs_min_default()(xe_utils_default().getWhatDay(currDate, -1)), dayjs_min_default()(xe_utils_default().getWhatDay(currDate, -1))]);
+      }
+    }, {
+      text: '前日',
+      onClick(picker) {
+        picker.emit('pick', [dayjs_min_default()(xe_utils_default().getWhatDay(currDate, -2)), dayjs_min_default()(xe_utils_default().getWhatDay(currDate, -2))]);
+      }
+    }, {
+      text: '本周',
+      onClick(picker) {
+        picker.emit('pick', [dayjs_min_default()(xe_utils_default().getWhatWeek(currDate, 0, 0, 0)), dayjs_min_default()(xe_utils_default().getWhatWeek(currDate, 0, 6, 0))]);
+      }
+    }, {
+      text: '上周',
+      onClick(picker) {
+        picker.emit('pick', [dayjs_min_default()(xe_utils_default().getWhatWeek(currDate, -1, 0, 0)), dayjs_min_default()(xe_utils_default().getWhatWeek(currDate, -1, 6, 0))]);
+      }
+    }, {
+      text: '本月',
+      onClick(picker) {
+        picker.emit('pick', [dayjs_min_default()(xe_utils_default().getWhatMonth(currDate, 0, 'first')), dayjs_min_default()(xe_utils_default().getWhatMonth(currDate, 0, 'last'))]);
+      }
+    }, {
+      text: '上月',
+      onClick(picker) {
+        picker.emit('pick', [dayjs_min_default()(xe_utils_default().getWhatMonth(currDate, -1, 'first')), dayjs_min_default()(xe_utils_default().getWhatMonth(currDate, -1, 'last'))]);
+      }
+    }, {
+      text: '过去7天',
+      onClick(picker) {
+        picker.emit('pick', [dayjs_min_default()(xe_utils_default().getWhatDay(currDate, -7)), dayjs_min_default()(currDate)]);
+      }
+    }, {
+      text: '过去30天',
+      onClick(picker) {
+        picker.emit('pick', [dayjs_min_default()(xe_utils_default().getWhatDay(currDate, -30)), dayjs_min_default()(currDate)]);
+      }
+    }, {
+      text: '过去90天',
+      onClick(picker) {
+        picker.emit('pick', [dayjs_min_default()(xe_utils_default().getWhatDay(currDate, -90)), dayjs_min_default()(currDate)]);
+      }
+    }, {
+      text: '今年至今',
+      onClick(picker) {
+        picker.emit('pick', [dayjs_min_default()(xe_utils_default().getWhatYear(currDate, 0, 'first')), dayjs_min_default()(currDate)]);
+      }
+    }]);
     const isReadonly = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       if (props.readonly === null) {
         return $xeform ? $xeform.props.readonly : false;
       }
       return props.readonly;
     });
+    const shortcutOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
+      if (props.shortcuts) {
+        return defaultShortcuts;
+      }
+      return [];
+    });
     const selectLabel = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       if (isReadonly.value) {
         if (props.startDate && props.endDate) {
@@ -42198,10 +42312,11 @@ const MlDateRangePickervue_type_script_lang_ts_setup_true_hoisted_1 = {
         "range-separator": "至",
         "start-placeholder": __props.placeholder[0],
         "end-placeholder": __props.placeholder[1],
+        shortcuts: (0,external_commonjs_vue_commonjs2_vue_root_Vue_.unref)(shortcutOpts),
         disabled: __props.disabled,
         clearable: __props.clearable,
         onChange: changeEvent
-      }, null, 8, ["modelValue", "start-placeholder", "end-placeholder", "disabled", "clearable"]));
+      }, null, 8, ["modelValue", "start-placeholder", "end-placeholder", "shortcuts", "disabled", "clearable"]));
     };
   }
 }));
@@ -68600,7 +68715,11 @@ const MlTreevue_type_script_lang_ts_setup_true_hoisted_2 = {
       type: Array,
       default: () => []
     },
-    expandedKeys: {
+    expandedRowKeys: {
+      type: Array,
+      default: null
+    },
+    selectedRowKeys: {
       type: Array,
       default: null
     },
@@ -68608,7 +68727,7 @@ const MlTreevue_type_script_lang_ts_setup_true_hoisted_2 = {
     indeterminateToChecked: Boolean,
     nodeProps: Object
   },
-  emits: ["update:expandedKeys", "update:checkRowKeys", "checkbox-all", "checkbox-change", "select-change", "expand-change"],
+  emits: ["update:expandedRowKeys", "update:checkRowKeys", "checkbox-all", "checkbox-change", "select-change", "expand-change"],
   setup(__props, {
     expose,
     emit
@@ -68663,7 +68782,7 @@ const MlTreevue_type_script_lang_ts_setup_true_hoisted_2 = {
         });
       }
       expandRowKeys.value = keys;
-      emit('update:expandedKeys', keys);
+      emit('update:expandedRowKeys', keys);
     };
     const selectEvent = row => {
       emit('select-change', {
@@ -68673,13 +68792,13 @@ const MlTreevue_type_script_lang_ts_setup_true_hoisted_2 = {
       });
     };
     const expandEvent = row => {
-      const expandedKeys = [];
-      expandRowKeys.value = expandedKeys;
-      emit('update:expandedKeys', expandedKeys);
+      const keys = [];
+      expandRowKeys.value = keys;
+      emit('update:expandedRowKeys', keys);
       emit('expand-change', {
         row,
         expanded: [],
-        expandedKeys: []
+        expandedKeys: keys
       });
     };
     const checkAllEvent = () => {
@@ -68848,7 +68967,7 @@ const MlTreevue_type_script_lang_ts_setup_true_hoisted_2 = {
       checkedRowKeys.value = props.checkRowKeys;
       setCheckboxRowKeys(props.checkRowKeys);
     });
-    (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(() => props.expandedKeys, value => {
+    (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(() => props.expandedRowKeys, value => {
       expandRowKeys.value = value;
     });
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(() => props.data, () => {
@@ -68862,7 +68981,7 @@ const MlTreevue_type_script_lang_ts_setup_true_hoisted_2 = {
       if (props.expandAll) {
         setAllTreeExpand(true);
       } else {
-        expandRowKeys.value = props.expandedKeys;
+        expandRowKeys.value = props.expandedRowKeys;
       }
       selectRowKeys.value = props.checkRowKeys || [];
       checkedRowKeys.value = props.checkRowKeys || [];
@@ -75415,7 +75534,7 @@ function index_config(options) {
   return config_0;
 }
 const MaliUI = {
-  version: "1.0.121",
+  version: "1.0.123",
   install: index_install,
   config: index_config,
   renderer: index_esm.renderer,