From 137fb8ea6af2789b3238b22bac31d80bced41dfe Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 28 七月 2021 11:39:39 +0800
Subject: [PATCH] 2021-07-28
---
src/templates/modalconfig/index.jsx | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/templates/modalconfig/index.jsx b/src/templates/modalconfig/index.jsx
index 8934dad..3ab3c92 100644
--- a/src/templates/modalconfig/index.jsx
+++ b/src/templates/modalconfig/index.jsx
@@ -13,7 +13,6 @@
import enUS from '@/locales/en-US/model.js'
import { getModalForm } from '@/templates/zshare/formconfig'
-import ModalForm from '@/templates/zshare/modalform'
import SourceElement from './dragelement/source'
import SettingForm from './settingform'
import MenuForm from './menuform'
@@ -25,6 +24,9 @@
const { Panel } = Collapse
const { confirm } = Modal
const CommonDict = sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS
+
+const ReplaceField = asyncComponent(() => import('@/menu/replaceField'))
+const ModalForm = asyncComponent(() => import('@/templates/zshare/modalform'))
const EditComponent = asyncComponent(() => import('@/templates/zshare/editcomponent'))
const DragElement = asyncComponent(() => import('./dragelement'))
const TableComponent = asyncComponent(() => import('@/templates/sharecomponent/tablecomponent'))
@@ -218,7 +220,7 @@
if (card.uuid === item.uuid) {
index = i
}
- if (item.type !== 'select' && item.type !== 'link' && item.type !== 'radio') return
+ if (!['select', 'link', 'radio', ''].includes(item.type)) return
if (item.field && !uniq.has(item.field)) {
uniq.set(item.field, true)
@@ -338,7 +340,7 @@
_config.fields = _config.fields.filter(item => !item.origin)
- if ((res.type === 'select' || res.type === 'multiselect' || res.type === 'link') && res.resourceType === '1' && /\s/.test(res.dataSource)) {
+ if (['select', 'multiselect', 'link', 'checkbox', 'radio', 'checkcard'].includes(res.type) && res.resourceType === '1' && /\s/.test(res.dataSource)) {
this.setState({
sqlVerifing: true
})
@@ -645,6 +647,7 @@
<div className="setting">
<Card title={dict['header.menu.form.configurable']} bordered={false} extra={
<div>
+ <ReplaceField type="form" config={config} updateConfig={this.updateconfig}/>
<EditComponent dict={dict} options={['form']} config={this.state.config} refresh={this.updateEditConfig}/>
<Button type="primary" onClick={this.submitConfig} loading={this.state.menuloading}>{dict['model.save']}</Button>
<Button onClick={this.cancelConfig}>{dict['model.back']}</Button>
@@ -710,7 +713,7 @@
<Modal
title={dict['model.edit']}
visible={this.state.settingVisible}
- width={700}
+ width={850}
maskClosable={false}
onOk={this.settingSave}
onCancel={() => { this.setState({ settingVisible: false }) }}
--
Gitblit v1.8.0