From c62724a2cdbafa3c660538955acbedafa5a01871 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 01 六月 2024 15:25:21 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/datasource/verifycard/index.jsx | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/menu/datasource/verifycard/index.jsx b/src/menu/datasource/verifycard/index.jsx
index 8fb10d0..f38a70b 100644
--- a/src/menu/datasource/verifycard/index.jsx
+++ b/src/menu/datasource/verifycard/index.jsx
@@ -962,13 +962,18 @@
copyColumns = () => {
const { config } = this.props
- const { columns, setting } = this.state
+ const { columns, subColumns, setting } = this.state
+ let _columns = columns
let m = []
let n = []
let s = []
- columns.forEach(col => {
+ if (subColumns && subColumns.length) {
+ _columns = [...columns, ...subColumns]
+ }
+
+ _columns.forEach(col => {
m.unshift(`${col.field} ${col.datatype}`)
n.unshift(col.field)
if (/decimal|int/ig.test(col.datatype)) {
@@ -993,7 +998,7 @@
cols.forEach(col => {
if (col.type === 'extend') {
let datatype = 'Nvarchar(50)'
- columns.forEach(c => {
+ _columns.forEach(c => {
if (c.field === col.field) {
datatype = c.datatype
}
@@ -1069,8 +1074,6 @@
addProcess = () => {
const { config } = this.props
const { columns } = this.state
-
- if (config.subtype === 'dualdatacard') return
let fields = []
let cols = []
--
Gitblit v1.8.0