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/custom/index.jsx | 112 +++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 87 insertions(+), 25 deletions(-)
diff --git a/src/tabviews/custom/index.jsx b/src/tabviews/custom/index.jsx
index 88009a6..36e091f 100644
--- a/src/tabviews/custom/index.jsx
+++ b/src/tabviews/custom/index.jsx
@@ -49,6 +49,7 @@
const DebugTable = asyncComponent(() => import('@/tabviews/debugtable'))
const FlowFloat = asyncComponent(() => import('@/tabviews/zshare/flowFloat'))
const TableNodes = asyncComponent(() => import('@/tabviews/zshare/tablenodes'))
+const DeepSeek = asyncComponent(() => import('@/tabviews/zshare/deepseek'))
const MkInterfaces = asyncComponent(() => import('@/tabviews/custom/components/interfaces'))
class CustomPage extends Component {
@@ -69,7 +70,8 @@
loading: false, // 鍒楄〃鏁版嵁鍔犺浇涓�
visible: false, // 鏍囩椤垫帶鍒�
shortcuts: null, // 蹇嵎閿�
- loadinginter: false
+ loadinginter: false,
+ noParam: false
}
stepInter = null
@@ -79,10 +81,15 @@
*/
async loadconfig () {
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)
@@ -209,12 +216,25 @@
let skip = config.permission === 'false' || window.GLOB.mkHS
let urlparam = {} // url鍙傛暟
if (param) {
- Object.keys(param).forEach(key => {
- if (/^\$/.test(key)) {
- urlparam[key] = param[key]
- } else {
- urlparam[key.toLowerCase()] = param[key]
- }
+ 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
+ }
+ }
+
+ if (config.urlFields && config.urlFields.length) {
+ config.urlFields.forEach(field => {
+ let key = field.toLowerCase()
+ if (urlparam[key] !== undefined) return
+
+ urlparam[key] = ''
})
}
@@ -224,7 +244,7 @@
let keys = Object.keys(urlparam)
config.allSqls.forEach(item => {
item.id = md5(window.GLOB.appkey + item.v_id)
- if (item.type === 'datasource' || item.type === 'excelOut') {
+ if (['datasource', 'interface', 'excelOut'].includes(item.type)) {
item.urlkeys = keys
item.urlparam = urlparam
if (config.flow_code) {
@@ -251,7 +271,7 @@
}
if (config.urlFields) {
config.urlFields.forEach(field => {
- let val = `'${urlparam[field.toLowerCase()] || ''}'`
+ let val = `'${urlparam[field.toLowerCase()]}'`
regs.push({
reg: new RegExp('@' + field + '@', 'ig'),
value: val
@@ -583,8 +603,9 @@
Utils.initSearchVal(item)
if (urlparam.$searchkey) {
+ let reg = new RegExp('(^|,)' + urlparam.$searchkey + '($|,)', 'ig')
item.search.forEach(cell => {
- if (urlparam.$searchkey === cell.field.toLowerCase() && ['text', 'select', 'link', 'checkcard'].includes(cell.type)) {
+ if (reg.test(cell.field) && ['text', 'select', 'link', 'checkcard'].includes(cell.type)) {
cell.initval = urlparam.$searchval
}
})
@@ -700,6 +721,12 @@
item.setting.tableMode = 'compatible'
item.setting.extendTime = moment().format('YYYY-MM-DD HH:mm:ss')
item.colsCtrls = null
+ }
+
+ if (item.wrap.tree === 'true') {
+ item.setting.sync = 'false'
+ item.$cache = false
+ item.setting.$tree = true
}
if (item.subtype === 'editable') {
@@ -824,6 +851,13 @@
group.subButton = this.resetButton(item, group.subButton)
+ if (group.subButton.linkmenu) {
+ if (Array.isArray(group.subButton.linkmenu) && group.subButton.linkmenu.length > 0) {
+ group.subButton.openmenu = group.subButton.linkmenu
+ }
+ delete group.subButton.linkmenu
+ }
+
if (item.$cache && item.$time) { // 琛ㄥ崟缂撳瓨
group.$cache = item.$cache
group.$time = item.$time
@@ -893,12 +927,9 @@
delete item.scripts
item.setting.$name = item.$menuname || ''
item.setting.execute = item.setting.execute !== 'false' // 榛樿sql鏄惁鎵ц锛岃浆涓篵oolean 缁熶竴鏍煎紡
-
+
if (!item.setting.execute) {
item.setting.dataresource = ''
- }
- if (/\s/.test(item.setting.dataresource)) {
- item.setting.dataresource = '(' + item.setting.dataresource + ') tb'
}
if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
@@ -920,7 +951,17 @@
item.setting.customScript = _customScript // 鏁寸悊鍚庤嚜瀹氫箟鑴氭湰
item.setting.tailScript = _tailScript // 鍚庣疆鑷畾涔夎剼鏈�
- item.setting.custompage = /@pageSize@|@orderBy@|@mk_total/i.test(item.setting.dataresource + item.setting.customScript)
+ item.setting.custompage = false
+
+ if (/order\s+by\s+sort_id\s*$/i.test(item.setting.dataresource)) {
+ item.setting.custompage = true
+ } else if (item.setting.$tree || /@pageSize@|@orderBy@|@mk_total/i.test(item.setting.dataresource + item.setting.customScript)) {
+ item.setting.custompage = true
+ }
+
+ if (/\s/.test(item.setting.dataresource)) {
+ item.setting.dataresource = '(' + item.setting.dataresource + ') tb'
+ }
if (!item.setting.execute || item.setting.custompage) {
item.forbidLine = true
@@ -981,7 +1022,7 @@
cell.modal.$cache = item.$cache
cell.modal.$time = item.$time
}
- cell.modal.uuid = cell.uuid + 'pop'
+ cell.modal.uuid = cell.uuid + '_pop'
}
if (cell.verify) {
@@ -1020,12 +1061,20 @@
}
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)
+ }
}
}
}
@@ -1038,6 +1087,7 @@
}
} else if (cell.syncComponentId === 'multiComponent') {
let ids = cell.syncComponents.map(m => {
+ if (Array.isArray(m)) return m.pop() || ''
return m.syncComId.pop() || ''
})
@@ -1344,9 +1394,6 @@
if (!inter.setting.execute) {
inter.setting.dataresource = ''
}
- if (/\s/.test(inter.setting.dataresource)) {
- inter.setting.dataresource = '(' + inter.setting.dataresource + ') tb'
- }
if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
inter.setting.dataresource = inter.setting.dataresource.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
@@ -1366,8 +1413,17 @@
inter.setting.customScript = _customScript // 鏁寸悊鍚庤嚜瀹氫箟鑴氭湰
inter.setting.tailScript = _tailScript // 鍚庣疆鑷畾涔夎剼鏈�
+ inter.setting.custompage = false
- inter.setting.custompage = /@pageSize@|@orderBy@|@mk_total/i.test(inter.setting.dataresource + inter.setting.customScript)
+ if (/order\s+by\s+sort_id\s*$/i.test(inter.setting.dataresource)) {
+ inter.setting.custompage = true
+ } else if (/@pageSize@|@orderBy@|@mk_total/i.test(inter.setting.dataresource + inter.setting.customScript)) {
+ inter.setting.custompage = true
+ }
+
+ if (/\s/.test(inter.setting.dataresource)) {
+ inter.setting.dataresource = '(' + inter.setting.dataresource + ') tb'
+ }
return inter
})
@@ -1383,7 +1439,11 @@
this.setState({loading: true, loadingview: false})
if (config.$cache && config.$time) {
- Api.getLCacheConfig(params[0].uuid || params[0].id, config.$time, BID).then(res => {
+ let uuid = params[0].uuid || ''
+ if (params[0].id) {
+ uuid = window.GLOB.CacheData.get('first_' + params[0].id) || ''
+ }
+ Api.getLCacheConfig(uuid, config.$time, BID).then(res => {
if (!res.valid) {
this.getMainData(param, params, config.MenuID)
} else {
@@ -1450,12 +1510,12 @@
})
}
- reloadMenuView = (menuId) => {
+ reloadMenuView = (menuId, clear) => {
const { MenuID } = this.props
if (MenuID !== menuId) return
- this.reloadview()
+ this.reloadview(clear)
}
resetActiveMenu = (menuId) => {
@@ -1550,7 +1610,7 @@
})
}
- reloadview = () => {
+ reloadview = (clear) => {
window.GLOB.CacheData.delete(this.props.MenuID)
if (this.state.config) {
@@ -1568,7 +1628,8 @@
viewlost: false, // 椤甸潰涓㈠け锛�1銆佹湭鑾峰彇鍒伴厤缃�-椤甸潰涓㈠け锛�2銆侀〉闈㈡湭鍚敤
config: null, // 椤甸潰閰嶇疆淇℃伅锛屽寘鎷粍浠剁瓑
loading: false, // 鍒楄〃鏁版嵁鍔犺浇涓�
- shortcuts: null
+ shortcuts: null,
+ noParam: clear === true
}, () => {
this.loadconfig()
})
@@ -1803,6 +1864,7 @@
{config.process === 'true' ? <FlowFloat config={config}/> : null}
<SettingComponent config={config} shortcuts={shortcuts || []}/>
<TableNodes config={config} />
+ <DeepSeek/>
</div>
</div>
)
--
Gitblit v1.8.0