From 4d82ec56ea2292c4359ddbcb159d98ae9ecd261d Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Mon, 25 Mar 2024 18:00:32 +0800 Subject: [PATCH] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 2 +- src/views/monitor/operlog/index.vue | 5 +++ src/views/workflow/process/ProcessTree.vue | 16 +++++----- .../workflow/process/nodes/ConditionNode.vue | 31 ++++++++++++------- src/views/workflow/process/nodes/Node.vue | 7 +++-- 5 files changed, 38 insertions(+), 23 deletions(-) diff --git a/.drone.yml b/.drone.yml index 5606aa1..ff45f09 100644 --- a/.drone.yml +++ b/.drone.yml @@ -25,7 +25,7 @@ steps: - export NODE_MODULES_PATH=`pwd`/node_modules #- npm config set registry https://registry.npm.taobao.org #- set NODE_OPTIONS=--openssl-legacy-provider -# - npm install + - npm install - npm run build - ls /app/build/$DRONE_REPO_NAME/ - echo $NODE_MODULES_PATH diff --git a/src/views/monitor/operlog/index.vue b/src/views/monitor/operlog/index.vue index e68fa14..89a1a92 100644 --- a/src/views/monitor/operlog/index.vue +++ b/src/views/monitor/operlog/index.vue @@ -318,3 +318,8 @@ const handleCurrentChange = (val) => { }; getList(); + diff --git a/src/views/workflow/process/ProcessTree.vue b/src/views/workflow/process/ProcessTree.vue index 6f5584a..ad86d7f 100644 --- a/src/views/workflow/process/ProcessTree.vue +++ b/src/views/workflow/process/ProcessTree.vue @@ -11,7 +11,7 @@ import MergeNode from './nodes/MergeNode.vue' import DelayNode from './nodes/DelayNode.vue' import AddBranchNode from './nodes/AddBranchNode.vue' -import { debounce } from 'lodash' +import {debounce} from 'lodash' import {defineExpose, h, render, ref} from 'vue' import DefaultProps from "./DefaultNodeProps" import {ElMessage, ElMessageBox} from 'element-plus' @@ -290,7 +290,7 @@ const selectNode = (node) => { } //处理节点插入逻辑 -const insertNode =debounce( (type, parentNode) => { +const insertNode = debounce((type, parentNode) => { //插入新节点 let id = getRandomId(); updateParentId(id, parentNode.id) @@ -322,7 +322,7 @@ const insertNode =debounce( (type, parentNode) => { break; } init() -},1000) +}, 1000) /** * 更新父id * @param newId @@ -475,7 +475,7 @@ const addBranchNode = (node) => { } //删除当前节点 -const delNode = (node) => { +const delNode = debounce((node) => { //获取该节点的父节点 let parentNode = processStore.nodeMap.get(node.parentId) if (parentNode) { @@ -488,8 +488,7 @@ const delNode = (node) => { } else { ElMessage.warning("出现错误，找不到上级节点😥") } -} - +}, 1000) /** * 从dom中删除 @@ -700,9 +699,8 @@ defineExpose({ flex-direction: column; align-items: center; border-top: 2px solid #000000; - border-bottom: 2px solid #000000; - +//border-radius: 40px; &:before { content: ""; position: absolute; @@ -745,9 +743,11 @@ defineExpose({ .add-branch-btn { position: absolute; width: 80px; + .el-button { border-color: #000000; } + .add-branch-btn-el { z-index: 999; position: absolute; diff --git a/src/views/workflow/process/nodes/ConditionNode.vue b/src/views/workflow/process/nodes/ConditionNode.vue index 62e0d1e..ae88d2e 100644 --- a/src/views/workflow/process/nodes/ConditionNode.vue +++ b/src/views/workflow/process/nodes/ConditionNode.vue @@ -51,8 +51,9 @@ import InsertButton from '../common/InsertButton.vue' import Ellipsis from '../common/Ellipsis.vue' import {ValueType} from '@/views/workflow/form/ComponentsConfigExport.js' -import {ArrowRightBold,ArrowLeftBold,CopyDocument,CloseBold,Warning} from '@element-plus/icons-vue' +import {ArrowRightBold, ArrowLeftBold, CopyDocument, CloseBold, Warning} from '@element-plus/icons-vue' import {defineProps, defineEmits, defineExpose} from "vue"; + const emit = defineEmits() const props = defineProps({ @@ -112,7 +113,7 @@ const content = computed(() => { return String(confitions).replaceAll(',', (props.config.props.groupsType === 'AND' ? ' 且 ' : ' 或 ')) }) -const designState = computed(()=>{ +const designState = computed(() => { return props.mode === 'design' }) @@ -146,23 +147,23 @@ const getOrdinaryConditionContent = (subCondition) => { //校验数据配置的合法性 const validate = (err) => { const defineProps = props.config.props - if (defineProps.groups.length <= 0){ + if (defineProps.groups.length <= 0) { showError.value = true errorInfo.value = '请设置分支条件' err.push(`${defineProps.config.name} 未设置条件`) - }else { + } else { for (let i = 0; i < defineProps.groups.length; i++) { - if (defineProps.groups[i].cids.length === 0){ + if (defineProps.groups[i].cids.length === 0) { showError.value = true errorInfo.value = `请设置条件组${groupNames.value[i]}内的条件` err.push(`条件 ${props.config.name} 条件组${groupNames.value[i]}内未设置条件`) break - }else { + } else { let conditions = defineProps.groups[i].conditions for (let ci = 0; ci < conditions.length; ci++) { let subc = conditions[ci] showError.value = subc.value.length === 0; - if (showError.value){ + if (showError.value) { errorInfo.value = `请完善条件组${groupNames.value[i]}内的${subc.title}条件` err.push(`条件 ${props.config.name} 条件组${groupNames.value[i]}内${subc.title}条件未完善`) return false @@ -248,14 +249,22 @@ defineExpose({ .node-body-main-header { padding: 10px 0px 5px; - font-size: xx-small; position: relative; + font-size: 14px !important; + display: flex; + align-items: center; .title { - color: #15bca3; - display: inline-block; - height: 14px; width: 125px; + color: #2E7CF0; + height: auto; + display: flex; + align-items: center; + } + + .name { + color: #2E7CF0; + height: auto; } .level { diff --git a/src/views/workflow/process/nodes/Node.vue b/src/views/workflow/process/nodes/Node.vue index efe0c3c..a8c8610 100644 --- a/src/views/workflow/process/nodes/Node.vue +++ b/src/views/workflow/process/nodes/Node.vue @@ -2,11 +2,11 @@
- + - +
@@ -234,7 +234,8 @@ const init = () => { .name { //height: 14px; //width: 150px; - display: inline-block + display: inline-block; + font-size: 16px; } }