From eee76430bace69ac77620b38e5974856546dfba4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=B8=85?= Date: Wed, 3 Apr 2019 17:22:22 +0800 Subject: [PATCH 01/12] bugfix:fix #3904 change to formatMessage --- src/components/PageHeaderWrapper/breadcrumb.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/PageHeaderWrapper/breadcrumb.js b/src/components/PageHeaderWrapper/breadcrumb.js index 02fe66fd..29678748 100644 --- a/src/components/PageHeaderWrapper/breadcrumb.js +++ b/src/components/PageHeaderWrapper/breadcrumb.js @@ -1,7 +1,7 @@ import React from 'react'; import pathToRegexp from 'path-to-regexp'; import Link from 'umi/link'; -import { FormattedMessage } from 'umi-plugin-react/locale'; +import { formatMessage } from 'umi-plugin-react/locale'; import { urlToList } from '../_utils/pathTools'; // 渲染Breadcrumb 子节点 @@ -17,7 +17,7 @@ const itemRender = (route, params, routes, paths) => { const renderItemLocal = item => { if (item.locale) { - return ; + return formatMessage({ id: item.locale, defaultMessage: item.name }); } return item.name; }; From d16a2e5cb978deb01996e1fe07c10473afa89b04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=8B=B7=E9=92=89?= <41830859@qq.com> Date: Thu, 4 Apr 2019 00:35:46 +0800 Subject: [PATCH 02/12] Fix wrong tab behavior (#3903) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 修复：有多个layout时，如果其中一个layout中没有routes，将发收到另一个layout的菜单 * tabs 激活 tabs 激活 --- src/components/PageHeaderWrapper/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/PageHeaderWrapper/index.js b/src/components/PageHeaderWrapper/index.js index 7a766834..7cf822df 100644 --- a/src/components/PageHeaderWrapper/index.js +++ b/src/components/PageHeaderWrapper/index.js @@ -16,11 +16,11 @@ const { Title } = Typography; * In order to be compatible with the old version of the PageHeader * basically all the functions are implemented. */ -const renderFooter = ({ tabList, activeKeyProps, onTabChange, tabBarExtraContent }) => { +const renderFooter = ({ tabList, tabActiveKey, onTabChange, tabBarExtraContent }) => { return tabList && tabList.length ? ( { if (onTabChange) { onTabChange(key); From 4cc441518239d1ad26e88bb21ab44a96be4fc5e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=B8=85?= Date: Thu, 4 Apr 2019 14:57:38 +0800 Subject: [PATCH 03/12] feat: site default authority="[admin]" --- src/utils/authority.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/utils/authority.js b/src/utils/authority.js index 288c1e68..396a9fbd 100644 --- a/src/utils/authority.js +++ b/src/utils/authority.js @@ -1,6 +1,4 @@ // use localStorage to store the authority info, which might be sent from server in actual project. -const { NODE_ENV } = process.env; - export function getAuthority(str) { // return localStorage.getItem('antd-pro-authority') || ['admin', 'user']; const authorityString = @@ -15,12 +13,11 @@ export function getAuthority(str) { if (typeof authority === 'string') { return [authority]; } - if (!authority && NODE_ENV !== 'production') { + if (!authority && APP_TYPE === 'site') { return ['admin']; } return authority; } - export function setAuthority(authority) { const proAuthority = typeof authority === 'string' ? [authority] : authority; return localStorage.setItem('antd-pro-authority', JSON.stringify(proAuthority)); From ac4e1db33dc50de61028f95eff4afb73169d5f68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=B8=85?= Date: Thu, 4 Apr 2019 15:18:07 +0800 Subject: [PATCH 04/12] bugfix: fix test --- jest.config.js | 3 +++ src/utils/authority.test.js | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/jest.config.js b/jest.config.js index 68a1144b..a1d8c22c 100644 --- a/jest.config.js +++ b/jest.config.js @@ -1,4 +1,7 @@ module.exports = { testURL: 'http://localhost:8000', preset: 'jest-puppeteer', + globals: { + APP_TYPE: false, + }, }; diff --git a/src/utils/authority.test.js b/src/utils/authority.test.js index 8a6cd41f..15b3cb95 100644 --- a/src/utils/authority.test.js +++ b/src/utils/authority.test.js @@ -2,7 +2,7 @@ import { getAuthority } from './authority'; describe('getAuthority should be strong', () => { it('empty', () => { - expect(getAuthority(null)).toEqual(['admin']); // default value + expect(getAuthority(null)).toEqual(null); // default value }); it('string', () => { expect(getAuthority('admin')).toEqual(['admin']); From db1423ee6fdaccc0534e7d73bfc735ed15b88c40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=B8=85?= Date: Fri, 5 Apr 2019 15:50:53 +0800 Subject: [PATCH 05/12] Roll back api, fix blocking --- netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index 9d3438c4..5ecaa964 100644 --- a/netlify.toml +++ b/netlify.toml @@ -3,7 +3,7 @@ [[redirects]] from = "/api/*" - to = "/.netlify/functions/api/:splat" + to = "https://us-central1-antd-pro.cloudfunctions.net/api/api/:splat" status = 200 force = true [redirects.headers] From 276a55dd5378e0453e8136bb66a3041e91e4ab6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=B8=85?= Date: Sun, 7 Apr 2019 09:32:53 +0800 Subject: [PATCH 06/12] fix #3923, eslint igrone lambda --- .eslintignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.eslintignore b/.eslintignore index 1cd605b1..03232aef 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,3 +1,3 @@ -/lambda/mock/** +/lambda/ /scripts /config \ No newline at end of file From 20b0dd9694273aea96c84831a6dbaa7838ea79b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=B8=85?= Date: Sun, 7 Apr 2019 09:37:37 +0800 Subject: [PATCH 07/12] bugfix: fix #3910, fix custom breadcrumbs error reporting --- src/components/PageHeaderWrapper/breadcrumb.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/components/PageHeaderWrapper/breadcrumb.js b/src/components/PageHeaderWrapper/breadcrumb.js index 29678748..66ca8b9c 100644 --- a/src/components/PageHeaderWrapper/breadcrumb.js +++ b/src/components/PageHeaderWrapper/breadcrumb.js @@ -93,7 +93,11 @@ export const conversionBreadcrumbList = props => { const { breadcrumbList } = props; const { routes, params, routerLocation, breadcrumbNameMap } = getBreadcrumbProps(props); if (breadcrumbList && breadcrumbList.length) { - return conversionFromProps(); + return { + routes: conversionFromProps(props), + params, + itemRender, + }; } // 如果传入 routes 和 params 属性 // If pass routes and params attributes From 37c8fb7c5e67af67faa77df62e0627b9197724b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=B8=85?= Date: Mon, 8 Apr 2019 14:30:13 +0800 Subject: [PATCH 08/12] feat: add login message (#3918) * feat: add login message * doc: change message text --- src/locales/en-US/login.js | 2 ++ src/locales/pt-BR/login.js | 2 ++ src/locales/zh-CN/login.js | 2 ++ src/locales/zh-TW/login.js | 2 ++ src/pages/User/Login.js | 3 ++- src/pages/User/Register.js | 3 ++- 6 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/locales/en-US/login.js b/src/locales/en-US/login.js index 82c1c20f..195e59ce 100644 --- a/src/locales/en-US/login.js +++ b/src/locales/en-US/login.js @@ -12,6 +12,8 @@ export default { 'app.login.login': 'Login', 'app.register.register': 'Register', 'app.register.get-verification-code': 'Get code', + 'app.login.verification-code-warning': + 'This project is a demo project and will not actually send you a verification code. Please switch to the account password login interface and log in as prompted.', 'app.register.sign-in': 'Already have an account?', 'app.register-result.msg': 'Account：registered at {email}', 'app.register-result.activation-email': diff --git a/src/locales/pt-BR/login.js b/src/locales/pt-BR/login.js index 453b3dac..5e2d8695 100644 --- a/src/locales/pt-BR/login.js +++ b/src/locales/pt-BR/login.js @@ -13,6 +13,8 @@ export default { 'app.login.login': 'Login', 'app.register.register': 'Cadastro', 'app.register.get-verification-code': 'Recuperar código', + 'app.login.verification-code-warning': + 'This project is a demo project and will not actually send you a verification code. Please switch to the account password login interface and log in as prompted.', 'app.register.sign-in': 'Já tem uma conta?', 'app.register-result.msg': 'Conta：registrada em {email}', 'app.register-result.activation-email': diff --git a/src/locales/zh-CN/login.js b/src/locales/zh-CN/login.js index eb227207..e211e2cf 100644 --- a/src/locales/zh-CN/login.js +++ b/src/locales/zh-CN/login.js @@ -12,6 +12,8 @@ export default { 'app.login.login': '登录', 'app.register.register': '注册', 'app.register.get-verification-code': '获取验证码', + 'app.login.verification-code-warning': + '此项目为演示项目，并不会真的给您发送验证码。请切换到账户密码登录界面按提示登录。', 'app.register.sign-in': '使用已有账户登录', 'app.register-result.msg': '你的账户：{email} 注册成功', 'app.register-result.activation-email': diff --git a/src/locales/zh-TW/login.js b/src/locales/zh-TW/login.js index ec5706a6..fb916603 100644 --- a/src/locales/zh-TW/login.js +++ b/src/locales/zh-TW/login.js @@ -12,6 +12,8 @@ export default { 'app.login.login': '登錄', 'app.register.register': '註冊', 'app.register.get-verification-code': '獲取驗證碼', + 'app.login.verification-code-warning': + '此項目為演示項目，並不會真的給您發送驗證碼。請切換到賬戶密碼登錄界面按提示登錄。', 'app.register.sign-in': '使用已有賬戶登錄', 'app.register-result.msg': '妳的賬戶：{email} 註冊成功', 'app.register-result.activation-email': diff --git a/src/pages/User/Login.js b/src/pages/User/Login.js index e3498bd3..29f59c89 100644 --- a/src/pages/User/Login.js +++ b/src/pages/User/Login.js @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import { connect } from 'dva'; import { formatMessage, FormattedMessage } from 'umi-plugin-react/locale'; import Link from 'umi/link'; -import { Checkbox, Alert, Icon } from 'antd'; +import { Checkbox, Alert, message, Icon } from 'antd'; import Login from '@/components/Login'; import styles from './Login.less'; @@ -35,6 +35,7 @@ class LoginPage extends Component { }) .then(resolve) .catch(reject); + message.warning(formatMessage({ id: 'app.login.verification-code-warning' })); } }); }); diff --git a/src/pages/User/Register.js b/src/pages/User/Register.js index d685965f..6aab8ffb 100644 --- a/src/pages/User/Register.js +++ b/src/pages/User/Register.js @@ -3,7 +3,7 @@ import { connect } from 'dva'; import { formatMessage, FormattedMessage } from 'umi-plugin-react/locale'; import Link from 'umi/link'; import router from 'umi/router'; -import { Form, Input, Button, Select, Row, Col, Popover, Progress } from 'antd'; +import { Form, Input, Button, message, Select, Row, Col, Popover, Progress } from 'antd'; import styles from './Register.less'; const FormItem = Form.Item; @@ -75,6 +75,7 @@ class Register extends Component { clearInterval(this.interval); } }, 1000); + message.warning(formatMessage({ id: 'app.login.verification-code-warning' })); }; getPasswordStatus = () => { From cab75e7672988fa393a9fa12aa2ad5fbf0f7433e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E4=B9=90?= Date: Mon, 8 Apr 2019 14:30:38 +0800 Subject: [PATCH 09/12] upgrade antd for using page-header (#3914) * upgrade antd for using page-header * antd@^3.16.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f720ef1f..ac25710a 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ ], "dependencies": { "@antv/data-set": "^0.10.1", - "antd": "^3.13.0", + "antd": "^3.16.1", "bizcharts": "^3.4.3", "bizcharts-plugin-slider": "^2.1.1-beta.1", "classnames": "^2.2.6", From a9fdb403b0855de5b49ec7312d76e8bdb78bee67 Mon Sep 17 00:00:00 2001 From: Yoshihisa Kaino Date: Tue, 9 Apr 2019 11:08:04 +0900 Subject: [PATCH 10/12] ja-JP README (#3931) * [Add] ja-JP README * [Fix] Indent * [Fix] Indent * [Fix] pipeline * [Fix] indent --- README.ja-JP.md | 136 ++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 2 +- README.ru-RU.md | 2 +- README.tr-TR.md | 2 +- README.zh-CN.md | 2 +- 5 files changed, 140 insertions(+), 4 deletions(-) create mode 100644 README.ja-JP.md diff --git a/README.ja-JP.md b/README.ja-JP.md new file mode 100644 index 00000000..9eb8f5ea --- /dev/null +++ b/README.ja-JP.md @@ -0,0 +1,136 @@ +[English](./README.md) | [简体中文](./README.zh-CN.md) | [Русский](./README.ru-RU.md) | [Türkçe](./README.tr-TR.md) | 日本語 + +

