From 073daa8c9ac0fb87d762fc5bbc4549c8c88907d2 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 31 十二月 2020 20:37:21 +0800
Subject: [PATCH] 2020-12-31
---
src/menu/components/search/main-search/index.jsx | 6 +++---
src/menu/components/share/searchcomponent/dragsearch/card.jsx | 8 ++++----
src/locales/zh-CN/model.js | 3 ---
src/templates/sharecomponent/columncomponent/index.jsx | 2 +-
src/templates/sharecomponent/actioncomponent/index.jsx | 2 +-
src/locales/en-US/model.js | 3 ---
src/views/login/index.scss | 10 +++++-----
src/menu/components/share/searchcomponent/index.jsx | 9 ++++-----
src/menu/components/share/actioncomponent/index.jsx | 2 +-
src/templates/sharecomponent/searchcomponent/index.jsx | 6 +++---
10 files changed, 22 insertions(+), 29 deletions(-)
diff --git a/src/locales/en-US/model.js b/src/locales/en-US/model.js
index 7e60392..a806926 100644
--- a/src/locales/en-US/model.js
+++ b/src/locales/en-US/model.js
@@ -233,15 +233,12 @@
'header.form.clickscale': '鐐瑰嚮缂╂斁',
'header.form.easyCode': 'EasyCode',
'header.modal.form.edit': '琛ㄥ崟-缂栬緫',
- 'model.searchCriteria': 'Search Criteria',
'model.action': '鎸夐挳',
'header.modal.action.copy': '鎸夐挳-澶嶅埗',
'header.modal.form.copy': '琛ㄥ崟-澶嶅埗',
'header.modal.column.edit': '鏄剧ず鍒�-缂栬緫',
'header.modal.gridbtn.edit': '鎿嶄綔鍒�-缂栬緫',
'header.modal.tabs.edit': '鏍囩-缂栬緫',
- 'model.field.exist': '瀛楁宸插瓨鍦�',
- 'model.name.exist': '鍚嶇О宸插瓨鍦�',
'form.required.input': 'Please enter the ',
'form.required.select': 'Please select a ',
'form.required.add': 'Please add ',
diff --git a/src/locales/zh-CN/model.js b/src/locales/zh-CN/model.js
index b306629..40a089c 100644
--- a/src/locales/zh-CN/model.js
+++ b/src/locales/zh-CN/model.js
@@ -233,15 +233,12 @@
'header.form.clickscale': '鐐瑰嚮缂╂斁',
'header.form.easyCode': '鍔╄鐮�',
'header.modal.form.edit': '琛ㄥ崟-缂栬緫',
- 'model.searchCriteria': '鎼滅储鏉′欢',
'model.action': '鎸夐挳',
'header.modal.action.copy': '鎸夐挳-澶嶅埗',
'header.modal.form.copy': '琛ㄥ崟-澶嶅埗',
'header.modal.column.edit': '鏄剧ず鍒�-缂栬緫',
'header.modal.gridbtn.edit': '鎿嶄綔鍒�-缂栬緫',
'header.modal.tabs.edit': '鏍囩-缂栬緫',
- 'model.field.exist': '瀛楁宸插瓨鍦�',
- 'model.name.exist': '鍚嶇О宸插瓨鍦�',
'form.required.input': '璇疯緭鍏�',
'form.required.select': '璇烽�夋嫨',
'form.required.add': '璇锋坊鍔�',
diff --git a/src/menu/components/search/main-search/index.jsx b/src/menu/components/search/main-search/index.jsx
index 12b5278..43134bf 100644
--- a/src/menu/components/search/main-search/index.jsx
+++ b/src/menu/components/search/main-search/index.jsx
@@ -236,14 +236,14 @@
if (fieldrepet) {
notification.warning({
top: 92,
- message: this.state.dict['model.field.exist'] + ' !',
+ message: '瀛楁宸插瓨鍦�!',
duration: 5
})
return
} else if (labelrepet) {
notification.warning({
top: 92,
- message: this.state.dict['model.name.exist'] + ' !',
+ message: '鍚嶇О宸插瓨鍦�!',
duration: 5
})
return
@@ -365,7 +365,7 @@
</Popover>
{/* 缂栬緫鎼滅储鏉′欢 */}
<Modal
- title={dict['model.searchCriteria'] + '-' + dict['model.edit']}
+ title="鎼滅储鏉′欢-缂栬緫"
visible={visible}
width={850}
maskClosable={false}
diff --git a/src/menu/components/share/actioncomponent/index.jsx b/src/menu/components/share/actioncomponent/index.jsx
index 6bcdbae..98132c1 100644
--- a/src/menu/components/share/actioncomponent/index.jsx
+++ b/src/menu/components/share/actioncomponent/index.jsx
@@ -293,7 +293,7 @@
if (labelrepet) {
notification.warning({
top: 92,
- message: this.state.dict['model.name.exist'] + ' !',
+ message: '鍚嶇О宸插瓨鍦�!',
duration: 5
})
return
diff --git a/src/menu/components/share/searchcomponent/dragsearch/card.jsx b/src/menu/components/share/searchcomponent/dragsearch/card.jsx
index a23d8e5..ad010e7 100644
--- a/src/menu/components/share/searchcomponent/dragsearch/card.jsx
+++ b/src/menu/components/share/searchcomponent/dragsearch/card.jsx
@@ -42,7 +42,7 @@
_defaultValue = ''
}
} else if (card.setAll === 'true') {
- _defaultValue = 'All'
+ _defaultValue = '鍏ㄩ儴'
}
} else if (card.type === 'daterange') {
_defaultValue = [null, null]
@@ -59,9 +59,9 @@
return (
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
- <Icon className="edit" title="edit" type="edit" onClick={() => editCard(id)} />
- <Icon className="copy" title="copy" type="copy" onClick={() => copyCard(id)} />
- <Icon className="close" title="delete" type="close" onClick={() => delCard(id)} />
+ <Icon className="edit" title="缂栬緫" type="edit" onClick={() => editCard(id)} />
+ <Icon className="copy" title="澶嶅埗" type="copy" onClick={() => copyCard(id)} />
+ <Icon className="close" title="鍒犻櫎" type="close" onClick={() => delCard(id)} />
</div>
} trigger="hover">
<div className={'page-card ' + (card.labelShow || '')} style={{ opacity: opacity}}>
diff --git a/src/menu/components/share/searchcomponent/index.jsx b/src/menu/components/share/searchcomponent/index.jsx
index 66c998f..fbad3ed 100644
--- a/src/menu/components/share/searchcomponent/index.jsx
+++ b/src/menu/components/share/searchcomponent/index.jsx
@@ -198,14 +198,14 @@
if (fieldrepet) {
notification.warning({
top: 92,
- message: this.state.dict['model.field.exist'] + ' !',
+ message: '瀛楁宸插瓨鍦�!',
duration: 5
})
return
} else if (labelrepet) {
notification.warning({
top: 92,
- message: this.state.dict['model.name.exist'] + ' !',
+ message: '鍚嶇О宸插瓨鍦�!',
duration: 5
})
return
@@ -264,11 +264,10 @@
*/
deleteElement = (card) => {
const { config } = this.props
- const { dict } = this.state
let _this = this
confirm({
- content: dict['model.confirm'] + dict['model.delete'] + ` - ${card.label} 锛焋,
+ content: `纭畾鍒犻櫎 - ${card.label} 锛焋,
onOk() {
let _searchlist = fromJS(_this.state.searchlist).toJS()
@@ -297,7 +296,7 @@
/>
{/* 缂栬緫鎼滅储鏉′欢 */}
<Modal
- title={dict['model.searchCriteria'] + '-' + dict['model.edit']}
+ title="鎼滅储鏉′欢-缂栬緫"
visible={visible}
width={850}
maskClosable={false}
diff --git a/src/templates/sharecomponent/actioncomponent/index.jsx b/src/templates/sharecomponent/actioncomponent/index.jsx
index 639af29..908d1a2 100644
--- a/src/templates/sharecomponent/actioncomponent/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/index.jsx
@@ -243,7 +243,7 @@
if (labelrepet) {
notification.warning({
top: 92,
- message: this.state.dict['model.name.exist'] + ' !',
+ message: '鍚嶇О宸插瓨鍦�!',
duration: 5
})
return
diff --git a/src/templates/sharecomponent/columncomponent/index.jsx b/src/templates/sharecomponent/columncomponent/index.jsx
index 6376773..a43d19b 100644
--- a/src/templates/sharecomponent/columncomponent/index.jsx
+++ b/src/templates/sharecomponent/columncomponent/index.jsx
@@ -191,7 +191,7 @@
if (fieldrepet) {
notification.warning({
top: 92,
- message: this.state.dict['model.field.exist'] + ' !',
+ message: '瀛楁宸插瓨鍦�!',
duration: 5
})
return
diff --git a/src/templates/sharecomponent/searchcomponent/index.jsx b/src/templates/sharecomponent/searchcomponent/index.jsx
index fbaf4e2..6d84804 100644
--- a/src/templates/sharecomponent/searchcomponent/index.jsx
+++ b/src/templates/sharecomponent/searchcomponent/index.jsx
@@ -174,14 +174,14 @@
if (fieldrepet) {
notification.warning({
top: 92,
- message: this.state.dict['model.field.exist'] + ' !',
+ message: '瀛楁宸插瓨鍦�!',
duration: 5
})
return
} else if (labelrepet) {
notification.warning({
top: 92,
- message: this.state.dict['model.name.exist'] + ' !',
+ message: '鍚嶇О宸插瓨鍦�!',
duration: 5
})
return
@@ -290,7 +290,7 @@
/>
{/* 缂栬緫鎼滅储鏉′欢 */}
<Modal
- title={dict['model.searchCriteria'] + '-' + (card && card.copyType === 'search' ? dict['model.copy'] : dict['model.edit'])}
+ title={card && card.copyType === 'search' ? '鎼滅储鏉′欢-澶嶅埗' : '鎼滅储鏉′欢-缂栬緫'}
visible={visible}
width={850}
maskClosable={false}
diff --git a/src/views/login/index.scss b/src/views/login/index.scss
index 55e32a2..4fa9192 100644
--- a/src/views/login/index.scss
+++ b/src/views/login/index.scss
@@ -207,11 +207,11 @@
color: #ffffff;
}
}
- // .ant-btn-primary[disabled] {
- // color: #fff;
- // background-color: #40a9ff;
- // border-color: #40a9ff;
- // }
+ .ant-btn-primary[disabled] {
+ color: #fff;
+ // background-color: #40a9ff;
+ // border-color: #40a9ff;
+ }
}
.sync-cloud-application {
.ant-modal-body {
--
Gitblit v1.8.0