From 5466452f77890b1c04d138b52a5fce54cb6d298a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 12 九月 2024 11:20:25 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/datasource/verifycard/index.jsx | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/menu/datasource/verifycard/index.jsx b/src/menu/datasource/verifycard/index.jsx
index c7c6806..a2f6111 100644
--- a/src/menu/datasource/verifycard/index.jsx
+++ b/src/menu/datasource/verifycard/index.jsx
@@ -23,6 +23,7 @@
const { Search } = Input
const { confirm } = Modal
+const ExcelOut = asyncComponent(() => import('./excelout'))
const CodeMirror = asyncComponent(() => import('@/templates/zshare/codemirror'))
const FieldsComponent = asyncComponent(() => import('@/templates/sharecomponent/fieldscomponent'))
const EditTable = asyncComponent(() => import('@/templates/zshare/editTable'))
@@ -1232,6 +1233,7 @@
type="fields"
updatefield={this.updatefields}
/>
+ <ExcelOut data={columns} setting={setting}/>
<EditTable actions={['edit', 'move', 'copy', 'del', 'clear']} searchKey={searchKey} type="datasourcefield" wrappedComponentRef={(inst) => this.datasource = inst} data={columns} columns={colColumns} onChange={(columns) => this.setState({columns})}/>
</TabPane> : <TabPane tab={
<span>
@@ -1240,6 +1242,7 @@
</span>
} key="columns">
<div className="base-table-columns"></div>
+ <ExcelOut data={columns} setting={setting}/>
<EditTable actions={[]} searchKey={searchKey} type="datasourcefield" data={columns} columns={colColumns}/>
</TabPane>}
{config.subtype === 'dualdatacard' ? <TabPane tab={
@@ -1254,6 +1257,7 @@
type="fields"
updatefield={this.updateSubfields}
/>
+ <ExcelOut data={subColumns} setting={setting}/>
<EditTable actions={['edit', 'move', 'copy', 'del', 'clear']} searchKey={searchKey} type="datasourcefield" wrappedComponentRef={(inst) => this.subdatasource = inst} data={subColumns} columns={colColumns} onChange={(subColumns) => this.setState({subColumns})}/>
</TabPane> : null}
<TabPane tab={
--
Gitblit v1.8.0