@dt-frames/ui 2.0.18 → 2.0.19

package/es/components/form/index.js

@@ -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 {
@@ -359,7 +349,8 @@ const _sfc_main$2 = {
         name,
         colon = appConf.ui.form.colon,
         suffix,
-        prefix
+        prefix,
+        description
       } = props.schema;
       const {
         labelCol,
@@ -399,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() {
@@ -409,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;
@@ -452,8 +445,9 @@ const _sfc_main$2 = {
           } 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) {
@@ -474,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 = () => {
@@ -496,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);
@@ -544,8 +538,9 @@ const _sfc_main$2 = {
         dynamicRules,
         required
       } = props.schema;
-      if (!component)
+      if (!component) {
         return [];
+      }
       if (isFunction(dynamicRules)) {
         return dynamicRules(unref(getValues).model);
       }
@@ -553,8 +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))
+        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);
@@ -655,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"
@@ -822,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, {
@@ -843,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 = [
@@ -961,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;
   }
@@ -1102,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;
             }
@@ -1111,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 {
@@ -1124,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;
@@ -1153,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;
@@ -1338,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(() => {
         });
       }
     }
@@ -1423,7 +1416,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       return {
         colspan,
         style: {
-          marginLeft: "auto"
+          marginLeft: showAdvancedButton ? "auto" : ""
         },
         ...{
           showAdvancedButton,
@@ -1459,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);
       },
       {
@@ -1487,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 {
@@ -1504,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)
@@ -1516,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);
@@ -1588,7 +1581,7 @@ function useForm(props) {
   return [register, methods];
 }
 export {
-  index as DtForm,
-  DtFormButtons,
+  _sfc_main as DtForm,
+  _sfc_main$1 as DtFormButtons,
   useForm
 };

package/es/components/form/src/components/FormItem.d.ts

@@ -71,7 +71,7 @@ declare const _sfc_main: {
                     type: NumberConstructor;
                 };
                 size: {
-                    type: PropType<"small" | "large" | "middle">;
+                    type: PropType<"large" | "small" | "middle">;
                 };
                 disabled: {
                     type: BooleanConstructor;
@@ -151,8 +151,7 @@ declare const _sfc_main: {
             type: PropType<FormActionType>;
         };
     };
