ll-plus 2.7.16 → 2.7.17

package/index.full.mjs

@@ -1988,6 +1988,13 @@ function deepCompare(obj1, obj2) {
 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) => {
@@ -63411,27 +63418,33 @@ var _sfc_main$N = /* @__PURE__ */ defineComponent({
     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 };
@@ -70334,7 +70347,8 @@ const LlInputNumber = withInstall(InputNumber);
 
 const getKeyValueItem = () => ({
   key: null,
-  value: null
+  value: null,
+  guid: guid()
 });
 const keyValueProps = buildProps({
   value: {
@@ -70442,43 +70456,59 @@ const formColumns = [
 ];
 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: {
@@ -70513,7 +70543,7 @@ var _sfc_main$C = /* @__PURE__ */ defineComponent({
     const attrs = useAttrs();
     const bem = createNamespace("key-value");
     const innerValue = ref(props.value);
-    const form = ref();
+    const formRef = ref();
     const getKeyType = computed(() => {
       const option = props.keyType;
       return option;
@@ -70542,16 +70572,23 @@ var _sfc_main$C = /* @__PURE__ */ defineComponent({
     };
     const handleChange = async () => {
       innerValue.value["value"] = null;
-      await form.value?.clearValidate();
+      await formRef.value?.clearValidate();
     };
     const validate = async () => {
-      return await form.value?.validate();
+      await 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);
     };
     watch(
       innerValue,
@@ -70582,8 +70619,8 @@ var _sfc_main$C = /* @__PURE__ */ defineComponent({
       const _component_a_popconfirm = resolveComponent("a-popconfirm");
       const _component_ll_form = resolveComponent("ll-form");
       return openBlock(), createBlock(_component_ll_form, {
-        ref_key: "form",
-        ref: form,
+        ref_key: "formRef",
+        ref: formRef,
         "form-columns": unref(formColumns),
         "form-data": props.value,
         "form-options": unref(formOptions)
@@ -70684,7 +70721,7 @@ var _sfc_main$C = /* @__PURE__ */ defineComponent({
                     name: "value"
                   }, {
                     default: withCtx(() => [
-                      renderSlot(_ctx.$slots, "value-warapper", normalizeProps(guardReactiveProps(getValueType.value)), () => [
+                      renderSlot(_ctx.$slots, "value-wrapper", normalizeProps(guardReactiveProps(getValueType.value)), () => [
                         (openBlock(), createBlock(resolveDynamicComponent(`ll-${getValueType.value.type}`), mergeProps({
                           value: innerValue.value["value"],
                           "onUpdate:value": _cache[2] || (_cache[2] = ($event) => innerValue.value["value"] = $event),
@@ -70810,38 +70847,68 @@ var _sfc_main$B = /* @__PURE__ */ defineComponent({
     const bem = createNamespace("key-value");
     const formItemContext = Form$1.useInjectFormItemContext();
     const innerValue = 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 = ref([]);
+    const keyValueItems = ref({});
+    const setKeyValueItems = (el, type) => {
+      if (el) {
+        keyValueItems.value[type] = el;
+      }
+    };
     const keyValueTypeDict = computed(() => {
       const obj = {};
-      props.keyTypes.map((e) => {
+      props.keyTypes.forEach((e) => {
         obj[e.value] = e.option;
       });
       return obj;
     });
     const validate = async () => {
       await 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 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 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,
@@ -70851,25 +70918,35 @@ var _sfc_main$B = /* @__PURE__ */ defineComponent({
     };
     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
+      }));
     };
     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,
@@ -70926,9 +71003,9 @@ var _sfc_main$B = /* @__PURE__ */ defineComponent({
                     null,
                     renderList(innerValue.value, (_item, idx) => {
                       return openBlock(), 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,
@@ -85640,4 +85717,4 @@ var installer = makeInstaller([...Components]);
 
 const install = installer.install;
 
-export { ALL_VALUE, AVATAR_IMG, Color, DEFAULT_METHOD, DEFAULT_TYPE, FALLBACK_IMAGE, FALL_BACK_IMG, HEADER_SRARCH_HEIGHT, ILlUploadDragProps, ImenuSwitchType, LEFT_SELECT_MIN_WIDTH, LlAdvancedFiltering, LlAdvancedFilteringParams, LlAdvancedFilteringTags, LlApiComponent, LlAvatar, LlBreadcrumbCard, LlButton, LlCascader, LlCheckbox, LlCheckboxGroup, LlCodeEditor, LlColorPicker, LlConfigProvider, LlCropperImage, LlCropperModal, LlDatePicker, LlDateRange, LlDescriptions, LlDescriptionsItem, LlDrawer, LlDropdown, LlDropdownButton, LlDropdownButtonSimple, LlEasyCron, LlEmpty, LlForm, LlFormComponent, LlFormItem, LlIcon, LlIconBase, LlIconPicker, LlImage, LlImagePreviewGroup, LlInput, LlInputNumber, LlKeyValue, LlMarkdownEditor, LlMarkdownViewer, LlModal, LlNewDrawer, LlNewModal, LlNumberRange, LlOperateIcon, LlOperateTree, LlRadio, LlRadioButton, LlRadioGroup, LlRichTextEditor, LlSecondConfirmation, LlSegmented, LlSelect, LlSelectGroup, LlSelectOptGroup, LlSelectOption, LlSpace, LlSteps, LlSwitch, LlTable, LlTabsSimple, LlTagGroup, LlTextarea, LlTimePicker, LlTimeRange, LlTooltip, LlTree, LlTreeSearch, LlUploadDrag, LlUploadImage, LlUriInput, LlWatermark, OPTIONS_KEY, OperateTreeEmits, PAGINATION_HEIGHT, THROTTLE_TIME, TypeEnum, addUnit, advancedFilteringEmits, advancedFilteringParamsEmits, advancedFilteringParamsProps, advancedFilteringProps, advancedFilteringTagsEmits, alphaSliderProps, apiComponentEmits, apiComponentProps, apiModalEmits, apiModalProps, apiUrlEmits, apiUrlProps, avatarEmits, avatarProps, avatarType, batchEditingEmits, batchEditingOptions, batchEditingProps, bodyEmits, bodyList, bodyProps, breadcrumbCardEmits, breadcrumbCardProps, buildProp, buildProps, buttonProps, calcRPN, checkboxGroupProps, checkboxProps, checkedType, clickInputEmits, clickInputProps, codeEditorEmits, codeEditorProps, codeThemeList, colorFormatOptions, colorPickerEmits, colorPickerProps, contentTypeOptions, createNamespace, cropperImageEmits, cropperImageProps, cropperModalEmits, cropperModalProps, customOverlay, dataURLtoBlob, dateUtil, deepCompare, deepUnref, installer as default, defaultButtonProps, defaultCropperOptions, defaultEditorConfig, defaultOptions, defaultToolbarConfig, definePropType, descriptionsItemProps, descriptionsProps, displayedRgb, drawerEmits, drawerOptions, drawerProps, dropdownButtonEmits, dropdownButtonProps, dropdownButtonSimpleEmits, dropdownButtonSimpleProps, dropdownEmits, dropdownProps, easyCronEmits, easyCronProps, emptyProps, epPropKey, fileToBase64, filterAllValue, findLabelByValue, footerShadowPlacement, formColumns, formComponentEmits, formComponentProps, formEmits, formOptions, formProps, formatFileSize, formatToDate, formatToDateTime, formdataTableColumns, getAmountChinese, getDateTimeUnit, getHttpMethodUri, getKeyValueItem, getType, hasValue, headersTableColumns, httpUriOptions, hueSliderProps, iconBaseProps, iconPickerModalEmits, iconPickerModalProps, iconPickerProps, iconPickerSearchEmits, iconPickerSearchProps, iconProps, iconTypes, imageProps, initValue, inputNumberEmits, inputNumberProps, inputProps, install, isArray, isBoolean, isDate$1 as isDate, isElement, isEmpty, isEpProp, isFunction$1 as isFunction, isNumber$2 as isNumber, isObject$1 as isObject, isPromise, isPropAbsent, isString$1 as isString, isStringNumber, isSymbol, isUndefined$2 as isUndefined, isValidComponentSize, isWindow, jsonTableColumns, jsonXmlEmits, jsonXmlOptions, jsonXmlProps, jsonXmlTableEmits, jsonXmlTableProps, jsonXmlTableRowEmits, jsonXmlTableRowProps, jsonXmlTypeOptions, keyValueEmits, keyValueItemEmits, keyValueItemProps, keyValueProps, llMarkdownEditorEmits, llMarkdownEditorProps, llMarkdownViewerProps, mainTableEmits, mainTableProps, menuSwitchRadioList, mergeNumberOfExps, methods$1 as methods, modalEmits, modalProps, modalType, mutable, newDrawerEmits, newDrawerProps, newModalEmits, newModalProps, numberRangeEmits, numberRangeProps, operateIconEmits, operateIconProps, operateTreeEmits, operateTreeProps, paramsOptions, paramsTableColumns, paramsTableEmits, paramsTableProps, paramsTableRowProps, parseColors, placement, preDefineProps, removeQueryString, requestList, richTextEditorEmits, richTextEditorProps, secondConfirmationProps, selectGroupData, selectGroupEmits, selectGroupFormType, selectGroupProps, selectOptGroupProps, selectOptionProps, selectProps, svPanelProps, tableContentType, tableHeaderSearchEmits, tableHeaderSearchProps, tablePaginationProps, tableProps, tabsSimpleEmits, tabsSimpleProps, tagGroupEmits, tagGroupProps, thousandsFormat, toRPN, tooltipProps, treeDataFormat, treeEmits, treeProps, treeSearchEmits, treeSearchEmits1, treeSearchOperateWayType, treeSearchProps, treeSelectDirectoryTitleEmits, treeSelectDirectoryTitleProps, treeSelectHeaderSearchEmits, treeSelectHeaderSearchProps, typeRules, uploadImageEmits, uploadImageProps, uriInputEmits, uriInputProps, url, useOptions, useScroll, useSecondConfirmation, useTabEmits, useTabProps, useTabSetup, withInstall };
+export { ALL_VALUE, AVATAR_IMG, Color, DEFAULT_METHOD, DEFAULT_TYPE, FALLBACK_IMAGE, FALL_BACK_IMG, HEADER_SRARCH_HEIGHT, ILlUploadDragProps, ImenuSwitchType, LEFT_SELECT_MIN_WIDTH, LlAdvancedFiltering, LlAdvancedFilteringParams, LlAdvancedFilteringTags, LlApiComponent, LlAvatar, LlBreadcrumbCard, LlButton, LlCascader, LlCheckbox, LlCheckboxGroup, LlCodeEditor, LlColorPicker, LlConfigProvider, LlCropperImage, LlCropperModal, LlDatePicker, LlDateRange, LlDescriptions, LlDescriptionsItem, LlDrawer, LlDropdown, LlDropdownButton, LlDropdownButtonSimple, LlEasyCron, LlEmpty, LlForm, LlFormComponent, LlFormItem, LlIcon, LlIconBase, LlIconPicker, LlImage, LlImagePreviewGroup, LlInput, LlInputNumber, LlKeyValue, LlMarkdownEditor, LlMarkdownViewer, LlModal, LlNewDrawer, LlNewModal, LlNumberRange, LlOperateIcon, LlOperateTree, LlRadio, LlRadioButton, LlRadioGroup, LlRichTextEditor, LlSecondConfirmation, LlSegmented, LlSelect, LlSelectGroup, LlSelectOptGroup, LlSelectOption, LlSpace, LlSteps, LlSwitch, LlTable, LlTabsSimple, LlTagGroup, LlTextarea, LlTimePicker, LlTimeRange, LlTooltip, LlTree, LlTreeSearch, LlUploadDrag, LlUploadImage, LlUriInput, LlWatermark, OPTIONS_KEY, OperateTreeEmits, PAGINATION_HEIGHT, THROTTLE_TIME, TypeEnum, addUnit, advancedFilteringEmits, advancedFilteringParamsEmits, advancedFilteringParamsProps, advancedFilteringProps, advancedFilteringTagsEmits, alphaSliderProps, apiComponentEmits, apiComponentProps, apiModalEmits, apiModalProps, apiUrlEmits, apiUrlProps, avatarEmits, avatarProps, avatarType, batchEditingEmits, batchEditingOptions, batchEditingProps, bodyEmits, bodyList, bodyProps, breadcrumbCardEmits, breadcrumbCardProps, buildProp, buildProps, buttonProps, calcRPN, checkboxGroupProps, checkboxProps, checkedType, clickInputEmits, clickInputProps, codeEditorEmits, codeEditorProps, codeThemeList, colorFormatOptions, colorPickerEmits, colorPickerProps, contentTypeOptions, createNamespace, cropperImageEmits, cropperImageProps, cropperModalEmits, cropperModalProps, customOverlay, dataURLtoBlob, dateUtil, deepCompare, deepUnref, installer as default, defaultButtonProps, defaultCropperOptions, defaultEditorConfig, defaultOptions, defaultToolbarConfig, definePropType, descriptionsItemProps, descriptionsProps, displayedRgb, drawerEmits, drawerOptions, drawerProps, dropdownButtonEmits, dropdownButtonProps, dropdownButtonSimpleEmits, dropdownButtonSimpleProps, dropdownEmits, dropdownProps, easyCronEmits, easyCronProps, emptyProps, epPropKey, fileToBase64, filterAllValue, findLabelByValue, footerShadowPlacement, formColumns, formComponentEmits, formComponentProps, formEmits, formOptions, formProps, formatFileSize, formatToDate, formatToDateTime, formdataTableColumns, getAmountChinese, getDateTimeUnit, getHttpMethodUri, getKeyValueItem, getType, guid, hasValue, headersTableColumns, httpUriOptions, hueSliderProps, iconBaseProps, iconPickerModalEmits, iconPickerModalProps, iconPickerProps, iconPickerSearchEmits, iconPickerSearchProps, iconProps, iconTypes, imageProps, initValue, inputNumberEmits, inputNumberProps, inputProps, install, isArray, isBoolean, isDate$1 as isDate, isElement, isEmpty, isEpProp, isFunction$1 as isFunction, isNumber$2 as isNumber, isObject$1 as isObject, isPromise, isPropAbsent, isString$1 as isString, isStringNumber, isSymbol, isUndefined$2 as isUndefined, isValidComponentSize, isWindow, jsonTableColumns, jsonXmlEmits, jsonXmlOptions, jsonXmlProps, jsonXmlTableEmits, jsonXmlTableProps, jsonXmlTableRowEmits, jsonXmlTableRowProps, jsonXmlTypeOptions, keyValueEmits, keyValueItemEmits, keyValueItemProps, keyValueProps, llMarkdownEditorEmits, llMarkdownEditorProps, llMarkdownViewerProps, mainTableEmits, mainTableProps, menuSwitchRadioList, mergeNumberOfExps, methods$1 as methods, modalEmits, modalProps, modalType, mutable, newDrawerEmits, newDrawerProps, newModalEmits, newModalProps, numberRangeEmits, numberRangeProps, operateIconEmits, operateIconProps, operateTreeEmits, operateTreeProps, paramsOptions, paramsTableColumns, paramsTableEmits, paramsTableProps, paramsTableRowProps, parseColors, placement, preDefineProps, removeQueryString, requestList, richTextEditorEmits, richTextEditorProps, secondConfirmationProps, selectGroupData, selectGroupEmits, selectGroupFormType, selectGroupProps, selectOptGroupProps, selectOptionProps, selectProps, svPanelProps, tableContentType, tableHeaderSearchEmits, tableHeaderSearchProps, tablePaginationProps, tableProps, tabsSimpleEmits, tabsSimpleProps, tagGroupEmits, tagGroupProps, thousandsFormat, toRPN, tooltipProps, treeDataFormat, treeEmits, treeProps, treeSearchEmits, treeSearchEmits1, treeSearchOperateWayType, treeSearchProps, treeSelectDirectoryTitleEmits, treeSelectDirectoryTitleProps, treeSelectHeaderSearchEmits, treeSelectHeaderSearchProps, typeRules, uploadImageEmits, uploadImageProps, uriInputEmits, uriInputProps, url, useOptions, useScroll, useSecondConfirmation, useTabEmits, useTabProps, useTabSetup, withInstall };