lw-cdp-ui 1.2.32 → 1.2.34

package/dist/components/lwFlow/index.vue

@@ -20,6 +20,7 @@
       <nodeEdit :lf="logicFlow"
                 :drawerShow="drawerShow"
                 :nodeData="clickNode"
+                :nodesDataConfig="nodesDataConfig"
                 @onClose="nodeEditClose" />
     </template>
 
@@ -91,24 +92,15 @@ export default {
         return []
       }
     },
-    /**
-     * 节点配置初始化数据
-     */
-    nodeDatas: {
-      type: Object,
-      default: () => {
-        return nodeDatas
-      }
-    },
     /**
      * 节点配置
      */
-    configNodesList: {
-      type: Object,
-      default: () => {
-        return configNodesList
-      }
-    },
+    // configNodesList: {
+    //   type: Object,
+    //   default: () => {
+    //     return configNodesList
+    //   }
+    // },
     /**
      * 是否显示默认节点
      */
@@ -130,6 +122,26 @@ export default {
       type: Array,
       default: []
     },
+    /**
+     * 节点数据配置
+     * 对应的就是nodeDatas目录下的数据结构 
+     * source: { // 节点名
+          formConfig: { // 表单配置
+            formItems: [{ // 表单项配置，写你要覆盖的参数
+              name: 'from', // name 指定你要覆盖的名称
+              component: 'select',
+              options: {
+                items: [{ label: '订单', value: 'order' }, { label: '会员', value: 'member' }],
+                placeholder: '请输入节点名称'
+              },
+            }]
+          }
+        }
+     */
+     nodesDataConfig: {
+      type: Object,
+      default: {}
+    },
     /**
      * apiNodes - 接口返回的节点数组，用于与内容节点合并。
      * @type {Array<Object>}

package/dist/components/lwFlow/nodeEdit/basicSettings.vue

@@ -1,7 +1,5 @@
 <template>
-  <lw-form-mini ref="dataFormRef"
-           :config="config"
-           v-model="dataForm">
+  <lw-form-mini ref="dataFormRef" :config="config" v-model="dataForm">
     <!-- 定时器 表单自定义部分 -->
     <template #dateCron>
       <lwCronSelect v-model="dataForm.cron" />
@@ -9,28 +7,30 @@
 
     <!-- et2l 表单自定义部分 -->
     <template #KeyableSource>
-      <lwTableForm :config="base.configKeyableSource"
-                   v-model="dataForm.from" />
+      <lwTableForm :config="base.configKeyableSource" v-model="dataForm.from" />
     </template>
+    
     <template #MapAction>
-      <lwTableForm :config="base.configMapAction"
-                   v-model="dataForm.with">
-        <template #sourceField="{row}">
-          <el-input v-if="row.type == 'direct'"
-                    size="small"
-                    v-model="row.from"
-                    placeholder="来源字段" />
-          <el-select v-else
-                     v-model="row.from"
-                     multiple
-                     filterable
-                     allow-create
-                     size="small"
-                     default-first-option
-                     :reserve-keyword="false"
-                     placeholder="来源字段"
-                     style="width: 100%">
-          </el-select>
+      <lwTableForm :config="base.configMapAction" v-model="dataForm.with">
+        <template #sourceField="{ row }">
+          <el-input
+            v-if="row.type === 'direct'"
+            size="small"
+            v-model="row.from"
+            placeholder="来源字段"
+          />
+          <el-select
+            v-else
+            v-model="row.from"
+            multiple
+            filterable
+            allow-create
+            size="small"
+            default-first-option
+            :reserve-keyword="false"
+            placeholder="来源字段"
+            style="width: 100%"
+          />
         </template>
       </lwTableForm>
     </template>
@@ -40,111 +40,39 @@
 </template>
 
 <script>
-import nodeDatas from '../nodesData/index.js'
 export default {
-  name: 'basicSettings',
-  data() {
-    return {
-      dataForm: {},
-      ...nodeDatas
-    }
-  },
+  name: "BasicSettings",
   props: {
     modelValue: {
       type: Object,
-      default: () => {
-        return {}
-      }
+      default: () => ({}),
     },
-    lf: {
+    config: {
       type: Object,
-      default: () => { }
+      default: () => ({}),
     },
-    type: {
-      type: String,
-      default: ''
-    }
+  },
+  data() {
+    return {
+      dataForm: {},
+    };
   },
   watch: {
     modelValue: {
       handler(val) {
         if (val) {
-          this.dataForm = val
+          this.dataForm = val;
         }
-
       },
       immediate: true,
-      deep: true
+      deep: true,
     },
     dataForm: {
-      handler(val, old) {
-        if (Object.keys(old).length > 0) {
-          this.$emit('update:modelValue', val)
-        }
-
+      handler(val, oldVal) {
+        this.$emit("update:modelValue", val)
       },
-      deep: true
-    }
-  },
-  computed: {
-    config() {
-      let config = {
-        labelWidth: '70px',
-        labelPosition: 'top',
-        formItems: [
-          {
-            label: '节点名称',
-            name: 'name',
-            value: '',
-            component: 'input',
-            options: {
-              placeholder: '请输入节点名称',
-            },
-            span: 24
-          }
-        ]
-      }
-
-      // 拿到对应节点的表单配置
-      let nodeConfig = nodeDatas[this.type]?.formConfig || {}
-      // 复制数据 防止修改表单配置影响全局
-      nodeConfig = JSON.parse(JSON.stringify(nodeConfig))
-      if (nodeConfig?.labelWidth) {
-        config.labelWidth = nodeConfig.labelWidth
-      }
-      if (nodeConfig?.labelPosition) {
-        config.labelPosition = nodeConfig.labelPosition
-      }
-
-      // 处理需要接口的内容
-      if (!this.$store.state[`lwFlow_${this.type}`]) {
-        this.$store.state[`lwFlow_${this.type}`] = {}
-      }
-      nodeConfig?.formItems?.forEach(async item => {
-        if (item?.options?.items) {
-          if (item.api) {
-            let items = await item.api(this.$http)
-            item.options.items = items || []
-          }
-
-          // 全局化选项内容 用于回显数据
-          if (item?.options?.name) {
-            this.$store.state[`lwFlow_${this.type}`][`${item.name}.${item.options.name}`] = item?.options?.items || ''
-          } else {
-            this.$store.state[`lwFlow_${this.type}`][item.name] = item?.options?.items || ''
-          }
-        }
-      })
-
-      if (nodeConfig?.formItems) {
-        config.formItems = nodeConfig.formItems
-      }
-
-      return config
-    }
+      deep: true,
+    },
   },
-  methods: {
-  }
-}
-
-</script>
+};
+</script>

package/dist/components/lwFlow/nodeEdit/eventReceive.vue

@@ -34,13 +34,11 @@
 </template>
 
 <script>
-import nodeDatas from '../nodesData/index.js'
 export default {
   name: 'basicSettings',
   data() {
     return {
       dataForm: {},
-      ...nodeDatas,
       behaviorIdOptions: [],
       dataModelFields: [],
     }
@@ -52,14 +50,10 @@ export default {
         return {}
       }
     },
-    lf: {
+    config: {
       type: Object,
-      default: () => { }
+      default: () => ({}),
     },
-    type: {
-      type: String,
-      default: ''
-    }
   },
   watch: {
     modelValue: {
@@ -82,61 +76,6 @@ export default {
       deep: true
     }
   },
-  computed: {
-    config() {
-      let config = {
-        labelWidth: '70px',
-        labelPosition: 'top',
-        formItems: [
-          {
-            label: '节点名称',
-            name: 'name',
-            value: '',
-            component: 'input',
-            options: {
-              placeholder: '请输入节点名称',
-            },
-            span: 24
-          }
-        ]
-      }
-
-      // 拿到对应节点的表单配置
-      let nodeConfig = nodeDatas[this.type]?.formConfig || {}
-      if (nodeConfig?.labelWidth) {
-        config.labelWidth = nodeConfig.labelWidth
-      }
-      if (nodeConfig?.labelPosition) {
-        config.labelPosition = nodeConfig.labelPosition
-      }
-
-      // 处理需要接口的内容
-      if (!this.$store.state[`lwFlow_${this.type}`]) {
-        this.$store.state[`lwFlow_${this.type}`] = {}
-      }
-      nodeConfig?.formItems?.forEach(async item => {
-        if (item?.options?.items) {
-          if (item.api) {
-            let items = await item.api(this.$http)
-            item.options.items = items || []
-          }
-
-          // 全局化选项内容 用于回显数据
-          if (item?.options?.name) {
-            this.$store.state[`lwFlow_${this.type}`][`${item.name}.${item.options.name}`] = item?.options?.items || ''
-          } else {
-            this.$store.state[`lwFlow_${this.type}`][item.name] = item?.options?.items || ''
-          }
-        }
-      })
-
-      if (nodeConfig?.formItems) {
-        config.formItems = nodeConfig.formItems
-      }
-
-      return config
-    }
-  },
   methods: {
     // 获取事件列表
     async getBehaviorList() {

package/dist/components/lwFlow/nodeEdit/index.vue

@@ -11,6 +11,9 @@
                    accordion>
         <el-collapse-item title="基础信息"
                           name="basicInfo">
+          <!-- 说明：
+                    此处如果对应的节点没有特别的处理直接使用 basicSettings 就可
+                    如果这个节点有特别的操作 请自定义节点组件 以防默认组件过于庞大-->
 
           <!-- 营销目标 -->
           <template v-if="['audience_receive'].includes(nodeData.type)">
@@ -22,21 +25,18 @@
           <template v-if="['event_receive'].includes(nodeData.type)">
             <eventReceive ref="dataFormRef"
                           v-model="dataForm.properties.data"
-                          :type="nodeData.type"
-                          :lf="lf" />
+                          :config="config" />
           </template>
           <template v-if="['sms'].includes(nodeData.type)">
             <sms ref="dataFormRef"
                  v-model="dataForm.properties.data"
-                 :type="nodeData.type"
-                 :lf="lf" />
+                 :config="config" />
           </template>
           <!-- 默认 -->
           <template v-else>
             <basicSettings ref="dataFormRef"
                            v-model="dataForm.properties.data"
-                           :type="nodeData.type"
-                           :lf="lf" />
+                           :config="config" />
           </template>
 
         </el-collapse-item>
@@ -67,6 +67,8 @@ import sms from './sms.vue'
 import basicSettings from './basicSettings.vue'
 import styleSettings from './styleSettings.vue'
 
+import nodeDatas from '../nodesData/index.js'
+
 export default {
   name: 'drawerForm',
   components: {
@@ -78,6 +80,7 @@ export default {
   },
   props: {
     nodeData: { type: Object, default: () => { } },
+    nodesDataConfig: { type: Object, default: () => { } },
     lf: {
       type: Object,
       default: () => { }
@@ -98,6 +101,7 @@ export default {
   data() {
     return {
       activeName: 'basicInfo',
+      ...nodeDatas,
       dataForm: {
         text: { value: '' },
         properties: {
@@ -108,6 +112,155 @@ export default {
       isShow: false
     }
   },
+  computed: {
+    config() {
+
+      /**
+       * 深度合并两个对象
+       * @param {Object} target 基础对象
+       * @param {Object} source 覆盖的对象
+       * @returns {Object} 合并后的对象
+       */
+      function deepMerge(target, source) {
+        // 如果 target 不是对象，则直接返回 source（注意：这里假设 source 一定有意义）
+        if (typeof target !== 'object' || target === null) {
+          return source;
+        }
+
+        // 遍历 source 的每个属性
+        for (const key in source) {
+          if (source.hasOwnProperty(key)) {
+            const sourceValue = source[key];
+            const targetValue = target[key];
+
+            // 特殊处理 formItems 数组
+            if (key === 'formItems' && Array.isArray(sourceValue)) {
+              target[key] = mergeFormItems(targetValue, sourceValue);
+            } else if (Array.isArray(sourceValue)) {
+              // 非 formItems 数组直接覆盖（也可根据需要扩展其他数组的合并规则）
+              target[key] = sourceValue.slice();
+            } else if (typeof sourceValue === 'object' && sourceValue !== null) {
+              // 如果 target 中对应属性不是对象，则先置为空对象
+              if (typeof targetValue !== 'object' || targetValue === null) {
+                target[key] = {};
+              }
+              // 递归合并对象
+              target[key] = deepMerge(target[key], sourceValue);
+            } else {
+              // 基本数据类型直接覆盖
+              target[key] = sourceValue;
+            }
+
+          }
+        }
+        return target;
+      }
+
+      /**
+       * 对 formItems 数组进行合并
+       * @param {Array} baseItems 基础 formItems 数组（可能为空）
+       * @param {Array} overrideItems 覆盖的 formItems 数组
+       * @returns {Array} 合并后的 formItems 数组
+       */
+      function mergeFormItems(baseItems, overrideItems) {
+        // 如果基础数据不存在或不是数组，则初始化为空数组
+        if (!Array.isArray(baseItems)) {
+          baseItems = [];
+        }
+
+        // 遍历覆盖数组中的每一项
+        overrideItems.forEach(overrideItem => {
+          let matched = false;
+          // 遍历基础数组中所有 name 相同的项
+          baseItems.forEach((baseItem, index) => {
+            if (baseItem.name === overrideItem.name) {
+              // 如果覆盖项设置了 hideHandle，则只有在 hideHandle 值相同的情况下才进行合并
+              if (overrideItem.hasOwnProperty('hideHandle')) {
+                if (baseItem.hideHandle === overrideItem.hideHandle) {
+                  baseItems[index] = deepMerge(baseItem, overrideItem);
+                  matched = true;
+                }
+              } else {
+                // 如果没有设置 hideHandle，则覆盖所有 name 相同的项
+                baseItems[index] = deepMerge(baseItem, overrideItem);
+                matched = true;
+              }
+            }
+          });
+          // 如果没有找到匹配项，则直接添加新的项（深拷贝以防引用问题）
+          if (!matched) {
+            baseItems.push(JSON.parse(JSON.stringify(overrideItem)));
+          }
+        });
+
+        return baseItems;
+      }
+
+
+      // 默认配置
+      let config = {
+        labelWidth: '70px',
+        labelPosition: 'top',
+        formItems: [
+          {
+            label: '节点名称',
+            name: 'name',
+            value: '',
+            component: 'input',
+            options: {
+              placeholder: '请输入节点名称'
+            },
+            span: 24
+          }
+        ]
+      };
+
+      // 注意：基础数据以 nodeDatas 为主，节点配置（nodesDataConfig）覆盖其中的对应字段
+      let nodeDatasMerge = deepMerge(
+        nodeDatas,
+        this.nodesDataConfig
+      );
+
+      // 取出对应节点的表单配置
+      let nodeConfig = nodeDatasMerge[this.nodeData.type]?.formConfig || {};
+      // 深拷贝，避免直接修改全局配置
+      nodeConfig = JSON.parse(JSON.stringify(nodeConfig));
+
+      if (nodeConfig?.labelWidth) {
+        config.labelWidth = nodeConfig.labelWidth;
+      }
+      if (nodeConfig?.labelPosition) {
+        config.labelPosition = nodeConfig.labelPosition;
+      }
+
+      // 处理需要接口的内容
+      if (!this.$store.state[`lwFlow_${this.nodeData.type}`]) {
+        this.$store.state[`lwFlow_${this.nodeData.type}`] = {};
+      }
+      nodeConfig?.formItems?.forEach(async item => {
+        if (item?.options?.items) {
+          if (item.api) {
+            let items = await item.api(this.$http);
+            item.options.items = items || [];
+          }
+          // 全局化选项内容 用于回显数据
+          if (item?.options?.name) {
+            this.$store.state[`lwFlow_${this.nodeData.type}`][`${item.name}.${item.options.name}`] =
+              item?.options?.items || '';
+          } else {
+            this.$store.state[`lwFlow_${this.nodeData.type}`][item.name] =
+              item?.options?.items || '';
+          }
+        }
+      });
+
+      if (nodeConfig?.formItems) {
+        config.formItems = nodeConfig.formItems;
+      }
+      return config;
+    }
+
+  },
   methods: {
     async onSubmit() {
       await this.$refs.dataFormRef.$refs.dataFormRef.validate();

package/dist/components/lwFlow/nodeEdit/sms.vue

@@ -1,7 +1,7 @@
 <template>
   <lw-form-mini ref="dataFormRef"
-           :config="config"
-           v-model="dataForm">
+                :config="config"
+                v-model="dataForm">
     <template #capabilityIdSelect>
       <el-select v-model="dataForm.capabilityId"
                  filterable
@@ -25,13 +25,11 @@
 </template>
 
 <script>
-import nodeDatas from '../nodesData/index.js'
 export default {
   name: 'basicSettings',
   data() {
     return {
       dataForm: {},
-      ...nodeDatas,
       communicates: [],
       content: ''
     }
@@ -43,14 +41,10 @@ export default {
         return {}
       }
     },
-    lf: {
+    config: {
       type: Object,
-      default: () => { }
+      default: () => ({}),
     },
-    type: {
-      type: String,
-      default: ''
-    }
   },
   watch: {
     modelValue: {
@@ -73,61 +67,7 @@ export default {
       deep: true
     }
   },
-  computed: {
-    config() {
-      let config = {
-        labelWidth: '70px',
-        labelPosition: 'top',
-        formItems: [
-          {
-            label: '节点名称',
-            name: 'name',
-            value: '',
-            component: 'input',
-            options: {
-              placeholder: '请输入节点名称',
-            },
-            span: 24
-          }
-        ]
-      }
-
-      // 拿到对应节点的表单配置
-      let nodeConfig = nodeDatas[this.type]?.formConfig || {}
-      if (nodeConfig?.labelWidth) {
-        config.labelWidth = nodeConfig.labelWidth
-      }
-      if (nodeConfig?.labelPosition) {
-        config.labelPosition = nodeConfig.labelPosition
-      }
-
-      // 处理需要接口的内容
-      if (!this.$store.state[`lwFlow_${this.type}`]) {
-        this.$store.state[`lwFlow_${this.type}`] = {}
-      }
-      nodeConfig?.formItems?.forEach(async item => {
-        if (item?.options?.items) {
-          if (item.api) {
-            let items = await item.api(this.$http)
-            item.options.items = items || []
-          }
 
-          // 全局化选项内容 用于回显数据
-          if (item?.options?.name) {
-            this.$store.state[`lwFlow_${this.type}`][`${item.name}.${item.options.name}`] = item?.options?.items || ''
-          } else {
-            this.$store.state[`lwFlow_${this.type}`][item.name] = item?.options?.items || ''
-          }
-        }
-      })
-
-      if (nodeConfig?.formItems) {
-        config.formItems = nodeConfig.formItems
-      }
-
-      return config
-    }
-  },
   methods: {
     async getCommunicate() {
       const params = { fields: "name,budgetSetting", expression: "" };

package/dist/components/lwFlow/nodesData/datas/base.js

@@ -73,6 +73,18 @@ export default {
 		},
 		rowKey: 'id',
 		formItems: [
+
+			{
+				label: '来源字段',
+				name: 'from',
+				value: '',
+				minWidth: '80',
+				component: 'sourceField',
+				options: {
+					placeholder: '请输入'
+				},
+				rules: [{ required: true, message: '不能为空', trigger: 'blur' }]
+			},
 			{
 				label: '映射类型',
 				name: 'type',
@@ -94,17 +106,6 @@ export default {
 				},
 				rules: [{ required: true, message: '不能为空', trigger: 'blur' }]
 			},
-			{
-				label: '来源字段',
-				name: 'from',
-				value: '',
-				minWidth: '80',
-				component: 'sourceField',
-				options: {
-					placeholder: '请输入'
-				},
-				rules: [{ required: true, message: '不能为空', trigger: 'blur' }]
-			},
 			{
 				label: '目标字段',
 				name: 'into',