From 07ba00bbc814f67050c46f028c5b56966d269c46 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 18 十月 2024 14:21:15 +0800
Subject: [PATCH] 处理树懒加载抖动，生命周期非编辑状态只读
---
Source/plt-web/plt-web-ui/src/App.vue | 17 ++++
Source/plt-web/plt-web-ui/src/components/flow-cycle/components/ContextMenu.vue | 46 ++++++-----
Source/plt-web/plt-web-ui/src/components/flow-cycle/components/Toolbar.vue | 14 +--
Source/plt-web/plt-web-ui/src/components/flow-cycle/flowchartEditor.vue | 11 ++
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/linkType/index.vue | 28 -------
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/lifeCycle/index.vue | 33 -------
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue | 32 --------
7 files changed, 57 insertions(+), 124 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/App.vue b/Source/plt-web/plt-web-ui/src/App.vue
index ea51abd..b83a1ca 100644
--- a/Source/plt-web/plt-web-ui/src/App.vue
+++ b/Source/plt-web/plt-web-ui/src/App.vue
@@ -125,4 +125,21 @@
.el-dialog__footer{
border-top: 1px solid #e9e7e7;
}
+/***鎸夐挳妗�****/
+.headerCon {
+ display: flex;
+ flex-wrap: wrap;
+ margin-bottom: 5px;
+ .el-button {
+ min-width: 60px;
+ padding-left: 9.5px;
+ margin-left: 0;
+ margin-right: 5px;
+ margin-bottom: 5px;
+ }
+}
+/***闅愯棌鏍戞噿鍔犺浇鏃惰妭鐐逛笂鐨刲oading锛岄槻姝㈣妭鐐规姈鍔�*****/
+.el-tree .el-tree-node__loading-icon{
+ display: none !important;
+}
</style>
diff --git a/Source/plt-web/plt-web-ui/src/components/flow-cycle/components/ContextMenu.vue b/Source/plt-web/plt-web-ui/src/components/flow-cycle/components/ContextMenu.vue
index 1b66514..f999664 100644
--- a/Source/plt-web/plt-web-ui/src/components/flow-cycle/components/ContextMenu.vue
+++ b/Source/plt-web/plt-web-ui/src/components/flow-cycle/components/ContextMenu.vue
@@ -48,32 +48,34 @@
background: #fff;
border-radius: 4px;
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
+ padding: 5px;
}
+::v-deep {
+ .contextMenu .command.disable .item {
+ color: rgba(0, 0, 0, 0.25);
+ cursor: auto;
+ }
-.contextMenu .command.disable .item {
- color: rgba(0, 0, 0, 0.25);
- cursor: auto;
-}
+ .contextMenu .command.disable .item:hover {
+ background: #fff;
+ }
-.contextMenu .command.disable .item:hover {
- background: #fff;
-}
+ .contextMenu .item {
+ display: flex;
+ align-items: center;
+ padding: 5px 12px;
+ cursor: pointer;
+ transition: all 0.3s;
+ user-select: none;
+ }
-.contextMenu .item {
- display: flex;
- align-items: center;
- padding: 5px 12px;
- cursor: pointer;
- transition: all 0.3s;
- user-select: none;
-}
+ .contextMenu .item:hover {
+ background: #e6f7ff;
+ }
-.contextMenu .item:hover {
- background: #e6f7ff;
-}
-
-.contextMenu .item i {
- margin-right: 8px;
- margin-top: 3px;
+ .contextMenu .item i {
+ margin-right: 8px;
+ margin-top: 3px;
+ }
}
</style>
diff --git a/Source/plt-web/plt-web-ui/src/components/flow-cycle/components/Toolbar.vue b/Source/plt-web/plt-web-ui/src/components/flow-cycle/components/Toolbar.vue
index f656817..5b882e2 100644
--- a/Source/plt-web/plt-web-ui/src/components/flow-cycle/components/Toolbar.vue
+++ b/Source/plt-web/plt-web-ui/src/components/flow-cycle/components/Toolbar.vue
@@ -17,19 +17,15 @@
<!-- <toolbar-button command="toFront" icon="to-front" text="鍚戜笂涓�灞�" /> -->
<!-- <toolbar-button command="addGroup" icon="group" text="缂栫粍" /> -->
<!-- <toolbar-button command="unGroup" icon="ungroup" text="鍙栨秷缂栫粍" /> -->
- <toolbar-button command="selectAll" icon="select-all" text="鍏ㄩ��"/>
- <toolbar-button command="multiSelect" icon="select" text="妗嗛��"/>
+ <toolbar-button v-show="disabledBtn" command="selectAll" icon="select-all" text="鍏ㄩ��"/>
+ <toolbar-button v-shof="disabledBtn" command="multiSelect" icon="select" text="妗嗛��"/>
<div v-if="disabledBtn" class="split"></div>
- <toolbar-button command="delete" text="鍒犻櫎"/>
- <toolbar-button command="clear" icon="clear" text="娓呯┖鐢诲竷"/>
+ <toolbar-button v-show="disabledBtn" command="delete" text="鍒犻櫎"/>
+ <toolbar-button v-show="disabledBtn" command="clear" icon="clear" text="娓呯┖鐢诲竷"/>
</template>
<template>
<div class="split"></div>
- <toolbar-button
- command="downloadImage"
- icon="image"
- text="涓嬭浇鍥惧儚"
- />
+ <toolbar-button command="downloadImage" icon="image" text="涓嬭浇鍥惧儚"/>
</template>
<!-- <el-button>{{this.$store}}</el-button>-->
<el-button :disabled="!disabledBtn" icon="el-icon-check" plain size="small" type="success"
diff --git a/Source/plt-web/plt-web-ui/src/components/flow-cycle/flowchartEditor.vue b/Source/plt-web/plt-web-ui/src/components/flow-cycle/flowchartEditor.vue
index 7e2245e..15b1954 100644
--- a/Source/plt-web/plt-web-ui/src/components/flow-cycle/flowchartEditor.vue
+++ b/Source/plt-web/plt-web-ui/src/components/flow-cycle/flowchartEditor.vue
@@ -23,6 +23,7 @@
<p>{{ item.name }}: {{ item.value }}</p>
</template>
</div>
+ <div v-if="!disabledBtn" class="mask"></div>
</div>
<div class="vfe-chart-panel">
@@ -129,7 +130,6 @@
},
// 澶勭悊鍥捐〃鏁版嵁鏇存敼鐨勪簨浠�
onAfterChange(e) {
- console.log(e)
try {
// if('edit' === this.$store.state.flow.type){
// this.$refs.flowChart.propsAPI.remove(e.item);
@@ -172,7 +172,6 @@
this.currentSelectedLine = currentEdge;
}
},
-
// 涓嬭浇鍥剧墖
_downloadImage(data, filename = "flowchart.png") {
const a = document.createElement("a");
@@ -264,6 +263,14 @@
margin: 0;
}
}
+ .mask{
+ opacity: 0.3;
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ left: 0;
+ top:0;
+ }
}
.vfe-chart-sidebar {
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue
index 03c0301..761693e 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue
@@ -1656,38 +1656,6 @@
.el-form-item .el-select {
width: 100%;
}
-
- .headerCon {
- .el-button {
- width: 82px;
- }
- }
-}
-
-.headerCon {
- display: flex;
- flex-wrap: wrap;
- margin-bottom: 5px;
-
- .el-button + .el-button {
- margin-left: 5px;
- }
-
- .el-button {
- margin-top: 5px;
- }
-}
-
-.headerCon > .el-button:nth-child(4) {
- margin-left: 0;
-}
-
-.headerCon > .el-button:nth-child(7) {
- margin-left: 0;
-}
-
-.headerCon > .el-button:nth-child(10) {
- margin-left: 0;
}
.descBox {
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/lifeCycle/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/lifeCycle/index.vue
index 142b70c..a9a4804 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/lifeCycle/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/lifeCycle/index.vue
@@ -1,6 +1,6 @@
<template>
<el-container>
- <el-aside width="15.7%">
+ <el-aside>
<basic-container>
<div ref="TreeBox" style="height: calc(100vh - 144px);!important;">
<div class="headerCon">
@@ -14,8 +14,7 @@
</el-button>
<el-button icon="el-icon-upload2" plain size="small" type="primary" @click="uploadClickHandler">瀵煎叆
</el-button>
- <el-button class="smallBtn" plain size="small" type="primary"
- @click="checkViewClickHandler">鏌ョ湅浣跨敤鑼冨洿
+ <el-button class="smallBtn" plain size="small" type="primary" @click="checkViewClickHandler">鏌ョ湅浣跨敤鑼冨洿
</el-button>
</div>
<!-- 宸︿晶鏍� -->
@@ -421,35 +420,7 @@
.el-scrollbar__wrap {
overflow: auto !important;
}
- .headerCon{
- .el-button {
- width: 65px;
- padding-left: 9.5px;
- }
- }
}
-
-.headerCon {
- display: flex;
- flex-wrap: wrap;
- margin-bottom: 5px;
-
- .el-button + .el-button {
- margin-left: 5px;
- }
-
- .el-button {
- margin-top: 5px;
- }
-}
-
-.headerCon > .el-button:nth-child(4) {
- margin-left: 0;
-}
-
-//.headerCon > .el-button:nth-child(6) {
-// margin-left: 0;
-//}
.smallBtn {
width: 77px !important;
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/linkType/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/linkType/index.vue
index 66319a6..122f429 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/linkType/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/linkType/index.vue
@@ -1154,34 +1154,6 @@
.el-form-item .el-select {
width: 100%;
}
-
- .headerCon {
- .el-button {
- width: 82px;
- }
- }
-}
-
-.headerCon {
- display: flex;
- flex-wrap: wrap;
- margin-bottom: 5px;
-
- .el-button + .el-button {
- margin-left: 5px;
- }
-
- .el-button {
- margin-top: 5px;
- }
-}
-
-.headerCon > .el-button:nth-child(4) {
- margin-left: 0;
-}
-
-.headerCon > .el-button:nth-child(7) {
- margin-left: 0;
}
.dialogForm {
--
Gitblit v1.9.3