lw-cdp-ui 1.2.43 → 1.2.44

package/dist/components/lwFlow/index.vue

@@ -21,7 +21,9 @@
                 :drawerShow="drawerShow"
                 :nodeData="clickNode"
                 :nodesDataConfig="nodesDataConfig"
-                @onClose="nodeEditClose" />
+                :tableFieldsList="tableFieldsList"
+                @onClose="nodeEditClose" 
+                @changedFieldValue="changedFieldValue"/>
     </template>
 
   </div>
@@ -142,6 +144,11 @@ export default {
       type: Object,
       default: {}
     },
+    // 用于接受更改数据表后，对应的表字段信息，此值属于定制化设置所需字段时使用
+    tableFieldsList:{
+      type: Object,
+      default: {}
+    },
     /**
      * apiNodes - 接口返回的节点数组，用于与内容节点合并。
      * @type {Array<Object>}
@@ -617,9 +624,14 @@ export default {
         }
       }
       return Object.keys(errorNodes).length === 0;
-    }
+    },
 
+    changedFieldValue(val){
+      this.$emit('changedFieldValue',val)
+    }
   },
+
+ 
 }
 </script>
 

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

@@ -1,7 +1,8 @@
 <template>
   <lw-form-mini ref="dataFormRef"
                 :config="config"
-                v-model="dataForm">
+                v-model="dataForm"
+                @changedFieldValue="changedFieldValue">
     <!-- 定时器 表单自定义部分 -->
     <template #dateCron>
       <lwCronSelect v-model="dataForm.cron" />
@@ -34,9 +35,40 @@
         </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>
     <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>
@@ -44,6 +76,14 @@ import nodeDatas from '../nodesData/index.js'
 export default {
   name: "BasicSettings",
   props: {
+    nodeData: { 
+      type: Object, 
+      default: () => { } 
+    },
+    tableFieldsList: { 
+      type: Object, 
+      default: () => { } 
+    },
     modelValue: {
       type: Object,
       default: () => ({}),
@@ -57,8 +97,35 @@ export default {
     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,13 +4,22 @@
              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 就可
                     如果这个节点有特别的操作 请自定义节点组件 以防默认组件过于庞大-->
@@ -36,10 +45,14 @@
           <template v-else>
             <basicSettings ref="dataFormRef"
                            v-model="dataForm.properties.data"
-                           :config="config" />
+                           :config="config" 
+                           :nodeData="nodeData"
+                           :tableFieldsList="tableFieldsList"
+                           @changedFieldValue="changedFieldValue"/>
           </template>
 
         </el-collapse-item>
+       
         <el-collapse-item title="样式设置"
                           name="styleSettings">
           <!-- 基础设置 -->
@@ -81,6 +94,7 @@ export default {
   props: {
     nodeData: { type: Object, default: () => { } },
     nodesDataConfig: { type: Object, default: () => { } },
+    tableFieldsList: { type: Object, default: () => { } },
     lf: {
       type: Object,
       default: () => { }
@@ -109,7 +123,8 @@ export default {
           style: {},
         }
       },
-      isShow: false
+      isShow: false,
+     
     }
   },
   computed: {
@@ -258,10 +273,190 @@ export default {
         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));
+
+      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: {
+    changedFieldValue(val){
+      this.$emit('changedFieldValue',val)
+    },
     async onSubmit() {
       await this.$refs.dataFormRef.$refs.dataFormRef.validate();
       const { id } = this.dataForm

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

@@ -0,0 +1,82 @@
+/**
+ * ET2L数据读取源节点 SOURCE 配置数据
+ */
+
+export default {
+	// 暂无显示需求
+	nodeHtml: [],
+	// 目标节点校验
+	targetRules: [
+		{
+			message: '目标节点只允许一个上级连接',
+			validate: (sourceNode, targetNode, sourceAnchor, targetAnchor) => {
+				let { edges } = targetNode.graphModel
+				let { id } = targetNode
+
+				let number = [...edges].filter((item) => {
+					let { targetNodeId } = { ...item }
+					return targetNodeId == id
+				})
+				return number.length < 1
+			}
+		}
+	],
+	// 表单内容
+  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',
+        // options: {
+        //   placeholder: '请输入节点标签'
+        // },
+        span: 24
+      },
+    
+      {
+        label: '描述信息',
+        name: 'desp',
+        value: '',
+        component: 'input',
+        options: {
+          placeholder: '请输入描述信息'
+        },
+        span: 24
+      },
+      {
+        label: '输出名称',
+        name: 'into',
+        value: '',
+        component: 'select',
+        options: {
+          placeholder: '请选择输出名称'
+        },
+        span: 24
+      }
+    ]
+  }
+}

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

