lw-cdp-ui 1.2.53 → 1.2.55

package/dist/components/lwFlow/config/nodesList.js

@@ -55,6 +55,12 @@ export default [
 				icon: 'icon-folder',
 				type: 'folder',
 				themeColor: '#FB9702'
+			},
+			{
+				name: 'UNIONS',
+				icon: 'icon-intelligent',
+				type: 'unions',
+				themeColor: '#0089ff'
 			}
 		]
 	},

package/dist/components/lwFlow/index.vue

@@ -307,14 +307,13 @@ export default {
       await this.initNode()
       if (this.modelValue && this.modelValue?.nodes?.length > 0) {
         this.logicFlow.render(this.modelValue)
+        this.translateCenter()
       } else {
         // 根据节点数据初始化节点
         this.initNodeData()
       }
 
       this.bindEvent()
-      // 内容移动到中心
-      this.logicFlow.translateCenter()
     },
     /**
      * 根据node 初始化数据
@@ -366,7 +365,7 @@ export default {
           return false
         }
         let sourceKeys = Array.isArray(item.from)
-          ? item.from.map(subItem => subItem.name)  // 如果是数组，提取每个 name
+          ? item.from.map(subItem => subItem?.name || subItem)  // 如果是数组，提取每个 name
           : [item.from];  // 如果是字符串，直接作为 sourceKey
 
         const targetKey = item.into;
@@ -377,16 +376,14 @@ export default {
         });
       });
 
-      this.logicFlow.renderRawData({
-        nodes,
-        edges
-      })
+      this.logicFlow.renderRawData({ nodes, edges })
 
       this.logicFlow.extension.dagre.layout({
         nodesep: 60,
         ranksep: 140,
       })
 
+      this.translateCenter()
     },
     /**
      * 初始化右键菜单
@@ -623,12 +620,12 @@ export default {
 
       // 获取当前数据 合并到上级
       let data = this.logicFlow.getGraphData()
+      data.nodes = data.nodes.map(x => x.properties.data)
       nodes.forEach((x) => {
         if (x.id === item.id) {
           x.properties.data = {
             ...x.properties.data,
-            nodes: data.nodes,
-            edges: data.edges
+            nodes: data.nodes
           }
         }
       })
@@ -643,9 +640,17 @@ export default {
         ranksep: 140,
       })
 
+      this.translateCenter()
+
       // 删除最后一级
       this.menuList.pop();
     },
+    // 内容移动到中心
+    translateCenter() {
+      this.logicFlow.resetZoom()
+      this.logicFlow.resetTranslate()
+      this.logicFlow.translateCenter()
+    },
     /**
      * 改变连线时处理上下级节点数据
      * 本扩展暂无使用 本意是直接提供接口说要的数据结构

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

@@ -234,7 +234,7 @@ export default {
 
       // 取出对应节点的表单配置
       let nodeConfig = nodeDatasMerge[this.nodeData.type]?.formConfig || {};
-
+      
       // 深拷贝，避免直接修改全局配置
       nodeConfig = JSON.parse(JSON.stringify(nodeConfig));
 
@@ -269,6 +269,7 @@ export default {
       if (nodeConfig?.formItems) {
         config.formItems = nodeConfig.formItems;
       }
+      
       return config;
     }
 

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

@@ -0,0 +1,39 @@
+/**
+ * ET2L数据合并节点 FOLDER 配置数据
+ */
+
+export default {
+	// 暂无显示需求
+	nodeHtml: [],
+	// 目标节点校验
+	targetRules: [],
+	// 表单内容
+	formConfig: {
+		labelWidth: '70px',
+		labelPosition: 'top',
+		formItems: [
+			{
+				label: '节点名称',
+				name: 'name',
+				value: '',
+				component: 'input',
+				options: {
+					placeholder: '请输入节点名称'
+				},
+				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/datas/{floder.js → unions.js}

@@ -1,5 +1,5 @@
 /**
- * ET2L数据合并节点 FLODER 配置数据
+ * ET2L数据合并节点 UNIONS 配置数据
  */
 
 export default {
@@ -23,49 +23,11 @@ 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',
-				value: '',
-				component: 'input',
-				span: 24,
-				options: {
-					placeholder: '请输入连接模式'
-				}
-			},
 			{
 				label: '数据来源',
 				name: 'from',
 				value: [],
-				component: 'KeyableSource',
-				span: 24,
-				rules: [{ required: true, message: '不能为空', trigger: 'change' }]
-			},
-			{
-				label: '映射动作',
-				name: 'with',
-				value: [],
-				component: 'MapAction',
-				options: {
-					placeholder: '请选择映射动作'
-				},
+				component: 'tags',
 				span: 24,
 				rules: [{ required: true, message: '不能为空', trigger: 'change' }]
 			},

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

@@ -19,7 +19,8 @@ import mapper from './datas/mapper'
 import reduce from './datas/reduce'
 import source from './datas/source'
 import target from './datas/target'
-import floder from './datas/floder'
+import folder from './datas/folder'
+import unions from './datas/unions'
 import timer from './datas/timer'
 import audience_receive from './datas/audienceReceive'
 import event_receive from './datas/eventReceive'
@@ -35,7 +36,8 @@ export default {
 	reduce,
 	source,
 	target,
-	floder,
+	folder,
+	unions,
 	timer,
 	audience_receive,
 	event_receive,

package/dist/components/lwFormMini/FormItem.vue

@@ -151,6 +151,7 @@
                       :disabled="item?.options?.disabled"
                       :value-format="item?.options?.valueFormat"
                       :format="item?.options?.format"
+                      :disabledDate="item?.options?.disabledDate"
                       :placeholder="item?.options?.placeholder || '请选择'"></el-date-picker>
     </template>
     <!-- number -->

package/dist/components/lwTable/components/TableColumn.vue

@@ -207,6 +207,19 @@ export default {
         }) || []
       )
     },
+    /**
+     * 检查权限
+     */
+    checkAuth(auth) {
+      const { menus = [], authorities = [] } = JSON.parse(localStorage.getItem('userAuthInfo') || '{}')
+      const allPermissions = [...menus, ...authorities]
+
+      if (!auth) return true
+      if (Array.isArray(auth)) {
+        return auth.some((permission) => allPermissions.includes(permission))
+      }
+      return allPermissions.includes(auth)
+    },
   }
 }
 </script>

