bm-admin-ui 1.0.53-alpha → 1.0.54-alpha

package/es/components/form-create/index.js

@@ -7,6 +7,7 @@ import BmStaffsSelector from 'bm-admin-ui/es/components/staffs-selector';
 import { BmTagsDisplay, BmFloatTable } from 'bm-admin-ui/es/components';
 import { SearchOutlined, CheckCircleFilled, PlusOutlined } from '@ant-design/icons-vue';
 import { cloneDeep, floor, debounce } from 'lodash-es';
+import customParseFormat from 'dayjs/plugin/customParseFormat';
 
 const fieldRatioMap = {
     '25%': 6,
@@ -802,7 +803,8 @@ const _sfc_main$a = /* @__PURE__ */ defineComponent({
         val.map((item) => ({
           [fieldNames.value]: item.key,
           [fieldNames.label]: item.title,
-          ...item
+          key: item.key,
+          title: item.title
         }))
       );
     }
@@ -938,6 +940,7 @@ var people = {
             minWidth: data.config.fieldRatio,
             slots: {
                 default({ row }) {
+                    var _a;
                     return h(StaffSelector, {
                         title: '添加员工',
                         mode: data.props.limit ? 'radio' : 'multiple',
@@ -952,6 +955,7 @@ var people = {
                                 return yield extraConfig.people.fetch(params);
                             });
                         },
+                        fieldNames: (_a = extraConfig.people) === null || _a === void 0 ? void 0 : _a.fieldNames,
                     });
                 },
             },
