From 1a5b9707d0a06703f089fd426e20d78875c74c67 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 09 五月 2020 18:16:17 +0800
Subject: [PATCH] 2020-05-09
---
src/locales/zh-CN/model.js | 1 +
src/templates/sharecomponent/settingcomponent/index.jsx | 6 ++----
src/tabviews/commontable/index.scss | 7 +++++--
src/templates/sharecomponent/columncomponent/index.jsx | 2 +-
src/locales/en-US/model.js | 1 +
src/templates/sharecomponent/searchcomponent/dategroup/index.scss | 9 ++++++++-
src/templates/zshare/formconfig.jsx | 3 +++
src/tabviews/zshare/normalTable/index.jsx | 1 +
src/templates/comtableconfig/source.jsx | 6 ++++++
src/tabviews/zshare/dategroup/index.scss | 9 ++++++++-
src/templates/sharecomponent/settingcomponent/settingform/customscript/index.jsx | 2 +-
11 files changed, 37 insertions(+), 10 deletions(-)
diff --git a/src/locales/en-US/model.js b/src/locales/en-US/model.js
index 3009892..aff431f 100644
--- a/src/locales/en-US/model.js
+++ b/src/locales/en-US/model.js
@@ -97,6 +97,7 @@
'header.form.text': 'Text',
'header.form.description': '鎻忚堪',
'header.form.textarea': '澶氳鏂囨湰',
+ 'header.form.contrastCol': '瀵规瘮鍒�',
'header.form.fileupload': '鏂囦欢涓婁紶',
'header.form.funcvar': '鍑芥暟鍙橀噺',
'header.form.linkForm': '鍏宠仈琛ㄥ崟',
diff --git a/src/locales/zh-CN/model.js b/src/locales/zh-CN/model.js
index 8c7f8b8..6f28d05 100644
--- a/src/locales/zh-CN/model.js
+++ b/src/locales/zh-CN/model.js
@@ -97,6 +97,7 @@
'header.form.text': '鏂囨湰',
'header.form.description': '鎻忚堪',
'header.form.textarea': '澶氳鏂囨湰',
+ 'header.form.contrastCol': '瀵规瘮鍒�',
'header.form.fileupload': '鏂囦欢涓婁紶',
'header.form.funcvar': '鍑芥暟鍙橀噺',
'header.form.linkForm': '鍏宠仈琛ㄥ崟',
diff --git a/src/tabviews/commontable/index.scss b/src/tabviews/commontable/index.scss
index 6a9c0b2..79135d2 100644
--- a/src/tabviews/commontable/index.scss
+++ b/src/tabviews/commontable/index.scss
@@ -91,16 +91,19 @@
.chart-view {
position: relative;
.ant-tabs-bar {
+ position: relative;
+ z-index: 1;
margin: 0;
border: 0;
.ant-tabs-nav-scroll {
text-align: right;
+ padding-right: 20px;
.ant-tabs-ink-bar {
display: none!important;
}
.ant-tabs-tab {
- margin-right: 0;
- padding: 10px 16px;
+ padding: 5px 5px;
+ margin-right: 5px;
}
}
}
diff --git a/src/tabviews/zshare/dategroup/index.scss b/src/tabviews/zshare/dategroup/index.scss
index e8c84bc..c13982b 100644
--- a/src/tabviews/zshare/dategroup/index.scss
+++ b/src/tabviews/zshare/dategroup/index.scss
@@ -42,7 +42,7 @@
border-color: #d1d5d9;
border-radius: 2px;
margin-right: 2px;
- padding: 2px 7px;
+ padding: 2px 6px;
}
.ant-tag-checkable:active {
background-color: #ffffff;
@@ -76,6 +76,13 @@
}
}
+@media screen and (min-width: 1440px) {
+ .table-search-date-group {
+ .ant-tag-checkable {
+ padding: 2px 7px;
+ }
+ }
+}
@media screen and (min-width: 1600px) {
.table-search-date-group {
.ant-tag-checkable {
diff --git a/src/tabviews/zshare/normalTable/index.jsx b/src/tabviews/zshare/normalTable/index.jsx
index b6bf7ec..9bee562 100644
--- a/src/tabviews/zshare/normalTable/index.jsx
+++ b/src/tabviews/zshare/normalTable/index.jsx
@@ -573,6 +573,7 @@
showTotal: (total, range) => `${range[0]}-${range[1]} ${this.props.dict['main.pagination.of']} ${total} ${this.props.dict['main.pagination.items']}`
}
}
+ // rowClassName={(record) => record.$className || ''}
return (
<div className="normal-data-table">
diff --git a/src/templates/comtableconfig/source.jsx b/src/templates/comtableconfig/source.jsx
index c7edb97..036bdbf 100644
--- a/src/templates/comtableconfig/source.jsx
+++ b/src/templates/comtableconfig/source.jsx
@@ -358,6 +358,12 @@
label: CommonDict['header.form.colspan'],
subType: 'colspan',
url: ''
+ },
+ {
+ type: 'columns',
+ label: '瀵规瘮鍒�',
+ subType: CommonDict['header.form.contrastCol'],
+ url: ''
}
]
diff --git a/src/templates/sharecomponent/columncomponent/index.jsx b/src/templates/sharecomponent/columncomponent/index.jsx
index 03a1df9..240a4a6 100644
--- a/src/templates/sharecomponent/columncomponent/index.jsx
+++ b/src/templates/sharecomponent/columncomponent/index.jsx
@@ -74,7 +74,7 @@
this.handleColumn(card)
} else {
this.setState({columnlist: list})
- this.props.updatecolumn({...config, search: list})
+ this.props.updatecolumn({...config, columns: list})
}
}
diff --git a/src/templates/sharecomponent/searchcomponent/dategroup/index.scss b/src/templates/sharecomponent/searchcomponent/dategroup/index.scss
index 2698956..6782732 100644
--- a/src/templates/sharecomponent/searchcomponent/dategroup/index.scss
+++ b/src/templates/sharecomponent/searchcomponent/dategroup/index.scss
@@ -8,13 +8,20 @@
border-color: #d1d5d9;
border-radius: 2px;
margin-right: 2px;
- padding: 2px 7px;
+ padding: 2px 6px;
}
.ant-tag-checkable-checked {
border-color: #1890ff;
}
}
+@media screen and (min-width: 1440px) {
+ .model-date-group {
+ .ant-tag-checkable {
+ padding: 2px 7px;
+ }
+ }
+}
@media screen and (min-width: 1600px) {
.model-date-group {
.ant-tag-checkable {
diff --git a/src/templates/sharecomponent/settingcomponent/index.jsx b/src/templates/sharecomponent/settingcomponent/index.jsx
index 1c16783..bc09bd0 100644
--- a/src/templates/sharecomponent/settingcomponent/index.jsx
+++ b/src/templates/sharecomponent/settingcomponent/index.jsx
@@ -14,9 +14,7 @@
import './index.scss'
-// const { Option } = Select
-
-class TablesComponent extends Component {
+class SettingComponent extends Component {
static propTpyes = {
type: PropTypes.string, // 鑿滃崟绫诲瀷
MenuID: PropTypes.string, // 鑿滃崟ID
@@ -202,4 +200,4 @@
}
}
-export default TablesComponent
\ No newline at end of file
+export default SettingComponent
\ No newline at end of file
diff --git a/src/templates/sharecomponent/settingcomponent/settingform/customscript/index.jsx b/src/templates/sharecomponent/settingcomponent/settingform/customscript/index.jsx
index 7d5847d..cffe183 100644
--- a/src/templates/sharecomponent/settingcomponent/settingform/customscript/index.jsx
+++ b/src/templates/sharecomponent/settingcomponent/settingform/customscript/index.jsx
@@ -229,7 +229,7 @@
</Col>
<Col span={24} className="sqlfield">
<Form.Item label={'鍙敤瀛楁'}>
- id, bid, loginuid, sessionuid, userid, appkey{usefulFields ? ', ' + usefulFields : ''}
+ id, bid, loginuid, sessionuid, userid, appkey, orderBy{setting.laypage !== 'false' ? ', pageSize, pageIndex': ''}{usefulFields ? ', ' + usefulFields : ''}
</Form.Item>
</Col>
<Col span={8} style={{whiteSpace: 'nowrap'}}>
diff --git a/src/templates/zshare/formconfig.jsx b/src/templates/zshare/formconfig.jsx
index da77965..d0c04da 100644
--- a/src/templates/zshare/formconfig.jsx
+++ b/src/templates/zshare/formconfig.jsx
@@ -1059,6 +1059,9 @@
}, {
value: 'textarea',
text: Formdict['header.form.textarea']
+ }, {
+ value: 'contrast',
+ text: Formdict['header.form.contrastCol']
}]
},
{
--
Gitblit v1.8.0