From 9a11e62adeb8d435b52a361eb62d5b59e1deef2a Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期四, 23 五月 2024 21:14:50 +0800 Subject: [PATCH] 2024-05-23 --- src/mob/modalconfig/index.jsx | 243 ++++++++++++++++-------------------------------- 1 files changed, 81 insertions(+), 162 deletions(-) diff --git a/src/mob/modalconfig/index.jsx b/src/mob/modalconfig/index.jsx index b05107d..8ef83d0 100644 --- a/src/mob/modalconfig/index.jsx +++ b/src/mob/modalconfig/index.jsx @@ -3,16 +3,10 @@ import { is, fromJS } from 'immutable' import { DndProvider } from 'react-dnd' import HTML5Backend from 'react-dnd-html5-backend' -import moment from 'moment' -import { Button, Modal, Collapse, notification, Switch } from 'antd' +import { Button, Modal, Collapse, Switch, message } from 'antd' import { LeftOutlined } from '@ant-design/icons' -import Api from '@/api' -import Utils from '@/utils/utils.js' -import zhCN from '@/locales/zh-CN/model.js' -import enUS from '@/locales/en-US/model.js' import { getModalForm } from '@/templates/zshare/formconfig' - import SourceElement from '@/templates/modalconfig/dragelement/source' import SettingForm from '@/templates/modalconfig/settingform' import asyncComponent from '@/utils/asyncComponent' @@ -22,9 +16,9 @@ const { Panel } = Collapse const { confirm } = Modal -const CommonDict = sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS -const PasteComponent = asyncComponent(() => import('./pastecomponent')) +const TableComponent = asyncComponent(() => import('@/menu/modalconfig/tablecomponent')) const ModalForm = asyncComponent(() => import('@/templates/zshare/modalform')) +const PasteForms = asyncComponent(() => import('@/menu/components/share/pasteforms')) const DragElement = asyncComponent(() => import('@/mob/components/formdragelement')) const FieldsComponent = asyncComponent(() => import('@/templates/sharecomponent/fieldscomponent')) @@ -36,7 +30,6 @@ } state = { - dict: CommonDict, // 瀛楀吀 config: null, // 椤甸潰閰嶇疆锛屽寘鎷ā鏉跨被鍨嬨�佹ā鎬佹璁剧疆銆佹坊鍔犺〃鍚嶃�佽〃鍗曞垪琛� visible: false, // 琛ㄥ崟缂栬緫妯℃�佹锛屾樉绀烘帶鍒� formlist: null, // 琛ㄥ崟缂栬緫妯℃�佹锛屽彲缂栬緫瀛楁 @@ -45,7 +38,6 @@ originConfig: null, // 鍘熷鑿滃崟 sqlVerifing: false, // sql楠岃瘉 showField: false, // 鏄剧ず琛ㄥ崟瀛楁鍊� - standardform: null, saving: false } @@ -65,6 +57,7 @@ } componentDidMount () { + window.GLOB.formId = '' MKEmitter.addListener('completeSave', this.completeSave) } @@ -111,98 +104,20 @@ * 3銆佽缃紪杈戝弬鏁伴」-formlist */ handleForm = (_card) => { - const { componentConfig } = this.props + const { componentConfig, btn } = this.props const { config } = this.state + let card = fromJS(_card).toJS() - let _inputfields = [] - let _tabfields = [] - let _linkableFields = [] - let _linksupFields = [{ - field: '', - label: '绌�' - }] - let standardform = null - let uniq = new Map() - let index = null - uniq.set(card.field, true) - - let _inputIndex = 1 - let _tabIndex = 1 - let _linkIndex = 1 - config.fields.forEach((item, i) => { - if (card.uuid === item.uuid) { - index = i - } - - if (['text', 'number', 'textarea', 'color'].includes(item.type) && card.field !== item.field) { - _inputfields.push({ - field: item.field, - label: _inputIndex + '銆�' + item.label - }) - _inputIndex++ - } - if (card.field !== item.field && item.hidden !== 'true' && ['text', 'number', 'select', 'link'].includes(item.type)) { - _tabfields.push({ - field: item.field, - label: _tabIndex + '銆�' + item.label - }) - _tabIndex++ - } - - if (!['select', 'link', 'radio', 'checkcard'].includes(item.type)) return - if (item.field && !uniq.has(item.field)) { - uniq.set(item.field, true) - - _linkableFields.push({ - field: item.field, - label: _linkIndex + '銆�' + item.label + ' (琛ㄥ崟)' - }) - _linksupFields.push({ - field: item.field, - label: _linkIndex + '銆�' + item.label - }) - _linkIndex++ - } - }) - - _tabfields.unshift({field: '', label: '鍘熻〃鍗�'}) - - if (index !== null) { - if (index === 0) { - standardform = config.fields[index + 1] || null - } else { - standardform = config.fields[index - 1] || null - } - } - - componentConfig.columns.forEach(col => { - if (col.field && !uniq.has(col.field)) { - uniq.set(col.field, true) - - _linkableFields.push({ - field: col.field, - label: _linkIndex + '銆�' + col.label + ' (鏄剧ず鍒�)' - }) - _linkIndex++ - } - }) - - if (card.linkSubField && card.linkSubField.length > 0) { - let fields = _inputfields.map(item => item.field) - card.linkSubField = card.linkSubField.filter(item => fields.includes(item)) - } - - if (!card.span && standardform && standardform.span) { - card.span = standardform.span - card.labelwidth = standardform.labelwidth + let columns = componentConfig.columns + if (btn.$sub) { + columns = componentConfig.subColumns || [] } this.setState({ - standardform, visible: true, card: card, - formlist: getModalForm(card, _inputfields, _tabfields, _linkableFields, _linksupFields) + formlist: getModalForm(card, config.fields, columns) }) } @@ -213,67 +128,33 @@ * 3銆侀�氳繃loading鍒锋柊 */ handleSubmit = () => { - this.formRef.handleConfirm().then(res => { - let _config = fromJS(this.state.config).toJS() - let fieldrepet = false // 瀛楁閲嶅 + let _config = fromJS(this.state.config).toJS() + this.formRef.handleConfirm(_config.fields).then(res => { _config.fields = _config.fields.map(item => { - if (item.uuid !== res.uuid && res.field && item.field && item.field.toLowerCase() === res.field.toLowerCase()) { - fieldrepet = true - } + delete item.focus - if (item.uuid === res.uuid) { - return res + if (item.uuid === res.values.uuid) { + return res.values } else { return item } }) - if (fieldrepet) { - notification.warning({ - top: 92, - message: '瀛楁宸插瓨鍦紒', - duration: 10 - }) - return - } - - if (['select', 'multiselect', 'link', 'checkbox', 'radio', 'checkcard'].includes(res.type) && res.resourceType === '1' && /\s/.test(res.dataSource)) { + if (res.loading) { this.setState({ sqlVerifing: true }) - let param = { - func: 's_debug_sql', - exec_type: 'y', - LText: res.dataSource - } - - param.LText = param.LText.replace(/@\$|\$@/ig, '') - - param.LText = Utils.formatOptions(param.LText) - param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') - param.secretkey = Utils.encrypt('', param.timestamp) - - if (window.GLOB.mainSystemApi && res.database === 'sso') { - param.rduri = window.GLOB.mainSystemApi - } - - Api.getLocalConfig(param).then(result => { - if (result.status) { - this.setState({ - sqlVerifing: false, - config: _config, - card: null, - visible: false - }) - } else { - this.setState({sqlVerifing: false}) - - Modal.error({ - title: result.message - }) - } + res.promise().then(() => { + this.setState({ + sqlVerifing: false, + config: _config, + card: null, + visible: false + }) + }, () => { + this.setState({sqlVerifing: false}) }) } else { this.setState({ @@ -392,12 +273,46 @@ }) } - insert = (config) => { + pasteFields = (items) => { + let _config = fromJS(this.state.config).toJS() + _config.fields = items + this.setState({ - config - }, () => { - this.handleForm(config.fields[config.fields.length - 1]) + config: _config }) + } + + triggerCopy = () => { + const { config } = this.state + + let val = { + copyType: 'forms', + fields: config.fields || [] + } + + if (val.fields.length === 0) { + message.warning('琛ㄥ崟鍏冪礌涓嶅彲涓虹┖锛�') + return + } + + try { + val = window.btoa(window.encodeURIComponent(JSON.stringify(val))) + } catch (e) { + console.warn(e) + message.warning('澶嶅埗澶辫触锛岃閲嶈瘯锛�') + val = '' + } + + if (val) { + let oInput = document.createElement('input') + oInput.value = val + document.body.appendChild(oInput) + oInput.select() + document.execCommand('Copy') + document.body.removeChild(oInput) + + message.success('澶嶅埗鎴愬姛銆�') + } } clearConfig = () => { @@ -414,14 +329,18 @@ } render () { - const { config, dict, saving } = this.state + const { btn } = this.props + const { config, saving, card } = this.state return ( <div className="mob-form-board"> <DndProvider backend={HTML5Backend}> <div className="tools"> <Collapse accordion defaultActiveKey="1" bordered={false}> - <Panel header={dict['header.menu.form']} key="1"> + <Panel header="鍩烘湰淇℃伅" key="0"> + <TableComponent /> + </Panel> + <Panel header="琛ㄥ崟" key="1"> <div className="search-element"> {SearchItems.map((item, index) => { return (<SourceElement key={index} content={item}/>) @@ -433,25 +352,25 @@ </div> <div className="modal-control"> <Button icon="setting" onClick={this.changeSetting}>璁剧疆</Button> - <Button type="primary" loading={saving} onClick={this.submitConfig}>淇濆瓨</Button> + <Button type="primary" id="save-modal-config" loading={saving} onClick={this.submitConfig}>淇濆瓨</Button> <Button onClick={this.cancelConfig}>杩斿洖</Button> - <PasteComponent config={config} updateConfig={this.insert} /> + <Button type="primary" style={{background: '#26C281', border: 'none'}} onClick={this.triggerCopy}>澶嶅埗</Button> + <PasteForms type="toolbar" config={config} update={this.pasteFields}/> <Button type="danger" onClick={this.clearConfig}>娓呯┖</Button> - <Switch checkedChildren={dict['model.switch.open']} unCheckedChildren={dict['model.switch.close']} defaultChecked={this.state.showField} onChange={(val) => this.setState({showField: val})} /> + <Switch checkedChildren="寮�" unCheckedChildren="鍏�" defaultChecked={this.state.showField} onChange={(val) => this.setState({showField: val})} /> </div> <div className="setting"> <div className="mob-shell" style={{width: window.GLOB.shellWidth, height: window.GLOB.shellHeight}}> <div className="mob-shell-inner"> <div className="am-navbar"> <LeftOutlined /> - <div className="am-navbar-title">{config.setting.title}</div> + <div className="am-navbar-title">{btn.label}</div> {config.setting.btnPosition === 'top' ? <Button className="modal-submit-top">{config.setting.btnName || '纭畾'}</Button> : null} </div> <DragElement list={config.fields} setting={config.setting} showField={this.state.showField} - placeholder={this.state.dict['header.form.modal.placeholder']} handleList={this.handleList} handleForm={this.handleForm} closeForm={this.closeForm} @@ -463,25 +382,26 @@ </div> </DndProvider> <Modal - title={this.state.dict['model.edit']} + title={card && card.$copy ? '澶嶅埗' : '缂栬緫'} + wrapClassName="mk-scroll-modal" visible={this.state.visible} - width={850} + width={950} + maskClosable={false} onCancel={this.editModalCancel} onOk={this.handleSubmit} confirmLoading={this.state.sqlVerifing} destroyOnClose > <ModalForm - dict={this.state.dict} - card={this.state.card} + card={card} formlist={this.state.formlist} inputSubmit={this.handleSubmit} - standardform={this.state.standardform} + fields={config.fields} wrappedComponentRef={(inst) => this.formRef = inst} /> </Modal> <Modal - title={this.state.dict['model.edit']} + title="缂栬緫" visible={this.state.settingVisible} width={900} maskClosable={false} @@ -491,7 +411,6 @@ > <SettingForm config={config} - dict={this.state.dict} isSubTab={!!this.props.editTab} inputSubmit={this.settingSave} wrappedComponentRef={(inst) => this.settingRef = inst} -- Gitblit v1.8.0