@dt-frames/ui 2.0.17 → 2.0.19

package/es/components/drawer/index.d.ts

@@ -67,6 +67,7 @@ declare const DtDrawer: import('../../utils/withInstall').SFCWithInstall<import(
     };
     props: any;
     propsRef: import("vue").Ref<{
+        t?: string;
         loading?: boolean;
         loadingText?: string;
         visible?: boolean;
@@ -1600,7 +1601,7 @@ declare const DtDrawer: import('../../utils/withInstall').SFCWithInstall<import(
             "text-anchor"?: import("csstype").TextAnchorProperty;
             "vector-effect"?: import("csstype").VectorEffectProperty;
         };
-        title?: string;
+        title?: string | ((data: import("@dt-frames/core").Recordable<any>) => string);
         wrapClassName?: string;
         class?: string;
         wrapStyle?: {
@@ -7711,7 +7712,7 @@ declare const DtDrawer: import('../../utils/withInstall').SFCWithInstall<import(
             t?: string;
             label: string;
             color?: "" | "error" | "warning" | "success";
-            type?: "default" | "dashed" | "text" | "primary" | "ghost" | "link";
+            type?: "link" | "default" | "dashed" | "text" | "primary" | "ghost";
             class?: string;
             disabled?: boolean;
             show?: boolean;
@@ -7732,13 +7733,11 @@ declare const DtDrawer: import('../../utils/withInstall').SFCWithInstall<import(
     getMergeProps: import("vue").ComputedRef<any>;
     getshowFooter: import("vue").ComputedRef<boolean>;
     getProps: import("vue").ComputedRef<import("./src/types/index.type").DrawerProps>;
-    getScrollContentStyle: import("vue").ComputedRef<import("vue").CSSProperties>;
     handleSave: () => void;
     handleCancel: (e?: Event) => Promise<void>;
     setDrawerProps: (props: Partial<import("./src/types/index.type").DrawerProps>) => void;
     drawerMethods: import("./src/types/index.type").DrawerMethods;
     instance: import("vue").ComponentInternalInstance;
-    readonly DtScrollContainer: import('../../utils/withInstall').SFCWithInstall<import("vue").DefineComponent<{}, {}, any, import("vue").ComputedOptions, import("vue").MethodOptions, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>>;
     DrawerHeader: import("vue").DefineComponent<{
         title: {
             type: import("vue").PropType<String | import("vue").ComputedRef<String>>;

package/es/components/drawer/index.js

@@ -1,4 +1,4 @@
-import { Drawer as Drawer$1 } from "ant-design-vue/es";
+import { Drawer } from "ant-design-vue/es";
 import "ant-design-vue/es/drawer/style";
 import { defineComponent, openBlock, createElementBlock, createElementVNode, toDisplayString, renderSlot, computed, createVNode, unref, useAttrs, ref, toRaw, getCurrentInstance, watch, createBlock, mergeProps, createSlots, withCtx, renderList, normalizeProps, guardReactiveProps, reactive, watchEffect, nextTick, onUnmounted } from "vue";
 import { useI18n, DtCache, CacheKey, deepMerge, isUnDef, isFunction, useApp, isObject, error } from "@dt-frames/core";
@@ -23,14 +23,6 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const _export_sfc = (sfc, props) => {
-  const target = sfc.__vccOpts || sfc;
-  for (const [key, val] of props) {
-    target[key] = val;
-  }
-  return target;
-};
-const DrawerHeader = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__file", "D:/dt/dt-frame-front/dt-frames/frames/packages/ui/src/components/drawer/src/components/DrawerHeader.vue"]]);
 const _hoisted_1 = {
   class: "flex items-center",
   style: { gap: "10px" }
@@ -86,7 +78,6 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const DrawerFooter = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__file", "D:/dt/dt-frame-front/dt-frames/frames/packages/ui/src/components/drawer/src/components/DrawerFooter.vue"]]);
 const basicProps = {
   t: {
     type: String
@@ -213,7 +204,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       { immediate: false }
     );
     return (_ctx, _cache) => {
-      const _component_ADrawer = Drawer$1;
+      const _component_ADrawer = Drawer;
       return openBlock(), createBlock(_component_ADrawer, mergeProps({
         class: "dt-drawer",
         onClose: handleCancel
@@ -230,7 +221,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         !_ctx.$slots.title ? {
           name: "title",
           fn: withCtx(() => [
-            createVNode(DrawerHeader, {
+            createVNode(_sfc_main$2, {
               title: unref(getProps).title
             }, {
               titleToolbar: withCtx(() => [
@@ -250,7 +241,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         unref(getshowFooter) ? {
           name: "footer",
           fn: withCtx(() => [
-            createVNode(DrawerFooter, {
+            createVNode(_sfc_main$1, {
               buttons: propsRef.value?.footer,
               showSave: unref(getProps).showOkBtn,
               showCancel: unref(getProps).showCancelBtn,
@@ -275,7 +266,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const Drawer = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "D:/dt/dt-frame-front/dt-frames/frames/packages/ui/src/components/drawer/src/index.vue"]]);
 const orgDialogProp = reactive({});
 const cbTransfer = reactive({});
 const dataTransfer = reactive({});
@@ -370,6 +360,12 @@ function useDrawer(props, setModalData) {
         return;
       }
       setModalData(data ?? {});
+      if (!data)
+        return;
+      if (props?.title && isFunction(props?.title)) {
+        let title = props.title(data);
+        methods.setDrawerProps({ title });
+      }
     });
   });
   const methods = {
@@ -393,7 +389,7 @@ const withInstall = (comp) => {
   };
   return comp;
 };
-const DtDrawer = withInstall(Drawer);
+const DtDrawer = withInstall(_sfc_main);
 export {
   DtDrawer,
   useDrawer,

package/es/components/drawer/index.less

@@ -7,4 +7,10 @@
 
 .ant-drawer-footer > div{
     float: right;
+}
+
+.ant-drawer-header-title{
+	button{
+		display: flex;
+	}
 }

package/es/components/drawer/src/index.d.ts

@@ -1,5 +1,4 @@
 import { DrawerMethods, DrawerProps } from './types/index.type';
-import { CSSProperties } from 'vue';
 declare const _sfc_main: import("vue").DefineComponent<{
     t: {
         type: StringConstructor;
@@ -29,7 +28,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    maskStyle: import("vue").PropType<CSSProperties>;
+    maskStyle: import("vue").PropType<import("vue").CSSProperties>;
     closeFunc: {
         type: import("vue").PropType<any>;
         default: any;
@@ -68,6 +67,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
     };
     props: any;
     propsRef: import("vue").Ref<{
+        t?: string;
         loading?: boolean;
         loadingText?: string;
         visible?: boolean;
@@ -1601,7 +1601,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
             "text-anchor"?: import("csstype").TextAnchorProperty;
             "vector-effect"?: import("csstype").VectorEffectProperty;
         };
-        title?: string;
+        title?: string | ((data: import("@dt-frames/core").Recordable<any>) => string);
         wrapClassName?: string;
         class?: string;
         wrapStyle?: {
@@ -7712,7 +7712,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
             t?: string;
             label: string;
             color?: "" | "error" | "warning" | "success";
-            type?: "default" | "dashed" | "text" | "primary" | "ghost" | "link";
+            type?: "link" | "default" | "dashed" | "text" | "primary" | "ghost";
             class?: string;
             disabled?: boolean;
             show?: boolean;
@@ -7733,13 +7733,11 @@ declare const _sfc_main: import("vue").DefineComponent<{
     getMergeProps: import("vue").ComputedRef<any>;
     getshowFooter: import("vue").ComputedRef<boolean>;
     getProps: import("vue").ComputedRef<DrawerProps>;
-    getScrollContentStyle: import("vue").ComputedRef<CSSProperties>;
     handleSave: () => void;
     handleCancel: (e?: Event) => Promise<void>;
     setDrawerProps: (props: Partial<DrawerProps>) => void;
     drawerMethods: DrawerMethods;
     instance: import("vue").ComponentInternalInstance;
-    readonly DtScrollContainer: import("../../../utils/withInstall").SFCWithInstall<import("vue").DefineComponent<{}, {}, any, import("vue").ComputedOptions, import("vue").MethodOptions, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>>;
     DrawerHeader: import("vue").DefineComponent<{
         title: {
             type: import("vue").PropType<String | import("vue").ComputedRef<String>>;
@@ -7831,7 +7829,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    maskStyle: import("vue").PropType<CSSProperties>;
+    maskStyle: import("vue").PropType<import("vue").CSSProperties>;
     closeFunc: {
         type: import("vue").PropType<any>;
         default: any;

package/es/components/drawer/src/types/index.type.d.ts

@@ -1,6 +1,8 @@
 import { ButtonProps } from '../../../form';
+import { Recordable } from "@dt-frames/core";
 import { CSSProperties, ComputedRef } from "vue";
 export declare type DrawerProps = {
+    t?: string;
     loading?: boolean;
     loadingText?: string;
     visible?: boolean;
@@ -11,7 +13,7 @@ export declare type DrawerProps = {
     maskClosable?: boolean;
     keyboard?: boolean;
     maskStyle?: CSSProperties;
-    title?: ComputedRef<string> | string;
+    title?: ComputedRef<string> | string | ((data: Recordable) => string);
     wrapClassName?: string;
     class?: string;
     wrapStyle?: CSSProperties;

package/es/components/form/index.js

@@ -1,7 +1,7 @@
 import { RadioButton, RadioGroup, Input, Button, FormItem as FormItem$1, Col as Col$1, Row, Form as Form$1 } from "ant-design-vue/es";
 import "ant-design-vue/es/form/style";
 import "ant-design-vue/es/row/style";
-import { computed, unref, getCurrentInstance, reactive, readonly, watchEffect, nextTick, toRaw, defineComponent, useAttrs, openBlock, createBlock, mergeProps, isRef, withCtx, createElementBlock, Fragment, renderList, createTextVNode, toDisplayString, createElementVNode, createVNode, normalizeProps, guardReactiveProps, createCommentVNode, toRefs, isVNode, ref, watch, resolveDirective, normalizeStyle, withDirectives, normalizeClass, onMounted, withKeys, createSlots, renderSlot } from "vue";
+import { computed, unref, getCurrentInstance, reactive, readonly, watchEffect, nextTick, toRaw, defineComponent, useAttrs, openBlock, createBlock, mergeProps, isRef, withCtx, createElementBlock, Fragment, renderList, createTextVNode, toDisplayString, createElementVNode, createVNode, normalizeProps, guardReactiveProps, createCommentVNode, ref, toRefs, isVNode, watch, resolveDirective, normalizeStyle, withDirectives, normalizeClass, onMounted, withKeys, createSlots, renderSlot } from "vue";
 import { useAppStore, isNumber, useI18n, isString, isFunction, error, useSlots, isArray, isUnDef, isBoolean, isNull, dispatchResize, isObject, deepMerge, isNullAndUnDef, useTimeoutFn } from "@dt-frames/core";
 import { merge, isEqual, omit, cloneDeep, upperFirst, uniqBy, set } from "lodash-es";
 import { Input as Input$1, Select, TreeSelect, Radio, Checkbox, AutoComplete, Cascader, DatePicker, InputNumber, Switch, TimePicker, Slider, Rate, Divider, Col, Tooltip, Form, FormItem } from "ant-design-vue";
@@ -169,14 +169,6 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const _export_sfc = (sfc, props) => {
-  const target = sfc.__vccOpts || sfc;
-  for (const [key, val] of props) {
-    target[key] = val;
-  }
-  return target;
-};
-const RadioButtonGroup = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["__file", "D:/dt/dt-frame-front/dt-frames/frames/packages/ui/src/components/form/src/components/radioButton.vue"]]);
 const _hoisted_1$1 = { class: "input-with-dialog" };
 const _sfc_main$3 = /* @__PURE__ */ defineComponent({
   __name: "formInputUseDialog",
@@ -213,15 +205,14 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
           key: 0,
           class: "i mdi:close-circle",
           onClick: clearProps
-        })) : createCommentVNode("v-if", true)
+        })) : createCommentVNode("", true)
       ]);
     };
   }
 });
-const DtFormInputDialog = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["__file", "D:/dt/dt-frame-front/dt-frames/frames/packages/ui/src/components/form/src/components/formInputUseDialog.vue"]]);
 const components = {
   Input: Input$1,
-  InputWithDialog: DtFormInputDialog,
+  InputWithDialog: _sfc_main$3,
   InputTextArea: Input$1.TextArea,
   InputSearch: Input$1.Search,
   InputGroup: Input$1.Group,
@@ -230,7 +221,7 @@ const components = {
   TreeSelect,
   Radio,
   RadioGroup: Radio.Group,
-  RadioButtonGroup,
+  RadioButtonGroup: _sfc_main$4,
   Checkbox,
   CheckboxGroup: Checkbox.Group,
   AutoComplete,
@@ -282,7 +273,6 @@ const _sfc_main$2 = {
     }
   },
   setup(props, {
-    emit,
     slots
   }) {
     const {
@@ -297,6 +287,7 @@ const _sfc_main$2 = {
     const {
       appConf
     } = useAppStore();
+    const uploadFiles = ref([]);
     const {
       schema,
       formProps
@@ -358,7 +349,8 @@ const _sfc_main$2 = {
         name,
         colon = appConf.ui.form.colon,
         suffix,
-        prefix
+        prefix,
+        description
       } = props.schema;
       const {
         labelCol,
@@ -398,7 +390,9 @@ const _sfc_main$2 = {
           "style": "flex:1; width: 100%;"
         }, [getContent()]), !!suffix && createVNode("span", {
           "class": "suffix px-2"
-        }, [getSuffix()])])]
+        }, [getSuffix()])]), description && createVNode("div", {
+          "class": "opacity-50 text-12"
+        }, [description])]
       });
     }
     function renderLabel() {
@@ -408,7 +402,7 @@ const _sfc_main$2 = {
         subLabel,
         toolTipProps = {}
       } = props.schema;
-      const renderLabel2 = subLabel ? createVNode("span", null, [createTextVNode(" "), label, createTextVNode(" "), createVNode("span", {
+      const renderLabel2 = subLabel ? createVNode("span", null, [" ", label, createTextVNode(" "), createVNode("span", {
         "class": "text-secondary opacity-50"
       }, [createTextVNode("("), subLabel, createTextVNode(")")])]) : label;
       const _toolTip = isFunction(toolTip) ? toolTip(unref(getValues).model) : toolTip;
@@ -443,13 +437,17 @@ const _sfc_main$2 = {
           const [e] = args;
           const target = e ? e.target : null;
           const value = target ? isCheck ? target.checked : target.value : e;
+          if (component === "Upload") {
+            uploadFiles.value = unref(args[1]);
+          }
           if (isString(name)) {
             props.setFormModel(name, value);
           } else if (isArray(name)) {
             name.map((key) => props.setFormModel(key, value));
           }
-          if (_sProps && _sProps[eventKey])
+          if (_sProps && _sProps[eventKey]) {
             _sProps[eventKey](...args, formModel);
+          }
         }
       };
       for (let it in _sProps) {
@@ -470,10 +468,12 @@ const _sfc_main$2 = {
           disabled: itemDisabled = false
         } = unref(getComponentProps);
         let _disabled = !!gDisabled || itemDisabled;
-        if (isBoolean(disabled))
+        if (isBoolean(disabled)) {
           _disabled = disabled;
-        if (isFunction(disabled))
+        }
+        if (isFunction(disabled)) {
           _disabled = disabled(unref(getValues).model);
+        }
         return _disabled;
       });
       const getSize = () => {
@@ -492,10 +492,8 @@ const _sfc_main$2 = {
         disabled: unref(getDisable)
       };
       if (component === "Select") {
-        {
-          itemProps.showSearch = true;
-          itemProps.optionFilterProp = "label";
-        }
+        itemProps.showSearch = true;
+        itemProps.optionFilterProp = "label";
       }
       if (component !== "RangePicker") {
         itemProps.placeholder = unref(getComponentProps)?.placeholder || createPlaceholder(component);
@@ -505,6 +503,7 @@ const _sfc_main$2 = {
       }
       if (component === "Upload" && !itemProps.defaultFiles && extraName?.length) {
         itemProps.defaultFiles = unref(getValues).values?.[extraName[0]];
+        itemProps.emitSnippet = true;
       }
       itemProps.formValues = unref(getValues);
       if (["Select", "DatePicker", "MonthPicker", "WeekPicker", "RangePicker"].includes(component)) {
@@ -539,8 +538,9 @@ const _sfc_main$2 = {
         dynamicRules,
         required
       } = props.schema;
-      if (!component)
+      if (!component) {
         return [];
+      }
       if (isFunction(dynamicRules)) {
         return dynamicRules(unref(getValues).model);
       }
@@ -548,6 +548,9 @@ const _sfc_main$2 = {
       let rules = cloneDeep(defaultRules);
       const getRequired = isFunction(required) ? required(unref(getValues).model) : required;
       function validator(rule, value) {
+        if (component === "Upload" && unref(uploadFiles).map((file) => file.fileId).includes(void 0)) {
+          return Promise.resolve();
+        }
         const msg = rule.message || defaultMsg;
         if (value === void 0 || isNull(value) || Array.isArray(value) && value.length === 0 || typeof value === "string" && value.trim() === "" || typeof value === "object" && Reflect.has(value, "checked") && Reflect.has(value, "halfChecked") && Array.isArray(value.checked) && Array.isArray(value.halfChecked) && value.checked.length === 0 && value.halfChecked.length === 0) {
           return Promise.reject(msg);
@@ -648,7 +651,6 @@ const _sfc_main$2 = {
     };
   }
 };
-const DtFormItem = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__file", "D:/dt/dt-frame-front/dt-frames/frames/packages/ui/src/components/form/src/components/FormItem.vue"]]);
 const _hoisted_1 = {
   key: 0,
   className: "preIcon pr-1"
@@ -815,18 +817,18 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
                     icon: withCtx(() => [
                       button.preIcon ? withDirectives((openBlock(), createElementBlock("span", _hoisted_1, null, 512)), [
                         [_directive_icon, button.preIcon]
-                      ]) : createCommentVNode("v-if", true)
+                      ]) : createCommentVNode("", true)
                     ]),
                     default: withCtx(() => [
                       createTextVNode(" " + toDisplayString(unref(t)(button.label)) + " ", 1),
                       button.postIcon ? withDirectives((openBlock(), createElementBlock("span", _hoisted_2, null, 512)), [
                         [_directive_icon, button.postIcon]
-                      ]) : createCommentVNode("v-if", true)
+                      ]) : createCommentVNode("", true)
                     ]),
                     _: 2
                   }, 1032, ["type", "class", "loading", "disabled", "onClick"])), [
                     [_directive_auth, getAuth(button.auth)]
-                  ]) : createCommentVNode("v-if", true)
+                  ]) : createCommentVNode("", true)
                 ], 64);
               }), 256)),
               unref(showAdvanceRef) ? (openBlock(), createBlock(_component_AButton, {
@@ -836,24 +838,22 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
                 onClick: toggleAdvanced
               }, {
                 default: withCtx(() => [
-                  createCommentVNode(" \u6536\u8D77 | \u5C55\u5F00 "),
                   createElementVNode("span", _hoisted_3, toDisplayString(advancedRef.value ? unref(t)("UI.ADVANCED") : unref(t)("UI.EXPAND")), 1),
                   createElementVNode("span", {
                     class: normalizeClass(unref(getAdvanceClass))
                   }, _hoisted_5, 2)
                 ]),
                 _: 1
-              })) : createCommentVNode("v-if", true)
+              })) : createCommentVNode("", true)
             ]),
             _: 1
           }, 8, ["style"])
         ]),
         _: 1
