ll-plus 2.7.15 → 2.7.17

package/index.full.js

@@ -1967,6 +1967,43 @@
     return currentObj;
   };
 
+  function deepCompare(obj1, obj2) {
+    const stack = [[obj1, obj2]];
+    while (stack.length) {
+      const [a, b] = stack.pop();
+      if (a === b)
+        continue;
+      if (typeof a !== "object" || a === null || typeof b !== "object" || b === null) {
+        return false;
+      }
+      const keysA = Object.keys(a);
+      const keysB = Object.keys(b);
+      if (keysA.length !== keysB.length) {
+        return false;
+      }
+      if (keysA.length === 0 && keysB.length === 0) {
+        continue;
+      }
+      for (const key of keysA) {
+        if (!keysB.includes(key)) {
+          return false;
+        }
+        stack.push([a[key], b[key]]);
+      }
+    }
+    return true;
+  }
+  const hasValue = (value) => {
+    return Array.isArray(value) ? value.length > 0 : !isNull(value) && !isUndefined$3(value) && value !== "";
+  };
+  const guid = () => {
+    return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(c) {
+      const r = Math.random() * 16 | 0;
+      const v = c === "x" ? r : r & 3 | 8;
+      return v.toString(16);
+    });
+  };
+
   const ALL_VALUE = "_ALL";
   const initValue = (columns, values) => {
     const copyValues = {};
@@ -2032,9 +2069,6 @@
     }
     return _findLabel(tree).join(",");
   };