-    setup(props: any, { emit, slots }: {
-        emit: any;
+    setup(props: any, { slots }: {
         slots: any;
     }): () => JSX.Element;
 };

package/es/components/form/src/props.d.ts

@@ -1,7 +1,7 @@
-import { Recordable } from "@dt-frames/core";
-import { PropType, Ref } from "vue";
-import { ButtonProps, ColEx, FormSchema } from "./types/form.type";
-import { FormActionType } from "./types/actions.type";
+import { Recordable } from '@dt-frames/core';
+import { PropType, Ref } from 'vue';
+import { ButtonProps, ColEx, FormSchema } from './types/form.type';
+import { FormActionType } from './types/actions.type';
 export declare const BasicProps: {
     mode: {
         type: PropType<"search" | "dialog">;
@@ -41,7 +41,7 @@ export declare const BasicProps: {
     };
     rowProps: {
         type: PropType<Partial<import("vue").ExtractPropTypes<{
-            align: PropType<"bottom" | "top" | "stretch" | "middle">;
+            align: PropType<"stretch" | "bottom" | "top" | "middle">;
             justify: PropType<"space-around" | "space-between" | "center" | "end" | "start">;
             prefixCls: StringConstructor;
             gutter: {
@@ -62,7 +62,7 @@ export declare const BasicProps: {
         type: NumberConstructor;
     };
     size: {
-        type: PropType<"small" | "large" | "middle">;
+        type: PropType<"large" | "small" | "middle">;
     };
     disabled: {
         type: BooleanConstructor;

package/es/components/form/src/types/form.type.d.ts

@@ -56,6 +56,7 @@ declare type Schema<ComponentType, T> = {
     wrapperCol?: Partial<ColEx>;
     isAdvanced?: boolean;
     extraName?: string[];
+    description: String;
 };
 export declare type FormSchema = Schema<'Input', Input> | Schema<'InputWithDialog', InputWithDialog> | Schema<'InputGroup', InputGroup> | Schema<'InputPassword', InputPassword> | Schema<'InputSearch', InputSearch> | Schema<'InputTextArea', InputTextArea> | Schema<'InputNumber', InputNumber> | Schema<'Select', Select> | Schema<'TreeSelect', TreeSelect> | Schema<'Radio', Radio> | Schema<'RadioButtonGroup', Radio> | Schema<'RadioGroup', RadioGroup> | Schema<'Checkbox', Checkbox> | Schema<'CheckboxGroup', CheckboxGroup> | Schema<'AutoComplete', Recordable> | Schema<'Cascader', Cascader> | Schema<'DatePicker', DatePicker> | Schema<'MonthPicker', DatePicker> | Schema<'RangePicker', RangePicker> | Schema<'WeekPicker', DatePicker> | Schema<'TimePicker', TimePicker> | Schema<'Switch', Switch> | Schema<'Slider', {
     disabled?: boolean;

package/es/components/source/index.js

@@ -135,6 +135,8 @@ function useSource(props) {
   const { t } = useI18n("UI");
   const { confirm, message } = useMessage();
   const { appConf } = useAppStore();
+  let okCode = appConf?.http?.okCode;
+  let _okCode = isArray(okCode) ? okCode : [okCode];
   const { baseUrl, api: orgApi, exportName, queryAfterUpdate, beforeUpdate, afterUpdate, authPrefix } = props;
   const pagination = ref({
     current: appConf?.ui?.table?.defaultPageNo || 1,
@@ -202,7 +204,7 @@ function useSource(props) {
         pagination.value = {
           current,
           pageSize: size || appConf?.ui?.table?.defaultPageSize,
-          total: 100
+          total
         };
       }
     } catch (err) {
@@ -278,7 +280,7 @@ function useSource(props) {
         loading.onAdd.value = true;
         try {
           const result = await fetch(api.add, { ...model }, false);
-          if (result?.code === appConf?.http?.okCode) {
+          if (_okCode.includes(result?.code)) {
             message.success(t("ADD_SUCCESS"));
             curdInstance && curdInstance.closeModal();
             if (queryAfterUpdate !== false)
@@ -294,7 +296,7 @@ function useSource(props) {
         loading.onUpdate.value = true;
         try {
           const result = await fetch(api.update, { ...model }, false);
-          if (result?.code === appConf?.http?.okCode) {
+          if (_okCode.includes(result?.code)) {
             message.success(t("UPDATE_SUCCESS"));
             curdInstance && curdInstance.closeModal();
             if (queryAfterUpdate !== false)
@@ -332,7 +334,7 @@ function useSource(props) {
       iconType: "warning",
       onOk() {
         fetch(api.deletes, toRaw(_ids), false).then((rsp) => {
-          if (rsp?.code === appConf?.http?.okCode) {
+          if (_okCode.includes(rsp?.code)) {
             message.success((isSingleDelete ? "" : t("MULTIFY")) + t("DELETE_SUCCESS"));
             !isSingleDelete && tableInstance.clearSelectedRowKeys();
             if (queryAfterUpdate !== false)

package/es/components/table/index.js

@@ -176,12 +176,13 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
     },
     btns: {
       type: Array,
-      default: []
+      default: () => []
     },
     flag: {
       type: String
     },
     record: {
+      type: Object,
       default: {}
     },
     index: {
@@ -201,17 +202,17 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
         return auth;
       } else if (authPrefix && auth) {
         return `${authPrefix}:${auth}`;
-      } else {
-        return auth ?? null;
       }
+      return auth ?? null;
     };
     const { appConf } = useAppStore();
     const getExpandNum = computed(() => {
       return props2.expandNum || appConf?.ui?.table?.expandNum;
     });
     const showMore = computed(() => {
-      if (!unref(getExpandNum))
+      if (!unref(getExpandNum)) {
         return false;
+      }
       let allAuths = DtCache.getLocal(CacheKey.AUTHS);
       let remainBtnNum = unref(actionBtns).length - unref(getExpandNum);
       let remainBtn = takeRight(unref(actionBtns), remainBtnNum);
@@ -280,7 +281,7 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
                 ]) : createCommentVNode("v-if", true),
                 index2 >= unref(getExpandNum) && index2 === actionBtns.value.length - 1 ? (openBlock(), createBlock(_component_ADropdown, {
                   key: 1,
-                  getPopupContainer: getPopupContainer$1,
+                  "get-popup-container": getPopupContainer$1,
                   trigger: ["click"]
                 }, {
                   overlay: withCtx(() => [
@@ -308,7 +309,7 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
                     })
                   ]),
                   default: withCtx(() => [
-                    unref(showMore) ? (openBlock(), createElementBlock("span", _hoisted_2$3, "\u66F4\u591A")) : createCommentVNode("v-if", true)
+                    unref(showMore) ? (openBlock(), createElementBlock("span", _hoisted_2$3, " \u66F4\u591A ")) : createCommentVNode("v-if", true)
                   ]),
                   _: 1
                 })) : createCommentVNode("v-if", true)
@@ -337,7 +338,7 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
         }), 256))
       ], 2)) : (openBlock(), createBlock(_component_ADropdown, {
         key: 1,
-        getPopupContainer: getPopupContainer$1,
+        "get-popup-container": getPopupContainer$1,
         trigger: ["click"]
       }, {
         overlay: withCtx(() => [
@@ -605,8 +606,9 @@ function handleItem(item, ellipsis) {
   const { key, dataIndex, children } = item;
   item.align = item.align || align;
   if (ellipsis) {
-    if (!key)
+    if (!key) {
       item.key = dataIndex && dataIndex.toString();
+    }
     if (!isBoolean(item.ellipsis)) {
       item = Object.assign(item, {
         ellipsis
@@ -618,8 +620,9 @@ function handleItem(item, ellipsis) {
   }
 }
 function handleChildren(children, ellipsis) {
-  if (!children)
+  if (!children) {
     return;
+  }
   children.forEach((item) => {
     const { children: children2 } = item;
     handleItem(item, ellipsis);
@@ -642,8 +645,9 @@ function handleIndexColumn(propsRef, getPaginationRef, columns) {
       columns.splice(indIndex, 1);
     }
   });
-  if (!pushIndexColumns)
+  if (!pushIndexColumns) {
     return;
+  }
   const isFixedLeft = columns.some((item) => item.fixed === "left");
   columns.unshift({
     flag: INDEX_FLAG,
@@ -651,8 +655,9 @@ function handleIndexColumn(propsRef, getPaginationRef, columns) {
     title: t("NUMBER"),
     align: "center",
     customRender: ({ index: index2, renderIndex, record }) => {
-      if (virtual && record?.index)
+      if (virtual && record?.index) {
         return record?.index;
+      }
       const getPagination = unref(getPaginationRef);
       const { appConf } = useAppStore();
       const { defaultPageSize } = appConf.ui.table;
@@ -672,31 +677,40 @@ function handleActionColumn(propsRef, columns) {
   const { appConf } = useAppStore();
   const { getIsZH } = useHeader();
   const { t } = useI18n("UI");
-  let defaultButtons = [
-    { label: t("EDIT"), icon: "mdi:text-box-edit-outline", onClick: unref(propsRef).onOpenUpdateDialog },
-    { label: t("DELETE"), icon: "mdi:delete-outline", onClick: unref(propsRef).onDelete, color: "#ed6f6f" }
+  const defaultButtons = [
+    {
+      label: t("EDIT"),
+      icon: "mdi:text-box-edit-outline",
+      onClick: unref(propsRef).onOpenUpdateDialog
+    },
+    {
+      label: t("DELETE"),
+      icon: "mdi:delete-outline",
+      onClick: unref(propsRef).onDelete,
+      color: "#ed6f6f"
+    }
   ];
   const { operations = defaultButtons, expandActions = false, authPrefix } = unref(propsRef);
-  if (!operations || isObject(operations) && operations?.btns && !operations?.btns?.length || isArray(operations) && !operations.length)
+  if (!operations || isObject(operations) && operations?.btns && !operations?.btns?.length || isArray(operations) && !operations.length) {
     return;
+  }
   const hasIndex = columns.findIndex((column) => column.flag === ACTION_COLUMN);
   if (hasIndex === -1) {
-    let column = isObject(operations) ? {
+    const column = isObject(operations) ? {
       expand: appConf?.ui?.table?.expandActions,
       btns: defaultButtons,
       ...operations
     } : isArray(operations) ? { expand: appConf?.ui?.table?.expandActions, btns: operations } : {};
-    let expand = column.expand ? column.expand : expandActions;
-    let expandNum = (isObject(operations) ? operations.expandNum : appConf?.ui?.table?.expandNum) || null;
-    let allAuths = DtCache.getLocal(CacheKey.AUTHS);
+    const expand = column.expand ? column.expand : expandActions;
+    const expandNum = (isObject(operations) ? operations.expandNum : appConf?.ui?.table?.expandNum) || null;
+    const allAuths = DtCache.getLocal(CacheKey.AUTHS);
     const getAuth = (auth) => {
       if (auth && auth.includes(":")) {
         return auth;
       } else if (authPrefix && auth) {
         return `${authPrefix}:${auth}`;
-      } else {
-        return auth ?? null;
       }
+      return auth ?? null;
     };
     const getWidth = () => {
       let w = 0;
@@ -719,7 +733,7 @@ function handleActionColumn(propsRef, columns) {
       }
       return w;
     };
-    let columnObj = {
+    const columnObj = {
       fixed: "right",
       title: t("ACTIONS"),
       align: "center",
@@ -733,12 +747,15 @@ function handleActionColumn(propsRef, columns) {
       customRender: ({ record, index: index2 }) => {
         return h(
           TableAction,
-          omit({
-            ...columnObj,
-            authPrefix,
-            record,
-            index: index2
-          }, "align")
+          omit(
+            {
+              ...columnObj,
+              authPrefix,
+              record,
+              index: index2
+            },
+            "align"
+          )
         );
       }
     });
@@ -748,9 +765,10 @@ function sortFixedColumn(columns) {
   const fixedLeftColumn = [];
   const fixedRightColumn = [];
   const defaultColumn = [];
-  for (let column of columns) {
-    if (column.defaultHidden)
+  for (const column of columns) {
+    if (column.defaultHidden) {
       continue;
+    }
     if (column.fixed === "left") {
       fixedLeftColumn.push(column);
       continue;
@@ -761,11 +779,7 @@ function sortFixedColumn(columns) {
     }
     defaultColumn.push(column);
   }
-  return [
-    ...fixedLeftColumn,
-    ...defaultColumn,
-    ...fixedRightColumn
-  ];
+  return [...fixedLeftColumn, ...defaultColumn, ...fixedRightColumn];
 }
 function useColumns(propsRef, getPaginationRef, tableElRef) {
   const columnsRef = ref(unref(propsRef).columns);
@@ -810,7 +824,8 @@ function useColumns(propsRef, getPaginationRef, tableElRef) {
   }
   function addResize() {
     const { resizable, minWidth = 50, maxWidth = 700 } = unref(propsRef);
-    let els = unref(tableElRef)?.$el.querySelectorAll(".__column"), allWidth = 0, columnAllWidth = 0, noWidthNum = 0, avgWidth = 0, scrollBarW = 10;
+    const els = unref(tableElRef)?.$el.querySelectorAll(".__column"), scrollBarW = 10;
+    let allWidth = 0, columnAllWidth = 0, noWidthNum = 0, avgWidth = 0;
     for (let i = 0; i < els?.length; i++) {
       allWidth += els[i].offsetWidth ?? 0;
     }
@@ -876,12 +891,12 @@ function useColumns(propsRef, getPaginationRef, tableElRef) {
     }
   }
   function setColumnsByDataIndex(dataIndex, value) {
-    if (!dataIndex || !value)
+    if (!dataIndex || !value) {
       return;
+    }
     cacheColumns.forEach((item) => {
       if (item.dataIndex === dataIndex) {
         Object.assign(item, value);
-        return;
       }
     });
     columnsRef.value = [...cacheColumns];
@@ -913,12 +928,14 @@ function useCustomRow(propsRef, { setSelectedRowKeys, getSelectedRowKeys, clearS
         e?.stopPropagation();
         function handleClick() {
           const { rowSelection, rowKey, clickToSelectRow } = unref(propsRef);
-          if (!rowSelection || !clickToSelectRow)
+          if (!rowSelection) {
             return;
+          }
           const keys = getSelectedRowKeys();
           const key = record[rowKey];
-          if (!key)
+          if (!key) {
             return;
+          }
           const isCheckbox = rowSelection.type === "checkbox";
           const isRadio = rowSelection.type === "radio";
           if (clickToSelectRow) {
@@ -929,17 +946,20 @@ function useCustomRow(propsRef, { setSelectedRowKeys, getSelectedRowKeys, clearS
                 setSelectedRowKeys([...keys, key]);
               }
             }
-            if (isRadio)
+            if (isRadio) {
               setSelectedRowKeys([key]);
+            }
             return;
           }
           if (isCheckbox) {
-            const tr = e.composedPath?.().find((dom) => dom.tagName === "TR");
-            if (!tr)
+            const td = e.composedPath?.().find((dom) => dom.tagName === "TD");
+            if (!td) {
               return;
-            const checkBox = tr.querySelector("input[type=checkbox]");
-            if (!checkBox || checkBox.hasAttribute("disabled"))
+            }
+            const checkBox = td.querySelector("input[type=checkbox]");
+            if (!checkBox || checkBox.hasAttribute("disabled")) {
               return;
+            }
             if (!keys.includes(key)) {
               setSelectedRowKeys([...keys, key]);
               return;
@@ -981,11 +1001,7 @@ function useCustomRow(propsRef, { setSelectedRowKeys, getSelectedRowKeys, clearS
     customRow
   };
 }
-function useDataSource(propsRef, {
-  getPaginationInfo,
-  setPagination,
-  clearSelectedRowKeys
-}) {
+function useDataSource(propsRef, { getPaginationInfo, setPagination, clearSelectedRowKeys }) {
   const dataSourceRef = ref([]);
   watch(
     () => unref(propsRef).dataSource,
@@ -1026,15 +1042,18 @@ function useDataSource(propsRef, {
   }
   const { defSort, onTableChange } = unref(propsRef);
   const { appConf } = useAppStore();
-  onTableChange({
-    pagination: {
-      current: 1,
-      pageSize: appConf.ui.table.defaultPageSize
+  onTableChange(
+    {
+      pagination: {
+        current: 1,
+        pageSize: appConf.ui.table.defaultPageSize
+      },
+      sort: defSort,
+      filter: null,
+      showBtnLoading: false
     },
-    sort: defSort,
-    filter: null,
-    showBtnLoading: false
-  }, false);
+    false
+  );
   function updateTableDataRecord(rowKey, record) {
     const row = findTableDataRecord(rowKey);
     if (row) {
@@ -1045,8 +1064,9 @@ function useDataSource(propsRef, {
     }
   }
   function findTableDataRecord(rowKey) {
-    if (!dataSourceRef.value || dataSourceRef.value.length == 0 || !rowKey)
+    if (!dataSourceRef.value || dataSourceRef.value.length == 0 || !rowKey) {
       return;
+    }
     const { childrenColumnName = "children" } = unref(propsRef);
     const findRow = (array) => {
       let ret;
@@ -1839,8 +1859,9 @@ function useRowSelection(propsRef, emit) {
   const selectedRowRef = ref([]);
   const getRowSelectionRef = computed(() => {
     const { rowSelection, showCheckboxColumn, checkStrictly } = unref(propsRef);
-    if (!rowSelection && !showCheckboxColumn)
+    if (!rowSelection && !showCheckboxColumn) {
       return null;
+    }
     if (isBoolean(showCheckboxColumn)) {
       if (showCheckboxColumn && rowSelection) {
         rowSelection.type = "checkbox";
@@ -1905,8 +1926,9 @@ function useRowSelection(propsRef, emit) {
         const { rowSelection } = unref(propsRef);
         if (rowSelection) {
           const { onChange } = rowSelection;
-          if (onChange && isFunction(onChange))
+          if (onChange && isFunction(onChange)) {
             onChange(getSelectedRowKeys(), getSelectRows());
+          }
         }
         emit("selection-change", {
           keys: getSelectedRowKeys(),
@@ -1938,7 +1960,7 @@ function useTableScroll(propsRef, tableElRef, columnsRef, rowSelectionRef) {
   windowResizeFn(debounceRedoHeight, 280);
   watch(
     () => propsRef.value.dataSource,
-    (v) => {
+    () => {
       debounceRedoHeight();
     },
     {
@@ -1947,8 +1969,8 @@ function useTableScroll(propsRef, tableElRef, columnsRef, rowSelectionRef) {
     }
   );
   function redoHeight() {
-    const { virtual } = unref(propsRef);
-    virtual ? calcTableScroll() : filterSource.value = unref(propsRef)?.dataSource;
+    const { virtual, dataSource } = unref(propsRef);
+    virtual ? calcTableScroll() : filterSource.value = dataSource.map((row) => new Proxy(row, {}));
   }
   const getScrollX = computed(() => {
     let width = 0;
@@ -1965,7 +1987,7 @@ function useTableScroll(propsRef, tableElRef, columnsRef, rowSelectionRef) {
     return tableWidth > width ? "100%" : width;
   });
   const hideScrollX = computed(() => {
-    let operations = unref(propsRef).operations;
+    const operations = unref(propsRef).operations;
     return !operations || isObject(operations) && operations?.btns && !operations?.btns?.length || isArray(operations) && !operations.length;
   });
   const getScrollRef = computed(() => {
@@ -1990,15 +2012,15 @@ function useTableScroll(propsRef, tableElRef, columnsRef, rowSelectionRef) {
     on(bodyEl, "scroll", fn);
   }
   function createScrollWrap(el, prefixH) {
-    let data = unref(propsRef)?.dataSource?.length;
+    const data = unref(propsRef)?.dataSource?.length;
     const { getUiSize } = useHeader();
     const rowHeight = TABLE_SIZE_HEIGHT[unref(getUiSize)];
-    let scrollWrap = el.querySelector(".tableScrollWrap");
-    let wrapHeight = data * rowHeight - prefixH + "px";
+    const scrollWrap = el.querySelector(".tableScrollWrap");
+    const wrapHeight = data * rowHeight - prefixH + "px";
     if (scrollWrap) {
       scrollWrap.style.height = wrapHeight;
     } else {
-      let div = document.createElement("div");
+      const div = document.createElement("div");
       div.className = "tableScrollWrap";
       div.style.height = wrapHeight;
       el.insertBefore(div, el.querySelector("table")[0]);
@@ -2009,10 +2031,10 @@ function useTableScroll(propsRef, tableElRef, columnsRef, rowSelectionRef) {
     cancelAnimationFrame(unref(t));
     t.value = requestAnimationFrame(() => {
       const scrollTop = el.scrollTop;
-      let maxIndex = Math.round(scrollTop / itemH) + itemSize * 2;
-      let minIndex = Math.round(scrollTop / itemH) - itemSize;
+      const maxIndex = Math.round(scrollTop / itemH) + itemSize * 2;
+      const minIndex = Math.round(scrollTop / itemH) - itemSize;
       if (minIndex < 0) {
-        bodyEl.querySelector("table").style.transform = `translateY(0px)`;
+        bodyEl.querySelector("table").style.transform = "translateY(0px)";
         filterSource.value = unref(propsRef)?.dataSource.slice(0, itemSize * 3);
       } else {
         bodyEl.querySelector("table").style.transform = `translateY(${minIndex * itemH}px)`;
@@ -2112,7 +2134,7 @@ const _sfc_main$1 = {
           }, [txt]);
         } else if (isVnode(render)) {
           renderText.value = createVNode(Fragment, null, [createTextVNode(" "), render, createTextVNode(" ")]);
-        } else if (render["setup"]) {
+        } else if (render.setup) {
           renderText.value = createVNode(render, {
             ...record,
             text
@@ -2122,7 +2144,7 @@ const _sfc_main$1 = {
         let afterRenderData = render(record, index2, text);
         if (afterRenderData.__v_isRef) {
           renderText = afterRenderData;
-        } else if (afterRenderData["setup"]) {
+        } else if (afterRenderData.setup) {
           renderText.value = createVNode(afterRenderData, {
             ...record,
             text
@@ -2280,11 +2302,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     });
     const { getRowClassName } = useRows(getProps);
     const tableCls = computed(() => {
-      return [
-        "dt-table",
-        "box-border",
-        { "dt-table-no-pagation": !unref(getProps).pagination }
-      ];
+      return ["dt-table", "box-border", { "dt-table-no-pagation": !unref(getProps).pagination }];
     });
     const { getLoading, setLoading } = useLoading(getProps);
     const { getPaginationInfo, setPagination, getPagination } = usePagination(getProps);
@@ -2304,7 +2322,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       getSelectedRowKeys,
       setSelectedRowKeys
     } = useRowSelection(getProps, emits);
-    const { getScrollRef, filterSource } = useTableScroll(getProps, tableElRef, getColumnsRef, getRowSelectionRef);
+    const { getScrollRef, filterSource } = useTableScroll(
+      getProps,
+      tableElRef,
+      getColumnsRef,
+      getRowSelectionRef
+    );
     const handlers = {
       onColumnsChange: (data) => {
         emits("columns-change", data);
@@ -2312,7 +2335,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
     };
     const { getHeaderProps } = useTableHeader(getProps, slots, handlers);
-    const { customRow } = useCustomRow(getProps, { setSelectedRowKeys, getSelectedRowKeys, clearSelectedRowKeys, emits });
+    const { customRow } = useCustomRow(getProps, {
+      setSelectedRowKeys,
+      getSelectedRowKeys,
+      clearSelectedRowKeys,
+      emits
+    });
     const { handleTableChange, findTableDataRecord, updateTableDataRecord } = useDataSource(
       getProps,
       {
@@ -2322,6 +2350,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
     );
     const getBind = computed(() => {
+      console.log(toRaw$1(unref(filterSource)));
       return {
         ...attrs,
         ...unref(getProps),
@@ -2380,8 +2409,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       unref(innerPropsRef)?.registerInstance(tableAction);
     }
     onMounted(() => {
-      if (unref(getProps).autoFetch)
+      if (unref(getProps).autoFetch) {
         unref(getProps)?.onSearch({});
+      }
     });
     return (_ctx, _cache) => {
       const _component_ATable = Table;
@@ -2389,7 +2419,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         ref_key: "tableElRef",
         ref: tableElRef
       }, unref(getBind), {
-        rowClassName: unref(getRowClassName),
+        "row-class-name": unref(getRowClassName),
         onChange: unref(handleTableChange)
       }), createSlots({
         bodyCell: withCtx(({ column, record, index: index2 }) => [
@@ -2417,7 +2447,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             ])
           };
         })
-      ]), 1040, ["rowClassName", "onChange"]);
+      ]), 1040, ["row-class-name", "onChange"]);
     };
   }
 });

package/es/components/table/src/types/table.type.d.ts

@@ -55,6 +55,7 @@ export interface BasicColumn extends ColumnProps<Recordable> {
 export declare type ButtonType = {
     t?: string;
     label?: string | ((row: Recordable) => string);
+    enLabel?: string | ((row: Recordable) => string);
     icon?: string | ((row: Recordable) => string);
     auth?: string;
     color?: string;

package/es/components/tree/index.js

@@ -315,6 +315,7 @@ function useTree(treeDataRef, getFieldNames, emit) {
     for (let index = 0; index < data.length; index++) {
       const item = data[index];
       const { key: keyField, children: childrenField } = unref(getFieldNames);
+      console.log(keyField, childrenField);
       const key = keyField ? item[keyField] : "";
       const children = childrenField ? item[childrenField] : [];
       res.push(key);
@@ -1135,6 +1136,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       emit("update:value", v);
       emit("change", v);
     });
+    watchEffect(() => {
+      activeKey.value = props.activeKey;
+    });
     watchEffect(() => {
       treeDataRef.value = props.treeData;
     });
@@ -1182,8 +1186,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           showIcon: false,
           treeData: unref(treeData),
           onDrop: unref(onDrop)
-        }), null, 16, ["treeData", "onDrop"])], 512), [[vShow, !unref(getNotFound)]]), withDirectives(createVNode(_component_AEmpty, null, null, 512), [[vShow, unref(getNotFound)]])]),
-        _: 1
+        }), createSlots({
+          _: 2
+        }, [_ctx.$slots.switcherIcon ? {
+          name: "switcherIcon",
+          fn: withCtx((data) => [renderSlot(_ctx.$slots, "switcherIcon", normalizeProps(guardReactiveProps(data || {})))]),
+          key: "0"
+        } : void 0]), 1040, ["treeData", "onDrop"])], 512), [[vShow, !unref(getNotFound)]]), withDirectives(createVNode(_component_AEmpty, null, null, 512), [[vShow, unref(getNotFound)]])]),
+        _: 3
       }, 8, ["spinning", "tip"])], 2);
     };
   }

package/es/components/tree/index.less

@@ -22,6 +22,12 @@
         overflow-y: auto;
         padding: 10px 0;
 
+        .ant-tree-switcher{
+            display: flex;
+            align-items: center;
+            justify-content: center;
+        }
+
         .ant-tree-treenode{
             padding: 0;
             align-items: center;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@dt-frames/ui",
-	"version": "2.0.18",
+	"version": "2.0.19",
 	"type": "module",
 	"license": "MIT",
 	"main": "./src/index.ts",