ll-plus 2.3.19 → 2.3.20

package/index.full.js

@@ -765,6 +765,7 @@
     });
     return result;
   });
+  var stringToPath$1 = stringToPath;
 
   function toString(value) {
     return value == null ? "" : baseToString(value);
@@ -774,7 +775,7 @@
     if (isArray$1(value)) {
       return value;
     }
-    return isKey(value, object) ? [value] : stringToPath(toString(value));
+    return isKey(value, object) ? [value] : stringToPath$1(toString(value));
   }
 
   var INFINITY = 1 / 0;
@@ -1156,9 +1157,9 @@
   var nodeIsSet = nodeUtil && nodeUtil.isSet;
   var isSet = nodeIsSet ? baseUnary(nodeIsSet) : baseIsSet;
 
-  var CLONE_DEEP_FLAG$1 = 1;
+  var CLONE_DEEP_FLAG$2 = 1;
   var CLONE_FLAT_FLAG$1 = 2;
-  var CLONE_SYMBOLS_FLAG$1 = 4;
+  var CLONE_SYMBOLS_FLAG$2 = 4;
   var argsTag = "[object Arguments]";
   var arrayTag = "[object Array]";
   var boolTag$1 = "[object Boolean]";
@@ -1189,7 +1190,7 @@
   cloneableTags[argsTag] = cloneableTags[arrayTag] = cloneableTags[arrayBufferTag] = cloneableTags[dataViewTag] = cloneableTags[boolTag$1] = cloneableTags[dateTag] = cloneableTags[float32Tag] = cloneableTags[float64Tag] = cloneableTags[int8Tag] = cloneableTags[int16Tag] = cloneableTags[int32Tag] = cloneableTags[mapTag$1] = cloneableTags[numberTag] = cloneableTags[objectTag] = cloneableTags[regexpTag] = cloneableTags[setTag$1] = cloneableTags[stringTag] = cloneableTags[symbolTag] = cloneableTags[uint8Tag] = cloneableTags[uint8ClampedTag] = cloneableTags[uint16Tag] = cloneableTags[uint32Tag] = true;
   cloneableTags[errorTag] = cloneableTags[funcTag] = cloneableTags[weakMapTag] = false;
   function baseClone(value, bitmask, customizer, key, object, stack) {
-    var result, isDeep = bitmask & CLONE_DEEP_FLAG$1, isFlat = bitmask & CLONE_FLAT_FLAG$1, isFull = bitmask & CLONE_SYMBOLS_FLAG$1;
+    var result, isDeep = bitmask & CLONE_DEEP_FLAG$2, isFlat = bitmask & CLONE_FLAT_FLAG$1, isFull = bitmask & CLONE_SYMBOLS_FLAG$2;
     if (customizer) {
       result = object ? customizer(value, key, object, stack) : customizer(value);
     }
@@ -1249,6 +1250,12 @@
     return result;
   }
 
+  var CLONE_DEEP_FLAG$1 = 1;
+  var CLONE_SYMBOLS_FLAG$1 = 4;
+  function cloneDeep(value) {
+    return baseClone(value, CLONE_DEEP_FLAG$1 | CLONE_SYMBOLS_FLAG$1);
+  }
+
   function hasPath(object, path, hasFunc) {
     path = castPath(path, object);
     var index = -1, length = path.length, result = false;
@@ -1540,6 +1547,62 @@
     }
   }
 
