3h1-ui 2.14.92 → 2.14.94

package/es/index.js

@@ -4071,9 +4071,16 @@ const _sfc_main$1q = defineComponent({
         return prev;
       }, []);
     });
-    watchEffect(() => {
-      props2.immediate && !props2.alwaysLoad && fetch();
-    });
+    watch(
+      () => props2.immediate && !props2.alwaysLoad,
+      (val) => {
+        if (val)
+          fetch();
+      },
+      {
+        immediate: true
+      }
+    );
     watch(
       () => state.value,
       (v) => {
@@ -4132,8 +4139,9 @@ const _sfc_main$1q = defineComponent({
     function emitChange() {
       emit("options-change", unref(getOptions));
     }
-    function handleChange(_, ...args) {
+    function handleChange(val, ...args) {
       emitData.value = args;
+      emit("update:value", val);
     }
     const filterOption = (input, option) => {
       var _a2, _b, _c;
@@ -7618,6 +7626,10 @@ const _hoisted_5$3 = {
 const _sfc_main$15 = /* @__PURE__ */ defineComponent({
   __name: "Table",
   props: {
+    rowKey: {
+      type: String,
+      default: () => "uuid"
+    },
     columns: {
       type: Array,
       default: () => []
@@ -7647,20 +7659,27 @@ const _sfc_main$15 = /* @__PURE__ */ defineComponent({
         width: 50,
         align: "center"
       };
-      return [indexColumn, ...props2.columns];
+      return [
+        indexColumn,
+        ...props2.columns.map((item) => ({
+          ...item,
+          type: item.type ? item.type : "input"
+        }))
+      ];
     });
     const plusClickEvent = () => {
-      state.value = [{ uuid: buildUUID() }, ...state.value];
+      state.value = [{ [props2.rowKey]: buildUUID() }, ...state.value];
       emit("add", state.value);
     };
     const rowClickEvent = (index2) => {
       const tempState = state.value.filter((item) => {
-        return item["uuid"] !== index2;
+        return item[props2.rowKey] !== index2;
       });
-      tempState.forEach((item) => item["uuid"] = buildUUID());
+      tempState.forEach((item) => item[props2.rowKey] = buildUUID());
       state.value = [...tempState];
       emit("remove", state.value, index2);
     };
+    const getPopupContainer2 = () => document.body;
     const loadKv = () => {
       const columns = props2.columns;
       let dicData = [];
@@ -7682,6 +7701,20 @@ const _sfc_main$15 = /* @__PURE__ */ defineComponent({
       }
       // { immediate: true }
     );
+    watch(
+      () => props2.value,
+      (v) => {
+        if (v.length) {
+          state.value = v.map((ele) => ({
+            ...ele,
+            [props2.rowKey]: buildUUID()
+          }));
+        }
+      },
+      {
+        immediate: true
+      }
+    );
     const validate = async () => {
       try {
         for (let formRef of listFormRefs.value) {
@@ -7702,26 +7735,29 @@ const _sfc_main$15 = /* @__PURE__ */ defineComponent({
         class: "table-children",
         align: "center"
       }, {
-        headerCell: withCtx(({ column }) => [
-          column.dataIndex === "index" ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
-            __props.isShowAction ? (openBlock(), createElementBlock("div", {
-              key: 0,
-              class: "shy-table-edit-icon-plus",
-              onClick: plusClickEvent
-            }, [
-              createVNode(unref(PlusCircleFilled$1), { style: { color: "#006eff" } })
-            ])) : (openBlock(), createElementBlock("div", _hoisted_1$t, "序号"))
-          ], 64)) : (openBlock(), createElementBlock(Fragment, { key: 1 }, [
-            column.required ? (openBlock(), createElementBlock("span", _hoisted_2$9, "*")) : createCommentVNode("", true),
-            createElementVNode("span", null, toDisplayString(column.title), 1)
-          ], 64))
-        ]),
-        bodyCell: withCtx(({ column, record, index: index2 }) => [
-          column.dataIndex !== "index" ? (openBlock(), createBlock(unref(FormItem), {
+        headerCell: withCtx(({ column }) => {
+          var _a2;
+          return [
+            column.dataIndex === "index" ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
+              __props.isShowAction ? (openBlock(), createElementBlock("div", {
+                key: 0,
+                class: "shy-table-edit-icon-plus",
+                onClick: plusClickEvent
+              }, [
+                createVNode(unref(PlusCircleFilled$1), { style: { color: "#006eff" } })
+              ])) : (openBlock(), createElementBlock("div", _hoisted_1$t, "序号"))
+            ], 64)) : (openBlock(), createElementBlock(Fragment, { key: 1 }, [
+              column.required || ((_a2 = column == null ? void 0 : column.rules) == null ? void 0 : _a2.length) ? (openBlock(), createElementBlock("span", _hoisted_2$9, "*")) : createCommentVNode("", true),
+              createElementVNode("span", null, toDisplayString(column.title), 1)
+            ], 64))
+          ];
+        }),
+        bodyCell: withCtx(({ column, record, index: index2, ...args }) => [
+          column.dataIndex !== "index" && column.type !== "text" ? (openBlock(), createBlock(unref(FormItem), {
             required: column.required,
             rules: (column == null ? void 0 : column.rules) || [],
             name: [_ctx.$attrs.codeField, index2, column.dataIndex],
-            key: record["uuid"]
+            key: record[__props.rowKey]
           }, {
             default: withCtx(() => [
               column.type === "select" ? (openBlock(), createBlock(unref(Select), {
@@ -7744,35 +7780,47 @@ const _sfc_main$15 = /* @__PURE__ */ defineComponent({
                 min: column.min,
                 max: column.max,
                 precision: column.precision ?? 2
-              }, null, 8, ["value", "onUpdate:value", "min", "max", "precision"])) : (openBlock(), createBlock(unref(Input), {
+              }, null, 8, ["value", "onUpdate:value", "min", "max", "precision"])) : column.type === "input" ? (openBlock(), createBlock(unref(Input), {
                 key: 3,
                 value: record[column.dataIndex],
                 "onUpdate:value": ($event) => record[column.dataIndex] = $event,
                 disabled: !props2.isShowAction
-              }, null, 8, ["value", "onUpdate:value", "disabled"]))
+              }, null, 8, ["value", "onUpdate:value", "disabled"])) : (openBlock(), createBlock(resolveDynamicComponent(unref(componentMap$2).get(column.type)), mergeProps(
+                {
+                  key: 4,
+                  allowClear: "",
+                  getPopupContainer: getPopupContainer2,
+                  style: { width: "100%" }
+                },
+                unref(isFunction$4)(column.componentProps) ? column.componentProps({ record, column, index: index2, ...args }) : column.componentProps,
+                {
+                  value: record[column.dataIndex],
+                  "onUpdate:value": ($event) => record[column.dataIndex] = $event
+                }
+              ), null, 16, ["value", "onUpdate:value"]))
             ]),
             _: 2
-          }, 1032, ["required", "rules", "name"])) : (openBlock(), createElementBlock("div", {
+          }, 1032, ["required", "rules", "name"])) : column.dataIndex === "index" ? (openBlock(), createElementBlock("div", {
             class: "table-children-delete-wrapper",
-            key: record["uuid"]
+            key: record[__props.rowKey]
           }, [
             __props.isShowAction ? (openBlock(), createElementBlock("span", _hoisted_3$6, toDisplayString(index2 + 1), 1)) : createCommentVNode("", true),
             __props.isShowAction ? (openBlock(), createElementBlock("div", {
               key: 1,
               class: "table-children-delete-item",
-              onClick: ($event) => rowClickEvent(record["uuid"])
+              onClick: ($event) => rowClickEvent(record[__props.rowKey])
             }, [
               createVNode(unref(DeleteFilled$1), { style: { color: "#fff" } })
             ], 8, _hoisted_4$4)) : (openBlock(), createElementBlock("span", _hoisted_5$3, toDisplayString(index2 + 1), 1))
-          ]))
+          ])) : createCommentVNode("", true)
         ]),
         _: 1
       }, 8, ["columns", "data-source"]);
     };
   }
 });
-const Table_vue_vue_type_style_index_0_scoped_9368e785_lang = "";
-const Table = /* @__PURE__ */ _export_sfc(_sfc_main$15, [["__scopeId", "data-v-9368e785"]]);
+const Table_vue_vue_type_style_index_0_scoped_ad73d9b9_lang = "";
+const Table = /* @__PURE__ */ _export_sfc(_sfc_main$15, [["__scopeId", "data-v-ad73d9b9"]]);
 const modal = "";
 useI18n$1();
 const modalProps = {
@@ -14711,7 +14759,8 @@ function handleColumnResize(propsRef, columns, wrapRef) {
     [0, 0]
   );
   const length = columns.length;
-  const colWidth = tableWidth ? (tableWidth - sumWidth - selectWidth) / (length - sumLength) : 100;
+  const countWidth = tableWidth ? (tableWidth - sumWidth - selectWidth) / (length - sumLength) : 150;
+  const colWidth = countWidth < 150 ? 150 : countWidth;
   columns.forEach((item) => {
     if (item.flag)
       return;
@@ -14828,7 +14877,22 @@ function useColumns$1(propsRef, getPaginationRef, tableAction, wrapRef) {
     return columns.filter((column) => {
       return hasPermission(column.auth) && isIfShow(column);
     }).map((column) => {
-      const { slots, customRender, format, edit, editRow, flag } = column;
+      var _a2, _b;
+      const isSummaryCol = unref(propsRef).showSummaryTotal && ((_b = (_a2 = unref(propsRef).summaryTotalFields) == null ? void 0 : _a2.includes) == null ? void 0 : _b.call(
+        _a2,
+        column.dataIndex
+      ));
+      const summaryFormat = (text) => {
+        return text ? isNumber$2(+text) && !isNaN(+text) ? Number.parseFloat((+text).toFixed(2)).toLocaleString("en-US") : text : "";
+      };
+      const {
+        slots,
+        customRender,
+        format = isSummaryCol ? summaryFormat : void 0,
+        edit,
+        editRow,
+        flag
+      } = column;
       if (!slots || !(slots == null ? void 0 : slots.title)) {
         column.customTitle = column.title;
         Reflect.deleteProperty(column, "title");
@@ -15014,7 +15078,7 @@ function useDataSource(propsRef, {
     const obj = {};
     summaryTotalFields.forEach((field) => {
       const total = dataSourceRef.value.reduce((acc, cur) => {
-        return acc + (cur[field] || 0);
+        return +acc + (+cur[field] || 0);
       }, 0);
       obj[field] = Number.parseFloat(total.toFixed(2)).toLocaleString("en-US");
     });
@@ -15030,7 +15094,9 @@ function useDataSource(propsRef, {
       immediate: true
     }
   );
+  let oldSortInfoRef;
   function handleTableChange(pagination, filters, sorter) {
+    const isChangeSorter = !eq(oldSortInfoRef, sorter.order);
     const { clearSelectOnPageChange, sortFn, filterFn } = unref(propsRef);
     if (clearSelectOnPageChange) {
       clearSelectedRowKeys();
@@ -15048,6 +15114,10 @@ function useDataSource(propsRef, {
       searchState.filterInfo = filterInfo;
       params.filterInfo = filterInfo;
     }
+    if (isChangeSorter && !unref(propsRef).isSortFetch) {
+      oldSortInfoRef = sorter.order;
+      return;
+    }
     fetch(params);
   }
   function setTableKey(items) {
@@ -15557,6 +15627,19 @@ function useTableScroll(propsRef, tableElRef, columnsRef, rowSelectionRef, getDa
     nextTick(() => {
       debounceRedoHeight();
     });
+    const table2 = unref(tableElRef);
+    if (!table2)
+      return;
+    const tableEl = table2.$el;
+    if (!tableEl)
+      return;
+    const bodyEl2 = tableEl.querySelector(".ant-table-tbody");
+    if (!bodyEl2)
+      return;
+    new Sortablejs(bodyEl2, {
+      ghostClass: "bg-gray-100",
+      draggable: ".ant-table-row"
+    });
   });
   const getScrollX = computed(() => {
     var _a2;
@@ -17281,6 +17364,7 @@ const basicProps$3 = reactive({
     }
   },
   inset: Boolean,
+  isSortFetch: { type: Boolean, default: true },
   sortFn: {
     type: Function,
     default: DEFAULT_SORT_FN

package/es/style.css

@@ -265,6 +265,10 @@ ul {
     max-width: 1600px;
   }
 }
+.bg-gray-100 {
+  --tw-bg-opacity: 1;
+  background-color: rgba(243, 244, 246, var(--tw-bg-opacity));
+}
 .border-primary {
   --tw-border-opacity: 1;
   border-color: rgba(24, 144, 255, var(--tw-border-opacity));
@@ -24871,40 +24875,40 @@ span.iconify {
 .shy-tinymce-container textarea {
   z-index: -1;
   visibility: hidden;
-}.shy-table-edit-icon-plus[data-v-9368e785] {
+}.shy-table-edit-icon-plus[data-v-ad73d9b9] {
   width: 30px;
   height: 30px;
   font-size: 30px;
   cursor: pointer;
   display: flex;
 }
-.table-children[data-v-9368e785] .ant-form-item {
+.table-children[data-v-ad73d9b9] .ant-form-item {
   margin-bottom: 0 !important;
 }
-.table-children-required[data-v-9368e785] {
+.table-children-required[data-v-ad73d9b9] {
   color: #ff4d4f;
   margin-right: 4px;
 }
-.table-children[data-v-9368e785] .ant-table-cell {
+.table-children[data-v-ad73d9b9] .ant-table-cell {
   padding: 8px !important;
 }
-.table-children[data-v-9368e785] .ant-table-cell .ant-form-item-explain {
+.table-children[data-v-ad73d9b9] .ant-table-cell .ant-form-item-explain {
   display: none;
 }
-.table-children-delete-wrapper[data-v-9368e785] {
+.table-children-delete-wrapper[data-v-ad73d9b9] {
   display: flex;
   height: 100%;
   justify-content: center;
 }
-.table-children-delete-wrapper:hover .table-children-delete-item[data-v-9368e785] {
+.table-children-delete-wrapper:hover .table-children-delete-item[data-v-ad73d9b9] {
   display: flex;
   justify-content: center;
   align-items: center;
 }
-.table-children-delete-wrapper:hover .table-children-delete-index[data-v-9368e785] {
+.table-children-delete-wrapper:hover .table-children-delete-index[data-v-ad73d9b9] {
   display: none;
 }
-.table-children-delete-item[data-v-9368e785] {
+.table-children-delete-item[data-v-ad73d9b9] {
   background-color: red;
   border-radius: 50%;
   width: 30px;
@@ -24913,7 +24917,7 @@ span.iconify {
   display: none;
   cursor: pointer;
 }
-.table-children-delete-index[data-v-9368e785] {
+.table-children-delete-index[data-v-ad73d9b9] {
   user-select: none;
   display: inline-block;
 }@media screen and (max-height: 600px) {

package/lib/index.js

@@ -4095,9 +4095,16 @@ const _sfc_main$1q = vue.defineComponent({
         return prev;
       }, []);
     });
-    vue.watchEffect(() => {
-      props2.immediate && !props2.alwaysLoad && fetch();
-    });
+    vue.watch(
+      () => props2.immediate && !props2.alwaysLoad,
+      (val) => {
+        if (val)
+          fetch();
+      },
+      {
+        immediate: true
+      }
+    );
     vue.watch(
       () => state.value,
       (v) => {
@@ -4156,8 +4163,9 @@ const _sfc_main$1q = vue.defineComponent({
     function emitChange() {
       emit("options-change", vue.unref(getOptions));
     }
-    function handleChange(_, ...args) {
+    function handleChange(val, ...args) {
       emitData.value = args;
+      emit("update:value", val);
     }
     const filterOption = (input, option) => {
       var _a2, _b, _c;
@@ -7642,6 +7650,10 @@ const _hoisted_5$3 = {
 const _sfc_main$15 = /* @__PURE__ */ vue.defineComponent({
   __name: "Table",
   props: {
+    rowKey: {
+      type: String,
+      default: () => "uuid"
+    },
     columns: {
       type: Array,
       default: () => []
@@ -7671,20 +7683,27 @@ const _sfc_main$15 = /* @__PURE__ */ vue.defineComponent({
         width: 50,
         align: "center"
       };
-      return [indexColumn, ...props2.columns];
+      return [
+        indexColumn,
+        ...props2.columns.map((item) => ({
+          ...item,
+          type: item.type ? item.type : "input"
+        }))
+      ];
     });
     const plusClickEvent = () => {
-      state.value = [{ uuid: utils.buildUUID() }, ...state.value];
+      state.value = [{ [props2.rowKey]: utils.buildUUID() }, ...state.value];
       emit("add", state.value);
     };
     const rowClickEvent = (index2) => {
       const tempState = state.value.filter((item) => {
-        return item["uuid"] !== index2;
+        return item[props2.rowKey] !== index2;
       });
-      tempState.forEach((item) => item["uuid"] = utils.buildUUID());
+      tempState.forEach((item) => item[props2.rowKey] = utils.buildUUID());
       state.value = [...tempState];
       emit("remove", state.value, index2);
     };
+    const getPopupContainer2 = () => document.body;
     const loadKv = () => {
       const columns = props2.columns;
       let dicData = [];
@@ -7706,6 +7725,20 @@ const _sfc_main$15 = /* @__PURE__ */ vue.defineComponent({
       }
       // { immediate: true }
     );
+    vue.watch(
+      () => props2.value,
+      (v) => {
+        if (v.length) {
+          state.value = v.map((ele) => ({
+            ...ele,
+            [props2.rowKey]: utils.buildUUID()
+          }));
+        }
+      },
+      {
+        immediate: true
+      }
+    );
     const validate = async () => {
       try {
         for (let formRef of listFormRefs.value) {
@@ -7726,26 +7759,29 @@ const _sfc_main$15 = /* @__PURE__ */ vue.defineComponent({
         class: "table-children",
         align: "center"
       }, {
-        headerCell: vue.withCtx(({ column }) => [
-          column.dataIndex === "index" ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 0 }, [
-            __props.isShowAction ? (vue.openBlock(), vue.createElementBlock("div", {
-              key: 0,
-              class: "shy-table-edit-icon-plus",
-              onClick: plusClickEvent
-            }, [
-              vue.createVNode(vue.unref(PlusCircleFilled$1), { style: { color: "#006eff" } })
-            ])) : (vue.openBlock(), vue.createElementBlock("div", _hoisted_1$t, "序号"))
-          ], 64)) : (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 1 }, [
-            column.required ? (vue.openBlock(), vue.createElementBlock("span", _hoisted_2$9, "*")) : vue.createCommentVNode("", true),
-            vue.createElementVNode("span", null, vue.toDisplayString(column.title), 1)
-          ], 64))
-        ]),
-        bodyCell: vue.withCtx(({ column, record, index: index2 }) => [
-          column.dataIndex !== "index" ? (vue.openBlock(), vue.createBlock(vue.unref(antDesignVue.FormItem), {
+        headerCell: vue.withCtx(({ column }) => {
+          var _a2;
+          return [
+            column.dataIndex === "index" ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 0 }, [
+              __props.isShowAction ? (vue.openBlock(), vue.createElementBlock("div", {
+                key: 0,
+                class: "shy-table-edit-icon-plus",
+                onClick: plusClickEvent
+              }, [
+                vue.createVNode(vue.unref(PlusCircleFilled$1), { style: { color: "#006eff" } })
+              ])) : (vue.openBlock(), vue.createElementBlock("div", _hoisted_1$t, "序号"))
+            ], 64)) : (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 1 }, [
+              column.required || ((_a2 = column == null ? void 0 : column.rules) == null ? void 0 : _a2.length) ? (vue.openBlock(), vue.createElementBlock("span", _hoisted_2$9, "*")) : vue.createCommentVNode("", true),
+              vue.createElementVNode("span", null, vue.toDisplayString(column.title), 1)
+            ], 64))
+          ];
+        }),
+        bodyCell: vue.withCtx(({ column, record, index: index2, ...args }) => [
+          column.dataIndex !== "index" && column.type !== "text" ? (vue.openBlock(), vue.createBlock(vue.unref(antDesignVue.FormItem), {
             required: column.required,
             rules: (column == null ? void 0 : column.rules) || [],
             name: [_ctx.$attrs.codeField, index2, column.dataIndex],
-            key: record["uuid"]
+            key: record[__props.rowKey]
           }, {
             default: vue.withCtx(() => [
               column.type === "select" ? (vue.openBlock(), vue.createBlock(vue.unref(antDesignVue.Select), {
@@ -7768,35 +7804,47 @@ const _sfc_main$15 = /* @__PURE__ */ vue.defineComponent({
                 min: column.min,
                 max: column.max,
                 precision: column.precision ?? 2
-              }, null, 8, ["value", "onUpdate:value", "min", "max", "precision"])) : (vue.openBlock(), vue.createBlock(vue.unref(antDesignVue.Input), {
+              }, null, 8, ["value", "onUpdate:value", "min", "max", "precision"])) : column.type === "input" ? (vue.openBlock(), vue.createBlock(vue.unref(antDesignVue.Input), {
                 key: 3,
                 value: record[column.dataIndex],
                 "onUpdate:value": ($event) => record[column.dataIndex] = $event,
                 disabled: !props2.isShowAction
-              }, null, 8, ["value", "onUpdate:value", "disabled"]))
+              }, null, 8, ["value", "onUpdate:value", "disabled"])) : (vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(vue.unref(componentMap$2).get(column.type)), vue.mergeProps(
+                {
+                  key: 4,
+                  allowClear: "",
+                  getPopupContainer: getPopupContainer2,
+                  style: { width: "100%" }
+                },
+                vue.unref(utils.isFunction)(column.componentProps) ? column.componentProps({ record, column, index: index2, ...args }) : column.componentProps,
+                {
+                  value: record[column.dataIndex],
+                  "onUpdate:value": ($event) => record[column.dataIndex] = $event
+                }
+              ), null, 16, ["value", "onUpdate:value"]))
             ]),
             _: 2
-          }, 1032, ["required", "rules", "name"])) : (vue.openBlock(), vue.createElementBlock("div", {
+          }, 1032, ["required", "rules", "name"])) : column.dataIndex === "index" ? (vue.openBlock(), vue.createElementBlock("div", {
             class: "table-children-delete-wrapper",
-            key: record["uuid"]
+            key: record[__props.rowKey]
           }, [
             __props.isShowAction ? (vue.openBlock(), vue.createElementBlock("span", _hoisted_3$6, vue.toDisplayString(index2 + 1), 1)) : vue.createCommentVNode("", true),
             __props.isShowAction ? (vue.openBlock(), vue.createElementBlock("div", {
               key: 1,
               class: "table-children-delete-item",
-              onClick: ($event) => rowClickEvent(record["uuid"])
+              onClick: ($event) => rowClickEvent(record[__props.rowKey])
             }, [
               vue.createVNode(vue.unref(DeleteFilled$1), { style: { color: "#fff" } })
             ], 8, _hoisted_4$4)) : (vue.openBlock(), vue.createElementBlock("span", _hoisted_5$3, vue.toDisplayString(index2 + 1), 1))
-          ]))
+          ])) : vue.createCommentVNode("", true)
         ]),
         _: 1
       }, 8, ["columns", "data-source"]);
     };
   }
 });
-const Table_vue_vue_type_style_index_0_scoped_9368e785_lang = "";
-const Table = /* @__PURE__ */ _export_sfc(_sfc_main$15, [["__scopeId", "data-v-9368e785"]]);
+const Table_vue_vue_type_style_index_0_scoped_ad73d9b9_lang = "";
+const Table = /* @__PURE__ */ _export_sfc(_sfc_main$15, [["__scopeId", "data-v-ad73d9b9"]]);
 const modal = "";
 use.useI18n();
 const modalProps = {
@@ -14735,7 +14783,8 @@ function handleColumnResize(propsRef, columns, wrapRef) {
     [0, 0]
   );
   const length = columns.length;
-  const colWidth = tableWidth ? (tableWidth - sumWidth - selectWidth) / (length - sumLength) : 100;
+  const countWidth = tableWidth ? (tableWidth - sumWidth - selectWidth) / (length - sumLength) : 150;
+  const colWidth = countWidth < 150 ? 150 : countWidth;
   columns.forEach((item) => {
     if (item.flag)
       return;
@@ -14852,7 +14901,22 @@ function useColumns$1(propsRef, getPaginationRef, tableAction, wrapRef) {
     return columns.filter((column) => {
       return hasPermission(column.auth) && isIfShow(column);
     }).map((column) => {
-      const { slots, customRender, format, edit, editRow, flag } = column;
+      var _a2, _b;
+      const isSummaryCol = vue.unref(propsRef).showSummaryTotal && ((_b = (_a2 = vue.unref(propsRef).summaryTotalFields) == null ? void 0 : _a2.includes) == null ? void 0 : _b.call(
+        _a2,
+        column.dataIndex
+      ));
+      const summaryFormat = (text) => {
+        return text ? utils.isNumber(+text) && !isNaN(+text) ? Number.parseFloat((+text).toFixed(2)).toLocaleString("en-US") : text : "";
+      };
+      const {
+        slots,
+        customRender,
+        format = isSummaryCol ? summaryFormat : void 0,
+        edit,
+        editRow,
+        flag
+      } = column;
       if (!slots || !(slots == null ? void 0 : slots.title)) {
         column.customTitle = column.title;
         Reflect.deleteProperty(column, "title");
@@ -15038,7 +15102,7 @@ function useDataSource(propsRef, {
     const obj = {};
     summaryTotalFields.forEach((field) => {
       const total = dataSourceRef.value.reduce((acc, cur) => {
-        return acc + (cur[field] || 0);
+        return +acc + (+cur[field] || 0);
       }, 0);
       obj[field] = Number.parseFloat(total.toFixed(2)).toLocaleString("en-US");
     });
@@ -15054,7 +15118,9 @@ function useDataSource(propsRef, {
       immediate: true
     }
   );
+  let oldSortInfoRef;
   function handleTableChange(pagination, filters, sorter) {
+    const isChangeSorter = !eq(oldSortInfoRef, sorter.order);
     const { clearSelectOnPageChange, sortFn, filterFn } = vue.unref(propsRef);
     if (clearSelectOnPageChange) {
       clearSelectedRowKeys();
@@ -15072,6 +15138,10 @@ function useDataSource(propsRef, {
       searchState.filterInfo = filterInfo;
       params.filterInfo = filterInfo;
     }
+    if (isChangeSorter && !vue.unref(propsRef).isSortFetch) {
+      oldSortInfoRef = sorter.order;
+      return;
+    }
     fetch(params);
   }
   function setTableKey(items) {
@@ -15581,6 +15651,19 @@ function useTableScroll(propsRef, tableElRef, columnsRef, rowSelectionRef, getDa
     vue.nextTick(() => {
       debounceRedoHeight();
     });
+    const table2 = vue.unref(tableElRef);
+    if (!table2)
+      return;
+    const tableEl = table2.$el;
+    if (!tableEl)
+      return;
+    const bodyEl2 = tableEl.querySelector(".ant-table-tbody");
+    if (!bodyEl2)
+      return;
+    new Sortablejs(bodyEl2, {
+      ghostClass: "bg-gray-100",
+      draggable: ".ant-table-row"
+    });
   });
   const getScrollX = vue.computed(() => {
     var _a2;
@@ -17305,6 +17388,7 @@ const basicProps$3 = vue.reactive({
     }
   },
   inset: Boolean,
+  isSortFetch: { type: Boolean, default: true },
   sortFn: {
     type: Function,
     default: DEFAULT_SORT_FN

package/lib/style.css

@@ -265,6 +265,10 @@ ul {
     max-width: 1600px;
   }
 }
+.bg-gray-100 {
+  --tw-bg-opacity: 1;
+  background-color: rgba(243, 244, 246, var(--tw-bg-opacity));
+}
 .border-primary {
   --tw-border-opacity: 1;
   border-color: rgba(24, 144, 255, var(--tw-border-opacity));
@@ -24871,40 +24875,40 @@ span.iconify {
 .shy-tinymce-container textarea {
   z-index: -1;
   visibility: hidden;
-}.shy-table-edit-icon-plus[data-v-9368e785] {
+}.shy-table-edit-icon-plus[data-v-ad73d9b9] {
   width: 30px;
   height: 30px;
   font-size: 30px;
   cursor: pointer;
   display: flex;
 }
-.table-children[data-v-9368e785] .ant-form-item {
+.table-children[data-v-ad73d9b9] .ant-form-item {
   margin-bottom: 0 !important;
 }
-.table-children-required[data-v-9368e785] {
+.table-children-required[data-v-ad73d9b9] {
   color: #ff4d4f;
   margin-right: 4px;
 }
-.table-children[data-v-9368e785] .ant-table-cell {
+.table-children[data-v-ad73d9b9] .ant-table-cell {
   padding: 8px !important;
 }
-.table-children[data-v-9368e785] .ant-table-cell .ant-form-item-explain {
+.table-children[data-v-ad73d9b9] .ant-table-cell .ant-form-item-explain {
   display: none;
 }
-.table-children-delete-wrapper[data-v-9368e785] {
+.table-children-delete-wrapper[data-v-ad73d9b9] {
   display: flex;
   height: 100%;
   justify-content: center;
 }
-.table-children-delete-wrapper:hover .table-children-delete-item[data-v-9368e785] {
+.table-children-delete-wrapper:hover .table-children-delete-item[data-v-ad73d9b9] {
   display: flex;
   justify-content: center;
   align-items: center;
 }
-.table-children-delete-wrapper:hover .table-children-delete-index[data-v-9368e785] {
+.table-children-delete-wrapper:hover .table-children-delete-index[data-v-ad73d9b9] {
   display: none;
 }
-.table-children-delete-item[data-v-9368e785] {
+.table-children-delete-item[data-v-ad73d9b9] {
   background-color: red;
   border-radius: 50%;
   width: 30px;
@@ -24913,7 +24917,7 @@ span.iconify {
   display: none;
   cursor: pointer;
 }
-.table-children-delete-index[data-v-9368e785] {
+.table-children-delete-index[data-v-ad73d9b9] {
   user-select: none;
   display: inline-block;
 }@media screen and (max-height: 600px) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "3h1-ui",
-  "version": "2.14.92",
+  "version": "2.14.94",
   "description": "",
   "module": "es/index.js",
   "main": "lib/index.js",
@@ -29,8 +29,8 @@
     "vue-json-pretty": "^2.2.3",
     "vxe-table": "^4.3.6",
     "xe-utils": "^3.5.7",
-    "@shy-plugins/tinymce": "^1.0.6",
     "@shy-plugins/use": "1.0.9",
+    "@shy-plugins/tinymce": "^1.0.6",
     "@shy-plugins/utils": "1.1.1"
   },
   "types": "es/ui/index.d.ts",