diff --git a/public/antd/iconfont.eot b/public/public/antd/iconfont.eot similarity index 100% rename from public/antd/iconfont.eot rename to public/public/antd/iconfont.eot diff --git a/public/antd/iconfont.svg b/public/public/antd/iconfont.svg similarity index 100% rename from public/antd/iconfont.svg rename to public/public/antd/iconfont.svg diff --git a/public/antd/iconfont.ttf b/public/public/antd/iconfont.ttf similarity index 100% rename from public/antd/iconfont.ttf rename to public/public/antd/iconfont.ttf diff --git a/public/antd/iconfont.woff b/public/public/antd/iconfont.woff similarity index 100% rename from public/antd/iconfont.woff rename to public/public/antd/iconfont.woff diff --git a/public/assets/data-1491837999815-H1_44Qtal.jpg b/public/public/assets/data-1491837999815-H1_44Qtal.jpg similarity index 100% rename from public/assets/data-1491837999815-H1_44Qtal.jpg rename to public/public/assets/data-1491837999815-H1_44Qtal.jpg diff --git a/public/assets/data-1493804606544-r1PBU7D1W.jpg b/public/public/assets/data-1493804606544-r1PBU7D1W.jpg similarity index 100% rename from public/assets/data-1493804606544-r1PBU7D1W.jpg rename to public/public/assets/data-1493804606544-r1PBU7D1W.jpg diff --git a/public/assets/data-1493804610896-SJoBIXPkW.jpg b/public/public/assets/data-1493804610896-SJoBIXPkW.jpg similarity index 100% rename from public/assets/data-1493804610896-SJoBIXPkW.jpg rename to public/public/assets/data-1493804610896-SJoBIXPkW.jpg diff --git a/public/iconfont.css b/public/public/iconfont.css similarity index 100% rename from public/iconfont.css rename to public/public/iconfont.css diff --git a/public/iconfont.eot b/public/public/iconfont.eot similarity index 100% rename from public/iconfont.eot rename to public/public/iconfont.eot diff --git a/public/iconfont.js b/public/public/iconfont.js similarity index 100% rename from public/iconfont.js rename to public/public/iconfont.js diff --git a/public/iconfont.svg b/public/public/iconfont.svg similarity index 100% rename from public/iconfont.svg rename to public/public/iconfont.svg diff --git a/public/iconfont.ttf b/public/public/iconfont.ttf similarity index 100% rename from public/iconfont.ttf rename to public/public/iconfont.ttf diff --git a/public/iconfont.woff b/public/public/iconfont.woff similarity index 100% rename from public/iconfont.woff rename to public/public/iconfont.woff diff --git a/public/logo.svg b/public/public/logo.svg similarity index 100% rename from public/logo.svg rename to public/public/logo.svg diff --git a/src/components/DataTable/DataTable.js b/src/components/DataTable/DataTable.js index 8f5417c..3478a5f 100644 --- a/src/components/DataTable/DataTable.js +++ b/src/components/DataTable/DataTable.js @@ -32,7 +32,7 @@ class DataTable extends React.Component { } } - componentWillReceiveProps (nextProps) { + UNSAFE_componentWillReceiveProps (nextProps) { const staticNextProps = cloneDeep(nextProps) delete staticNextProps.columns const { columns, ...otherProps } = this.props diff --git a/src/utils/config.js b/src/utils/config.js index e9a7bbf..9ce27e9 100644 --- a/src/utils/config.js +++ b/src/utils/config.js @@ -5,9 +5,9 @@ module.exports = { name: 'AntD Admin', prefix: 'antdAdmin', footerText: 'Ant Design Admin © 2018 zuiidea', - logo: '/logo.svg', - iconFontCSS: '/iconfont.css', - iconFontJS: '/iconfont.js', + logo: '/public/logo.svg', + iconFontCSS: '/public/iconfont.css', + iconFontJS: '/public/iconfont.js', CORS: [], openPages: ['/login'], apiPrefix: '/api/v1',