From 08f7aadb915f6cd5f709aa3aed02d7dc8000a0f6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 21 一月 2022 18:27:28 +0800
Subject: [PATCH] 2022-01-21
---
src/templates/zshare/modalform/index.jsx | 2 +-
src/views/mobdesign/index.scss | 7 ++-----
src/views/pcdesign/index.scss | 7 ++-----
src/views/pcdesign/index.jsx | 5 ++---
src/menu/components/form/formaction/actionform/index.jsx | 2 +-
src/views/mobdesign/index.jsx | 5 ++---
src/menu/components/card/cardcellcomponent/elementform/index.jsx | 2 +-
src/templates/menuconfig/menuform/index.jsx | 2 +-
src/templates/formtabconfig/actionform/index.jsx | 2 --
src/templates/sharecomponent/searchcomponent/searchform/index.jsx | 2 +-
10 files changed, 13 insertions(+), 23 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/elementform/index.jsx b/src/menu/components/card/cardcellcomponent/elementform/index.jsx
index 5a4fad8..b3eda93 100644
--- a/src/menu/components/card/cardcellcomponent/elementform/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/elementform/index.jsx
@@ -377,7 +377,7 @@
})(
<Select
showSearch
- filterOption={(input, option) => option.props.children[2].toLowerCase().indexOf(input.toLowerCase()) >= 0}
+ filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}
onChange={(value, option) => {this.selectChange(item.key, value, option)}}
getPopupContainer={() => document.getElementById('card-winter')}
>
diff --git a/src/menu/components/form/formaction/actionform/index.jsx b/src/menu/components/form/formaction/actionform/index.jsx
index f36d0b1..eab08d9 100644
--- a/src/menu/components/form/formaction/actionform/index.jsx
+++ b/src/menu/components/form/formaction/actionform/index.jsx
@@ -245,7 +245,7 @@
})(
<Select
showSearch
- filterOption={(input, option) => option.props.children[2].toLowerCase().indexOf(input.toLowerCase()) >= 0}
+ filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}
onChange={(value) => {this.optionChange(item.key, value)}}
getPopupContainer={() => document.getElementById('winter')}
allowClear={item.allowClear}
diff --git a/src/templates/formtabconfig/actionform/index.jsx b/src/templates/formtabconfig/actionform/index.jsx
index 503b392..7f4b88b 100644
--- a/src/templates/formtabconfig/actionform/index.jsx
+++ b/src/templates/formtabconfig/actionform/index.jsx
@@ -324,8 +324,6 @@
]
})(
<Select
- showSearch
- filterOption={(input, option) => option.props.children[2].toLowerCase().indexOf(input.toLowerCase()) >= 0}
getPopupContainer={() => document.getElementById('winter')}
disabled={!!item.readonly}
>
diff --git a/src/templates/menuconfig/menuform/index.jsx b/src/templates/menuconfig/menuform/index.jsx
index b7de0a9..8a1ae15 100644
--- a/src/templates/menuconfig/menuform/index.jsx
+++ b/src/templates/menuconfig/menuform/index.jsx
@@ -70,7 +70,7 @@
})(
<Select
showSearch
- filterOption={(input, option) => option.props.children[2].toLowerCase().indexOf(input.toLowerCase()) >= 0}
+ filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}
onChange={(value) => {this.openTypeChange(item.key, value)}}
getPopupContainer={() => document.getElementById('form-box')}
>
diff --git a/src/templates/sharecomponent/searchcomponent/searchform/index.jsx b/src/templates/sharecomponent/searchcomponent/searchform/index.jsx
index ced101f..069c271 100644
--- a/src/templates/sharecomponent/searchcomponent/searchform/index.jsx
+++ b/src/templates/sharecomponent/searchcomponent/searchform/index.jsx
@@ -440,7 +440,7 @@
content = <Select
showSearch
allowClear={item.allowClear === true}
- filterOption={(input, option) => option.props.children[2].toLowerCase().indexOf(input.toLowerCase()) >= 0}
+ filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}
onChange={(value) => {this.optionChange(item.key, value)}}
getPopupContainer={() => document.getElementById('commontable-search-form-box')}
>
diff --git a/src/templates/zshare/modalform/index.jsx b/src/templates/zshare/modalform/index.jsx
index 711f3e6..b0d6203 100644
--- a/src/templates/zshare/modalform/index.jsx
+++ b/src/templates/zshare/modalform/index.jsx
@@ -467,7 +467,7 @@
content = <Select
showSearch
allowClear={item.allowClear === true}
- filterOption={(input, option) => option.props.children[2].toLowerCase().indexOf(input.toLowerCase()) >= 0}
+ filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}
onChange={(value) => {this.optionChange(item.key, value)}}
getPopupContainer={() => document.getElementById('modal-fields-form-box')}
>
diff --git a/src/views/mobdesign/index.jsx b/src/views/mobdesign/index.jsx
index 0bac9a5..c10b914 100644
--- a/src/views/mobdesign/index.jsx
+++ b/src/views/mobdesign/index.jsx
@@ -6,7 +6,7 @@
import moment from 'moment'
import HTML5Backend from 'react-dnd-html5-backend'
import { ConfigProvider, notification, Modal, Collapse, Switch, Button, message, Spin, Typography } from 'antd'
-import { DoubleLeftOutlined, DoubleRightOutlined, HomeOutlined, LoginOutlined, RedoOutlined } from '@ant-design/icons'
+import { DoubleLeftOutlined, DoubleRightOutlined, HomeOutlined, LoginOutlined, RedoOutlined, ArrowLeftOutlined } from '@ant-design/icons'
import Api from '@/api'
import Utils, { setGLOBFuncs } from '@/utils/utils.js'
@@ -17,7 +17,6 @@
import MKEmitter from '@/utils/events.js'
import MenuUtils from '@/utils/utils-custom.js'
import asyncComponent from '@/utils/asyncComponent'
-import backurl from '@/assets/img/back.jpg'
import './index.scss'
@@ -1713,7 +1712,7 @@
<div className="wrap">
<Button type="primary" onClick={this.submitConfig} id="save-config" loading={menuloading}>{dict['mob.save']}</Button>
<Switch className="big" checkedChildren={dict['mob.enable']} unCheckedChildren={dict['mob.disable']} checked={config && config.enabled} onChange={this.onEnabledChange} />
- <img title="鍚庨��" className="back-view" onClick={this.backView} src={backurl} alt=""/>
+ <ArrowLeftOutlined title="鍚庨��" className="back-view" onClick={this.backView}/>
<CreateView resetmenu={this.getAppMenus} />
<PasteController insert={this.insert} />
<StyleCombControlButton menu={config} />
diff --git a/src/views/mobdesign/index.scss b/src/views/mobdesign/index.scss
index d9f3125..0881850 100644
--- a/src/views/mobdesign/index.scss
+++ b/src/views/mobdesign/index.scss
@@ -12,11 +12,8 @@
float: right;
margin-right: 10px;
cursor: pointer;
- filter: opacity(0.7);
- transition: filter 0.3s;
- }
- .back-view:hover {
- filter: opacity(0.9);
+ font-size: 20px;
+ color: #757575;
}
.modal-form-board {
padding-top: 0;
diff --git a/src/views/pcdesign/index.jsx b/src/views/pcdesign/index.jsx
index 7f0144d..2147a54 100644
--- a/src/views/pcdesign/index.jsx
+++ b/src/views/pcdesign/index.jsx
@@ -6,7 +6,7 @@
import moment from 'moment'
import HTML5Backend from 'react-dnd-html5-backend'
import { ConfigProvider, notification, Modal, Collapse, Switch, Button, message, Spin, Typography } from 'antd'
-import { DoubleLeftOutlined, DoubleRightOutlined, HomeOutlined, LoginOutlined, RedoOutlined } from '@ant-design/icons'
+import { DoubleLeftOutlined, DoubleRightOutlined, HomeOutlined, LoginOutlined, RedoOutlined, ArrowLeftOutlined } from '@ant-design/icons'
import Api from '@/api'
import Utils, { setGLOBFuncs } from '@/utils/utils.js'
@@ -17,7 +17,6 @@
import MKEmitter from '@/utils/events.js'
import MenuUtils from '@/utils/utils-custom.js'
import asyncComponent from '@/utils/asyncComponent'
-import backurl from '@/assets/img/back.jpg'
import './index.scss'
@@ -1778,7 +1777,7 @@
<div className="wrap">
<Button type="primary" id="save-config" onClick={this.submitConfig} loading={menuloading}>{dict['mob.save']}</Button>
<Switch className="big" checkedChildren={dict['mob.enable']} unCheckedChildren={dict['mob.disable']} checked={config && config.enabled} onChange={this.onEnabledChange} />
- <img title="鍚庨��" className="back-view" onClick={this.backView} src={backurl} alt=""/>
+ <ArrowLeftOutlined title="鍚庨��" className="back-view" onClick={this.backView}/>
<CreateView resetmenu={this.getAppMenus} />
<PasteController insert={this.insert} />
<StyleCombControlButton menu={config} />
diff --git a/src/views/pcdesign/index.scss b/src/views/pcdesign/index.scss
index c6a8f6a..b8689fe 100644
--- a/src/views/pcdesign/index.scss
+++ b/src/views/pcdesign/index.scss
@@ -16,11 +16,8 @@
float: right;
margin-right: 10px;
cursor: pointer;
- filter: opacity(0.7);
- transition: filter 0.3s;
- }
- .back-view:hover {
- filter: opacity(0.9);
+ font-size: 20px;
+ color: #757575;
}
.modal-form-board {
padding-top: 0;
--
Gitblit v1.8.0