Просмотр исходного кода

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

liuyang лет назад: 2
Родитель
Сommit
3a6b0aef6f

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

24
// 动态panel
24
// 动态panel
25
import PanelGlobal from './panel/PanelGlobal.vue';
25
import PanelGlobal from './panel/PanelGlobal.vue';
26
// 全局节点
26
// 全局节点
27
// 逻辑控制节点
28
// 数据处理
27
// import PanelStart from './panel/PanelStart.vue';
29
// import PanelStart from './panel/PanelStart.vue';
28
// import PanelEnd from './panel/PanelEnd.vue';
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
// import PanelSql from './panel/PanelSql.vue';
31
// import PanelSql from './panel/PanelSql.vue';
33
// import PanelExpression from './panel/PanelExpression.vue';
32
// import PanelExpression from './panel/PanelExpression.vue';
34
// import PanelBranch from './panel/PanelBranch.vue';
33
// import PanelBranch from './panel/PanelBranch.vue';
35
// import PanelSubFlow from './panel/PanelSubFlow.vue';
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
import PanelSql from './right-panel/PanelSql.vue';
44
import PanelSql from './right-panel/PanelSql.vue';
38
import PanelExpression from './right-panel/PanelExpression.vue';
45
import PanelExpression from './right-panel/PanelExpression.vue';
39
import PanelBranch from './right-panel/PanelBranch.vue';
46
import PanelBranch from './right-panel/PanelBranch.vue';
40
import PanelSubFlow from './right-panel/PanelSubFlow.vue';
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
import PanelForeach from './right-panel/PanelForeach.vue';
49
import PanelForeach from './right-panel/PanelForeach.vue';
47
import PanelFunction from './right-panel/PanelFunction.vue';
50
import PanelFunction from './right-panel/PanelFunction.vue';
48
import PanelDataAggregation from './right-panel/PanelDataAggregation.vue';
51
import PanelDataAggregation from './right-panel/PanelDataAggregation.vue';

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

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

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

24
          class="int"
24
          class="int"
25
          placeholder="请输入异常描述"
25
          placeholder="请输入异常描述"
26
        ></el-input>
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
          <Delete></Delete>
28
          <Delete></Delete>
34
        </el-icon>
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
      </li>
36
      </li>
36
    </ul>
37
    </ul>
37
    <el-button type="primary" class="full-button" @click.stop="addItem">
38
    <el-button type="primary" class="full-button" @click.stop="addItem">

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

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