{hideCheckAll ? null : (
- 全部
+ {selectAllText}
)}
{value &&
@@ -117,7 +130,7 @@ class TagSelect extends Component {
})}
{expandable && (
- {expand ? '收起' : '展开'}
diff --git a/src/defaultSettings.js b/src/defaultSettings.js
index 20fa3af..6e98a77 100644
--- a/src/defaultSettings.js
+++ b/src/defaultSettings.js
@@ -7,8 +7,9 @@ module.exports = {
autoHideHeader: false, // auto hide header
fixSiderbar: true, // sticky siderbar
collapse: true,
- title: 'Sword企业级开发平台',
menu: {
disableLocal: false,
},
+ title: 'Sword企业级开发平台',
+ pwa: true,
};
diff --git a/src/global.js b/src/global.js
index 62f8cce..bf60b41 100644
--- a/src/global.js
+++ b/src/global.js
@@ -1,54 +1,59 @@
import React from 'react';
import { notification, Button, message } from 'antd';
import { formatMessage } from 'umi/locale';
+import defaultSettings from './defaultSettings';
-// Notify user if offline now
-window.addEventListener('sw.offline', () => {
- message.warning(formatMessage({ id: 'app.pwa.offline' }));
-});
-
-// Pop up a prompt on the page asking the user if they want to use the latest version
-window.addEventListener('sw.updated', e => {
- const reloadSW = async () => {
- // Check if there is sw whose state is waiting in ServiceWorkerRegistration
- // https://developer.mozilla.org/en-US/docs/Web/API/ServiceWorkerRegistration
- const worker = e.detail && e.detail.waiting;
- if (!worker) {
- return Promise.resolve();
- }
- // Send skip-waiting event to waiting SW with MessageChannel
- await new Promise((resolve, reject) => {
- const channel = new MessageChannel();
- channel.port1.onmessage = event => {
- if (event.data.error) {
- reject(event.data.error);
- } else {
- resolve(event.data);
- }
- };
- worker.postMessage({ type: 'skip-waiting' }, [channel.port2]);
- });
- // Refresh current page to use the updated HTML and other assets after SW has skiped waiting
- window.location.reload(true);
- return true;
- };
- const key = `open${Date.now()}`;
- const btn = (
-
- );
- notification.open({
- message: formatMessage({ id: 'app.pwa.serviceworker.updated' }),
- description: formatMessage({ id: 'app.pwa.serviceworker.updated.hint' }),
- btn,
- key,
- onClose: async () => {},
+const { pwa } = defaultSettings;
+// if pwa is true
+if (pwa) {
+ // Notify user if offline now
+ window.addEventListener('sw.offline', () => {
+ message.warning(formatMessage({ id: 'app.pwa.offline' }));
});
-});
+
+ // Pop up a prompt on the page asking the user if they want to use the latest version
+ window.addEventListener('sw.updated', e => {
+ const reloadSW = async () => {
+ // Check if there is sw whose state is waiting in ServiceWorkerRegistration
+ // https://developer.mozilla.org/en-US/docs/Web/API/ServiceWorkerRegistration
+ const worker = e.detail && e.detail.waiting;
+ if (!worker) {
+ return Promise.resolve();
+ }
+ // Send skip-waiting event to waiting SW with MessageChannel
+ await new Promise((resolve, reject) => {
+ const channel = new MessageChannel();
+ channel.port1.onmessage = event => {
+ if (event.data.error) {
+ reject(event.data.error);
+ } else {
+ resolve(event.data);
+ }
+ };
+ worker.postMessage({ type: 'skip-waiting' }, [channel.port2]);
+ });
+ // Refresh current page to use the updated HTML and other assets after SW has skiped waiting
+ window.location.reload(true);
+ return true;
+ };
+ const key = `open${Date.now()}`;
+ const btn = (
+
+ );
+ notification.open({
+ message: formatMessage({ id: 'app.pwa.serviceworker.updated' }),
+ description: formatMessage({ id: 'app.pwa.serviceworker.updated.hint' }),
+ btn,
+ key,
+ onClose: async () => {},
+ });
+ });
+}
diff --git a/src/global.less b/src/global.less
index fccd7e8..1450ba4 100644
--- a/src/global.less
+++ b/src/global.less
@@ -1,3 +1,5 @@
+@import '~antd/lib/style/themes/default.less';
+
html,
body,
#root {
@@ -31,3 +33,20 @@ ul,
ol {
list-style: none;
}
+
+@media (max-width: @screen-xs) {
+ .ant-table {
+ width: 100%;
+ overflow-x: auto;
+ &-thead > tr,
+ &-tbody > tr {
+ > th,
+ > td {
+ white-space: pre;
+ > span {
+ display: block;
+ }
+ }
+ }
+ }
+}
diff --git a/src/layouts/BasicLayout.js b/src/layouts/BasicLayout.js
index 37c84d4..dc93402 100644
--- a/src/layouts/BasicLayout.js
+++ b/src/layouts/BasicLayout.js
@@ -52,7 +52,7 @@ const query = {
},
};
-class BasicLayout extends React.PureComponent {
+class BasicLayout extends React.Component {
constructor(props) {
super(props);
this.getPageTitle = memoizeOne(this.getPageTitle);
@@ -76,15 +76,6 @@ class BasicLayout extends React.PureComponent {
});
}
- componentDidUpdate(preProps) {
- // After changing to phone mode,
- // if collapsed is true, you need to click twice to display
- const { collapsed, isMobile } = this.props;
- if (isMobile && !preProps.isMobile && !collapsed) {
- this.handleMenuCollapse(false);
- }
- }
-
getContext() {
const { location, breadcrumbNameMap } = this.props;
return {
@@ -98,20 +89,28 @@ class BasicLayout extends React.PureComponent {
return breadcrumbNameMap[pathKey];
};
- getRouterAuthority = (pathname, routeData) => {
- let routeAuthority = ['noAuthority'];
- const getAuthority = (key, routes) => {
- routes.forEach(route => {
- if (route.path && pathToRegexp(route.path).test(key)) {
- routeAuthority = route.authority;
- } else if (route.routes) {
- routeAuthority = getAuthority(key, route.routes);
+ getRouteAuthority = (pathname, routeData) => {
+ const routes = routeData.slice(); // clone
+ let authorities;
+
+ while (routes.length > 0) {
+ const route = routes.shift();
+ // check partial route
+ if (pathToRegexp(`${route.path}(.*)`).test(pathname)) {
+ if (route.authority) {
+ authorities = route.authority;
}
- return route;
- });
- return routeAuthority;
- };
- return getAuthority(pathname, routeData);
+ // is exact route?
+ if (pathToRegexp(route.path).test(pathname)) {
+ break;
+ }
+
+ if (route.routes) {
+ route.routes.forEach(r => routes.push(r));
+ }
+ }
+ }
+ return authorities;
};
getPageTitle = (pathname, breadcrumbNameMap) => {
@@ -172,7 +171,7 @@ class BasicLayout extends React.PureComponent {
} = this.props;
const isTop = PropsLayout === 'topmenu';
- const routerConfig = this.getRouterAuthority(pathname, routes);
+ const routerConfig = this.getRouteAuthority(pathname, routes);
const contentStyle = !fixedHeader ? { paddingTop: 0 } : {};
const layout = (
-
-
+ Sword企业级开发平台
-
+
+
+
+ Ant Design Pro
+
-
-
+
+
+
+);
export default UserLayout;
diff --git a/src/locales/en-US.js b/src/locales/en-US.js
index 1872b2f..d681f2e 100644
--- a/src/locales/en-US.js
+++ b/src/locales/en-US.js
@@ -11,6 +11,7 @@ import result from './en-US/result';
import settingDrawer from './en-US/settingDrawer';
import settings from './en-US/settings';
import pwa from './en-US/pwa';
+import component from './en-US/component';
export default {
'navBar.lang': 'Languages',
@@ -34,4 +35,5 @@ export default {
...settingDrawer,
...settings,
...pwa,
+ ...component,
};
diff --git a/src/locales/en-US/component.js b/src/locales/en-US/component.js
new file mode 100644
index 0000000..3ba7eed
--- /dev/null
+++ b/src/locales/en-US/component.js
@@ -0,0 +1,5 @@
+export default {
+ 'component.tagSelect.expand': 'Expand',
+ 'component.tagSelect.collapse': 'Collapse',
+ 'component.tagSelect.all': 'All',
+};
diff --git a/src/locales/en-US/settings.js b/src/locales/en-US/settings.js
index e0de686..822dd00 100644
--- a/src/locales/en-US/settings.js
+++ b/src/locales/en-US/settings.js
@@ -25,14 +25,14 @@ export default {
'app.settings.security.medium': 'Medium',
'app.settings.security.weak': 'Weak',
'app.settings.security.password': 'Account Password',
- 'app.settings.security.password-description': 'Current password strength：',
+ 'app.settings.security.password-description': 'Current password strength',
'app.settings.security.phone': 'Security Phone',
- 'app.settings.security.phone-description': 'Bound phone：',
+ 'app.settings.security.phone-description': 'Bound phone',
'app.settings.security.question': 'Security Question',
'app.settings.security.question-description':
'The security question is not set, and the security policy can effectively protect the account security',
'app.settings.security.email': 'Backup Email',
- 'app.settings.security.email-description': 'Bound Email：',
+ 'app.settings.security.email-description': 'Bound Email',
'app.settings.security.mfa': 'MFA Device',
'app.settings.security.mfa-description':
'Unbound MFA device, after binding, can be confirmed twice',
diff --git a/src/locales/zh-CN.js b/src/locales/zh-CN.js
index 68a82d3..96b7f51 100644
--- a/src/locales/zh-CN.js
+++ b/src/locales/zh-CN.js
@@ -11,6 +11,7 @@ import result from './zh-CN/result';
import settingDrawer from './zh-CN/settingDrawer';
import settings from './zh-CN/settings';
import pwa from './zh-CN/pwa';
+import component from './zh-CN/component';
export default {
'navBar.lang': '语言',
@@ -34,4 +35,5 @@ export default {
...settingDrawer,
...settings,
...pwa,
+ ...component,
};
diff --git a/src/locales/zh-CN/component.js b/src/locales/zh-CN/component.js
new file mode 100644
index 0000000..1f1fead
--- /dev/null
+++ b/src/locales/zh-CN/component.js
@@ -0,0 +1,5 @@
+export default {
+ 'component.tagSelect.expand': '展开',
+ 'component.tagSelect.collapse': '收起',
+ 'component.tagSelect.all': '全部',
+};
diff --git a/src/locales/zh-CN/settings.js b/src/locales/zh-CN/settings.js
index f664d37..df8af43 100644
--- a/src/locales/zh-CN/settings.js
+++ b/src/locales/zh-CN/settings.js
@@ -25,13 +25,13 @@ export default {
'app.settings.security.medium': '中',
'app.settings.security.weak': '弱',
'app.settings.security.password': '账户密码',
- 'app.settings.security.password-description': '当前密码强度：',
+ 'app.settings.security.password-description': '当前密码强度',
'app.settings.security.phone': '密保手机',
- 'app.settings.security.phone-description': '已绑定手机：',
+ 'app.settings.security.phone-description': '已绑定手机',
'app.settings.security.question': '密保问题',
'app.settings.security.question-description': '未设置密保问题，密保问题可有效保护账户安全',
'app.settings.security.email': '备用邮箱',
- 'app.settings.security.email-description': '已绑定邮箱：',
+ 'app.settings.security.email-description': '已绑定邮箱',
'app.settings.security.mfa': 'MFA 设备',
'app.settings.security.mfa-description': '未绑定 MFA 设备，绑定后，可以进行二次确认',
'app.settings.security.modify': '修改',
diff --git a/src/locales/zh-TW.js b/src/locales/zh-TW.js
index 8dbc94a..6f290d6 100644
--- a/src/locales/zh-TW.js
+++ b/src/locales/zh-TW.js
@@ -11,6 +11,7 @@ import result from './zh-TW/result';
import settingDrawer from './zh-TW/settingDrawer';
import settings from './zh-TW/settings';
import pwa from './zh-TW/pwa';
+import component from './zh-TW/component';
export default {
'navBar.lang': '語言',
@@ -34,4 +35,5 @@ export default {
...settingDrawer,
...settings,
...pwa,
+ ...component,
};
diff --git a/src/locales/zh-TW/component.js b/src/locales/zh-TW/component.js
new file mode 100644
index 0000000..ba48e29
--- /dev/null
+++ b/src/locales/zh-TW/component.js
@@ -0,0 +1,5 @@
+export default {
+ 'component.tagSelect.expand': '展開',
+ 'component.tagSelect.collapse': '收起',
+ 'component.tagSelect.all': '全部',
+};
diff --git a/src/locales/zh-TW/globalHeader.js b/src/locales/zh-TW/globalHeader.js
index 0ab49d6..c7b4e6f 100644
--- a/src/locales/zh-TW/globalHeader.js
+++ b/src/locales/zh-TW/globalHeader.js
@@ -3,7 +3,7 @@ export default {
'component.globalHeader.search.example1': '搜索提示壹',
'component.globalHeader.search.example2': '搜索提示二',
'component.globalHeader.search.example3': '搜索提示三',
- 'component.globalHeader.help': '使用文檔',
+ 'component.globalHeader.help': '使用手冊',
'component.globalHeader.notification': '通知',
'component.globalHeader.notification.empty': '妳已查看所有通知',
'component.globalHeader.message': '消息',
@@ -12,7 +12,7 @@ export default {
'component.globalHeader.event.empty': '妳已完成所有待辦',
'component.noticeIcon.clear': '清空',
'component.noticeIcon.cleared': '清空了',
- 'component.noticeIcon.empty': '暫無數據',
+ 'component.noticeIcon.empty': '暫無資料',
'component.noticeIcon.loaded': '加載完畢',
'component.noticeIcon.loading-more': '加載更多',
};
diff --git a/src/locales/zh-TW/settings.js b/src/locales/zh-TW/settings.js
index 8a94de5..dd45151 100644
--- a/src/locales/zh-TW/settings.js
+++ b/src/locales/zh-TW/settings.js
@@ -25,13 +25,13 @@ export default {
'app.settings.security.medium': '中',
'app.settings.security.weak': '弱',
'app.settings.security.password': '賬戶密碼',
- 'app.settings.security.password-description': '當前密碼強度：',
+ 'app.settings.security.password-description': '當前密碼強度',
'app.settings.security.phone': '密保手機',
- 'app.settings.security.phone-description': '已綁定手機：',
+ 'app.settings.security.phone-description': '已綁定手機',
'app.settings.security.question': '密保問題',
'app.settings.security.question-description': '未設置密保問題，密保問題可有效保護賬戶安全',
'app.settings.security.email': '備用郵箱',
- 'app.settings.security.email-description': '已綁定郵箱：',
+ 'app.settings.security.email-description': '已綁定郵箱',
'app.settings.security.mfa': 'MFA 設備',
'app.settings.security.mfa-description': '未綁定 MFA 設備，綁定後，可以進行二次確認',
'app.settings.security.modify': '修改',
diff --git a/src/pages/Dashboard/Workplace.js b/src/pages/Dashboard/Workplace.js
index 9371dd5..17c2431 100644
--- a/src/pages/Dashboard/Workplace.js
+++ b/src/pages/Dashboard/Workplace.js
@@ -177,7 +177,7 @@ class Workplace extends PureComponent {
SpringBlade 企业版系列
- 已通过长时间生产环境的考验，现将其拆分出基础模块进行开源，当前版本为：2.0.0-RC3。
+ 已通过长时间生产环境的考验，现将其拆分出基础模块进行开源，当前版本为：2.0.0。
}
diff --git a/src/pages/document.ejs b/src/pages/document.ejs
index 2bb0c7f..ddd1b8b 100644
--- a/src/pages/document.ejs
+++ b/src/pages/document.ejs
@@ -1,15 +1,18 @@
-
-
-
-
+
+
+
+
+
- );
- }
-}
+ {children}
+
+
+ 
+ Ant Design
+
-
-
-
-
- {children}
-
-
-
- Sword 企业级开发平台
-
-
-
- Sword是SpringBlade前端UI项目，基于react 、ant design、umi、dva等流行技术栈。
-
- Ant Design 是西湖区最具影响力的 Web 设计规范