lw-cdp-ui 1.2.44 → 1.2.46

package/dist/components/lwFlow/index.vue

@@ -21,11 +21,22 @@
                 :drawerShow="drawerShow"
                 :nodeData="clickNode"
                 :nodesDataConfig="nodesDataConfig"
-                :tableFieldsList="tableFieldsList"
-                @onClose="nodeEditClose" 
-                @changedFieldValue="changedFieldValue"/>
+                :soltList="soltList"
+                @onClose="nodeEditClose">
+        <template v-slot:[soltName]="{itemCur, formCur}"
+                  v-for="soltName in soltList">
+          <slot :name="soltName"
+                :itemCur="itemCur"
+                :formCur="formCur">
+            <el-tag type="danger">[{{ soltName }}]
+              没有这个默认组件也未自定义插槽内容</el-tag>
+          </slot>
+        </template>
+        <template #mySolt>
+          sssssssssssssssss
+        </template>
+      </nodeEdit>
     </template>
-
   </div>
 </template>
 
@@ -85,41 +96,31 @@ export default {
         return {}
       }
     },
-    /**
-     * 节点数据 在没有 modelValue时 用以自动创建节点  默认使用modelValue
-     */
+    // 节点数据 在没有 modelValue时 用以自动创建节点  默认使用modelValue
     nodes: {
       type: Array,
       default: () => {
         return []
       }
     },
-    /**
-     * 节点配置
-     */
-    // configNodesList: {
-    //   type: Object,
-    //   default: () => {
-    //     return configNodesList
-    //   }
-    // },
-    /**
-     * 是否显示默认节点
-     */
+    // 节点插槽列表
+    soltList: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    // 是否显示默认节点
     showDefaultNode: {
       type: Boolean,
       default: true
     },
-    /**
-     * 是否仅查看
-     */
+    // 是否仅查看
     isView: {
       type: Boolean,
       default: false
     },
-    /**
-     * 需要展示的节点分组 不传默认展示所有内置节点
-     */
+    // 需要展示的节点分组 不传默认展示所有内置节点
     showNodeGroup: {
       type: Array,
       default: []
@@ -140,12 +141,7 @@ export default {
           }
         }
      */
-     nodesDataConfig: {
-      type: Object,
-      default: {}
-    },
-    // 用于接受更改数据表后，对应的表字段信息，此值属于定制化设置所需字段时使用
-    tableFieldsList:{
+    nodesDataConfig: {
       type: Object,
       default: {}
     },
@@ -566,7 +562,7 @@ export default {
       this.logicFlow.setProperties(data.id, {
         error: false
       });
-      
+
       this.clickNode = data
       this.drawerShow = true
 
@@ -584,7 +580,7 @@ export default {
         let { formConfig } = nodeDatas[node.type];
         let { formItems } = formConfig;
         let { data } = node.properties;
-        
+
         if (formItems?.length > 0) {
           for (const item of formItems) {
             let value = data ? data[item?.name] : data;
@@ -624,14 +620,9 @@ export default {
         }
       }
       return Object.keys(errorNodes).length === 0;
-    },
-
-    changedFieldValue(val){
-      this.$emit('changedFieldValue',val)
     }
-  },
 
- 
+  },
 }
 </script>
 

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

@@ -1,8 +1,7 @@
 <template>
   <lw-form-mini ref="dataFormRef"
                 :config="config"
-                v-model="dataForm"
-                @changedFieldValue="changedFieldValue">
+                v-model="dataForm">
     <!-- 定时器 表单自定义部分 -->
     <template #dateCron>
       <lwCronSelect v-model="dataForm.cron" />
@@ -35,40 +34,16 @@
         </template>
       </lwTableForm>
     </template>
-    <!-- 所需字段 自定义设置 -->
-    <template #cols>
-      <div style="width: 100%;display: flex;">
-        <el-input v-model="dataForm.cols" placeholder="来源字段" />
-        <el-button type="primary" style="margin-left:5px ;" @click="openFieldChoice">选择字段</el-button>
-      </div>
+
+    <template v-slot:[soltName]="{itemCur, formCur}"
+              v-for="soltName in soltList">
+      <slot :name="soltName"
+            :itemCur="itemCur"
+            :formCur="formCur"></slot>
     </template>
+
     <span></span>
   </lw-form-mini>
-
-  <!-- 字段选择弹框 -->
-  <el-dialog
-    v-model="dialogVisible"
-    title="字段选择"
-    width="500"
-    :before-close="handleClose"
-  >
-    <el-table :data="tableFieldsList?.from || []"
-              row-key="name"
-              @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" />
-      <el-table-column property="name" label="id" width="150" />
-      <el-table-column property="aliasName" label="名称" width="200" />
-      <el-table-column property="type" label="类型" />
-    </el-table>
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button @click="cancel">取消</el-button>
-        <el-button type="primary" @click="confirm">
-          确认
-        </el-button>
-      </div>
-    </template>
-  </el-dialog>
 </template>
 
 <script>