Ant Design Pro

+ +
+ +独創的な業務システムのUIを解決するためのReactボイラープレート。 + +[![Build With Umi](https://img.shields.io/badge/build%20with-umi-028fe4.svg?style=flat-square)](http://umijs.org/) +[![Build Status](https://dev.azure.com/ant-design/ant-design-pro/_apis/build/status/ant-design.ant-design-pro?branchName=master)](https://dev.azure.com/ant-design/ant-design-pro/_build/latest?definitionId=1?branchName=master) +[![Dependencies](https://img.shields.io/david/ant-design/ant-design-pro.svg)](https://david-dm.org/ant-design/ant-design-pro) +[![DevDependencies](https://img.shields.io/david/dev/ant-design/ant-design-pro.svg)](https://david-dm.org/ant-design/ant-design-pro?type=dev) +[![Gitter](https://img.shields.io/gitter/room/ant-design/pro-english.svg?style=flat-square&logoWidth=20&logo=data%3Aimage%2Fsvg%2Bxml%3Bbase64%2CPD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4NCjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgd2lkdGg9IjEyMzUiIGhlaWdodD0iNjUwIiB2aWV3Qm94PSIwIDAgNzQxMCAzOTAwIj4NCjxyZWN0IHdpZHRoPSI3NDEwIiBoZWlnaHQ9IjM5MDAiIGZpbGw9IiNiMjIyMzQiLz4NCjxwYXRoIGQ9Ik0wLDQ1MEg3NDEwbTAsNjAwSDBtMCw2MDBINzQxMG0wLDYwMEgwbTAsNjAwSDc0MTBtMCw2MDBIMCIgc3Ryb2tlPSIjZmZmIiBzdHJva2Utd2lkdGg9IjMwMCIvPg0KPHJlY3Qgd2lkdGg9IjI5NjQiIGhlaWdodD0iMjEwMCIgZmlsbD0iIzNjM2I2ZSIvPg0KPGcgZmlsbD0iI2ZmZiI%2BDQo8ZyBpZD0iczE4Ij4NCjxnIGlkPSJzOSI%2BDQo8ZyBpZD0iczUiPg0KPGcgaWQ9InM0Ij4NCjxwYXRoIGlkPSJzIiBkPSJNMjQ3LDkwIDMxNy41MzQyMzAsMzA3LjA4MjAzOSAxMzIuODczMjE4LDE3Mi45MTc5NjFIMzYxLjEyNjc4MkwxNzYuNDY1NzcwLDMwNy4wODIwMzl6Ii8%2BDQo8dXNlIHhsaW5rOmhyZWY9IiNzIiB5PSI0MjAiLz4NCjx1c2UgeGxpbms6aHJlZj0iI3MiIHk9Ijg0MCIvPg0KPHVzZSB4bGluazpocmVmPSIjcyIgeT0iMTI2MCIvPg0KPC9nPg0KPHVzZSB4bGluazpocmVmPSIjcyIgeT0iMTY4MCIvPg0KPC9nPg0KPHVzZSB4bGluazpocmVmPSIjczQiIHg9IjI0NyIgeT0iMjEwIi8%2BDQo8L2c%2BDQo8dXNlIHhsaW5rOmhyZWY9IiNzOSIgeD0iNDk0Ii8%2BDQo8L2c%2BDQo8dXNlIHhsaW5rOmhyZWY9IiNzMTgiIHg9Ijk4OCIvPg0KPHVzZSB4bGluazpocmVmPSIjczkiIHg9IjE5NzYiLz4NCjx1c2UgeGxpbms6aHJlZj0iI3M1IiB4PSIyNDcwIi8%2BDQo8L2c%2BDQo8L3N2Zz4%3D)](https://gitter.im/ant-design/pro-english?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) +[![Join the chat at https://gitter.im/ant-design/ant-design-pro](https://img.shields.io/gitter/room/ant-design/ant-design-pro.svg?style=flat-square&logoWidth=20&logo=data%3Aimage%2Fsvg%2Bxml%3Bbase64%2CPD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4NCjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgd2lkdGg9IjkwMCIgaGVpZ2h0PSI2MDAiIHZpZXdCb3g9IjAgMCAzMCAyMCI%2BDQo8ZGVmcz4NCjxwYXRoIGlkPSJzIiBkPSJNMCwtMSAwLjU4Nzc4NSwwLjgwOTAxNyAtMC45NTEwNTcsLTAuMzA5MDE3SDAuOTUxMDU3TC0wLjU4Nzc4NSwwLjgwOTAxN3oiIGZpbGw9IiNmZmRlMDAiLz4NCjwvZGVmcz4NCjxyZWN0IHdpZHRoPSIzMCIgaGVpZ2h0PSIyMCIgZmlsbD0iI2RlMjkxMCIvPg0KPHVzZSB4bGluazpocmVmPSIjcyIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoNSw1KSBzY2FsZSgzKSIvPg0KPHVzZSB4bGluazpocmVmPSIjcyIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMTAsMikgcm90YXRlKDIzLjAzNjI0MykiLz4NCjx1c2UgeGxpbms6aHJlZj0iI3MiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDEyLDQpIHJvdGF0ZSg0NS44Njk4OTgpIi8%2BDQo8dXNlIHhsaW5rOmhyZWY9IiNzIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgxMiw3KSByb3RhdGUoNjkuOTQ1Mzk2KSIvPg0KPHVzZSB4bGluazpocmVmPSIjcyIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMTAsOSkgcm90YXRlKDIwLjY1OTgwOCkiLz4NCjwvc3ZnPg%3D%3D)](https://gitter.im/ant-design/ant-design-pro?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) +[![Netlify Status](https://api.netlify.com/api/v1/badges/b68e9850-a529-4364-9d3b-d70aade560f9/deploy-status)](https://app.netlify.com/sites/ant-design-pro/deploys) +![](https://user-images.githubusercontent.com/8186664/44953195-581e3d80-aec4-11e8-8dcb-54b9db38ec11.png) + +
+ + - プレビュー: http://preview.pro.ant.design + - ホームページ: http://pro.ant.design + - ドキュメント: http://pro.ant.design/docs/getting-started + - 変更ログ: http://pro.ant.design/docs/changelog + - FAQ: http://pro.ant.design/docs/faq + - 中国のミラーサイト: http://ant-design-pro.gitee.io + +## 2.0がリリースされました 🎉🎉🎉 +[Announcing Ant Design Pro 2.0.0](https://medium.com/ant-design/beautiful-and-powerful-ant-design-pro-2-0-release-51358da5af95) + +## 翻訳の募集 :loudspeaker: + +私たちはあなたの助けを必要としています。: https://github.com/ant-design/ant-design-pro/issues/120 + +## 特徴 + + - :gem: **きちんとしたデザイン**: [Ant Design specification](http://ant.design/) に従ってくださ い。 + - :triangular_ruler: **共通のテンプレート**: 業務システム用のテンプレート + - :rocket: **現状のアート開発**: `React/umi/dva/antd` の最新開発スタック + - :iphone: **レスポンシブ**: さまざまな画面サイズ用の設計 + - :art: **テーマ**: シンプルな設定でカスタマイズ可能なテーマ + - :globe_with_meridians: **国際化**: 国際化の解決策を内蔵 + - :gear: **ベストプラクティス**: コードを美しくするための正しいワークフロー + - :1234: **モック開発**: 使いやすいモック開発 + - :white_check_mark: **UIテスト**: ユニットテストとe2eテスト + +## テンプレート + +``` +- ダッシュボード + - アナリティクス + - モニター +  - ワークスペース +- 形 +  - 基本フォーム +  - ステップフォーム +  - 高度なフォーム + - リスト +  - スタンダードテーブル +  - スタンダードリスト +  - カードリスト +  - 検索リスト（プロジェクト/アプリケーション/記事） + - プロフィール +  - 簡単なプロフィール +  - 高度なプロファイル + - アカウント +  - アカウントセンター +  - アカウント設定 + - 結果 +  - 成功 +  - 失敗 + - 例外 +  - 403 +  - 404 +  - 500 + - ユーザー +  - ログイン +  - 登録 +  - 登録結果 +``` + +## 使用法 + +### bashを使う方法 + +```bash +$ git clone https://github.com/ant-design/ant-design-pro.git --depth=1 +$ cd ant-design-pro +$ npm install +$ npm start # http://localhost:8000 を開く +``` + +### Dockerを使う方法 + +```bash +# プレビュー +$ docker pull antdesign/ant-design-pro +$ docker run -p 80:80 antdesign/ant-design-pro +# http://localhost を開く + +# 開発 +$ npm run docker:dev + +# ビルド +$ npm run docker:build + + +# プロダクション開発 +$ npm run docker-prod:dev + +# プロダクションビルド +$ npm run docker-prod:build +``` + +### Gitpodを使う方法 + +Gitpod（GitHub用の無料オンライン開発環境）でプロジェクトを開き、すぐにコーディングを開始できます。 + +[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/ant-design/ant-design-pro) + +その他の指示は [ドキュメント](http://pro.ant.design/docs/getting-started) を確認してください。 + +## サポートするブラウザー + +モダンなブラウザとIE11。 + +| [IE / Edge](http://godban.github.io/browsers-support-badges/)
IE / Edge | [Firefox](http://godban.github.io/browsers-support-badges/)
Firefox | [Chrome](http://godban.github.io/browsers-support-badges/)
Chrome | [Safari](http://godban.github.io/browsers-support-badges/)
Safari | [Opera](http://godban.github.io/browsers-support-badges/)
Opera | +| --------- | --------- | --------- | --------- | --------- | +| IE11, Edge | 最新版から2バージョン | 最新版から2バージョン | 最新版から2バージョン | 最新版から2バージョン | + +## 貢献する + +どんな種類の貢献でも大歓迎です。あなたがこのプロジェクトに貢献できる方法のいくつかの例はここにあります。： + + - 毎日の仕事にAnt Design Proを使用すること。 + - 報告すること。 [issues](http://github.com/ant-design/ant-design-pro/issues) to report bugs or ask questions. + - 更新すること。 [pull requests](http://github.com/ant-design/ant-design-pro/pulls) to improve our code. diff --git a/README.md b/README.md index c6da6474..db85e165 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -English | [简体中文](./README.zh-CN.md) | [Русский](./README.ru-RU.md) | [Türkçe](./README.tr-TR.md) +English | [简体中文](./README.zh-CN.md) | [Русский](./README.ru-RU.md) | [Türkçe](./README.tr-TR.md) | [日本語](./README.ja-JP.md)

Ant Design Pro

diff --git a/README.ru-RU.md b/README.ru-RU.md index f820dfba..b1614842 100644 --- a/README.ru-RU.md +++ b/README.ru-RU.md @@ -1,4 +1,4 @@ -[English](./README.md) | [简体中文](./README.zh-CN.md) | Русский | [Türkçe](./README.tr-TR.md) +[English](./README.md) | [简体中文](./README.zh-CN.md) | Русский | [Türkçe](./README.tr-TR.md) | [日本語](./README.ja-JP.md)

Ant Design Pro

diff --git a/README.tr-TR.md b/README.tr-TR.md index 8470cb79..0c887ab5 100644 --- a/README.tr-TR.md +++ b/README.tr-TR.md @@ -1,4 +1,4 @@ -[English](./README.md) | [简体中文](./README.zh-CN.md) | [Русский](./README.ru-RU.md) | Türkçe +[English](./README.md) | [简体中文](./README.zh-CN.md) | [Русский](./README.ru-RU.md) | Türkçe | [日本語](./README.ja-JP.md)

Ant Design Pro

diff --git a/README.zh-CN.md b/README.zh-CN.md index b4b3b722..d87f0bd9 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -1,4 +1,4 @@ -[English](./README.md) | 简体中文 | [Русский](./README.ru-RU.md) | [Türkçe](./README.tr-TR.md) +[English](./README.md) | 简体中文 | [Русский](./README.ru-RU.md) | [Türkçe](./README.tr-TR.md) | [日本語](./README.ja-JP.md)

Ant Design Pro

From ac55ffce5e3a9d4adc01346698fa680f59b935b0 Mon Sep 17 00:00:00 2001 From: Yoshihisa Kaino Date: Wed, 10 Apr 2019 10:30:56 +0900 Subject: [PATCH 11/12] [Fix] miss transration (#3943) * [Fix] miss transration * [Fix] miss --- README.ja-JP.md | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/README.ja-JP.md b/README.ja-JP.md index 9eb8f5ea..04c027f6 100644 --- a/README.ja-JP.md +++ b/README.ja-JP.md @@ -97,17 +97,17 @@ $ docker pull antdesign/ant-design-pro $ docker run -p 80:80 antdesign/ant-design-pro # http://localhost を開く -# 開発 +# dev $ npm run docker:dev -# ビルド +# build $ npm run docker:build -# プロダクション開発 +# production dev $ npm run docker-prod:dev -# プロダクションビルド +# production build $ npm run docker-prod:build ``` @@ -132,5 +132,7 @@ Gitpod（GitHub用の無料オンライン開発環境）でプロジェクト どんな種類の貢献でも大歓迎です。あなたがこのプロジェクトに貢献できる方法のいくつかの例はここにあります。： - 毎日の仕事にAnt Design Proを使用すること。 - - 報告すること。 [issues](http://github.com/ant-design/ant-design-pro/issues) to report bugs or ask questions. - - 更新すること。 [pull requests](http://github.com/ant-design/ant-design-pro/pulls) to improve our code. + - 報告すること。 [issues](http://github.com/ant-design/ant-design-pro/issues) にバグ報告や質問をしてください。 + - 更新すること。 改善を、[pull requests](http://github.com/ant-design/ant-design-pro/pulls) で送ってください。 + +[![DevDependencies](https://img.shields.io/david/dev/ant-design/ant-design-pro.svg)](https://david-dm.org/ant-design/ant-design-pro?type=dev) From 7e2500c713e02757fbcf57b59a8c33ffecc62010 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=B0=8F=E8=81=AA?= Date: Wed, 10 Apr 2019 09:31:37 +0800 Subject: [PATCH 12/12] remove serve authRoutes (#3946) --- mock/route.js | 5 ----- src/app.js | 35 +---------------------------------- 2 files changed, 1 insertion(+), 39 deletions(-) delete mode 100644 mock/route.js diff --git a/mock/route.js b/mock/route.js deleted file mode 100644 index 418d10f1..00000000 --- a/mock/route.js +++ /dev/null @@ -1,5 +0,0 @@ -export default { - '/api/auth_routes': { - '/form/advanced-form': { authority: ['admin', 'user'] }, - }, -}; diff --git a/src/app.js b/src/app.js index 0f35ff9a..2e98b22b 100644 --- a/src/app.js +++ b/src/app.js @@ -1,5 +1,3 @@ -import fetch from 'dva/fetch'; - export const dva = { config: { onError(err) { @@ -8,37 +6,6 @@ export const dva = { }, }; -let authRoutes = {}; - -function ergodicRoutes(routes, authKey, authority) { - routes.forEach(element => { - if (element.path === authKey) { - if (!element.authority) element.authority = []; // eslint-disable-line - Object.assign(element.authority, authority || []); - } else if (element.routes) { - ergodicRoutes(element.routes, authKey, authority); - } - return element; - }); -} - -export function patchRoutes(routes) { - Object.keys(authRoutes).map(authKey => - ergodicRoutes(routes, authKey, authRoutes[authKey].authority) - ); - window.g_routes = routes; -} - export function render(oldRender) { - fetch('/api/auth_routes') - .then(res => res.json()) - .then( - ret => { - authRoutes = ret; - oldRender(); - }, - () => { - oldRender(); - } - ); + oldRender(); }