From 888095418c902cc94693cba8b45f31bb79cdf818 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 28 二月 2020 01:31:46 +0800
Subject: [PATCH] 2020-02-28
---
src/tabviews/commontable/index.jsx | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/src/tabviews/commontable/index.jsx b/src/tabviews/commontable/index.jsx
index 47c50fa..704f247 100644
--- a/src/tabviews/commontable/index.jsx
+++ b/src/tabviews/commontable/index.jsx
@@ -119,6 +119,28 @@
// config[group] = config[group].filter(tab => permAction[tab.uuid])
// })
+ let _actions = [] // 宸ュ叿鏍忔寜閽�
+ let _operations = [] // 鎿嶄綔鍒楁寜閽紙瀛樺湪鏃讹級
+
+ config.action.forEach(item => {
+ if (item.execMode) {
+ item.OpenType = 'funcbutton'
+ }
+
+ if (item.position === 'toolbar') {
+ _actions.push(item)
+ } else if (item.position === 'grid') {
+ _operations.push(item)
+ }
+ })
+
+ if (config.gridBtn && config.gridBtn.display && _operations.length > 0) {
+ _columns.push({
+ ...config.gridBtn,
+ operations: _operations
+ })
+ }
+
// 1銆佺瓫閫夊瓧娈甸泦锛�2銆佽繃婊ら殣钘忓垪鍙婂悎骞跺垪涓殑瀛楁uuid
config.columns.forEach(col => {
@@ -158,17 +180,6 @@
}
})
- let _actions = config.action.filter(item => item.position === 'toolbar') // 杩囨护宸ュ叿鏍忔寜閽�
- let _operations = config.action.filter(item => item.position === 'grid') // 娣诲姞鎿嶄綔鍒楋紙瀛樺湪鏃讹級
-
- if (config.gridBtn && config.gridBtn.display && _operations.length > 0) {
- _columns.push({
- ...config.gridBtn,
- operations: _operations
- })
- }
-
-
let _isLinkMain = false // 妫�鏌ユ槸鍚︽湁涓庝富琛ㄥ叧鑱旂殑瀛愯〃
config.tabgroups.forEach(groupId => {
if (!config[groupId] || config[groupId].length === 0) return
--
Gitblit v1.8.0