@@ -76,14 +51,6 @@ import nodeDatas from '../nodesData/index.js'
 export default {
   name: "BasicSettings",
   props: {
-    nodeData: { 
-      type: Object, 
-      default: () => { } 
-    },
-    tableFieldsList: { 
-      type: Object, 
-      default: () => { } 
-    },
     modelValue: {
       type: Object,
       default: () => ({}),
@@ -92,40 +59,14 @@ export default {
       type: Object,
       default: () => ({}),
     },
+    soltList: { type: Array, default: () => { return [] } },
   },
   data() {
     return {
       ...nodeDatas,
       dataForm: {},
-      dialogVisible:false,
-      multipleSelection:[]
     };
   },
-  methods:{
-    changedFieldValue(val){
-      this.$emit('changedFieldValue',val)
-    },
-    openFieldChoice(){
-      this.dialogVisible = true
-    },
-    handleSelectionChange(val){
-      this.multipleSelection = val
-    },
-    cancel(){
-      this.dialogVisible = false
-      this.multipleSelection = this.dataForm.cols.split(',')
-    },
-    confirm(){
-      this.dialogVisible = false
-      if(!this.dataForm.cols)this.dataForm.cols = ''
-      const idsInMultipleSelection = []
-      this.multipleSelection.map(it=>{
-        idsInMultipleSelection.push(it.name)
-      })
-      this.dataForm.cols = `${this.dataForm.cols}${this.dataForm.cols===''?'':','}${[...new Set(idsInMultipleSelection)].join(',')}`
-      this.dataForm.cols = [...new Set(this.dataForm.cols.split(','))].join(',')
-    }
-  },
   watch: {
     modelValue: {
       handler(val) {

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

@@ -4,22 +4,13 @@
              direction="rtl"
              :append-to-body="true"
              :size="600"
-             :before-close="close"
-            >
+             :before-close="close">
     <div v-if="isShow"
          class="drawer-form">
       <el-collapse v-model="activeName"
                    accordion>
         <el-collapse-item title="基础信息"
                           name="basicInfo">
-          <!-- 基础信息 -->
-           <basicSettings ref="dataFormRef"
-                           v-model="dataForm.properties.data"
-                           :config="basicConfig" 
-                           @changedFieldValue="changedFieldValue"/>
-        </el-collapse-item>
-        <el-collapse-item title="节点信息"
-                          name="nodeInfo">
           <!-- 说明：
                     此处如果对应的节点没有特别的处理直接使用 basicSettings 就可
                     如果这个节点有特别的操作 请自定义节点组件 以防默认组件过于庞大-->
@@ -45,14 +36,19 @@
           <template v-else>
             <basicSettings ref="dataFormRef"
                            v-model="dataForm.properties.data"
-                           :config="config" 
-                           :nodeData="nodeData"
-                           :tableFieldsList="tableFieldsList"
-                           @changedFieldValue="changedFieldValue"/>
+                           :soltList="soltList"
+                           :config="config">
+              <template v-slot:[soltName]="{itemCur, formCur}"
+                        v-for="soltName in soltList">
+                <slot :name="soltName"
+                      :itemCur="itemCur"
+                      :formCur="formCur"></slot>
+              </template>
+
+            </basicSettings>
           </template>
 
         </el-collapse-item>
-       
         <el-collapse-item title="样式设置"
                           name="styleSettings">
           <!-- 基础设置 -->
@@ -65,6 +61,7 @@
         </el-collapse-item>
       </el-collapse>
     </div>
+
     <template #footer>
       <el-button @click="close">取 消</el-button>
       <el-button type="primary"
@@ -94,12 +91,12 @@ export default {
   props: {
     nodeData: { type: Object, default: () => { } },
     nodesDataConfig: { type: Object, default: () => { } },
-    tableFieldsList: { type: Object, default: () => { } },
     lf: {
       type: Object,
       default: () => { }
     },
-    drawerShow: { type: Boolean, default: false }
+    drawerShow: { type: Boolean, default: false },
+    soltList: { type: Array, default: () => { return [] } },
   },
   watch: {
     drawerShow: {
@@ -123,8 +120,7 @@ export default {
           style: {},
         }
       },
-      isShow: false,
-     
+      isShow: false
     }
   },
   computed: {
@@ -238,183 +234,7 @@ export default {
 
       // 取出对应节点的表单配置
       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;
-    },
-    basicConfig() {
-
-      /**
-       * 深度合并两个对象
-       * @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
-          },
-          {
-            label: '节点并行度',
-            name: 'para',
-            value: '',
-            component: 'number',
-            options: {
-              placeholder: '请输入节点并行度'
-            },
-            span: 24
-          },
-          {
-            label: '节点标签',
-            name: 'tags',
-            value: '',
-            component: 'tags',
-            // options: {
-            //   placeholder: '请输入节点标签'
-            // },
-            span: 24
-          },
-        
-          {
-            label: '描述信息',
-            name: 'desp',
-            value: '',
-            component: 'input',
-            options: {
-              placeholder: '请输入描述信息'
-            },
-            span: 24
-          },
-        ]
-      }
-
-      // 注意：基础数据以 nodeDatas 为主，节点配置（nodesDataConfig）覆盖其中的对应字段
-      let nodeDatasMerge = deepMerge(
-        nodeDatas,
-        this.nodesDataConfig
-      );
-
-      // 取出对应节点的表单配置
-      let nodeConfig = nodeDatasMerge?.basicNode?.formConfig || {};
       // 深拷贝，避免直接修改全局配置
       nodeConfig = JSON.parse(JSON.stringify(nodeConfig));
 
@@ -450,13 +270,10 @@ export default {
         config.formItems = nodeConfig.formItems;
       }
       return config;
-    },
+    }
 
   },
   methods: {
-    changedFieldValue(val){
-      this.$emit('changedFieldValue',val)
-    },
     async onSubmit() {
       await this.$refs.dataFormRef.$refs.dataFormRef.validate();
       const { id } = this.dataForm

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

@@ -1,7 +1,7 @@
 <template>
   <lw-form-mini ref="dataFormRef"
-           :config="config"
-           v-model="dataForm">
+                :config="config"
+                v-model="dataForm">
     <template #fontStyle>
       <el-button size="small"
                  :type="dataForm.fontWeight  === 'bold'? 'primary' : ''"
@@ -68,7 +68,7 @@ export default {
       return {
         labelWidth: '70px',
         labelPosition: 'right',
-        size: 'medium',
+        size: 'default',
         formItems: [
           {
             label: '背景色',

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

@@ -3,6 +3,60 @@
  */
 
 export default {
+	// 表单内容
+	formConfig: {
+		labelWidth: '70px',
+		labelPosition: 'top',
+		formItems: [
+			{
+				label: '节点名称',
+				name: 'name',
+				value: '',
+				component: 'input',
+				options: {
+					placeholder: '请输入节点名称'
+				},
+				span: 24
+			},
+			{
+				label: '节点并行度',
+				name: 'para',
+				value: '',
+				component: 'number',
+				options: {
+					placeholder: '请输入节点并行度'
+				},
+				span: 24
+			},
+			{
+				label: '节点标签',
+				name: 'tags',
+				value: '',
+				component: 'tags',
+				span: 24
+			},
+			{
+				label: '描述信息',
+				name: 'desp',
+				value: '',
+				component: 'input',
+				options: {
+					placeholder: '请输入描述信息'
+				},
+				span: 24
+			},
+			{
+				label: '输出名称',
+				name: 'into',
+				value: '',
+				component: 'select',
+				options: {
+					placeholder: '请选择输出名称'
+				},
+				span: 24
+			}
+		]
+	},
 	// 数据来源
 	configKeyableSource: {
 		treeProps: {
@@ -66,14 +120,13 @@ export default {
 			}
 		]
 	},
-  // 映射动作
+	// 映射动作
 	configMapAction: {
 		treeProps: {
 			children: 'fields'
 		},
 		rowKey: 'id',
 		formItems: [
-
 			{
 				label: '来源字段',
 				name: 'from',

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

@@ -23,6 +23,23 @@ export default {
 				span: 24,
 				rules: [{ required: true, message: '不能为空', trigger: 'blur' }]
 			},
+      {
+				label: '节点并行度',
+				name: 'para',
+				value: '',
+				component: 'number',
+				options: {
+					placeholder: '请输入节点并行度'
+				},
+				span: 24
+			},
+			{
+				label: '节点标签',
+				name: 'tags',
+				value: '',
+				component: 'tags',
+				span: 24
+			},
 			{
 				label: '连接模式',
 				name: 'mode',

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

@@ -26,6 +26,33 @@ export default {
 		labelWidth: '70px',
 		labelPosition: 'top',
 		formItems: [
+      {
+				label: '节点名称',
+				name: 'name',
+				value: '',
+				component: 'input',
+				options: {
+					placeholder: '请输入节点名称'
+				},
+				span: 24
+			},
+			{
+				label: '节点并行度',
+				name: 'para',
+				value: '',
+				component: 'number',
+				options: {
+					placeholder: '请输入节点并行度'
+				},
+				span: 24
+			},
+			{
+				label: '节点标签',
+				name: 'tags',
+				value: '',
+				component: 'tags',
+				span: 24
+			},
 			{
 				label: '运行模式',
 				name: 'mode',
@@ -100,6 +127,16 @@ export default {
 				},
 				span: 24,
 			},
+      {
+				label: '输出名称',
+				name: 'into',
+				value: '',
+				component: 'select',
+				options: {
+					placeholder: '请选择输出名称'
+				},
+				span: 24
+			}
 		]
 	}
 }