bm-admin-ui 1.0.61-alpha → 1.0.63-alpha

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

@@ -593,11 +593,15 @@ var picture = {
                     listType: 'picture-card',
                     text: '请选择',
                     multiple: maxCount > 1,
+                    accept: '.jpg,.png',
                 },
                 extraProps: {
                     maxSize: 10,
                     maxCount,
                 },
+                customErrors: {
+                    format: '请上传jpg、png格式的图片',
+                },
                 defaultList: data.value,
                 uploadRequest(inject, file) {
                     return __awaiter(this, void 0, void 0, function* () {
@@ -623,7 +627,7 @@ var picture = {
                     });
                 },
                 error(inject, error) {
-                    message.error(error.message);
+                    message.error(error === null || error === void 0 ? void 0 : error.message);
                 },
             },
         };
@@ -1506,14 +1510,25 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
       const field = rule.field;
       const associatedFields = rule?.config?.associatedFields;
       let result = void 0;
-      if (row[field]) {
-        result = await props.extraConfig.product.fetch({ productCode: row[field] });
+      try {
+        if (row[field]) {
+          result = await props.extraConfig.product.fetch({
+            productCode: row[field]
+          });
+        }
+        processAssociatedFields(field, associatedFields, row, result);
+        return result;
+      } catch (e) {
+        row[field] = "";
+        processAssociatedFields(field, associatedFields, row, result);
+        return Promise.resolve(result);
       }
+    }
+    function processAssociatedFields(field, associatedFields, row, result) {
       if (associatedFields.length)
         associatedFields.forEach((item) => {
           row[productPicName(item.value, field)] = result ? result[productInfoKeyMap[item.value]] : void 0;
         });
-      return result;
     }
     function handleChange(e) {
       const file = e.target.files[0];
@@ -1696,11 +1711,7 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
       return !formData.value[shopField];
     }
     function handlePressEnter(rule, row) {
-      queryProductInfo(rule, row).then((data2) => {
-        if (!data2) {
-          row[rule.field] = "";
-        }
-      });
+      queryProductInfo(rule, row);
     }
     function handleProductInputChange(rule, row) {
       queryProductInfoDebounce(rule, row);
@@ -2090,6 +2101,9 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
         tempSelected: {}
       };
     }
+    function handleError(e) {
+      message.error(e?.message);
+    }
     props.value && initValue(props.value);
     props.extraConfig.materialTemp.getDict().then((data) => {
       measrueDicts.value = data;
@@ -2320,14 +2334,19 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
                                           listType: "picture-card",
                                           text: "\u4E0A\u4F20\u56FE\u7247",
                                           multiple: true,
-                                          disabled: __props.disabled?.includes?.("uploadPic")
+                                          disabled: __props.disabled?.includes?.("uploadPic"),
+                                          accept: ".jpg,.png"
                                         },
                                         "extra-props": {
                                           maxCount: 9
                                         },
                                         "upload-request": __props.extraConfig.materialTemp.uploadRequest,
                                         "default-list": pane.uploadList,
-                                        onUpdate: handleUpload
+                                        "custom-errors": {
+                                          format: "\u8BF7\u4E0A\u4F20jpg\u3001png\u683C\u5F0F\u7684\u56FE\u7247"
+                                        },
+                                        onUpdate: handleUpload,
+                                        onError: handleError
                                       }, null, 8, ["upload-props", "upload-request", "default-list"])
                                     ]),
                                     _: 2