@@ -1279,6 +1283,7 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
   emits: ["change"],
   setup(__props, { emit: emits }) {
     const props = __props;
+    dayjs.extend(customParseFormat);
     const productInfoKeyMap = {
       \u5546\u54C1\u540D\u79F0: "productName",
       \u5546\u54C1\u7B80\u79F0: "productShortName",
@@ -1486,13 +1491,15 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
     function emitChange() {
       emits("change", data);
     }
-    function queryProductInfo(rule, row) {
+    async function queryProductInfo(rule, row) {
       const field = rule.field;
       const associatedFields = rule?.config?.associatedFields;
-      associatedFields.length && props.extraConfig.product.fetch({ productCode: row[field] }).then((data2) => {
-        associatedFields.forEach((item) => {
-          row[field + item.value] = data2[productInfoKeyMap[item.value]];
-        });
+      return await props.extraConfig.product.fetch({ productCode: row[field] }).then((data2) => {
+        if (data2 && associatedFields.length)
+          associatedFields.forEach((item) => {
+            row[field + item.value] = data2[productInfoKeyMap[item.value]];
+          });
+        return data2;
       });
     }
     function handleChange(e) {
@@ -1509,7 +1516,14 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
           });
           result.push(rowData);
         });
-        validate(result);
+        result.length && validate(result).then((result2) => {
+          data.splice(0, data.length, ...result2);
+        }).catch((error) => {
+          message.error("\u5B58\u5728\u9519\u8BEF\u6570\u636E\uFF0C\u5BFC\u5165\u5931\u8D25");
+          console.log("---------------");
+          console.log(error);
+          console.log("---------------");
+        });
         e.target.value = "";
       };
       file && reader.readAsText(file, "GB2312");
@@ -1520,62 +1534,125 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
     function parseCsv(result) {
       let data2 = [];
       if (result) {
-        data2 = result.split("\r\n").slice(1).filter((item) => item).map((item) => item.replaceAll("	", "").split(","));
+        const rows = result.split("\r\n");
+        const columnsTxt = rows[0];
+        const columnArr = columnsTxt.includes("	") ? columnsTxt.split("	") : columnsTxt.split(",");
+        if (columnArr.length !== columns.filter((c) => isValidColumn(c)).length) {
+          message.error("\u5BFC\u5165\u7684\u6A21\u677F\u51FA\u9519");
+        } else {
+          data2 = rows.slice(1).filter((item) => item).map(
+            (item) => item.includes("	") ? item.split("	") : item.split(",")
+          );
+        }
       }
       return data2;
     }
-    function validate(rowData) {
+    async function validate(rowData) {
+      let error = "";
       const validColumns = columns.filter((c) => isValidColumn(c));
       for (const row of rowData) {
         for (const { field } of validColumns) {
           const rule = childRulesMap.value[field];
-          let value = row[field];
+          const title = rule?.title?.title;
+          if (!rule)
+            break;
+          let value = row[field] || "";
           const txtFormatFn = rule.config?.txtFormatFn;
           if (rule.effect.required && !value) {
+            error = `${title}\u4E0D\u80FD\u4E3A\u7A7A`;
             break;
           }
           if (txtFormatFn && !txtFormatFn(value)) {
+            error = `${title}\u586B\u5199\u89C4\u5219\u4E0D\u6B63\u786E`;
             break;
           }
           if (rule.name === "input") {
             const maxlength = rule.props.maxlength || 200;
             if (value.length > maxlength) {
+              error = `${title}\u5B57\u6570\u8D85\u51FA`;
               break;
             }
           }
           if (rule.name === "textarea") {
             if (value.length > 5e3) {
+              error = `${title}\u5B57\u6570\u8D85\u51FA`;
               break;
             }
           }
           if (rule.name === "numInput") {
             if (rule.config.format === 1) {
               if (!value.includes("%")) {
+                error = `${title}\u4E0D\u4E3A\u767E\u5206\u6570`;
                 break;
+              } else {
+                value = value.replaceAll("%", "");
               }
             } else {
-              if (!isNaN(value)) {
+              if (isNaN(value)) {
+                error = `${title}\u4E0D\u4E3A\u6570\u5B57\u7C7B\u578B`;
                 break;
               }
             }
             if (rule.config.decimalPlaces !== void 0 && value.split(".")[1]?.length > rule.config.decimalPlaces) {
+              error = `${title}\u4FDD\u7559\u7684\u5C0F\u6570\u70B9\u4E3A\u4E0D\u6B63\u786E`;
               break;
             }
           }
           if (rule.name === "radio") {
             if (rule.options.every((item) => item.value !== value)) {
+              error = `${title}\u4E0D\u5B58\u5728\u8BE5\u9009\u9879`;
               break;
             }
           }
           if (rule.name === "checkbox") {
             value = value.split("\u3001");
             if (value.some((item) => rule.options.every((r) => r.value !== item))) {
+              error = `${title}\u5B58\u5728\u4E0D\u5B58\u5728\u7684\u9009\u9879\u503C`;
+              break;
+            }
+          }
+          if (rule.name === "date") {
+            if (!dayjs(value, rule.props.format, true).isValid()) {
+              error = `${title}\u4E0D\u4E3A\u6709\u6548\u65F6\u671F\u6216\u4E0D\u7B26\u5408\u65E5\u671F\u683C\u5F0F`;
+              break;
+            }
+          }
+          if (rule.name === "dateRange") {
+            value = value.split("~");
+            if (value.some((item) => !dayjs(item, rule.props.format, true).isValid())) {
+              error = `${title}\u4E0D\u4E3A\u6709\u6548\u65F6\u671F\u6216\u4E0D\u7B26\u5408\u65E5\u671F\u683C\u5F0F`;
+              break;
+            }
+          }
+          if (rule.name === "people" || rule.name === "department") {
+            const limit = rule.props.limit;
+            value = value.split("\u3001").map((item) => ({}));
+            if (limit === 1 && value.length > limit) {
+              error = `${title}\u6700\u591A\u53EA\u80FD\u9009\u4E00\u4E2A`;
+              break;
+            }
+          }
+          if (rule.name === "product") {
+            const productInfo = await queryProductInfo(rule, row);
+            if (!productInfo) {
+              error = `${title}\u67E5\u8BE2\u7684\u5546\u54C1\u4E0D\u5B58\u5728`;
               break;
             }
-            row[field] = value;
           }
-          if (rule.name === "date") ;
+          if (rule.name === "shop") {
+            value = {
+              value: Number(value)
+            };
+          }
+          row[field] = value;
         }
+        if (error)
+          break;
+      }
+      if (error) {
+        return Promise.reject(error);
+      } else {
+        return Promise.resolve(rowData);
       }
     }
     watch(
@@ -2854,7 +2931,7 @@ var department = {
                         return yield extraConfig.department.fetch();
                     });
                 },
-                fieldNames: (_a = extraConfig.people) === null || _a === void 0 ? void 0 : _a.fieldNames,
+                fieldNames: (_a = extraConfig.department) === null || _a === void 0 ? void 0 : _a.fieldNames,
             },
             effect: {
                 required: data.effect.required && '请选择',
@@ -2897,7 +2974,7 @@ var department = {
                         return yield extraConfig.department.fetch();
                     });
                 },
