From c7fe2dfd0b1a3a986d9e8cd8f2b8a713ef404f69 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 18 十月 2024 10:06:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/components/flow-cycle/flowchartEditor.vue | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 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..7e2245e 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">
@@ -25,7 +25,7 @@
</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 +108,11 @@
currentSelectedLine: {}
};
},
+ computed: {
+ disabledBtn() {
+ return this.$store.state.flow.methodBtn;
+ }
+ },
mounted() {
// 缁勪欢鎸傝浇瀹屾垚鍚庯紝鑷姩缂╂斁鐢诲竷锛堜粎鍦ㄦ坊鍔犳ā寮忎笅锛�
@@ -124,7 +129,15 @@
},
// 澶勭悊鍥捐〃鏁版嵁鏇存敼鐨勪簨浠�
onAfterChange(e) {
+ console.log(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) {
@@ -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;
@@ -257,14 +271,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