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 | 70 ++++++++++++++++++++++++----------
1 files changed, 49 insertions(+), 21 deletions(-)
diff --git a/src/tabviews/custom/index.jsx b/src/tabviews/custom/index.jsx
index 0a2277e..093e914 100644
--- a/src/tabviews/custom/index.jsx
+++ b/src/tabviews/custom/index.jsx
@@ -21,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'))
@@ -40,6 +41,7 @@
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'))
@@ -196,9 +198,10 @@
popview = 'popview'
}
- config.interfaces = this.formatInterSetting(config.interfaces, regs)
+ config.$cache = config.cacheLocal === 'true'
- config.components = this.filterComponent(config.components, roleId, window.GLOB.mkActions, balMap, skip, param, MenuID, config.interfaces, popview)
+ 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 = []
@@ -239,6 +242,15 @@
config,
mainSearch
}, () => {
+ 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({
@@ -306,9 +318,10 @@
}
}
- filterComponent = (components, roleId, permAction, balMap, skip, urlparam, pageId, interfaces, popview) => {
+ 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
@@ -392,7 +405,7 @@
item.subtabs = item.subtabs.map(tab => {
tab.$pageId = pageId
- tab.components = this.filterComponent(tab.components, roleId, permAction, balMap, skip, urlparam, pageId, interfaces, popview)
+ tab.components = this.filterComponent(tab.components, roleId, permAction, balMap, skip, urlparam, pageId, interfaces, popview, cache)
return tab
})
@@ -405,7 +418,7 @@
return false
}
- item.components = this.filterComponent(item.components, roleId, permAction, balMap, skip, urlparam, pageId, interfaces, popview)
+ 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)) {
@@ -725,24 +738,12 @@
group.subButton.syncComponentId = ''
}
- let _sql = `Declare @mk_organization nvarchar(512) select @mk_organization='${sessionStorage.getItem('organization') || ''}'\n`
- let _sso = _sql
- let _local = _sql
-
group.fields = group.fields.map(cell => {
// 鏁版嵁婧恠ql璇彞锛岄澶勭悊锛屾潈闄愰粦鍚嶅崟瀛楁璁剧疆涓洪殣钘忚〃鍗�
if (['select', 'link', 'multiselect', 'radio', 'checkbox', 'checkcard'].includes(cell.type) && cell.resourceType === '1') {
let _option = Utils.getSelectQueryOptions(cell)
- if (cell.database === 'sso') {
- cell.data_sql = Utils.formatOptions(_sso + _option.sql)
- _sso = ''
- } else {
- cell.data_sql = Utils.formatOptions(_local + _option.sql)
- _local = ''
- }
-
- cell.base_sql = window.btoa(window.encodeURIComponent(_sql + _option.sql))
+ cell.base_sql = _option.sql
cell.arr_field = _option.field
}
@@ -849,6 +850,10 @@
}
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'
@@ -995,7 +1000,8 @@
* @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})
@@ -1005,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,
@@ -1146,6 +1162,12 @@
<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}>
@@ -1284,6 +1306,12 @@
<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}>
@@ -1301,8 +1329,8 @@
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' ? <TableNodes config={config} /> : null}
--
Gitblit v1.8.0