npm - bm-admin-ui - Versions diffs - 1.0.62-alpha → 1.0.63-alpha - Mend

bm-admin-ui 1.0.62-alpha → 1.0.63-alpha

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/es/components/form-designer/index.js +61 -58
package/lib/components/form-designer/index.js +61 -58
package/package.json +1 -1

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

@@ -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',
@@ -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

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

@@ -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',
@@ -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

package/package.json CHANGED Viewed

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