From 3d8cb6c1787dec23cbc85d4b262fd1f00654f891 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 18 二月 2020 01:33:07 +0800
Subject: [PATCH] 2020-02-18
---
src/templates/comtableconfig/index.jsx | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/templates/comtableconfig/index.jsx b/src/templates/comtableconfig/index.jsx
index 0b67ebd..ae94117 100644
--- a/src/templates/comtableconfig/index.jsx
+++ b/src/templates/comtableconfig/index.jsx
@@ -779,14 +779,11 @@
if (btn.verify && btn.verify.sheet && btn.verify.columns && btn.verify.columns.length > 0) {
let _param = {
funcName: btn.innerFunc,
- name: config.setting.tableName || '',
- fields: '',
menuNo: menu.MenuNo
}
- newLText = Utils.formatOptions(Utils.getexcelInfunc(_param, btn, menu, config))
+ newLText = Utils.formatOptions(Utils.getexcelInfunc(_param, btn, menu))
DelText = Utils.formatOptions(Utils.dropfunc(_param.funcName))
- // resolve(true)
- resolve(false)
+ resolve(true)
} else {
notification.warning({
top: 92,
@@ -2476,6 +2473,7 @@
<DragElement
type="action"
list={this.state.config.action}
+ setting={this.state.config.setting}
handleList={this.handleList}
handleMenu={this.handleAction}
copyElement={(val) => this.handleAction(val, 'copy')}
@@ -2560,6 +2558,7 @@
card={this.state.card}
tabs={this.state.tabviews}
formlist={this.state.formlist}
+ setting={this.state.config.setting}
wrappedComponentRef={(inst) => this.actionFormRef = inst}
/>
</Modal>
--
Gitblit v1.8.0