+  const ALL_VALUE = "_ALL";
+  const initValue = (column, values) => {
+    let value = has(values, column.key) ? values[column.key] : null;
+    if (has(column, "options") && !column.unUseDefaultOption) {
+      if (column.type === "checkbox-group" || has(column, "mode")) {
+        value = isEmpty(value) || isNil(value) ? [ALL_VALUE] : value;
+      } else {
+        value = isNil(value) ? ALL_VALUE : value;
+      }
+    }
+    return value;
+  };
+  const filterAllValue = (values) => {
+    let value = null;
+    if (Array.isArray(values)) {
+      value = values.filter((item) => item !== ALL_VALUE);
+    } else {
+      value = values === ALL_VALUE ? null : values;
+    }
+    return value;
+  };
+  const treeDataFormat = (arr = [], fieldNames) => {
+    let options = [];
+    if (!arr)
+      return [];
+    options = arr.map((e) => {
+      const obj = {};
+      obj.label = e[fieldNames.label];
+      obj.value = e[fieldNames.value];
+      if (e[fieldNames.children] && e[fieldNames.children].length) {
+        obj.children = treeDataFormat(e[fieldNames.children], fieldNames);
+      }
+      return obj;
+    });
+    return options;
+  };
+  const findLabelByValue = (tree, value) => {
+    function _findLabel(nodes) {
+      const labels = [];
+      if (!nodes)
+        return [];
+      for (const node of nodes) {
+        if (node.value === value) {
+          labels.push(node.label);
+        }
+        if (node.children && node.children.length > 0) {
+          const childLabels = _findLabel(node.children);
+          if (childLabels) {
+            labels.push(...childLabels);
+          }
+        }
+      }
+      return labels.length > 0 ? labels : [];
+    }
+    return _findLabel(tree).join(",");
+  };
   const advancedFilteringProps = buildProps({
     filterColumns: {
       type: definePropType(Array),
@@ -1585,7 +1648,8 @@
   const advancedFilteringParamsEmits = {
     close: () => true,
     confirm: () => true,
-    changeValue: (value) => !!value
+    changeValue: (value) => !!value,
+    "update:value": (value) => !!value
   };
   const advancedFilteringTagsEmits = {
     change: (value) => !!value,
@@ -1611,7 +1675,25 @@
       const props = __props;
       const emits = __emit;
       const bem = createNamespace("advanced-filtering-params");
-      const key = require$$0.ref(0);
+      const innerValue = require$$0.ref({});
+      const computeFormColumns = require$$0.computed(() => {
+        return props.filterColumns.map((column) => {
+          if (has(column, "options")) {
+            if (column.options.length && column.options[0].value === ALL_VALUE || column.unUseDefaultOption) {
+              console.log({ column });
+              return column;
+            }
+            column.options = [
+              {
+                label: column?.defaultOptionLabel ?? "\u5168\u90E8",
+                value: ALL_VALUE
+              },
+              ...column.options
+            ];
+          }
+          return column;
+        });
+      });
       const handleClose = () => {
         emits("close");
       };
@@ -1619,12 +1701,47 @@
         emits("confirm");
       };
       const handleChange = (val) => {
-        emits("changeValue", val);
+        setData(val);
+      };
+      const setData = (val) => {
+        const value = cloneDeep(val);
+        const obj = {};
+        for (const i in value) {
+          obj[i] = filterAllValue(value[i]);
+        }
+        emits("update:value", obj);
+        emits("changeValue", obj);
       };
       require$$0.watch(
         () => props.value,
-        () => {
-          key.value++;
+        (val) => {
+          const value = cloneDeep(val);
+          const cloneInnerValue = cloneDeep(innerValue.value);
+          const obj = {};
+          computeFormColumns.value.forEach((item) => {
+            obj[item.key] = initValue(item, value);
+          });
+          const comparedObj = {};
+          computeFormColumns.value.forEach((item) => {
+            comparedObj[item.key] = initValue(item, cloneInnerValue);
+          });
+          if (JSON.stringify(obj) !== JSON.stringify(comparedObj)) {
+            innerValue.value = cloneDeep(obj);
+          }
+        },
+        {
+          deep: true,
+          immediate: true
+        }
+      );
+      require$$0.watch(
+        () => innerValue.value,
+        (val) => {
+          setData(val);
+        },
+        {
+          deep: true,
+          immediate: true
         }
       );
       return (_ctx, _cache) => {
@@ -1653,13 +1770,12 @@
                 class: require$$0.normalizeClass(require$$0.unref(bem).m("content"))
               },
               [
-                props.filterColumns.length > 0 ? (require$$0.openBlock(), require$$0.createBlock(require$$0.unref(LlForm), {
-                  key: key.value,
-                  "form-columns": props.filterColumns,
+                props.filterColumns.length > 0 ? (require$$0.openBlock(), require$$0.createBlock(require$$0.unref(LlForm), require$$0.mergeProps({ key: 0 }, _ctx.$attrs, {
+                  "form-columns": computeFormColumns.value,
                   "form-options": props.formOptions,
-                  "form-data": props.value,
+                  "form-data": innerValue.value,
                   onChange: handleChange
-                }, null, 8, ["form-columns", "form-options", "form-data"])) : (require$$0.openBlock(), require$$0.createElementBlock(
+                }), null, 16, ["form-columns", "form-options", "form-data"])) : (require$$0.openBlock(), require$$0.createElementBlock(
                   "div",
                   {
                     key: 1,
@@ -2089,45 +2205,11 @@
         emits("update:value", obj);
         emits("change", obj);
       };
-      const treeDataFormat = (arr = [], fieldNames) => {
-        let options = [];
-        if (!arr)
-          return [];
-        options = arr.map((e) => {
-          const obj = {};
-          obj.label = e[fieldNames.label];
-          obj.value = e[fieldNames.value];
-          if (e[fieldNames.children] && e[fieldNames.children].length) {
-            obj.children = treeDataFormat(e[fieldNames.children], fieldNames);
-          }
-          return obj;
-        });
-        return options;
-      };
-      const findLabelByValue = (tree, value) => {
-        function _findLabel(nodes) {
-          const labels = [];
-          if (!nodes)
-            return [];
-          for (const node of nodes) {
-            if (node.value === value) {
-              labels.push(node.label);
-            }
-            if (node.children && node.children.length > 0) {
-              const childLabels = _findLabel(node.children);
-              if (childLabels) {
-                labels.push(...childLabels);
-              }
-            }
-          }
-          return labels.length > 0 ? labels : [];
-        }
-        return _findLabel(tree).join(",");
-      };
-      const getTags = (filterColumns, value) => {
+      const getTags = (filterColumns, values) => {
         const arr = [];
         filterColumns.map((item) => {
-          if (!isNil(value[item.key])) {
+          const value = filterAllValue(values[item.key]);
+          if (!isNil(value)) {
             let tagValue = "";
             if (item?.options) {
               let options = [];
@@ -2136,47 +2218,53 @@
               } else {
                 options = item.options;
               }
-              if (Array.isArray(value[item.key])) {
+              if (Array.isArray(value)) {
                 let tagArr = [];
-                tagArr = value[item.key].map((val) => {
+                tagArr = value.map((val) => {
                   return findLabelByValue(options, val);
                 });
                 tagValue = tagArr.join(",");
               } else {
-                tagValue = findLabelByValue(options, value[item.key]);
+                tagValue = findLabelByValue(options, value);
               }
             } else {
-              tagValue = value[item.key];
+              tagValue = value;
             }
             if (item.type === "date-picker") {
-              tagValue = dayjs(value[item.key]).format(item?.format ?? "YYYY-MM-DD");
+              tagValue = dayjs(value).format(item?.format ?? "YYYY-MM-DD");
             }
             if (item.type === "time-picker") {
-              tagValue = dayjs(value[item.key]).format(
-                item?.format ?? "YYYY/MM/DD hh:mm:ss"
-              );
+              tagValue = dayjs(value).format(item?.format ?? "YYYY/MM/DD hh:mm:ss");
             }
             if (item.type === "date-range") {
-              tagValue = `${dayjs(value[item.key][0]).format(
+              tagValue = `${dayjs(value[0]).format(
               item?.format ?? "YYYY-MM-DD"
-            )}-${dayjs(value[item.key][1]).format(item?.format ?? "YYYY-MM-DD")}`;
+            )}-${dayjs(value[1]).format(item?.format ?? "YYYY-MM-DD")}`;
             }
             if (item.type === "number-range") {
-              tagValue = `${value[item.key][0]}${value[item.key][1] ? `-${value[item.key][1]}` : ""}`;
+              tagValue = `${value[0]}${value[1] ? `-${value[1]}` : ""}`;
             }
-            if (item.type === "time-picker") {
-              tagValue = `${dayjs(value[item.key][0]).format(
+            if (item.type === "time-range") {
+              tagValue = `${dayjs(value[0]).format(
               item?.format ?? "YYYY/MM/DD HH:mm:ss"
-            )}-${dayjs(value[item.key][1]).format(
-              item?.format ?? "YYYY/MM/DD HH:mm:ss"
-            )}`;
+            )}-${dayjs(value[1]).format(item?.format ?? "YYYY/MM/DD HH:mm:ss")}`;
+            }
+            if (item.type === "switch") {
+              if (has(item, "checkedChildren") && has(item, "checkedValue") && has(item, "unCheckedChildren") && has(item, "unCheckedValue")) {
+                tagValue = value === item.checkedValue ? item.checkedChildren : item.unCheckedChildren;
+              }
+              if (has(item, "checkedChildren") && !has(item, "checkedValue")) {
+                tagValue = value ? item.checkedChildren : false;
+              }
+            }
+            if (tagValue) {
+              arr.push({
+                label: item.label || "",
+                key: item.key,
+                value,
+                showValue: tagValue
+              });
             }
-            arr.push({
-              label: item.label || "",
-              key: item.key,
-              value: value[item.key],
-              showValue: tagValue
-            });
           }
         });
         return arr;
@@ -2320,8 +2408,9 @@
       require$$0.watch(
         filterValue,
         (n) => {
-          emits("update:value", n);
-          emits("change", n);
+          const value = filterAllValue(n);
+          emits("update:value", value);
+          emits("change", value);
         },
         {
           deep: true
@@ -57272,6 +57361,18 @@
           deep: true
         }
       );
+      require$$0.watch(
+        () => props.formData,
+        async (val) => {
+          for (const i in val) {
+            formData[i] = val[i];
+          }
+        },
+        {
+          deep: true,
+          immediate: true
+        }
+      );
       __expose({
         validate,
         resetFields
@@ -59211,7 +59312,7 @@
 
   const numberRangeProps = buildProps({
     value: {
-      type: definePropType(Array),
+      type: definePropType([Array, null]),
       default: () => []
     },
     min: Number,
@@ -59242,18 +59343,18 @@
       const props = __props;
       const emits = __emit;
       const bem = createNamespace("number-range");
-      const minValue = require$$0.ref(null);
-      const maxValue = require$$0.ref(null);
+      const minValue = require$$0.ref(void 0);
+      const maxValue = require$$0.ref(void 0);
       const setValue = () => {
         const arr = [minValue.value, maxValue.value];
-        emits("change", arr);
         emits("update:value", arr);
+        emits("change", arr);
       };
       const handleMinChange = (e) => {
         if (!!e || e.value === 0) {
           minValue.value = e;
         } else {
-          minValue.value = null;
+          minValue.value = void 0;
         }
         setValue();
       };
@@ -59261,7 +59362,7 @@
         if (!!e || e.value === 0) {
           maxValue.value = e;
         } else {
-          minValue.value = null;
+          minValue.value = void 0;
         }
         setValue();
       };
@@ -59288,14 +59389,21 @@
             if (n[0] || n[0] === 0) {
               minValue.value = n[0];
             } else {
-              minValue.value = null;
+              minValue.value = void 0;
             }
             if (n[1] || n[1] === 0) {
               maxValue.value = n[1];
             } else {
-              maxValue.value = null;
+              maxValue.value = void 0;
             }
+          } else {
+            minValue.value = void 0;
+            maxValue.value = void 0;
           }
+        },
+        {
+          immediate: true,
+          deep: true
         }
       );
       return (_ctx, _cache) => {
@@ -77321,6 +77429,7 @@
 
   const install = installer.install;
 
+  exports.ALL_VALUE = ALL_VALUE;
   exports.DEFAULT_METHOD = DEFAULT_METHOD;
   exports.DEFAULT_TYPE = DEFAULT_TYPE;
   exports.HEADER_SRARCH_HEIGHT = HEADER_SRARCH_HEIGHT;
@@ -77433,6 +77542,8 @@
   exports.easyCronEmits = easyCronEmits;
   exports.easyCronProps = easyCronProps;
   exports.emptyProps = emptyProps;
+  exports.filterAllValue = filterAllValue;
+  exports.findLabelByValue = findLabelByValue;
   exports.formColumns = formColumns;
   exports.formComponentProps = formComponentProps;
   exports.formEmits = formEmits;
@@ -77453,6 +77564,7 @@
   exports.iconPickerSearchProps = iconPickerSearchProps;
   exports.iconProps = iconProps;
   exports.iconTypes = iconTypes;
+  exports.initValue = initValue;
   exports.inputNumberEmits = inputNumberEmits;
   exports.inputNumberProps = inputNumberProps;
   exports.inputProps = inputProps;
@@ -77506,6 +77618,7 @@
   exports.tagGroupEmits = tagGroupEmits;
   exports.tagGroupProps = tagGroupProps;
   exports.tooltipProps = tooltipProps;
+  exports.treeDataFormat = treeDataFormat;
   exports.treeEmits = treeEmits;
   exports.treeProps = treeProps;
   exports.treeSearchEmits = treeSearchEmits;