From e7062fee38bd54850e521ae7498275bc0f370702 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 19 七月 2023 17:13:26 +0800
Subject: [PATCH] 2023-07-19
---
src/mob/modalconfig/index.jsx | 137 ++++++++++++++++++++++++++++-----------------
1 files changed, 86 insertions(+), 51 deletions(-)
diff --git a/src/mob/modalconfig/index.jsx b/src/mob/modalconfig/index.jsx
index ca395cc..c33da82 100644
--- a/src/mob/modalconfig/index.jsx
+++ b/src/mob/modalconfig/index.jsx
@@ -4,7 +4,7 @@
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, notification, Switch, message } from 'antd'
import { LeftOutlined } from '@ant-design/icons'
import Api from '@/api'
@@ -20,8 +20,9 @@
const { Panel } = Collapse
const { confirm } = Modal
-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'))
@@ -61,6 +62,7 @@
}
componentDidMount () {
+ window.GLOB.formId = ''
MKEmitter.addListener('submitStyle', this.getStyle)
MKEmitter.addListener('completeSave', this.completeSave)
}
@@ -127,7 +129,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 = []
@@ -135,64 +137,49 @@
let _linkableFields = []
let _linksupFields = []
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
}
- let label = item.label || ''
- if (item.field && item.field.toLowerCase() !== label.toLowerCase()) {
- label = label + ' (' + item.field + ')'
- }
+ if (!item.field || card.field === item.field) return
- if (['text', 'number', 'textarea', 'color'].includes(item.type) && card.field !== item.field) {
+ if (['text', 'number', 'textarea', 'color'].includes(item.type)) {
_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)) {
+ if (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
})
}
if (!['select', 'link', 'radio', 'checkcard'].includes(item.type)) return
- if (item.type === 'checkcard' && item.multiple === 'true') 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 + '銆�' + label
- })
- _linkIndex++
- }
+ _linksupFields.push({
+ field: item.field,
+ label: item.label
+ })
+
+ if (item.type === 'checkcard' && item.multiple === 'true') return
+
+ _linkableFields.push({
+ field: item.field,
+ label: item.label + '-琛ㄥ崟'
+ })
})
-
- _tabfields.unshift({field: '', label: '鍘熻〃鍗�'})
if (index !== null) {
if (index === 0) {
@@ -202,15 +189,18 @@
}
}
- componentConfig.columns.forEach(col => {
- if (col.field && !uniq.has(col.field)) {
- uniq.set(col.field, true)
+ let columns = componentConfig.columns
+ if (btn.$sub) {
+ columns = componentConfig.subColumns || []
+ }
+ let _fields = _linkableFields.map(cell => cell.field)
+ columns.forEach(col => {
+ if (col.field && !_fields.includes(col.field)) {
_linkableFields.push({
field: col.field,
- label: _linkIndex + '銆�' + col.label + ' (鏄剧ず鍒�)'
+ label: col.label + '-鏄剧ず鍒�'
})
- _linkIndex++
}
})
@@ -223,7 +213,7 @@
standardform,
visible: true,
card: card,
- formlist: getModalForm(card, _inputfields, _tabfields, _linkableFields, _linksupFields)
+ formlist: getModalForm(card, _inputfields, _tabfields, _linkableFields, _linksupFields, columns)
})
}
@@ -242,6 +232,8 @@
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) {
if (item.style) {
@@ -262,6 +254,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
@@ -270,11 +264,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)
@@ -416,12 +412,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 = () => {
@@ -439,13 +469,16 @@
render () {
const { btn } = this.props
- const { config, saving } = this.state
+ 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="鍩烘湰淇℃伅" key="0">
+ <TableComponent />
+ </Panel>
<Panel header="琛ㄥ崟" key="1">
<div className="search-element">
{SearchItems.map((item, index) => {
@@ -460,7 +493,8 @@
<Button icon="setting" onClick={this.changeSetting}>璁剧疆</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="寮�" unCheckedChildren="鍏�" defaultChecked={this.state.showField} onChange={(val) => this.setState({showField: val})} />
</div>
@@ -487,7 +521,8 @@
</div>
</DndProvider>
<Modal
- title="缂栬緫"
+ title={card && card.$copy ? '澶嶅埗' : '缂栬緫'}
+ wrapClassName="mk-scroll-modal"
visible={this.state.visible}
width={950}
maskClosable={false}
@@ -497,7 +532,7 @@
destroyOnClose
>
<ModalForm
- card={this.state.card}
+ card={card}
formlist={this.state.formlist}
inputSubmit={this.handleSubmit}
standardform={this.state.standardform}
--
Gitblit v1.8.0