From d2da078b40578cf72901442c7a2b878dfc34cae5 Mon Sep 17 00:00:00 2001
From: wujingjing <gersonwu@qq.com>
Date: 星期五, 13 十二月 2024 12:10:00 +0800
Subject: [PATCH] feat(flow): 新增执行功能节点并优化流程画布
---
src/components/vue-flow/ui/nodes/ConditionNode.vue | 115 ++++++++++++++++++++++++++-------------------------------
1 files changed, 53 insertions(+), 62 deletions(-)
diff --git a/src/components/vue-flow/ui/nodes/ConditionNode.vue b/src/components/vue-flow/ui/nodes/ConditionNode.vue
index de447b8..eeb4c1d 100644
--- a/src/components/vue-flow/ui/nodes/ConditionNode.vue
+++ b/src/components/vue-flow/ui/nodes/ConditionNode.vue
@@ -27,7 +27,13 @@
<div class="flex flex-col gap-y-2 min-w-[400px]">
<div class="flex justify-between flex-0">
<div class="flex items-center gap-x-2">
- <img src="/@/components/vue-flow/ui/assets/images/icon_Start.png" class="h-4 w-4" alt="Start icon" />
+ <YWIcon
+ :name="VueFlowConfig.nodeStyleMap.get(NodeType.Condition).icon"
+ :fontSize="VueFlowConfig.nodeStyleMap.get(NodeType.Condition).fontSize"
+ :color="VueFlowConfig.nodeStyleMap.get(NodeType.Condition).color"
+ class="rounded-lg p-1.5"
+ :class="VueFlowConfig.nodeStyleMap.get(NodeType.Condition).class"
+ />
<div class="flex flex-col gap-y-1">
<p v-if="!titleIsEdit" class="text-xl font-bold text-gray-500" @click="titleIsEdit = true">{{ data.title }}</p>
<el-input v-elInputFocus="false" v-else v-model="data.title" @blur="() => (titleIsEdit = false)"></el-input>
@@ -36,10 +42,10 @@
</div>
<div class="flex-auto !overflow-x-auto gap-y-2 flex-col flex nodrag">
- <div v-for="(item, index) in conditionGroupList" class="flex flex-col gap-3 relative group/conditionGroup">
+ <div v-for="(item, index) in conditionGroupList" :key="item.id" class="flex flex-col gap-3 relative group/conditionGroup">
<div class="flex-items-center justify-between">
- <div class="text-lg font-bold">濡傛灉</div>
- <div class="flex-items-center gap-3">
+ <div class="text-lg font-bold">{{ item.conditions ? '濡傛灉' : '鍚﹀垯' }}</div>
+ <div class="flex-items-center gap-3" v-if="item.conditions">
<el-select v-model="item.operator" class="w-[130px]">
<el-option
v-for="item in Object.keys(conditionOperatorMap)"
@@ -57,10 +63,10 @@
</div>
</div>
- <div class="flex flex-col gap-y-2">
+ <div class="flex flex-col gap-y-2" v-if="item.conditions">
<div v-for="(subItem, subIndex) in item.conditions" class="ml-5 flex-items-center gap-x-2 group/conditionItem pr-8">
<el-input filterable class="w-[120px] flex-0" v-model="subItem.left_value" placeholder="杈撳叆鍙橀噺"> </el-input>
- <el-select v-model="subItem.comparison_operation" class="flex-0 w-[120px]" placeholder="閫夋嫨鏉′欢">
+ <el-select filterable v-model="subItem.comparison_operation" class="flex-0 w-[120px]" placeholder="閫夋嫨鏉′欢">
<el-option
v-for="item in Object.keys(compareOperationMap)"
:key="item"
@@ -69,32 +75,33 @@
></el-option>
</el-select>
- <el-select v-model="subItem.right_value_type" class="flex-0 w-[90px]" placeholder="璇烽�夋嫨">
+ <!-- <el-select v-model="subItem.right_value_type" class="flex-0 w-[90px]" placeholder="璇烽�夋嫨">
<el-option v-for="item in Object.keys(varTypeMap)" :key="item" :value="item" :label="varTypeMap[item]"></el-option>
- </el-select>
+ </el-select> -->
+ <template v-if="isShowRight(subItem)">
+ <el-input
+ v-if="subItem.right_value_type === VarType.Input"
+ v-model="subItem.right_value"
+ class="w-[180px]"
+ placeholder="杈撳叆鍊�"
+ >
+ </el-input>
- <el-input
- v-if="subItem.right_value_type === VarType.Input"
- v-model="subItem.right_value"
- class="w-[120px]"
- placeholder="杈撳叆鍊�"
- >
- </el-input>
-
- <el-tree-select
- v-else
- filterable
- class="w-[120px] flex-0"
- v-model="subItem.right_value"
- :data="treeReferOptions"
- node-key="id"
- :clearable="true"
- :accordion="false"
- :expandNode="false"
- :check-strictly="false"
- placeholder="閫夋嫨鍙橀噺"
- >
- </el-tree-select>
+ <el-tree-select
+ v-else
+ filterable
+ class="w-[120px] flex-0"
+ v-model="subItem.right_value"
+ :data="treeReferOptions"
+ node-key="id"
+ :clearable="true"
+ :accordion="false"
+ :expandNode="false"
+ :check-strictly="false"
+ placeholder="閫夋嫨鍙橀噺"
+ >
+ </el-tree-select>
+ </template>
<span
class="ywifont ywicon-shanchu text-red-400 invisible group-hover/conditionItem:visible cursor-pointer"
@@ -103,51 +110,27 @@
</div>
<el-button class="w-fit mt-3" type="primary" @click="addConditionItem(item)">娣诲姞鏉′欢</el-button>
</div>
+ <el-button v-else @click="addConditionBranch" class="w-fit mt-3" type="success">娣诲姞鍒嗘敮</el-button>
<Handle class="!right-0 !-translate-y-4" :id="item.id" type="source" :position="Position.Right" />
-
- </div>
-
- <div class="flex flex-col gap-3 relative pr-8">
- <div class="flex-items-center justify-between">
- <div class="text-lg font-bold">鍚﹀垯</div>
- <!-- <el-select class="w-[130px]">
- <el-option
- v-for="item in Object.keys(conditionOperatorMap)"
- :key="item"
- :value="parseInt(item)"
- :label="conditionOperatorMap[item]"
- ></el-option>
- </el-select> -->
- </div>
-
- <div class="flex-column">
- <el-button @click="addConditionBranch" class="w-fit mt-3" type="success">娣诲姞鍒嗘敮</el-button>
- </div>
- <Handle class="!right-0 !-translate-y-4" :id="otherHandleId" type="source" :position="Position.Right" />
</div>
</div>
</div>
<!-- <Handle :id="handleId" type="source" :position="Position.Right" /> -->
</div>
-
- <!-- <div>
- <span>璧峰</span>
-
- <Handle type="source" :position="Position.Right" />
- </div> -->
</template>
<script lang="ts" setup>
-import { Handle, Position, useNode, useVueFlow } from '@vue-flow/core';
-import { ref, watchEffect } from 'vue';
-
import type { NodeProps } from '@vue-flow/core';
-import { computed } from 'vue';
+import { Handle, Position, useNode, useVueFlow } from '@vue-flow/core';
+import { computed, ref, watchEffect } from 'vue';
import { VueFlowConstant } from '../../VueFlowConstant';
import { ConditionHelper, VueFlowHelper } from '../../VueFlowHelper';
-import { VarType, compareOperationMap, conditionOperatorMap, varTypeMap } from '../../vueFlowEnum';
+import { CompareOperation, VarType, compareOperationMap, conditionOperatorMap } from '../../vueFlowEnum';
import { LLMNodeData, LLMNodeEvents } from './index';
import { deepClone } from '/@/utils/other';
+import { VueFlowConfig } from '../VueFlowConfig';
+import { NodeType } from '../../vueFlowEnum';
+
defineProps<NodeProps<LLMNodeData, LLMNodeEvents>>();
const node = useNode();
@@ -155,6 +138,12 @@
const { findNode } = useVueFlow();
const referenceOptions = ref([]);
const otherHandleId = VueFlowHelper.genId();
+
+const isShowRight = (item) => {
+ const yes = ![CompareOperation.empty, CompareOperation.notEmpty].includes(item.comparison_operation);
+ return yes;
+};
+
const treeReferOptions = computed(() => {
const result = [];
for (const item of referenceOptions.value) {
@@ -212,6 +201,7 @@
});
const data = ref(node.node.data);
+
const conditionGroupList = ref(VueFlowHelper.getFieldValue(data.value, 'condition'));
const titleIsEdit = ref(false);
@@ -255,7 +245,8 @@
};
const addConditionBranch = () => {
const conditionGroup = ConditionHelper.getDefaultConditionGroup();
- conditionGroupList.value.push(conditionGroup);
+ // 涓嶈兘鍒犻櫎鍏朵粬鍒嗘敮
+ conditionGroupList.value.splice(-1, 0, conditionGroup);
};
const delConditionBranch = (index) => {
--
Gitblit v1.9.3