From 606b0b991748740179fa37448f645e6e9c7f1c41 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期日, 24 一月 2021 19:17:38 +0800 Subject: [PATCH] 2021-01-24 --- src/templates/sharecomponent/settingcomponent/settingform/index.jsx | 84 ++++++++++++++++++++++++++++++++---------- 1 files changed, 64 insertions(+), 20 deletions(-) diff --git a/src/templates/sharecomponent/settingcomponent/settingform/index.jsx b/src/templates/sharecomponent/settingcomponent/settingform/index.jsx index b5c4ffe..0ee9ff9 100644 --- a/src/templates/sharecomponent/settingcomponent/settingform/index.jsx +++ b/src/templates/sharecomponent/settingcomponent/settingform/index.jsx @@ -31,7 +31,8 @@ arr_field: '', regoptions: [], setting: null, - defaultSql: '' + defaultSql: '', + status: {} } UNSAFE_componentWillMount() { @@ -80,6 +81,11 @@ _search = _search.replace(/@\$@/ig, '') _search = _search ? 'where ' + _search : '' + let status = fromJS(_setting).toJS() + status.requestMode = status.requestMode || 'system' + status.procMode = status.procMode || 'script' + status.callbackType = status.callbackType || 'script' + this.setState({ setting: _setting, search: _search, @@ -88,7 +94,8 @@ columns: columns, scripts: _scripts, preScripts: _preScripts, - cbScripts: _cbScripts + cbScripts: _cbScripts, + status }) } @@ -147,7 +154,7 @@ } handleConfirm = (trigger) => { - const { activeKey, setting, scripts } = this.state + const { activeKey, setting, scripts, preScripts, cbScripts } = this.state let _loading = false if (this.scriptsForm && this.scriptsForm.props.form.getFieldValue('sql')) { @@ -195,7 +202,7 @@ this.setState({loading: false}) reject() return - } else if (res.interType === 'system' && res.default === 'false' && _scripts.length === 0) { + } else if ((res.interType === 'system' || res.requestMode === 'system') && res.default === 'false' && _scripts.length === 0) { notification.warning({ top: 92, message: '涓嶆墽琛岄粯璁ql鏃讹紝璇锋坊鍔犺嚜瀹氫箟鑴氭湰锛�', @@ -210,7 +217,7 @@ }, () => { this.sqlverify(() => { this.setState({loading: false}) - resolve({...res, scripts}) + resolve({...res, scripts, preScripts, cbScripts}) }, () => { this.setState({loading: false}) reject() @@ -221,7 +228,7 @@ reject() }) }) - } else { + } else if (activeKey === 'scripts') { return new Promise((resolve, reject) => { if (trigger === 'func' && setting.interType !== 'inner') { notification.warning({ @@ -231,7 +238,7 @@ }) this.setState({loading: false}) reject() - } else if (setting.interType === 'system' && setting.default === 'false' && _scripts.length === 0) { + } else if ((setting.interType === 'system' || setting.requestMode === 'system') && setting.default === 'false' && _scripts.length === 0) { notification.warning({ top: 92, message: '涓嶆墽琛岄粯璁ql鏃讹紝璇锋坊鍔犺嚜瀹氫箟鑴氭湰锛�', @@ -242,12 +249,17 @@ } else { this.sqlverify(() => { this.setState({loading: false}) - resolve({...setting, scripts}) + resolve({...setting, scripts, preScripts, cbScripts}) }, () => { this.setState({loading: false}) reject() }, 'submit') } + }) + } else { + this.setState({loading: false}) + return new Promise((resolve) => { + resolve({...setting, scripts, preScripts, cbScripts}) }) } } @@ -255,7 +267,7 @@ sqlverify = (_resolve, _reject, type, uscripts) => { const { setting, scripts, arr_field, regoptions, search } = this.state - if (setting.interType !== 'system') { // 涓嶄娇鐢ㄧ郴缁熸帴鍙f椂锛屼笉闇�瑕乻ql楠岃瘉 + if (setting.interType !== 'system' && setting.requestMode !== 'system') { // 涓嶄娇鐢ㄧ郴缁熸帴鍙f椂锛屼笉闇�瑕乻ql楠岃瘉 _resolve() return } @@ -296,7 +308,7 @@ // 鏍囩鍒囨崲 changeTab = (val) => { - const { activeKey, search, arr_field } = this.state + const { activeKey, search, arr_field, setting } = this.state let _loading = false if (this.scriptsForm && this.scriptsForm.props.form.getFieldValue('sql')) { @@ -316,13 +328,38 @@ return } + if (activeKey !== 'setting') { + if (setting.interType !== 'system' && setting.requestMode !== 'system' && val === 'scripts') { + notification.warning({ + top: 92, + message: '浣跨敤绯荤粺鎺ュ彛鏃讹紝鎵嶅彲浠ヨ缃嚜瀹氫箟鑴氭湰锛�', + duration: 5 + }) + return + } else if (setting.interType !== 'custom' && (val === 'prescripts' || val === 'cbscripts')) { + notification.warning({ + top: 92, + message: '浣跨敤鑷畾涔夋帴鍙f椂锛屾墠鍙互璁剧疆鍓嶇疆鎴栧洖璋冭剼鏈紒', + duration: 5 + }) + return + } + } + if (activeKey === 'setting') { let _defaultSql = '' this.settingForm.handleConfirm().then(res => { - if (res.interType !== 'system') { + if (res.interType !== 'system' && res.requestMode !== 'system' && val === 'scripts') { notification.warning({ top: 92, message: '浣跨敤绯荤粺鎺ュ彛鏃讹紝鎵嶅彲浠ヨ缃嚜瀹氫箟鑴氭湰锛�', + duration: 5 + }) + return + } else if (res.interType !== 'custom' && (val === 'prescripts' || val === 'cbscripts')) { + notification.warning({ + top: 92, + message: '浣跨敤鑷畾涔夋帴鍙f椂锛屾墠鍙互璁剧疆鍓嶇疆鎴栧洖璋冭剼鏈紒', duration: 5 }) return @@ -369,6 +406,10 @@ loading: false }) }, activeKey) + } else { + this.setState({ + activeKey: val + }) } } @@ -394,9 +435,13 @@ this.setState({cbScripts}) } + updateStatus = (status) => { + this.setState({status: {...this.state.status, ...status}}) + } + render() { const { config, menu, dict } = this.props - const { loading, activeKey, setting, defaultSql, columns, scripts, preScripts, cbScripts } = this.state + const { loading, activeKey, setting, defaultSql, columns, scripts, preScripts, cbScripts, status, regoptions } = this.state return ( <div className="model-table-setting-form-box" id="model-setting-form-body"> @@ -410,6 +455,7 @@ columns={columns} setting={setting} scripts={scripts} + updateStatus={this.updateStatus} wrappedComponentRef={(inst) => this.settingForm = inst} /> </TabPane> @@ -418,13 +464,14 @@ 鑷畾涔夎剼鏈� {scripts.length ? <span className="count-tip">{scripts.length}</span> : null} </span> - } key="scripts"> + } disabled={!(status.interType === 'system' || (status.interType === 'custom' && status.requestMode === 'system'))} key="scripts"> <CustomScript dict={dict} setting={setting} scripts={scripts} defaultSql={defaultSql} searches={this.props.search} + scriptsChange={this.scriptsChange} scriptsUpdate={this.scriptsUpdate} wrappedComponentRef={(inst) => this.scriptsForm = inst} /> @@ -434,14 +481,13 @@ 鍓嶇疆鑴氭湰 {preScripts.length ? <span className="count-tip">{preScripts.length}</span> : null} </span> - } key="prescripts"> + } disabled={status.interType !== 'custom' || status.procMode !== 'script'} key="prescripts"> <SimpleScript dict={dict} setting={setting} scripts={preScripts} - defaultSql={defaultSql} + regoptions={regoptions} searches={this.props.search} - scriptsChange={this.scriptsChange} scriptsUpdate={this.preScriptsUpdate} wrappedComponentRef={(inst) => this.preScriptsForm = inst} /> @@ -451,14 +497,12 @@ 鍥炶皟鑴氭湰 {cbScripts.length ? <span className="count-tip">{cbScripts.length}</span> : null} </span> - } key="cbscripts"> + } disabled={status.interType !== 'custom' || status.callbackType !== 'script'} key="cbscripts"> <SimpleScript dict={dict} setting={setting} scripts={cbScripts} - searches={this.props.search} - scriptsChange={this.scriptsChange} - scriptsUpdate={this.scriptsUpdate} + scriptsUpdate={this.cbScriptsUpdate} wrappedComponentRef={(inst) => this.cbScriptsForm = inst} /> </TabPane> -- Gitblit v1.8.0