From e0aff8f4c0e9c8f16d1ba07863cf600638067514 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 13 四月 2021 15:08:47 +0800
Subject: [PATCH] 2021-04-13
---
src/tabviews/custom/index.jsx | 82 ++++++++++++++++++++++++++++++-----------
1 files changed, 60 insertions(+), 22 deletions(-)
diff --git a/src/tabviews/custom/index.jsx b/src/tabviews/custom/index.jsx
index b113301..6fb6711 100644
--- a/src/tabviews/custom/index.jsx
+++ b/src/tabviews/custom/index.jsx
@@ -23,6 +23,7 @@
const AntvTabs = asyncComponent(() => import('./components/tabs/antv-tabs'))
const DataCard = asyncComponent(() => import('./components/card/data-card'))
const PropCard = asyncComponent(() => import('./components/card/prop-card'))
+const NormalForm = asyncComponent(() => import('./components/form/normal-form'))
const CarouselDataCard = asyncComponent(() => import('./components/carousel/data-card'))
const CarouselPropCard = asyncComponent(() => import('./components/carousel/prop-card'))
const TableCard = asyncComponent(() => import('./components/card/table-card'))
@@ -136,14 +137,8 @@
component.search = component.search.map(item => {
item.oriInitval = item.initval
- if (['text', 'select', 'link'].includes(item.type) && param) {
- if (param.searchkey === item.field) {
- item.initval = param.searchval
- } else if (param.BID && item.field.toLowerCase() === 'bid') {
- item.initval = param.BID
- } else if (param.data && param.data[item.field]) {
- item.initval = param.data[item.field]
- }
+ if (['text', 'select', 'link'].includes(item.type) && param && param.$searchkey === item.field) {
+ item.initval = param.$searchval
}
return item
@@ -153,7 +148,7 @@
})
let params = []
- let BID = param && param.BID ? param.BID : ''
+ let BID = param && param.$BID ? param.$BID : ''
let inherit = {}
if (config.cacheUseful === 'true') { // 缂撳瓨缁ф壙
@@ -162,7 +157,38 @@
inherit.cacheTime = config.cacheTime
}
- config.components = this.formatSetting(config.components, params, mainSearch, inherit)
+ let userName = sessionStorage.getItem('User_Name') || ''
+ let fullName = sessionStorage.getItem('Full_Name') || ''
+ let city = sessionStorage.getItem('city') || ''
+
+ if (sessionStorage.getItem('isEditState') === 'true') {
+ userName = sessionStorage.getItem('CloudUserName') || ''
+ fullName = sessionStorage.getItem('CloudFullName') || ''
+ }
+
+ let regs = [
+ { reg: /@userName@/ig, value: userName },
+ { reg: /@fullName@/ig, value: fullName },
+ { reg: /@login_city@/ig, value: city }
+ ]
+
+ if (window.GLOB.externalDatabase !== null) {
+ regs.push({
+ reg: /@db@/ig,
+ value: window.GLOB.externalDatabase
+ })
+ }
+ if (config.urlFields) {
+ config.urlFields.forEach(field => {
+ let val = `'${param ? (param[field] || '') : ''}'`
+ regs.push({
+ reg: new RegExp(field, 'ig'),
+ value: val
+ })
+ })
+ }
+
+ config.components = this.formatSetting(config.components, params, mainSearch, inherit, regs)
this.setState({
BID: BID,
@@ -436,7 +462,7 @@
tab.components.forEach(comp => {
if (comp.type === 'tabs' && comp.parentIds) {
supIds.push(...comp.parentIds)
- } else if (comp.setting.supModule) {
+ } else if (comp.setting && comp.setting.supModule) {
supIds.push(comp.setting.supModule)
}
})
@@ -493,7 +519,7 @@
cell.syncComponentId = cell.syncComponent ? cell.syncComponent.pop() : ''
cell.$menuId = item.uuid
cell.$tabId = tabId
- cell.$type = 'CustomPage'
+ cell.$view = 'CustomPage'
if (cell.OpenType === 'funcbutton' && cell.funcType === 'print' && cell.verify) { // 鎵撳嵃鏈鸿缃�
cell = this.getPrinter(cell, item.uuid)
@@ -519,7 +545,7 @@
cell.syncComponentId = cell.syncComponent ? cell.syncComponent.pop() : ''
cell.$menuId = item.uuid
cell.$tabId = tabId
- cell.$type = 'CustomPage'
+ cell.$view = 'CustomPage'
if (cell.OpenType === 'funcbutton' && cell.funcType === 'print' && cell.verify) { // 鎵撳嵃鏈鸿缃�
cell = this.getPrinter(cell, item.uuid)
@@ -538,7 +564,7 @@
cell.syncComponentId = cell.syncComponent ? cell.syncComponent.pop() : ''
cell.$menuId = item.uuid
cell.$tabId = tabId
- cell.$type = 'CustomPage'
+ cell.$view = 'CustomPage'
if (cell.OpenType === 'funcbutton' && cell.funcType === 'print' && cell.verify) { // 鎵撳嵃鏈鸿缃�
cell = this.getPrinter(cell, item.uuid)
@@ -560,7 +586,7 @@
cell.syncComponentId = cell.syncComponent ? cell.syncComponent.pop() : ''
cell.$menuId = item.uuid
cell.$tabId = tabId
- cell.$type = 'CustomPage'
+ cell.$view = 'CustomPage'
if (cell.OpenType === 'funcbutton' && cell.funcType === 'print' && cell.verify) { // 鎵撳嵃鏈鸿缃�
cell = this.getPrinter(cell, item.uuid)
@@ -581,7 +607,7 @@
cell.syncComponentId = cell.syncComponent ? cell.syncComponent.pop() : ''
cell.$menuId = item.uuid
cell.$tabId = tabId
- cell.$type = 'CustomPage'
+ cell.$view = 'CustomPage'
if (cell.OpenType === 'funcbutton' && cell.funcType === 'print' && cell.verify) { // 鎵撳嵃鏈鸿缃�
cell = this.getPrinter(cell, item.uuid)
@@ -656,22 +682,22 @@
}
// 鏍煎紡鍖栭粯璁よ缃�
- formatSetting = (components, params, mainSearch, inherit) => {
+ formatSetting = (components, params, mainSearch, inherit, regs) => {
return components.map(component => {
if (component.type === 'tabs') {
component.subtabs = component.subtabs.map(tab => {
- tab.components = this.formatSetting(tab.components, [], [], inherit)
+ tab.components = this.formatSetting(tab.components, [], [], inherit, regs)
tab = {...tab, ...inherit}
return tab
})
return component
} else if (component.type === 'group') {
- component.components = this.formatSetting(component.components, [], [], inherit)
+ component.components = this.formatSetting(component.components, [], [], inherit, regs)
component = {...component, ...inherit}
return component
}
- if (['propcard', 'brafteditor', 'sandbox'].includes(component.subtype) && component.wrap.datatype === 'static') {
+ if (['propcard', 'brafteditor', 'sandbox', 'stepform'].includes(component.subtype) && component.wrap.datatype === 'static') {
component.format = ''
}
@@ -712,6 +738,11 @@
component.setting.dataresource = component.setting.dataresource.replace(/@\$|\$@/ig, '')
_customScript = _customScript.replace(/@\$|\$@/ig, '')
}
+
+ regs.forEach(cell => {
+ component.setting.dataresource = component.setting.dataresource.replace(cell.reg, cell.value)
+ _customScript = _customScript.replace(cell.reg, cell.value)
+ })
component.setting.customScript = _customScript // 鏁寸悊鍚庤嚜瀹氫箟鑴氭湰
@@ -810,6 +841,7 @@
let diffUser = false
let userName = sessionStorage.getItem('User_Name') || ''
let fullName = sessionStorage.getItem('Full_Name') || ''
+ let city = sessionStorage.getItem('city') || ''
if (sessionStorage.getItem('isEditState') === 'true') {
userName = sessionStorage.getItem('CloudUserName') || ''
@@ -820,8 +852,8 @@
let _script = item.script
if (index === 0) {
- _script = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50)
- select @ErrorCode='',@retmsg ='',@UserName='${userName}', @FullName='${fullName}'
+ _script = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50),@login_city nvarchar(50)
+ select @ErrorCode='',@retmsg ='',@UserName='${userName}', @FullName='${fullName}', @login_city='${city}'
${_script}
`
}
@@ -973,6 +1005,12 @@
<AntvPie config={item} data={data} BID={_bid} mainSearch={mainSearch} menuType={menuType} />
</Col>
)
+ } else if (item.type === 'form') {
+ return (
+ <Col span={item.width} key={item.uuid}>
+ <NormalForm config={item} data={data} BID={_bid} mainSearch={mainSearch} menuType={menuType} />
+ </Col>
+ )
} else if (item.type === 'search') {
return (
<Col span={item.width} key={item.uuid}>
--
Gitblit v1.8.0