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 | 61 +++++++++---------------------
1 files changed, 18 insertions(+), 43 deletions(-)
diff --git a/src/menu/modalconfig/index.jsx b/src/menu/modalconfig/index.jsx
index 4aab297..a0409b1 100644
--- a/src/menu/modalconfig/index.jsx
+++ b/src/menu/modalconfig/index.jsx
@@ -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'))
@@ -137,7 +137,7 @@
})
}
- if (item.type === 'switch') {
+ if (item.type === 'switch' || item.type === 'check') {
_linksupFields.push({
field: item.field,
label: item.label
@@ -237,6 +237,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) {
@@ -458,44 +460,8 @@
})
}
- plusFields = (items, type) => {
+ plusFields = (items) => {
let _config = fromJS(this.state.config).toJS()
-
- if (type === 'forms') {
- if (_config.fields.length > 0) {
- let that = this
- _config.fields = items.fields.map(item => {
- item.uuid = Utils.getuuid()
- return item
- })
-
- confirm({
- title: '纭畾鏇挎崲琛ㄥ崟鍚楋紵',
- content: '鍘熻〃鍗曞皢鍒犻櫎銆�',
- onOk() {
- that.setState({
- config: _config
- })
- },
- onCancel() {}
- })
- } else {
- _config.fields = items.fields.map(item => {
- item.uuid = Utils.getuuid()
- return item
- })
-
- this.setState({
- config: _config
- })
- notification.success({
- top: 92,
- message: '绮樿创鎴愬姛锛�',
- duration: 2
- })
- }
- return
- }
_config.fields.push(...items)
@@ -505,6 +471,15 @@
if (items.length === 1 && items[0].focus) {
this.handleForm(items[0])
}
+ })
+ }
+
+ pasteFields = (items) => {
+ let _config = fromJS(this.state.config).toJS()
+ _config.fields = items
+
+ this.setState({
+ config: _config
})
}
@@ -543,7 +518,7 @@
render () {
const { btn } = this.props
- const { config, saving } = this.state
+ const { config, saving, card } = this.state
return (
<div className="modal-form-board">
@@ -564,7 +539,7 @@
<Card title="琛ㄥ崟閰嶇疆" bordered={false} extra={
<div>
<Button type="danger" onClick={this.clearConfig}>娓呯┖</Button>
- <EditComponent options={['form', 'forms']} type="formboard" 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>
@@ -608,7 +583,7 @@
</div>
</DndProvider>
<Modal
- title="缂栬緫"
+ title={card && card.$copy ? '澶嶅埗' : '缂栬緫'}
visible={this.state.visible}
width={950}
maskClosable={false}
@@ -618,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