From 5388172791b961806c13c3ddd0af1fbdbb437940 Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期五, 27 十二月 2024 18:24:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/components/dialog.vue | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/components/dialog.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/components/dialog.vue
index c47afba..fa491cb 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/components/dialog.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/components/dialog.vue
@@ -20,7 +20,7 @@
:option="treeOption"
@node-click="nodeClick">
<span slot-scope="{ node, data }" class="el-tree-node__label">
- <span style="font-size: 15px">
+ <span>
<i class="el-icon-s-promotion"></i>
{{ (node || {}).label }}
</span>
@@ -82,7 +82,7 @@
lastIndex: null,
selectList: [],
data: [],
- option: {
+ option: {
...basicOption,
addBtn: false,
height: 420,
@@ -163,6 +163,7 @@
this.dialog.loading = false;
this.dialog.showDialog = false;
this.$refs.tree.setCurrentKey(null);
+ this.$emit('cancelAction',null);
},
submitDialog() {
if (this.selectList.length==0) {
@@ -179,8 +180,9 @@
this.$emit('updataAction', this.selectList[0]);
}
- this.cancelDialog();
-
+ this.dialog.loading = false;
+ this.dialog.showDialog = false;
+ this.$refs.tree.setCurrentKey(null);
},
// 宸︿晶鏍戣姹�
getTreeList(status) {
@@ -218,6 +220,9 @@
this.data = data;
this.tableLoading = false;
+ this.$nextTick(function (){
+ this.$refs.crud.doLayout()
+ })
})
},
--
Gitblit v1.9.3