lw-cdp-ui 1.1.59 → 1.1.61

package/dist/components/lwFlow/index.vue

@@ -31,7 +31,7 @@
 import LogicFlow from '@logicflow/core'
 import '@logicflow/core/dist/index.css';
 import { Menu, MiniMap } from "@logicflow/extension";
-import { dagre } from '@logicflow/layout';
+import { Dagre } from '@logicflow/layout';
 import '@logicflow/extension/lib/style/index.css';
 
 // 注册组件
@@ -84,7 +84,7 @@ export default {
       }
     },
     /**
-     * 节点数据 在没有完整modelValue 用以自动创建节点
+     * 节点数据 在没有 modelValue时 用以自动创建节点  默认使用modelValue
      */
     nodes: {
       type: Array,
@@ -274,7 +274,7 @@ export default {
       this.logicFlow = new LogicFlow({
         container: this.$refs.container,
         // 注册组件
-        plugins: [Menu, MiniMap, dagre],
+        plugins: [Menu, MiniMap, Dagre],
         // 不可编辑
         isSilentMode: this.isView,
         hoverOutline: !this.isView,
@@ -284,7 +284,7 @@ export default {
       })
       this.initMenu()
       await this.initNode()
-      if (!this.modelValue) {
+      if (this.modelValue && this.modelValue.length > 0) {
         this.logicFlow.render(this.modelValue)
       } else {
         // 根据节点数据初始化节点
@@ -339,17 +339,24 @@ export default {
 
       // 创建边
       this.nodes.forEach(item => {
-        const sourceKey = item.from;
+        let sourceKeys = Array.isArray(item.from)
+          ? item.from.map(subItem => subItem.name)  // 如果是数组，提取每个 name
+          : [item.from];  // 如果是字符串，直接作为 sourceKey
+
         const targetKey = item.into;
-        if (nodeMap[sourceKey] && nodeMap[targetKey]) {
-          edges.push(generateEdge(nodeMap[sourceKey], nodeMap[targetKey]));
-        }
+
+        sourceKeys.forEach(sourceKey => {
+          if (nodeMap[sourceKey] && nodeMap[targetKey]) {
+            edges.push(generateEdge(nodeMap[sourceKey], nodeMap[targetKey]));
+          }
+        });
       });
 
       this.logicFlow.renderRawData({
         nodes,
         edges
       })
+
       this.logicFlow.extension.dagre.layout()
 
     },

package/dist/components/lwFormMini/index.vue

@@ -1,6 +1,6 @@
 <template>
   <el-affix v-if="showMenu"
-            :offset="100">
+            :offset="100" style="width: 100%; height: 45px;">
     <ul class="affix-body">
       <template v-for="(item, index) in config.formItems"
                 :key="index">
@@ -154,6 +154,7 @@
                            style="width: 100%;"
                            :props="item?.options?.props"
                            :separator="item?.options?.separator"
+                           :disabled="item?.options?.disabled"
                            :options="item?.options.items"
                            clearable></el-cascader>
             </template>