浏览代码

fixed: 修改节点逻辑修改后带来的bug

liuyang 2 年之前
父节点
当前提交
a9fc9d6774

+ 10 - 7
src/views/_components/RightPanel.vue

@ -24,25 +24,28 @@ import { ref, computed, onMounted, getCurrentInstance } from 'vue';
24 24
// 动态panel
25 25
import PanelGlobal from './panel/PanelGlobal.vue';
26 26
// 全局节点
27
// 逻辑控制节点
28
// 数据处理
27 29
// import PanelStart from './panel/PanelStart.vue';
28 30
// import PanelEnd from './panel/PanelEnd.vue';
29
import PanelStart from './right-panel/PanelStart.vue';
30
import PanelEnd from './right-panel/PanelEnd.vue';
31
// 逻辑控制节点
32 31
// import PanelSql from './panel/PanelSql.vue';
33 32
// import PanelExpression from './panel/PanelExpression.vue';
34 33
// import PanelBranch from './panel/PanelBranch.vue';
35 34
// import PanelSubFlow from './panel/PanelSubFlow.vue';
35
// import PanelForeach from './panel/PanelForeach.vue';
36
// import PanelFunction from './panel/PanelFunction.vue';
37
// import PanelDataAggregation from './panel/PanelDataAggregation.vue';
38
// import PanelHttp from './panel/PanelHttp.vue';
36 39
40
// 全局节点
41
import PanelStart from './right-panel/PanelStart.vue';
42
import PanelEnd from './right-panel/PanelEnd.vue';
43
// 逻辑控制节点
37 44
import PanelSql from './right-panel/PanelSql.vue';
38 45
import PanelExpression from './right-panel/PanelExpression.vue';
39 46
import PanelBranch from './right-panel/PanelBranch.vue';
40 47
import PanelSubFlow from './right-panel/PanelSubFlow.vue';
41 48
// 数据处理
42
// import PanelForeach from './panel/PanelForeach.vue';
43
// import PanelFunction from './panel/PanelFunction.vue';
44
// import PanelDataAggregation from './panel/PanelDataAggregation.vue';
45
// import PanelHttp from './panel/PanelHttp.vue';
46 49
import PanelForeach from './right-panel/PanelForeach.vue';
47 50
import PanelFunction from './right-panel/PanelFunction.vue';
48 51
import PanelDataAggregation from './right-panel/PanelDataAggregation.vue';

+ 3 - 7
src/views/_components/_flow/Index.vue

@ -152,7 +152,7 @@ function initGraph() {
152 152
          tartgetPorts.filter((el) => el.id === targetPort)?.[0].group ===
153 153
          'output'
154 154
        ) {
155
          proxy.$message.error('不能连接输出节点!');
155
          // proxy.$message.error('不能连接输出节点!');
156 156
          return false;
157 157
        }
158 158
        return true;
@ -312,11 +312,7 @@ const dragEndNode = (target, e) => {
312 312
};
313 313
// 输入输出节点
314 314
const dragInputNode = (target, e) => {
315
  if (
316
    target.type === 'logic' ||
317
    target.type === 'data-processing' ||
318
    target.type === 'route'
319
  ) {
315
  if (target.type === 'logic' || target.type === 'data-processing') {
320 316
    const node = new CreateNodeClass(
321 317
      'flow-input-node',
322 318
      graph.value,
@ -328,7 +324,7 @@ const dragInputNode = (target, e) => {
328 324
329 325
// 分支节点
330 326
const dragBranchNode = (target, e) => {
331
  if (target.id === 'branch') {
327
  if (target.type === 'branch') {
332 328
    const node = new CreateNodeClass(
333 329
      'flow-route-node',
334 330
      graph.value,

+ 7 - 6
src/views/_components/panel/common/AddItem.vue

@ -24,14 +24,15 @@
24 24
          class="int"
25 25
          placeholder="请输入异常描述"
26 26
        ></el-input>
27
        <el-icon
28
          v-if="!item.default"
29
          class="icon"
30
          size="18"
31
          @click.stop="deleteItem(index)"
32
        >
27
        <el-icon class="icon" size="18">
33 28
          <Delete></Delete>
34 29
        </el-icon>
30
        <common-icon
31
          v-if="!item.default"
32
          name="tool-narrow"
33
          :size="18"
34
          @click.stop="deleteItem(index)"
35
        ></common-icon>
35 36
      </li>
36 37
    </ul>
37 38
    <el-button type="primary" class="full-button" @click.stop="addItem">

+ 1 - 1
src/views/_components/right-panel/PanelBranch.vue

@ -61,7 +61,7 @@ function setNodeAttrData() {
61 61
      ...data,
62 62
      attrsData: {
63 63
        ...data.attrsData,
64
        function: functionData.value
64
        function: JSON.parse(JSON.stringify(functionData.value))
65 65
      }
66 66
    },
67 67
    {