ll-plus 2.7.16 → 2.7.18

package/es/utils/data.d.ts

@@ -1,2 +1,3 @@
 export declare function deepCompare(obj1: any, obj2: any): boolean;
 export declare const hasValue: (value: any) => boolean;
+export declare const guid: () => string;

package/es/utils/props/runtime.d.ts

@@ -27,6 +27,6 @@ export declare const buildProp: <Type = never, Value = never, Validator = never,
 export type TestProps = Record<string, {
     [epPropKey]: true;
 } | NativePropType | EpPropInput<any, any, any, any, any>>;
-export declare const buildProps: <Props extends Record<string, {
+export declare const buildProps: <Props extends Record<string, NativePropType | EpPropInput<any, any, any, any, any> | {
     __epPropKey: true;
-} | NativePropType | EpPropInput<any, any, any, any, any>>>(props: Props) => { [K in keyof Props]: IfEpProp<Props[K], Props[K], IfNativePropType<Props[K], Props[K], EpPropConvert<Props[K]>>>; };
+}>>(props: Props) => { [K in keyof Props]: IfEpProp<Props[K], Props[K], IfNativePropType<Props[K], Props[K], EpPropConvert<Props[K]>>>; };

package/index.full.js

@@ -1996,6 +1996,13 @@
   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) => {
@@ -63419,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 };
@@ -70342,7 +70355,8 @@
 
   const getKeyValueItem = () => ({
     key: null,
-    value: null
+    value: null,
+    guid: guid()
   });
   const keyValueProps = buildProps({
     value: {
@@ -70450,43 +70464,59 @@
   ];
   const keyValueItemProps = buildProps({
     disabled: {
-      type: Boolean
+      type: Boolean,
+      default: false
     },
     values: {
       type: definePropType(Array),
       default: () => [
         {
           key: null,
-          value: 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: {
@@ -70521,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;
@@ -70550,16 +70580,23 @@
       };
       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,
@@ -70590,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)
@@ -70692,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),
@@ -70818,38 +70855,68 @@
       const bem = createNamespace("key-value");
       const formItemContext = antDesignVue.Form.useInjectFormItemContext();
       const innerValue = require$$0.ref(
-        props.value.length ? props.value : [{ key: null, value: null }]
+        !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 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,
@@ -70859,25 +70926,35 @@
       };
       const handleDelete = (idx) => {
         if (innerValue.value.length === 1) {
-          innerValue.value = [{ key: null, value: null }];
+          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));
+        return val.filter((e) => hasValue(e.key) || hasValue(e.value)).map((e) => ({
+          key: e.key,
+          value: e.value
+        }));
       };
       require$$0.watch(
         () => props.value,
         (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 }] : n
-          ];
+            ...n && n.length > 0 ? n : props.keepLast ? [{ key: null, value: null, guid: guid() }] : n
+          ].map((e) => {
+            return {
+              ...e,
+              guid: guid()
+            };
+          });
         },
         {
           immediate: true,
@@ -70934,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,
@@ -85830,6 +85907,7 @@
   exports.getHttpMethodUri = getHttpMethodUri;
   exports.getKeyValueItem = getKeyValueItem;
   exports.getType = getType;
+  exports.guid = guid;
   exports.hasValue = hasValue;
   exports.headersTableColumns = headersTableColumns;
   exports.httpUriOptions = httpUriOptions;