@@ -2613,6 +2632,7 @@ var product = {
             on: {
                 change(inject, value) {
                     inject.self.value = value;
+                    inject.self.props.defalutValue = value;
                     nextTick(() => {
                         inject.api.validateField(inject.self.field);
                     });
@@ -2639,6 +2659,10 @@ var product = {
             on: {
                 change(inject, value) {
                     inject.self.value = value;
+                    inject.self.props.defalutValue = value;
+                    nextTick(() => {
+                        inject.api.validateField(inject.self.field);
+                    });
                 },
             },
         };

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

@@ -3286,21 +3286,6 @@ var shop = {
                 value: rule.config.isMain,
                 hidden: !!parentRule,
                 inject: true,
-                on: {
-                    change({ api, self }, value) {
-                        if (value) {
-                            api.mergeRule(fieldsMap$1['effect.required'], {
-                                value: true,
-                                props: { disabled: true },
-                            });
-                        }
-                        else {
-                            api.mergeRule(fieldsMap$1['effect.required'], {
-                                props: { disabled: false },
-                            });
-                        }
-                    },
-                },
             },
             {
                 type: 'switch',
@@ -3997,7 +3982,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         message.error("\u8BE5\u63A7\u4EF6\u5DF2\u88AB\u8BBE\u4E3A\u6570\u636E\u8FC7\u6EE4\u6761\u4EF6\uFF0C\u4E0D\u53EF\u5220\u9664\u3002");
         return;
       }
-      if (props.flowCondition[targetRule.field]) {
+      if (props.flowCondition?.[targetRule.field]) {
         message.error(
           `\u8BE5\u7EC4\u4EF6\u5728\u201C${props.flowCondition[targetRule.field]}\u201D\u5DF2\u88AB\u8BBE\u4E3A\u5BA1\u6279\u6761\u4EF6\uFF0C\u4E0D\u53EF\u5220\u9664\u3002`
         );
@@ -4036,9 +4021,25 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       if (!cacheProps[rule.field]) {
         cacheProps[rule.field] = makePropRule(rule, parentRule);
       }
+      flowConditionEffect(props.flowCondition);
     }
     function propChange(field, value) {
       setRulePropValue(field, value, activeRule.value);
+      processShopProps(field, value);
+    }
+    function processShopProps(field, value) {
+      if (activeRule.value?.config?.config.name === "shop") {
+        if (field === "config.isMain") {
+          const shopProps = cacheProps[activeRule.value.field];
+          const requiredRule = shopProps.find(
+            (rule) => rule.field === "effect.required"
+          );
+          if (value) {
+            requiredRule.value = true;
+          }
+          flowConditionEffect(props.flowCondition);
+        }
+      }
     }
     function setRulePropValue(field, value, rule) {
       field.split(".").reduce((pre, cur, index, arr) => {
@@ -4161,48 +4162,53 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
       return pass;
     }
-    function flowConditionEffect(activeProps2, flowCondition) {
+    function flowConditionEffect(flowCondition) {
       if (activeRule.value.config) {
-        const disabled = !!flowCondition[activeRule.value.field];
+        const activeProps2 = cacheProps[activeRule.value.field];
         const ruleName = activeRule.value.config.config.name;
-        if (disabled) {
-          const requiredRule = activeProps2?.find(
-            (rule) => rule.field === "effect.required"
-          );
-          if (requiredRule) {
-            if (!requiredRule.props) {
-              requiredRule.props = {};
-            }
-            requiredRule.props.disabled = true;
-          }
-          if (["radio", "checkbox"].includes(ruleName)) {
-            const optionsRule = activeProps2?.find(
-              (rule) => rule.field === "options"
-            );
-            optionsRule.props.disabled = true;
-          }
-          if (ruleName === "materialType") {
-            const formatRule = activeProps2?.find(
-              (rule) => rule.field === "config.format"
-            );
-            const multipleRule = activeProps2?.find(
-              (rule) => rule.field === "props.multiple"
-            );
-            formatRule.props = {
-              disabled: true
-            };
-            multipleRule.props = {
-              disabled: true
-            };
-          }
-          if (["people", "department"].includes(ruleName)) {
-            const limitRule = activeProps2?.find(
-              (rule) => rule.field === "props.limit"
-            );
-            limitRule.props = {
-              disabled: true
-            };
+        let disabled;
+        if (ruleName === "shop") {
+          const isMainValue = activeProps2.find(
+            (rule) => rule.field === "config.isMain"
+          )?.value;
+          disabled = !!flowCondition[activeRule.value.field] || isMainValue;
+        } else {
+          disabled = !!flowCondition[activeRule.value.field];
+        }
+        const requiredRule = activeProps2?.find(
+          (rule) => rule.field === "effect.required"
+        );
+        if (requiredRule) {
+          if (!requiredRule.props) {
+            requiredRule.props = {};
           }
+          requiredRule.props.disabled = disabled;
+        }
+        if (["radio", "checkbox"].includes(ruleName)) {
+          const optionsRule = activeProps2?.find((rule) => rule.field === "options");
+          optionsRule.props.disabled = disabled;
+        }
+        if (ruleName === "materialType") {
+          const formatRule = activeProps2?.find(
+            (rule) => rule.field === "config.format"
+          );
+          const multipleRule = activeProps2?.find(
+            (rule) => rule.field === "props.multiple"
+          );
+          formatRule.props = {
+            disabled
+          };
+          multipleRule.props = {
+            disabled
+          };
+        }
+        if (["people", "department"].includes(ruleName)) {
+          const limitRule = activeProps2?.find(
+            (rule) => rule.field === "props.limit"
+          );
+          limitRule.props = {
+            disabled
+          };
         }
       }
     }
@@ -4222,13 +4228,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         immediate: true
       }
     );
-    watch(activeProps, (activeProps2) => {
-      flowConditionEffect(activeProps2, props.flowCondition);
-    });
     watch(
       () => props.flowCondition,
       (flowCondition) => {
-        flowConditionEffect(activeProps.value, flowCondition);
+        flowConditionEffect(flowCondition);
       },
       {
         deep: true
@@ -4375,7 +4378,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 })) : createCommentVNode("v-if", true)
               ])) : createCommentVNode("v-if", true),
               createElementVNode("div", _hoisted_6, [
-                _ctx.flowCondition[activeRule.value.field] ? (openBlock(), createElementBlock("div", _hoisted_7, [
+                _ctx.flowCondition?.[activeRule.value.field] ? (openBlock(), createElementBlock("div", _hoisted_7, [
                   createVNode(unref(ExclamationCircleFilled), { style: { "color": "#2f4eed" } }),
                   createTextVNode(" \u8BE5\u7EC4\u4EF6\u5728\u201C" + toDisplayString(_ctx.flowCondition[activeRule.value.field]) + "\u201D\u5DF2\u88AB\u8BBE\u4E3A\u5BA1\u6279\u6761\u4EF6\uFF0C" + toDisplayString(flowConditionTipMap[activeRule.value?.config?.config?.name]), 1)
                 ])) : createCommentVNode("v-if", true),

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

@@ -604,11 +604,15 @@ var picture = {
                     listType: 'picture-card',
                     text: '请选择',
                     multiple: maxCount > 1,
+                    accept: '.jpg,.png',
                 },
                 extraProps: {
                     maxSize: 10,
                     maxCount,
                 },
+                customErrors: {
+                    format: '请上传jpg、png格式的图片',
+                },
                 defaultList: data.value,
                 uploadRequest(inject, file) {
                     return __awaiter(this, void 0, void 0, function* () {
@@ -634,7 +638,7 @@ var picture = {
                     });
                 },
                 error(inject, error) {
-                    antDesignVue.message.error(error.message);
+                    antDesignVue.message.error(error === null || error === void 0 ? void 0 : error.message);
                 },
             },
         };
@@ -1517,14 +1521,25 @@ const _sfc_main$7 = /* @__PURE__ */ vue.defineComponent({
       const field = rule.field;
       const associatedFields = rule?.config?.associatedFields;
       let result = void 0;
-      if (row[field]) {
-        result = await props.extraConfig.product.fetch({ productCode: row[field] });
+      try {
+        if (row[field]) {
+          result = await props.extraConfig.product.fetch({
+            productCode: row[field]
+          });
+        }
+        processAssociatedFields(field, associatedFields, row, result);
+        return result;
+      } catch (e) {
+        row[field] = "";
+        processAssociatedFields(field, associatedFields, row, result);
+        return Promise.resolve(result);
       }
+    }
+    function processAssociatedFields(field, associatedFields, row, result) {
       if (associatedFields.length)
         associatedFields.forEach((item) => {
           row[productPicName(item.value, field)] = result ? result[productInfoKeyMap[item.value]] : void 0;
         });
-      return result;
     }
     function handleChange(e) {
       const file = e.target.files[0];
@@ -1707,11 +1722,7 @@ const _sfc_main$7 = /* @__PURE__ */ vue.defineComponent({
       return !formData.value[shopField];
     }
     function handlePressEnter(rule, row) {
-      queryProductInfo(rule, row).then((data2) => {
-        if (!data2) {
-          row[rule.field] = "";
-        }
-      });
+      queryProductInfo(rule, row);
     }
     function handleProductInputChange(rule, row) {
       queryProductInfoDebounce(rule, row);
@@ -2101,6 +2112,9 @@ const _sfc_main$6 = /* @__PURE__ */ vue.defineComponent({
         tempSelected: {}
       };
     }
+    function handleError(e) {
+      antDesignVue.message.error(e?.message);
+    }
     props.value && initValue(props.value);
     props.extraConfig.materialTemp.getDict().then((data) => {
       measrueDicts.value = data;
@@ -2331,14 +2345,19 @@ const _sfc_main$6 = /* @__PURE__ */ vue.defineComponent({
                                           listType: "picture-card",
                                           text: "\u4E0A\u4F20\u56FE\u7247",
                                           multiple: true,
-                                          disabled: __props.disabled?.includes?.("uploadPic")
+                                          disabled: __props.disabled?.includes?.("uploadPic"),
+                                          accept: ".jpg,.png"
                                         },
                                         "extra-props": {
                                           maxCount: 9
                                         },
                                         "upload-request": __props.extraConfig.materialTemp.uploadRequest,
                                         "default-list": pane.uploadList,
-                                        onUpdate: handleUpload
+                                        "custom-errors": {
+                                          format: "\u8BF7\u4E0A\u4F20jpg\u3001png\u683C\u5F0F\u7684\u56FE\u7247"
+                                        },
+                                        onUpdate: handleUpload,
+                                        onError: handleError
                                       }, null, 8, ["upload-props", "upload-request", "default-list"])
                                     ]),
                                     _: 2
@@ -2624,6 +2643,7 @@ var product = {
             on: {
                 change(inject, value) {
                     inject.self.value = value;
+                    inject.self.props.defalutValue = value;
                     vue.nextTick(() => {
                         inject.api.validateField(inject.self.field);
                     });
@@ -2650,6 +2670,10 @@ var product = {
             on: {
                 change(inject, value) {
                     inject.self.value = value;
+                    inject.self.props.defalutValue = value;
+                    vue.nextTick(() => {
+                        inject.api.validateField(inject.self.field);
+                    });
                 },
             },
         };

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

@@ -3296,21 +3296,6 @@ var shop = {
                 value: rule.config.isMain,
                 hidden: !!parentRule,
                 inject: true,
-                on: {
-                    change({ api, self }, value) {
-                        if (value) {
-                            api.mergeRule(fieldsMap$1['effect.required'], {
-                                value: true,
-                                props: { disabled: true },
-                            });
-                        }
-                        else {
-                            api.mergeRule(fieldsMap$1['effect.required'], {
-                                props: { disabled: false },
-                            });
-                        }
-                    },
-                },
             },
             {
                 type: 'switch',
@@ -4007,7 +3992,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         antDesignVue.message.error("\u8BE5\u63A7\u4EF6\u5DF2\u88AB\u8BBE\u4E3A\u6570\u636E\u8FC7\u6EE4\u6761\u4EF6\uFF0C\u4E0D\u53EF\u5220\u9664\u3002");
         return;
       }
-      if (props.flowCondition[targetRule.field]) {
+      if (props.flowCondition?.[targetRule.field]) {
         antDesignVue.message.error(
           `\u8BE5\u7EC4\u4EF6\u5728\u201C${props.flowCondition[targetRule.field]}\u201D\u5DF2\u88AB\u8BBE\u4E3A\u5BA1\u6279\u6761\u4EF6\uFF0C\u4E0D\u53EF\u5220\u9664\u3002`
         );
@@ -4046,9 +4031,25 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       if (!cacheProps[rule.field]) {
         cacheProps[rule.field] = makePropRule(rule, parentRule);
       }
+      flowConditionEffect(props.flowCondition);
     }
     function propChange(field, value) {
       setRulePropValue(field, value, activeRule.value);
+      processShopProps(field, value);
+    }
+    function processShopProps(field, value) {
+      if (activeRule.value?.config?.config.name === "shop") {
+        if (field === "config.isMain") {
+          const shopProps = cacheProps[activeRule.value.field];
+          const requiredRule = shopProps.find(
+            (rule) => rule.field === "effect.required"
+          );
+          if (value) {
+            requiredRule.value = true;
+          }
+          flowConditionEffect(props.flowCondition);
+        }
+      }
     }
     function setRulePropValue(field, value, rule) {
       field.split(".").reduce((pre, cur, index, arr) => {
@@ -4171,48 +4172,53 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       }
       return pass;
     }
-    function flowConditionEffect(activeProps2, flowCondition) {
+    function flowConditionEffect(flowCondition) {
       if (activeRule.value.config) {
-        const disabled = !!flowCondition[activeRule.value.field];
+        const activeProps2 = cacheProps[activeRule.value.field];
         const ruleName = activeRule.value.config.config.name;
-        if (disabled) {
-          const requiredRule = activeProps2?.find(
-            (rule) => rule.field === "effect.required"
-          );
-          if (requiredRule) {
-            if (!requiredRule.props) {
-              requiredRule.props = {};
-            }
-            requiredRule.props.disabled = true;
-          }
-          if (["radio", "checkbox"].includes(ruleName)) {
-            const optionsRule = activeProps2?.find(
-              (rule) => rule.field === "options"
-            );
-            optionsRule.props.disabled = true;
-          }
-          if (ruleName === "materialType") {
-            const formatRule = activeProps2?.find(
-              (rule) => rule.field === "config.format"
-            );
-            const multipleRule = activeProps2?.find(
-              (rule) => rule.field === "props.multiple"
-            );
-            formatRule.props = {
-              disabled: true
-            };
-            multipleRule.props = {
-              disabled: true
-            };
-          }
-          if (["people", "department"].includes(ruleName)) {
-            const limitRule = activeProps2?.find(
-              (rule) => rule.field === "props.limit"
-            );
-            limitRule.props = {
-              disabled: true
-            };
+        let disabled;
+        if (ruleName === "shop") {
+          const isMainValue = activeProps2.find(
+            (rule) => rule.field === "config.isMain"
+          )?.value;
+          disabled = !!flowCondition[activeRule.value.field] || isMainValue;
+        } else {
+          disabled = !!flowCondition[activeRule.value.field];
+        }
+        const requiredRule = activeProps2?.find(
+          (rule) => rule.field === "effect.required"
+        );
+        if (requiredRule) {
+          if (!requiredRule.props) {
+            requiredRule.props = {};
           }
+          requiredRule.props.disabled = disabled;
+        }
+        if (["radio", "checkbox"].includes(ruleName)) {
+          const optionsRule = activeProps2?.find((rule) => rule.field === "options");
+          optionsRule.props.disabled = disabled;
+        }
+        if (ruleName === "materialType") {
+          const formatRule = activeProps2?.find(
+            (rule) => rule.field === "config.format"
+          );
+          const multipleRule = activeProps2?.find(
+            (rule) => rule.field === "props.multiple"
+          );
+          formatRule.props = {
+            disabled
+          };
+          multipleRule.props = {
+            disabled
+          };
+        }
+        if (["people", "department"].includes(ruleName)) {
+          const limitRule = activeProps2?.find(
+            (rule) => rule.field === "props.limit"
+          );
+          limitRule.props = {
+            disabled
+          };
         }
       }
     }
@@ -4232,13 +4238,10 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         immediate: true
       }
     );
-    vue.watch(activeProps, (activeProps2) => {
-      flowConditionEffect(activeProps2, props.flowCondition);
-    });
     vue.watch(
       () => props.flowCondition,
       (flowCondition) => {
-        flowConditionEffect(activeProps.value, flowCondition);
+        flowConditionEffect(flowCondition);
       },
       {
         deep: true
@@ -4385,7 +4388,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                 })) : vue.createCommentVNode("v-if", true)
               ])) : vue.createCommentVNode("v-if", true),
               vue.createElementVNode("div", _hoisted_6, [
-                _ctx.flowCondition[activeRule.value.field] ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_7, [
+                _ctx.flowCondition?.[activeRule.value.field] ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_7, [
                   vue.createVNode(vue.unref(iconsVue.ExclamationCircleFilled), { style: { "color": "#2f4eed" } }),
                   vue.createTextVNode(" \u8BE5\u7EC4\u4EF6\u5728\u201C" + vue.toDisplayString(_ctx.flowCondition[activeRule.value.field]) + "\u201D\u5DF2\u88AB\u8BBE\u4E3A\u5BA1\u6279\u6761\u4EF6\uFF0C" + vue.toDisplayString(flowConditionTipMap[activeRule.value?.config?.config?.name]), 1)
                 ])) : vue.createCommentVNode("v-if", true),

package/package.json

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