From 2ae980243b7ad705dea575eadcfc4cf4e24073bd Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 17 五月 2022 22:57:19 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/templates/sharecomponent/actioncomponent/index.jsx | 92 +++++++++++++++++++++++++++-------------------
1 files changed, 54 insertions(+), 38 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/index.jsx b/src/templates/sharecomponent/actioncomponent/index.jsx
index 8a0a704..6374f8a 100644
--- a/src/templates/sharecomponent/actioncomponent/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/index.jsx
@@ -24,6 +24,7 @@
const VerifyCard = asyncSpinComponent(() => import('@/templates/zshare/verifycard'))
const VerifyPrint = asyncSpinComponent(() => import('@/templates/sharecomponent/actioncomponent/verifyprint'))
const VerifyExcelIn = asyncSpinComponent(() => import('@/templates/sharecomponent/actioncomponent/verifyexcelin'))
+const VerifyMegvii = asyncSpinComponent(() => import('@/templates/sharecomponent/actioncomponent/verifymegvii'))
const VerifyExcelOut = asyncSpinComponent(() => import('@/templates/sharecomponent/actioncomponent/verifyexcelout'))
class ActionComponent extends Component {
@@ -44,7 +45,8 @@
copying: false, // 鎸夐挳澶嶅埗涓�
visible: false, // 妯℃�佹鎺у埗
printTemps: [], // 鍗曟嵁鎵撳嵃妯℃澘
- profVisible: false // 楠岃瘉淇℃伅妯℃�佹
+ profVisible: false, // 楠岃瘉淇℃伅妯℃�佹
+ record: null
}
/**
@@ -858,12 +860,57 @@
MKEmitter.removeListener('pasteButton', this.pasteButton)
}
+ getVerify = (card) => {
+ const { config } = this.props
+ const { dict } = this.state
+
+ if (!card) return null
+
+ if (['pop', 'prompt', 'exec'].includes(card.OpenType)) {
+ return <VerifyCard
+ card={card}
+ dict={dict}
+ config={config}
+ columns={config.columns}
+ wrappedComponentRef={(inst) => this.verifyRef = inst}
+ />
+ } else if (card.OpenType === 'excelIn') {
+ return <VerifyExcelIn
+ card={card}
+ dict={dict}
+ columns={config.columns}
+ wrappedComponentRef={(inst) => this.verifyRef = inst}
+ />
+ } else if (card.OpenType === 'excelOut') {
+ return <VerifyExcelOut
+ card={card}
+ dict={dict}
+ config={config}
+ wrappedComponentRef={(inst) => this.verifyRef = inst}
+ />
+ } else if (card.OpenType === 'funcbutton' && card.funcType === 'print') {
+ return <VerifyPrint
+ card={card}
+ dict={dict}
+ columns={config.columns}
+ wrappedComponentRef={(inst) => this.verifyRef = inst}
+ />
+ } else if (card.OpenType === 'funcbutton' && card.funcType === 'megvii') {
+ return <VerifyMegvii
+ card={card}
+ dict={dict}
+ columns={config.columns}
+ wrappedComponentRef={(inst) => this.verifyRef = inst}
+ />
+ }
+ }
+
render() {
const { config } = this.props
- const { actionlist, visible, card, dict, copying, profVisible } = this.state
+ const { actionlist, visible, card, dict, copying, profVisible, record } = this.state
return (
- <div className="model-table-action-list" style={config.charts.length > 1 ? {paddingTop: 25} : null}>
+ <div className="model-table-action-list" style={config.charts && config.charts.length > 1 ? {paddingTop: 25} : null}>
<Tooltip placement="bottomLeft" overlayClassName="middle" title="鍦ㄥ乏渚у伐鍏锋爮銆婃寜閽�嬩腑锛岄�夋嫨瀵瑰簲绫诲瀷鐨勬寜閽嫋鑷虫澶勬坊鍔狅紝濡傞�夋嫨鎸夐挳绫诲瀷涓鸿〃鍗曘�佹柊鏍囩椤电瓑鍚湁閰嶇疆椤甸潰鐨勬寜閽紝鍙湪宸︿晶宸ュ叿鏍�-鎸夐挳-鍙厤缃寜閽锛岀偣鍑绘寜閽畬鎴愮浉鍏抽厤缃�傛敞锛氬綋璁剧疆鎸夐挳鏄剧ず浣嶇疆涓鸿〃鏍兼椂锛屾樉绀哄垪浼氬鍔犳搷浣滃垪銆�">
<QuestionCircleOutlined style={{color: '#c49f47', position: 'absolute', left: '5px', top: '5px'}} />
</Tooltip>
@@ -885,8 +932,8 @@
maskClosable={false}
onCancel={this.editModalCancel}
footer={[
- <CreateInterface key="interface" dict={dict} ref="btnCreatInterface" trigger={this.btnCreatInterface}/>,
- <CreateFunc key="create" dict={dict} ref="btnCreatFunc" trigger={this.creatFunc}/>,
+ record && ['pop', 'exec', 'prompt'].includes(record.OpenType) && record.intertype === 'system' ? <CreateInterface key="interface" dict={dict} ref="btnCreatInterface" trigger={this.btnCreatInterface}/> : null,
+ record && record.intertype === 'inner' ? <CreateFunc key="create" dict={dict} ref="btnCreatFunc" trigger={this.creatFunc}/> : null,
<Button key="cancel" onClick={this.editModalCancel}>{dict['model.cancel']}</Button>,
<Button key="confirm" type="primary" loading={copying} onClick={this.handleSubmit}>{dict['model.confirm']}</Button>
]}
@@ -898,6 +945,7 @@
formlist={this.state.formlist}
inputSubmit={this.handleSubmit}
setting={config.setting}
+ updRecord={(record) => this.setState({record: fromJS(record).toJS()})}
wrappedComponentRef={(inst) => this.actionFormRef = inst}
/>
</Modal>
@@ -921,39 +969,7 @@
}}
destroyOnClose
>
- {card && !card.execMode && card.OpenType !== 'excelIn' && card.OpenType !== 'excelOut' ?
- <VerifyCard
- card={card}
- dict={dict}
- config={config}
- columns={config.columns}
- wrappedComponentRef={(inst) => this.verifyRef = inst}
- /> : null
- }
- {card && card.execMode ?
- <VerifyPrint
- card={card}
- dict={dict}
- columns={config.columns}
- wrappedComponentRef={(inst) => this.verifyRef = inst}
- /> : null
- }
- {card && card.OpenType === 'excelIn' ?
- <VerifyExcelIn
- card={card}
- dict={dict}
- columns={config.columns}
- wrappedComponentRef={(inst) => this.verifyRef = inst}
- /> : null
- }
- {card && card.OpenType === 'excelOut' ?
- <VerifyExcelOut
- card={card}
- dict={dict}
- config={config}
- wrappedComponentRef={(inst) => this.verifyRef = inst}
- /> : null
- }
+ {this.getVerify(card)}
</Modal>
</div>
)
--
Gitblit v1.8.0