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 | 104 +++++++++++++++++++++++++++++----------------------
1 files changed, 59 insertions(+), 45 deletions(-)
diff --git a/src/tabviews/commontable/index.jsx b/src/tabviews/commontable/index.jsx
index 10dcee9..463dc0b 100644
--- a/src/tabviews/commontable/index.jsx
+++ b/src/tabviews/commontable/index.jsx
@@ -22,8 +22,6 @@
const SubTable = asyncSpinComponent(() => import('@/tabviews/subtable'))
const CardComponent = asyncSpinComponent(() => import('@/tabviews/zshare/cardcomponent'))
const ChartComponent = asyncSpinComponent(() => import('@/tabviews/zshare/chartcomponent'))
-const PagemsgComponent = asyncComponent(() => import('@/tabviews/zshare/pageMessage'))
-const AutoMatic = asyncComponent(() => import('@/tabviews/zshare/automatic'))
const DebugTable = asyncComponent(() => import('@/tabviews/debugtable'))
const { TabPane } = Tabs
@@ -47,7 +45,6 @@
shortcuts: null, // 蹇嵎閿�
actions: null, // 鎸夐挳闆�
columns: null, // 鏄剧ず鍒�
- arr_field: '', // 鏌ヨ瀛楁闆�
setting: null, // 椤甸潰鍏ㄥ眬璁剧疆锛氭暟鎹簮銆佹寜閽強鏄剧ず鍒楀浐瀹氥�佷富閿瓑
data: [], // 鍒楄〃鏁版嵁闆�
selectedData: [], // 宸查�夎〃鏍兼暟鎹�
@@ -63,7 +60,6 @@
statFields: [], // 鍚堣瀛楁
statFValue: [], // 鍚堣鍊�
absFields: [], // 缁濆鍊煎瓧娈�
- hasReqFields: false,
autoMatic: null,
visible: false
}
@@ -117,7 +113,7 @@
}
// HS涓嶄娇鐢ㄨ嚜瀹氫箟璁剧疆
- if (result.LongParamUser && !window.GLOB.mkHS) {
+ if (result.LongParamUser) {
try { // 閰嶇疆淇℃伅瑙ｆ瀽
let userConfig = JSON.parse(window.decodeURIComponent(window.atob(result.LongParamUser)))
if (userConfig && !userConfig.version) {
@@ -142,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,19 +205,13 @@
chartId = config.charts[0] ? config.charts[0].uuid : ''
}
- config.search = Utils.initSearchVal(config.search)
+ Utils.initSearchVal(config)
// 瀛楁閫忚鍙婂繀濉爣蹇�
- let hasReqFields = false
config.search = config.search.map(item => {
- if (['text', 'select', 'link'].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
}
-
- if (item.required) {
- hasReqFields = true
- }
-
return item
})
@@ -263,10 +253,8 @@
}
if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
- config.setting.dataresource = config.setting.dataresource.replace(/\$@/ig, '/*')
- config.setting.dataresource = config.setting.dataresource.replace(/@\$/ig, '*/')
- config.setting.customScript = config.setting.customScript.replace(/\$@/ig, '/*')
- config.setting.customScript = config.setting.customScript.replace(/@\$/ig, '*/')
+ config.setting.dataresource = config.setting.dataresource.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/')
+ config.setting.customScript = config.setting.customScript.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/')
} else {
config.setting.dataresource = config.setting.dataresource.replace(/@\$|\$@/ig, '')
config.setting.customScript = config.setting.customScript.replace(/@\$|\$@/ig, '')
@@ -274,11 +262,6 @@
let userName = sessionStorage.getItem('User_Name') || ''
let fullName = sessionStorage.getItem('Full_Name') || ''
-
- if (sessionStorage.getItem('isEditState') === 'true') {
- userName = sessionStorage.getItem('CloudUserName') || ''
- fullName = sessionStorage.getItem('CloudFullName') || ''
- }
let regs = [
{ reg: /@userName@/ig, value: `'${userName}'` },
@@ -299,6 +282,8 @@
config.setting.customScript = config.setting.customScript.replace(reg, val)
})
}
+ } else {
+ config.setting.dataresource = ''
}
let _arrField = [] // 瀛楁闆�
@@ -310,12 +295,27 @@
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璁板綍鎿嶄綔鎸夐挳
item.$menuId = this.props.MenuID
item.$old = true
item.ContainerId = this.state.ContainerId
+
+ if (item.OpenType === 'excelOut') { // 瀵煎嚭
+ item.$menuName = MenuName
+ }
+
+ 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'
+ }
+ }
if (item.OpenType === 'funcbutton' && item.funcType === 'print' && item.verify) { // 鎵撳嵃鏈鸿缃�
let _item = window.GLOB.UserCacheMap.get(this.props.MenuID + item.uuid)
@@ -340,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)
}
})
@@ -356,7 +371,7 @@
if (col.linkmenu && col.linkmenu.length > 0) {
let menu_id = col.linkmenu.slice(-1)[0]
- col.linkThdMenu = window.GLOB.mkThdMenus.filter(m => m.MenuID === menu_id)[0] || ''
+ col.linkThdMenu = window.GLOB.mkThdMenus.get(menu_id) || ''
} else {
col.linkThdMenu = ''
}
@@ -457,6 +472,8 @@
resetContrl: config.setting.resetContrl,
}
+ config.setting.arr_field = _arrField.join(',')
+
this.setState({
pageSize: config.setting.pageSize || 10,
loadingview: false,
@@ -469,10 +486,8 @@
setting: config.setting,
actions: _actions,
columns: _columns,
- arr_field: _arrField.join(','),
BID: param && param.$BID ? param.$BID : '',
- search: Utils.initMainSearch(config.search),
- hasReqFields
+ search: Utils.initMainSearch(config.search)
}, () => {
if (config.setting.onload !== 'false') { // 鍒濆鍖栧彲鍔犺浇
this.loadData()
@@ -513,7 +528,6 @@
let _shortcut = `${preKey}+${keyCode}`
if (window.GLOB.breakpoint && _shortcut === 'ctrl+67') {
- window.debugger = false
window.GLOB.breakpoint = false
sessionStorage.removeItem('breakpoint')
@@ -540,14 +554,14 @@
loadData = (id) => {
const { MenuID } = this.props
- const { setting, search, hasReqFields, ContainerId } = this.state
+ const { setting, search, config, ContainerId } = this.state
this.setState({
selectedData: []
})
MKEmitter.emit('changeTableLine', ContainerId, MenuID, '', '')
- if (hasReqFields) {
+ if (config.$s_req) {
let requireFields = search.filter(item => item.required && item.value === '')
if (requireFields.length > 0) {
@@ -574,14 +588,16 @@
* @description 涓昏〃鏁版嵁鍔犺浇
*/
async loadmaindata (id) {
- const { setting, arr_field, search, orderBy, BID, pageIndex, pageSize, absFields, autoMatic } = this.state
+ const { setting, search, orderBy, BID, pageIndex, pageSize, absFields, autoMatic } = this.state
this.setState({
loading: true
})
let _orderBy = orderBy || setting.order
- let param = UtilsDM.getQueryDataParams(setting, arr_field, search, _orderBy, pageIndex, pageSize, BID)
+ let param = UtilsDM.getQueryDataParams(setting, search, _orderBy, pageIndex, pageSize, BID)
+
+ delete param.s_version_up
let result = await Api.genericInterface(param)
@@ -665,14 +681,16 @@
* @description 鑾峰彇鍗曡鏁版嵁
*/
async loadmainLinedata (id) {
- const { setting, arr_field, search, orderBy, BID, pageIndex, pageSize, absFields } = this.state
+ const { setting, search, orderBy, BID, pageIndex, pageSize, absFields } = this.state
this.setState({
loading: true
})
let _orderBy = orderBy || setting.order
- let param = UtilsDM.getQueryDataParams(setting, arr_field, search, _orderBy, pageIndex, pageSize, BID, id)
+ 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) {
@@ -864,16 +882,14 @@
* @description 瀵煎嚭Excel鏃讹紝鑾峰彇椤甸潰鎼滅储鎺掑簭绛夊弬鏁�
*/
queryModuleParam = (menuId, callback) => {
- const { MenuName, MenuID } = this.props
- const { arr_field, orderBy, search, setting} = this.state
+ const { MenuID } = this.props
+ const { orderBy, search, setting } = this.state
if (MenuID !== menuId) return
callback({
- arr_field: arr_field,
orderBy: orderBy || setting.order,
- search: search,
- menuName: MenuName
+ search: search
})
}
@@ -1006,7 +1022,7 @@
render() {
const { MenuID } = this.props
- const { BID, setting, pageSize, actions, columns, loadingview, viewlost, pickup, config, chartId, search, selectedData, shortcuts, autoMatic } = this.state
+ const { BID, setting, pageSize, actions, columns, loadingview, viewlost, pickup, config, chartId, search, selectedData, shortcuts } = this.state
return (
<div className="commontable" id={this.state.ContainerId}>
@@ -1144,9 +1160,7 @@
</Tabs>))
}
{setting && window.GLOB.breakpoint ? <DebugTable /> : null}
- {!window.GLOB.mkHS && autoMatic ? <AutoMatic autoMatic={autoMatic} config={config} /> : null}
- {!window.GLOB.mkHS && window.GLOB.systemType !== 'production' ? <PagemsgComponent menu={{MenuName: this.props.MenuName, MenuNo: this.props.MenuNo}} config={config}/> : null}
- {!window.GLOB.mkHS && setting ? <SettingComponent config={config} shortcuts={shortcuts || []}/> : null}
+ {setting ? <SettingComponent config={config} shortcuts={shortcuts || []}/> : null}
{viewlost ? <NotFount msg={this.state.lostmsg} /> : null}
</div>
)
--
Gitblit v1.8.0