@dt-frames/ui 2.0.14 → 2.0.15

package/es/components/form/index.js

@@ -56,7 +56,7 @@ function createPlaceholder(component) {
   if (component.includes("Input") || component.includes("Complete")) {
     return t("PLEASE_INPUT");
   }
-  if (component.includes("Picker") || component.includes("Select") || component.includes("Cascader") || component.includes("Checkbox") || component.includes("Radio") || component.includes("Switch")) {
+  if (component.includes("Picker") || component.includes("Select") || component.includes("Cascader") || component.includes("Checkbox") || component.includes("Radio") || component.includes("Switch") || component.includes("Upload")) {
     return t("PLEASE_SELECT");
   }
   if (component.includes("Icon")) {
@@ -423,7 +423,8 @@ const _sfc_main$2 = {
         changeEvent = "change",
         valueField,
         renderComponent,
-        props: sProps
+        props: sProps,
+        extraName
       } = props.schema;
       const isCheck = component && ["Switch", "Checkbox"].includes(component);
       const eventKey = `on${upperFirst(changeEvent)}`;
@@ -493,7 +494,9 @@ const _sfc_main$2 = {
       if (["DatePicker", "MonthPicker", "RangePicker"].includes(component)) {
         itemProps.defaultValue = props.formModel[name];
       }
-      itemProps.codeName = name;
+      if (component === "Upload" && !itemProps.defaultFiles && extraName?.length) {
+        itemProps.defaultFiles = unref(getValues).values?.[extraName[0]];
+      }
       itemProps.formValues = unref(getValues);
       if (["Select", "DatePicker", "MonthPicker", "WeekPicker", "RangePicker"].includes(component)) {
         itemProps.dropdownClassName += ` ${unref(getUiSize)}`;

package/es/components/form/index.less

@@ -14,7 +14,14 @@
 
 	&__dialog {
 		.ant-form-item {
-			margin-bottom: 20px;
+			margin-bottom: 22px;
+			&.small{
+				margin-bottom: 18px;
+			}
+
+			&.ant-form-item-with-help{
+				margin-bottom: 0;
+			}
 		}
 	}
 
@@ -102,8 +109,8 @@
 		}
 
 		.ant-form-item-explain{
-			height: 16px;
-			min-height: 16px;
+			height: 18px;
+			min-height: 18px;
 		}
 		.ant-form-item-explain-error{
 			font-size: 12px;
@@ -218,6 +225,15 @@
 				font-size: 13px;
 			}
 		}
+
+		.ant-form-item-explain{
+			height: 22px;
+			min-height: 22px;
+		}
+		.ant-form-item-explain-error{
+			font-size: 13px;
+			line-height: 20px;
+		}
 	}
 
 	.ant-form-item.large{
@@ -294,6 +310,15 @@
 				font-size: 14px;
 			}
 		}
+
+		.ant-form-item-explain{
+			height: 22px;
+			min-height: 22px;
+		}
+		.ant-form-item-explain-error{
+			font-size: 13px;
+			line-height: 20px;
+		}
 	}
 
 	.ant-input-number {

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

@@ -41,8 +41,8 @@ export declare const BasicProps: {
     };
     rowProps: {
         type: PropType<Partial<import("vue").ExtractPropTypes<{
-            align: PropType<"middle" | "top" | "bottom" | "stretch">;
-            justify: PropType<"center" | "space-around" | "space-between" | "end" | "start">;
+            align: PropType<"stretch" | "bottom" | "top" | "middle">;
+            justify: PropType<"space-around" | "space-between" | "center" | "end" | "start">;
             prefixCls: StringConstructor;
             gutter: {
                 type: PropType<import("ant-design-vue/lib/grid/Row").Gutter | [import("ant-design-vue/lib/grid/Row").Gutter, import("ant-design-vue/lib/grid/Row").Gutter]>;
@@ -62,7 +62,7 @@ export declare const BasicProps: {
         type: NumberConstructor;
     };
     size: {
-        type: PropType<"small" | "large" | "middle">;
+        type: PropType<"middle" | "small" | "large">;
     };
     disabled: {
         type: BooleanConstructor;

package/es/components/table/index.js

@@ -1,5 +1,5 @@
 import { useAppStore, useSlots, error, http, useApp, getDynamicProps, isBoolean, isFunction, getPopupContainer, useI18n, isNumber, isArray, isObject, isString, useMessage, isNullAndUnDef, windowResizeFn, off, on, getDictValueByCode, formatNumber, isVnode } from "@dt-frames/core";
-import { useSlots as useSlots$1, unref, ref, watch, onUnmounted, defineComponent, useAttrs, resolveDirective, openBlock, createElementBlock, normalizeClass, Fragment, renderList, toDisplayString, createCommentVNode, createBlock, withCtx, createVNode, withDirectives, createElementVNode, normalizeStyle, provide, inject, h as h$1, computed, mergeProps, nextTick, toRaw as toRaw$1, reactive, createTextVNode, watchEffect, normalizeProps, renderSlot, onMounted, createSlots, guardReactiveProps } from "vue";
+import { useSlots as useSlots$1, unref, ref, watch, onUnmounted, defineComponent, useAttrs, resolveDirective, openBlock, createElementBlock, normalizeClass, Fragment, renderList, toDisplayString, createCommentVNode, createBlock, withCtx, createVNode, withDirectives, createElementVNode, createTextVNode, normalizeStyle, provide, inject, h as h$1, computed, mergeProps, nextTick, toRaw as toRaw$1, reactive, watchEffect, normalizeProps, renderSlot, onMounted, createSlots, guardReactiveProps } from "vue";
 import { useHeader } from "../../theme";
 import { MenuItem, Menu, Dropdown, Tooltip, Checkbox as Checkbox$1, Divider, Col, Row, Button, CheckboxGroup, Popover as Popover$1, Table } from "ant-design-vue/es";
 import "ant-design-vue/es/table/style";
@@ -236,16 +236,16 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
         key: 0,
         class: normalizeClass(__props.expandNum ? "dt-expand-has-collapse" : "")
       }, [
-        (openBlock(true), createElementBlock(Fragment, null, renderList(actionBtns.value, (item, index2) => {
+        (openBlock(true), createElementBlock(Fragment, null, renderList(actionBtns.value, (item, index) => {
           return openBlock(), createElementBlock(Fragment, null, [
             item.ifShow ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
               __props.expandNum ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
-                index2 < __props.expandNum ? (openBlock(), createElementBlock("span", {
+                index < __props.expandNum ? (openBlock(), createElementBlock("span", {
                   key: 0,
                   class: "dt-table-action-btn w-8 inline-block",
                   onClick: ($event) => handleAction(item)
-                }, toDisplayString(item.label()), 9, _hoisted_1$8)) : createCommentVNode("v-if", true),
-                index2 >= __props.expandNum && index2 === actionBtns.value.length - 1 ? (openBlock(), createBlock(_component_ADropdown, {
+                }, toDisplayString(item.label()), 9, _hoisted_1$8)) : createCommentVNode("", true),
+                index >= __props.expandNum && index === actionBtns.value.length - 1 ? (openBlock(), createBlock(_component_ADropdown, {
                   key: 1,
                   getPopupContainer: getPopupContainer$1,
                   trigger: ["click"]
@@ -264,10 +264,10 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
                                   createElementVNode("span", _hoisted_4$2, toDisplayString(item1.label()), 1)
                                 ]),
                                 _: 2
-                              }, 1032, ["onClick"])) : createCommentVNode("v-if", true)
+                              }, 1032, ["onClick"])) : createCommentVNode("", true)
                             ])), [
                               [_directive_auth, getAuth(item1.auth)]
-                            ]) : createCommentVNode("v-if", true)
+                            ]) : createCommentVNode("", true)
                           ], 64);
                         }), 256))
                       ]),