-                fieldNames: (_a = extraConfig.people) === null || _a === void 0 ? void 0 : _a.fieldNames,
+                fieldNames: (_a = extraConfig.department) === null || _a === void 0 ? void 0 : _a.fieldNames,
             },
             effect: {
                 required: data.effect.required && '请选择',
@@ -2928,6 +3005,7 @@ var department = {
             minWidth: data.config.fieldRatio,
             slots: {
                 default({ row }) {
+                    var _a;
                     return h(StaffSelector, {
                         title: '添加部门',
                         mode: data.props.limit ? 'radio' : 'multiple',
@@ -2944,6 +3022,7 @@ var department = {
                                 return yield extraConfig.department.fetch(params);
                             });
                         },
+                        fieldNames: (_a = extraConfig.department) === null || _a === void 0 ? void 0 : _a.fieldNames,
                     });
                 },
             },

package/lib/components/form-create/index.js

@@ -11,12 +11,14 @@ var BmStaffsSelector = require('bm-admin-ui/lib/components/staffs-selector');
 var components = require('bm-admin-ui/lib/components');
 var iconsVue = require('@ant-design/icons-vue');
 var lodashEs = require('lodash-es');
+var customParseFormat = require('dayjs/plugin/customParseFormat');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var dayjs__default = /*#__PURE__*/_interopDefaultLegacy(dayjs);
 var Picture__default = /*#__PURE__*/_interopDefaultLegacy(Picture);
 var BmStaffsSelector__default = /*#__PURE__*/_interopDefaultLegacy(BmStaffsSelector);
+var customParseFormat__default = /*#__PURE__*/_interopDefaultLegacy(customParseFormat);
 
 const fieldRatioMap = {
     '25%': 6,
@@ -812,7 +814,8 @@ const _sfc_main$a = /* @__PURE__ */ vue.defineComponent({
         val.map((item) => ({
           [fieldNames.value]: item.key,
           [fieldNames.label]: item.title,
-          ...item
+          key: item.key,
+          title: item.title
         }))
       );
     }
@@ -948,6 +951,7 @@ var people = {
             minWidth: data.config.fieldRatio,
             slots: {
                 default({ row }) {
+                    var _a;
                     return vue.h(StaffSelector, {
                         title: '添加员工',
                         mode: data.props.limit ? 'radio' : 'multiple',
@@ -962,6 +966,7 @@ var people = {
                                 return yield extraConfig.people.fetch(params);
                             });
                         },
+                        fieldNames: (_a = extraConfig.people) === null || _a === void 0 ? void 0 : _a.fieldNames,
                     });
                 },
             },
