bm-admin-ui 1.0.75-alpha → 1.0.76-alpha

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

@@ -5,7 +5,7 @@ import Draggable from 'vuedraggable';
 import { Tooltip, FormItemRest, Input, Button, RadioGroup, Radio, DatePicker, Checkbox, Tabs, TabPane, Row, Col, Dropdown, Menu, CheckboxGroup, MenuItem, Divider, Switch, Select, Layout, LayoutSider, LayoutContent, message } from 'ant-design-vue';
 import { HolderOutlined, EditOutlined, PlusOutlined, QuestionCircleOutlined, InfoCircleFilled, ExclamationCircleFilled } from '@ant-design/icons-vue';
 import { BmUpload } from 'bm-admin-ui/es/components';
-import { cloneDeep, merge } from 'lodash-es';
+import { cloneDeep } from 'lodash-es';
 import FC from '@form-create/ant-design-vue';
 
 var WidgetType;
@@ -3238,9 +3238,6 @@ var shop = {
     name: name$1,
     label: label$1,
     rule() {
-        console.log('---------------');
-        console.log(`第${i + 1}次添加店铺控件`);
-        console.log('---------------');
         return {
             type: 'Select',
             field: uniqueId(),
@@ -3987,19 +3984,31 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function handleFormItemClick(rule) {
       setActiveRule(rule);
     }
-    function copyRule(rule, parentRule) {
-      const newRule = makeRule(rule.config.config);
-      const list = parentRule?.config?.childRules || widgetFormRules;
-      const index = list.findIndex((ruleItem) => ruleItem.field === rule.field);
-      list.splice(index + 1, 0, newRule);
+    function copyRule(rule, ruleConfig, ruleHost, isCopyChildRule = false) {
+      const newRule = makeRule(ruleConfig);
+      if (isCopyChildRule) {
+        ruleHost.push(newRule);
+      } else {
+        const index = ruleHost.findIndex(
+          (ruleItem) => ruleItem.field === rule.field
+        );
+        ruleHost.splice(index + 1, 0, newRule);
+      }
       copyPropValue(rule, newRule);
-      if (rule.config.childRules?.length) {
-        rule.config.childRules.forEach((cRule) => copyRule(cRule, newRule));
+      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);
+        });
       }
       return newRule;
     }
     function handleFormItemCopy(rule, parentRule) {
-      const newRule = copyRule(rule, parentRule);
+      const newRule = copyRule(
+        rule,
+        rule.config.config,
+        parentRule?.config?.childRules || widgetFormRules
+      );
       setActiveRule(newRule, parentRule);
     }
     function handleFormItemDelete(targetRule, parentRule) {
@@ -4132,22 +4141,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     function edit(formRules) {
       widgetFormRules.splice(0);
-      formRules.forEach((item) => {
-        widgetFormRules.push(recursiveMakeRule(cloneDeep(item)));
-      });
-    }
-    function recursiveMakeRule(item) {
-      const rule = makeRule(ruleList[item.name]);
-      delete item.name;
-      if (item?.config?.childRules?.length) {
-        rule.config.childRules = item.config.childRules.map((childItem) => {
-          const childRule = recursiveMakeRule(childItem);
-          delete childItem.name;
-          return childRule;
-        });
-      }
-      merge(rule, item);
-      return rule;
+      formRules.forEach(
+        (item) => copyRule(item, ruleList[item.name], widgetFormRules, true)
+      );
     }
     function getRule(name) {
       return makeRule(ruleList[name]);

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

@@ -3248,9 +3248,6 @@ var shop = {
     name: name$1,
     label: label$1,
     rule() {
-        console.log('---------------');
-        console.log(`第${i + 1}次添加店铺控件`);
-        console.log('---------------');
         return {
             type: 'Select',
             field: uniqueId__default["default"](),
@@ -3997,19 +3994,31 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     function handleFormItemClick(rule) {
       setActiveRule(rule);
     }
-    function copyRule(rule, parentRule) {
-      const newRule = makeRule(rule.config.config);
-      const list = parentRule?.config?.childRules || widgetFormRules;
-      const index = list.findIndex((ruleItem) => ruleItem.field === rule.field);
-      list.splice(index + 1, 0, newRule);
+    function copyRule(rule, ruleConfig, ruleHost, isCopyChildRule = false) {
+      const newRule = makeRule(ruleConfig);
+      if (isCopyChildRule) {
+        ruleHost.push(newRule);
+      } else {
+        const index = ruleHost.findIndex(
+          (ruleItem) => ruleItem.field === rule.field
+        );
+        ruleHost.splice(index + 1, 0, newRule);
+      }
       copyPropValue(rule, newRule);
-      if (rule.config.childRules?.length) {
-        rule.config.childRules.forEach((cRule) => copyRule(cRule, newRule));
+      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);
+        });
       }
       return newRule;
     }
     function handleFormItemCopy(rule, parentRule) {
-      const newRule = copyRule(rule, parentRule);
+      const newRule = copyRule(
+        rule,
+        rule.config.config,
+        parentRule?.config?.childRules || widgetFormRules
+      );
       setActiveRule(newRule, parentRule);
     }
     function handleFormItemDelete(targetRule, parentRule) {
@@ -4142,22 +4151,9 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     }
     function edit(formRules) {
       widgetFormRules.splice(0);
-      formRules.forEach((item) => {
-        widgetFormRules.push(recursiveMakeRule(lodashEs.cloneDeep(item)));
-      });
-    }
-    function recursiveMakeRule(item) {
-      const rule = makeRule(ruleList[item.name]);
-      delete item.name;
-      if (item?.config?.childRules?.length) {
-        rule.config.childRules = item.config.childRules.map((childItem) => {
-          const childRule = recursiveMakeRule(childItem);
-          delete childItem.name;
-          return childRule;
-        });
-      }
-      lodashEs.merge(rule, item);
-      return rule;
+      formRules.forEach(
+        (item) => copyRule(item, ruleList[item.name], widgetFormRules, true)
+      );
     }
     function getRule(name) {
       return makeRule(ruleList[name]);

package/package.json

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