ll-plus 2.7.15 → 2.7.16

package/index.full.js

@@ -1967,6 +1967,36 @@
     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 ALL_VALUE = "_ALL";
   const initValue = (columns, values) => {
     const copyValues = {};
@@ -2032,9 +2062,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 +63388,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) => {
@@ -70318,7 +70347,7 @@
   const keyValueProps = buildProps({
     value: {
       type: definePropType(Array),
-      default: () => [{ key: "", value: "" }]
+      default: () => [{ key: null, value: null }]
     },
     loading: {
       type: Boolean,
@@ -70423,6 +70452,15 @@
     disabled: {
       type: Boolean
     },
+    values: {
+      type: definePropType(Array),
+      default: () => [
+        {
+          key: null,
+          value: null
+        }
+      ]
+    },
     disabledValue: {
       type: definePropType(Array)
     },
@@ -70459,9 +70497,9 @@
       type: Object,
       default: () => ({})
     },
-    showDelete: {
+    keepLast: {
       type: Boolean,
-      default: true
+      default: false
     }
   });
   const keyValueItemEmits = {
@@ -70501,12 +70539,12 @@
       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");
       };
@@ -70682,57 +70720,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 +70743,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 +70759,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,7 +70817,9 @@
       const emits = __emit;
       const bem = createNamespace("key-value");
       const formItemContext = antDesignVue.Form.useInjectFormItemContext();
-      const innerValue = require$$0.ref([]);
+      const innerValue = require$$0.ref(
+        props.value.length ? props.value : [{ key: null, value: null }]
+      );
       const keyValueItems = require$$0.ref([]);
       const keyValueTypeDict = require$$0.computed(() => {
         const obj = {};
@@ -70824,32 +70856,53 @@
           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 }];
+        } else {
+          innerValue.value.splice(idx, 1);
+          emits("delete", idx);
         }
       };
+      const getValue = (val) => {
+        return val.filter((e) => hasValue(e.key) || hasValue(e.value));
+      };
       require$$0.watch(
         () => props.value,
         (n) => {
-          innerValue.value = n && n.length > 0 ? n : props.keepLast ? [{ key: null, value: null }] : n;
+          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 }] : n
+          ];
         },
         {
           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,
@@ -70894,13 +70947,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 +70966,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 +85786,7 @@
   exports.customOverlay = customOverlay;
   exports.dataURLtoBlob = dataURLtoBlob;
   exports.dateUtil = dateUtil;
+  exports.deepCompare = deepCompare;
   exports.deepUnref = deepUnref;
   exports.default = installer;
   exports.defaultButtonProps = defaultButtonProps;