From 9e18636bed4fc3fceec08ca25d6c7916d4d9a429 Mon Sep 17 00:00:00 2001
From: wangting <wangting@vci-tech.com>
Date: 星期三, 25 十二月 2024 17:20:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/components/flow-cycle/flowchartEditor.vue | 36 +++++++++++++++++++++++++++++-------
1 files changed, 29 insertions(+), 7 deletions(-)
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 b8ac66b..b4ed438 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
@@ -7,8 +7,8 @@
</div>
<div class="vfe-chart-container">
<!-- 宸︿晶椤圭洰鏍� -->
- <div v-if="type !== 'detail'" class="vfe-chart-sidebar">
- <editor-item-panel :node-items="chartDataNodeItems"/>
+ <div v-if="disabledBtn" class="vfe-chart-sidebar">
+ <editor-item-panel :node-items="chartDataNodeItems"/>
</div>
<!-- 涓诲浘琛� -->
<div class="vfe-chart-main">
@@ -23,9 +23,10 @@
<p>{{ item.name }}: {{ item.value }}</p>
</template>
</div>
+ <div v-if="!disabledBtn" class="mask"></div>
</div>
- <div v-if="type !== 'detail'" class="vfe-chart-panel">
+ <div class="vfe-chart-panel">
<div class="vfe-chart-panel-detail">
<editor-detail-panel
ref="EditorDetailPanel"
@@ -108,6 +109,11 @@
currentSelectedLine: {}
};
},
+ computed: {
+ disabledBtn() {
+ return this.$store.state.flow.methodBtn;
+ }
+ },
mounted() {
// 缁勪欢鎸傝浇瀹屾垚鍚庯紝鑷姩缂╂斁鐢诲竷锛堜粎鍦ㄦ坊鍔犳ā寮忎笅锛�
@@ -125,7 +131,15 @@
// 澶勭悊鍥捐〃鏁版嵁鏇存敼鐨勪簨浠�
onAfterChange(e) {
try {
+ // if('edit' === this.$store.state.flow.type){
+ // this.$refs.flowChart.propsAPI.remove(e.item);
+ // if(e.action === 'remove'){
+ // this.$message.error('缂栬緫鐘舵�佷笅涓嶈兘鍒囨崲閫変腑椤癸紒');
+ // }
+ // return;
+ // }
// 濡傛灉娣诲姞浜嗚妭鐐逛笖鑺傜偣娌℃湁琚洿鏀硅繃
+
if (e.action === "add" && e.model.type === "node") {
if (!e.model.change) {
this.$refs.flowChart.propsAPI.remove(e.item); // 绉婚櫎鍘熸湁鐨勮妭鐐�
@@ -159,7 +173,6 @@
this.currentSelectedLine = currentEdge;
}
},
-
// 涓嬭浇鍥剧墖
_downloadImage(data, filename = "flowchart.png") {
const a = document.createElement("a");
@@ -229,7 +242,8 @@
.vfe-chart-main {
position: relative;
flex: 1;
- max-height: calc(100% - 5px); // fix scroll show
+ height: 80vh; // fix scroll show
+ width: 65%;
.tooltip {
position: absolute;
@@ -250,6 +264,14 @@
margin: 0;
}
}
+ .mask{
+ opacity: 0.3;
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ left: 0;
+ top:0;
+ }
}
.vfe-chart-sidebar {
@@ -257,14 +279,14 @@
position: relative;
display: flex;
justify-content: center;
- width: 16%;
+ width: 210px;
background-color: #fafafa;
border-right: 1px solid #e6e9ed;
}
.vfe-chart-panel {
position: relative;
- width: 300px;
+ width: 260px;
background-color: #fafafa;
border-left: 1px solid #e6e9ed;
overflow-y: scroll;
--
Gitblit v1.9.3