From 84804b405cb88f659d055b16eb3bd00b813ccb4a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 10 十二月 2020 10:58:38 +0800
Subject: [PATCH] 2020-12-10
---
src/menu/modalconfig/index.jsx | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/menu/modalconfig/index.jsx b/src/menu/modalconfig/index.jsx
index c27c42e..878cb09 100644
--- a/src/menu/modalconfig/index.jsx
+++ b/src/menu/modalconfig/index.jsx
@@ -19,13 +19,14 @@
import SettingForm from '@/templates/modalconfig/settingform'
import GroupForm from '@/templates/modalconfig/groupform'
import EditCard from '@/templates/modalconfig/editcard'
-import EditComponent from '@/templates/zshare/editcomponent'
+import asyncComponent from '@/utils/asyncComponent'
import { SearchItems } from '@/templates/modalconfig/source'
import './index.scss'
const { Panel } = Collapse
const { confirm } = Modal
const CommonDict = localStorage.getItem('lang') !== 'en-US' ? zhCN : enUS
+const EditComponent = asyncComponent(() => import('@/templates/zshare/editcomponent'))
class ComModalConfig extends Component {
static propTpyes = {
@@ -260,7 +261,7 @@
if (_config.groups.length > 0) {
_config.groups.forEach(group => {
group.sublist = group.sublist.map(item => {
- if (item.uuid !== res.uuid && item.field === res.field) {
+ if (item.uuid !== res.uuid && item.field.toLowerCase() === res.field.toLowerCase()) {
fieldrepet = true
} else if (item.uuid !== res.uuid && item.label === res.label) {
labelrepet = true
@@ -275,7 +276,7 @@
})
} else {
_config.fields = _config.fields.map(item => {
- if (item.uuid !== res.uuid && item.field === res.field) {
+ if (item.uuid !== res.uuid && item.field.toLowerCase() === res.field.toLowerCase()) {
fieldrepet = true
} else if (item.uuid !== res.uuid && item.label === res.label) {
labelrepet = true
@@ -717,7 +718,7 @@
updateConfig = (res) => {
if (res.type === 'paste') {
this.setState({
- config: res.content
+ config: res.config
})
}
}
@@ -744,7 +745,7 @@
<div className="setting">
<Card title={this.state.dict['header.menu.form.configurable']} bordered={false} extra={
<div>
- <EditComponent dict={this.state.dict} type="form" config={this.state.config} refresh={this.updateConfig}/>
+ <EditComponent dict={this.state.dict} options={['form']} config={this.state.config} refresh={this.updateConfig}/>
<Button type="primary" onClick={this.submitConfig}>{this.state.dict['model.confirm']}</Button>
<Button onClick={this.cancelConfig}>{this.state.dict['model.cancel']}</Button>
</div>
--
Gitblit v1.8.0