From 930766d03537d803cea4bf468ab2abc44ff42645 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期三, 19 七月 2023 14:51:29 +0800
Subject: [PATCH] 1、主要解决 mybatis返回map时value值为null，属性和value都不显示问题
---
Source/UBCS-WEB/src/components/Master/MasterTree.vue | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
index 9c1c430..2a583b3 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTree.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
@@ -116,13 +116,18 @@
},
//琛ㄦ牸澶撮儴
TableHeadRend() {
- return new Promise((resolve,reject)=>{
+ return new Promise((resolve, reject) => {
MasterTable({
codeClassifyOid: this.nodeClickList.oid,
functionId: 5,
}).then(res => {
- console.log(res.data.buttons)
- this.masterVrBtnList = res.data.buttons
+ const flagsToDeleteBtn = ["CODEIMPORTHISTORY", "CODEEXPORT", "CODEQUERY","batchApplyCode"];
+ //涓嶅悓鑺傜偣鏄剧ず涓嶅悓鎸夐挳
+ if (!res.data.leaf) {
+ this.masterVrBtnList = res.data.buttons.filter(obj => flagsToDeleteBtn.includes(obj.uniqueFlag));
+ } else {
+ this.masterVrBtnList = res.data.buttons
+ }
this.tableHeadDataFateher = res.data;
this.templateOids = res.data.tableDefineVO.oid;
let List = res.data.tableDefineVO.cols[0];
@@ -134,14 +139,14 @@
sortable: item.sort,
width: item.minWidth
};
- this.tableHeadFindData.push(columnItem)
+ this.tableHeadFindData.push(Object.assign(item, columnItem))
// console.log(' this.tableHeadFindData', this.tableHeadFindData)
})
this.$emit('tableHeadDataFateher', this.tableHeadDataFateher);
this.$emit('tableHeadFindData', this.tableHeadFindData);
this.$emit('tableHeadBttoms', this.masterVrBtnList);
resolve();
- }).catch(err=>{
+ }).catch(err => {
reject(err)
})
})
@@ -156,7 +161,7 @@
this.TableRend(); // TableHeadRend() 鏂规硶瀹屾垚鍚庡啀鎵ц TableRend()
this.$emit('nodeClick',this.templateOids)
this.$emit("codeClassifyOid", this.nodeClickList.oid )
- console.log('鏍�',this.nodeClickList.oid)
+ console.log('鏍�',this.nodeClickList)
} catch (error) {
// 澶勭悊閿欒
this.$message.error(error)
--
Gitblit v1.9.3