From 8137ac074ce6370e4b46295e7acf9c7870ef82d2 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 17 二月 2023 22:19:23 +0800
Subject: [PATCH] 2023-02-17
---
src/tabviews/custom/index.jsx | 752 +++++++++++++++++++++++++++------------------------------
1 files changed, 359 insertions(+), 393 deletions(-)
diff --git a/src/tabviews/custom/index.jsx b/src/tabviews/custom/index.jsx
index 669e36e..093e914 100644
--- a/src/tabviews/custom/index.jsx
+++ b/src/tabviews/custom/index.jsx
@@ -4,11 +4,10 @@
import { notification, Spin, Row, Col } from 'antd'
import Api from '@/api'
-import options from '@/store/options.js'
import zhCN from '@/locales/zh-CN/main.js'
import enUS from '@/locales/en-US/main.js'
import Utils from '@/utils/utils.js'
-import UtilsDM, { getStructuredParams, getStructDefaultParam } from '@/utils/utils-datamanage.js'
+import { getStructuredParams, getStructDefaultParam } from '@/utils/utils-datamanage.js'
import asyncComponent from '@/utils/asyncComponent'
import MKEmitter from '@/utils/events.js'
import NotFount from '@/components/404'
@@ -22,6 +21,7 @@
const AntvScatter = asyncComponent(() => import('./components/chart/antv-scatter'))
const DataCard = asyncComponent(() => import('./components/card/data-card'))
const PropCard = asyncComponent(() => import('./components/card/prop-card'))
+const DoubleDataCard = asyncComponent(() => import('./components/card/double-data-card'))
const SimpleForm = asyncComponent(() => import('./components/form/simple-form'))
const StepForm = asyncComponent(() => import('./components/form/step-form'))
const TabForm = asyncComponent(() => import('./components/form/tab-form'))
@@ -37,11 +37,15 @@
const NormalTree = asyncComponent(() => import('./components/tree/antd-tree'))
const Balcony = asyncComponent(() => import('./components/card/balcony'))
const SettingComponent = asyncComponent(() => import('@/tabviews/zshare/settingcomponent'))
-const PagemsgComponent = asyncComponent(() => import('@/tabviews/zshare/pageMessage'))
const CustomChart = asyncComponent(() => import('./components/chart/custom-chart'))
const TimeLine = asyncComponent(() => import('./components/timeline/normal-timeline'))
+const AntvG6 = asyncComponent(() => import('./components/chart/antv-G6'))
const Voucher = asyncComponent(() => import('./components/module/voucher'))
+const Account = asyncComponent(() => import('./components/module/account'))
+const Iframe = asyncComponent(() => import('./components/iframe'))
const DebugTable = asyncComponent(() => import('@/tabviews/debugtable'))
+const TableNodes = asyncComponent(() => import('@/tabviews/zshare/tablenodes'))
+const MkInterfaces = asyncComponent(() => import('@/tabviews/custom/components/interfaces'))
class CustomPage extends Component {
static propTpyes = {
@@ -49,7 +53,8 @@
Tab: PropTypes.string, // 寮圭獥鏍囩
MenuID: PropTypes.string, // 鑿滃崟Id
MenuNo: PropTypes.string, // 鑿滃崟鍙傛暟
- MenuName: PropTypes.string // 鑿滃崟鍚嶇О
+ MenuName: PropTypes.string, // 鑿滃崟鍚嶇О
+ changeTemp: PropTypes.func
}
state = {
@@ -65,7 +70,6 @@
data: null, // 鍒楄〃鏁版嵁闆�
loading: false, // 鍒楄〃鏁版嵁鍔犺浇涓�
visible: false, // 鏍囩椤垫帶鍒�
- treevisible: false, // 鑿滃崟缁撴瀯鏍戝脊妗嗘樉绀洪殣钘忔帶鍒�
shortcuts: null // 蹇嵎閿�
}
@@ -94,21 +98,6 @@
config = ''
}
- // HS涓嶄娇鐢ㄨ嚜瀹氫箟璁剧疆
- if (result.LongParamUser && !window.GLOB.mkHS) {
- try { // 閰嶇疆淇℃伅瑙ｆ瀽
- let userConfig = JSON.parse(window.decodeURIComponent(window.atob(result.LongParamUser)))
- if (userConfig) {
- shortcuts = userConfig.action
- userConfig.printers.forEach(item => {
- window.GLOB.UserCacheMap.set(item.parentId + item.uuid, item)
- })
- }
- } catch (e) {
- console.warn('Parse Failure')
- }
- }
-
// 椤甸潰閰嶇疆瑙ｆ瀽閿欒鏃舵彁绀�
if (!config) {
this.setState({
@@ -128,6 +117,36 @@
return
}
+ // 妯℃澘閿欒
+ if (config.Template !== 'CustomPage') {
+ if (config.Template === 'BaseTable' || config.Template === 'CommonTable') {
+ this.props.changeTemp(MenuID, config.Template)
+ } else {
+ this.setState({
+ viewlost: true,
+ loadingview: false,
+ lostmsg: '鑿滃崟淇℃伅閿欒锛屽彲鑳藉師鍥狅細1銆佸綋鍓嶇敤鎴锋棤鏉冮檺锛�2銆佹墦寮�姝よ彍鍗曠殑鎸夐挳闇�瑕佹洿鏂般��'
+ })
+ }
+
+ return
+ }
+
+ // HS涓嶄娇鐢ㄨ嚜瀹氫箟璁剧疆
+ if (result.LongParamUser && !window.GLOB.mkHS) {
+ try { // 閰嶇疆淇℃伅瑙ｆ瀽
+ let userConfig = JSON.parse(window.decodeURIComponent(window.atob(result.LongParamUser)))
+ if (userConfig) {
+ shortcuts = userConfig.action
+ userConfig.printers.forEach(item => {
+ window.GLOB.UserCacheMap.set(item.parentId + item.uuid, item)
+ })
+ }
+ } catch (e) {
+ console.warn('Parse Failure')
+ }
+ }
+
// 鏁版嵁缂撳瓨璁剧疆
if (config.cacheUseful === 'true') {
if (!['day', 'hour'].includes(config.timeUnit)) {
@@ -143,35 +162,6 @@
let param = this.props.param || {} // url鍙傛暟
window.GLOB.CacheData.set(MenuID, param)
-
- config.components = this.filterComponent(config.components, roleId, window.GLOB.mkActions, balMap, skip, param, MenuID)
-
- // 鑾峰彇涓绘悳绱㈡潯浠�
- let mainSearch = []
- config.components.forEach(component => {
- if (component.type !== 'search') return
-
- component.search = component.search.map(item => {
- item.oriInitval = item.initval
- if (['text', 'select', 'link'].includes(item.type) && param.$searchkey === item.field) {
- item.initval = param.$searchval
- }
-
- return item
- })
-
- mainSearch = Utils.initMainSearch(component.search)
- })
-
- let params = []
- let BID = param.$BID || ''
- let inherit = {}
-
- if (config.cacheUseful === 'true') { // 缂撳瓨缁ф壙
- inherit.cacheUseful = config.cacheUseful
- inherit.timeUnit = config.timeUnit
- inherit.cacheTime = config.cacheTime
- }
let userName = sessionStorage.getItem('User_Name') || ''
let fullName = sessionStorage.getItem('Full_Name') || ''
@@ -202,6 +192,44 @@
})
}
+ let popview = 'CustomPage'
+
+ if (config.version === 2.0) {
+ popview = 'popview'
+ }
+
+ config.$cache = config.cacheLocal === 'true'
+
+ config.interfaces = this.formatInterSetting(config.interfaces, regs)
+ config.components = this.filterComponent(config.components, roleId, window.GLOB.mkActions, balMap, skip, param, MenuID, config.interfaces, popview, config.$cache)
+
+ // 鑾峰彇涓绘悳绱㈡潯浠�
+ let mainSearch = []
+ config.components.forEach(component => {
+ if (component.type !== 'search') return
+
+ component.search = component.search.map(item => {
+ item.oriInitval = item.initval
+ if (['text', 'select', 'link'].includes(item.type) && param.$searchkey === item.field) {
+ item.initval = param.$searchval
+ }
+
+ return item
+ })
+
+ mainSearch = Utils.initMainSearch(component.search)
+ })
+
+ let params = []
+ let BID = param.$BID || ''
+ let inherit = {}
+
+ if (config.cacheUseful === 'true') { // 缂撳瓨缁ф壙
+ inherit.cacheUseful = config.cacheUseful
+ inherit.timeUnit = config.timeUnit
+ inherit.cacheTime = config.cacheTime
+ }
+
config.components = this.formatSetting(config.components, params, mainSearch, inherit, regs, balMap)
if ([...balMap.keys()].length > 0) {
@@ -210,11 +238,20 @@
this.setState({
BID: BID,
- shortcuts,
+ shortcuts: shortcuts.length > 0 ? shortcuts : null,
config,
mainSearch
}, () => {
- if (!params || params.length === 0) {
+ if (config.normalcss) {
+ let node = document.getElementById(config.uuid)
+ node && node.remove()
+
+ let ele = document.createElement('style')
+ ele.id = config.uuid
+ ele.innerHTML = config.normalcss
+ document.getElementsByTagName('head')[0].appendChild(ele)
+ }
+ if (params.length === 0) {
setTimeout(() => { // 寤舵椂鍔犺浇鐘舵��
this.setState({
loadingview: false
@@ -227,8 +264,6 @@
if (!this.props.Tab) {
this.setShortcut()
}
-
- this.loadData()
})
} else {
this.setState({
@@ -246,11 +281,6 @@
setShortcut = () => {
const { shortcuts } = this.state
- if (!shortcuts || shortcuts.length === 0) {
- document.onkeydown = () => {}
- return
- }
-
document.onkeydown = (event) => {
let e = event || window.event
let keyCode = e.keyCode || e.which || e.charCode
@@ -265,8 +295,18 @@
}
if (!preKey || !keyCode) return
-
+
let _shortcut = `${preKey}+${keyCode}`
+
+ if (window.GLOB.breakpoint && _shortcut === 'ctrl+67') {
+ window.debugger = false
+ window.GLOB.breakpoint = false
+ sessionStorage.removeItem('breakpoint')
+
+ MKEmitter.emit('debugChange')
+ }
+
+ if (!shortcuts) return
shortcuts.some(item => {
if (item.$shortcut === _shortcut) {
@@ -278,178 +318,10 @@
}
}
- loadData = () => {
- const { config } = this.state
-
- if (!config.interfaces || config.interfaces.length === 0) return
-
- let inters = []
-
- config.interfaces.forEach(item => {
- if (item.status !== 'true') return
-
- if (window.GLOB.systemType === 'production' && !item.proInterface) {
- notification.warning({
- top: 92,
- message: `銆�${item.name}銆嬫湭璁剧疆姝ｅ紡绯荤粺鍦板潃!`,
- duration: 3
- })
- return
- }
-
- item.MenuName = config.MenuName || ''
-
- inters.push(item)
- })
-
- // if (inters.length > 0) {
- // this.loadOutResource(inters)
- // }
- }
-
- loadOutResource = (inters) => {
- let setting = inters.shift()
- let param = UtilsDM.getPrevQueryParams(setting, [], this.state.BID)
-
- Api.genericInterface(param).then(res => {
- if (res.status) {
- if (res.mk_ex_invoke === 'false' || res.mk_ex_invoke === false) {
- if (inters.length > 0) {
- this.loadOutResource(inters)
- }
- } else {
- this.customOuterRequest(res, setting, inters)
- }
- } else {
- notification.error({
- top: 92,
- message: res.message,
- duration: 10
- })
- }
- })
- }
-
- customOuterRequest = (result, setting, inters) => {
- let url = ''
-
- if (window.GLOB.systemType === 'production') {
- url = setting.proInterface
- } else {
- url = setting.interface
- }
-
- let mkey = result.mk_api_key || ''
-
- delete result.mk_ex_invoke
- delete result.status
- delete result.message
- delete result.ErrCode
- delete result.ErrMesg
- delete result.mk_api_key
-
- let param = {}
-
- Object.keys(result).forEach(key => {
- key = key.replace(/^mk_/ig, '')
- param[key] = result[key]
- })
-
- Api.directRequest(url, setting.method, param, setting.cross).then(res => {
- if (typeof(res) !== 'object') {
- let error = '鏈煡鐨勮繑鍥炵粨鏋滐紒'
-
- if (typeof(res) === 'string') {
- error = res.replace(/'/ig, '"')
- }
-
- let _result = {
- mk_api_key: mkey,
- $ErrCode: 'E',
- $ErrMesg: error
- }
-
- this.customCallbackRequest(_result, setting, inters)
- } else {
- if (Array.isArray(res)) {
- res = { data: res }
- }
- res.mk_api_key = mkey
- this.customCallbackRequest(res, setting, inters)
- }
- }, (e) => {
- let _result = {
- mk_api_key: mkey,
- $ErrCode: 'E',
- $ErrMesg: e && e.statusText ? e.statusText : ''
- }
-
- this.customCallbackRequest(_result, setting, inters)
- })
- }
-
- customCallbackRequest = (result, setting, inters) => {
- let errSql = ''
- if (result.$ErrCode === 'E') {
- errSql = `
- set @ErrorCode='E'
- set @retmsg='${result.$ErrMesg}'
- `
- delete result.$ErrCode
- delete result.$ErrMesg
- }
-
- let lines = UtilsDM.getCallBackSql(setting, result)
- let param = {}
-
- if (setting.callbackType === 'script') { // 浣跨敤鑷畾涔夎剼鏈�
- let sql = lines.map(item => (`
- ${item.insert}
- ${item.selects.join(` union all
- `)}
- `))
- sql = sql.join('')
-
- param = UtilsDM.getCallBackQueryParams(setting, sql, errSql, this.state.BID)
- } else {
- param.func = 's_ex_result_back'
- param.s_ex_result = lines.map((item, index) => ({
- MenuID: this.props.MenuID || '',
- MenuName: this.props.MenuName || '',
- TableName: item.table,
- LongText: window.btoa(window.encodeURIComponent(`${item.insert} ${item.selects.join(` union all `)}`)),
- Sort: index + 1
- }))
-
- if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
- let sql = lines.map(item => (`
- ${item.insert}
- ${item.selects.join(` union all
- `)}
- `))
- sql = sql.join('')
- console.info(sql.replace(/\n\s{10}/ig, '\n'))
- }
- }
-
- Api.genericInterface(param).then(res => {
- if (res.status) {
- if (inters.length > 0) {
- this.loadOutResource(inters)
- }
- } else {
- notification.error({
- top: 92,
- message: res.message,
- duration: 10
- })
- }
- })
- }
-
- filterComponent = (components, roleId, permAction, balMap, skip, urlparam, pageId) => {
+ filterComponent = (components, roleId, permAction, balMap, skip, urlparam, pageId, interfaces, popview, cache) => {
return components.filter(item => {
item.$pageId = pageId
+ item.$cache = cache
if (item.style && item.style.boxShadow) {
delete item.style.hShadow
@@ -533,7 +405,7 @@
item.subtabs = item.subtabs.map(tab => {
tab.$pageId = pageId
- tab.components = this.filterComponent(tab.components, roleId, permAction, balMap, skip, urlparam, pageId)
+ tab.components = this.filterComponent(tab.components, roleId, permAction, balMap, skip, urlparam, pageId, interfaces, popview, cache)
return tab
})
@@ -546,7 +418,7 @@
return false
}
- item.components = this.filterComponent(item.components, roleId, permAction, balMap, skip, urlparam, pageId)
+ item.components = this.filterComponent(item.components, roleId, permAction, balMap, skip, urlparam, pageId, interfaces, popview, cache)
return true
} else if (['pie', 'bar', 'line', 'dashboard', 'scatter', 'chart'].includes(item.type)) {
@@ -563,6 +435,19 @@
) {
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
+ }
+ }
+ }
+
+ if (item.subtype === 'tablecard') { // 鍏煎
+ item.type = 'card'
}
// 鎼滅储鏉′欢鍒濆鍖�
@@ -570,19 +455,16 @@
item.search = Utils.initSearchVal(item.search)
}
- if (item.type === 'table' && (item.subtype === 'normaltable' || item.subtype === 'editable')) {
+ if (item.type === 'table') {
let statFields = []
let getCols = (cols) => {
return cols.filter(col => {
- if (item.subtype !== 'editable') {
- if (col.blacklist && col.blacklist.filter(v => roleId.indexOf(v) > -1).length > 0) {
- return false
- } else if (col.Hide === 'true') {
- return false
- }
- } else if (col.blacklist && col.blacklist.filter(v => roleId.indexOf(v) > -1).length > 0) {
- col.Hide = 'true'
+ if (col.blacklist && col.blacklist.filter(v => roleId.indexOf(v) > -1).length > 0) {
+ return false
+ } else if (col.Hide === 'true') {
+ return false
}
+
if (col.type === 'number') {
if (col.sum === 'true' && !statFields.includes(col.field)) {
statFields.push(col)
@@ -644,18 +526,16 @@
}
// 鏉冮檺杩囨护
- let tabId = this.props.Tab ? this.props.Tab.uuid : '' // 寮圭獥鏍囩鎸夐挳Id
if (item.action && item.action.length > 0) {
item.action = item.action.filter(cell => {
- if (item.hidden === 'true') return false
+ if (cell.hidden === 'true') return false
cell.logLabel = item.$menuname + '-' + cell.label
cell.ContainerId = this.state.ContainerId
cell.syncComponentId = cell.syncComponent ? (cell.syncComponent.pop() || '') : ''
cell.$menuId = item.uuid
cell.$MenuID = this.props.MenuID
- cell.$tabId = tabId
- cell.$view = 'CustomPage'
+ cell.$view = popview
cell.$toolbtn = true
if (!mutil && cell.syncComponentId === item.setting.supModule) {
@@ -675,7 +555,7 @@
})
}
- if (item.type === 'card') {
+ if (item.type === 'card' || item.type === 'carousel' || item.type === 'timeline') {
item.subcards && item.subcards.forEach(card => {
if (card.style.boxShadow) {
delete card.style.hShadow
@@ -694,8 +574,7 @@
cell.syncComponentId = cell.syncComponent ? (cell.syncComponent.pop() || '') : ''
cell.$menuId = item.uuid
cell.$MenuID = this.props.MenuID
- cell.$tabId = tabId
- cell.$view = 'CustomPage'
+ cell.$view = popview
if (!mutil && cell.syncComponentId === item.setting.supModule) {
cell.syncComponentId = ''
@@ -722,6 +601,9 @@
return cell.eleType !== 'button' || skip || permAction[cell.uuid]
})
+
+ if (!card.backElements || card.backElements.length === 0) return
+
card.backElements = card.backElements.filter(cell => {
if (cell.eleType === 'button') {
if (cell.hidden === 'true') return false
@@ -732,8 +614,7 @@
cell.syncComponentId = cell.syncComponent ? (cell.syncComponent.pop() || '') : ''
cell.$menuId = item.uuid
cell.$MenuID = this.props.MenuID
- cell.$tabId = tabId
- cell.$view = 'CustomPage'
+ cell.$view = popview
if (!mutil && cell.syncComponentId === item.setting.supModule) {
cell.syncComponentId = ''
@@ -778,8 +659,7 @@
cell.syncComponentId = cell.syncComponent ? (cell.syncComponent.pop() || '') : ''
cell.$menuId = item.uuid
cell.$MenuID = this.props.MenuID
- cell.$tabId = tabId
- cell.$view = 'CustomPage'
+ cell.$view = popview
if (cell.syncComponentId === item.wrap.supModule) {
cell.syncComponentId = ''
@@ -802,47 +682,7 @@
return cell.eleType !== 'button' || skip || permAction[cell.uuid]
})
- } else if ((item.type === 'table' && item.subtype === 'tablecard') || item.type === 'carousel' || item.type === 'timeline') {
- item.subcards && item.subcards.forEach(card => {
- card.elements = card.elements.filter(cell => {
- if (cell.eleType === 'button') {
- if (cell.hidden === 'true') return false
-
- cell.logLabel = item.$menuname + '-' + cell.label
- cell.Ot = cell.Ot || 'requiredSgl'
- cell.ContainerId = this.state.ContainerId
- cell.syncComponentId = cell.syncComponent ? (cell.syncComponent.pop() || '') : ''
- cell.$menuId = item.uuid
- cell.$MenuID = this.props.MenuID
- cell.$tabId = tabId
- cell.$view = 'CustomPage'
-
- if (cell.syncComponentId === item.setting.supModule) {
- cell.syncComponentId = ''
- }
-
- if (cell.OpenType === 'funcbutton' && cell.funcType === 'print' && cell.verify) { // 鎵撳嵃鏈鸿缃�
- cell = this.getPrinter(cell, item.uuid)
- }
- if (card.btnstyle) { // 鍏煎
- card.style = card.style || {}
- card.style = {...card.style, ...card.btnstyle}
- }
- } else if (['text', 'number', 'formula'].includes(cell.eleType)) {
- if (!cell.height) {
- cell.innerHeight = 'auto'
- }
- if (cell.eleType === 'number' && typeof(cell.decimal) === 'number') {
- cell.round = Math.pow(10, cell.decimal)
- if (cell.format === 'percent') {
- cell.decimal = cell.decimal > 2 ? cell.decimal - 2 : 0
- }
- }
- }
- return cell.eleType !== 'button' || skip || permAction[cell.uuid]
- })
- })
- } else if (item.type === 'table' && (item.subtype === 'normaltable' || item.subtype === 'editable')) {
+ } else if (item.type === 'table') {
item.cols = item.cols.filter(col => {
if (col.type !== 'action') return true
col.elements = col.elements.filter(cell => {
@@ -854,8 +694,7 @@
cell.syncComponentId = cell.syncComponent ? (cell.syncComponent.pop() || '') : ''
cell.$menuId = item.uuid
cell.$MenuID = this.props.MenuID
- cell.$tabId = tabId
- cell.$view = 'CustomPage'
+ cell.$view = popview
if (cell.syncComponentId === item.setting.supModule) {
cell.syncComponentId = ''
@@ -883,6 +722,7 @@
item.subcards = item.subcards.map(group => {
group.subButton.uuid = group.uuid
group.subButton.$menuId = group.uuid
+ group.subButton.$MenuID = this.props.MenuID
// group.subButton.$forbid = true // 涓嶅０鏄庢暟鎹簮鍙橀噺
group.subButton.OpenType = 'formSubmit'
group.subButton.execError = 'never'
@@ -902,9 +742,8 @@
// 鏁版嵁婧恠ql璇彞锛岄澶勭悊锛屾潈闄愰粦鍚嶅崟瀛楁璁剧疆涓洪殣钘忚〃鍗�
if (['select', 'link', 'multiselect', 'radio', 'checkbox', 'checkcard'].includes(cell.type) && cell.resourceType === '1') {
let _option = Utils.getSelectQueryOptions(cell)
-
- cell.data_sql = Utils.formatOptions(_option.sql)
- cell.base_sql = window.btoa(window.encodeURIComponent(_option.sql))
+
+ cell.base_sql = _option.sql
cell.arr_field = _option.field
}
@@ -996,21 +835,26 @@
component.components = this.formatSetting(component.components, null, null, inherit, regs, balMap)
component = {...component, ...inherit}
return component
- }
+ } else if (component.wrap && component.wrap.datatype === 'public') {
+ component.setting.useMSearch = false
- if (component.setting) {
- component.setting.useMSearch = component.setting.useMSearch === 'true'
- component.setting.syncRefresh = (component.setting.useMSearch && component.setting.syncRefresh === 'true')
- }
-
- if (component.wrap && component.wrap.datatype === 'static') {
+ return component
+ } else if (component.wrap && component.wrap.datatype === 'static') {
component.format = ''
component.setting = component.setting || {}
component.setting.useMSearch = false
- component.setting.syncRefresh = false
+
+ return component
+ } else if (!component.setting || !component.format) {
+ return component
}
- if (!component.setting || !component.format) return component // 1銆佷笉浣跨敤绯荤粺鍑芥暟鏃讹紱2銆� 娌℃湁鍔ㄦ�佹暟鎹� 鏁版嵁鏍煎紡 array 鎴� object
+ component.setting.useMSearch = component.setting.useMSearch === 'true'
+
+ if (component.wrap && component.wrap.goback === 'true') {
+ component.setting.sync = 'false'
+ }
+
if (component.setting.interType !== 'system') { // 涓嶄娇鐢ㄧ郴缁熷嚱鏁版椂
component.setting.sync = 'false'
component.setting.laypage = component.setting.laypage === 'true'
@@ -1054,10 +898,14 @@
component.setting.customScript = _customScript // 鏁寸悊鍚庤嚜瀹氫箟鑴氭湰
- // floor 缁勪欢鐨勫眰绾�
// dataName 绯荤粺鐢熸垚鐨勬暟鎹簮鍚嶇О
+ if (component.setting.sync === 'true') {
+ component.dataName = Utils.getdataName()
+ }
+
+ // floor 缁勪欢鐨勫眰绾�
// pageable 鏄惁鍒嗛〉锛岀粍浠跺睘鎬э紝涓嶅垎椤电殑缁勪欢鎵嶅彲浠ョ粺涓�鏌ヨ
- if (params && component.dataName && (!component.pageable || (component.pageable && !component.setting.laypage)) && component.setting.onload === 'true' && component.setting.sync === 'true') {
+ if (params && (!component.pageable || (component.pageable && !component.setting.laypage)) && component.setting.onload === 'true' && component.setting.sync === 'true') {
let searchlist = []
if (component.search && component.search.length > 0) {
searchlist = Utils.initMainSearch(component.search)
@@ -1079,9 +927,10 @@
}
} else if (params) {
component.setting.sync = 'false'
- component.setting.delay = delay
- delay += 20
}
+
+ component.setting.delay = delay
+ delay += 20
if (balMap.has(component.uuid)) {
component.setting.$hasSyncModule = true
@@ -1092,11 +941,67 @@
})
}
+ // 鏍煎紡鍖栭粯璁よ缃�
+ formatInterSetting = (inters, regs) => {
+ if (!inters) return []
+
+ let interfaces = inters.filter(m => m.status === 'true')
+
+ let delay = 15
+ return interfaces.map(inter => {
+ inter.setting.delay = delay
+ delay += 15
+
+ if (inter.setting.interType !== 'system') return inter
+
+ let _customScript = ''
+ inter.scripts.forEach(script => {
+ if (script.status !== 'false') {
+ _customScript += `
+ ${script.sql}
+ `
+ }
+ })
+ delete inter.scripts
+
+ inter.setting.$name = '鍏叡鏁版嵁婧�-' + inter.setting.name
+ inter.setting.execute = inter.setting.execute !== 'false'
+ inter.setting.laypage = true
+
+ 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(/@datam@/ig, '\'Y\'')
+ inter.setting.dataresource = inter.setting.dataresource.replace(/@\$/ig, '*/')
+ _customScript = _customScript.replace(/\$@/ig, '/*').replace(/@datam@/ig, '\'Y\'')
+ _customScript = _customScript.replace(/@\$/ig, '*/')
+ } else {
+ inter.setting.dataresource = inter.setting.dataresource.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
+ _customScript = _customScript.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
+ }
+
+ regs.forEach(cell => {
+ inter.setting.dataresource = inter.setting.dataresource.replace(cell.reg, cell.value)
+ _customScript = _customScript.replace(cell.reg, cell.value)
+ })
+
+ inter.setting.customScript = _customScript // 鏁寸悊鍚庤嚜瀹氫箟鑴氭湰
+
+ return inter
+ })
+ }
+
/**
* @description 涓昏〃鏁版嵁鍔犺浇
*/
loadmaindata = (params) => {
- let param = getStructuredParams(params, this.state.config, this.state.BID || '')
+ const { config } = this.state
+ let param = getStructuredParams(params, config, this.state.BID || '')
this.setState({loading: true, loadingview: false})
@@ -1106,6 +1011,16 @@
delete result.message
delete result.ErrMesg
delete result.ErrCode
+
+ if (config.$cache) {
+ params.forEach((item) => {
+ let _data = result[item.name] || ''
+ if (_data && !Array.isArray(_data)) {
+ _data = [_data]
+ }
+ Api.writeCacheConfig(item.uuid, _data)
+ })
+ }
this.setState({
data: result,
@@ -1151,6 +1066,7 @@
}
componentDidMount () {
+ MKEmitter.addListener('debugChange', this.debugChange)
MKEmitter.addListener('reloadMenuView', this.reloadMenuView)
MKEmitter.addListener('resetActiveMenu', this.resetActiveMenu)
}
@@ -1162,11 +1078,21 @@
this.setState = () => {
return
}
+ MKEmitter.removeListener('debugChange', this.debugChange)
MKEmitter.removeListener('reloadMenuView', this.reloadMenuView)
MKEmitter.removeListener('resetActiveMenu', this.resetActiveMenu)
window.GLOB.CacheData.delete(this.props.MenuID)
- this.deleteCache(this.state.config.components)
+ if (this.state.config) {
+ this.deleteCache(this.state.config.components)
+ this.state.config.interfaces.forEach(m => {
+ window.GLOB.CacheData.delete(m.uuid)
+ })
+ }
+ }
+
+ debugChange = () => {
+ this.setState({visible: !this.state.visible})
}
deleteCache = (components) => {
@@ -1184,6 +1110,15 @@
}
reloadview = () => {
+ window.GLOB.CacheData.delete(this.props.MenuID)
+
+ if (this.state.config) {
+ this.deleteCache(this.state.config.components)
+ this.state.config.interfaces.forEach(m => {
+ window.GLOB.CacheData.delete(m.uuid)
+ })
+ }
+
this.setState({
BID: '', // 椤甸潰璺宠浆鏃舵惡甯D
loadingview: true, // 椤甸潰鍔犺浇涓�
@@ -1209,148 +1144,178 @@
if (!config || !config.components) return
return config.components.map(item => {
- if (item.type === 'bar' || item.type === 'line') {
+ let style = null
+
+ if (item.style && item.style.clear === 'left') {
+ style = {clear: 'left'}
+ }
+
+ if (item.type === 'card' && item.subtype === 'datacard') {
return (
- <Col span={item.width} key={item.uuid}>
- <AntvBarAndLine config={item} data={data} mainSearch={mainSearch}/>
- </Col>
- )
- } else if (item.type === 'pie') {
- return (
- <Col span={item.width} key={item.uuid}>
- <AntvPie config={item} data={data} mainSearch={mainSearch}/>
- </Col>
- )
- } else if (item.type === 'scatter') {
- return (
- <Col span={item.width} key={item.uuid}>
- <AntvScatter config={item} data={data} mainSearch={mainSearch}/>
- </Col>
- )
- } else if (item.type === 'dashboard') {
- return (
- <Col span={item.width} key={item.uuid}>
- <AntvDashboard config={item} data={data} mainSearch={mainSearch}/>
- </Col>
- )
- } else if (item.type === 'form' && item.subtype === 'simpleform') {
- return (
- <Col span={item.width} key={item.uuid}>
- <SimpleForm config={item} data={data} mainSearch={mainSearch}/>
- </Col>
- )
- } else if (item.type === 'form' && item.subtype === 'stepform') {
- return (
- <Col span={item.width} key={item.uuid}>
- <StepForm config={item} data={data} mainSearch={mainSearch}/>
- </Col>
- )
- } else if (item.type === 'form' && item.subtype === 'tabform') {
- return (
- <Col span={item.width} key={item.uuid}>
- <TabForm config={item} data={data} mainSearch={mainSearch}/>
- </Col>
- )
- } else if (item.type === 'search') {
- return (
- <Col span={item.width} key={item.uuid}>
- <MainSearch config={item} BID={BID} refreshdata={this.resetSearch} />
- </Col>
- )
- } else if (item.type === 'tabs') {
- return (
- <Col span={item.width} key={item.uuid}>
- <AntvTabs config={item} mainSearch={mainSearch} />
- </Col>
- )
- } else if (item.type === 'card' && item.subtype === 'datacard') {
- return (
- <Col span={item.width} key={item.uuid}>
+ <Col span={item.width} style={style} key={item.uuid}>
<DataCard config={item} data={data} mainSearch={mainSearch}/>
</Col>
)
} else if (item.type === 'card' && item.subtype === 'propcard') {
return (
- <Col span={item.width} key={item.uuid}>
+ <Col span={item.width} style={style} key={item.uuid}>
<PropCard config={item} data={data} mainSearch={mainSearch}/>
+ </Col>
+ )
+ } else if (item.type === 'card' && item.subtype === 'dualdatacard') {
+ return (
+ <Col span={item.width} style={style} key={item.uuid}>
+ <DoubleDataCard config={item} mainSearch={mainSearch}/>
+ </Col>
+ )
+ } else if (item.type === 'table' && item.subtype === 'normaltable') {
+ return (
+ <Col span={item.width} style={style} key={item.uuid}>
+ <NormalTable config={item} data={data} mainSearch={mainSearch}/>
+ </Col>
+ )
+ } else if (item.type === 'bar' || item.type === 'line') {
+ return (
+ <Col span={item.width} style={style} key={item.uuid}>
+ <AntvBarAndLine config={item} data={data} mainSearch={mainSearch}/>
+ </Col>
+ )
+ } else if (item.type === 'pie') {
+ return (
+ <Col span={item.width} style={style} key={item.uuid}>
+ <AntvPie config={item} data={data} mainSearch={mainSearch}/>
+ </Col>
+ )
+ } else if (item.type === 'scatter') {
+ return (
+ <Col span={item.width} style={style} key={item.uuid}>
+ <AntvScatter config={item} data={data} mainSearch={mainSearch}/>
+ </Col>
+ )
+ } else if (item.type === 'dashboard') {
+ return (
+ <Col span={item.width} style={style} key={item.uuid}>
+ <AntvDashboard config={item} data={data} mainSearch={mainSearch}/>
+ </Col>
+ )
+ } else if (item.type === 'form' && item.subtype === 'simpleform') {
+ return (
+ <Col span={item.width} style={style} key={item.uuid}>
+ <SimpleForm config={item} data={data} mainSearch={mainSearch}/>
+ </Col>
+ )
+ } else if (item.type === 'form' && item.subtype === 'stepform') {
+ return (
+ <Col span={item.width} style={style} key={item.uuid}>
+ <StepForm config={item} data={data} mainSearch={mainSearch}/>
+ </Col>
+ )
+ } else if (item.type === 'form' && item.subtype === 'tabform') {
+ return (
+ <Col span={item.width} style={style} key={item.uuid}>
+ <TabForm config={item} data={data} mainSearch={mainSearch}/>
+ </Col>
+ )
+ } else if (item.type === 'search') {
+ return (
+ <Col span={item.width} style={style} key={item.uuid}>
+ <MainSearch config={item} BID={BID} refreshdata={this.resetSearch} />
+ </Col>
+ )
+ } else if (item.type === 'tabs') {
+ return (
+ <Col span={item.width} style={style} key={item.uuid}>
+ <AntvTabs config={item} mainSearch={mainSearch} />
</Col>
)
} else if (item.type === 'balcony') {
return (
- <Col span={item.width} key={item.uuid}>
+ <Col span={item.width} style={style} key={item.uuid}>
<Balcony config={item} data={data}/>
</Col>
)
} else if (item.type === 'timeline') {
return (
- <Col span={item.width} key={item.uuid}>
+ <Col span={item.width} style={style} key={item.uuid}>
<TimeLine config={item} data={data} mainSearch={mainSearch}/>
</Col>
)
} else if (item.type === 'carousel' && item.subtype === 'datacard') {
return (
- <Col span={item.width} key={item.uuid}>
+ <Col span={item.width} style={style} key={item.uuid}>
<CarouselDataCard config={item} data={data} mainSearch={mainSearch}/>
</Col>
)
} else if (item.type === 'carousel' && item.subtype === 'propcard') {
return (
- <Col span={item.width} key={item.uuid}>
+ <Col span={item.width} style={style} key={item.uuid}>
<CarouselPropCard config={item} data={data} mainSearch={mainSearch}/>
</Col>
)
- } else if (item.type === 'table' && item.subtype === 'tablecard') {
+ } else if (item.type === 'card' && item.subtype === 'tablecard') {
return (
- <Col span={item.width} key={item.uuid}>
+ <Col span={item.width} style={style} key={item.uuid}>
<TableCard config={item} data={data} mainSearch={mainSearch}/>
- </Col>
- )
- } else if (item.type === 'table' && item.subtype === 'normaltable') {
- return (
- <Col span={item.width} key={item.uuid}>
- <NormalTable config={item} data={data} mainSearch={mainSearch}/>
</Col>
)
} else if (item.type === 'table' && item.subtype === 'editable') {
return (
- <Col span={item.width} key={item.uuid}>
+ <Col span={item.width} style={style} key={item.uuid}>
<EditTable config={item} mainSearch={mainSearch}/>
</Col>
)
} else if (item.type === 'group' && item.subtype === 'normalgroup') {
return (
- <Col span={item.width} key={item.uuid}>
+ <Col span={item.width} style={style} key={item.uuid}>
<NormalGroup config={item} mainSearch={mainSearch}/>
</Col>
)
} else if (item.type === 'editor') {
return (
- <Col span={item.width} key={item.uuid}>
+ <Col span={item.width} style={style} key={item.uuid}>
<BraftEditor config={item} data={data} mainSearch={mainSearch}/>
</Col>
)
} else if (item.type === 'tree') {
return (
- <Col span={item.width} key={item.uuid}>
+ <Col span={item.width} style={style} key={item.uuid}>
<NormalTree config={item} data={data} mainSearch={mainSearch}/>
</Col>
)
} else if (item.type === 'code') {
return (
- <Col span={item.width} key={item.uuid}>
+ <Col span={item.width} style={style} key={item.uuid}>
<SandBox config={item} data={data} mainSearch={mainSearch}/>
</Col>
)
} else if (item.type === 'chart') {
return (
- <Col span={item.width} key={item.uuid}>
+ <Col span={item.width} style={style} key={item.uuid}>
<CustomChart config={item} data={data} mainSearch={mainSearch}/>
+ </Col>
+ )
+ } else if (item.type === 'antvG6') {
+ return (
+ <Col span={item.width} style={style} key={item.uuid}>
+ <AntvG6 config={item} data={data} mainSearch={mainSearch}/>
</Col>
)
} else if (item.type === 'module' && item.subtype === 'voucher') {
return (
- <Col span={item.width} key={item.uuid}>
+ <Col span={item.width} style={style} key={item.uuid}>
<Voucher config={item}/>
+ </Col>
+ )
+ } else if (item.type === 'module' && item.subtype === 'account') {
+ return (
+ <Col span={item.width} style={style} key={item.uuid}>
+ <Account config={item}/>
+ </Col>
+ )
+ } else if (item.type === 'iframe') {
+ return (
+ <Col span={item.width} style={style} key={item.uuid}>
+ <Iframe config={item} data={data} mainSearch={mainSearch}/>
</Col>
)
} else {
@@ -1360,15 +1325,16 @@
}
render() {
- const { loadingview, viewlost, config, loading, shortcuts } = this.state
+ const { loadingview, viewlost, config, loading, shortcuts, BID } = this.state
return (
<div className={'custom-page-wrap ' + (loadingview || loading ? 'loading' : '')} id={this.state.ContainerId} style={config ? config.style : null}>
- {(loadingview || loading) ? <Spin className="view-spin" size="large" /> : null}
- <Row className="component-wrap">{this.getComponents()}</Row>
+ {(loadingview || (loading && !config.$cache)) ? <Spin className="view-spin" size="large" /> : null}
+ <Row id={config ? 'menu' + config.uuid : ''} className="component-wrap">{this.getComponents()}</Row>
+ {config && config.interfaces.length > 0 ? <MkInterfaces BID={BID} interfaces={config.interfaces}/> : null}
{config && window.GLOB.breakpoint ? <DebugTable /> : null}
- {!window.GLOB.mkHS && window.GLOB.systemType !== 'production' ? <PagemsgComponent menu={{MenuName: this.props.MenuName, MenuNo: this.props.MenuNo}} config={config} dict={this.state.dict} /> : null}
- {!window.GLOB.mkHS && shortcuts ? <SettingComponent config={config} dict={this.state.dict} shortcuts={shortcuts}/> : null}
+ {!window.GLOB.mkHS && window.GLOB.systemType !== 'production' ? <TableNodes config={config} /> : null}
+ {!window.GLOB.mkHS && config ? <SettingComponent config={config} dict={this.state.dict} shortcuts={shortcuts || []}/> : null}
{viewlost ? <NotFount msg={this.state.lostmsg} /> : null}
</div>
)
--
Gitblit v1.8.0