From f128d679cacda2a6b5b730ad0368b5fe73f887f7 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 14 二月 2025 15:27:02 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
index b754c1e..645b74d 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
@@ -41,6 +41,7 @@
inputType: 'input',
editable: true,
unique: true,
+ strict: true,
searchable: true,
copy: true,
width: '16%'
@@ -51,7 +52,6 @@
inputType: 'input',
editable: true,
searchable: true,
- unique: true,
width: '16%'
},
{
@@ -198,6 +198,12 @@
val += '鏍煎紡鍖栵細鐧惧垎姣旓紱'
}
}
+ if (record.prefix) {
+ val += `鍓嶇紑锛�${record.prefix}锛沗
+ }
+ if (record.postfix) {
+ val += `鍚庣紑锛�${record.postfix}锛沗
+ }
return <div>{val}<EditOutlined className="edit-other" onClick={() => {this.setState({visible: true, line: fromJS(record).toJS()})}} /></div>
} else if (record.type === 'text') {
@@ -215,6 +221,12 @@
} else if (record.textFormat === 'YYYY-MM-DD HH:mm:ss') {
val += '鏍煎紡鍖栵細YYYY-MM-DD HH:mm:ss锛�'
}
+ }
+ if (record.prefix) {
+ val += `鍓嶇紑锛�${record.prefix}锛沗
+ }
+ if (record.postfix) {
+ val += `鍚庣紑锛�${record.postfix}锛沗
}
return <div>{val}<EditOutlined className="edit-other" onClick={() => {this.setState({visible: true, line: fromJS(record).toJS()})}} /></div>
@@ -482,8 +494,8 @@
columnChange = (values, callback) => {
let verify = JSON.parse(JSON.stringify(this.state.verify))
- let fields = verify.columns.map(item => item.Column)
- if (fields.includes(values.Column)) {
+ let fields = verify.columns.map(item => item.Column.toLowerCase())
+ if (fields.includes(values.Column.toLowerCase())) {
notification.warning({
top: 92,
message: values.Column + '瀛楁宸插瓨鍦紒',
@@ -592,7 +604,12 @@
return
}
- if (card.intertype === 'system' && verify.dataType !== 'custom' && verify.columns.length > 0 && config.$c_ds && config.setting.interType === 'system' && config.columns && config.columns.length > 0) {
+ let ds = true
+ if (config.wrap && config.wrap.datatype && ['static', 'public'].includes(config.wrap.datatype)) {
+ ds = false
+ }
+
+ if (card.intertype === 'system' && verify.dataType !== 'custom' && verify.columns.length > 0 && ds && config.setting.interType === 'system' && config.columns && config.columns.length > 0) {
let cols = []
let columns = config.columns.map(c => c.field)
@@ -798,12 +815,12 @@
clearField = () => {
const { verify } = this.state
- const _this = this
+ const that = this
confirm({
content: `纭畾娓呯┖Excel鍒楀悧锛焋,
onOk() {
- _this.setState({
+ that.setState({
verify: {
...verify,
columns: []
@@ -1205,7 +1222,7 @@
onCancel={() => {this.setState({visible: false, line: null})}}
destroyOnClose
>
- <OtherForm line={line} onChange={(values) => this.setState({line: values})}/>
+ <OtherForm line={line} submit={this.lineSubmit} onChange={(values) => this.setState({line: values})}/>
</Modal>
</div>
)
--
Gitblit v1.8.0