package/dist/components/lwTable/index.js

@@ -47,7 +47,7 @@ export default {
 
 	data() {
 		return {
-      empty,
+			empty,
 			// 表格基础状态
 			tableHeaders: [], // 表格列配置
 			localTableSize: this.tableSize, // 表格大小
@@ -244,20 +244,6 @@ export default {
 				this.isFullscreen = false
 			}
 		},
-
-		/**
-		 * 检查权限
-		 */
-		checkAuth(auth) {
-			const { menus = [], authorities = [] } = JSON.parse(localStorage.getItem('userAuthInfo') || '{}')
-			const allPermissions = [...menus, ...authorities]
-
-			if (!auth) return true
-			if (Array.isArray(auth)) {
-				return auth.some((permission) => allPermissions.includes(permission))
-			}
-			return allPermissions.includes(auth)
-		},
 		// 拖动选中
 		onSelect({ selected }) {
 			let list = []
@@ -271,6 +257,12 @@ export default {
 				}
 			})
 			this.$emit('multipleSelection', list)
+		},
+		toggleRowSelection(row, selected) {
+			if (!this.isCard) {
+				this.$refs.multipleTable.toggleRowSelection(row, selected)
+			} else {
+			}
 		}
 	}
 }

package/dist/components/lwTableSelect/index.vue

