From 2b46797c3a5868f7f26329da5834c13aae07ad69 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 03 四月 2023 11:59:34 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/mob/modalconfig/index.jsx | 52 +++++++++-------------------------------------------
1 files changed, 9 insertions(+), 43 deletions(-)
diff --git a/src/mob/modalconfig/index.jsx b/src/mob/modalconfig/index.jsx
index 8bcad78..b355b14 100644
--- a/src/mob/modalconfig/index.jsx
+++ b/src/mob/modalconfig/index.jsx
@@ -20,8 +20,8 @@
const { Panel } = Collapse
const { confirm } = Modal
-const PasteComponent = asyncComponent(() => import('./pastecomponent'))
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 +61,7 @@
}
componentDidMount () {
+ window.GLOB.formId = ''
MKEmitter.addListener('submitStyle', this.getStyle)
MKEmitter.addListener('completeSave', this.completeSave)
}
@@ -253,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
@@ -409,49 +412,12 @@
})
}
- insert = (config, type) => {
- if (type === 'forms') {
- let _config = fromJS(this.state.config).toJS()
-
- if (_config.fields.length > 0) {
- let that = this
- _config.fields = config.fields.map(item => {
- item.uuid = Utils.getuuid()
- return item
- })
-
- confirm({
- title: '纭畾鏇挎崲琛ㄥ崟鍚楋紵',
- content: '鍘熻〃鍗曞皢鍒犻櫎銆�',
- onOk() {
- that.setState({
- config: _config
- })
- },
- onCancel() {}
- })
- } else {
- _config.fields = config.fields.map(item => {
- item.uuid = Utils.getuuid()
- return item
- })
-
- this.setState({
- config: _config
- })
- notification.success({
- top: 92,
- message: '绮樿创鎴愬姛锛�',
- duration: 2
- })
- }
- return
- }
+ 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
})
}
@@ -525,7 +491,7 @@
<Button type="primary" id="save-modal-config" loading={saving} onClick={this.submitConfig}>淇濆瓨</Button>
<Button onClick={this.cancelConfig}>杩斿洖</Button>
<Button type="primary" style={{background: '#26C281', border: 'none'}} onClick={this.triggerCopy}>澶嶅埗</Button>
- <PasteComponent config={config} updateConfig={this.insert} />
+ <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>
--
Gitblit v1.8.0