From 7bc44b8b3e88950fd2ff553f41dd0a01198f27ca Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期四, 09 十一月 2023 15:06:41 +0800 Subject: [PATCH] 2023-11-09 --- src/menu/components/form/simple-form/index.jsx | 42 +++++++++++++++++++++++++++++++++++++----- 1 files changed, 37 insertions(+), 5 deletions(-) diff --git a/src/menu/components/form/simple-form/index.jsx b/src/menu/components/form/simple-form/index.jsx index f267c58..c9e9664 100644 --- a/src/menu/components/form/simple-form/index.jsx +++ b/src/menu/components/form/simple-form/index.jsx @@ -82,6 +82,10 @@ } } + componentDidMount () { + MKEmitter.addListener('mkUpdateInter', this.mkUpdateInter) + } + shouldComponentUpdate (nextProps, nextState) { return !is(fromJS(this.state), fromJS(nextState)) } @@ -92,6 +96,21 @@ componentWillUnmount () { this.setState = () => { return + } + MKEmitter.removeListener('mkUpdateInter', this.mkUpdateInter) + } + + mkUpdateInter = (inter, split) => { + const { card } = this.state + + if (card.wrap.datatype === 'public' && card.wrap.publicId === inter.uuid) { + let _card = {...card, columns: fromJS(inter.columns).toJS()} + + split.delay = split.delay + 10 + + setTimeout(() => { + this.updateComponent(_card) + }, split.delay) } } @@ -104,7 +123,7 @@ card.errors = [] let idCtrl = false - if (card.wrap.datatype !== 'static') { + if (card.wrap.datatype === 'dynamic') { let supModule = card.setting.supModule ? card.setting.supModule[card.setting.supModule.length - 1] || '' : '' if (supModule === 'empty') { supModule = '' @@ -128,7 +147,10 @@ }) }) } else { - let supModule = card.wrap.supModule ? card.wrap.supModule[card.wrap.supModule.length - 1] : '' + let supModule = '' + if (card.wrap.datatype === 'static') { + supModule = card.wrap.supModule ? card.wrap.supModule[card.wrap.supModule.length - 1] : '' + } card.$tables = getTables(card) @@ -137,7 +159,7 @@ if (m.dataSource && /@ID@/ig.test(m.dataSource)) { idCtrl = true } - if (m.type === 'linkMain' && !supModule) { + if (m.type === 'linkMain' && !supModule && card.wrap.datatype === 'static') { card.errors.push({ level: 1, detail: `璇锋鏌ュ叧鑱斾富琛ㄢ��${m.label}鈥濇槸鍚︽湁鏁坄}) } }) @@ -497,6 +519,17 @@ } else { _card.setting.supModule = '' } + } else if (res.datatype === 'public') { + let interfaces = window.GLOB.customMenu.interfaces || [] + + let d = interfaces.filter(m => m.uuid === res.publicId && m.status === 'true')[0] + + if (d) { + _card.columns = fromJS(d.columns).toJS() + + _card.setting = { interType: 'system' } + _card.scripts = [] + } } _card.subcards[0].setting.focus = _card.wrap.focus @@ -563,8 +596,7 @@ <PasteForms config={card.subcards[0]} update={this.pasteForm} /> <FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle}/> <DeleteOutlined className="close" title="鍒犻櫎缁勪欢" onClick={() => this.props.deletecomponent(card.uuid)} /> - {card.wrap.datatype !== 'static' ? <SettingComponent config={card} updateConfig={this.updateComponent} /> : null} - {card.wrap.datatype === 'static' ? <SettingOutlined style={{color: '#eeeeee', cursor: 'not-allowed'}}/> : null} + {card.wrap.datatype === 'dynamic' ? <SettingComponent config={card} updateConfig={this.updateComponent} /> : <SettingOutlined style={{color: '#eeeeee', cursor: 'not-allowed'}}/>} </div> } trigger="hover"> <ToolOutlined /> -- Gitblit v1.8.0