3h1-ui 3.0.0-next.5 → 3.0.0-next.7

package/lib/index.js

@@ -4542,9 +4542,16 @@ const _sfc_main$1q = vue.defineComponent({
         return prev2;
       }, []);
     });
-    vue.watchEffect(() => {
-      props2.immediate && !props2.alwaysLoad && fetch();
-    });
+    vue.watch(
+      () => props2.immediate && !props2.alwaysLoad,
+      (val) => {
+        if (val)
+          fetch();
+      },
+      {
+        immediate: true
+      }
+    );
     vue.watch(
       () => state.value,
       (v) => {
@@ -4588,6 +4595,7 @@ const _sfc_main$1q = vue.defineComponent({
         console.warn(error2);
       } finally {
         loading.value = false;
+        isFirstLoad.value = false;
       }
     }
     async function handleFetch(visible) {
@@ -4603,8 +4611,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;
@@ -8072,24 +8081,28 @@ const _sfc_main$16 = /* @__PURE__ */ vue.defineComponent({
     };
   }
 });
-const _hoisted_1$t = { key: 0 };
-const _hoisted_2$9 = { key: 1 };
-const _hoisted_3$6 = {
-  key: 1,
-  class: "delete-wrapper"
+const _hoisted_1$t = { key: 1 };
+const _hoisted_2$9 = {
+  key: 0,
+  class: "table-children-required"
 };
+const _hoisted_3$6 = { class: "text-red-500" };
 const _hoisted_4$4 = {
   key: 0,
-  class: "delete-index"
+  class: "table-children-delete-index"
 };
 const _hoisted_5$3 = ["onClick"];
 const _hoisted_6$1 = {
   key: 2,
-  class: ""
+  class: "table-children-delete-index"
 };
 const _sfc_main$15 = /* @__PURE__ */ vue.defineComponent({
   __name: "Table",
   props: {
+    rowKey: {
+      type: String,
+      default: () => "uuid"
+    },
     columns: {
       type: Array,
       default: () => []
@@ -8106,7 +8119,7 @@ const _sfc_main$15 = /* @__PURE__ */ vue.defineComponent({
   emits: ["update:value", "change", "add", "remove"],
   setup(__props, { expose, emit }) {
     const props2 = __props;
-    const listFormRefs = vue.ref([]);
+    const formActionType = vue.inject("formActionType");
     const emitData = vue.ref([]);
     const [state] = use.useRuleFormItem(props2, "value", "change", emitData);
     const getColumns = vue.computed(() => {
@@ -8119,18 +8132,124 @@ 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 = [{}, ...state.value];
+      state.value = [{ [props2.rowKey]: utils.buildUUID() }, ...vue.toRaw(state.value)];
       emit("add", state.value);
     };
     const rowClickEvent = (index2) => {
-      state.value = vue.unref(state).filter((item, i) => {
-        return index2 !== i;
+      const tempState = state.value.filter((item) => {
+        return item[props2.rowKey] !== index2;
       });
+      tempState.forEach((item) => item[props2.rowKey] = utils.buildUUID());
+      state.value = [...tempState];
       emit("remove", state.value, index2);
     };
+    const getPopupContainer2 = () => document.body;
+    const rulesRef = vue.reactive({});
+    const getRules = ({ column: column2, record, index: index2, ...args }) => {
+      var _a2, _b;
+      const errKey = `${column2.dataIndex}-${record.uuid}Info`;
+      if (!column2.required)
+        return [];
+      if ((_a2 = rulesRef[errKey]) == null ? void 0 : _a2.rules)
+        return (_b = rulesRef[errKey]) == null ? void 0 : _b.rules;
+      rulesRef[errKey] = {
+        rules: [],
+        show: false,
+        msg: ""
+      };
+      if (!column2.rules && column2.required) {
+        rulesRef[errKey].rules = [
+          {
+            required: true,
+            validator: (rule, value) => {
+              const prefix = column2.type.toLocaleLowerCase().includes("input") ? "请输入" : "请选择";
+              const errMsg = `${prefix}${column2.title}`;
+              if (value) {
+                rulesRef[errKey].show = false;
+                return Promise.resolve();
+              }
+              rulesRef[errKey].show = true;
+              rulesRef[errKey].msg = errMsg;
+              return Promise.reject(errMsg);
+            }
+          }
+        ];
+        return rulesRef[errKey].rules;
+      }
+      if (!isArray$3(column2.rules))
+        return column2.rules;
+      rulesRef[errKey].rules = cloneDeep(column2.rules);
+      rulesRef[errKey].rules.forEach((item) => {
+        if (!item.validator || !utils.isFunction(item.validator))
+          return;
+        const validator = item.validator;
+        item.validator = async (rule, value) => {
+          try {
+            rulesRef[errKey].show = false;
+            return await validator(
+              rule,
+              value,
+              { column: column2, record, ...args },
+              formActionType
+            );
+          } catch (error2) {
+            rulesRef[errKey].show = true;
+            rulesRef[errKey].msg = error2;
+            return Promise.reject(error2);
+          }
+        };
+      });
+      return rulesRef[errKey].rules;
+    };
+    vue.watch(
+      () => state.value,
+      (v, old) => {
+        if (!isEqual(vue.toRaw(v), vue.toRaw(old))) {
+          emit(
+            "update:value",
+            vue.toRaw(v).map((ele) => {
+              return {
+                ...ele,
+                [props2.rowKey]: ele[props2.rowKey] || utils.buildUUID()
+              };
+            })
+          );
+        }
+      },
+      {
+        deep: true
+      }
+    );
+    const isScroll = vue.ref(false);
+    const timer = vue.ref();
+    vue.onMounted(() => {
+      window.addEventListener(
+        "scroll",
+        (e) => {
+          clearTimeout(timer.value);
+          timer.value = setTimeout(() => {
+            isScroll.value = false;
+          }, 500);
+          if (isScroll.value)
+            return;
+          isScroll.value = true;
+        },
+        true
+      );
+    });
+    vue.onUnmounted(() => {
+      window.removeEventListener("scroll", () => {
+      });
+    });
     const loadKv = () => {
       const columns = props2.columns;
       let dicData = [];
@@ -8141,14 +8260,7 @@ const _sfc_main$15 = /* @__PURE__ */ vue.defineComponent({
         }
       });
     };
-    loadKv();
-    vue.watch(
-      () => state.value,
-      (v) => {
-        emit("update:value", v);
-      }
-      // { immediate: true }
-    );
+    const listFormRefs = vue.ref([]);
     const validate = async () => {
       try {
         for (let formRef of listFormRefs.value) {
@@ -8158,6 +8270,7 @@ const _sfc_main$15 = /* @__PURE__ */ vue.defineComponent({
         throw new Error("校验失败");
       }
     };
+    loadKv();
     expose({ validate });
     return (_ctx, _cache) => {
       return vue.openBlock(), vue.createBlock(vue.unref(antDesignVue.Table), {
@@ -8169,81 +8282,109 @@ const _sfc_main$15 = /* @__PURE__ */ vue.defineComponent({
         class: "table-children",
         align: "center"
       }, {
-        headerCell: vue.withCtx(({ column: column2 }) => [
-          column2.dataIndex === "index" ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_1$t, [
-            __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_2$9, "序号"))
-          ])) : vue.createCommentVNode("", true)
-        ]),
-        bodyCell: vue.withCtx(({ column: column2, record, index: index2 }) => [
-          column2.dataIndex !== "index" ? (vue.openBlock(), vue.createBlock(vue.unref(antDesignVue.Form), {
-            key: 0,
-            model: record,
-            ref: (el) => {
-              if (el)
-                listFormRefs.value.push(el);
-            }
+        headerCell: vue.withCtx(({ column: column2 }) => {
+          var _a2;
+          return [
+            column2.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 }, [
+              column2.required || ((_a2 = column2 == null ? void 0 : column2.rules) == null ? void 0 : _a2.length) ? (vue.openBlock(), vue.createElementBlock("span", _hoisted_2$9, "*")) : vue.createCommentVNode("", true),
+              vue.createElementVNode("span", null, vue.toDisplayString(column2.title), 1)
+            ], 64))
+          ];
+        }),
+        bodyCell: vue.withCtx(({ column: column2, record, index: index2, ...args }) => [
+          column2.dataIndex !== "index" && column2.type !== "text" ? (vue.openBlock(), vue.createBlock(vue.unref(antDesignVue.FormItem), {
+            required: column2.required,
+            rules: getRules({ column: column2, record, index: index2, ...args }),
+            name: [_ctx.$attrs.codeField, index2, column2.dataIndex],
+            key: record[__props.rowKey]
           }, {
-            default: vue.withCtx(() => [
-              vue.createVNode(vue.unref(antDesignVue.FormItem), {
-                rules: (column2 == null ? void 0 : column2.rules) || [],
-                name: column2.dataIndex
-              }, {
-                default: vue.withCtx(() => [
-                  column2.type === "select" ? (vue.openBlock(), vue.createBlock(vue.unref(antDesignVue.Select), {
-                    key: 0,
-                    value: record[column2.dataIndex],
-                    "onUpdate:value": ($event) => record[column2.dataIndex] = $event,
-                    options: column2.dicData,
-                    mode: column2.mode,
-                    "max-tag-count": column2.maxTagCount,
-                    "max-tag-text-length": column2.maxTagTextLength
-                  }, null, 8, ["value", "onUpdate:value", "options", "mode", "max-tag-count", "max-tag-text-length"])) : column2.type === "datePicker" ? (vue.openBlock(), vue.createBlock(vue.unref(antDesignVue.DatePicker), {
-                    key: 1,
-                    value: record[column2.dataIndex],
-                    "onUpdate:value": ($event) => record[column2.dataIndex] = $event,
-                    valueFormat: "YYYY-MM-DD HH:mm:ss"
-                  }, null, 8, ["value", "onUpdate:value"])) : column2.type === "number" ? (vue.openBlock(), vue.createBlock(vue.unref(antDesignVue.InputNumber), {
-                    key: 2,
-                    value: record[column2.dataIndex],
-                    "onUpdate:value": ($event) => record[column2.dataIndex] = $event,
-                    min: column2.min,
-                    max: column2.max,
-                    precision: column2.precision ?? 2
-                  }, null, 8, ["value", "onUpdate:value", "min", "max", "precision"])) : (vue.openBlock(), vue.createBlock(vue.unref(antDesignVue.Input), {
-                    key: 3,
-                    value: record[column2.dataIndex],
-                    "onUpdate:value": ($event) => record[column2.dataIndex] = $event,
-                    disabled: !props2.isShowAction
-                  }, null, 8, ["value", "onUpdate:value", "disabled"]))
-                ]),
-                _: 2
-              }, 1032, ["rules", "name"])
-            ]),
+            default: vue.withCtx(() => {
+              var _a2;
+              return [
+                vue.createVNode(vue.unref(antDesignVue.Popover), {
+                  overlayClassName: "table-children-err-popover",
+                  visible: !!((_a2 = rulesRef == null ? void 0 : rulesRef[`${column2.dataIndex}-${record.uuid}Info`]) == null ? void 0 : _a2.show) && !isScroll.value
+                }, {
+                  content: vue.withCtx(() => {
+                    var _a3;
+                    return [
+                      vue.createElementVNode("span", _hoisted_3$6, vue.toDisplayString((_a3 = rulesRef[`${column2.dataIndex}-${record.uuid}Info`]) == null ? void 0 : _a3.msg), 1)
+                    ];
+                  }),
+                  default: vue.withCtx(() => [
+                    column2.type === "select" ? (vue.openBlock(), vue.createBlock(vue.unref(antDesignVue.Select), {
+                      key: 0,
+                      value: record[column2.dataIndex],
+                      "onUpdate:value": ($event) => record[column2.dataIndex] = $event,
+                      options: column2.dicData,
+                      mode: column2.mode,
+                      "max-tag-count": column2.maxTagCount,
+                      "max-tag-text-length": column2.maxTagTextLength
+                    }, null, 8, ["value", "onUpdate:value", "options", "mode", "max-tag-count", "max-tag-text-length"])) : column2.type === "datePicker" ? (vue.openBlock(), vue.createBlock(vue.unref(antDesignVue.DatePicker), {
+                      key: 1,
+                      value: record[column2.dataIndex],
+                      "onUpdate:value": ($event) => record[column2.dataIndex] = $event,
+                      valueFormat: "YYYY-MM-DD HH:mm:ss"
+                    }, null, 8, ["value", "onUpdate:value"])) : column2.type === "number" ? (vue.openBlock(), vue.createBlock(vue.unref(antDesignVue.InputNumber), {
+                      key: 2,
+                      value: record[column2.dataIndex],
+                      "onUpdate:value": ($event) => record[column2.dataIndex] = $event,
+                      min: column2.min,
+                      max: column2.max,
+                      precision: column2.precision ?? 2
+                    }, null, 8, ["value", "onUpdate:value", "min", "max", "precision"])) : column2.type === "input" ? (vue.openBlock(), vue.createBlock(vue.unref(antDesignVue.Input), {
+                      key: 3,
+                      value: record[column2.dataIndex],
+                      "onUpdate:value": ($event) => record[column2.dataIndex] = $event,
+                      disabled: !props2.isShowAction
+                    }, null, 8, ["value", "onUpdate:value", "disabled"])) : (vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(vue.unref(componentMap$2).get(column2.type)), vue.mergeProps(
+                      {
+                        key: 4,
+                        allowClear: "",
+                        getPopupContainer: getPopupContainer2,
+                        style: { width: "100%" }
+                      },
+                      vue.unref(utils.isFunction)(column2.componentProps) ? column2.componentProps({ record, column: column2, index: index2, ...args }) : column2.componentProps,
+                      {
+                        value: record[column2.dataIndex],
+                        "onUpdate:value": ($event) => record[column2.dataIndex] = $event
+                      }
+                    ), null, 16, ["value", "onUpdate:value"]))
+                  ]),
+                  _: 2
+                }, 1032, ["visible"])
+              ];
+            }),
             _: 2
-          }, 1032, ["model"])) : (vue.openBlock(), vue.createElementBlock("div", _hoisted_3$6, [
+          }, 1032, ["required", "rules", "name"])) : column2.dataIndex === "index" ? (vue.openBlock(), vue.createElementBlock("div", {
+            class: "table-children-delete-wrapper",
+            key: record[__props.rowKey]
+          }, [
             __props.isShowAction ? (vue.openBlock(), vue.createElementBlock("span", _hoisted_4$4, vue.toDisplayString(index2 + 1), 1)) : vue.createCommentVNode("", true),
             __props.isShowAction ? (vue.openBlock(), vue.createElementBlock("div", {
               key: 1,
-              class: "delete-item",
-              onClick: ($event) => rowClickEvent(index2)
+              class: "table-children-delete-item",
+              onClick: ($event) => rowClickEvent(record[__props.rowKey])
             }, [
               vue.createVNode(vue.unref(DeleteFilled$1), { style: { color: "#fff" } })
             ], 8, _hoisted_5$3)) : (vue.openBlock(), vue.createElementBlock("span", _hoisted_6$1, vue.toDisplayString(index2 + 1), 1))
-          ]))
+          ])) : vue.createCommentVNode("", true)
         ]),
         _: 1
       }, 8, ["columns", "data-source"]);
     };
   }
 });
-const Table_vue_vue_type_style_index_0_scoped_cb71007d_lang = "";
-const Table = /* @__PURE__ */ _export_sfc(_sfc_main$15, [["__scopeId", "data-v-cb71007d"]]);
+const Table_vue_vue_type_style_index_0_scoped_9232fde4_lang = "";
+const Table = /* @__PURE__ */ _export_sfc(_sfc_main$15, [["__scopeId", "data-v-9232fde4"]]);
 const modal = "";
 const modalProps = {
   visible: { type: Boolean },
@@ -9258,10 +9399,8 @@ const _sfc_main$Z = vue.defineComponent({
     vue.watch(
       () => vue.unref(visibleRef),
       (v) => {
-        var _a2;
         emit("visible-change", v);
         emit("update:visible", v);
-        instance && ((_a2 = modalMethods.emitVisible) == null ? void 0 : _a2.call(modalMethods, v, instance.uid));
         vue.nextTick(() => {
           if (props2.scrollTop && v && vue.unref(modalWrapperRef)) {
             vue.unref(modalWrapperRef).scrollTop();
@@ -11139,6 +11278,9 @@ function createPlaceholderMessage$1(component) {
   if (component.includes("Transfer") || component.includes("Select") || component.includes("Cascader") || component.includes("Checkbox") || component.includes("Radio") || component.includes("Switch")) {
     return "请选择";
   }
+  if (component.includes("Table")) {
+    return "请至少添加一条";
+  }
   return "";
 }
 const DATE_TYPE = ["DatePicker", "MonthPicker", "WeekPicker", "TimePicker"];
@@ -11414,7 +11556,9 @@ const _sfc_main$O = /* @__PURE__ */ vue.defineComponent({
         dynamicRules,
         required
       } = props2.schema;
-      emit("clearCurrValidate", vue.unref(getValues).field);
+      if (props2.schema.component !== "Table") {
+        emit("clearCurrValidate", vue.unref(getValues).field);
+      }
       if (utils.isFunction(dynamicRules)) {
         return dynamicRules(vue.unref(getValues));
       }
@@ -11423,7 +11567,7 @@ const _sfc_main$O = /* @__PURE__ */ vue.defineComponent({
         rulesMessageJoinLabel: globalRulesMessageJoinLabel
       } = props2.formProps;
       const joinLabel = Reflect.has(props2.schema, "rulesMessageJoinLabel") ? rulesMessageJoinLabel : globalRulesMessageJoinLabel;
-      const defaultMsg = createPlaceholderMessage$1(component) + `${joinLabel ? label : ""}`;
+      const defaultMsg = createPlaceholderMessage$1(component) + `${joinLabel ? label ? label : "" : ""}`;
       function validator(rule, value) {
         const msg = rule.message || defaultMsg;
         if (value === void 0 || utils.isNull(value)) {
@@ -12657,28 +12801,30 @@ const _sfc_main$M = vue.defineComponent({
       () => formModel,
       useDebounceFn$1((val) => {
         var _a2;
+        if (isEqual(vue.toRaw(val), vue.toRaw(tempFormModel)))
+          return;
         for (const key2 in val) {
-          if (val[key2] !== tempFormModel[key2]) {
-            (_a2 = vue.unref(getProps).schemas) == null ? void 0 : _a2.forEach((item) => {
-              var _a3;
-              const isComponentProps = item.field === key2 && item.componentProps;
-              if (isComponentProps && !utils.isFunction(item.componentProps) && ((_a3 = item.componentProps) == null ? void 0 : _a3.onModelChange)) {
-                item.componentProps.onModelChange(val[key2]);
-              } else if (isComponentProps && utils.isFunction(item.componentProps)) {
-                const modelProps = item.componentProps({
-                  schema: item,
-                  formModel,
-                  formActionType,
-                  tableAction: props2.tableAction
-                });
-                if (modelProps.onModelChange) {
-                  modelProps.onModelChange(val[key2]);
-                }
+          if (isEqual(vue.toRaw(val[key2]), vue.toRaw(tempFormModel[key2])))
+            continue;
+          (_a2 = vue.unref(getProps).schemas) == null ? void 0 : _a2.forEach((item) => {
+            var _a3;
+            const isComponentProps = item.field === key2 && item.componentProps;
+            if (isComponentProps && !utils.isFunction(item.componentProps) && ((_a3 = item.componentProps) == null ? void 0 : _a3.onModelChange)) {
+              item.componentProps.onModelChange(val[key2]);
+            } else if (isComponentProps && utils.isFunction(item.componentProps)) {
+              const modelProps = item.componentProps({
+                schema: item,
+                formModel,
+                formActionType,
+                tableAction: props2.tableAction
+              });
+              if (modelProps.onModelChange) {
+                modelProps.onModelChange(val[key2]);
               }
-            });
-          }
+            }
+          });
         }
-        Object.assign(tempFormModel, formModel);
+        Object.assign(tempFormModel, cloneDeep(formModel));
         vue.unref(getProps).submitOnChange && handleSubmit();
       }, 300),
       { deep: true }
@@ -12721,6 +12867,7 @@ const _sfc_main$M = vue.defineComponent({
       submit: handleSubmit,
       scrollToField
     };
+    vue.provide("formActionType", formActionType);
     const clearCurrValidate = (field) => {
       clearValidate([field]);
     };
@@ -15181,7 +15328,8 @@ function handleColumnResize(propsRef, columns, wrapRef) {
     [0, 0]
   );
   const length2 = columns.length;
-  const colWidth = tableWidth ? (tableWidth - sumWidth - selectWidth) / (length2 - sumLength) : 100;
+  const countWidth = tableWidth ? (tableWidth - sumWidth - selectWidth) / (length2 - sumLength) : 150;
+  const colWidth = countWidth < 150 ? 150 : countWidth;
   columns.forEach((item) => {
     if (item.flag)
       return;
@@ -15234,7 +15382,7 @@ function handleIndexColumn(propsRef, getPaginationRef, columns) {
         return `${index2 + 1}`;
       }
       const { current = 1, pageSize = PAGE_SIZE } = getPagination;
-      return ((current < 1 ? 1 : current) - 1) * pageSize + index2 + 1;
+      return vue.h("div", { class: "ant-table-cell-index full cursor-pointer" }, ((current < 1 ? 1 : current) - 1) * pageSize + index2 + 1);
     },
     ...isFixedLeft ? {
       fixed: "left"
@@ -15298,7 +15446,22 @@ function useColumns$1(propsRef, getPaginationRef, tableAction, wrapRef) {
     return columns.filter((column2) => {
       return hasPermission(column2.auth) && isIfShow(column2);
     }).map((column2) => {
-      const { slots, customRender, format: format2, edit, editRow, flag } = column2;
+      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,
+        column2.dataIndex
+      ));
+      const summaryFormat = (text) => {
+        return text ? utils.isNumber(+text) && !isNaN(+text) ? Number.parseFloat((+text).toFixed(2)).toLocaleString("en-US") : text : "";
+      };
+      const {
+        slots,
+        customRender,
+        format: format2 = isSummaryCol ? summaryFormat : void 0,
+        edit,
+        editRow,
+        flag
+      } = column2;
       if (!slots || !(slots == null ? void 0 : slots.title)) {
         column2.customTitle = column2.title;
         Reflect.deleteProperty(column2, "title");
@@ -15484,7 +15647,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");
     });
@@ -15500,7 +15663,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();
@@ -15518,6 +15683,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) {
@@ -16027,6 +16196,20 @@ 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",
+      handle: ".ant-table-cell .ant-table-cell-index",
+      draggable: ".ant-table-row"
+    });
   });
   const getScrollX = vue.computed(() => {
     var _a2;
@@ -17751,6 +17934,7 @@ const basicProps$3 = vue.reactive({
     }
   },
   inset: Boolean,
+  isSortFetch: { type: Boolean, default: true },
   sortFn: {
     type: Function,
     default: DEFAULT_SORT_FN
@@ -19650,9 +19834,7 @@ const _sfc_main$i = vue.defineComponent({
       () => visibleRef.value,
       (visible) => {
         vue.nextTick(() => {
-          var _a2;
           emit("visible-change", visible);
-          instance && ((_a2 = drawerInstance.emitVisible) == null ? void 0 : _a2.call(drawerInstance, visible, instance.uid));
         });
       }
     );
@@ -25924,7 +26106,7 @@ const styles = `.vue-colorful {
   border-color: transparent;
   border-bottom: 12px solid #000;
   border-radius: 8px 8px 0 0;
-  background-image: linear-gradient(to top, #000, rgba(0, 0, 0, 0)),
+  background-image: linear-gradient(to top, #000, rgba(0, 0, 0, 0)),\r
       linear-gradient(to right, #fff, rgba(255, 255, 255, 0));
 }
 .vue-colorful__pointer-fill, .vue-colorful__alpha-gradient {
@@ -25945,15 +26127,15 @@ const styles = `.vue-colorful {
   height: 24px;
 }
 .vue-colorful__hue {
-  background: linear-gradient(
-      to right,
-      #f00 0%,
-      #ff0 17%,
-      #0f0 33%,
-      #0ff 50%,
-      #00f 67%,
-      #f0f 83%,
-      #f00 100%
+  background: linear-gradient(\r
+      to right,\r
+      #f00 0%,\r
+      #ff0 17%,\r
+      #0f0 33%,\r
+      #0ff 50%,\r
+      #00f 67%,\r
+      #f0f 83%,\r
+      #f00 100%\r
     );
 }
 .vue-colorful__last-control {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "3h1-ui",
-  "version": "3.0.0-next.5",
+  "version": "3.0.0-next.7",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -30,8 +30,8 @@
     "vxe-table": "^4.3.6",
     "xe-utils": "^3.5.7",
     "@shy-plugins/tinymce": "^1.0.6",
-    "@shy-plugins/use": "1.0.0-next.1",
-    "@shy-plugins/utils": "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": {