From 7b0dbecd1d6155d26ec67be0a47a16264c738c85 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 09 五月 2023 14:48:10 +0800
Subject: [PATCH] 2023-05-09
---
src/menu/modalconfig/index.jsx | 108 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 76 insertions(+), 32 deletions(-)
diff --git a/src/menu/modalconfig/index.jsx b/src/menu/modalconfig/index.jsx
index 6b1c9ae..a0409b1 100644
--- a/src/menu/modalconfig/index.jsx
+++ b/src/menu/modalconfig/index.jsx
@@ -4,8 +4,8 @@
import { DndProvider } from 'react-dnd'
import HTML5Backend from 'react-dnd-html5-backend'
import moment from 'moment'
-import { Button, Card, Modal, Collapse, notification, Switch } from 'antd'
-import { SettingOutlined } from '@ant-design/icons'
+import { Button, Card, Modal, Collapse, notification, Switch, message } from 'antd'
+import { SettingOutlined, CopyOutlined } from '@ant-design/icons'
import Api from '@/api'
import Utils from '@/utils/utils.js'
@@ -21,7 +21,7 @@
const { Panel } = Collapse
const { confirm } = Modal
const ModalForm = asyncComponent(() => import('@/templates/zshare/modalform'))
-const EditComponent = asyncComponent(() => import('@/templates/zshare/editcomponent'))
+const PasteForms = asyncComponent(() => import('@/menu/components/share/pasteforms'))
const DragElement = asyncComponent(() => import('@/templates/modalconfig/dragelement'))
const FieldsComponent = asyncComponent(() => import('@/templates/sharecomponent/fieldscomponent'))
@@ -106,7 +106,7 @@
* 3銆佽缃紪杈戝弬鏁伴」-formlist
*/
handleForm = (_card) => {
- const { componentConfig } = this.props
+ const { componentConfig, btn } = this.props
const { config } = this.state
let card = fromJS(_card).toJS()
let _inputfields = []
@@ -119,38 +119,28 @@
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
}
- let label = item.label || ''
- if (item.field && item.field.toLowerCase() !== label.toLowerCase()) {
- label = label + ' (' + item.field + ')'
- }
-
if (['text', 'number', 'textarea', 'color'].includes(item.type) && card.field !== item.field) {
_inputfields.push({
field: item.field,
- label: _inputIndex + '銆�' + label
+ label: 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 + '銆�' + label
+ label: item.label
})
- _tabIndex++
}
- if (item.type === 'switch') {
+ if (item.type === 'switch' || item.type === 'check') {
_linksupFields.push({
field: item.field,
- label: _linkIndex + '銆�' + label
+ label: item.label
})
}
@@ -161,13 +151,12 @@
_linkableFields.push({
field: item.field,
- label: _linkIndex + '銆�' + item.label + ' (琛ㄥ崟)'
+ label: item.label + '-琛ㄥ崟'
})
_linksupFields.push({
field: item.field,
- label: _linkIndex + '銆�' + label
+ label: item.label
})
- _linkIndex++
}
})
if (index !== null) {
@@ -178,17 +167,19 @@
}
}
- _tabfields.unshift({field: '', label: '鍘熻〃鍗�'})
+ let columns = componentConfig.columns
+ if (btn.$sub) {
+ columns = componentConfig.subColumns || []
+ }
- componentConfig.columns.forEach(col => {
+ columns.forEach(col => {
if (col.field && !uniq.has(col.field)) {
uniq.set(col.field, true)
_linkableFields.push({
field: col.field,
- label: _linkIndex + '銆�' + col.label + ' (鏄剧ず鍒�)'
+ label: col.label + '-鏄剧ず鍒�'
})
- _linkIndex++
}
})
@@ -200,13 +191,16 @@
if (!card.span && standardform && standardform.span) {
card.span = standardform.span
card.labelwidth = standardform.labelwidth
+ } else if (!card.span) {
+ card.span = 12
+ card.labelwidth = 33.3
}
this.setState({
standardform,
visible: true,
card: card,
- formlist: getModalForm(card, _inputfields, _tabfields, _linkableFields, _linksupFields)
+ formlist: getModalForm(card, _inputfields, _tabfields, _linkableFields, _linksupFields, columns)
})
}
@@ -244,6 +238,8 @@
fieldrepet = true
}
+ delete item.focus
+
if (item.uuid === res.uuid) {
if (item.style) {
res.style = item.style
@@ -263,6 +259,8 @@
return
}
+ window.GLOB.formId = res.uuid
+
if (['select', 'multiselect', 'link', 'checkbox', 'radio', 'checkcard'].includes(res.type) && res.resourceType === '1' && /\s/.test(res.dataSource)) {
this.setState({
sqlVerifing: true
@@ -271,11 +269,13 @@
let param = {
func: 's_debug_sql',
exec_type: 'y',
- LText: res.dataSource
+ LText: `declare @mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20)
+ ${res.dataSource}`
}
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.LText = param.LText.replace(/@\$|\$@/ig, '').replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id)@/ig, `'${param.timestamp}'`)
+ param.LText = param.LText.replace(/\n/g, ' ')
param.LText = Utils.formatOptions(param.LText)
param.secretkey = Utils.encrypt('', param.timestamp)
@@ -474,8 +474,51 @@
})
}
+ pasteFields = (items) => {
+ let _config = fromJS(this.state.config).toJS()
+ _config.fields = items
+
+ this.setState({
+ 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('澶嶅埗鎴愬姛銆�')
+ }
+ }
+
render () {
- const { config, saving } = this.state
+ const { btn } = this.props
+ const { config, saving, card } = this.state
return (
<div className="modal-form-board">
@@ -496,7 +539,7 @@
<Card title="琛ㄥ崟閰嶇疆" bordered={false} extra={
<div>
<Button type="danger" onClick={this.clearConfig}>娓呯┖</Button>
- <EditComponent options={['form']} config={this.state.config} plusFields={this.plusFields}/>
+ <PasteForms type="toolbar" config={config} update={this.pasteFields}/>
<Button type="primary" id="save-modal-config" loading={saving} onClick={this.submitConfig}>淇濆瓨</Button>
<Button onClick={this.cancelConfig}>杩斿洖</Button>
</div>
@@ -504,11 +547,12 @@
<SettingOutlined onClick={this.changeSetting} />
<div className="ant-modal-content" style={{width: config.setting.width > 100 ? config.setting.width : config.setting.width + '%'}}>
<div className="ant-modal-header">
- <div className="ant-modal-title">{config.setting.title}</div>
+ <div className="ant-modal-title">{btn.label}</div>
<Button className="mk-cols-change" onClick={() => this.changecols(1)}>1鍒�</Button>
<Button className="mk-cols-change" onClick={() => this.changecols(2)}>2鍒�</Button>
<Button className="mk-cols-change" onClick={() => this.changecols(3)}>3鍒�</Button>
<Button className="mk-cols-change" onClick={() => this.changecols(4)}>4鍒�</Button>
+ <CopyOutlined title="澶嶅埗" onClick={this.triggerCopy} />
<Switch checkedChildren="寮�" unCheckedChildren="鍏�" defaultChecked={this.state.showField} onChange={(val) => this.setState({showField: val})} />
</div>
<div className="ant-modal-body">
@@ -539,7 +583,7 @@
</div>
</DndProvider>
<Modal
- title="缂栬緫"
+ title={card && card.$copy ? '澶嶅埗' : '缂栬緫'}
visible={this.state.visible}
width={950}
maskClosable={false}
@@ -549,7 +593,7 @@
destroyOnClose
>
<ModalForm
- card={this.state.card}
+ card={card}
formlist={this.state.formlist}
inputSubmit={this.handleSubmit}
standardform={this.state.standardform}
--
Gitblit v1.8.0