-      }, 16)) : createCommentVNode("v-if", true);
+      }, 16)) : createCommentVNode("", true);
     };
   }
 });
-const DtFormButtons = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__file", "D:/dt/dt-frame-front/dt-frames/frames/packages/ui/src/components/form/src/components/FormButtons.vue"]]);
 const SEARCH_BTN_NAME = "UI.SEARCH";
 const RESET_BTN_NAME = "UI.RESET";
 const SEARCH_BTNS = [
@@ -954,22 +954,22 @@ function useFormEvents({
     schemaRef.value = schemaList;
   }
   function _removeSchemaByName(name, schemaList) {
-    const index2 = schemaList.findIndex((schema) => schema.name === name);
-    if (index2 !== -1) {
+    const index = schemaList.findIndex((schema) => schema.name === name);
+    if (index !== -1) {
       delete formModel[name];
-      schemaList.splice(index2, 1);
+      schemaList.splice(index, 1);
     }
   }
   function appendFormItems(schema, prefixName, first = false) {
     const schemaList = cloneDeep(unref(getSchema));
-    const index2 = schemaList.findIndex((schema2) => schema2.name === prefixName);
-    if (!prefixName || index2 === -1 || first) {
+    const index = schemaList.findIndex((schema2) => schema2.name === prefixName);
+    if (!prefixName || index === -1 || first) {
       first ? schemaList.unshift(...schema) : schemaList.push(...schema);
       schemaRef.value = schemaList;
       return;
     }
-    if (index2 !== -1) {
-      schemaList.splice(index2 + 1, 0, ...schema);
+    if (index !== -1) {
+      schemaList.splice(index + 1, 0, ...schema);
     }
     schemaRef.value = schemaList;
   }
@@ -988,7 +988,6 @@ function useFormEvents({
       return;
     }
     const names = unref(getSchema).map((item) => item.name).filter(Boolean);
-    const validKeys = [];
     Object.keys(values).forEach((key) => {
       const schema = unref(getSchema).find((item) => item.name === key);
       let value = values[key];
@@ -1013,12 +1012,10 @@ function useFormEvents({
         } else {
           formModel[key] = value;
         }
-        validKeys.push(key);
       } else {
         formModel[key] = value;
       }
     });
-    return validateFields(validKeys);
   }
   async function validate(nameList) {
     return await unref(formElRef)?.validate(nameList);
@@ -1098,7 +1095,7 @@ function useFormValues({
           if (isArray(defaultValue2)) {
             let vals = defaultValue2.map((it) => format ? dayjs(it, format) : dayjs(it));
             if (names.length > 1) {
-              names.map((key, index2) => obj[key] = vals[index2] ?? null);
+              names.map((key, index) => obj[key] = vals[index] ?? null);
             } else {
               obj[names[0]] = vals;
             }
@@ -1107,11 +1104,11 @@ function useFormValues({
           }
         } else {
           if (names.length > 1) {
-            names.forEach((key, index2) => {
-              if (!defaultValue2 || defaultValue2.length - 1 < index2) {
+            names.forEach((key, index) => {
+              if (!defaultValue2 || defaultValue2.length - 1 < index) {
                 obj[key] = null;
               } else {
-                obj[key] = defaultValue2[index2];
+                obj[key] = defaultValue2[index];
               }
             });
           } else {
@@ -1120,7 +1117,7 @@ function useFormValues({
         }
       } else {
         names.map((it) => {
-          if (component === "TreeSelect" || (mode === "multiple" || treeCheckable) || component === "Select" && mode === "multiple") {
+          if (component === "TreeSelect" && (mode === "multiple" || treeCheckable) || component === "Select" && mode === "multiple") {
             obj[it] = [];
           } else {
             obj[it] = null;
@@ -1149,8 +1146,8 @@ function useFormActions(opt) {
     } = unref(getProps);
     let schema = [...schemas];
     if (showAdvancedButton) {
-      schema = schemas.reduce((t, it, index2) => {
-        if (index2 > minShowColumn - 1)
+      schema = schemas.reduce((t, it, index) => {
+        if (index > minShowColumn - 1)
           it.isAdvanced = isAdvanced;
         t.push(it);
         return t;
@@ -1334,7 +1331,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       formModel[key] = value;
       const { validateTrigger } = unref(getBindValue);
       if (!validateTrigger || validateTrigger === "change") {
-        validateFields([key]).catch((err) => {
+        validateFields([key]).catch(() => {
         });
       }
     }
@@ -1419,7 +1416,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       return {
         colspan,
         style: {
-          marginLeft: "auto"
+          marginLeft: showAdvancedButton ? "auto" : ""
         },
         ...{
           showAdvancedButton,
@@ -1455,10 +1452,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     );
     watch(
       () => unref(getProps).model,
-      (v) => {
+      () => {
         const { model } = unref(getProps);
-        if (!model || !Object.keys(model).length)
+        if (!model || !Object.keys(model).length) {
           return;
+        }
         setFormValues(model);
       },
       {
@@ -1483,14 +1481,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           } }), {
             default: withCtx(() => [
               (openBlock(true), createElementBlock(Fragment, null, renderList(unref(getSchema), (schema) => {
-                return openBlock(), createBlock(unref(DtFormItem), {
+                return openBlock(), createBlock(unref(_sfc_main$2), {
                   key: schema.name,
                   schema,
-                  formProps: unref(getProps),
-                  formModel,
-                  defaultValues: defaultValue.value,
-                  setFormModel,
-                  formActionType: formActionMethods
+                  "form-props": unref(getProps),
+                  "form-model": formModel,
+                  "default-values": defaultValue.value,
+                  "set-form-model": setFormModel,
+                  "form-action-type": formActionMethods
                 }, createSlots({ _: 2 }, [
                   renderList(Object.keys(_ctx.$slots), (item) => {
                     return {
@@ -1500,9 +1498,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       ])
                     };
                   })
-                ]), 1032, ["schema", "formProps", "formModel", "defaultValues"]);
+                ]), 1032, ["schema", "form-props", "form-model", "default-values"]);
               }), 128)),
-              unref(getActionsProps).buttonList?.length ? (openBlock(), createBlock(unref(DtFormButtons), mergeProps({ key: 0 }, unref(getActionsProps), { onHandleMethod: unref(handleMethod) }), null, 16, ["onHandleMethod"])) : createCommentVNode("v-if", true)
+              unref(getActionsProps).buttonList?.length ? (openBlock(), createBlock(unref(_sfc_main$1), mergeProps({ key: 0 }, unref(getActionsProps), { onHandleMethod: unref(handleMethod) }), null, 16, ["onHandleMethod"])) : createCommentVNode("", true)
             ]),
             _: 3
           }, 16)
@@ -1512,7 +1510,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const index = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "D:/dt/dt-frame-front/dt-frames/frames/packages/ui/src/components/form/src/index.vue"]]);
 function useForm(props) {
   const formRef = ref(null);
   const loadedRef = ref(false);
@@ -1584,7 +1581,7 @@ function useForm(props) {
   return [register, methods];
 }
 export {
-  index as DtForm,
-  DtFormButtons,
+  _sfc_main as DtForm,
+  _sfc_main$1 as DtFormButtons,
   useForm
 };