From 400fee62fb40006a9839f1c3a8244b82566b5057 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 08 五月 2025 16:30:39 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/basetable/index.jsx | 207 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 164 insertions(+), 43 deletions(-)
diff --git a/src/tabviews/basetable/index.jsx b/src/tabviews/basetable/index.jsx
index 565fea4..2c95369 100644
--- a/src/tabviews/basetable/index.jsx
+++ b/src/tabviews/basetable/index.jsx
@@ -2,6 +2,7 @@
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
import { notification, Spin, Row, Col } from 'antd'
+import md5 from 'md5'
import Api from '@/api'
import Utils from '@/utils/utils.js'
@@ -16,6 +17,7 @@
const FlowFloat = asyncComponent(() => import('@/tabviews/zshare/flowFloat'))
const SettingComponent = asyncComponent(() => import('@/tabviews/zshare/settingcomponent'))
const TableNodes = asyncComponent(() => import('@/tabviews/zshare/tablenodes'))
+const DeepSeek = asyncComponent(() => import('@/tabviews/zshare/deepseek'))
const AutoMatic = asyncComponent(() => import('@/tabviews/zshare/automatic'))
const DebugTable = asyncComponent(() => import('@/tabviews/debugtable'))
@@ -38,18 +40,24 @@
userConfig: null, // 鐢ㄦ埛鑷畾涔夎缃�
visible: false, // 鏍囩椤垫帶鍒�
shortcuts: null, // 蹇嵎閿�
- autoMatic: null
+ autoMatic: null,
+ noParam: false
}
/**
* @description 鑾峰彇椤甸潰閰嶇疆淇℃伅
*/
async loadconfig () {
- const { MenuID, MenuName } = this.props
+ const { MenuID, MenuName, param } = this.props
+ const { noParam } = this.state
let _param = {
func: 'sPC_Get_LongParam',
MenuID: MenuID
+ }
+
+ if (window.GLOB.mkHS) {
+ _param.lang = 'zh-CN'
}
let result = await Api.getCacheConfig(_param)
@@ -148,8 +156,8 @@
try { // 閰嶇疆淇℃伅瑙ｆ瀽
let userConfig = JSON.parse(window.decodeURIComponent(window.atob(result.LongParamUser)))
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)
})
}
@@ -161,9 +169,46 @@
// 鏉冮檺杩囨护
let roleId = sessionStorage.getItem('role_id') || '' // 瑙掕壊ID
let skip = window.GLOB.mkHS
- let param = this.props.param || {} // url鍙傛暟
+ let urlparam = {} // url鍙傛暟
+ if (param) {
+ if (!noParam) {
+ Object.keys(param).forEach(key => {
+ if (/^\$/.test(key)) {
+ urlparam[key] = param[key]
+ } else {
+ urlparam[key.toLowerCase()] = param[key]
+ }
+ })
+ } else {
+ urlparam.$BID = param.$BID
+ }
+ }
- window.GLOB.CacheData.set(MenuID, param)
+ if (config.urlFields && config.urlFields.length) {
+ config.urlFields.forEach(field => {
+ let key = field.toLowerCase()
+ if (urlparam[key] !== undefined) return
+
+ urlparam[key] = ''
+ })
+ }
+
+ window.GLOB.CacheData.set(MenuID, urlparam)
+
+ if (window.backend && config.allSqls) {
+ let keys = Object.keys(urlparam)
+ config.allSqls.forEach(item => {
+ item.id = md5(window.GLOB.appkey + item.v_id)
+ if (['datasource', 'interface', 'excelOut'].includes(item.type)) {
+ item.urlkeys = keys
+ item.urlparam = urlparam
+ if (config.flow_code) {
+ item.works_flow_code = config.flow_code
+ }
+ }
+ window.GLOB.CacheData.set('sql_' + item.uuid, item)
+ })
+ }
let userName = sessionStorage.getItem('User_Name') || ''
let fullName = sessionStorage.getItem('Full_Name') || ''
@@ -181,7 +226,7 @@
}
if (config.urlFields) {
config.urlFields.forEach(field => {
- let val = `'${param[field] || ''}'`
+ let val = `'${urlparam[field.toLowerCase()]}'`
regs.push({
reg: new RegExp('@' + field + '@', 'ig'),
value: val
@@ -193,7 +238,7 @@
regs.push({ reg: /@works_flow_code@/ig, value: `'${config.flow_code}'` })
}
- config.components = this.filterComponent(config.components, roleId, window.GLOB.mkActions, skip, param, MenuID, config.MenuName, config.process === 'true')
+ config.components = this.filterComponent(config.components, roleId, window.GLOB.mkActions, skip, urlparam, MenuID, config.MenuName, config.process === 'true')
let autoMatic = null
if (config.autoMatic && config.autoMatic.enable === 'true') {
@@ -208,22 +253,10 @@
}
})
}
-
+
// 鑾峰彇涓绘悳绱㈡潯浠�
config.components.forEach(component => {
if (component.type === 'tabs') return
-
- if (param.$searchkey) {
- component.search = component.search.map(item => {
- if (['text', 'select', 'link', 'checkcard'].includes(item.type) && param.$searchkey === item.field) {
- item.initval = param.$searchval
- }
-
- return item
- })
-
- component.$searches = Utils.initMainSearch(component.search)
- }
if (component.$searches.length) {
component.$main = true
@@ -236,7 +269,7 @@
}
})
- let BID = param.$BID || ''
+ let BID = urlparam.$BID || ''
config.components = this.formatSetting(config.components, regs)
@@ -346,11 +379,6 @@
item.name = (MenuName || '')
}
- // 鎼滅储鏉′欢鍒濆鍖�
- Utils.initSearchVal(item)
-
- item.$searches = Utils.initMainSearch(item.search)
-
if (item.setting.supModule) {
let pid = item.setting.supModule.pop()
if (pid && pid !== 'empty') {
@@ -359,6 +387,20 @@
item.setting.supModule = ''
}
}
+
+ // 鎼滅储鏉′欢鍒濆鍖�
+ Utils.initSearchVal(item)
+
+ if (urlparam.$searchkey) {
+ let reg = new RegExp('(^|,)' + urlparam.$searchkey + '($|,)', 'ig')
+ item.search.forEach(cell => {
+ if (reg.test(cell.field) && ['text', 'select', 'link', 'checkcard'].includes(cell.type)) {
+ cell.initval = urlparam.$searchval
+ }
+ })
+ }
+
+ item.$searches = Utils.initMainSearch(item.search)
let statFields = []
let getCols = (cols) => {
@@ -371,7 +413,10 @@
col.type = 'custom'
}
- if (col.type === 'number') {
+ if (col.type === 'index') {
+ col.field = '$Index'
+ col.type = 'text'
+ } else if (col.type === 'number') {
if (col.sum === 'true') {
statFields.push(col)
}
@@ -397,7 +442,7 @@
cell = this.getPrinter(cell, item.uuid)
}
- return skip || permAction[cell.uuid]
+ return skip || permAction[cell.uuid] || cell.permission === 'false'
} else if (['text', 'number', 'formula'].includes(cell.eleType)) {
if (!cell.height) {
cell.innerHeight = 'auto'
@@ -409,6 +454,22 @@
}
}
}
+
+ if (cell.linkmenu && cell.linkmenu.length > 0) {
+ let menu_id = cell.linkmenu.pop()
+ cell.linkThdMenu = window.GLOB.mkThdMenus.get(menu_id) || ''
+ if (!cell.linkThdMenu) {
+ cell.link = ''
+ }
+ }
+
+ if (cell.marks && cell.marks.length === 0) {
+ cell.marks = null
+ }
+ if (cell.anchors && cell.anchors.length === 0) {
+ cell.anchors = null
+ }
+
return true
})
@@ -422,6 +483,10 @@
col.linkThdMenu = window.GLOB.mkThdMenus.get(menu_id) || ''
} else {
col.linkThdMenu = ''
+ }
+
+ if (col.marks && col.marks.length === 0) {
+ col.marks = null
}
return true
@@ -444,7 +509,7 @@
cell = this.getPrinter(cell, item.uuid)
}
- return skip || permAction[cell.uuid]
+ return skip || permAction[cell.uuid] || cell.permission === 'false'
})
}
@@ -475,12 +540,56 @@
}
if (cell.OpenType === 'excelOut') { // 瀵煎嚭
- cell.$menuName = item.name
+ cell.$menuName = item.$menuname
+ } else if (cell.OpenType === 'pop' && cell.modal) {
+ cell.modal.uuid = cell.uuid + '_pop'
+ }
- if (!cell.verify || !cell.verify.columns || cell.verify.columns.length === 0) {
- cell.errorType = 'error1'
- } else if (cell.intertype === 'system' && cell.verify.dataType !== 'custom' && item.setting.interType !== 'system') {
- cell.errorType = 'error2'
+ if (cell.verify) {
+ if (cell.verify.invalid === 'true') {
+ if (item.setting && item.setting.maxScript && item.setting.maxScript >= 300) {
+ cell.verify.invalid = 'false'
+ } else if (cell.intertype !== 'system' && cell.procMode !== 'system') {
+ cell.verify.invalid = 'false'
+ } else if (cell.sqlType === 'insert') {
+ cell.verify.invalid = 'false'
+ } else if (cell.Ot === 'notRequired') {
+ cell.verify.invalid = 'false'
+ }
+ }
+
+ if (cell.verify.linkEnable === 'true' && /@/.test(cell.verify.linkUrl)) {
+ cell.returnValue = 'true'
+ }
+
+ if (cell.verify.preHandle === 'true') {
+ let script = cell.verify.pre_func
+ if (!/#position-/.test(script) || /#position-init/.test(script)) {
+ try {
+ // eslint-disable-next-line
+ let func = new Function('btn', 'position', 'systemType', script)
+ func(cell, 'init', window.GLOB.systemType)
+ } catch (e) {
+ console.warn(e)
+ }
+ }
+ if (/#position-inner/.test(script)) {
+ cell.$innerScript = script
+
+ if (window.backend && window.GLOB.CacheData.has('sql_' + cell.uuid) && !/\$backend/.test(script)) {
+ window.GLOB.CacheData.delete('sql_' + cell.uuid)
+ }
+ }
+ if (/#position-outer/.test(script)) {
+ cell.$outerScript = script
+ }
+ if (/#position-callback/.test(script)) {
+ cell.$callbackScript = script
+
+ if (window.backend && window.GLOB.CacheData.has('sql_back_' + cell.uuid) && !/\$backend/.test(script)) {
+ window.GLOB.CacheData.delete('sql_back_' + cell.uuid)
+ }
+ }
}
}
@@ -492,6 +601,7 @@
}
} else if (cell.syncComponentId === 'multiComponent') {
let ids = cell.syncComponents.map(m => {
+ if (Array.isArray(m)) return m.pop() || ''
return m.syncComId.pop() || ''
})
@@ -557,9 +667,12 @@
if (component.setting.interType !== 'system') { // 涓嶄娇鐢ㄧ郴缁熷嚱鏁版椂
component.setting.sync = 'false'
+ component.setting.dataresource = ''
component.setting.laypage = component.setting.laypage === 'true'
return component
}
+
+ component.setting.uuid = component.uuid
let _customScript = ''
let _tailScript = ''
@@ -583,9 +696,6 @@
if (!component.setting.execute) {
component.setting.dataresource = ''
}
- if (/\s/.test(component.setting.dataresource)) {
- component.setting.dataresource = '(' + component.setting.dataresource + ') tb'
- }
if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
component.setting.dataresource = component.setting.dataresource.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
@@ -605,26 +715,35 @@
component.setting.customScript = _customScript // 鏁寸悊鍚庤嚜瀹氫箟鑴氭湰
component.setting.tailScript = _tailScript // 鍚庣疆鑷畾涔夎剼鏈�
+ component.setting.custompage = false
- component.setting.custompage = /@pageSize@|@orderBy@/i.test(component.setting.dataresource + component.setting.customScript)
+ if (/order\s+by\s+sort_id\s*$/i.test(component.setting.dataresource)) {
+ component.setting.custompage = true
+ } else if (/@pageSize@|@orderBy@|@mk_total/i.test(component.setting.dataresource + component.setting.customScript)) {
+ component.setting.custompage = true
+ }
+
+ if (/\s/.test(component.setting.dataresource)) {
+ component.setting.dataresource = '(' + component.setting.dataresource + ') tb'
+ }
if (!component.setting.execute || component.setting.custompage) {
component.forbidLine = true
}
- component.setting.delay = delay
+ component.setting.delay = delay + (component.setting.delay || 0)
delay += 20
return component
})
}
- reloadMenuView = (menuId) => {
+ reloadMenuView = (menuId, clear) => {
const { MenuID } = this.props
if (MenuID !== menuId) return
- this.reloadview()
+ this.reloadview(clear)
}
resetActiveMenu = (menuId) => {
@@ -686,7 +805,7 @@
})
}
- reloadview = () => {
+ reloadview = (clear) => {
window.GLOB.CacheData.delete(this.props.MenuID)
if (this.state.config) {
this.deleteCache(this.state.config.components)
@@ -698,6 +817,7 @@
viewlost: false, // 椤甸潰涓㈠け锛�1銆佹湭鑾峰彇鍒伴厤缃�-椤甸潰涓㈠け锛�2銆侀〉闈㈡湭鍚敤
config: null, // 椤甸潰閰嶇疆淇℃伅锛屽寘鎷粍浠剁瓑
shortcuts: null,
+ noParam: clear === true
}, () => {
this.loadconfig()
})
@@ -749,6 +869,7 @@
{config.process === 'true' ? <FlowFloat config={config}/> : null}
<SettingComponent config={config} shortcuts={shortcuts || []}/>
<TableNodes config={config} />
+ <DeepSeek/>
</div>
</div>
)
--
Gitblit v1.8.0