hy-dispatch-ui-v3 0.2.67 → 0.2.68

package/es/components/hyTable/js/index.mjs

@@ -2,8 +2,8 @@ import { unref, ref, computed, watch, nextTick, watchEffect } from 'vue';
 import '../../../hooks/index.mjs';
 import '../../../utils/index.mjs';
 import '../../index.mjs';
-import { isPermission, isBoolean, isFunction, isNumber, isString, isArray } from '../../../utils/is.mjs';
-import { useLocale } from '../../../hooks/useLocale.mjs';
+import { isPermission, isBoolean, isFunction, isNumber, isString, isArray, isSymbol } from '../../../utils/is.mjs';
+import { $t } from '../../../hooks/useLocale.mjs';
 import { ElLoading as HyLoading } from '../../hyLoading/index.mjs';
 
 function tableColumnShowHandler(column) {
@@ -31,17 +31,14 @@ function tableColumnsEditableleHandler(columns, columnsEditablele) {
     });
   }
   const sortList = Array.from(sortSet.values()).reduce((a, b) => a - b);
-  const columnsList = Object.keys(columnsEditableleObj).reduce(
-    (columnsList2, key) => {
-      const list = columnsEditableleObj[key];
-      for (let i = 0; i < list.length; i++) {
-        const target = list[i];
-        columnsList2.push(target.column);
-      }
-      return columnsList2;
-    },
-    []
-  );
+  const columnsList = Object.keys(columnsEditableleObj).reduce((columnsList2, key) => {
+    const list = columnsEditableleObj[key];
+    for (let i = 0; i < list.length; i++) {
+      const target = list[i];
+      columnsList2.push(target.column);
+    }
+    return columnsList2;
+  }, []);
   return {
     columnsList,
     columnsEditablele
@@ -93,26 +90,21 @@ function operatorDisabledHandler(operator, scope) {
   return false;
 }
 function operatorDisableTextdHandler(operator, scope) {
-  const { t } = useLocale();
   const { disabledText } = operator;
   if (isString(disabledText)) return disabledText;
   if (isFunction(disabledText)) return disabledText(scope);
-  return t("table.nonsupport");
+  return $t("table.nonsupport");
 }
 function operatorFilterHandler(column, scope, type = "all") {
   let { width } = column;
   width = isString(width) ? Number(width.replace(/[a-zA-Z]+/g, "")) : width;
-  const operator = (column.operator || []).filter(
-    (item) => operatorShowHandler(item, scope)
-  );
+  const operator = (column.operator || []).filter((item) => operatorShowHandler(item, scope));
   if (type === "all" || operator.length <= 1 && type === "default") {
     return operator;
   }
   const btnWidth = 40;
   const gapWidth = 12;
-  const operatorCount = Math.floor(
-    (width - 12 * 2 - btnWidth) / (btnWidth + gapWidth) + 1
-  );
+  const operatorCount = Math.floor((width - 12 * 2 - btnWidth) / (btnWidth + gapWidth) + 1);
   if (operatorCount === operator.length) {
     return type === "default" ? operator : [];
   }
@@ -150,15 +142,7 @@ function renderContentHandler(column, scope) {
   return row[column.prop];
 }
 const useAppTableWrapper = (hy) => {
-  const {
-    props,
-    emits,
-    containerRef,
-    tableRef,
-    tableDropdownRef,
-    operatorDropdownRef
-  } = hy;
-  const { t } = useLocale();
+  const { props, emits, containerRef, tableRef, tableDropdownRef, operatorDropdownRef } = hy;
   const CACHE_COLUMNS_KEY = props.controller || props.url || "CACHE_COLUMNS_KEY";
   const tableDataSource = ref([]);
   const tableColumns = ref([]);
@@ -167,15 +151,12 @@ const useAppTableWrapper = (hy) => {
     return tableColumns.value.filter((column) => tableColumnShowHandler(column));
   });
   const searchPlaceholder = computed(() => {
-    const searchLabelSet = tableColumnsList.value.reduce(
-      (searchLabelSet2, column) => {
-        if (column.isSearch) {
-          searchLabelSet2.add(column.label);
-        }
-        return searchLabelSet2;
-      },
-      /* @__PURE__ */ new Set()
-    );
+    const searchLabelSet = tableColumnsList.value.reduce((searchLabelSet2, column) => {
+      if (column.isSearch) {
+        searchLabelSet2.add(column.label);
+      }
+      return searchLabelSet2;
+    }, /* @__PURE__ */ new Set());
     if (props.searchArr?.length > 0) {
       props.searchArr.forEach((item) => {
         searchLabelSet.add(item.label);
@@ -190,10 +171,7 @@ const useAppTableWrapper = (hy) => {
     return row.id;
   }
   function onTableColumnsSelectHandler(value) {
-    const { columnsList, searchText } = tableColumnsEditableleHandler(
-      props.tableColumns,
-      value
-    );
+    const { columnsList, searchText } = tableColumnsEditableleHandler(props.tableColumns, value);
     tableColumns.value = columnsList;
     tableColumnsEditablele.value = value;
     sessionStorage.setItem(CACHE_COLUMNS_KEY, JSON.stringify(value));
@@ -252,9 +230,7 @@ const useAppTableWrapper = (hy) => {
       x: clientX,
       y: clientY
     });
-    const column = tableColumns.value.find(
-      (column2) => column2.type === "operator"
-    );
+    const column = tableColumns.value.find((column2) => column2.type === "operator");
     const operator = operatorFilterHandler(column, { row });
     if (!operator?.length) return;
     tableTriggerRef.value.column = column;
@@ -278,15 +254,16 @@ const useAppTableWrapper = (hy) => {
     if (props.type === "default") {
       return tableColumnsList.value.some((column) => column.type === "expand");
     } else if (props.type === "virtual") {
-      return tableColumnsList.value.some(
-        (column) => column.type === "expand" && column.expandType === "expand"
-      );
+      return tableColumnsList.value.some((column) => column.type === "expand" && column.expandType === "expand");
     }
     return false;
   });
   const isAccordionMode = computed(() => {
     return isExpandTable.value && props.expandMode === "accordion";
   });
+  function getRowExpansion() {
+    return expandRowKeys.value;
+  }
   function setRowExpansion(list = []) {
     const keys = (list || []).map((item) => {
       return isString(item) || isNumber(item) ? item : getRowKey(item);
@@ -294,7 +271,7 @@ const useAppTableWrapper = (hy) => {
     expandRowKeys.value = isAccordionMode.value ? [keys[0]] : keys;
   }
   function toggleRowExpansion(row, expanded) {
-    const key = isString(row) || isNumber(row) ? row : getRowKey(row);
+    const key = isString(row) || isNumber(row) || isSymbol(row) ? row : getRowKey(row);
     const index = expandRowKeyMap.value.get(key);
     const isExpanded = isBoolean(expanded) ? expanded : !isNumber(index);
     if (isAccordionMode.value) {
@@ -310,7 +287,8 @@ const useAppTableWrapper = (hy) => {
         expandRowKeys.value.splice(index, 1);
       }
     }
-    emits("expand-change", row, isExpanded);
+    const data = tableDataSource.value.find((v) => getRowKey(v) === key);
+    emits("expand-change", data, isExpanded);
   }
   function onTableRowExpandChangeHandler(row, expandedRows) {
     if (props.type === "virtual") {
@@ -393,9 +371,7 @@ const useAppTableWrapper = (hy) => {
     selectedList.value = list || [];
     clearSelection();
     list.forEach((row) => {
-      const item = tableDataSource.value.find(
-        (v) => getRowKey(row) === getRowKey(v)
-      );
+      const item = tableDataSource.value.find((v) => getRowKey(row) === getRowKey(v));
       if (item) {
         tableRef.value.toggleRowSelection(item, true);
       } else {
@@ -414,11 +390,28 @@ const useAppTableWrapper = (hy) => {
     }
     return className.filter(Boolean).join(" ");
   }
+  function scrollToTop(top) {
+    if (!isNumber(top) || isNaN(top)) return;
+    if (props.type === "virtual") {
+      tableRef.value.scrollToTop(top);
+    } else {
+      tableRef.value.setScrollTop(top);
+    }
+  }
+  function scrollToLeft(left) {
+    if (!isNumber(left) || isNaN(left)) return;
+    if (props.type === "virtual") {
+      tableRef.value.scrollToLeft(left);
+    } else {
+      tableRef.value.setScrollLeft(left);
+    }
+  }
+  function onScrollHandler(params) {
+    emits("scroll", params);
+  }
+  window.scrollToTop = scrollToTop;
   watchEffect(() => {
-    const { columnsList, columnsEditablele, searchText } = tableColumnHandler(
-      props.tableColumns,
-      CACHE_COLUMNS_KEY
-    );
+    const { columnsList, columnsEditablele, searchText } = tableColumnHandler(props.tableColumns, CACHE_COLUMNS_KEY);
     tableColumns.value = columnsList;
     tableColumnsEditablele.value = columnsEditablele;
   });
@@ -440,6 +433,7 @@ const useAppTableWrapper = (hy) => {
     clearSelectedList,
     expandRowKeys,
     expandRowKeyMap,
+    getRowExpansion,
     setRowExpansion,
     toggleRowExpansion,
     onTableRowExpandChangeHandler,
@@ -448,7 +442,10 @@ const useAppTableWrapper = (hy) => {
     onTableRowClickHandler,
     onTableColumnsSelectHandler,
     showAppTableLoading,
-    closeAppTableLoading
+    closeAppTableLoading,
+    scrollToTop,
+    scrollToLeft,
+    onScrollHandler
   };
 };
 

package/es/components/hyTable/js/useAppTable.mjs

@@ -2,12 +2,11 @@ import { toRef } from 'vue';
 import '../../../hooks/index.mjs';
 import '../../../utils/index.mjs';
 import '../../index.mjs';
-import { useLocale } from '../../../hooks/useLocale.mjs';
+import { $t } from '../../../hooks/useLocale.mjs';
 import { isPermission, isBoolean, isString, isObject, isEmpty } from '../../../utils/is.mjs';
 import { useAppSearch } from '../../hySearch/js/useAppSearch.mjs';
 
 function getColumnDefaultConfig(column) {
-  const { t } = useLocale();
   switch (column.type) {
     case "selection":
       return {
@@ -17,7 +16,7 @@ function getColumnDefaultConfig(column) {
     case "index":
       return {
         prop: `${column.type}_prop`,
-        label: t("table.index")
+        label: $t("table.index")
       };
     case "expand":
       return {
@@ -25,7 +24,7 @@ function getColumnDefaultConfig(column) {
       };
     case "operator":
       return {
-        label: t("table.operator"),
+        label: $t("table.operation"),
         prop: `operator_prop`,
         fixed: "right"
       };

package/es/components/hyTable/style/table.scss

@@ -69,3 +69,11 @@
     }
   }
 }
+
+.hy-el-table--default .hy-el-table__cell {
+  padding: 0px 0px !important;
+}
+.hy-table .hy-el-table .hy-el-table__cell .cell {
+  padding: 8px 12px !important;
+  box-sizing: border-box;
+}

package/es/components/hyTable/table.vue.mjs

@@ -9,9 +9,9 @@ import { useAppTableSearch } from './js/search.mjs';
 import _sfc_main$2 from './cpns/headerItem.vue.mjs';
 import _sfc_main$1 from './cpns/columnSelect.vue.mjs';
 import _sfc_main$3 from './cpns/virtualTable.vue.mjs';
-import { useLocale } from '../../hooks/useLocale.mjs';
 import { useMixins } from '../../hooks/useMixins.mjs';
 import { HyIcon } from '../hyIcon/index.mjs';
+import { $t } from '../../hooks/useLocale.mjs';
 import { HyTooltip } from '../hyTooltip/index.mjs';
 import { HyInputSearch } from '../hyInput/index.mjs';
 import { HyButton } from '../hyButton/index.mjs';
@@ -199,13 +199,13 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     "expand-change",
     "on-select-checkbox",
     "reqSuccess",
-    "search-data"
+    "search-data",
+    "scroll"
   ], ["update:loading"]),
   setup(__props, { expose: __expose, emit: __emit }) {
     const props = __props;
     const emits = __emit;
     const loading = useModel(__props, "loading");
-    const { t } = useLocale();
     const containerRef = useTemplateRef("containerRef");
     const tableRef = useTemplateRef("tableRef");
     const appSearchRef = useTemplateRef("appSearchRef");
@@ -229,12 +229,16 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       clearSelectedList,
       expandRowKeys,
       expandRowKeyMap,
+      getRowExpansion,
       setRowExpansion,
       toggleRowExpansion,
       onTableRowClickHandler,
       onTableRowContextmenuHandler,
       onTableRowExpandChangeHandler,
       onTableSelectHandler,
+      scrollToTop,
+      scrollToLeft,
+      onScrollHandler,
       // useAppTableSearch
       // 表单查询
       totalElements,
@@ -282,6 +286,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       getTableDataSource,
       clearSelection,
       clearSelectedList,
+      getRowExpansion,
       setRowExpansion,
       toggleRowExpansion,
       showAppTableLoading,
@@ -289,7 +294,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
       getOptions,
       getOptionsFields,
       getOptionsError,
-      getOptionsByField
+      getOptionsByField,
+      scrollToTop,
+      scrollToLeft
     });
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock(
@@ -315,7 +322,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
               }, null, 8, ["columns", "columns-editable", "origin-columns", "onConfirm"])) : createCommentVNode("v-if", true),
               __props.filterColumns.length > 0 ? (openBlock(), createElementBlock("div", {
                 key: 1,
-                class: "h-[32px] flex items-center gap-[10px] clickBox px-3 select-none rounded hover:bg-background-2",
+                class: "h-[32px] flex items-center gap-[10px] clickBox px-3 select-none rounded hover:bg-background-2 box-border",
                 onClick: unref(switchShowFilter)
               }, [
                 createVNode(unref(HyIcon), {
@@ -325,7 +332,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                 createElementVNode(
                   "span",
                   null,
-                  toDisplayString(unref(showFilter) ? unref(t)("table.hideFilter") : unref(t)("table.displayFilter")),
+                  toDisplayString(unref(showFilter) ? unref($t)("table.hideFilter") : unref($t)("table.displayFilter")),
                   1
                   /* TEXT */
                 )
@@ -338,14 +345,14 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
               }, {
                 content: withCtx(() => [
                   createElementVNode("span", {
-                    innerHTML: unref(t)("table.searchByInput", [unref(searchPlaceholder)])
+                    innerHTML: unref($t)("table.searchByInput", [unref(searchPlaceholder)])
                   }, null, 8, ["innerHTML"])
                 ]),
                 default: withCtx(() => [
                   createVNode(unref(HyInputSearch), {
                     modelValue: __props.filterModel.query,
                     "onUpdate:modelValue": ($event) => __props.filterModel.query = $event,
-                    placeholder: unref(t)("table.searchFor", [__props.controllerText || ""]),
+                    placeholder: unref($t)("table.searchFor", [__props.controllerText || ""]),
                     onSearch: unref(onSearchQueryHandler)
                   }, null, 8, ["modelValue", "onUpdate:modelValue", "placeholder", "onSearch"])
                 ]),
@@ -421,14 +428,15 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                 onSelectAll: (list) => unref(onTableSelectHandler)(list, null, true),
                 onRowClick: unref(onTableRowClickHandler),
                 onRowContextmenu: unref(onTableRowContextmenuHandler),
-                onExpandChange: unref(onTableRowExpandChangeHandler)
+                onExpandChange: unref(onTableRowExpandChangeHandler),
+                onScroll: unref(onScrollHandler)
               }), {
                 empty: withCtx(() => [
                   renderSlot(_ctx.$slots, "empty", {}, () => [
                     createElementVNode(
                       "span",
                       null,
-                      toDisplayString(__props.emptyText || unref(t)("hy.noData")),
+                      toDisplayString(__props.emptyText || unref($t)("hy.noData")),
                       1
                       /* TEXT */
                     )
@@ -481,11 +489,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                   (openBlock(true), createElementBlock(
                                     Fragment,
                                     null,
-                                    renderList(unref(operatorFilterHandler)(
-                                      column,
-                                      scope,
-                                      "default"
-                                    ), (citem, cindex) => {
+                                    renderList(unref(operatorFilterHandler)(column, scope, "default"), (citem, cindex) => {
                                       return openBlock(), createBlock(unref(HyTooltip), {
                                         key: cindex,
                                         "is-always": "",
@@ -551,11 +555,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                             (openBlock(true), createElementBlock(
                                               Fragment,
                                               null,
-                                              renderList(unref(operatorFilterHandler)(
-                                                column,
-                                                scope,
-                                                "more"
-                                              ), (citem, cindex) => {
+                                              renderList(unref(operatorFilterHandler)(column, scope, "more"), (citem, cindex) => {
                                                 return openBlock(), createBlock(unref(ElDropdownItem), {
                                                   key: cindex,
                                                   command: cindex,
@@ -611,7 +611,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                         createVNode(unref(HyTooltip), {
                                           "is-always": "",
                                           overLine: 1,
-                                          content: unref(t)("table.moreOperations")
+                                          content: unref($t)("table.moreOperations")
                                         }, {
                                           default: withCtx(() => [
                                             createElementVNode("div", { class: "w-[40px] h-[48px] inline-flex flex-col items-center justify-center text-main text-xs hover:font-bold border border-transparent hover:border-theme hover:shadow-[0px_0px_5px_0px_rgba(var(--hy-theme),0.5)] rounded box-border cursor-pointer" }, [
@@ -628,7 +628,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                                               createElementVNode(
                                                 "div",
                                                 { class: "mt-0.5" },
-                                                toDisplayString(unref(t)("table.more")),
+                                                toDisplayString(unref($t)("table.more")),
                                                 1
                                                 /* TEXT */
                                               )
@@ -692,7 +692,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                 ]),
                 _: 3
                 /* FORWARDED */
-              }, 16, ["row-key", "data", "show-header", "row-class-name", "class", "style", "expand-row-keys", "onSelect", "onSelectAll", "onRowClick", "onRowContextmenu", "onExpandChange"])) : createCommentVNode("v-if", true),
+              }, 16, ["row-key", "data", "show-header", "row-class-name", "class", "style", "expand-row-keys", "onSelect", "onSelectAll", "onRowClick", "onRowContextmenu", "onExpandChange", "onScroll"])) : createCommentVNode("v-if", true),
               __props.type === "virtual" ? (openBlock(), createBlock(unref(ElAutoResizer), { key: 1 }, {
                 default: withCtx(({ height, width }) => [
                   createVNode(_sfc_main$3, mergeProps({
@@ -721,7 +721,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                     onSelectAll: unref(onTableSelectHandler),
                     onRowClick: unref(onTableRowClickHandler),
                     onRowContextmenu: unref(onTableRowContextmenuHandler),
-                    onExpandClick: unref(onTableRowExpandChangeHandler)
+                    onExpandClick: unref(onTableRowExpandChangeHandler),
+                    onScroll: unref(onScrollHandler)
                   }), createSlots({
                     empty: withCtx(() => [
                       createElementVNode("div", { class: "w-full h-full flex items-center justify-center border-b border-border" }, [
@@ -729,7 +730,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                           createElementVNode(
                             "span",
                             null,
-                            toDisplayString(__props.emptyText || unref(t)("hy.noData")),
+                            toDisplayString(__props.emptyText || unref($t)("hy.noData")),
                             1
                             /* TEXT */
                           )
@@ -747,7 +748,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                         ])
                       };
                     })
-                  ]), 1040, ["expandedRowKeys", "onUpdate:expandedRowKeys", "expandRowKeyMap", "width", "height", "data", "columns", "columns-editable", "show-header", "row-class-name", "show-all-select", "style", "row-key", "filter-model", "expandMode", "onSearch", "onSelect", "onSelectAll", "onRowClick", "onRowContextmenu", "onExpandClick"])
+                  ]), 1040, ["expandedRowKeys", "onUpdate:expandedRowKeys", "expandRowKeyMap", "width", "height", "data", "columns", "columns-editable", "show-header", "row-class-name", "show-all-select", "style", "row-key", "filter-model", "expandMode", "onSearch", "onSelect", "onSelectAll", "onRowClick", "onRowContextmenu", "onExpandClick", "onScroll"])
                 ]),
                 _: 3
                 /* FORWARDED */
@@ -761,11 +762,12 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
               createElementVNode(
                 "div",
                 { class: "absolute left-4 top-1/2 transform -translate-y-1/2 text-sm" },
-                toDisplayString(unref(t)("table.aTotalOfPiecesOfData", [unref(totalElements)])),
+                toDisplayString(unref($t)("table.aTotalOfPiecesOfData", [unref(totalElements)])),
                 1
                 /* TEXT */
               ),
-              createVNode(unref(ElPagination), {
+              unref(totalElements) >= 10 ? (openBlock(), createBlock(unref(ElPagination), {
+                key: 0,
                 "current-page": __props.filterModel.page,
                 "onUpdate:currentPage": ($event) => __props.filterModel.page = $event,
                 "page-size": __props.filterModel.size,
@@ -776,12 +778,11 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                 layout: __props.layout,
                 size: "default",
                 background: "",
-                "hide-on-single-page": "",
                 onSizeChange: unref(onSizeChangeHandler),
                 onCurrentChange: unref(onCurrentChangeHandler)
-              }, null, 8, ["current-page", "onUpdate:currentPage", "page-size", "onUpdate:pageSize", "total", "pager-count", "layout", "onSizeChange", "onCurrentChange"]),
+              }, null, 8, ["current-page", "onUpdate:currentPage", "page-size", "onUpdate:pageSize", "total", "pager-count", "layout", "onSizeChange", "onCurrentChange"])) : createCommentVNode("v-if", true),
               unref(selectedList) && unref(selectedList).length > 0 ? (openBlock(), createElementBlock("div", {
-                key: 0,
+                key: 1,
                 class: "absolute right-4 top-1/2 transform -translate-y-1/2"
               }, [
                 renderSlot(_ctx.$slots, "multiple-operator-slot")
@@ -800,12 +801,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
             },
             "virtual-triggering": "",
             trigger: "contextmenu",
-            placement: "bottom",
-            onCommand: ($event) => unref(operatorClickHandler)(
-              $event,
-              unref(tableTriggerRef).column,
-              unref(tableTriggerRef).scope
-            )
+            placement: "bottom-end",
+            onCommand: ($event) => unref(operatorClickHandler)($event, unref(tableTriggerRef).column, unref(tableTriggerRef).scope)
           }, {
             dropdown: withCtx(() => [
               createVNode(unref(ElDropdownMenu), { class: "hy-table-dropdown-menu" }, {
@@ -813,10 +810,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                   (openBlock(true), createElementBlock(
                     Fragment,
                     null,
-                    renderList(unref(operatorFilterHandler)(
-                      unref(tableTriggerRef).column,
-                      unref(tableTriggerRef).scope
-                    ), (citem, cindex) => {
+                    renderList(unref(operatorFilterHandler)(unref(tableTriggerRef).column, unref(tableTriggerRef).scope), (citem, cindex) => {
                       return openBlock(), createBlock(unref(ElDropdownItem), {
                         key: cindex,
                         command: cindex,

package/es/components/hyTableActionButton/tableActionButton.vue.mjs

@@ -1,10 +1,8 @@
 import { defineComponent, ref, computed, unref, watch, openBlock, createElementBlock, createBlock, withCtx, createVNode, normalizeClass, createTextVNode, toDisplayString, createElementVNode, Fragment, renderList, createCommentVNode, normalizeStyle } from 'vue';
 import { ElPopover, ElIcon } from 'element-plus';
 import { ArrowDown } from '@element-plus/icons-vue';
-import '../../hooks/index.mjs';
 import '../../utils/index.mjs';
 import '../index.mjs';
-import { useLocale } from '../../hooks/useLocale.mjs';
 import { isPermission, isBoolean, isFunction } from '../../utils/is.mjs';
 import { HyTooltip } from '../hyTooltip/index.mjs';
 import { HyButton } from '../hyButton/index.mjs';
@@ -70,7 +68,6 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
   setup(__props, { expose: __expose, emit: __emit }) {
     const props = __props;
     const emits = __emit;
-    const { t } = useLocale();
     const visible = ref(false);
     const dataList = ref([]);
     const selectedData = ref(null);
@@ -185,7 +182,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
             }, {
               content: withCtx(() => [
                 createElementVNode("div", { class: "h-full flex items-center justify-center pl-[14px]" }, [
-                  createVNode(unref(HyIcon), { "svg-name": __props.svgName }, null, 8, ["svg-name"]),
+                  createVNode(unref(HyIcon), {
+                    "svg-name": __props.svgName,
+                    class: "w-[14px] h-[14px]"
+                  }, null, 8, ["svg-name"]),
                   createElementVNode(
                     "span",
                     { class: "ml-[6px]" },

package/es/components/hyTableForm/batchTableForm.vue.mjs

@@ -7,7 +7,6 @@ import '../index.mjs';
 import _sfc_main$1 from './tableForm.vue.mjs';
 import { doReadExcel } from './js/index.mjs';
 import { useApi } from '../../hooks/useApi.mjs';
-import { useLocale } from '../../hooks/useLocale.mjs';
 import { HyConfirmDialog } from '../hyConfirmDialog/index.mjs';
 import { isArray } from '../../utils/is.mjs';
 import { HyIcon } from '../hyIcon/index.mjs';
@@ -96,7 +95,6 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
     const props = __props;
     const emits = __emit;
     const { api } = useApi();
-    const { t } = useLocale();
     const containerRef = useTemplateRef("containerRef");
     const uploadRef = useTemplateRef("uploadRef");
     const tableRef = useTemplateRef("tableRef");
@@ -297,9 +295,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
         emits("submit", submitResult);
         onResetUpload();
       } else {
-        ElMessage.warning(
-          `${submitResult.success} \u6761\u6570\u636E\u5BFC\u5165\u6210\u529F\uFF0C ${submitResult.failed} \u6761\u6570\u636E\u5F02\u5E38\uFF0C\u8BF7\u8C03\u6574`
-        );
+        ElMessage.warning(`${submitResult.success} \u6761\u6570\u636E\u5BFC\u5165\u6210\u529F\uFF0C ${submitResult.failed} \u6761\u6570\u636E\u5F02\u5E38\uFF0C\u8BF7\u8C03\u6574`);
         emits("submit", submitResult);
       }
     }
@@ -403,8 +399,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign(__default__, {
                         createElementVNode("div", { class: "w-full text-main absolute left-1/2 bottom-4 transform -translate-x-1/2" }, [
                           createElementVNode("div", { class: "flex items-center justify-center text-xs text-auxiliary gap-2" }, [
                             createElementVNode("span", null, "\u6587\u4EF6\u652F\u6301\uFF1A"),
-                            createElementVNode("div", { class: "border border-border rounded py-1 px-2.5 bg-background-4" }, " .xls "),
-                            createElementVNode("div", { class: "border border-border rounded py-1 px-2.5 bg-background-4" }, " .xlsx "),
+                            createElementVNode("div", { class: "border border-border rounded py-1 px-2.5 bg-background-4 box-border" }, ".xls"),
+                            createElementVNode("div", { class: "border border-border rounded py-1 px-2.5 bg-background-4 box-border" }, ".xlsx"),
                             createElementVNode("span", null, "\u5355\u6587\u4EF6\u4E0D\u8D85\u8FC7 10 MB")
                           ])
                         ])

package/es/components/hyTableForm/js/index.mjs

@@ -22,10 +22,7 @@ const doValidate = async (target = {}, columns = [], ruleList = {}) => {
   }, {});
   Object.entries(ruleList || {}).forEach(([key, citem]) => {
     if (columnMap[key]) {
-      rules[key] = [
-        ...isArray(citem) ? citem : [citem],
-        ...rules[key]
-      ].filter(Boolean);
+      rules[key] = [...isArray(citem) ? citem : [citem], ...rules[key]].filter(Boolean);
     }
   });
   const validator = new AsyncValidator(rules);
@@ -53,10 +50,7 @@ const doReadExcel = (files, props) => {
         const ws1 = XLSX.utils.sheet_to_json(workbook.Sheets[wsname1]);
         let content = formColumns.reduce((content2, column) => {
           const title = column.import ? column.import.title : column.label;
-          return content2.replace(
-            new RegExp(`"${title}":`, "g"),
-            `"${column.prop}":`
-          );
+          return content2.replace(new RegExp(`"${title}":`, "g"), `"${column.prop}":`);
         }, JSON.stringify(ws1));
         let dataSource = JSON.parse(content);
         if (beforeDataHandle) {

package/es/components/hyTableForm/js/useAppTableForm.mjs

@@ -13,9 +13,7 @@ const useAppTableForm = (config = {}) => {
       expandType: "expand",
       width: 48
     },
-    ...columns.filter(
-      (column) => !["expand", "operator"].includes(column.type)
-    ),
+    ...columns.filter((column) => !["expand", "operator"].includes(column.type)),
     {
       label: "\u5BFC\u5165\u72B6\u6001",
       prop: "validateStatus",
@@ -23,10 +21,7 @@ const useAppTableForm = (config = {}) => {
     }
   ];
   const { tableColumns } = useAppTable({ columns });
-  const { formModel, formColumns } = useAppForm(
-    config.formColumns,
-    config.formModel
-  );
+  const { formModel, formColumns } = useAppForm(config.formColumns, config.formModel);
   formColumns.value.forEach((item) => {
     if (isString(item.import)) {
       item.import = {