From d5edf87014863eceaa44f28809ae4b54a39b9a8e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 23 五月 2025 10:54:05 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/components/table/edit-table/normalTable/index.jsx | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
index 28d8931..8415ed3 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
@@ -759,7 +759,7 @@
content = `${record[col.field]}`
}
- if (col.editType === 'select' && col.options.length > 0) {
+ if (col.editType === 'select' && col.showValue !== 'value' && col.options.length > 0) {
content = col.map.get(content) || content
} else if (col.editType === 'switch') {
if (content === col.openVal) {
@@ -1122,7 +1122,7 @@
content = `${record[col.field]}`
}
- if (col.editType === 'select' && col.options.length > 0) {
+ if (col.editType === 'select' && col.showValue !== 'value' && col.options.length > 0) {
content = col.map.get(content) || content
} else if (col.editType === 'switch') {
if (content === col.openVal) {
@@ -2138,8 +2138,8 @@
delete result.status
this.props.columns.forEach(item => {
- if (item.arr_field && result[item.arr_field]) {
- result[item.uuid] = result[item.arr_field]
+ if (item.arr_field && result[item.field]) {
+ result[item.uuid] = result[item.field]
}
})
@@ -2508,7 +2508,7 @@
if (setting.supModule && !BID) {
notification.warning({
top: 92,
- message: dict['sup_key_req'] || '闇�瑕佷笂绾т富閿�硷紒',
+ message: setting.supModTip || dict['sup_key_req'] || '闇�瑕佷笂绾т富閿�硷紒',
duration: 5
})
@@ -2544,7 +2544,7 @@
this.execError({})
})
} else if (submit.intertype === 'system') { // 绯荤粺瀛樺偍杩囩▼
- let result = getEditTableSql(submit, data, forms)
+ let result = getEditTableSql(submit, data, forms, setting)
let param = {}
param.func = 'sPC_TableData_InUpDe'
@@ -2573,7 +2573,7 @@
this.execError({})
})
} else if (submit.intertype === 'inner' && submit.innerFunc) { // 鑷畾涔夊瓨鍌ㄨ繃绋�
- let result = getEditTableSql(submit, data, forms)
+ let result = getEditTableSql(submit, data, forms, setting)
let param = {}
param.func = submit.innerFunc
@@ -2628,7 +2628,11 @@
let lines = data.map(item => {
let vals = []
forms.forEach(col => {
- vals.push(item[col.field])
+ if (typeof(item[col.field]) === 'number') {
+ vals.push(item[col.field] + '')
+ } else {
+ vals.push(item[col.field])
+ }
})
vals.push(item.$$uuid)
--
Gitblit v1.8.0