From a18125ff424ee0051351c8b6a8193defaf9b09f0 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 14 十二月 2023 21:05:03 +0800
Subject: [PATCH] 2023-12-14
---
src/menu/components/card/cardcomponent/options.jsx | 2 +-
src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx | 7 +++++++
2 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/menu/components/card/cardcomponent/options.jsx b/src/menu/components/card/cardcomponent/options.jsx
index b8550d5..2ff1dc3 100644
--- a/src/menu/components/card/cardcomponent/options.jsx
+++ b/src/menu/components/card/cardcomponent/options.jsx
@@ -67,7 +67,7 @@
required: false,
options: [
{value: 'card', label: '灞炴�у崱'},
- {value: 'header', label: '琛ㄦ牸澶�'},
+ {value: 'header', label: '琛ㄦ牸澶达紙鍙帓搴忥級'},
],
controlFields: [
{field: 'type', values: ['card']},
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
index fb05456..aac8482 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
@@ -528,6 +528,13 @@
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 cols = []
let columns = config.columns.map(c => c.field)
+
+ if (config.subtype === 'dualdatacard' && config.subColumns) {
+ config.subColumns.forEach(item => {
+ columns.push(item.field)
+ })
+ }
+
verify.columns.forEach(col => {
if (col.output === 'false' || col.Column === '$Index') return
if (!columns.includes(col.Column)) {
--
Gitblit v1.8.0