From 71e3da644eca32a5aa40503e903efb0640748093 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 21 七月 2023 17:00:59 +0800
Subject: [PATCH] 2023-07-21
---
src/views/billprint/index.jsx | 64 +++++++++++++++++++-------------
1 files changed, 38 insertions(+), 26 deletions(-)
diff --git a/src/views/billprint/index.jsx b/src/views/billprint/index.jsx
index a7be0ab..a52fd05 100644
--- a/src/views/billprint/index.jsx
+++ b/src/views/billprint/index.jsx
@@ -315,7 +315,10 @@
config.components = config.components.map(component => {
if (component.action) component.action = []
- if (component.search) component.search = []
+ if (component.search) {
+ component.search = []
+ component.$searches = []
+ }
component.data = [] // 鍒濆鍖栨暟鎹负绌�
if (component.subtype === 'tablecard') { // 鍏煎
@@ -429,13 +432,11 @@
}
if (sessionStorage.getItem('dataM') === 'true') { // 鏁版嵁鏉冮檺
- component.setting.dataresource = component.setting.dataresource.replace(/\$@/ig, '/*')
- component.setting.dataresource = component.setting.dataresource.replace(/@\$/ig, '*/')
- _customScript = _customScript.replace(/\$@/ig, '/*')
- _customScript = _customScript.replace(/@\$/ig, '*/')
+ component.setting.dataresource = component.setting.dataresource.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
+ _customScript = _customScript.replace(/\$@/ig, '/*').replace(/@\$/ig, '*/').replace(/@datam@/ig, '\'Y\'')
} else {
- component.setting.dataresource = component.setting.dataresource.replace(/@\$|\$@/ig, '')
- _customScript = _customScript.replace(/@\$|\$@/ig, '')
+ component.setting.dataresource = component.setting.dataresource.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
+ _customScript = _customScript.replace(/@\$|\$@/ig, '').replace(/@datam@/ig, '\'\'')
}
regs.forEach(cell => {
@@ -533,11 +534,6 @@
setTimeout(() => {
this.getMenuParam()
}, 50)
- // Api.getAppVersion(tempId).then(() => {
- // this.getMenuParam()
- // }, () => {
- // this.getMenuParam()
- // })
})
}
@@ -684,6 +680,13 @@
this.setState({loadingview: false, pages})
}
+ let setData = (item) => {
+ if (item.setting && item.setting.sync === 'true' && item.data) {
+ item.dataName = Utils.getuuid()
+ window.GLOB.SyncData.set(item.dataName, item.data)
+ }
+ }
+
while (!over) {
let page = []
let count = 0
@@ -698,6 +701,7 @@
}
if (item.wrap && item.wrap.printType === 'headerOrfooter') { // 椤电湁椤佃剼
+ setData(item)
page.push(item)
} else if (_pageover) {
return
@@ -711,10 +715,12 @@
}
if (count <= limit) {
_item.added = true
+ setData(item)
page.push(item)
}
} else if (!item.added) {
_item.added = true
+ setData(item)
page.push(item)
}
} else {
@@ -732,11 +738,13 @@
}
+ setData(item)
page.push(item)
}
_item.added = true
} else if (!item.added) {
_item.added = true
+ setData(item)
page.push(item)
}
} else if (!item.added && item.wrap && item.wrap.printHeight) {
@@ -751,10 +759,12 @@
}
if (count <= limit) {
_item.added = true
+ setData(item)
page.push(item)
}
} else if (!item.added) {
_item.added = true
+ setData(item)
page.push(item)
}
@@ -876,90 +886,92 @@
if (item.style && item.style.clear === 'left') {
style = {clear: 'left'}
+ } else if (item.style && item.style.clear === 'right') {
+ style = {float: 'right'}
}
if (item.type === 'bar' || item.type === 'line') {
return (
<Col span={item.width} style={style} key={item.uuid}>
- <AntvBarAndLine config={item} initdata={item.data} mainSearch={[]} />
+ <AntvBarAndLine config={item}/>
</Col>
)
} else if (item.type === 'pie') {
return (
<Col span={item.width} style={style} key={item.uuid}>
- <AntvPie config={item} initdata={item.data} mainSearch={[]} />
+ <AntvPie config={item} />
</Col>
)
} else if (item.type === 'scatter') {
return (
<Col span={item.width} style={style} key={item.uuid}>
- <AntvScatter config={item} initdata={item.data} mainSearch={[]}/>
+ <AntvScatter config={item}/>
</Col>
)
} else if (item.type === 'dashboard') {
return (
<Col span={item.width} style={style} key={item.uuid}>
- <AntvDashboard config={item} initdata={item.data} mainSearch={[]}/>
+ <AntvDashboard config={item}/>
</Col>
)
} else if (item.type === 'card' && item.subtype === 'datacard') {
return (
<Col span={item.width} style={style} key={item.uuid}>
- <DataCard config={item} initdata={item.data} mainSearch={[]} />
+ <DataCard config={item} />
</Col>
)
} else if (item.type === 'card' && item.subtype === 'propcard') {
return (
<Col span={item.width} style={style} key={item.uuid}>
- <PropCard config={item} initdata={item.data} mainSearch={[]} />
+ <PropCard config={item} />
</Col>
)
} else if (item.type === 'card' && item.subtype === 'dualdatacard') {
return (
<Col span={item.width} style={style} key={item.uuid}>
- <DoubleDataCard config={item} mainSearch={[]}/>
+ <DoubleDataCard config={item}/>
</Col>
)
} else if (item.type === 'card' && item.subtype === 'tablecard') {
return (
<Col span={item.width} style={style} key={item.uuid}>
- <TableCard config={item} initdata={item.data} mainSearch={[]}/>
+ <TableCard config={item}/>
</Col>
)
} else if (item.type === 'table' && item.subtype === 'normaltable') {
return (
<Col span={item.width} style={style} key={item.uuid}>
- <NormalTable config={item} initdata={item.data} mainSearch={[]}/>
+ <NormalTable config={item}/>
</Col>
)
} else if (item.type === 'code') {
return (
<Col span={item.width} style={style} key={item.uuid}>
- <SandBox config={item} initdata={item.data} mainSearch={[]}/>
+ <SandBox config={item}/>
</Col>
)
} else if (item.type === 'balcony') {
return (
<Col span={item.width} style={style} key={item.uuid}>
- <Balcony config={item} initdata={item.data}/>
+ <Balcony config={item}/>
</Col>
)
} else if (item.type === 'timeline') {
return (
<Col span={item.width} style={style} key={item.uuid}>
- <TimeLine config={item} initdata={item.data} mainSearch={[]}/>
+ <TimeLine config={item}/>
</Col>
)
} else if (item.type === 'editor') {
return (
<Col span={item.width} style={style} key={item.uuid}>
- <BraftEditor config={item} initdata={item.data} mainSearch={[]}/>
+ <BraftEditor config={item}/>
</Col>
)
} else if (item.type === 'antvG6') {
return (
<Col span={item.width} style={style} key={item.uuid}>
- <AntvG6 config={item} initdata={item.data} mainSearch={[]}/>
+ <AntvG6 config={item}/>
</Col>
)
} else if (item.type === 'antvX6') {
--
Gitblit v1.8.0