From 30c8ef68ab9fc3544ae9063cee95fc0245f022ed Mon Sep 17 00:00:00 2001 From: tengge1 <930372551@qq.com> Date: Tue, 24 Sep 2019 22:00:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=B7=E6=96=B0=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assets/css/icon/demo_index.html | 23 + ShadowEditor.Web/assets/css/icon/iconfont.css | 16 +- ShadowEditor.Web/assets/css/icon/iconfont.eot | Bin 17296 -> 17492 bytes ShadowEditor.Web/assets/css/icon/iconfont.js | 2 +- .../assets/css/icon/iconfont.json | 590 ++++++++++++++++++ ShadowEditor.Web/assets/css/icon/iconfont.svg | 3 + ShadowEditor.Web/assets/css/icon/iconfont.ttf | Bin 17128 -> 17324 bytes .../assets/css/icon/iconfont.woff | Bin 11296 -> 11432 bytes .../assets/css/icon/iconfont.woff2 | Bin 9368 -> 9512 bytes ShadowEditor.Web/locales/zh-CN.json | 3 +- ShadowEditor.Web/src/ui/table/DataGrid.jsx | 8 + .../src/ui/table/css/DataGrid.css | 1 + 12 files changed, 638 insertions(+), 8 deletions(-) create mode 100644 ShadowEditor.Web/assets/css/icon/iconfont.json diff --git a/ShadowEditor.Web/assets/css/icon/demo_index.html b/ShadowEditor.Web/assets/css/icon/demo_index.html index 6987ca87..538ea916 100644 --- a/ShadowEditor.Web/assets/css/icon/demo_index.html +++ b/ShadowEditor.Web/assets/css/icon/demo_index.html @@ -504,6 +504,12 @@
&#xe6bb;
+
  • + +
    刷新
    +
    &#xe627;
    +
  • +
  • 不可见
    @@ -1283,6 +1289,15 @@
  • +
  • + +
    + 刷新 +
    +
    .icon-refresh +
    +
  • +
  • @@ -1971,6 +1986,14 @@
    #icon-down-triangle
  • +
  • + +
    刷新
    +
    #icon-refresh
    +
  • +
  • {_t('Total {{totalPage}} Pages', { totalPage })}, @@ -133,6 +135,10 @@ class DataGrid extends React.Component { handleLastPage(onLastPage, event) { onLastPage && onLastPage(event); } + + handleRefresh(onRefresh, event) { + onRefresh && onRefresh(event); + } } DataGrid.propTypes = { @@ -160,6 +166,7 @@ DataGrid.propTypes = { onPreviousPage: PropTypes.func, onNextPage: PropTypes.func, onLastPage: PropTypes.func, + onRefresh: PropTypes.func, }; DataGrid.defaultProps = { @@ -179,6 +186,7 @@ DataGrid.defaultProps = { onPreviousPage: null, onNextPage: null, onLastPage: null, + onRefresh: null, }; export default DataGrid; \ No newline at end of file diff --git a/ShadowEditor.Web/src/ui/table/css/DataGrid.css b/ShadowEditor.Web/src/ui/table/css/DataGrid.css index d13af9db..14d0b2fc 100644 --- a/ShadowEditor.Web/src/ui/table/css/DataGrid.css +++ b/ShadowEditor.Web/src/ui/table/css/DataGrid.css @@ -100,6 +100,7 @@ .DataGrid>.page>.IconButton>.iconfont { font-size: 14px; + line-height: 18px; } .DataGrid>.page>.line {