From c6cf46f3e11e60f692e0b8d12188458ad1b6120e Mon Sep 17 00:00:00 2001 From: yangyin <18723093654@163.com> Date: 星期五, 13 十二月 2024 17:09:44 +0800 Subject: [PATCH] Merge branch 'test' of http://47.103.154.90:83/r/WI/Web.Admin.V1.0 into test --- src/components/vue-flow/ui/nodes/ConditionNode.vue | 217 +++++++++++++++++------------------------------------- 1 files changed, 69 insertions(+), 148 deletions(-) diff --git a/src/components/vue-flow/ui/nodes/ConditionNode.vue b/src/components/vue-flow/ui/nodes/ConditionNode.vue index eeb4c1d..d6f82b2 100644 --- a/src/components/vue-flow/ui/nodes/ConditionNode.vue +++ b/src/components/vue-flow/ui/nodes/ConditionNode.vue @@ -1,143 +1,97 @@ <template> - <div - class="w-max-[520px] border-2 rounded-lg border-solid border-gray-100 bg-white p-3 shadow-md relative hover:border-blue-500 group" - > + <NodeBasicLayout v-model:title="data.title" :type="NodeType.Condition" :description="VueFlowHelper.getConfigValue(data, 'description', '鏍规嵁鏉′欢琛ㄨ揪寮忔墽琛屼笉鍚岀殑鍒嗘敮銆�')"> <Handle :id="leftId" type="target" :position="Position.Left" /> - <div - class="group-hover:visible invisible flex absolute divide-y-[1.5px] divide-solid divide-gray-100 rounded-lg right-0 -top-0.5 translate-y-[-100%]" - style="box-shadow: 0 0 15px #dbdee6" + <FieldLayout + v-for="(item, index) in conditionGroupList" + :key="item.id" + class="relative group/conditionGroup" + :title="item.conditions ? '濡傛灉' : '鍚﹀垯'" > - <el-tooltip effect="dark" content="澶嶅埗" placement="top"> - <div - class="flex content-center items-center border-x-0 p-1 hover:bg-gray-200 active:bg-gray-300 cursor-pointer" - @click="handleClickDuplicateBtn" - > - <span class="ywifont !text-[20px] mb-1 p-1.5 ywicon-copy"></span> - </div> - </el-tooltip> - <el-tooltip effect="dark" content="鍒犻櫎" placement="top"> - <div - @click="clickDeleteBtn" - class="flex content-center items-center border-x-0 p-1 hover:bg-gray-200 active:bg-gray-300 hover:text-red-400 cursor-pointer" - > - <span class="ywifont !text-[20px] mb-1 p-1.5 ywicon-shanchu"></span> - </div> - </el-tooltip> - </div> - <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"> - <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> - </div> - </div> - </div> + <template #right v-if="item.conditions"> + <el-select v-model="item.operator" class="w-[130px]"> + <el-option + v-for="item in Object.keys(conditionOperatorMap)" + :key="item" + :value="item" + :label="conditionOperatorMap[item]" + ></el-option> + </el-select> + <!-- v-if="conditionGroupList.length > 1" --> - <div class="flex-auto !overflow-x-auto gap-y-2 flex-col flex nodrag"> - <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">{{ 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)" - :key="item" - :value="item" - :label="conditionOperatorMap[item]" - ></el-option> - </el-select> - <!-- v-if="conditionGroupList.length > 1" --> + <span + class="ywifont ywicon-shanchu text-red-400 invisible group-hover/conditionGroup:visible cursor-pointer" + @click="delConditionBranch(index)" + ></span> + </template> - <span - class="ywifont ywicon-shanchu text-red-400 invisible group-hover/conditionGroup:visible cursor-pointer" - @click="delConditionBranch(index)" - ></span> - </div> - </div> + <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 filterable v-model="subItem.comparison_operation" class="flex-0 w-[120px]" placeholder="閫夋嫨鏉′欢"> + <el-option + v-for="item in Object.keys(compareOperationMap)" + :key="item" + :value="item" + :label="compareOperationMap[item]" + ></el-option> + </el-select> - <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 filterable v-model="subItem.comparison_operation" class="flex-0 w-[120px]" placeholder="閫夋嫨鏉′欢"> - <el-option - v-for="item in Object.keys(compareOperationMap)" - :key="item" - :value="item" - :label="compareOperationMap[item]" - ></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> --> - <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> + <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-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> + <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" - @click="delConditionItem(item, subIndex)" - ></span> - </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" /> + <span + class="ywifont ywicon-shanchu text-red-400 invisible group-hover/conditionItem:visible cursor-pointer" + @click="delConditionItem(item, subIndex)" + ></span> </div> + <el-button class="w-fit mt-3" type="primary" @click="addConditionItem(item)">娣诲姞鏉′欢</el-button> </div> - </div> - <!-- <Handle :id="handleId" type="source" :position="Position.Right" /> --> - </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" /> + </FieldLayout> + </NodeBasicLayout> </template> <script lang="ts" setup> import type { NodeProps } from '@vue-flow/core'; 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 { CompareOperation, VarType, compareOperationMap, conditionOperatorMap } from '../../vueFlowEnum'; +import { CompareOperation, NodeType, VarType, compareOperationMap, conditionOperatorMap } from '../../vueFlowEnum'; import { LLMNodeData, LLMNodeEvents } from './index'; -import { deepClone } from '/@/utils/other'; -import { VueFlowConfig } from '../VueFlowConfig'; -import { NodeType } from '../../vueFlowEnum'; +import FieldLayout from './components/FieldLayout.vue'; +import NodeBasicLayout from './components/NodeBasicLayout.vue'; defineProps<NodeProps<LLMNodeData, LLMNodeEvents>>(); - const node = useNode(); const leftId = VueFlowHelper.getHandleId(node, 'target'); const { findNode } = useVueFlow(); const referenceOptions = ref([]); -const otherHandleId = VueFlowHelper.genId(); const isShowRight = (item) => { const yes = ![CompareOperation.empty, CompareOperation.notEmpty].includes(item.comparison_operation); @@ -203,42 +157,9 @@ const data = ref(node.node.data); const conditionGroupList = ref(VueFlowHelper.getFieldValue(data.value, 'condition')); -const titleIsEdit = ref(false); -function handleClickAddBtn() { - if (!data.value[VueFlowConstant.GROUP_PARAMS_KEY]) { - data.value[VueFlowConstant.GROUP_PARAMS_KEY] = []; - } +const { removeEdges } = useVueFlow(); - data.value[VueFlowConstant.GROUP_PARAMS_KEY].push({ - name: '', - description: '', - type: '', - isRequired: true, - }); -} - -function handleClickDeleteBtn(index: number) { - data.value[VueFlowConstant.GROUP_PARAMS_KEY].splice(index, 1); -} -const { removeNodes, removeEdges, addNodes } = useVueFlow(); - -function handleClickDuplicateBtn() { - const { type, position, data } = node.node; - const newNode = { - id: VueFlowHelper.genGeometryId(), - type, - position: { - x: position.x + 100, - y: position.y + 100, - }, - data: deepClone(data), - }; - addNodes(newNode); -} -const clickDeleteBtn = () => { - removeNodes(node.id); -}; const removeRelativeHandleEdge = (handleId: string) => { const edges = node.connectedEdges.value.filter((item) => item.sourceHandle === handleId || item.targetHandle === handleId); removeEdges(edges); -- Gitblit v1.9.3