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/index.vue | 76 ++++++++++++++++++++++++-------------
1 files changed, 49 insertions(+), 27 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/index.vue
index 19d7f72..fcf06d1 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/index.vue
@@ -23,28 +23,34 @@
<el-main>
<basic-container v-if="treeNodeRow.id === 'root' ">
- <div class="headerCon">
- <el-button v-if="permissionList.addBtn" icon="el-icon-plus" plain size="small" type="primary" @click="addTreeClickHandler">鍒涘缓
- </el-button>
- <!--<el-button v-if="permissionList.editBtn" icon="el-icon-edit" plain size="small" type="primary" @click="editTreeClickHandler">淇敼
- </el-button>
- <el-button v-if="permissionList.delBtn" icon="el-icon-delete" plain size="small" type="danger" @click="delTreeClickHandler">鍒犻櫎
- </el-button>-->
- <el-button v-if="permissionList.importBtn" icon="el-icon-upload2" plain size="small" type="primary" @click="uploadClickHandler">瀵煎叆
- </el-button>
- <el-button v-if="permissionList.exportBtn" icon="el-icon-download" plain size="small" type="primary" @click="exportClickHandler">瀵煎嚭
- </el-button>
- </div>
<div>
<avue-crud
ref="treeCrud"
v-model="treeForm"
- :data="treeData[0].childs"
+ :data="treeData[0].children"
:option="treeCrudOption"
@row-del="rowTreeDelHandler"
@row-save="rowTreeSaveHandler"
@row-update="rowTreeUpdataHandler"
@refresh-change="handleRefresh">
+ <template slot="menuLeft">
+ <el-button v-if="permissionList.addBtn" icon="el-icon-plus" plain size="small" type="primary" @click="addTreeClickHandler(treeNodeRow)">鍒涘缓
+ </el-button>
+ <!--<el-button v-if="permissionList.editBtn" icon="el-icon-edit" plain size="small" type="primary" @click="editTreeClickHandler">淇敼
+ </el-button>
+ <el-button v-if="permissionList.delBtn" icon="el-icon-delete" plain size="small" type="danger" @click="delTreeClickHandler">鍒犻櫎
+ </el-button>-->
+ <el-button v-if="permissionList.importBtn" icon="el-icon-upload2" plain size="small" type="primary" @click="uploadClickHandler">瀵煎叆
+ </el-button>
+ <el-button v-if="permissionList.exportBtn" icon="el-icon-download" plain size="small" type="primary" @click="exportClickHandler">瀵煎嚭
+ </el-button>
+ </template>
+ <template #menu="{ row, size }">
+ <el-button v-if="permissionList.addBtn" :size="size" icon="el-icon-plus"
+ text
+ type="text"
+ @click="addTreeClickHandler(row)">鏂板瀛愮骇</el-button>
+ </template>
</avue-crud>
</div>
</basic-container>
@@ -174,7 +180,7 @@
props: {
label: 'name',
value: 'id',
- children: 'childs'
+ children: 'children'
}
},
treeData: []
@@ -206,10 +212,13 @@
addBtn: false,
calcHeight: -50,
highlightCurrentRow: true,
- menuWidth: 160,
+ rowKey: 'id',
+ rowParentKey: 'pid',
+ menuWidth: 300,
span: 24,
labelWidth: 100,
dialogWidth: '800',
+ align:'left',
column: [{
label: '鍒嗙被鍚嶇О',
prop: 'name',
@@ -229,11 +238,6 @@
}, {
label: '鐖朵富绫�',
prop: 'pidName',
- formatter:function(row){
- if(row.pid=='root'){
- return 'Action鍒嗙被'
- }
- },
disabled: true,
span: 24
}, {
@@ -396,7 +400,7 @@
}
getActionTree(params).then(res => {
const data = res.data.obj;
- this.treeData = [data];
+ this.treeData = this.treeDataFormAtter([data],'Action鍒嗙被');
const selectTreeData = this.option.column.find(item => item.prop === 'plActionCls'); // 鎵惧埌action娣诲姞鍒嗙被鏍�
const dicData=[data];
dicData[0].disabled=true;//鏍硅妭鐐逛笉鑳介��
@@ -404,11 +408,25 @@
})
},
+ treeDataFormAtter(items,pidName) {
+ return items.map(item => {
+ // 杞崲褰撳墠鑺傜偣鐨勫睘鎬�
+ const formList = {
+ ...item,
+ pidName:pidName,
+ children: item.childs && item.childs.length > 0 ? this.treeDataFormAtter(item.childs,item.name) : undefined
+ };
+ return formList;
+ });
+ },
+
// 宸︿晶鏍戣鐐瑰嚮
nodeClick(row) {
this.treeNodeRow = row;
- this.getRightTableList(row);
- this.bottomData = [];
+ if(this.treeNodeRow.id !== 'root'){
+ this.getRightTableList(row);
+ this.bottomData = [];
+ }
},
// 澶撮儴鍒锋柊鎸夐挳
@@ -675,16 +693,20 @@
},
// 宸︿晶鏍戝垱寤�
- addTreeClickHandler() {
- if (func.isEmptyObject(this.treeNodeRow)) {
+ addTreeClickHandler(row) {
+ let parentRow=row;
+ if(!row || !row.id){
+ parentRow=this.treeNodeRow
+ }
+ if (func.isEmptyObject(parentRow)) {
this.$message.error('璇烽�夋嫨涓�鏉″垎绫昏繘琛屾坊鍔�');
return;
}
- if (!this.treeNodeRow.id && this.treeNodeRow.name=='鏈垎绫�') {
+ if (!parentRow.id && parentRow.name=='鏈垎绫�') {
this.$message.error('鏈垎绫讳笅涓嶈兘鍒涘缓瀛愬垎绫�');
return;
}
- const {createTime, creator, name, id, description} = this.treeNodeRow;
+ const {createTime, creator, name, id, description} = parentRow;
this.$set(this.treeForm, 'createTime', func.formattedDate(createTime));
this.$set(this.treeForm, 'creator', creator);
this.$set(this.treeForm, 'pid', id);
--
Gitblit v1.9.3