@@ -1289,6 +1294,7 @@ const _sfc_main$7 = /* @__PURE__ */ vue.defineComponent({
   emits: ["change"],
   setup(__props, { emit: emits }) {
     const props = __props;
+    dayjs__default["default"].extend(customParseFormat__default["default"]);
     const productInfoKeyMap = {
       \u5546\u54C1\u540D\u79F0: "productName",
       \u5546\u54C1\u7B80\u79F0: "productShortName",
@@ -1496,13 +1502,15 @@ const _sfc_main$7 = /* @__PURE__ */ vue.defineComponent({
     function emitChange() {
       emits("change", data);
     }
-    function queryProductInfo(rule, row) {
+    async function queryProductInfo(rule, row) {
       const field = rule.field;
       const associatedFields = rule?.config?.associatedFields;
-      associatedFields.length && props.extraConfig.product.fetch({ productCode: row[field] }).then((data2) => {
-        associatedFields.forEach((item) => {
-          row[field + item.value] = data2[productInfoKeyMap[item.value]];
-        });
+      return await props.extraConfig.product.fetch({ productCode: row[field] }).then((data2) => {
+        if (data2 && associatedFields.length)
+          associatedFields.forEach((item) => {
+            row[field + item.value] = data2[productInfoKeyMap[item.value]];
+          });
+        return data2;
       });
     }
     function handleChange(e) {
@@ -1519,7 +1527,14 @@ const _sfc_main$7 = /* @__PURE__ */ vue.defineComponent({
           });
           result.push(rowData);
         });
-        validate(result);
+        result.length && validate(result).then((result2) => {
+          data.splice(0, data.length, ...result2);
+        }).catch((error) => {
+          antDesignVue.message.error("\u5B58\u5728\u9519\u8BEF\u6570\u636E\uFF0C\u5BFC\u5165\u5931\u8D25");
+          console.log("---------------");
+          console.log(error);
+          console.log("---------------");
+        });
         e.target.value = "";
       };
       file && reader.readAsText(file, "GB2312");
@@ -1530,62 +1545,125 @@ const _sfc_main$7 = /* @__PURE__ */ vue.defineComponent({
     function parseCsv(result) {
       let data2 = [];
       if (result) {
-        data2 = result.split("\r\n").slice(1).filter((item) => item).map((item) => item.replaceAll("	", "").split(","));
+        const rows = result.split("\r\n");
+        const columnsTxt = rows[0];
+        const columnArr = columnsTxt.includes("	") ? columnsTxt.split("	") : columnsTxt.split(",");
+        if (columnArr.length !== columns.filter((c) => isValidColumn(c)).length) {
+          antDesignVue.message.error("\u5BFC\u5165\u7684\u6A21\u677F\u51FA\u9519");
+        } else {
+          data2 = rows.slice(1).filter((item) => item).map(
+            (item) => item.includes("	") ? item.split("	") : item.split(",")
+          );
+        }
       }
       return data2;
     }
-    function validate(rowData) {
+    async function validate(rowData) {
+      let error = "";
       const validColumns = columns.filter((c) => isValidColumn(c));
       for (const row of rowData) {
         for (const { field } of validColumns) {
           const rule = childRulesMap.value[field];
-          let value = row[field];
+          const title = rule?.title?.title;
+          if (!rule)
+            break;
+          let value = row[field] || "";
           const txtFormatFn = rule.config?.txtFormatFn;
           if (rule.effect.required && !value) {
+            error = `${title}\u4E0D\u80FD\u4E3A\u7A7A`;
             break;
           }
           if (txtFormatFn && !txtFormatFn(value)) {
+            error = `${title}\u586B\u5199\u89C4\u5219\u4E0D\u6B63\u786E`;
             break;
           }
           if (rule.name === "input") {
             const maxlength = rule.props.maxlength || 200;
             if (value.length > maxlength) {
+              error = `${title}\u5B57\u6570\u8D85\u51FA`;
               break;
             }
           }
           if (rule.name === "textarea") {
             if (value.length > 5e3) {
+              error = `${title}\u5B57\u6570\u8D85\u51FA`;
               break;
             }
           }
           if (rule.name === "numInput") {
             if (rule.config.format === 1) {
               if (!value.includes("%")) {
+                error = `${title}\u4E0D\u4E3A\u767E\u5206\u6570`;
                 break;
+              } else {
+                value = value.replaceAll("%", "");
               }
             } else {
-              if (!isNaN(value)) {
+              if (isNaN(value)) {
+                error = `${title}\u4E0D\u4E3A\u6570\u5B57\u7C7B\u578B`;
                 break;
               }
             }
             if (rule.config.decimalPlaces !== void 0 && value.split(".")[1]?.length > rule.config.decimalPlaces) {
+              error = `${title}\u4FDD\u7559\u7684\u5C0F\u6570\u70B9\u4E3A\u4E0D\u6B63\u786E`;
               break;
             }
           }
           if (rule.name === "radio") {
             if (rule.options.every((item) => item.value !== value)) {
+              error = `${title}\u4E0D\u5B58\u5728\u8BE5\u9009\u9879`;
               break;
             }
           }
           if (rule.name === "checkbox") {
             value = value.split("\u3001");
             if (value.some((item) => rule.options.every((r) => r.value !== item))) {
+              error = `${title}\u5B58\u5728\u4E0D\u5B58\u5728\u7684\u9009\u9879\u503C`;
+              break;
+            }
+          }
+          if (rule.name === "date") {
+            if (!dayjs__default["default"](value, rule.props.format, true).isValid()) {
+              error = `${title}\u4E0D\u4E3A\u6709\u6548\u65F6\u671F\u6216\u4E0D\u7B26\u5408\u65E5\u671F\u683C\u5F0F`;
+              break;
+            }
+          }
+          if (rule.name === "dateRange") {
+            value = value.split("~");
+            if (value.some((item) => !dayjs__default["default"](item, rule.props.format, true).isValid())) {
+              error = `${title}\u4E0D\u4E3A\u6709\u6548\u65F6\u671F\u6216\u4E0D\u7B26\u5408\u65E5\u671F\u683C\u5F0F`;
+              break;
+            }
+          }
+          if (rule.name === "people" || rule.name === "department") {
+            const limit = rule.props.limit;
+            value = value.split("\u3001").map((item) => ({}));
+            if (limit === 1 && value.length > limit) {
+              error = `${title}\u6700\u591A\u53EA\u80FD\u9009\u4E00\u4E2A`;
+              break;
+            }
+          }
+          if (rule.name === "product") {
+            const productInfo = await queryProductInfo(rule, row);
+            if (!productInfo) {
+              error = `${title}\u67E5\u8BE2\u7684\u5546\u54C1\u4E0D\u5B58\u5728`;
               break;
             }
-            row[field] = value;
           }
-          if (rule.name === "date") ;
+          if (rule.name === "shop") {
+            value = {
+              value: Number(value)
+            };
+          }
+          row[field] = value;
         }
+        if (error)
+          break;
+      }
+      if (error) {
+        return Promise.reject(error);
+      } else {
+        return Promise.resolve(rowData);
       }
     }
     vue.watch(
@@ -2864,7 +2942,7 @@ var department = {
                         return yield extraConfig.department.fetch();
                     });
                 },
-                fieldNames: (_a = extraConfig.people) === null || _a === void 0 ? void 0 : _a.fieldNames,
+                fieldNames: (_a = extraConfig.department) === null || _a === void 0 ? void 0 : _a.fieldNames,
             },
             effect: {
                 required: data.effect.required && '请选择',
@@ -2907,7 +2985,7 @@ var department = {
                         return yield extraConfig.department.fetch();
                     });
                 },
-                fieldNames: (_a = extraConfig.people) === null || _a === void 0 ? void 0 : _a.fieldNames,
+                fieldNames: (_a = extraConfig.department) === null || _a === void 0 ? void 0 : _a.fieldNames,
             },
             effect: {
                 required: data.effect.required && '请选择',
@@ -2938,6 +3016,7 @@ var department = {
             minWidth: data.config.fieldRatio,
             slots: {
                 default({ row }) {
+                    var _a;
                     return vue.h(StaffSelector, {
                         title: '添加部门',
                         mode: data.props.limit ? 'radio' : 'multiple',
@@ -2954,6 +3033,7 @@ var department = {
                                 return yield extraConfig.department.fetch(params);
                             });
                         },
+                        fieldNames: (_a = extraConfig.department) === null || _a === void 0 ? void 0 : _a.fieldNames,
                     });
                 },
             },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bm-admin-ui",
-  "version": "1.0.53-alpha",
+  "version": "1.0.54-alpha",
   "private": false,
   "description": "An Admin Component Library for Bm",
   "license": "UNLICENSED",