@@ -278,26 +278,28 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
                     _hoisted_2$2
                   ]),
                   _: 1
-                })) : createCommentVNode("v-if", true)
+                })) : createCommentVNode("", true)
               ], 64)) : (openBlock(), createBlock(_component_ATooltip, {
                 key: 1,
                 placement: "bottom"
               }, {
                 title: withCtx(() => [
-                  createElementVNode("span", _hoisted_5$1, toDisplayString(item.label()), 1)
+                  createTextVNode(toDisplayString(item.label()), 1)
                 ]),
                 default: withCtx(() => [
-                  createElementVNode("i", {
-                    class: normalizeClass(["i cursor-pointer", item.icon()]),
-                    style: normalizeStyle({
-                      color: item.color
-                    }),
-                    onClick: ($event) => handleAction(item)
-                  }, null, 14, _hoisted_6)
+                  createElementVNode("span", _hoisted_5$1, [
+                    createElementVNode("i", {
+                      class: normalizeClass(["i cursor-pointer", item.icon()]),
+                      style: normalizeStyle({
+                        color: item.color
+                      }),
+                      onClick: ($event) => handleAction(item)
+                    }, null, 14, _hoisted_6)
+                  ])
                 ]),
                 _: 2
               }, 1024))
-            ], 64)) : createCommentVNode("v-if", true)
+            ], 64)) : createCommentVNode("", true)
           ], 64);
         }), 256))
       ], 2)) : (openBlock(), createBlock(_component_ADropdown, {
@@ -324,7 +326,7 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
                       createElementVNode("span", _hoisted_8, toDisplayString(item.label()), 1)
                     ]),
                     _: 2
-                  }, 1032, ["onClick"])) : createCommentVNode("v-if", true)
+                  }, 1032, ["onClick"])) : createCommentVNode("", true)
                 ])), [
                   [_directive_auth, getAuth(item.auth)]
                 ]);