@@ -83,8 +83,11 @@ export default {
       keyword: null,
       defaultValue: [],
       tableData: [],
+      isLock: false,
+      listIds: [],
       pageSize: config.pageSize,
       total: 0,
+      idExpression: '',
       currentPage: 1,
       defaultProps: {
         label: config.props.label,
@@ -101,10 +104,13 @@ export default {
   },
   watch: {
     modelValue: {
-      handler() {
+      handler(val) {
         this.defaultValue = this.modelValue
+
+        this.initValue()
       },
-      deep: true
+      deep: true,
+      immediate: true
     }
   },
   mounted() {
@@ -122,11 +128,11 @@ export default {
       }
     },
     //获取表格数据
-    async getData() {
+    async getData(pageSize = this.pageSize) {
       this.loading = true;
       var reqData = {
         [this.defaultProps.page]: this.currentPage - 1,
-        [this.defaultProps.pageSize]: this.pageSize,
+        [this.defaultProps.pageSize]: pageSize,
         [this.defaultProps.keyword]: this.keyword
       }
       let expression = this.$expression(this.formData)
@@ -139,6 +145,11 @@ export default {
       } else {
         this.formData.expression = ''
       }
+
+      if (this.idExpression) {
+        this.formData.expression = this.formData.expression ? `${this.formData.expression} AND ${this.idExpression}` : this.idExpression
+      }
+
       Object.assign(reqData, this.params, this.formData)
 
       var res = await this.apiObj(reqData);
@@ -146,21 +157,36 @@ export default {
       this.tableData = parseData.rows;
       this.total = parseData.total;
       this.loading = false;
-      //表格默认赋值
-      this.$nextTick(() => {
+      //表格默认赋值 10000的时候是回显数据
+      if (pageSize != 10000) {
+        this.$nextTick(() => {
+          if (this.multiple) {
+            this.defaultValue.forEach(row => {
+              var setrow = this.tableData.filter(item => item[this.defaultProps.value] === row['value'])
+              if (setrow.length > 0) {
+                this.$refs.table.toggleRowSelection(setrow[0], true);
+              }
+            })
+          } else {
+            var setrow = this.tableData.filter(item => item[this.defaultProps.value] === this.defaultValue?.value)
+            this.$refs.table.setCurrentRow(setrow[0]);
+          }
+          this.$refs.table.setScrollTop(0)
+        })
+      } else {
+        let setrow = this.tableData.filter(item => this.listIds.includes(item[this.defaultProps.value]))
+
         if (this.multiple) {
-          this.defaultValue.forEach(row => {
-            var setrow = this.tableData.filter(item => item[this.defaultProps.value] === row['value'])
-            if (setrow.length > 0) {
-              this.$refs.table.toggleRowSelection(setrow[0], true);
-            }
-          })
+          this.defaultValue = setrow.map(item => this.getCurVlaue(item))
         } else {
-          var setrow = this.tableData.filter(item => item[this.defaultProps.value] === this.defaultValue?.value)
-          this.$refs.table.setCurrentRow(setrow[0]);
+          this.defaultValue = setrow.map(item => this.getCurVlaue(item))[0]
         }
-        this.$refs.table.setScrollTop(0)
-      })
+        if (setrow.length > 0) {
+          this.lock()
+        }
+        this.idExpression = ''
+      }
+
     },
     //插糟表单提交
     formSubmit() {
@@ -193,7 +219,7 @@ export default {
       } else {
         this.defaultValue.splice(this.defaultValue.findIndex(item => item['value'] == row[this.defaultProps.value]), 1)
       }
-
+      this.lock()
     },
     //表格全选事件
     selectAll(rows) {
@@ -209,8 +235,7 @@ export default {
       } else {
         this.defaultValue = []
       }
-      this.$emit('update:modelValue', this.defaultValue);
-      this.$emit('change', this.defaultValue);
+      this.lock()
     },
     click(row) {
       if (this.multiple) {
@@ -218,19 +243,54 @@ export default {
       } else {
         this.defaultValue = this.getCurVlaue(row)
         this.$refs.select.blur()
-        this.$emit('update:modelValue', this.defaultValue);
-        this.$emit('change', this.defaultValue);
+        this.lock()
       }
     },
     //tags删除后回调
     removeTag(tag) {
       var row = this.findRowByKey(tag.value)
       this.$refs.table.toggleRowSelection(row, false);
-      this.$emit('update:modelValue', this.defaultValue);
+      this.lock()
     },
     //清空后的回调
     clear() {
+      this.lock()
+    },
+    // 数据修改锁定
+    lock() {
+      this.isLock = true
+      setTimeout(() => {
+        this.isLock = false
+      }, 1000)
       this.$emit('update:modelValue', this.defaultValue);
+      this.$emit('change', this.defaultValue);
+    },
+    // 初始化回显
+    initValue(val = this.modelValue) {
+      if (val && !this.isLock) {
+        this.defaultProps = Object.assign(this.defaultProps, this.props);
+        // 自动判断类型回显
+        let list = []
+        if (typeof val === 'string') {
+          list.push(val)
+        } else if (Array.isArray(val)) {
+          val.forEach(item => {
+            console.log(item)
+            if (typeof item === 'string' && item) {
+              list.push(item)
+            } else if (typeof item === 'object' && item) {
+              list.push(item[this.defaultProps.value])
+            }
+          })
+        } else if (typeof val === 'object') {
+          list.push(val[this.defaultProps.value])
+        }
+
+        this.listIds = list
+        this.idExpression = this.$expression({ [`${this.defaultProps.value}_in`]: list })
+
+        this.getData(10000)
+      }
     },
     // 关键值查询表格数据行
     findRowByKey(value) {