From 8e003c1a94d26cc4d477e7aa03593ccb4d7e6c61 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 11 十月 2024 17:47:40 +0800
Subject: [PATCH] 2024-10-11
---
src/tabviews/custom/index.jsx | 76 ++++++++++++++++++++++++++++++--------
1 files changed, 60 insertions(+), 16 deletions(-)
diff --git a/src/tabviews/custom/index.jsx b/src/tabviews/custom/index.jsx
index ce3f77e..8e29805 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'
@@ -219,6 +220,21 @@
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 (item.type === 'datasource' || item.type === 'excelOut') {
+ 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') || ''
@@ -285,7 +301,7 @@
}
})
- config.components = this.formatSetting(config.components, params, inherit, config.interfaces, balMap, tbMap)
+ config.components = this.formatSetting(config.components, params, inherit, config.interfaces, balMap, tbMap, BID)
if (initInters.length > 0) {
this.stepInter = {
@@ -680,6 +696,7 @@
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
@@ -698,6 +715,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
@@ -908,7 +928,7 @@
if (item.setting.sync === 'true') {
// pageable 鏄惁鍒嗛〉锛岀粍浠跺睘鎬э紝涓嶅垎椤电殑缁勪欢鎵嶅彲浠ョ粺涓�鏌ヨ
- if ((!item.pageable || (item.pageable && !item.setting.laypage)) && item.setting.onload === 'true') {
+ if ((!item.pageable || (item.pageable && !item.setting.laypage)) && item.setting.onload === 'true' && !_tailScript) {
} else {
item.setting.sync = 'false'
@@ -956,15 +976,18 @@
if (cell.OpenType === 'excelOut') { // 瀵煎嚭
cell.$menuName = item.$menuname
- } 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'
+ } else if (cell.OpenType === 'pop' && cell.modal) {
+ if (item.$cache && item.$time) {
+ cell.modal.$cache = item.$cache
+ cell.modal.$time = item.$time
+ }
+ cell.modal.uuid = cell.uuid + '_pop'
}
if (cell.verify) {
+ let isStatic = item.wrap && (item.wrap.datatype === 'static' || item.wrap.datatype === 'public')
if (cell.verify.invalid === 'true') {
- if (item.wrap && (item.wrap.datatype === 'static' || item.wrap.datatype === 'public')) {
+ if (isStatic) {
cell.verify.invalid = 'false'
} else if (item.setting && item.setting.maxScript && item.setting.maxScript >= 300) {
cell.verify.invalid = 'false'
@@ -975,6 +998,9 @@
} else if (cell.Ot === 'notRequired') {
cell.verify.invalid = 'false'
}
+ }
+ if (cell.verify.uniques && cell.verify.uniques.length > 0 && cell.Ot === 'requiredOnce' && isStatic) {
+ cell.verify.uniques = []
}
if (cell.verify.linkEnable === 'true' && /@/.test(cell.verify.linkUrl)) {
@@ -1120,18 +1146,18 @@
}
// 鏍煎紡鍖栭粯璁よ缃�
- formatSetting = (components, params, inherit, interfaces, balMap, tbMap) => {
+ 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, interfaces, balMap, tbMap)
+ 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, interfaces, balMap, tbMap)
+ component.components = this.formatSetting(component.components, params, null, interfaces, balMap, tbMap, BID)
return component
}
@@ -1206,6 +1232,8 @@
if (component.setting.interType !== 'system') return component
+ component.setting.uuid = component.uuid
+
// dataName 绯荤粺鐢熸垚鐨勬暟鎹簮鍚嶇О
if (component.setting.sync === 'true') {
component.dataName = 'mk' + component.uuid.slice(-18)
@@ -1227,12 +1255,22 @@
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
return component
@@ -1258,7 +1296,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
@@ -1281,6 +1319,8 @@
inter.setting.arr_field = inter.columns.map(col => col.field).join(',')
if (inter.setting.interType !== 'system') return inter
+
+ inter.setting.uuid = inter.uuid
let _customScript = ''
let _tailScript = ''
@@ -1343,7 +1383,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 +1423,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)
--
Gitblit v1.8.0