From cd68e400dec06aa87d093aebc691c127ca816cb8 Mon Sep 17 00:00:00 2001
From: 田源 <tianyuan@vci-tech.com>
Date: 星期一, 30 十二月 2024 11:14:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/index.vue | 266 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 161 insertions(+), 105 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 2199e65..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
@@ -2,43 +2,59 @@
<el-container>
<el-aside>
<basic-container>
- <div ref="TreeBox" style="height: calc(100vh - 144px);!important;">
- <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 style="height: calc(100vh - 280px);">
- <avue-tree
- ref="tree"
- v-model="treeForm"
- :data="treeData"
- :option="treeOption"
- @save="rowTreeSaveHandler"
- @update="rowTreeUpdataHandler"
- @node-click="nodeClick">
+ <!-- 宸︿晶鏍� -->
+ <div style="height: calc(100vh - 150px);">
+ <avue-tree
+ ref="tree"
+ v-model="treeForm"
+ :data="treeData"
+ :option="treeOption"
+ @node-click="nodeClick">
<span slot-scope="{ node, data }" class="el-tree-node__label">
- <span>
- <i class="el-icon-s-promotion"></i>
+ <span style="display: flex">
+ <icon-show :name="data.icon"></icon-show>
{{ (node || {}).label }}
</span>
</span>
- </avue-tree>
- </div>
+ </avue-tree>
</div>
</basic-container>
</el-aside>
<el-main>
- <basic-container>
+ <basic-container v-if="treeNodeRow.id === 'root' ">
+ <div>
+ <avue-crud
+ ref="treeCrud"
+ v-model="treeForm"
+ :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>
+ <basic-container v-else>
<div>
<avue-crud
ref="crud"
@@ -159,66 +175,15 @@
treeNodeRow: {},
treeForm: {},
treeOption: {
- addBtn: false,
+ menu: false,
defaultExpandedKeys: ['root'],
props: {
label: 'name',
value: 'id',
- children: 'childs'
- },
- dialogWidth:'800',
- dialogMenuPosition: 'right',
- formOption: {
- dialogMenuPosition: 'right',
- column: [
- {
- label: '鍒嗙被鍚嶇О',
- prop: 'name',
- rules: [
- {
- required: true,
- message: '璇疯緭鍏ュ垎绫诲悕绉�',
- trigger: 'blur'
- }
- ]
- },
- {
- label: '鍒嗙被搴忓彿',
- prop: 'serialno',
- rules: [
- {
- required: true,
- message: '璇疯緭鍏ュ垎绫诲簭鍙�',
- trigger: 'blur'
- }
- ]
- },
- {
- label: '鍒涘缓鑰�',
- prop: 'creator',
- disabled: true,
- },
- {
- label: '鍒涘缓鏃堕棿',
- prop: 'createTime',
- disabled: true,
- },
- {
- label: '鐖朵富绫�',
- prop: 'pidName',
- disabled: true,
- span:24
- },
- {
- label: '澶囨敞',
- prop: 'description',
- type:'textarea',
- span:24
- },
- ],
+ children: 'children'
}
},
- treeData: [],
+ treeData: []
}
},
computed:{
@@ -238,6 +203,50 @@
actionBottomDelBtn: this.vaildData(this.permission[this.$route.query.id].actionBottomDel, false),
actionBottomEditBtn: this.vaildData(this.permission[this.$route.query.id].actionBottomEdit, false),
};
+ },
+ treeCrudOption(){
+ return {
+ ...basicOption,
+ editBtn: this.permissionList.editBtn,
+ delBtn: this.permissionList.delBtn,
+ addBtn: false,
+ calcHeight: -50,
+ highlightCurrentRow: true,
+ rowKey: 'id',
+ rowParentKey: 'pid',
+ menuWidth: 300,
+ span: 24,
+ labelWidth: 100,
+ dialogWidth: '800',
+ align:'left',
+ column: [{
+ label: '鍒嗙被鍚嶇О',
+ prop: 'name',
+ rules: [{
+ required: true,
+ message: '璇疯緭鍏ュ垎绫诲悕绉�',
+ trigger: 'blur'
+ }]
+ }, {
+ label: '鍒嗙被搴忓彿',
+ prop: 'serialno',
+ rules: [{
+ required: true,
+ message: '璇疯緭鍏ュ垎绫诲簭鍙�',
+ trigger: 'blur'
+ }]
+ }, {
+ label: '鐖朵富绫�',
+ prop: 'pidName',
+ disabled: true,
+ span: 24
+ }, {
+ label: '澶囨敞',
+ prop: 'description',
+ type: 'textarea',
+ span: 24
+ }],
+ }
},
option() {
return {
@@ -348,12 +357,11 @@
addBtn: false,
editBtn:this.permissionList.actionBottomEditBtn,
delBtn:this.permissionList.actionBottomDelBtn,
- calcHeight: -30,
+ calcHeight: -20,
selection: false,
refreshBtn: false,
dialogWidth:'700',
saveBtn:false,
- // height:'auto',
column: [
{
label: '鍙傛暟鍚嶇О',
@@ -392,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;//鏍硅妭鐐逛笉鑳介��
@@ -400,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 = [];
+ }
},
// 澶撮儴鍒锋柊鎸夐挳
@@ -417,7 +439,6 @@
// 鍙充晶琛ㄦ牸淇℃伅
getRightTableList(row) {
- console.log(row);
this.tableLoading = true;
const params = {
plactioncls: row.id ? row.id : ''
@@ -565,9 +586,7 @@
exportAction(params).then(res => {
func.downloadFileByBlobHandler(res);
this.$message.success('瀵煎嚭鎴愬姛');
- }).catch(err => {
- this.$message.error(err);
- })
+ });
},
// action鍒楄〃琛屽垹闄�
@@ -674,27 +693,31 @@
},
// 宸︿晶鏍戝垱寤�
- 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);
this.$set(this.treeForm, 'pidName', name);
- this.$refs.tree.rowAdd();
+ this.$refs.treeCrud.rowAdd();
},
// action鍒嗙被淇濆瓨
- rowTreeSaveHandler(node, data, done, loading) {
- saveActionCls(data).then(res => {
+ rowTreeSaveHandler(row, done, loading) {
+ saveActionCls(row).then(res => {
if (res.data.code === 200) {
this.$message.success('鍒嗙被鍒涘缓鎴愬姛');
this.getTreeList();
@@ -730,15 +753,15 @@
this.$set(this.treeForm, 'pidName', pidName);
this.$set(this.treeForm, 'description', description);
- this.$refs.tree.rowEdit();
+ this.$refs.treeCrud.rowEdit();
},
// action鍒嗙被淇敼淇濆瓨
- rowTreeUpdataHandler(node, data, done, loading) {
- updateActionCls(data).then(res => {
+ rowTreeUpdataHandler(row, done, loading) {
+ updateActionCls(row).then(res => {
if (res.data.code === 200) {
this.$message.success('淇敼鎴愬姛');
- //this.getBottomList();
+ this.getTreeList();
}
done();
})
@@ -759,6 +782,32 @@
}
}
return 'null';
+ },
+
+ // action鍒嗙被淇敼淇濆瓨
+ rowTreeDelHandler( row) {
+ if (row.id === 'root') {
+ this.$message.error('鏍硅妭鐐逛笉鑳藉垹闄�');
+ return;
+ }
+
+ this.$confirm('鎮ㄧ‘瀹氳鍒犻櫎褰撳墠鏁版嵁鍚楋紵', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ deleteActionCls(row).then(res => {
+ if (res.data.code === 200) {
+ this.$message.success('鍒嗙被鍒犻櫎鎴愬姛');
+ this.getTreeList();
+ }
+ })
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: '宸插彇娑堝垹闄�'
+ });
+ });
},
// action鍒嗙被鍒犻櫎
@@ -794,12 +843,18 @@
// action鍒嗙被瀵煎嚭
exportClickHandler() {
-
+ this.$message({
+ type: 'info',
+ message: '寰呭疄鐜�'
+ });
},
// action鍒嗙被瀵煎叆
uploadClickHandler() {
-
+ this.$message({
+ type: 'info',
+ message: '寰呭疄鐜�'
+ });
}
}
@@ -811,8 +866,9 @@
.el-scrollbar__wrap {
overflow: auto !important;
}
+
.avue-dialog .el-dialog__body .avue-form{
- margin: 0 auto;
+ margin: 0 auto !important;
}
}
</style>
--
Gitblit v1.9.3