From a1e9b18a4dbfd21e1bf4d5cb60974ac2f0115efd Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 30 五月 2025 15:18:44 +0800
Subject: [PATCH] 2025-05-30
---
src/tabviews/custom/index.jsx | 500 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 301 insertions(+), 199 deletions(-)
diff --git a/src/tabviews/custom/index.jsx b/src/tabviews/custom/index.jsx
index b56749d..36e091f 100644
--- a/src/tabviews/custom/index.jsx
+++ b/src/tabviews/custom/index.jsx
@@ -3,6 +3,7 @@
import { is, fromJS } from 'immutable'
import { notification, Spin, Row, Col, Modal } from 'antd'
import moment from 'moment'
+import md5 from 'md5'
import Api from '@/api'
import Utils from '@/utils/utils.js'
@@ -48,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 {
@@ -68,7 +70,8 @@
loading: false, // 鍒楄〃鏁版嵁鍔犺浇涓�
visible: false, // 鏍囩椤垫帶鍒�
shortcuts: null, // 蹇嵎閿�
- loadinginter: false
+ loadinginter: false,
+ noParam: false
}
stepInter = null
@@ -78,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)
@@ -204,19 +212,48 @@
// 鏉冮檺杩囨护
let roleId = sessionStorage.getItem('role_id') || '' // 瑙掕壊ID
let balMap = new Map()
+ let tbMap = new Map()
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] = ''
})
}
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') || ''
@@ -234,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
@@ -261,7 +298,7 @@
let initInters = []
config.interfaces = this.formatInterSetting(config.interfaces, regs, MenuID, initInters, config.MenuName)
- config.components = this.filterComponent(config.components, roleId, window.GLOB.mkActions, balMap, skip, urlparam, MenuID, config.interfaces, config.$cache, config.$time, config.MenuName, MenuID, MenuID, config.process === 'true')
+ config.components = this.filterComponent(config.components, roleId, window.GLOB.mkActions, balMap, tbMap, skip, urlparam, MenuID, config.$cache, config.$time, config.MenuName, MenuID, MenuID, config.process === 'true', regs)
let params = []
let BID = urlparam.$BID || ''
@@ -284,11 +321,7 @@
}
})
- config.components = this.formatSetting(config.components, params, inherit, regs, balMap)
-
- if (balMap.size > 0) {
- config.components = this.filterBalcony(config.components, balMap)
- }
+ config.components = this.formatSetting(config.components, params, inherit, config.interfaces, balMap, tbMap, BID)
if (initInters.length > 0) {
this.stepInter = {
@@ -380,7 +413,7 @@
}
}
- filterComponent = (components, roleId, permAction, balMap, skip, urlparam, pageId, interfaces, cache, time, MenuName, searchId, syncId, process) => {
+ filterComponent = (components, roleId, permAction, balMap, tbMap, skip, urlparam, pageId, cache, time, MenuName, searchId, syncId, process, regs) => {
return components.filter(item => {
item.$pageId = pageId
item.$searchId = searchId
@@ -497,7 +530,7 @@
_searchId = tab.uuid
}
- tab.components = this.filterComponent(tab.components, roleId, permAction, balMap, skip, urlparam, pageId, interfaces, cache, time, MenuName, _searchId, tab.uuid, process)
+ tab.components = this.filterComponent(tab.components, roleId, permAction, balMap, tbMap, skip, urlparam, pageId, cache, time, MenuName, _searchId, tab.uuid, process, regs)
if (_searchId === tab.uuid) {
tab.components.forEach(cell => {
@@ -521,7 +554,7 @@
return false
}
- item.components = this.filterComponent(item.components, roleId, permAction, balMap, skip, urlparam, pageId, interfaces, cache, time, MenuName, searchId, syncId, process)
+ item.components = this.filterComponent(item.components, roleId, permAction, balMap, tbMap, skip, urlparam, pageId, cache, time, MenuName, searchId, syncId, process, regs)
return true
} else if (['pie', 'bar', 'line', 'dashboard', 'scatter', 'chart', 'antvG6', 'antvX6'].includes(item.type)) {
@@ -537,16 +570,6 @@
item.wrap.blacklist.filter(v => roleId.indexOf(v) > -1).length > 0
) {
return false
- }
-
- if (item.wrap.datatype === 'public') {
- let inter = interfaces.filter(int => item.wrap.publicId === int.uuid)[0]
- if (!inter) {
- item.wrap.datatype = 'static'
- } else {
- item.setting = {...inter.setting}
- item.$searchId = inter.$searchId
- }
}
}
@@ -580,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
}
})
@@ -693,9 +717,16 @@
if (item.hasExtend) {
item.setting.hasExtend = true
+ item.setting.sync = 'false'
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') {
@@ -711,6 +742,9 @@
}
}
} else if (item.type === 'card' || item.type === 'carousel' || item.type === 'timeline') {
+ if (item.wrap.datatype === 'public') {
+ balMap.set(item.wrap.publicId + 'public', true)
+ }
item.subcards && item.subcards.forEach(card => {
if (card.style.boxShadow) {
delete card.style.hShadow
@@ -785,6 +819,9 @@
item.wrap.supModule = item.wrap.supModule.pop()
item.setting.supModule = item.wrap.supModule
}
+ if (item.wrap.datatype === 'public') {
+ balMap.set(item.wrap.publicId + 'public', true)
+ }
item.elements = item.elements.filter(cell => {
if (cell.eleType === 'button') {
if (cell.hidden === 'true') return false
@@ -801,6 +838,9 @@
return cell.eleType !== 'button' || pass || permAction[cell.uuid] || cell.permission === 'false'
})
} else if (item.type === 'form') {
+ if (item.wrap.datatype === 'public') {
+ balMap.set(item.wrap.publicId + 'public', true)
+ }
item.subcards = item.subcards.map(group => {
group.subButton.uuid = group.uuid
group.subButton.OpenType = 'formSubmit'
@@ -810,6 +850,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
@@ -843,43 +890,98 @@
item.wrap.supModule = ''
}
}
+
+ // 鏁寸悊鏁版嵁婧�
+ if (item.setting && item.format && (!item.wrap || !['public', 'static'].includes(item.wrap.datatype))) {
+ item.setting.arr_field = item.columns ? item.columns.map(col => col.field).join(',') : ''
+ item.setting.useMSearch = item.setting.useMSearch === 'true'
+ item.setting.laypage = item.setting.laypage === 'true' // 鏄惁鍒嗛〉锛岃浆涓篵oolean 缁熶竴鏍煎紡
+
+ if (item.wrap && item.wrap.goback === 'true') {
+ item.setting.sync = 'false'
+ }
+
+ if (item.format === 'object') {
+ item.setting.laypage = false
+ item.setting.$top = true
+ }
+
+ if (item.setting.interType !== 'system') { // 涓嶄娇鐢ㄧ郴缁熷嚱鏁版椂
+ item.setting.sync = 'false'
+ item.setting.dataresource = ''
+ } else {
+ let _customScript = ''
+ let _tailScript = ''
+ item.scripts && item.scripts.forEach(script => {
+ if (script.status === 'false') return
+ if (script.position !== 'back') {
+ _customScript += `
+ ${script.sql}
+ `
+ } else {
+ _tailScript += `
+ ${script.sql}
+ `
+ }
+ })
+ delete item.scripts
+ item.setting.$name = item.$menuname || ''
+ item.setting.execute = item.setting.execute !== 'false' // 榛樿sql鏄惁鎵ц锛岃浆涓篵oolean 缁熶竴鏍煎紡
+
+ if (!item.setting.execute) {
+ item.setting.dataresource = ''
+ }
- return true
- })
- }
+ if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
+ item.setting.dataresource = item.setting.dataresource.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
+ _customScript = _customScript.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
+ _tailScript = _tailScript.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
+ } else {
+ item.setting.dataresource = item.setting.dataresource.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
+ _customScript = _customScript.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
+ _tailScript = _tailScript.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
+ }
- filterBalcony = (components, balMap) => {
- return components.filter(item => {
- if (item.type === 'tabs') {
- item.subtabs = item.subtabs.map(tab => {
- tab.components = this.filterBalcony(tab.components, balMap)
- return tab
- })
- } else if (item.type === 'group') {
- item.components = this.filterBalcony(item.components, balMap)
- }
+ regs.forEach(cell => {
+ item.setting.dataresource = item.setting.dataresource.replace(cell.reg, cell.value)
+ _customScript = _customScript.replace(cell.reg, cell.value)
+ _tailScript = _tailScript.replace(cell.reg, cell.value)
+ })
- if (item.type === 'balcony' && item.wrap.linkType === 'sync') {
- let conf = balMap.get(item.wrap.syncModuleId)
+ item.setting.customScript = _customScript // 鏁寸悊鍚庤嚜瀹氫箟鑴氭湰
+ item.setting.tailScript = _tailScript // 鍚庣疆鑷畾涔夎剼鏈�
- if (!conf || conf === true) {
- return false
- }
-
- item.syncConfig = {
- uuid: conf.uuid,
- wrap: conf.wrap,
- setting: conf.setting,
- columns: conf.columns
- }
+ item.setting.custompage = false
- if (item.wrap.checkAll === 'show') {
- if (conf.subtype === 'datacard' && conf.wrap.cardType !== 'checkbox') {
- item.wrap.checkAll = 'hidden'
- } else if (conf.subtype === 'normaltable' && conf.wrap.tableType !== 'checkbox') {
- item.wrap.checkAll = 'hidden'
+ 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
+ }
+
+ if (item.setting.sync === 'true') {
+ // pageable 鏄惁鍒嗛〉锛岀粍浠跺睘鎬э紝涓嶅垎椤电殑缁勪欢鎵嶅彲浠ョ粺涓�鏌ヨ
+ if ((!item.pageable || (item.pageable && !item.setting.laypage)) && item.setting.onload === 'true' && !_tailScript) {
+
+ } else {
+ item.setting.sync = 'false'
+ }
}
}
+ }
+
+ if (item.type === 'card' && item.subtype === 'datacard') {
+ tbMap.set(item.uuid, item)
+ } else if (item.type === 'table' && item.subtype !== 'editable') {
+ tbMap.set(item.uuid, item)
}
return true
@@ -915,55 +1017,65 @@
if (cell.OpenType === 'excelOut') { // 瀵煎嚭
cell.$menuName = item.$menuname
-
- if (!cell.verify || !cell.verify.columns || cell.verify.columns.length === 0) {
- cell.errorType = 'error1'
- } else if (cell.intertype === 'system' && cell.verify.dataType !== 'custom') {
- if (item.setting.interType !== 'system') {
- cell.errorType = 'error2'
- } else if (item.type === 'balcony' || item.subtype === 'propcard') {
- cell.errorType = 'error2'
- }
+ } else if (cell.OpenType === 'pop' && cell.modal) {
+ if (item.$cache && item.$time) {
+ cell.modal.$cache = item.$cache
+ cell.modal.$time = item.$time
}
- } else if (cell.OpenType === 'pop' && item.$cache && item.$time && cell.modal) {
- 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 && cell.verify.invalid === 'true') {
- if (item.wrap && (item.wrap.datatype === 'static' || item.wrap.datatype === 'public')) {
- cell.verify.invalid = 'false'
- } else 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 && 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 (cell.verify) {
+ let isStatic = item.wrap && (item.wrap.datatype === 'static' || item.wrap.datatype === 'public')
+ if (cell.verify.invalid === 'true') {
+ if (isStatic) {
+ cell.verify.invalid = 'false'
+ } else 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 (/#position-inner/.test(script)) {
- cell.$innerScript = script
+ if (cell.verify.uniques && cell.verify.uniques.length > 0 && cell.Ot === 'requiredOnce' && isStatic) {
+ cell.verify.uniques = []
}
- if (/#position-outer/.test(script)) {
- cell.$outerScript = script
+
+ if (cell.verify.linkEnable === 'true' && /@/.test(cell.verify.linkUrl)) {
+ cell.returnValue = 'true'
}
- if (/#position-callback/.test(script)) {
- cell.$callbackScript = script
+
+ 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)
+ }
+ }
}
}
@@ -975,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() || ''
})
@@ -1083,20 +1196,64 @@
}
// 鏍煎紡鍖栭粯璁よ缃�
- formatSetting = (components, params, inherit, regs, balMap) => {
+ formatSetting = (components, params, inherit, interfaces, balMap, tbMap, BID) => {
let delay = 20
return components.map(component => {
if (component.type === 'tabs') {
component.subtabs = component.subtabs.map(tab => {
- tab.components = this.formatSetting(tab.components, null, inherit, regs, balMap)
+ tab.components = this.formatSetting(tab.components, null, inherit, interfaces, balMap, tbMap, BID)
tab = {...tab, ...inherit}
return tab
})
return component
} else if (component.type === 'group') {
- component.components = this.formatSetting(component.components, params, null, regs, balMap)
+ component.components = this.formatSetting(component.components, params, null, interfaces, balMap, tbMap, BID)
return component
- } else if (component.wrap && component.wrap.datatype === 'public') {
+ }
+
+ if (component.type === 'balcony') {
+ if (component.wrap.linkType === 'sync') {
+ let conf = tbMap.get(component.wrap.syncModuleId)
+
+ if (conf) {
+ component.syncConfig = {
+ uuid: conf.uuid,
+ wrap: conf.wrap,
+ setting: conf.setting,
+ columns: conf.columns
+ }
+
+ if (component.wrap.checkAll === 'show') {
+ if (conf.subtype === 'datacard' && conf.wrap.cardType !== 'checkbox') {
+ component.wrap.checkAll = 'hidden'
+ } else if (conf.subtype === 'normaltable' && conf.wrap.tableType !== 'checkbox') {
+ component.wrap.checkAll = 'hidden'
+ }
+ }
+ }
+ }
+ } else if (balMap.has(component.uuid)) {
+ component.setting.$hasSyncModule = true
+ }
+ if (balMap.has(component.uuid + 'public')) {
+ component.$hasTopModule = true
+ }
+
+ if (component.wrap && component.wrap.datatype === 'public') {
+ if (tbMap.has(component.wrap.publicId)) {
+ let tb = tbMap.get(component.wrap.publicId)
+ component.setting = {...tb.setting}
+ component.$searchId = tb.$searchId
+ component.wrap.publicId = component.wrap.publicId + 'tb'
+ } else {
+ let inter = interfaces.filter(int => component.wrap.publicId === int.uuid)[0]
+ if (!inter) {
+ component.wrap.datatype = 'static'
+ } else {
+ component.setting = {...inter.setting}
+ component.$searchId = inter.$searchId
+ }
+ }
return component
} else if (component.wrap && component.wrap.datatype === 'static') {
component.format = ''
@@ -1109,10 +1266,6 @@
return component
}
- component.setting.arr_field = component.columns ? component.columns.map(col => col.field).join(',') : ''
- component.setting.useMSearch = component.setting.useMSearch === 'true'
- component.setting.laypage = component.setting.laypage === 'true' // 鏄惁鍒嗛〉锛岃浆涓篵oolean 缁熶竴鏍煎紡
-
if (component.setting.useMSearch) {
if (!window.GLOB.SearchBox.has(component.$searchId)) {
component.setting.useMSearch = false
@@ -1127,79 +1280,9 @@
}
}
- if (component.wrap && component.wrap.goback === 'true') {
- component.setting.sync = 'false'
- }
+ if (component.setting.interType !== 'system') return component
- if (component.format === 'object') {
- component.setting.laypage = false
- component.setting.$top = true
- }
-
- if (component.setting.interType !== 'system') { // 涓嶄娇鐢ㄧ郴缁熷嚱鏁版椂
- component.setting.sync = 'false'
- component.setting.dataresource = ''
- return component
- }
-
- let _customScript = ''
- let _tailScript = ''
- component.scripts && component.scripts.forEach(script => {
- if (script.status === 'false') return
- if (script.position !== 'back') {
- _customScript += `
- ${script.sql}
- `
- } else {
- _tailScript += `
- ${script.sql}
- `
- }
- })
- delete component.scripts
- component.setting.$name = component.$menuname || ''
- component.setting.execute = component.setting.execute !== 'false' // 榛樿sql鏄惁鎵ц锛岃浆涓篵oolean 缁熶竴鏍煎紡
-
- 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\'')
- _customScript = _customScript.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
- _tailScript = _tailScript.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
- } else {
- component.setting.dataresource = component.setting.dataresource.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
- _customScript = _customScript.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
- _tailScript = _tailScript.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
- }
-
- regs.forEach(cell => {
- component.setting.dataresource = component.setting.dataresource.replace(cell.reg, cell.value)
- _customScript = _customScript.replace(cell.reg, cell.value)
- _tailScript = _tailScript.replace(cell.reg, cell.value)
- })
-
- component.setting.customScript = _customScript // 鏁寸悊鍚庤嚜瀹氫箟鑴氭湰
- component.setting.tailScript = _tailScript // 鍚庣疆鑷畾涔夎剼鏈�
-
- component.setting.custompage = /@pageSize@|@orderBy@/i.test(component.setting.dataresource + component.setting.customScript)
-
- if (!component.setting.execute || component.setting.custompage) {
- component.forbidLine = true
- }
-
- if (component.setting.sync === 'true') {
- // pageable 鏄惁鍒嗛〉锛岀粍浠跺睘鎬э紝涓嶅垎椤电殑缁勪欢鎵嶅彲浠ョ粺涓�鏌ヨ
- if ((!component.pageable || (component.pageable && !component.setting.laypage)) && component.setting.onload === 'true') {
-
- } else {
- component.setting.sync = 'false'
- }
- }
+ component.setting.uuid = component.uuid
// dataName 绯荤粺鐢熸垚鐨勬暟鎹簮鍚嶇О
if (component.setting.sync === 'true') {
@@ -1222,18 +1305,23 @@
component.setting.sync = 'false'
component.setting.onload = 'false'
} else {
- params.push(getStructDefaultParam(component, searchlist, params.length === 0))
+ let backend = false
+ if (window.backend && params.length === 0 && window.GLOB.CacheData.has('sql_' + component.uuid)) {
+ backend = true
+ } else if (window.backend && params[0] && params[0].exps) {
+ backend = true
+ }
+ if (backend && !window.GLOB.CacheData.has('sql_' + component.uuid)) {
+ component.setting.sync = 'false'
+ } else {
+ params.push(getStructDefaultParam(component, searchlist, params.length === 0, BID))
+ }
}
}
}
- component.setting.delay = delay
+ component.setting.delay = delay + (component.setting.delay || 0)
delay += 20
-
- if (balMap.has(component.uuid)) {
- component.setting.$hasSyncModule = true
- balMap.set(component.uuid, component)
- }
return component
})
@@ -1258,7 +1346,7 @@
let delay = 15
return interfaces.map(inter => {
inter.MenuID = MenuID
- inter.setting.delay = delay
+ inter.setting.delay = delay + (inter.setting.delay || 0)
inter.$searchId = MenuID
delay += 15
@@ -1282,6 +1370,8 @@
if (inter.setting.interType !== 'system') return inter
+ inter.setting.uuid = inter.uuid
+
let _customScript = ''
let _tailScript = ''
inter.scripts.forEach(script => {
@@ -1304,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\'')
@@ -1326,8 +1413,17 @@
inter.setting.customScript = _customScript // 鏁寸悊鍚庤嚜瀹氫箟鑴氭湰
inter.setting.tailScript = _tailScript // 鍚庣疆鑷畾涔夎剼鏈�
+ inter.setting.custompage = false
- inter.setting.custompage = /@pageSize@|@orderBy@/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
})
@@ -1343,7 +1439,11 @@
this.setState({loading: true, loadingview: false})
if (config.$cache && config.$time) {
- Api.getLCacheConfig(params[0].uuid, 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 {
@@ -1379,11 +1479,11 @@
}
params.forEach((item) => {
- let _data = result[item.name] || ''
+ let _data = result[item.dataName] || ''
if (_data && !Array.isArray(_data)) {
_data = [_data]
}
- window.GLOB.SyncData.set(item.name, _data)
+ window.GLOB.SyncData.set(item.dataName, _data)
})
MKEmitter.emit('transferSyncData', MenuID)
@@ -1410,12 +1510,12 @@
})
}
- reloadMenuView = (menuId) => {
+ reloadMenuView = (menuId, clear) => {
const { MenuID } = this.props
if (MenuID !== menuId) return
- this.reloadview()
+ this.reloadview(clear)
}
resetActiveMenu = (menuId) => {
@@ -1510,7 +1610,7 @@
})
}
- reloadview = () => {
+ reloadview = (clear) => {
window.GLOB.CacheData.delete(this.props.MenuID)
if (this.state.config) {
@@ -1528,7 +1628,8 @@
viewlost: false, // 椤甸潰涓㈠け锛�1銆佹湭鑾峰彇鍒伴厤缃�-椤甸潰涓㈠け锛�2銆侀〉闈㈡湭鍚敤
config: null, // 椤甸潰閰嶇疆淇℃伅锛屽寘鎷粍浠剁瓑
loading: false, // 鍒楄〃鏁版嵁鍔犺浇涓�
- shortcuts: null
+ shortcuts: null,
+ noParam: clear === true
}, () => {
this.loadconfig()
})
@@ -1763,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