3h1-ui 3.0.0-next.81 → 3.0.0-next.83

package/es/index.js

@@ -16270,7 +16270,7 @@ const _sfc_main$X = /* @__PURE__ */ defineComponent({
 });
 const formTable = "";
 const SHOW_ROW_COUNT = 10;
-const ROW_HEIGHT = 48.67;
+const ROW_HEIGHT = 48.5;
 const BODY_HEIGHT = ROW_HEIGHT * SHOW_ROW_COUNT;
 const ShyFormTable = /* @__PURE__ */ defineComponent({
   props: {
@@ -16534,11 +16534,13 @@ const ShyFormTable = /* @__PURE__ */ defineComponent({
       }, null)])]);
     });
     const create = () => {
-      state.value = [{
+      state.value = [...toRaw(state.value), {
         [props2.rowKey]: buildUUID()
-      }, ...toRaw(state.value)];
+      }];
       curIndex.value = 0;
-      document.querySelector(`.${prefixCls2}-scroll-bar-wrapper`).scrollTop = curIndex.value * ROW_HEIGHT;
+      nextTick(() => {
+        document.querySelector(`.${prefixCls2}-scroll-bar-wrapper`).scrollTop = (state.value.length + 1) * ROW_HEIGHT;
+      });
       emit("add", state.value);
     };
     const remove = (index2) => {
@@ -16559,7 +16561,7 @@ const ShyFormTable = /* @__PURE__ */ defineComponent({
     }) => {
       var _a2, _b;
       const errKey = `${column2.dataIndex}-${record[props2.rowKey]}Info`;
-      if (!column2.required)
+      if (!column2.required && !column2.rules)
         return [];
       if ((_a2 = rulesRef[errKey]) == null ? void 0 : _a2.rules)
         return (_b = rulesRef[errKey]) == null ? void 0 : _b.rules;
@@ -16589,8 +16591,27 @@ const ShyFormTable = /* @__PURE__ */ defineComponent({
         return column2.rules;
       rulesRef[errKey].rules = cloneDeep(column2.rules);
       rulesRef[errKey].rules.forEach((item) => {
-        if (!item.validator || !isFunction$4(item.validator))
+        if (!item.validator || !isFunction$4(item.validator)) {
+          item.validator = async (rule, value) => {
+            rulesRef[errKey].show = false;
+            if (!rule.pattern && !rule.required)
+              return Promise.resolve();
+            if ((column2.required || rule.required) && isNil(value)) {
+              const prefix = column2.type.toLocaleLowerCase().includes("input") ? "请输入" : "请选择";
+              const errMsg = `${prefix}${column2.title}`;
+              rulesRef[errKey].show = true;
+              rulesRef[errKey].msg = errMsg;
+              return Promise.reject(errMsg);
+            }
+            if (rule.pattern && !rule.pattern.test(value)) {
+              rulesRef[errKey].show = true;
+              rulesRef[errKey].msg = rule.message;
+              return Promise.reject(rule.message);
+            }
+            return Promise.resolve();
+          };
           return;
+        }
         const validator = item.validator;
         item.validator = async (rule, value) => {
           try {
@@ -16672,6 +16693,7 @@ const ShyFormTable = /* @__PURE__ */ defineComponent({
         document.querySelector(`.${prefixCls2}-scroll-bar-wrapper`).scrollTop = curIndex.value * ROW_HEIGHT;
       }, true);
       tableWrapperRef.value.addEventListener("scroll", handleScroll, true);
+      dataSource.value = state.value.length > SHOW_ROW_COUNT ? state.value.slice(curIndex.value, curIndex.value + SHOW_ROW_COUNT) : state.value.slice(0, SHOW_ROW_COUNT);
     });
     onUnmounted(() => {
       window.removeEventListener("scroll", () => {
@@ -21833,7 +21855,6 @@ const FormItem = /* @__PURE__ */ defineComponent({
       type: Boolean
     }
   },
-  emits: ["clearCurrValidate"],
   setup(props2, {
     slots,
     emit,
@@ -21998,9 +22019,6 @@ const FormItem = /* @__PURE__ */ defineComponent({
         dynamicRules,
         required
       } = props2.schema;
-      if (props2.schema.component !== "Table") {
-        emit("clearCurrValidate", unref(getValues).field);
-      }
       if (isFunction$4(dynamicRules)) {
         return dynamicRules(unref(getValues));
       }
@@ -23170,9 +23188,6 @@ const ShyForm = /* @__PURE__ */ defineComponent({
       scrollToField
     };
     provide("formActionType", formActionType);
-    const clearCurrValidate = (field) => {
-      clearValidate([field]);
-    };
     const isTableForm = computed(() => {
       return !!getBindValue.value.tableAction;
     });
@@ -23248,7 +23263,6 @@ const ShyForm = /* @__PURE__ */ defineComponent({
           "allDefaultValues": defaultValueRef.value,
           "formModel": formModel,
           "setFormModel": setFormModel,
-          "onClearCurrValidate": clearCurrValidate,
           "class": {
             [`${prefixCls2}-table-form-item`]: isTableForm.value
           },

package/lib/index.js

@@ -16294,7 +16294,7 @@ const _sfc_main$X = /* @__PURE__ */ vue.defineComponent({
 });
 const formTable = "";
 const SHOW_ROW_COUNT = 10;
-const ROW_HEIGHT = 48.67;
+const ROW_HEIGHT = 48.5;
 const BODY_HEIGHT = ROW_HEIGHT * SHOW_ROW_COUNT;
 const ShyFormTable = /* @__PURE__ */ vue.defineComponent({
   props: {
@@ -16558,11 +16558,13 @@ const ShyFormTable = /* @__PURE__ */ vue.defineComponent({
       }, null)])]);
     });
     const create = () => {
-      state.value = [{
+      state.value = [...vue.toRaw(state.value), {
         [props2.rowKey]: utils.buildUUID()
-      }, ...vue.toRaw(state.value)];
+      }];
       curIndex.value = 0;
-      document.querySelector(`.${prefixCls2}-scroll-bar-wrapper`).scrollTop = curIndex.value * ROW_HEIGHT;
+      vue.nextTick(() => {
+        document.querySelector(`.${prefixCls2}-scroll-bar-wrapper`).scrollTop = (state.value.length + 1) * ROW_HEIGHT;
+      });
       emit("add", state.value);
     };
     const remove = (index2) => {
@@ -16583,7 +16585,7 @@ const ShyFormTable = /* @__PURE__ */ vue.defineComponent({
     }) => {
       var _a2, _b;
       const errKey = `${column2.dataIndex}-${record[props2.rowKey]}Info`;
-      if (!column2.required)
+      if (!column2.required && !column2.rules)
         return [];
       if ((_a2 = rulesRef[errKey]) == null ? void 0 : _a2.rules)
         return (_b = rulesRef[errKey]) == null ? void 0 : _b.rules;
@@ -16613,8 +16615,27 @@ const ShyFormTable = /* @__PURE__ */ vue.defineComponent({
         return column2.rules;
       rulesRef[errKey].rules = cloneDeep(column2.rules);
       rulesRef[errKey].rules.forEach((item) => {
-        if (!item.validator || !utils.isFunction(item.validator))
+        if (!item.validator || !utils.isFunction(item.validator)) {
+          item.validator = async (rule, value) => {
+            rulesRef[errKey].show = false;
+            if (!rule.pattern && !rule.required)
+              return Promise.resolve();
+            if ((column2.required || rule.required) && isNil(value)) {
+              const prefix = column2.type.toLocaleLowerCase().includes("input") ? "请输入" : "请选择";
+              const errMsg = `${prefix}${column2.title}`;
+              rulesRef[errKey].show = true;
+              rulesRef[errKey].msg = errMsg;
+              return Promise.reject(errMsg);
+            }
+            if (rule.pattern && !rule.pattern.test(value)) {
+              rulesRef[errKey].show = true;
+              rulesRef[errKey].msg = rule.message;
+              return Promise.reject(rule.message);
+            }
+            return Promise.resolve();
+          };
           return;
+        }
         const validator = item.validator;
         item.validator = async (rule, value) => {
           try {
@@ -16696,6 +16717,7 @@ const ShyFormTable = /* @__PURE__ */ vue.defineComponent({
         document.querySelector(`.${prefixCls2}-scroll-bar-wrapper`).scrollTop = curIndex.value * ROW_HEIGHT;
       }, true);
       tableWrapperRef.value.addEventListener("scroll", handleScroll, true);
+      dataSource.value = state.value.length > SHOW_ROW_COUNT ? state.value.slice(curIndex.value, curIndex.value + SHOW_ROW_COUNT) : state.value.slice(0, SHOW_ROW_COUNT);
     });
     vue.onUnmounted(() => {
       window.removeEventListener("scroll", () => {
@@ -21857,7 +21879,6 @@ const FormItem = /* @__PURE__ */ vue.defineComponent({
       type: Boolean
     }
   },
-  emits: ["clearCurrValidate"],
   setup(props2, {
     slots,
     emit,
@@ -22022,9 +22043,6 @@ const FormItem = /* @__PURE__ */ vue.defineComponent({
         dynamicRules,
         required
       } = props2.schema;
-      if (props2.schema.component !== "Table") {
-        emit("clearCurrValidate", vue.unref(getValues).field);
-      }
       if (utils.isFunction(dynamicRules)) {
         return dynamicRules(vue.unref(getValues));
       }
@@ -23194,9 +23212,6 @@ const ShyForm = /* @__PURE__ */ vue.defineComponent({
       scrollToField
     };
     vue.provide("formActionType", formActionType);
-    const clearCurrValidate = (field) => {
-      clearValidate([field]);
-    };
     const isTableForm = vue.computed(() => {
       return !!getBindValue.value.tableAction;
     });
@@ -23272,7 +23287,6 @@ const ShyForm = /* @__PURE__ */ vue.defineComponent({
           "allDefaultValues": defaultValueRef.value,
           "formModel": formModel,
           "setFormModel": setFormModel,
-          "onClearCurrValidate": clearCurrValidate,
           "class": {
             [`${prefixCls2}-table-form-item`]: isTableForm.value
           },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "3h1-ui",
-  "version": "3.0.0-next.81",
+  "version": "3.0.0-next.83",
   "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/use": "1.0.1-next.3",
     "@shy-plugins/tinymce": "^1.0.6",
-    "@shy-plugins/utils": "1.0.0-next.1"
+    "@shy-plugins/utils": "1.0.0-next.1",
+    "@shy-plugins/use": "1.0.1-next.3"
   },
   "types": "es/ui/index.d.ts",
   "devDependencies": {