-  const hasValue = (value) => {
-    return Array.isArray(value) ? value.length > 0 : !isNull(value) && !isUndefined$3(value) && value !== "";
-  };
   const advancedFilteringProps = buildProps({
     filterColumns: {
       type: definePropType(Array),
@@ -63361,7 +63395,9 @@
       const bem = createNamespace("form");
       const formData = require$$0.reactive(props.formData);
       const formRef = require$$0.ref();
-      const formComponents = require$$0.ref([]);
+      const formComponents = require$$0.ref(
+        []
+      );
       const computedFormColumns = require$$0.computed(() => {
         const formColumns = deepUnref(props.formColumns);
         return formColumns.map((e) => {
@@ -63390,27 +63426,33 @@
       const validate = async () => {
         if (props.validateErrorStop) {
           clearValidate();
-          let bool = true;
           if (!validateFields.value.length)
-            return bool;
+            return Promise.resolve();
           for (const i of validateFields.value) {
-            bool = await formRef.value.validateFields([i]);
-            if (!bool) {
-              return bool;
+            try {
+              await formRef.value.validateFields([i]);
+            } catch (error) {
+              return Promise.reject(error);
             }
           }
+          return Promise.resolve();
         } else {
-          return await formRef.value.validateFields();
+          try {
+            await formRef.value.validateFields(validateFields.value);
+            return Promise.resolve();
+          } catch (error) {
+            return Promise.reject(error);
+          }
         }
       };
       const resetFields = async () => {
-        return await formRef.value.resetFields();
+        await formRef.value.resetFields();
       };
       const clearValidate = async (nameList) => {
-        return await formRef.value.clearValidate(nameList);
+        await formRef.value.clearValidate(nameList);
       };
       const scrollToField = async (name, options) => {
-        return await formRef.value.scrollToField(name, options);
+        await formRef.value.scrollToField(name, options);
       };
       const getBindValue = (item) => {
         const obj = { ...item };
@@ -70313,12 +70355,13 @@
 
   const getKeyValueItem = () => ({
     key: null,
-    value: null
+    value: null,
+    guid: guid()
   });
   const keyValueProps = buildProps({
     value: {
       type: definePropType(Array),
-      default: () => [{ key: "", value: "" }]
+      default: () => [{ key: null, value: null }]
     },
     loading: {
       type: Boolean,
@@ -70421,34 +70464,59 @@
   ];
   const keyValueItemProps = buildProps({
     disabled: {
-      type: Boolean
+      type: Boolean,
+      default: false
+    },
+    values: {
+      type: definePropType(Array),
+      default: () => [
+        {
+          key: null,
+          value: null,
+          guid: ""
+        }
+      ]
     },
     disabledValue: {
-      type: definePropType(Array)
+      type: definePropType(Array),
+      default: () => []
     },
     disabledKey: {
-      type: definePropType(Array)
+      type: definePropType(Array),
+      default: () => []
     },
     disabledDelete: {
-      type: definePropType(Array)
+      type: definePropType(Array),
+      default: () => []
     },
     keyValueType: {
-      type: definePropType(String)
+      type: definePropType(String),
+      default: "doubt"
     },
     keyType: {
-      type: definePropType(Object)
+      type: definePropType(Object),
+      default: () => ({
+        type: "input",
+        placeholder: "\u8BF7\u8F93\u5165Key"
+      })
     },
     keyTypes: {
-      type: definePropType(Array)
+      type: definePropType(Array),
+      default: () => []
     },
     valueType: {
-      type: definePropType(Object)
+      type: definePropType(Object),
+      default: () => ({
+        type: "input",
+        placeholder: "\u8BF7\u8F93\u5165Value"
+      })
     },
     value: {
       type: definePropType(Object),
       default: () => ({
         key: "",
-        value: ""
+        value: "",
+        guid: ""
       })
     },
     idx: {
@@ -70459,9 +70527,9 @@
       type: Object,
       default: () => ({})
     },
-    showDelete: {
+    keepLast: {
       type: Boolean,
-      default: true
+      default: false
     }
   });
   const keyValueItemEmits = {
@@ -70483,7 +70551,7 @@
       const attrs = require$$0.useAttrs();
       const bem = createNamespace("key-value");
       const innerValue = require$$0.ref(props.value);
-      const form = require$$0.ref();
+      const formRef = require$$0.ref();
       const getKeyType = require$$0.computed(() => {
         const option = props.keyType;
         return option;
@@ -70501,27 +70569,34 @@
       const getValueDisabled = require$$0.computed(() => {
         return props.disabledValue?.includes(props.idx) || props.disabled || getValueType.value?.disabled;
       });
-      const getDeleteDisabled = require$$0.computed(() => {
-        return props.disabledDelete?.includes(props.idx) || props.disabled;
-      });
       const hasValue = require$$0.computed(() => {
         return innerValue.value["key"] || innerValue.value["key"] === 0 || innerValue.value["value"];
       });
+      const getDeleteDisabled = require$$0.computed(() => {
+        return props.disabledDelete?.includes(props.idx) || props.disabled || props.values.length === 1 && !hasValue.value;
+      });
       const handleDelete = () => {
         emits("delete");
       };
       const handleChange = async () => {
         innerValue.value["value"] = null;
-        await form.value?.clearValidate();
+        await formRef.value?.clearValidate();
       };
       const validate = async () => {
-        return await form.value?.validate();
+        await require$$0.nextTick();
+        try {
+          await formRef.value?.validate();
+          return Promise.resolve();
+        } catch (error) {
+          console.log({ error }, props.idx);
+          return Promise.reject();
+        }
       };
       const resetFields = async () => {
-        return await form.value?.resetFields();
+        await formRef.value?.resetFields();
       };
       const clearValidate = async (namePath) => {
-        return await form.value?.clearValidate(namePath);
+        await formRef.value?.clearValidate(namePath);
       };
       require$$0.watch(
         innerValue,
@@ -70552,8 +70627,8 @@
         const _component_a_popconfirm = require$$0.resolveComponent("a-popconfirm");
         const _component_ll_form = require$$0.resolveComponent("ll-form");
         return require$$0.openBlock(), require$$0.createBlock(_component_ll_form, {
-          ref_key: "form",
-          ref: form,
+          ref_key: "formRef",
+          ref: formRef,
           "form-columns": require$$0.unref(formColumns),
           "form-data": props.value,
           "form-options": require$$0.unref(formOptions)
@@ -70654,7 +70729,7 @@
                       name: "value"
                     }, {
                       default: require$$0.withCtx(() => [
-                        require$$0.renderSlot(_ctx.$slots, "value-warapper", require$$0.normalizeProps(require$$0.guardReactiveProps(getValueType.value)), () => [
+                        require$$0.renderSlot(_ctx.$slots, "value-wrapper", require$$0.normalizeProps(require$$0.guardReactiveProps(getValueType.value)), () => [
                           (require$$0.openBlock(), require$$0.createBlock(require$$0.resolveDynamicComponent(`ll-${getValueType.value.type}`), require$$0.mergeProps({
                             value: innerValue.value["value"],
                             "onUpdate:value": _cache[2] || (_cache[2] = ($event) => innerValue.value["value"] = $event),
@@ -70682,57 +70757,21 @@
                   2
                   /* CLASS */
                 ),
-                props.showDelete ? (require$$0.openBlock(), require$$0.createElementBlock(
-                  require$$0.Fragment,
-                  { key: 2 },
-                  [
-                    hasValue.value ? (require$$0.openBlock(), require$$0.createBlock(_component_a_popconfirm, {
-                      key: 0,
-                      title: "\u786E\u5B9A\u8981\u79FB\u9664\u5417?",
-                      "ok-text": "\u786E\u8BA4",
-                      "cancel-text": "\u53D6\u6D88",
-                      placement: "topRight",
-                      "overlay-class-name": require$$0.unref(bem).m("popconfirm"),
-                      "get-popup-container": (trigger) => trigger.parentNode,
-                      "destroy-tooltip-on-hide": "",
-                      onConfirm: handleDelete
-                    }, {
-                      default: require$$0.withCtx(() => [
-                        require$$0.createElementVNode(
-                          "div",
-                          {
-                            class: require$$0.normalizeClass(require$$0.unref(bem).m("delete")),
-                            style: require$$0.normalizeStyle({
-                              "margin-top": !!require$$0.unref(attrs)["key-label"] || !!require$$0.unref(attrs)["value-label"] ? "26px" : "0px"
-                            })
-                          },
-                          [
-                            require$$0.createVNode(_component_ll_button, {
-                              type: "link",
-                              disabled: getDeleteDisabled.value
-                            }, {
-                              default: require$$0.withCtx(() => [
-                                require$$0.renderSlot(_ctx.$slots, "delete-icon", {}, () => [
-                                  require$$0.createVNode(_component_ll_icon, {
-                                    "icon-name": "icon-remove",
-                                    class: "delete"
-                                  })
-                                ])
-                              ]),
-                              _: 3
-                              /* FORWARDED */
-                            }, 8, ["disabled"])
-                          ],
-                          6
-                          /* CLASS, STYLE */
-                        )
-                      ]),
-                      _: 3
-                      /* FORWARDED */
-                    }, 8, ["overlay-class-name", "get-popup-container"])) : (require$$0.openBlock(), require$$0.createElementBlock(
+                hasValue.value ? (require$$0.openBlock(), require$$0.createBlock(_component_a_popconfirm, {
+                  key: 2,
+                  title: "\u786E\u5B9A\u8981\u79FB\u9664\u5417?",
+                  "ok-text": "\u786E\u8BA4",
+                  "cancel-text": "\u53D6\u6D88",
+                  placement: "topRight",
+                  "overlay-class-name": require$$0.unref(bem).m("popconfirm"),
+                  "get-popup-container": (trigger) => trigger.parentNode,
+                  "destroy-tooltip-on-hide": "",
+                  onConfirm: handleDelete
+                }, {
+                  default: require$$0.withCtx(() => [
+                    require$$0.createElementVNode(
                       "div",
                       {
-                        key: 1,
                         class: require$$0.normalizeClass(require$$0.unref(bem).m("delete")),
                         style: require$$0.normalizeStyle({
                           "margin-top": !!require$$0.unref(attrs)["key-label"] || !!require$$0.unref(attrs)["value-label"] ? "26px" : "0px"
@@ -70741,8 +70780,7 @@
                       [
                         require$$0.createVNode(_component_ll_button, {
                           type: "link",
-                          disabled: getDeleteDisabled.value,
-                          onClick: handleDelete
+                          disabled: getDeleteDisabled.value
                         }, {
                           default: require$$0.withCtx(() => [
                             require$$0.renderSlot(_ctx.$slots, "delete-icon", {}, () => [
@@ -70758,11 +70796,40 @@
                       ],
                       6
                       /* CLASS, STYLE */
-                    ))
+                    )
+                  ]),
+                  _: 3
+                  /* FORWARDED */
+                }, 8, ["overlay-class-name", "get-popup-container"])) : (require$$0.openBlock(), require$$0.createElementBlock(
+                  "div",
+                  {
+                    key: 3,
+                    class: require$$0.normalizeClass(require$$0.unref(bem).m("delete")),
+                    style: require$$0.normalizeStyle({
+                      "margin-top": !!require$$0.unref(attrs)["key-label"] || !!require$$0.unref(attrs)["value-label"] ? "26px" : "0px"
+                    })
+                  },
+                  [
+                    require$$0.createVNode(_component_ll_button, {
+                      type: "link",
+                      disabled: getDeleteDisabled.value,
+                      onClick: handleDelete
+                    }, {
+                      default: require$$0.withCtx(() => [
+                        require$$0.renderSlot(_ctx.$slots, "delete-icon", {}, () => [
+                          require$$0.createVNode(_component_ll_icon, {
+                            "icon-name": "icon-remove",
+                            class: "delete"
+                          })
+                        ])
+                      ]),
+                      _: 3
+                      /* FORWARDED */
+                    }, 8, ["disabled"])
                   ],
-                  64
-                  /* STABLE_FRAGMENT */
-                )) : require$$0.createCommentVNode("v-if", true)
+                  6
+                  /* CLASS, STYLE */
+                ))
               ],
               2
               /* CLASS */
@@ -70787,69 +70854,132 @@
       const emits = __emit;
       const bem = createNamespace("key-value");
       const formItemContext = antDesignVue.Form.useInjectFormItemContext();
-      const innerValue = require$$0.ref([]);
-      const keyValueItems = require$$0.ref([]);
+      const innerValue = require$$0.ref(
+        !props.value || props.value && !props.value.length ? [{ key: null, value: null, guid: guid() }] : props.value.map((e) => {
+          return {
+            ...e,
+            guid: guid()
+          };
+        })
+      );
+      const keyValueItems = require$$0.ref({});
+      const setKeyValueItems = (el, type) => {
+        if (el) {
+          keyValueItems.value[type] = el;
+        }
+      };
       const keyValueTypeDict = require$$0.computed(() => {
         const obj = {};
-        props.keyTypes.map((e) => {
+        props.keyTypes.forEach((e) => {
           obj[e.value] = e.option;
         });
         return obj;
       });
       const validate = async () => {
         await require$$0.nextTick();
-        return Promise.all(
-          keyValueItems.value.filter((e) => !!e).map((e) => e.validate())
+        const validationPromises = Object.values(keyValueItems.value).map(
+          async (item) => {
+            try {
+              await item.validate();
+              return { item, valid: true };
+            } catch (error) {
+              console.error("Validation failed for item:", item, error);
+              return { item, valid: false, error };
+            }
+          }
         );
+        const validationResults = await Promise.all(validationPromises);
+        const allValid = validationResults.every((result) => result.valid);
+        const errors = validationResults.filter((result) => !result.valid);
+        if (!allValid) {
+          console.log("Validation errors:", errors);
+          return { valid: false, errors };
+        }
+        return { valid: true };
       };
       const resetFields = async () => {
         await require$$0.nextTick();
-        return Promise.all(
-          keyValueItems.value.filter((e) => !!e).map((e) => e.resetFields())
-        );
+        for (const i of Object.values(keyValueItems.value)) {
+          if (i) {
+            i.resetFields();
+          }
+        }
       };
       const clearValidate = async () => {
         await require$$0.nextTick();
-        return Promise.all(
-          keyValueItems.value.filter((e) => !!e).map((e) => e.clearValidate())
-        );
+        for (const i of Object.values(keyValueItems.value)) {
+          if (i) {
+            i.clearValidate();
+          }
+        }
       };
       const handleAddItem = async () => {
-        const valid = await validate();
-        if (props.validate && !valid)
-          return false;
+        const { valid } = await validate();
+        if (!valid)
+          return;
         innerValue.value.push(getKeyValueItem());
         emits("add", {
           index: innerValue.value.length - 1,
           item: innerValue.value[innerValue.value.length - 1],
           value: innerValue.value
         });
-        handleChange();
       };
       const handleDelete = (idx) => {
-        innerValue.value.splice(idx, 1);
-        emits("delete", idx);
-        handleChange();
-      };
-      const handleChange = () => {
-        try {
-          formItemContext.onFieldChange();
-          emits("change", innerValue.value);
-          emits("update:value", innerValue.value);
-        } catch (error) {
-          console.error(error);
+        if (innerValue.value.length === 1) {
+          innerValue.value = [{ key: null, value: null, guid: guid() }];
+        } else {
+          innerValue.value.splice(idx, 1);
+          emits("delete", idx);
         }
       };
+      const getValue = (val) => {
+        return val.filter((e) => hasValue(e.key) || hasValue(e.value)).map((e) => ({
+          key: e.key,
+          value: e.value
+        }));
+      };
       require$$0.watch(
         () => props.value,
         (n) => {
-          innerValue.value = n && n.length > 0 ? n : props.keepLast ? [{ key: null, value: null }] : n;
+          if (!n || n && !n.length)
+            return;
+          const copyInnerValue = getValue(innerValue.value);
+          const copyPropsValue = getValue(n);
+          if (deepCompare(copyInnerValue, copyPropsValue))
+            return;
+          innerValue.value = [
+            ...n && n.length > 0 ? n : props.keepLast ? [{ key: null, value: null, guid: guid() }] : n
+          ].map((e) => {
+            return {
+              ...e,
+              guid: guid()
+            };
+          });
         },
         {
           immediate: true,
           deep: true
         }
       );
+      require$$0.watch(
+        () => innerValue.value,
+        (val) => {
+          const copyInnerValue = getValue(val);
+          const copyPropsValue = getValue(props.value);
+          if (deepCompare(copyInnerValue, copyPropsValue))
+            return;
+          try {
+            formItemContext.onFieldChange();
+            emits("change", copyInnerValue);
+            emits("update:value", copyInnerValue);
+          } catch (error) {
+            console.error(error);
+          }
+        },
+        {
+          deep: true
+        }
+      );
       __expose({
         validate,
         resetFields,
@@ -70881,9 +71011,9 @@
                       null,
                       require$$0.renderList(innerValue.value, (_item, idx) => {
                         return require$$0.openBlock(), require$$0.createBlock(keyValueItem, {
-                          key: _item,
+                          key: _item.guid,
                           ref_for: true,
-                          ref: (el) => keyValueItems.value[idx] = el,
+                          ref: (el) => setKeyValueItems(el, _item.guid),
                           value: innerValue.value[idx],
                           "onUpdate:value": ($event) => innerValue.value[idx] = $event,
                           idx,
@@ -70894,13 +71024,13 @@
                           "key-type": props.keyType,
                           "key-types": props.keyTypes,
                           "value-type": props.valueType,
+                          values: innerValue.value,
                           disabled: props.disabled,
                           "disabled-value": props.disabledValue,
                           "disabled-key": props.disabledKey,
                           "disabled-delete": props.disabledDelete,
-                          "show-delete": props.keepLast ? idx > 0 : true,
-                          onDelete: ($event) => handleDelete(idx),
-                          onChange: handleChange
+                          "keep-last": props.keepLast,
+                          onDelete: ($event) => handleDelete(idx)
                         }, require$$0.createSlots({
                           _: 2
                           /* DYNAMIC */
@@ -70913,7 +71043,7 @@
                               ])
                             };
                           })
-                        ]), 1032, ["value", "onUpdate:value", "idx", "key-label", "value-label", "key-value-type-dict", "key-value-type", "key-type", "key-types", "value-type", "disabled", "disabled-value", "disabled-key", "disabled-delete", "show-delete", "onDelete"]);
+                        ]), 1032, ["value", "onUpdate:value", "idx", "key-label", "value-label", "key-value-type-dict", "key-value-type", "key-type", "key-types", "value-type", "values", "disabled", "disabled-value", "disabled-key", "disabled-delete", "keep-last", "onDelete"]);
                       }),
                       128
                       /* KEYED_FRAGMENT */
@@ -85733,6 +85863,7 @@
   exports.customOverlay = customOverlay;
   exports.dataURLtoBlob = dataURLtoBlob;
   exports.dateUtil = dateUtil;
+  exports.deepCompare = deepCompare;
   exports.deepUnref = deepUnref;
   exports.default = installer;
   exports.defaultButtonProps = defaultButtonProps;
@@ -85776,6 +85907,7 @@
   exports.getHttpMethodUri = getHttpMethodUri;
   exports.getKeyValueItem = getKeyValueItem;
   exports.getType = getType;
+  exports.guid = guid;
   exports.hasValue = hasValue;
   exports.headersTableColumns = headersTableColumns;
   exports.httpUriOptions = httpUriOptions;