From 2bccb9ec7bdefe23292a22bc153463cfa1479a49 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 21 六月 2024 16:25:42 +0800
Subject: [PATCH] 2024-06-21
---
src/tabviews/commontable/index.jsx | 44 +++++++++++++++++++++++++++++++++++---------
1 files changed, 35 insertions(+), 9 deletions(-)
diff --git a/src/tabviews/commontable/index.jsx b/src/tabviews/commontable/index.jsx
index 77ef6c6..463dc0b 100644
--- a/src/tabviews/commontable/index.jsx
+++ b/src/tabviews/commontable/index.jsx
@@ -138,8 +138,8 @@
})
})
} else if (userConfig) {
- shortcuts = userConfig.action
- userConfig.printers.forEach(item => {
+ shortcuts = userConfig.action || []
+ userConfig.printers && userConfig.printers.forEach(item => {
window.GLOB.UserCacheMap.set(item.parentId + item.uuid, item)
})
}
@@ -209,7 +209,7 @@
// 瀛楁閫忚鍙婂繀濉爣蹇�
config.search = config.search.map(item => {
- if (['text', 'select', 'link', 'checkcard'].includes(item.type) && param && param.$searchkey === item.field) {
+ if (['text', 'select', 'link', 'checkcard'].includes(item.type) && param && param.$searchkey === item.field.toLowerCase()) {
item.initval = param.$searchval
}
return item
@@ -282,6 +282,8 @@
config.setting.customScript = config.setting.customScript.replace(reg, val)
})
}
+ } else {
+ config.setting.dataresource = ''
}
let _arrField = [] // 瀛楁闆�
@@ -293,6 +295,7 @@
let _actions = [] // 宸ュ叿鏍忔寜閽�
let _operations = [] // 鎿嶄綔鍒楁寜閽紙瀛樺湪鏃讹級
+ let colors = { primary: '#1890ff', yellow: '#c49f47', orange: 'orange', danger: '#ff4d4f', green: '#26C281', dgreen: '#32c5d2', purple: '#8E44AD', cyan: '#13c2c2', gray: '#E7E7EF', default: 'rgba(0, 0, 0, 0.65)' }
config.action.forEach(item => {
item.logLabel = MenuName + '-' + item.label // 鐢ㄤ簬sPC_TableData_InUpDe璁板綍鎿嶄綔鎸夐挳
@@ -302,11 +305,15 @@
if (item.OpenType === 'excelOut') { // 瀵煎嚭
item.$menuName = MenuName
-
- if (!item.verify || !item.verify.columns || item.verify.columns.length === 0) {
- item.errorType = 'error1'
- } else if (item.intertype === 'system' && item.verify.dataType !== 'custom' && config.setting.interType !== 'system') {
- item.errorType = 'error2'
+ }
+
+ if (item.verify && item.verify.invalid === 'true') {
+ if (item.sqlType === 'insert') {
+ item.verify.invalid = 'false'
+ } else if (item.Ot === 'notRequired') {
+ item.verify.invalid = 'false'
+ } else if (item.intertype !== 'system' && item.procMode !== 'system') {
+ item.verify.invalid = 'false'
}
}
@@ -333,11 +340,26 @@
item.controlVals = [(item.controlVal || '')]
}
}
-
+
+ item.show = 'button'
+
+ let _c = item.class ? item.class.replace('border-', '') : ''
+ let color = colors[_c] || '#1890ff'
+
if (item.position === 'toolbar') {
item.$toolbtn = true
+
+ if (item.class === 'default') {
+ item.style = {color: 'rgba(0, 0, 0, 0.65)', backgroundColor: '#fff', borderColor: '#d9d9d9', marginRight: '15px'}
+ } else if (item.class.indexOf('border') > -1) {
+ item.style = {color: color, backgroundColor: '#fff', borderColor: color, marginRight: '15px'}
+ } else {
+ item.style = {color: item.class === 'gray' ? 'rgba(0, 0, 0, 0.65)' : '#fff', backgroundColor: color, borderColor: color, marginRight: '15px'}
+ }
+
_actions.push(item)
} else if (item.position === 'grid') {
+ item.style = {color: color, backgroundColor: 'transparent', borderColor: 'transparent'}
_operations.push(item)
}
})
@@ -575,6 +597,8 @@
let _orderBy = orderBy || setting.order
let param = UtilsDM.getQueryDataParams(setting, search, _orderBy, pageIndex, pageSize, BID)
+ delete param.s_version_up
+
let result = await Api.genericInterface(param)
this.getStatFieldsValue()
@@ -666,6 +690,8 @@
let _orderBy = orderBy || setting.order
let param = UtilsDM.getQueryDataParams(setting, search, _orderBy, pageIndex, pageSize, BID, id)
+ delete param.s_version_up
+
let result = await Api.genericInterface(param)
if (result.status) {
let data = fromJS(this.state.data).toJS()
--
Gitblit v1.8.0