From f22211dcc3767d8fb50a37eb424a258a12fe626b Mon Sep 17 00:00:00 2001
From: wangting <wangting@vci-tech.com>
Date: 星期三, 08 一月 2025 15:44:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/index.vue | 105 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 78 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 b403bec..3e14dae 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
@@ -12,7 +12,7 @@
@node-click="nodeClick">
<span slot-scope="{ node, data }" class="el-tree-node__label">
<span style="display: flex">
- <icon-show :name="data.icon"></icon-show>
+ <icon-show v-if="data.icon" :name="data.icon"></icon-show>
{{ (node || {}).label }}
</span>
</span>
@@ -34,22 +34,42 @@
@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 v-if="permissionList.addBtn" class="button-custom-icon" plain size="small" type="primary"
+ @click="addTreeClickHandler(treeNodeRow)">
+ <icon-show :name="permissionList.addBtn.source"></icon-show>
+ 鍒涘缓
</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 v-if="permissionList.importBtn" class="button-custom-icon" plain size="small" type="primary" @click="uploadClickHandler">
+ <icon-show :name="permissionList.importBtn.source"></icon-show>
+ 瀵煎叆
</el-button>
- <el-button v-if="permissionList.exportBtn" icon="el-icon-download" plain size="small" type="primary" @click="exportClickHandler">瀵煎嚭
+ <el-button v-if="permissionList.exportBtn" class="button-custom-icon" plain size="small" type="primary" @click="exportClickHandler">
+ <icon-show :name="permissionList.exportBtn.source"></icon-show>
+ 瀵煎嚭
</el-button>
</template>
- <template #menu="{ row, size }">
- <el-button v-if="permissionList.addBtn" :size="size" icon="el-icon-plus"
+ <template #menu="{ row, index, size }">
+ <el-button v-if="permissionList.editBtn" size="small" type="text"
+ @click="$refs.treeCrud.rowEdit(row, index)">
+ <icon-show :name="permissionList.editBtn.source"></icon-show>
+ 缂栬緫
+ </el-button>
+ <el-button v-if="permissionList.delBtn" size="small" type="text"
+ @click.stop="rowTreeDelHandler(row,index)">
+ <icon-show :name="permissionList.delBtn.source"></icon-show>
+ 鍒犻櫎
+ </el-button>
+ <el-button v-if="permissionList.addBtn" :size="size"
text
type="text"
- @click="addTreeClickHandler(row)">鏂板瀛愮骇</el-button>
+ @click="addTreeClickHandler(row)">
+ <icon-show :name="permissionList.addBtn.source"></icon-show>
+ 鏂板瀛愮骇
+ </el-button>
</template>
</avue-crud>
</div>
@@ -85,10 +105,26 @@
</el-tag>
</template>
<template slot="menuLeft" slot-scope="scope">
- <el-button v-if="treeNodeRow.id !== 'root' && permissionList.actionTopAddBtn" icon="el-icon-plus" plain size="small" type="primary"
- @click="addClickHandler">澧炲姞
+ <el-button v-if="treeNodeRow.id !== 'root' && permissionList.actionTopAddBtn" class="button-custom-icon" plain size="small" type="primary"
+ @click="addClickHandler">
+ <icon-show :name="permissionList.actionTopAddBtn.source"></icon-show>
+ 澧炲姞
</el-button>
- <el-button v-if="permissionList.actionTopExportBtn" icon="el-icon-download" plain size="small" type="success" @click="downLoadHandler">瀵煎嚭
+ <el-button v-if="permissionList.actionTopExportBtn" class="button-custom-icon" plain size="small" type="success" @click="downLoadHandler">
+ <icon-show :name="permissionList.actionTopExportBtn.source"></icon-show>
+ 瀵煎嚭
+ </el-button>
+ </template>
+ <template #menu="{row,index,size}">
+ <el-button v-if="permissionList.actionTopEditBtn" size="small" type="text"
+ @click="$refs.crud.rowEdit(row, index)">
+ <icon-show :name="permissionList.actionTopEditBtn.source"></icon-show>
+ 缂栬緫
+ </el-button>
+ <el-button v-if="permissionList.actionTopDelBtn" size="small" type="text"
+ @click.stop="rowDelHandler(row,index)">
+ <icon-show :name="permissionList.actionTopDelBtn.source"></icon-show>
+ 鍒犻櫎
</el-button>
</template>
</avue-crud>
@@ -106,7 +142,21 @@
@row-del="BottomRowDelHandler"
>
<template slot="menuLeft" slot-scope="scope">
- <el-button v-if="permissionList.actionBottomAddBtn" icon="el-icon-plus" plain size="small" type="primary" @click="bottomAddClickHandler">澧炲姞
+ <el-button v-if="permissionList.actionBottomAddBtn" class="button-custom-icon" plain size="small" type="primary" @click="bottomAddClickHandler">
+ <icon-show :name="permissionList.actionBottomAddBtn.source"></icon-show>
+ 澧炲姞
+ </el-button>
+ </template>
+ <template #menu="{row,index,size}">
+ <el-button v-if="permissionList.actionBottomEditBtn" size="small" type="text"
+ @click="$refs.BottomCrud.rowEdit(row, index)">
+ <icon-show :name="permissionList.actionBottomEditBtn.source"></icon-show>
+ 缂栬緫
+ </el-button>
+ <el-button v-if="permissionList.actionBottomDelBtn" size="small" type="text"
+ @click.stop="BottomRowDelHandler(row,index)">
+ <icon-show :name="permissionList.actionBottomDelBtn.source"></icon-show>
+ 鍒犻櫎
</el-button>
</template>
<template slot="menuForm" slot-scope="scope">
@@ -203,20 +253,20 @@
editBtn: this.vaildData(this.permission[this.$route.query.id].EDIT, false),
exportBtn: this.vaildData(this.permission[this.$route.query.id].EXPORT, false),
importBtn: this.vaildData(this.permission[this.$route.query.id].IMPORT, false),
- actionTopAddBtn: this.vaildData(this.permission[this.$route.query.id].actionTopAdd, false),
- actionTopDelBtn: this.vaildData(this.permission[this.$route.query.id].actionTopDel, false),
- actionTopEditBtn: this.vaildData(this.permission[this.$route.query.id].actionTopEdit, false),
- actionTopExportBtn: this.vaildData(this.permission[this.$route.query.id].actionTopExport, false),
- actionBottomAddBtn: this.vaildData(this.permission[this.$route.query.id].actionBottomAdd, false),
- actionBottomDelBtn: this.vaildData(this.permission[this.$route.query.id].actionBottomDel, false),
- actionBottomEditBtn: this.vaildData(this.permission[this.$route.query.id].actionBottomEdit, false),
+ actionTopAddBtn: this.vaildData(this.permission[this.$route.query.id].USE, false),
+ actionTopDelBtn: this.vaildData(this.permission[this.$route.query.id].RESET, false),
+ actionTopEditBtn: this.vaildData(this.permission[this.$route.query.id].RECYCLE, false),
+ actionTopExportBtn: this.vaildData(this.permission[this.$route.query.id].DOWNLOADFILE, false),
+ actionBottomAddBtn: this.vaildData(this.permission[this.$route.query.id].FREEZE, false),
+ actionBottomDelBtn: this.vaildData(this.permission[this.$route.query.id].BATCHAPPLY, false),
+ actionBottomEditBtn: this.vaildData(this.permission[this.$route.query.id].CODEAPPLY, false),
};
},
treeCrudOption(){
return {
...basicOption,
- editBtn: this.permissionList.editBtn,
- delBtn: this.permissionList.delBtn,
+ editBtn: false,
+ delBtn: false,
addBtn: false,
calcHeight: -50,
highlightCurrentRow: true,
@@ -259,8 +309,8 @@
option() {
return {
...basicOption,
- editBtn:this.permissionList.actionTopEditBtn,
- delBtn:this.permissionList.actionTopDelBtn,
+ editBtn:false,
+ delBtn:false,
addBtn: false,
height: 350,
highlightCurrentRow: true,
@@ -304,7 +354,7 @@
{
required: true,
message: '璇烽�夋嫨鍥炬爣',
- trigger: 'blur'
+ trigger: 'submit'
}
]
},
@@ -312,7 +362,7 @@
label: '鍒嗙被',
prop: 'plActionCls',
type: 'tree',
- hide: true,
+ defaultExpandedKeys:['root'],
props: {
label: 'name',
value: 'id',
@@ -376,8 +426,8 @@
return {
...basicOption,
addBtn: false,
- editBtn:this.permissionList.actionBottomEditBtn,
- delBtn:this.permissionList.actionBottomDelBtn,
+ editBtn:false,
+ delBtn:false,
calcHeight: -20,
selection: false,
refreshBtn: false,
@@ -424,8 +474,9 @@
this.treeData = this.treeDataFormAtter([data],'Action鍒嗙被');
const selectTreeData = this.option.column.find(item => item.prop === 'plActionCls'); // 鎵惧埌action娣诲姞鍒嗙被鏍�
const dicData=this.treeData;
- dicData[0].disabled=true;//鏍硅妭鐐逛笉鑳介��
+ dicData[0].disabled=true;//鍒嗙被鏍硅妭鐐逛笉鑳介��
selectTreeData.dicData = dicData;
+ selectTreeData.hide=true;//闅愯棌鍒嗙被鍒椼�備笉鑳界洿鎺ュ湪option璁剧疆锛屼細瀵煎嚭dicData鍔犺浇涓嶅嚭
})
},
--
Gitblit v1.9.3