@@ -341,14 +343,6 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const _export_sfc = (sfc, props2) => {
-  const target = sfc.__vccOpts || sfc;
-  for (const [key, val] of props2) {
-    target[key] = val;
-  }
-  return target;
-};
-const TableAction = /* @__PURE__ */ _export_sfc(_sfc_main$9, [["__file", "D:/dt/dt-frame-front/dt-frames/frames/packages/ui/src/components/table/src/components/TableAction.vue"]]);
 const tableKey = Symbol("dt-page");
 function createTableInstance(instance) {
   provide(tableKey, instance);
@@ -443,9 +437,9 @@ const _sfc_main$8 = /* @__PURE__ */ defineComponent({
       const val = unref(currentValueRef);
       const value = isCheckValue ? isNumber(val) && isBoolean(val) ? val : !!val : val;
       let compProps = props2.column?.editComponentProps ?? {};
-      const { record, column, index: index2 } = props2;
+      const { record, column, index } = props2;
       if (isFunction(compProps)) {
-        compProps = compProps({ text: val, record, column, index: index2 }) ?? {};
+        compProps = compProps({ text: val, record, column, index }) ?? {};
       }
       if (unref(getComponent) === "InputNumber") {
         compProps = {
@@ -525,9 +519,8 @@ const _sfc_main$8 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const EditableCell = /* @__PURE__ */ _export_sfc(_sfc_main$8, [["__file", "D:/dt/dt-frame-front/dt-frames/frames/packages/ui/src/components/table/src/components/editTable/EditTableCell.vue"]]);
 function renderEditCell(column) {
-  return ({ text: value, record, index: index2 }) => {
+  return ({ text: value, record, index }) => {
     record.onValid = async () => {
       if (isArray(record?.validCbs)) {
         const validFns = (record?.validCbs || []).map((fn) => fn());
@@ -555,11 +548,11 @@ function renderEditCell(column) {
       }
       return true;
     };
-    return h(EditableCell, {
+    return h(_sfc_main$8, {
       value,
       record,
       column,
-      index: index2
+      index
     });
   };
 }
@@ -616,17 +609,17 @@ function handleIndexColumn(propsRef, getPaginationRef, columns) {
     width: unref(getIsZH) ? 50 : 70,
     title: t("NUMBER"),
     align: "center",
-    customRender: ({ index: index2, renderIndex, record }) => {
+    customRender: ({ index, renderIndex, record }) => {
       if (virtual && record?.index)
         return record?.index;
       const getPagination = unref(getPaginationRef);
       const { appConf } = useAppStore();
       const { defaultPageSize } = appConf.ui.table;
       if (isBoolean(getPagination)) {
-        return `${index2 + 1}`;
+        return `${index + 1}`;
       }
       const { current = 1, pageSize = defaultPageSize } = getPagination;
-      return ((current < 1 ? 1 : current) - 1) * pageSize + index2 + 1;
+      return ((current < 1 ? 1 : current) - 1) * pageSize + index + 1;
     },
     ...isFixedLeft ? {
       fixed: "left"
@@ -664,14 +657,14 @@ function handleActionColumn(propsRef, columns) {
     };
     columns.push({
       ...columnObj,
-      customRender: ({ record, index: index2 }) => {
+      customRender: ({ record, index }) => {
         return h$1(
-          TableAction,
+          _sfc_main$9,
           omit({
             ...columnObj,
             authPrefix,
             record,
-            index: index2
+            index
           }, "align")
         );
       }
@@ -708,7 +701,7 @@ function useColumns(propsRef, getPaginationRef, tableElRef) {
   const getColumnsRef = computed(() => {
     const columns = cloneDeep(unref(columnsRef));
     const { ellipsis } = unref(propsRef);
-    columns.forEach((it, index2) => {
+    columns.forEach((it, index) => {
       it.class = it.class ?? "";
       if (!it.class.split(" ").includes("__column")) {
         it.class = `${it.class} __column`;
@@ -842,7 +835,7 @@ function useColumns(propsRef, getPaginationRef, tableElRef) {
   };
 }
 function useCustomRow(propsRef, { setSelectedRowKeys, getSelectedRowKeys, clearSelectedRowKeys, emits }) {
-  const customRow = (record, index2) => {
+  const customRow = (record, index) => {
     return {
       onClick: (e) => {
         e?.stopPropagation();
@@ -896,19 +889,19 @@ function useCustomRow(propsRef, { setSelectedRowKeys, getSelectedRowKeys, clearS
           }
         }
         handleClick();
-        emits("row-click", record, index2, e);
+        emits("row-click", record, index, e);
       },
       onDblclick: (event) => {
-        emits("row-dbClick", record, index2, event);
+        emits("row-dbClick", record, index, event);
       },
       onContextmenu: (event) => {
-        emits("row-contextmenu", record, index2, event);
+        emits("row-contextmenu", record, index, event);
       },
       onMouseenter: (event) => {
-        emits("row-mouseenter", record, index2, event);
+        emits("row-mouseenter", record, index, event);
       },
       onMouseleave: (event) => {
-        emits("row-mouseleave", record, index2, event);
+        emits("row-mouseleave", record, index, event);
       }
     };
   };
@@ -1030,7 +1023,7 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
       const _component_ATooltip = Tooltip;
       return openBlock(), createBlock(_component_ATooltip, { placement: "top" }, {
         title: withCtx(() => [
-          !unref(isFullscreen) ? (openBlock(), createElementBlock("span", _hoisted_1$6, toDisplayString(unref(t)("FULLSCREEN")), 1)) : createCommentVNode("v-if", true)
+          !unref(isFullscreen) ? (openBlock(), createElementBlock("span", _hoisted_1$6, toDisplayString(unref(t)("FULLSCREEN")), 1)) : createCommentVNode("", true)
         ]),
         default: withCtx(() => [
           createElementVNode("span", {
@@ -1047,7 +1040,6 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const FullscreenSetting = /* @__PURE__ */ _export_sfc(_sfc_main$7, [["__file", "D:/dt/dt-frame-front/dt-frames/frames/packages/ui/src/components/table/src/components/tableSetting/Fullscreen.vue"]]);
 const _hoisted_1$5 = { class: "column-select" };
 const _sfc_main$6 = /* @__PURE__ */ defineComponent({
   __name: "DownloadCtrl",
@@ -1119,7 +1111,7 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
             createVNode(_component_ADivider, { dashed: "" }),
             createVNode(_component_ARow, null, {
               default: withCtx(() => [
-                (openBlock(true), createElementBlock(Fragment, null, renderList(modalData.value, (it, index2) => {
+                (openBlock(true), createElementBlock(Fragment, null, renderList(modalData.value, (it, index) => {
                   return openBlock(), createBlock(_component_ACol, { span: 8 }, {
                     default: withCtx(() => [
                       createVNode(_component_ACheckbox, {
@@ -1145,7 +1137,6 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const DownloadCtrl = /* @__PURE__ */ _export_sfc(_sfc_main$6, [["__file", "D:/dt/dt-frame-front/dt-frames/frames/packages/ui/src/components/table/src/components/tableSetting/DownloadCtrl.vue"]]);
 const _hoisted_1$4 = /* @__PURE__ */ createElementVNode("span", { class: "flex" }, [
   /* @__PURE__ */ createElementVNode("i", { class: "i ic:baseline-download w-7 leading-7 text-center cursor-pointer" })
 ], -1);
@@ -1204,19 +1195,19 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
                       createElementVNode("span", null, toDisplayString(unref(t)("EXPORT_CURRENT_PAGE")), 1)
                     ]),
                     _: 1
-                  })) : createCommentVNode("v-if", true),
+                  })) : createCommentVNode("", true),
                   unref(showSelectedDownload) ? (openBlock(), createBlock(_component_AMenuItem, { key: "select" }, {
                     default: withCtx(() => [
                       createElementVNode("span", null, toDisplayString(unref(t)("EXPORT_SELECT_COLUMN")), 1)
                     ]),
                     _: 1
-                  })) : createCommentVNode("v-if", true),
+                  })) : createCommentVNode("", true),
                   unref(showBackDownload) ? (openBlock(), createBlock(_component_AMenuItem, { key: "all" }, {
                     default: withCtx(() => [
                       createElementVNode("span", null, toDisplayString(unref(t)("EXPORT_ALL")), 1)
                     ]),
                     _: 1
-                  })) : createCommentVNode("v-if", true)
+                  })) : createCommentVNode("", true)
                 ]),
                 _: 1
               })
@@ -1226,14 +1217,13 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
             ]),
             _: 1
           }),
-          createVNode(DownloadCtrl, { onRegister: unref(registerDialog) }, null, 8, ["onRegister"])
+          createVNode(_sfc_main$6, { onRegister: unref(registerDialog) }, null, 8, ["onRegister"])
         ]),
         _: 1
       });
     };
   }
 });
-const Download = /* @__PURE__ */ _export_sfc(_sfc_main$5, [["__file", "D:/dt/dt-frame-front/dt-frames/frames/packages/ui/src/components/table/src/components/tableSetting/Download.vue"]]);
 const _hoisted_1$3 = /* @__PURE__ */ createElementVNode("i", { class: "i ant-design:drag-outlined drag-icon cursor-pointer" }, null, -1);
 const _hoisted_2$1 = ["onClick"];
 const _hoisted_3$1 = ["onClick"];
@@ -1376,9 +1366,9 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
         return;
       const columns = getColumns();
       const isFixed = item.fixed === fixed ? false : fixed;
-      const index2 = columns.findIndex((col) => col.dataIndex === item.dataIndex);
-      if (index2 !== -1) {
-        columns[index2].fixed = isFixed;
+      const index = columns.findIndex((col) => col.dataIndex === item.dataIndex);
+      if (index !== -1) {
+        columns[index].fixed = isFixed;
       }
       item.fixed = isFixed;
       if (isFixed && !item.width) {
@@ -1569,7 +1559,6 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const ColumnSetting = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["__file", "D:/dt/dt-frame-front/dt-frames/frames/packages/ui/src/components/table/src/components/tableSetting/Column.vue"]]);
 const _hoisted_1$2 = { class: "flex dt-table-setting" };
 const _sfc_main$3 = /* @__PURE__ */ defineComponent({
   __name: "index",
@@ -1595,17 +1584,16 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
     }
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", _hoisted_1$2, [
-        unref(getSetting).download ? (openBlock(), createBlock(Download, normalizeProps(mergeProps({ key: 0 }, unref(getSetting))), null, 16)) : createCommentVNode("v-if", true),
-        unref(getSetting).setting ? (openBlock(), createBlock(ColumnSetting, {
+        unref(getSetting).download ? (openBlock(), createBlock(_sfc_main$5, normalizeProps(mergeProps({ key: 0 }, unref(getSetting))), null, 16)) : createCommentVNode("", true),
+        unref(getSetting).setting ? (openBlock(), createBlock(_sfc_main$4, {
           key: 1,
           onColumnsChange: handleColumnChange
-        })) : createCommentVNode("v-if", true),
-        unref(getSetting).fullscreen ? (openBlock(), createBlock(FullscreenSetting, { key: 2 })) : createCommentVNode("v-if", true)
+        })) : createCommentVNode("", true),
+        unref(getSetting).fullscreen ? (openBlock(), createBlock(_sfc_main$7, { key: 2 })) : createCommentVNode("", true)
       ]);
     };
   }
 });
-const DtTableSetting = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["__file", "D:/dt/dt-frame-front/dt-frames/frames/packages/ui/src/components/table/src/components/tableSetting/index.vue"]]);
 const _hoisted_1$1 = { class: "dt-table-header" };
 const _hoisted_2 = { class: "flex flex-row justify-between" };
 const _hoisted_3 = { class: "flex flex-row flex-1" };
@@ -1641,21 +1629,20 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
       return openBlock(), createElementBlock("div", _hoisted_1$1, [
         createElementVNode("div", _hoisted_2, [
           createElementVNode("div", _hoisted_3, [
-            unref(getActionsProps)?.buttonList.length ? (openBlock(), createBlock(unref(DtFormButtons), normalizeProps(mergeProps({ key: 0 }, unref(getActionsProps))), null, 16)) : createCommentVNode("v-if", true),
+            unref(getActionsProps)?.buttonList.length ? (openBlock(), createBlock(unref(DtFormButtons), normalizeProps(mergeProps({ key: 0 }, unref(getActionsProps))), null, 16)) : createCommentVNode("", true),
             renderSlot(_ctx.$slots, "toolbar")
           ]),
           __props.tableSetting ? (openBlock(), createElementBlock("div", _hoisted_4, [
-            createVNode(DtTableSetting, { setting: __props.tableSetting }, null, 8, ["setting"])
-          ])) : createCommentVNode("v-if", true)
+            createVNode(_sfc_main$3, { setting: __props.tableSetting }, null, 8, ["setting"])
+          ])) : createCommentVNode("", true)
         ]),
         _ctx.$slots.headerTop ? (openBlock(), createElementBlock("div", _hoisted_5, [
           renderSlot(_ctx.$slots, "headerTop")
-        ])) : createCommentVNode("v-if", true)
+        ])) : createCommentVNode("", true)
       ]);
     };
   }
 });
-const TableHeader = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__file", "D:/dt/dt-frame-front/dt-frames/frames/packages/ui/src/components/table/src/components/TableHeader.vue"]]);
 function useTableHeader(propsRef, slots, handlers) {
   const { t } = useI18n("UI");
   const getHeaderProps = computed(() => {
@@ -1668,7 +1655,7 @@ function useTableHeader(propsRef, slots, handlers) {
     const hideTitle = (!toolbar || !toolbar.filter((it) => it.show ?? true).length) && !slots.toolbar && !slots.headerTop && !tableSetting;
     return {
       title: hideTitle ? null : () => h$1(
-        TableHeader,
+        _sfc_main$2,
         {
           tableSetting,
           toolbar,
@@ -2048,14 +2035,14 @@ function useTableScroll(propsRef, tableElRef, columnsRef, rowSelectionRef) {
   };
 }
 function useRows(propsRef) {
-  function getRowClassName(record, index2) {
+  function getRowClassName(record, index) {
     const { striped, rowClassName } = unref(propsRef);
     const classNames = [];
     if (striped) {
-      classNames.push(index2 % 2 === 1 ? "table-striped" : "");
+      classNames.push(index % 2 === 1 ? "table-striped" : "");
     }
     if (rowClassName && isFunction(rowClassName)) {
-      classNames.push(rowClassName(record, index2));
+      classNames.push(rowClassName(record, index));
     }
     return classNames.join(" ");
   }
@@ -2085,7 +2072,7 @@ const _sfc_main$1 = {
       const {
         column,
         record,
-        index: index2
+        index
       } = props2;
       const {
         render,
@@ -2127,7 +2114,7 @@ const _sfc_main$1 = {
           });
         }
       } else if (isFunction(render)) {
-        let afterRenderData = render(record, index2, text);
+        let afterRenderData = render(record, index, text);
         if (afterRenderData.__v_isRef) {
           renderText = afterRenderData;
         } else if (afterRenderData["setup"]) {
@@ -2145,7 +2132,6 @@ const _sfc_main$1 = {
     return () => createVNode("span", null, [unref(renderText)]);
   }
 };
-const TableRender = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__file", "D:/dt/dt-frame-front/dt-frames/frames/packages/ui/src/components/table/src/components/TableRender.vue"]]);
 const DEFAULT_SORT_FN = (sortInfo) => {
   const { field, order } = sortInfo;
   return field && order ? { field, order } : {};
@@ -2248,11 +2234,11 @@ const TableProps = {
   },
   onOpenUpdateDialog: {
     type: Function,
-    default: (row, index2) => ({})
+    default: (row, index) => ({})
   },
   onDelete: {
     type: Function,
-    default: (row, index2) => ({})
+    default: (row, index) => ({})
   },
   onDeletes: {
     type: Function,
@@ -2400,16 +2386,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         rowClassName: unref(getRowClassName),
         onChange: unref(handleTableChange)
       }), createSlots({
-        bodyCell: withCtx(({ column, record, index: index2 }) => [
-          _ctx.$slots.bodyCell ? renderSlot(_ctx.$slots, "bodyCell", normalizeProps(mergeProps({ key: 0 }, { column, record, index: index2 }))) : createCommentVNode("v-if", true),
-          column.slot ? renderSlot(_ctx.$slots, column.slot, normalizeProps(mergeProps({ key: 1 }, { column, record, index: index2 }))) : createCommentVNode("v-if", true),
-          createCommentVNode(" \u9759\u6001\u7684\u6570\u636E\u53EF\u4EE5\u901A\u8FC7customRender, \u4F46\u662F\u54CD\u5E94\u5F0F\u6570\u636E, \u5F02\u6B65\u51FD\u6570,\u7EC4\u4EF6\u7B49\u9700\u8981\u4F7F\u7528bodyCell\u6E32\u67D3 "),
-          column?.render && !column.slot && !_ctx.$slots.bodyCell ? (openBlock(), createBlock(TableRender, {
+        bodyCell: withCtx(({ column, record, index }) => [
+          _ctx.$slots.bodyCell ? renderSlot(_ctx.$slots, "bodyCell", normalizeProps(mergeProps({ key: 0 }, { column, record, index }))) : createCommentVNode("", true),
+          column.slot ? renderSlot(_ctx.$slots, column.slot, normalizeProps(mergeProps({ key: 1 }, { column, record, index }))) : createCommentVNode("", true),
+          column?.render && !column.slot && !_ctx.$slots.bodyCell ? (openBlock(), createBlock(_sfc_main$1, {
             key: 2,
             column,
             record,
-            index: index2
-          }, null, 8, ["column", "record", "index"])) : createCommentVNode("v-if", true)
+            index
+          }, null, 8, ["column", "record", "index"])) : createCommentVNode("", true)
         ]),
         emptyText: withCtx(() => [
           _hoisted_1
@@ -2428,8 +2413,7 @@ 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/table/src/index.vue"]]);
 export {
-  index as DtTable,
+  _sfc_main as DtTable,
   useTable
 };

package/es/components/table/src/components/TableAction.d.ts

@@ -9,6 +9,9 @@ declare const _sfc_main: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
+    expandNum: {
+        type: NumberConstructor;
+    };
     width: {
         type: StringConstructor;
         default: string;
@@ -47,6 +50,9 @@ declare const _sfc_main: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
+    expandNum: {
+        type: NumberConstructor;
+    };
     width: {
         type: StringConstructor;
         default: string;

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

@@ -75,7 +75,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    expandMethodIcon: {
+    expandActions: {
         type: BooleanConstructor;
         default: boolean;
     };
@@ -311,7 +311,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
         slotsTemplate: {};
         showIndexColumn: boolean;
         showCheckboxColumn: boolean;
-        expandMethodIcon: boolean;
+        expandActions: boolean;
         ellipsis: boolean;
         canResize: boolean;
         onTableChange: Function;
@@ -478,7 +478,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    expandMethodIcon: {
+    expandActions: {
         type: BooleanConstructor;
         default: boolean;
     };
@@ -607,7 +607,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
     slotsTemplate: {};
     showIndexColumn: boolean;
     showCheckboxColumn: boolean;
-    expandMethodIcon: boolean;
+    expandActions: boolean;
     ellipsis: boolean;
     dataSource: import("@dt-frames/core").Recordable<any>[];
     bordered: boolean;

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

@@ -79,7 +79,7 @@ export declare const TableProps: {
         type: BooleanConstructor;
         default: boolean;
     };
-    expandMethodIcon: {
+    expandActions: {
         type: BooleanConstructor;
         default: boolean;
     };