bm-admin-ui 1.0.77-alpha → 1.0.78-alpha

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

@@ -3032,25 +3032,11 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
     function handleChange(val) {
       emits("change", val);
     }
-    function shopLinkProduct(newField, oldField) {
-      shopRules.value.forEach((shop) => {
-        if (shop.field === oldField) {
-          shop.config.linkProductCount--;
-        }
-        if (shop.field === newField) {
-          if (!shop.config.linkProductCount) {
-            shop.config.linkProductCount = 0;
-          }
-          shop.config.linkProductCount++;
-        }
-      });
-    }
     watch(checkedValue, (checkedValue2) => {
       checkedValueChange(checkedValue2);
     });
-    watch(selectValue, (selectValue2, oldSelectValue) => {
+    watch(selectValue, (selectValue2) => {
       selectValueChange(selectValue2);
-      shopLinkProduct(selectValue2, oldSelectValue);
       handleChange(selectValue2);
     });
     return (_ctx, _cache) => {
@@ -3984,7 +3970,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function handleFormItemClick(rule) {
       setActiveRule(rule);
     }
-    function copyRule(rule, ruleConfig, ruleHost, isCopyChildRule = false) {
+    function copyRule(rule, ruleConfig, ruleHost, isCopyChildRule = false, needCopyField = false) {
       const newRule = makeRule(ruleConfig);
       if (isCopyChildRule) {
         ruleHost.push(newRule);
@@ -3994,11 +3980,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         );
         ruleHost.splice(index + 1, 0, newRule);
       }
-      copyPropValue(rule, newRule);
+      copyPropValue(rule, newRule, needCopyField);
       if (rule?.config?.childRules?.length) {
         rule.config.childRules.forEach((cRule) => {
           const config = cRule?.config?.config || ruleList[cRule.name];
-          copyRule(cRule, config, newRule.config.childRules, true);
+          copyRule(cRule, config, newRule.config.childRules, true, needCopyField);
         });
       }
       return newRule;
@@ -4094,7 +4080,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         return pre[cur];
       }, rule);
     }
-    function copyPropValue(oldRule, newRule) {
+    function copyPropValue(oldRule, newRule, needCopyField = false) {
+      if (needCopyField) {
+        newRule.field = oldRule.field;
+      }
       newRule.config.propsFields.forEach((field) => {
         if (field !== "config.childRules")
           setRulePropValue(field, cloneDeep(getValue(field, oldRule)), newRule);
@@ -4142,7 +4131,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function edit(formRules) {
       widgetFormRules.splice(0);
       formRules.forEach(
-        (item) => copyRule(item, ruleList[item.name], widgetFormRules, true)
+        (item) => copyRule(item, ruleList[item.name], widgetFormRules, true, true)
       );
     }
     function getRule(name) {

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

@@ -3042,25 +3042,11 @@ const _sfc_main$7 = /* @__PURE__ */ vue.defineComponent({
     function handleChange(val) {
       emits("change", val);
     }
-    function shopLinkProduct(newField, oldField) {
-      shopRules.value.forEach((shop) => {
-        if (shop.field === oldField) {
-          shop.config.linkProductCount--;
-        }
-        if (shop.field === newField) {
-          if (!shop.config.linkProductCount) {
-            shop.config.linkProductCount = 0;
-          }
-          shop.config.linkProductCount++;
-        }
-      });
-    }
     vue.watch(checkedValue, (checkedValue2) => {
       checkedValueChange(checkedValue2);
     });
-    vue.watch(selectValue, (selectValue2, oldSelectValue) => {
+    vue.watch(selectValue, (selectValue2) => {
       selectValueChange(selectValue2);
-      shopLinkProduct(selectValue2, oldSelectValue);
       handleChange(selectValue2);
     });
     return (_ctx, _cache) => {
@@ -3994,7 +3980,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     function handleFormItemClick(rule) {
       setActiveRule(rule);
     }
-    function copyRule(rule, ruleConfig, ruleHost, isCopyChildRule = false) {
+    function copyRule(rule, ruleConfig, ruleHost, isCopyChildRule = false, needCopyField = false) {
       const newRule = makeRule(ruleConfig);
       if (isCopyChildRule) {
         ruleHost.push(newRule);
@@ -4004,11 +3990,11 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         );
         ruleHost.splice(index + 1, 0, newRule);
       }
-      copyPropValue(rule, newRule);
+      copyPropValue(rule, newRule, needCopyField);
       if (rule?.config?.childRules?.length) {
         rule.config.childRules.forEach((cRule) => {
           const config = cRule?.config?.config || ruleList[cRule.name];
-          copyRule(cRule, config, newRule.config.childRules, true);
+          copyRule(cRule, config, newRule.config.childRules, true, needCopyField);
         });
       }
       return newRule;
@@ -4104,7 +4090,10 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         return pre[cur];
       }, rule);
     }
-    function copyPropValue(oldRule, newRule) {
+    function copyPropValue(oldRule, newRule, needCopyField = false) {
+      if (needCopyField) {
+        newRule.field = oldRule.field;
+      }
       newRule.config.propsFields.forEach((field) => {
         if (field !== "config.childRules")
           setRulePropValue(field, lodashEs.cloneDeep(getValue(field, oldRule)), newRule);
@@ -4152,7 +4141,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     function edit(formRules) {
       widgetFormRules.splice(0);
       formRules.forEach(
-        (item) => copyRule(item, ruleList[item.name], widgetFormRules, true)
+        (item) => copyRule(item, ruleList[item.name], widgetFormRules, true, true)
       );
     }
     function getRule(name) {

package/package.json

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