@@ -26,17 +26,6 @@ export default {
 		labelWidth: '70px',
 		labelPosition: 'top',
 		formItems: [
-			{
-				label: '节点名称',
-				name: 'name',
-				value: '',
-				component: 'input',
-				options: {
-					placeholder: '请输入节点名称'
-				},
-				span: 24,
-				rules: [{ required: true, message: '不能为空', trigger: 'blur' }]
-			},
 			{
 				label: '运行模式',
 				name: 'mode',
@@ -64,65 +53,6 @@ export default {
 					]
 				}
 			},
-			{
-				label: '数据表名',
-				name: 'from',
-				value: '',
-				component: 'input',
-				options: {
-					placeholder: '请输入数据表名'
-				},
-				tips: '非SQL模式必须填写',
-				span: 24,
-				hideHandle: '$.mode == "sql"',
-				rules: [{ required: true, message: '不能为空', trigger: 'blur' }]
-			},
-			{
-				label: '数据表名',
-				name: 'from',
-				value: '',
-				component: 'input',
-				options: {
-					placeholder: '请输入数据表名'
-				},
-				tips: '非SQL模式必须填写',
-				span: 24,
-				hideHandle: '$.mode != "sql"'
-			},
-			{
-				label: '所需字段',
-				name: 'cols',
-				value: '',
-				component: 'input',
-				options: {
-					placeholder: '请输入所需字段'
-				},
-				tips: '多个字段采用逗号分隔，为空时选取所有字段，支持AS关键字。',
-				span: 24
-			},
-			{
-				label: '关联字段',
-				name: 'with',
-				value: '',
-				component: 'input',
-				options: {
-					placeholder: '请输入关联字段'
-				},
-				span: 24,
-				hideHandle: '$.mode != "expand" && $.mode != "collap"',
-				rules: [{ required: true, message: '不能为空', trigger: 'blur' }]
-			},
-			{
-				label: '关联字段',
-				name: 'with',
-				value: '',
-				component: 'input',
-				options: {
-					placeholder: '请输入关联字段'
-				},
-				span: 24,
-				hideHandle: '$.mode == "expand" || $.mode == "collap"'
-			},
 			{
 				label: '折叠排序方式',
 				name: 'sort',
@@ -157,27 +87,19 @@ export default {
 				span: 24
 			},
 			{
-				label: '输出名称',
-				name: 'into',
+				label: '数据表名来源',
+				name: 'fromNameSource',
 				value: '',
-				component: 'input',
+				component: 'select',
 				options: {
-					placeholder: '请输入输出名称'
+					placeholder: '请输选择数据表名来源',
+					items:[
+						{value:'hive',label:'hive'},
+						{value:'lake',label:'lake'},
+					]
 				},
 				span: 24,
-				rules: [{ required: true, message: '不能为空', trigger: 'blur' }]
 			},
-			{
-				label: '描述信息',
-				name: 'desp',
-				value: '',
-				component: 'input',
-				options: {
-					type: 'textarea',
-					placeholder: '请输入'
-				},
-				span: 24
-			}
 		]
 	}
 }

package/dist/components/lwFlow/nodesData/index.js

@@ -23,6 +23,7 @@ import timer from './datas/timer'
 import audience_receive from './datas/audienceReceive'
 import event_receive from './datas/eventReceive'
 import sms from './datas/sms'
+import basicNode from './datas/basicNode'
 
 export default {
 	base,
@@ -37,5 +38,6 @@ export default {
 	timer,
 	audience_receive,
 	event_receive,
-	sms
+	sms,
+	basicNode
 }

package/dist/components/lwFormMini/FormItem.vue

@@ -103,6 +103,7 @@
                  :collapse-tags-tooltip="item?.options?.collapseTagsTooltip"
                  :disabled="item?.options.disabled"
                  filterable
+                 @change="handlerSelectChange(item,objItem.value)"
                  style="width: 100%;">
         <el-option v-for="option in item?.options.items"
                    :key="option.value"
@@ -290,6 +291,16 @@ export default {
     },
   },
   methods: {
+    handlerSelectChange(item,val){
+      const res = {
+        changeField:item.name,
+        changeLabel:item.label,
+        changeValue:item.value,
+      }
+
+      this.$emit("changedFieldValue", res)
+
+    },
     flattenObject(obj, key, defaultValue = '') {
       if (!key || !obj) { return false }
       const keys = key.split('.');  // 将路径拆分成数组

package/dist/components/lwFormMini/index.vue

@@ -55,7 +55,8 @@
           <FormItem v-else
                     :item="item"
                     :form="form"
-                    :index="index">
+                    :index="index"
+                    @changedFieldValue="changedFieldValue">
             <!-- 没有组件是component值 就是插槽名称 -->
             <template v-if="!['input', 'upload', 'checkbox', 'checkboxGroup', 'switch', 'select', 'treeSelect', 'cascader', 'date', 'number', 'radio', 'color', 'rate', 'slider','tags', 'divider'].includes(item.component)"
                       v-slot:[item.component]>
@@ -329,6 +330,9 @@ export default {
       titleNameDividers.forEach(divider => {
         observer.observe(divider);
       });
+    },
+    changedFieldValue(val){
+      this.$emit("changedFieldValue", val)
     }
   }
 }

package/dist/components/lwLayout/components/tags.vue

@@ -291,6 +291,7 @@ export default {
     //横向滚动
     scrollInit() {
       const scrollDiv = document.querySelector('.context-menu-list')
+      if (!scrollDiv) { return false }
       scrollDiv.addEventListener('mousewheel', handler, false) || scrollDiv.addEventListener("DOMMouseScroll", handler, false)
       function handler(event) {
         const detail = event.wheelDelta || event.detail;

package/dist/components/lwUpload/index.vue

@@ -364,6 +364,7 @@ export default {
       for (const key in param.data) {
         data.append(key, param.data[key]);
       }
+      console.log(apiObj)
       apiObj(data, {
         onUploadProgress: e => {
           this.file.percentage = parseInt(((e.loaded / e.total) * 100) | 0, 10)