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

package/es/index.js

@@ -37073,9 +37073,9 @@ const ShyTableColumn = /* @__PURE__ */ defineComponent({
     const table2 = useTableContext();
     const defaultRowSelection = omit$1(table2.getRowSelection(), "selectedRowKeys");
     let inited = false;
+    let inset = false;
     const cachePlainOptions = ref([]);
     const plainOptions = ref([]);
-    const plainSortOptions = ref([]);
     const columnListRef = ref(null);
     const state = reactive({
       checkAll: true,
@@ -37091,7 +37091,7 @@ const ShyTableColumn = /* @__PURE__ */ defineComponent({
       return unref(table2 == null ? void 0 : table2.getBindValues) || {};
     });
     watch(() => table2.getColumns(), () => {
-      if (!state.isInit)
+      if (!state.isInit || inset)
         return;
       reInit();
     }, {
@@ -37117,9 +37117,9 @@ const ShyTableColumn = /* @__PURE__ */ defineComponent({
         ignoreAction: true
       }).forEach((item) => {
         ret.push({
-          label: item.title || item.customTitle,
-          value: item.dataIndex || item.title,
-          ...item
+          ...item,
+          title: item.title || item.customTitle,
+          dataIndex: item.dataIndex || item.title
         });
       });
       return ret;
@@ -37137,7 +37137,6 @@ const ShyTableColumn = /* @__PURE__ */ defineComponent({
       }).filter(Boolean);
       if (!plainOptions.value.length) {
         plainOptions.value = columns;
-        plainSortOptions.value = columns;
         cachePlainOptions.value = columns;
         state.defaultCheckList = checkList;
       } else {
@@ -37154,8 +37153,6 @@ const ShyTableColumn = /* @__PURE__ */ defineComponent({
     }
     const reInit = () => {
       const columns = getColumns();
-      plainOptions.value = columns;
-      cachePlainOptions.value = columns;
       unref(plainOptions).forEach((item) => {
         const findItem = columns.find((col) => col.dataIndex === item.dataIndex);
         if (findItem) {
@@ -37163,17 +37160,16 @@ const ShyTableColumn = /* @__PURE__ */ defineComponent({
           item.width = findItem.width;
         }
       });
-      const data = getResult(columns);
-      emit("columns-change", data);
+      handleEmit(columns, false);
     };
     function onCheckAllChange(e) {
-      const checkList = plainOptions.value.map((item) => item.value);
+      const checkList = plainOptions.value.map((item) => item.dataIndex);
       if (e.target.checked) {
         state.checkedList = checkList;
-        setColumns(checkList);
+        handleEmit(checkList);
       } else {
         state.checkedList = [];
-        setColumns([]);
+        handleEmit([]);
       }
     }
     const indeterminate = computed(() => {
@@ -37182,13 +37178,13 @@ const ShyTableColumn = /* @__PURE__ */ defineComponent({
       return checkedLen > 0 && checkedLen < len;
     });
     function onChange(checkedList) {
-      const len = plainSortOptions.value.length;
+      const len = plainOptions.value.length;
       state.checkAll = checkedList.length === len;
-      const sortList = unref(plainSortOptions).map((item) => item.value);
+      const sortList = unref(plainOptions).map((item) => item.dataIndex);
       checkedList.sort((prev2, next2) => {
         return sortList.indexOf(prev2) - sortList.indexOf(next2);
       });
-      setColumns(checkedList);
+      handleEmit(checkedList);
     }
     let sortable;
     let sortableOrder = [];
@@ -37196,8 +37192,7 @@ const ShyTableColumn = /* @__PURE__ */ defineComponent({
       state.checkedList = [...state.defaultCheckList];
       state.checkAll = true;
       plainOptions.value = unref(cachePlainOptions);
-      plainSortOptions.value = unref(cachePlainOptions);
-      setColumns(table2.getCacheColumns());
+      handleEmit(table2.getCacheColumns());
       sortable.sort(sortableOrder);
     }
     function handleVisibleChange() {
@@ -37223,7 +37218,7 @@ const ShyTableColumn = /* @__PURE__ */ defineComponent({
             if (isNullAndUnDef(oldIndex) || isNullAndUnDef(newIndex) || oldIndex === newIndex) {
               return;
             }
-            const columns = cloneDeep(plainSortOptions.value);
+            const columns = cloneDeep(plainOptions.value);
             if (oldIndex > newIndex) {
               columns.splice(newIndex, 0, columns[oldIndex]);
               columns.splice(oldIndex + 1, 1);
@@ -37231,8 +37226,8 @@ const ShyTableColumn = /* @__PURE__ */ defineComponent({
               columns.splice(newIndex + 1, 0, columns[oldIndex]);
               columns.splice(oldIndex, 1);
             }
-            plainSortOptions.value = columns;
-            setColumns(columns.map((col) => col.value).filter((value) => state.checkedList.includes(value)));
+            const tempCol = columns.map((col) => col.dataIndex).filter((value) => state.checkedList.includes(value));
+            handleEmit(tempCol);
           }
         });
         sortableOrder = sortable.toArray();
@@ -37266,27 +37261,51 @@ const ShyTableColumn = /* @__PURE__ */ defineComponent({
       (_a2 = table2.setCacheColumnsByField) == null ? void 0 : _a2.call(table2, item.dataIndex, {
         fixed: isFixed
       });
-      setColumns(columns);
+      handleEmit(columns);
     }
     function getResult(columns) {
-      return unref(plainOptions).map((col) => {
-        const defaultHidden = columns.findIndex((c) => c === col.value || typeof c !== "string" && c.dataIndex === col.value && (isBoolean(c.defaultHidden) ? c.defaultHidden : false)) !== -1;
+      const tempOptions = unref(plainOptions).map((col) => {
+        let defaultHidden = false;
+        if (columns.every((val) => typeof val === "string")) {
+          defaultHidden = columns.findIndex((val) => val === col.dataIndex) === -1;
+        } else {
+          const find = columns.find((val) => val.dataIndex === col.dataIndex);
+          defaultHidden = find ? isBoolean(find.defaultHidden) ? find.defaultHidden : false : true;
+        }
         return {
-          dataIndex: col.value,
+          title: col.title,
+          dataIndex: col.dataIndex,
           fixed: col.fixed,
           defaultHidden,
           width: col.width
         };
       });
-    }
-    function setColumns(columns) {
-      table2.setColumns(columns);
-      const data = getResult(columns);
-      emit("columns-change", data);
+      if (!columns.every((val) => typeof val === "string")) {
+        const sortList = columns.map((item) => item.dataIndex);
+        tempOptions.sort((prev2, next2) => {
+          return sortList.indexOf(prev2.dataIndex) - sortList.indexOf(next2.dataIndex);
+        });
+        return tempOptions;
+      }
+      tempOptions.sort((prev2, next2) => {
+        return columns.indexOf(prev2.dataIndex) - columns.indexOf(next2.dataIndex);
+      });
+      return tempOptions;
     }
     function getPopupContainer2() {
       return isFunction$4(attrs.getPopupContainer) ? attrs.getPopupContainer() : getPopupContainer$1();
     }
+    const handleEmit = useDebounceFn$1((columns, set2 = true) => {
+      const data = getResult(columns);
+      emit("columns-change", data);
+      if (set2) {
+        inset = true;
+        table2.setColumns(columns);
+        setTimeout(() => {
+          inset = false;
+        });
+      }
+    }, 100);
     return () => {
       return createVNode(Tooltip, {
         "placement": "top"
@@ -37342,9 +37361,9 @@ const ShyTableColumn = /* @__PURE__ */ defineComponent({
                 }, [createVNode(DragOutlined$1, {
                   "class": "table-column-drag-icon"
                 }, null), createVNode(Checkbox, {
-                  "value": item.value
+                  "value": item.dataIndex
                 }, {
-                  default: () => [item.label]
+                  default: () => [item.title]
                 }), createVNode(Tooltip, {
                   "placement": "bottomLeft",
                   "mouseLeaveDelay": 0.4,
@@ -37354,7 +37373,7 @@ const ShyTableColumn = /* @__PURE__ */ defineComponent({
                     "rotate": 90,
                     "class": [`${prefixCls2}__fixed-left`, {
                       active: item.fixed === "left",
-                      disabled: !state.checkedList.includes(item.value)
+                      disabled: !state.checkedList.includes(item.dataIndex)
                     }],
                     "onClick": () => handleColumnFixed(item, "left")
                   }, null)],
@@ -37370,7 +37389,7 @@ const ShyTableColumn = /* @__PURE__ */ defineComponent({
                     "rotate": 90,
                     "class": [`${prefixCls2}__fixed-right`, {
                       active: item.fixed === "right",
-                      disabled: !state.checkedList.includes(item.value)
+                      disabled: !state.checkedList.includes(item.dataIndex)
                     }],
                     "onClick": () => handleColumnFixed(item, "right")
                   }, null)],

package/lib/index.js

@@ -37097,9 +37097,9 @@ const ShyTableColumn = /* @__PURE__ */ vue.defineComponent({
     const table2 = useTableContext();
     const defaultRowSelection = omit$1(table2.getRowSelection(), "selectedRowKeys");
     let inited = false;
+    let inset = false;
     const cachePlainOptions = vue.ref([]);
     const plainOptions = vue.ref([]);
-    const plainSortOptions = vue.ref([]);
     const columnListRef = vue.ref(null);
     const state = vue.reactive({
       checkAll: true,
@@ -37115,7 +37115,7 @@ const ShyTableColumn = /* @__PURE__ */ vue.defineComponent({
       return vue.unref(table2 == null ? void 0 : table2.getBindValues) || {};
     });
     vue.watch(() => table2.getColumns(), () => {
-      if (!state.isInit)
+      if (!state.isInit || inset)
         return;
       reInit();
     }, {
@@ -37141,9 +37141,9 @@ const ShyTableColumn = /* @__PURE__ */ vue.defineComponent({
         ignoreAction: true
       }).forEach((item) => {
         ret.push({
-          label: item.title || item.customTitle,
-          value: item.dataIndex || item.title,
-          ...item
+          ...item,
+          title: item.title || item.customTitle,
+          dataIndex: item.dataIndex || item.title
         });
       });
       return ret;
@@ -37161,7 +37161,6 @@ const ShyTableColumn = /* @__PURE__ */ vue.defineComponent({
       }).filter(Boolean);
       if (!plainOptions.value.length) {
         plainOptions.value = columns;
-        plainSortOptions.value = columns;
         cachePlainOptions.value = columns;
         state.defaultCheckList = checkList;
       } else {
@@ -37178,8 +37177,6 @@ const ShyTableColumn = /* @__PURE__ */ vue.defineComponent({
     }
     const reInit = () => {
       const columns = getColumns();
-      plainOptions.value = columns;
-      cachePlainOptions.value = columns;
       vue.unref(plainOptions).forEach((item) => {
         const findItem = columns.find((col) => col.dataIndex === item.dataIndex);
         if (findItem) {
@@ -37187,17 +37184,16 @@ const ShyTableColumn = /* @__PURE__ */ vue.defineComponent({
           item.width = findItem.width;
         }
       });
-      const data = getResult(columns);
-      emit("columns-change", data);
+      handleEmit(columns, false);
     };
     function onCheckAllChange(e) {
-      const checkList = plainOptions.value.map((item) => item.value);
+      const checkList = plainOptions.value.map((item) => item.dataIndex);
       if (e.target.checked) {
         state.checkedList = checkList;
-        setColumns(checkList);
+        handleEmit(checkList);
       } else {
         state.checkedList = [];
-        setColumns([]);
+        handleEmit([]);
       }
     }
     const indeterminate = vue.computed(() => {
@@ -37206,13 +37202,13 @@ const ShyTableColumn = /* @__PURE__ */ vue.defineComponent({
       return checkedLen > 0 && checkedLen < len;
     });
     function onChange(checkedList) {
-      const len = plainSortOptions.value.length;
+      const len = plainOptions.value.length;
       state.checkAll = checkedList.length === len;
-      const sortList = vue.unref(plainSortOptions).map((item) => item.value);
+      const sortList = vue.unref(plainOptions).map((item) => item.dataIndex);
       checkedList.sort((prev2, next2) => {
         return sortList.indexOf(prev2) - sortList.indexOf(next2);
       });
-      setColumns(checkedList);
+      handleEmit(checkedList);
     }
     let sortable;
     let sortableOrder = [];
@@ -37220,8 +37216,7 @@ const ShyTableColumn = /* @__PURE__ */ vue.defineComponent({
       state.checkedList = [...state.defaultCheckList];
       state.checkAll = true;
       plainOptions.value = vue.unref(cachePlainOptions);
-      plainSortOptions.value = vue.unref(cachePlainOptions);
-      setColumns(table2.getCacheColumns());
+      handleEmit(table2.getCacheColumns());
       sortable.sort(sortableOrder);
     }
     function handleVisibleChange() {
@@ -37247,7 +37242,7 @@ const ShyTableColumn = /* @__PURE__ */ vue.defineComponent({
             if (utils.isNullAndUnDef(oldIndex) || utils.isNullAndUnDef(newIndex) || oldIndex === newIndex) {
               return;
             }
-            const columns = cloneDeep(plainSortOptions.value);
+            const columns = cloneDeep(plainOptions.value);
             if (oldIndex > newIndex) {
               columns.splice(newIndex, 0, columns[oldIndex]);
               columns.splice(oldIndex + 1, 1);
@@ -37255,8 +37250,8 @@ const ShyTableColumn = /* @__PURE__ */ vue.defineComponent({
               columns.splice(newIndex + 1, 0, columns[oldIndex]);
               columns.splice(oldIndex, 1);
             }
-            plainSortOptions.value = columns;
-            setColumns(columns.map((col) => col.value).filter((value) => state.checkedList.includes(value)));
+            const tempCol = columns.map((col) => col.dataIndex).filter((value) => state.checkedList.includes(value));
+            handleEmit(tempCol);
           }
         });
         sortableOrder = sortable.toArray();
@@ -37290,27 +37285,51 @@ const ShyTableColumn = /* @__PURE__ */ vue.defineComponent({
       (_a2 = table2.setCacheColumnsByField) == null ? void 0 : _a2.call(table2, item.dataIndex, {
         fixed: isFixed
       });
-      setColumns(columns);
+      handleEmit(columns);
     }
     function getResult(columns) {
-      return vue.unref(plainOptions).map((col) => {
-        const defaultHidden = columns.findIndex((c) => c === col.value || typeof c !== "string" && c.dataIndex === col.value && (isBoolean(c.defaultHidden) ? c.defaultHidden : false)) !== -1;
+      const tempOptions = vue.unref(plainOptions).map((col) => {
+        let defaultHidden = false;
+        if (columns.every((val) => typeof val === "string")) {
+          defaultHidden = columns.findIndex((val) => val === col.dataIndex) === -1;
+        } else {
+          const find = columns.find((val) => val.dataIndex === col.dataIndex);
+          defaultHidden = find ? isBoolean(find.defaultHidden) ? find.defaultHidden : false : true;
+        }
         return {
-          dataIndex: col.value,
+          title: col.title,
+          dataIndex: col.dataIndex,
           fixed: col.fixed,
           defaultHidden,
           width: col.width
         };
       });
-    }
-    function setColumns(columns) {
-      table2.setColumns(columns);
-      const data = getResult(columns);
-      emit("columns-change", data);
+      if (!columns.every((val) => typeof val === "string")) {
+        const sortList = columns.map((item) => item.dataIndex);
+        tempOptions.sort((prev2, next2) => {
+          return sortList.indexOf(prev2.dataIndex) - sortList.indexOf(next2.dataIndex);
+        });
+        return tempOptions;
+      }
+      tempOptions.sort((prev2, next2) => {
+        return columns.indexOf(prev2.dataIndex) - columns.indexOf(next2.dataIndex);
+      });
+      return tempOptions;
     }
     function getPopupContainer2() {
       return utils.isFunction(attrs.getPopupContainer) ? attrs.getPopupContainer() : utils.getPopupContainer();
     }
+    const handleEmit = useDebounceFn$1((columns, set2 = true) => {
+      const data = getResult(columns);
+      emit("columns-change", data);
+      if (set2) {
+        inset = true;
+        table2.setColumns(columns);
+        setTimeout(() => {
+          inset = false;
+        });
+      }
+    }, 100);
     return () => {
       return vue.createVNode(antDesignVue.Tooltip, {
         "placement": "top"
@@ -37366,9 +37385,9 @@ const ShyTableColumn = /* @__PURE__ */ vue.defineComponent({
                 }, [vue.createVNode(DragOutlined$1, {
                   "class": "table-column-drag-icon"
                 }, null), vue.createVNode(antDesignVue.Checkbox, {
-                  "value": item.value
+                  "value": item.dataIndex
                 }, {
-                  default: () => [item.label]
+                  default: () => [item.title]
                 }), vue.createVNode(antDesignVue.Tooltip, {
                   "placement": "bottomLeft",
                   "mouseLeaveDelay": 0.4,
@@ -37378,7 +37397,7 @@ const ShyTableColumn = /* @__PURE__ */ vue.defineComponent({
                     "rotate": 90,
                     "class": [`${prefixCls2}__fixed-left`, {
                       active: item.fixed === "left",
-                      disabled: !state.checkedList.includes(item.value)
+                      disabled: !state.checkedList.includes(item.dataIndex)
                     }],
                     "onClick": () => handleColumnFixed(item, "left")
                   }, null)],
@@ -37394,7 +37413,7 @@ const ShyTableColumn = /* @__PURE__ */ vue.defineComponent({
                     "rotate": 90,
                     "class": [`${prefixCls2}__fixed-right`, {
                       active: item.fixed === "right",
-                      disabled: !state.checkedList.includes(item.value)
+                      disabled: !state.checkedList.includes(item.dataIndex)
                     }],
                     "onClick": () => handleColumnFixed(item, "right")
                   }, null)],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "3h1-ui",
-  "version": "3.0.0-next.43",
+  "version": "3.0.0-next.45",
   "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/utils": "1.0.0-next.1"
+    "@shy-plugins/use": "1.0.0-next.1"
   },
   "types": "es/ui/index.d.ts",
   "devDependencies": {
@@ -48,7 +48,6 @@
     "patch": "npm version patch",
     "deploy": "pnpm -v",
     "build": "vite build",
-    "build:less": "esno build/buildLess",
-    "update:version": "tsx ../../scripts/update-version.ts"
+    "build:less": "esno build/buildLess"
   }
 }