3h1-ui 3.0.0-next.45 → 3.0.0-next.47

package/es/index.js

@@ -37065,7 +37065,7 @@ function _isSlot$2(s) {
   return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !isVNode(s);
 }
 const ShyTableColumn = /* @__PURE__ */ defineComponent({
-  emits: ["columns-change"],
+  emits: ["columns-change", "columns-reset"],
   setup(props2, {
     emit
   }) {
@@ -37192,8 +37192,12 @@ const ShyTableColumn = /* @__PURE__ */ defineComponent({
       state.checkedList = [...state.defaultCheckList];
       state.checkAll = true;
       plainOptions.value = unref(cachePlainOptions);
-      handleEmit(table2.getCacheColumns());
       sortable.sort(sortableOrder);
+      inset = true;
+      emit("columns-reset");
+      setTimeout(() => {
+        inset = false;
+      });
     }
     function handleVisibleChange() {
       if (inited)
@@ -37437,7 +37441,7 @@ const ShyTableSetting = /* @__PURE__ */ defineComponent({
       default: () => ({})
     }
   },
-  emits: ["columns-change"],
+  emits: ["columns-change", "columns-reset"],
   setup(props2, {
     emit
   }) {
@@ -37460,6 +37464,9 @@ const ShyTableSetting = /* @__PURE__ */ defineComponent({
     const handleColumnChange = (data) => {
       emit("columns-change", data);
     };
+    const handleColumnsReset = () => {
+      emit("columns-reset");
+    };
     const getTableContainer = () => {
       return table2 ? unref(table2.wrapRef) : document.body;
     };
@@ -37487,6 +37494,7 @@ const ShyTableSetting = /* @__PURE__ */ defineComponent({
     const renderTableColumn = computed(() => {
       return getSetting.value.setting ? createVNode(ShyTableColumn, {
         "onColumnsChange": handleColumnChange,
+        "onColumnsReset": handleColumnsReset,
         "getPopupContainer": getTableContainer
       }, null) : null;
     });
@@ -37552,7 +37560,7 @@ const ShyTableHeader = /* @__PURE__ */ defineComponent({
       type: Boolean
     }
   },
-  emits: ["columns-change"],
+  emits: ["columns-change", "columns-reset"],
   setup(props2, {
     emit,
     slots
@@ -37560,10 +37568,17 @@ const ShyTableHeader = /* @__PURE__ */ defineComponent({
     const {
       prefixCls: prefixCls2
     } = useDesign$1("table-header");
+    const handleColumnChange = (data) => {
+      emit("columns-change", data);
+    };
+    const handleColumnsReset = () => {
+      emit("columns-reset");
+    };
     const isShowSetting = () => {
       return props2.showTableSetting ? createVNode(ShyTableSetting, {
         "setting": props2.tableSetting,
-        "onColumnsChange": handleColumnChange
+        "onColumnsChange": handleColumnChange,
+        "onColumnsReset": handleColumnsReset
       }, null) : null;
     };
     const isShowTitle = () => {
@@ -37576,9 +37591,6 @@ const ShyTableHeader = /* @__PURE__ */ defineComponent({
         "class": `${prefixCls2}-placeholder`
       }, null);
     };
-    const handleColumnChange = (data) => {
-      emit("columns-change", data);
-    };
     const getAlignClass = computed(() => [`${prefixCls2}-align`, `${prefixCls2}-align-${props2.headerAlign}`]);
     return () => {
       var _a2;
@@ -37618,7 +37630,8 @@ const useTableHeader = (propsRef, slots, handlers2) => {
       titleHelpMessage,
       showTableSetting,
       tableSetting,
-      onColumnsChange: handlers2.onColumnsChange
+      onColumnsChange: handlers2.onColumnsChange,
+      onColumnsReset: handlers2.onColumnsReset
     };
     return {
       title: hideTitle ? null : () => createVNode(ShyTableHeader, headerProps, {
@@ -37666,18 +37679,19 @@ function handleColumnResize(propsRef, columns, wrapRef) {
   );
   const length2 = columns.length;
   columns.forEach((item) => {
-    const colWidth = item.width || ((item == null ? void 0 : item.title) + "").length * 12 + 16;
-    const countWidth = tableWidth ? (tableWidth - sumWidth - selectWidth) / (length2 - sumLength) : colWidth;
+    const minWidth = ((item == null ? void 0 : item.title) + "").length * 14 + 16;
+    const colWidth = item.width || minWidth;
+    const countWidth = tableWidth && length2 - sumLength ? (tableWidth - sumWidth - selectWidth) / (length2 - sumLength) : colWidth;
     if (item.flag)
       return;
     if (propsRef.value.resizable) {
       item.width = colWidth > countWidth ? colWidth : countWidth;
-      item.minWidth = ((item == null ? void 0 : item.title) + "").length * 12 + 16;
+      item.minWidth = minWidth;
       item.resizable = item.resizable === void 0 ? true : item.resizable;
     } else {
       if (item.resizable) {
         item.width = colWidth > countWidth ? colWidth : countWidth;
-        item.minWidth = ((item == null ? void 0 : item.title) + "").length * 12 + 16;
+        item.minWidth = minWidth;
       }
     }
   });
@@ -38561,7 +38575,7 @@ function _isSlot$1(s) {
 }
 const ShyTable = /* @__PURE__ */ defineComponent({
   name: "ShyTable",
-  emits: ["fetch-success", "fetch-error", "selection-change", "register", "row-click", "row-dbClick", "row-contextmenu", "row-mouseenter", "row-mouseleave", "edit-end", "edit-cancel", "edit-row-end", "edit-change", "expanded-rows-change", "change", "columns-change"],
+  emits: ["fetch-success", "fetch-error", "selection-change", "register", "row-click", "row-dbClick", "row-contextmenu", "row-mouseenter", "row-mouseleave", "edit-end", "edit-cancel", "edit-row-end", "edit-change", "expanded-rows-change", "change", "columns-change", "columns-reset"],
   props: shyTableBasicProps,
   setup(props2, {
     attrs,
@@ -38791,6 +38805,12 @@ const ShyTable = /* @__PURE__ */ defineComponent({
         var _a2, _b;
         emit("columns-change", data);
         (_b = (_a2 = unref(getProps)).onColumnsChange) == null ? void 0 : _b.call(_a2, data);
+      },
+      onColumnsReset: () => {
+        var _a2, _b;
+        setColumns(getCacheColumns());
+        emit("columns-reset");
+        (_b = (_a2 = unref(getProps)).onColumnsReset) == null ? void 0 : _b.call(_a2);
       }
     };
     const {

package/lib/index.js

@@ -37089,7 +37089,7 @@ function _isSlot$2(s) {
   return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !vue.isVNode(s);
 }
 const ShyTableColumn = /* @__PURE__ */ vue.defineComponent({
-  emits: ["columns-change"],
+  emits: ["columns-change", "columns-reset"],
   setup(props2, {
     emit
   }) {
@@ -37216,8 +37216,12 @@ const ShyTableColumn = /* @__PURE__ */ vue.defineComponent({
       state.checkedList = [...state.defaultCheckList];
       state.checkAll = true;
       plainOptions.value = vue.unref(cachePlainOptions);
-      handleEmit(table2.getCacheColumns());
       sortable.sort(sortableOrder);
+      inset = true;
+      emit("columns-reset");
+      setTimeout(() => {
+        inset = false;
+      });
     }
     function handleVisibleChange() {
       if (inited)
@@ -37461,7 +37465,7 @@ const ShyTableSetting = /* @__PURE__ */ vue.defineComponent({
       default: () => ({})
     }
   },
-  emits: ["columns-change"],
+  emits: ["columns-change", "columns-reset"],
   setup(props2, {
     emit
   }) {
@@ -37484,6 +37488,9 @@ const ShyTableSetting = /* @__PURE__ */ vue.defineComponent({
     const handleColumnChange = (data) => {
       emit("columns-change", data);
     };
+    const handleColumnsReset = () => {
+      emit("columns-reset");
+    };
     const getTableContainer = () => {
       return table2 ? vue.unref(table2.wrapRef) : document.body;
     };
@@ -37511,6 +37518,7 @@ const ShyTableSetting = /* @__PURE__ */ vue.defineComponent({
     const renderTableColumn = vue.computed(() => {
       return getSetting.value.setting ? vue.createVNode(ShyTableColumn, {
         "onColumnsChange": handleColumnChange,
+        "onColumnsReset": handleColumnsReset,
         "getPopupContainer": getTableContainer
       }, null) : null;
     });
@@ -37576,7 +37584,7 @@ const ShyTableHeader = /* @__PURE__ */ vue.defineComponent({
       type: Boolean
     }
   },
-  emits: ["columns-change"],
+  emits: ["columns-change", "columns-reset"],
   setup(props2, {
     emit,
     slots
@@ -37584,10 +37592,17 @@ const ShyTableHeader = /* @__PURE__ */ vue.defineComponent({
     const {
       prefixCls: prefixCls2
     } = use.useDesign("table-header");
+    const handleColumnChange = (data) => {
+      emit("columns-change", data);
+    };
+    const handleColumnsReset = () => {
+      emit("columns-reset");
+    };
     const isShowSetting = () => {
       return props2.showTableSetting ? vue.createVNode(ShyTableSetting, {
         "setting": props2.tableSetting,
-        "onColumnsChange": handleColumnChange
+        "onColumnsChange": handleColumnChange,
+        "onColumnsReset": handleColumnsReset
       }, null) : null;
     };
     const isShowTitle = () => {
@@ -37600,9 +37615,6 @@ const ShyTableHeader = /* @__PURE__ */ vue.defineComponent({
         "class": `${prefixCls2}-placeholder`
       }, null);
     };
-    const handleColumnChange = (data) => {
-      emit("columns-change", data);
-    };
     const getAlignClass = vue.computed(() => [`${prefixCls2}-align`, `${prefixCls2}-align-${props2.headerAlign}`]);
     return () => {
       var _a2;
@@ -37642,7 +37654,8 @@ const useTableHeader = (propsRef, slots, handlers2) => {
       titleHelpMessage,
       showTableSetting,
       tableSetting,
-      onColumnsChange: handlers2.onColumnsChange
+      onColumnsChange: handlers2.onColumnsChange,
+      onColumnsReset: handlers2.onColumnsReset
     };
     return {
       title: hideTitle ? null : () => vue.createVNode(ShyTableHeader, headerProps, {
@@ -37690,18 +37703,19 @@ function handleColumnResize(propsRef, columns, wrapRef) {
   );
   const length2 = columns.length;
   columns.forEach((item) => {
-    const colWidth = item.width || ((item == null ? void 0 : item.title) + "").length * 12 + 16;
-    const countWidth = tableWidth ? (tableWidth - sumWidth - selectWidth) / (length2 - sumLength) : colWidth;
+    const minWidth = ((item == null ? void 0 : item.title) + "").length * 14 + 16;
+    const colWidth = item.width || minWidth;
+    const countWidth = tableWidth && length2 - sumLength ? (tableWidth - sumWidth - selectWidth) / (length2 - sumLength) : colWidth;
     if (item.flag)
       return;
     if (propsRef.value.resizable) {
       item.width = colWidth > countWidth ? colWidth : countWidth;
-      item.minWidth = ((item == null ? void 0 : item.title) + "").length * 12 + 16;
+      item.minWidth = minWidth;
       item.resizable = item.resizable === void 0 ? true : item.resizable;
     } else {
       if (item.resizable) {
         item.width = colWidth > countWidth ? colWidth : countWidth;
-        item.minWidth = ((item == null ? void 0 : item.title) + "").length * 12 + 16;
+        item.minWidth = minWidth;
       }
     }
   });
@@ -38585,7 +38599,7 @@ function _isSlot$1(s) {
 }
 const ShyTable = /* @__PURE__ */ vue.defineComponent({
   name: "ShyTable",
-  emits: ["fetch-success", "fetch-error", "selection-change", "register", "row-click", "row-dbClick", "row-contextmenu", "row-mouseenter", "row-mouseleave", "edit-end", "edit-cancel", "edit-row-end", "edit-change", "expanded-rows-change", "change", "columns-change"],
+  emits: ["fetch-success", "fetch-error", "selection-change", "register", "row-click", "row-dbClick", "row-contextmenu", "row-mouseenter", "row-mouseleave", "edit-end", "edit-cancel", "edit-row-end", "edit-change", "expanded-rows-change", "change", "columns-change", "columns-reset"],
   props: shyTableBasicProps,
   setup(props2, {
     attrs,
@@ -38815,6 +38829,12 @@ const ShyTable = /* @__PURE__ */ vue.defineComponent({
         var _a2, _b;
         emit("columns-change", data);
         (_b = (_a2 = vue.unref(getProps)).onColumnsChange) == null ? void 0 : _b.call(_a2, data);
+      },
+      onColumnsReset: () => {
+        var _a2, _b;
+        setColumns(getCacheColumns());
+        emit("columns-reset");
+        (_b = (_a2 = vue.unref(getProps)).onColumnsReset) == null ? void 0 : _b.call(_a2);
       }
     };
     const {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "3h1-ui",
-  "version": "3.0.0-next.45",
+  "version": "3.0.0-next.47",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -29,9 +29,9 @@
     "vue-json-pretty": "^2.2.3",
     "vxe-table": "^4.3.6",
     "xe-utils": "^3.5.7",
-    "@shy-plugins/utils": "1.0.0-next.1",
     "@shy-plugins/tinymce": "^1.0.6",
-    "@shy-plugins/use": "1.0.0-next.1"
+    "@shy-plugins/use": "1.0.0-next.1",
+    "@shy-plugins/utils": "1.0.0-next.1"
   },
   "types": "es/ui/index.d.ts",
   "devDependencies": {