diff --git a/.eslintignore b/.eslintignore
index c1fcbb8a79c1eb2990b138469a6d86f8e02eefda..966421f4778a6a847aa6f666e1ab3d8df649f084 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,3 +1,3 @@
-/lambda/mock/**
+/lambda/
/scripts
/config
diff --git a/README.ja-JP.md b/README.ja-JP.md
new file mode 100644
index 0000000000000000000000000000000000000000..04c027f6d88fecc25c80675e94bb572aa58ce59e
--- /dev/null
+++ b/README.ja-JP.md
@@ -0,0 +1,138 @@
+[English](./README.md) | [简体中文](./README.zh-CN.md) | [Русский](./README.ru-RU.md) | [Türkçe](./README.tr-TR.md) | 日本語
+
+Ant Design Pro
+
+
+
+独創的な業務システムのUIを解決するためのReactボイラープレート。
+
+[](http://umijs.org/)
+[](https://dev.azure.com/ant-design/ant-design-pro/_build/latest?definitionId=1?branchName=master)
+[](https://david-dm.org/ant-design/ant-design-pro)
+[](https://david-dm.org/ant-design/ant-design-pro?type=dev)
+[](https://gitter.im/ant-design/pro-english?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+[](https://gitter.im/ant-design/ant-design-pro?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+[](https://app.netlify.com/sites/ant-design-pro/deploys)
+
+
+
+
+ - プレビュー: 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 を開く
+
+# dev
+$ npm run docker:dev
+
+# build
+$ npm run docker:build
+
+
+# production dev
+$ npm run docker-prod:dev
+
+# production build
+$ npm run docker-prod:build
+```
+
+### Gitpodを使う方法
+
+Gitpod（GitHub用の無料オンライン開発環境）でプロジェクトを開き、すぐにコーディングを開始できます。
+
+[](https://gitpod.io/#https://github.com/ant-design/ant-design-pro)
+
+その他の指示は [ドキュメント](http://pro.ant.design/docs/getting-started) を確認してください。
+
+## サポートするブラウザー
+
+モダンなブラウザとIE11。
+
+| [
](http://godban.github.io/browsers-support-badges/)IE / Edge | [
](http://godban.github.io/browsers-support-badges/)Firefox | [
](http://godban.github.io/browsers-support-badges/)Chrome | [
](http://godban.github.io/browsers-support-badges/)Safari | [
](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) にバグ報告や質問をしてください。
+ - 更新すること。 改善を、[pull requests](http://github.com/ant-design/ant-design-pro/pulls) で送ってください。
+
+[](https://david-dm.org/ant-design/ant-design-pro?type=dev)
diff --git a/README.md b/README.md
index c6da6474c5ce12b04bd107d4eb5b3c74dd804b6d..db85e1651f98b4f1a5a356df3da1406cd0780308 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 f820dfba2343571ac0803274109b2d989845e727..b1614842d2d0061df57a10539de09841699d6dca 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 8470cb79a41153736603c6bb92c63ebbbfdc2187..0c887ab52b5d4f620aaa9b6d549b28224d46b762 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 b4b3b722c650b12905a652c59076252129a8d897..d87f0bd95c5503275fa513c62c508fe3416cac68 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
diff --git a/jest.config.js b/jest.config.js
index 68a1144bcb17feb585b3725e5d323b0414dd91cc..a1d8c22c46eb9e2af27371cbda86fc9d70fd7ea2 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/netlify.toml b/netlify.toml
index 9d3438c4aff06f5a644d10167b5c7133f5175e45..5ecaa9640ddcfa44e69b09a66fda260740f87a3b 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]
diff --git a/package.json b/package.json
index c2a9cccb30622b20aed0010e15c720e7e2dd2772..c7a6f6a494da9611fbe53b7389dd281a8675f039 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,10 @@
],
"dependencies": {
"@ant-design/pro-layout": "^4.0.3",
- "antd": "^3.15.0",
+ "@antv/data-set": "^0.10.1",
+ "antd": "^3.16.1",
+ "bizcharts": "^3.4.3",
+ "bizcharts-plugin-slider": "^2.1.1-beta.1",
"classnames": "^2.2.6",
"dva": "^2.4.0",
"express": "^4.16.4",
diff --git a/src/app.ts b/src/app.ts
index c2bb1b1bc86d4194a7007aa915e6516ebfb09fcd..faaa39659a813fca1fa681986435ebaa4095f106 100644
--- a/src/app.ts
+++ b/src/app.ts
@@ -1,6 +1,3 @@
-import fetch from 'dva/fetch';
-import { IRoute } from 'umi-types';
-
export const dva = {
config: {
onError(err: ErrorEvent) {
@@ -9,37 +6,6 @@ export const dva = {
},
};
-let authRoutes = {};
-
-function ergodicRoutes(routes: IRoute[], authKey: string, authority: string | string[]) {
- 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: IRoute[]) {
- Object.keys(authRoutes).map(authKey =>
- ergodicRoutes(routes, authKey, authRoutes[authKey].authority),
- );
- (window as any).g_routes = routes;
-}
-
-export function render(oldRender: Function) {
- fetch('/api/auth_routes')
- .then(res => res.json())
- .then(
- ret => {
- authRoutes = ret;
- oldRender();
- },
- () => {
- oldRender();
- },
- );
+export function render(oldRender) {
+ oldRender();
}
diff --git a/src/components/PageHeaderWrapper/Breadcrumb.tsx b/src/components/PageHeaderWrapper/Breadcrumb.tsx
deleted file mode 100644
index 7c869136fb807de1b970aa3160a5b21d6944cbbf..0000000000000000000000000000000000000000
--- a/src/components/PageHeaderWrapper/Breadcrumb.tsx
+++ /dev/null
@@ -1,138 +0,0 @@
-import React from 'react';
-import pathToRegexp from 'path-to-regexp';
-import Link from 'umi/link';
-import { formatMessage } from 'umi-plugin-react/locale';
-import { urlToList } from '../_utils/pathTools';
-import { PageHeaderWrapperProps } from '.';
-import { MenuDataItem } from '../SiderMenu';
-import { BreadcrumbProps as AntdBreadcrumbProps } from 'antd/lib/breadcrumb';
-
-type BreadcrumbProps = PageHeaderWrapperProps;
-
-// 渲染Breadcrumb 子节点
-// Render the Breadcrumb child node
-const itemRender: AntdBreadcrumbProps['itemRender'] = (route, params, routes, paths) => {
- const last = routes.indexOf(route) === routes.length - 1;
- return last || !route.component ? (
- {route.breadcrumbName}
- ) : (
- {route.breadcrumbName}
- );
-};
-
-const renderItemLocal = (item: MenuDataItem): string => {
- if (item.locale) {
- return formatMessage({
- id: item.locale,
- defaultMessage: item.name,
- });
- }
- return item.name as string;
-};
-
-export const getBreadcrumb = (
- breadcrumbNameMap: PageHeaderWrapperProps['breadcrumbNameMap'],
- url: string,
-): MenuDataItem => {
- if (!breadcrumbNameMap) {
- return {
- path: '',
- };
- }
- let breadcrumb = breadcrumbNameMap[url];
- if (!breadcrumb) {
- Object.keys(breadcrumbNameMap).forEach(item => {
- if (pathToRegexp(item).test(url)) {
- breadcrumb = breadcrumbNameMap[item];
- }
- });
- }
- return breadcrumb || { path: '' };
-};
-
-export const getBreadcrumbProps = (props: BreadcrumbProps): PageHeaderWrapperProps => {
- const { location, breadcrumbNameMap } = props;
- return {
- location,
- breadcrumbNameMap,
- };
-};
-
-// Generated according to props
-const conversionFromProps = (props: BreadcrumbProps): AntdBreadcrumbProps['routes'] => {
- const { breadcrumbList = [] } = props;
- return breadcrumbList
- .map(item => {
- const { title, href } = item;
- return {
- path: href,
- breadcrumbName: title,
- };
- })
- .filter(item => item.path);
-};
-
-const conversionFromLocation = (
- routerLocation: PageHeaderWrapperProps['location'],
- breadcrumbNameMap: PageHeaderWrapperProps['breadcrumbNameMap'],
- props: BreadcrumbProps,
-): AntdBreadcrumbProps['routes'] => {
- if (!routerLocation) {
- return [];
- }
- const { home } = props;
- // Convert the url to an array
- const pathSnippets = urlToList(routerLocation.pathname);
- // Loop data mosaic routing
- const extraBreadcrumbItems: AntdBreadcrumbProps['routes'] = pathSnippets
- .map(url => {
- const currentBreadcrumb = getBreadcrumb(breadcrumbNameMap, url);
- if (currentBreadcrumb.inherited) {
- return { path: '', breadcrumbName: '' };
- }
- const name = renderItemLocal(currentBreadcrumb);
- const { hideInBreadcrumb } = currentBreadcrumb;
- return name && !hideInBreadcrumb
- ? {
- path: url,
- breadcrumbName: name,
- }
- : { path: '', breadcrumbName: '' };
- })
- .filter(item => item && item.path);
- // Add home breadcrumbs to your head if defined
- if (home) {
- extraBreadcrumbItems.unshift({
- path: '/',
- breadcrumbName: home,
- });
- }
- return extraBreadcrumbItems;
-};
-
-/**
- * 将参数转化为面包屑
- * Convert parameters into breadcrumbs
- */
-export const conversionBreadcrumbList = (props: BreadcrumbProps): AntdBreadcrumbProps => {
- const { breadcrumbList } = props;
- const { location, breadcrumbNameMap } = getBreadcrumbProps(props);
- if (breadcrumbList && breadcrumbList.length) {
- return {
- routes: conversionFromProps(props),
- itemRender,
- };
- }
-
- // 根据 location 生成 面包屑
- // Generate breadcrumbs based on location
- if (location && location.pathname) {
- return {
- routes: conversionFromLocation(location, breadcrumbNameMap, props),
- itemRender,
- };
- }
- return {
- routes: [],
- };
-};
diff --git a/src/components/PageHeaderWrapper/GridContent.less b/src/components/PageHeaderWrapper/GridContent.less
deleted file mode 100644
index d5496e9ecb95318c38a30f1369d35e8fcf583758..0000000000000000000000000000000000000000
--- a/src/components/PageHeaderWrapper/GridContent.less
+++ /dev/null
@@ -1,10 +0,0 @@
-.main {
- width: 100%;
- height: 100%;
- min-height: 100%;
- transition: 0.3s;
- &.wide {
- max-width: 1200px;
- margin: 0 auto;
- }
-}
diff --git a/src/components/PageHeaderWrapper/GridContent.tsx b/src/components/PageHeaderWrapper/GridContent.tsx
deleted file mode 100644
index 88e0284b197bf9efae2fddeae2565ff07ac6430a..0000000000000000000000000000000000000000
--- a/src/components/PageHeaderWrapper/GridContent.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import React from 'react';
-import { connect } from 'dva';
-import styles from './GridContent.less';
-import ConnectState from '@/models/connect';
-import { ContentWidth } from 'config/defaultSettings';
-
-interface GridContentProps {
- contentWidth: ContentWidth;
- children: React.ReactNode;
-}
-
-const GridContent = (props: GridContentProps) => {
- const { contentWidth, children } = props;
- let className = `${styles.main}`;
- if (contentWidth === 'Fixed') {
- className = `${styles.main} ${styles.wide}`;
- }
- return {children}
;
-};
-
-export default connect(({ setting }: ConnectState) => ({
- contentWidth: setting.contentWidth,
-}))(GridContent);
diff --git a/src/components/PageHeaderWrapper/index.less b/src/components/PageHeaderWrapper/index.less
deleted file mode 100644
index 119585bbaef2af9a3a3f4dd90ce882a50a5a98e8..0000000000000000000000000000000000000000
--- a/src/components/PageHeaderWrapper/index.less
+++ /dev/null
@@ -1,110 +0,0 @@
-@import '~antd/lib/style/themes/default.less';
-
-.children-content {
- margin: 24px 24px 0;
-}
-
-.main {
- :global {
- .ant-page-header {
- padding: 16px 32px 0;
- background: #fff;
- border-bottom: 1px solid #e8e8e8;
- }
- }
-
- .wide {
- max-width: 1200px;
- margin: auto;
- }
- .detail {
- display: flex;
- }
-
- .row {
- display: flex;
- width: 100%;
- }
-
- .logo {
- flex: 0 1 auto;
- margin-right: 16px;
- padding-top: 1px;
- > img {
- display: block;
- width: 28px;
- height: 28px;
- border-radius: @border-radius-base;
- }
- }
-
- .title-content {
- margin-bottom: 16px;
- }
-
- @media screen and (max-width: @screen-sm) {
- .content {
- margin: 24px 0 0;
- }
- }
-
- .title,
- .content {
- flex: auto;
- }
-
- .extraContent,
- .main {
- flex: 0 1 auto;
- }
-
- .main {
- width: 100%;
- }
-
- .title {
- margin-bottom: 16px;
- }
-
- .logo,
- .content,
- .extraContent {
- margin-bottom: 16px;
- }
-
- .extraContent {
- min-width: 242px;
- margin-left: 88px;
- text-align: right;
- }
-}
-
-@media screen and (max-width: @screen-xl) {
- .extraContent {
- margin-left: 44px;
- }
-}
-
-@media screen and (max-width: @screen-lg) {
- .extraContent {
- margin-left: 20px;
- }
-}
-
-@media screen and (max-width: @screen-md) {
- .row {
- display: block;
- }
-
- .action,
- .extraContent {
- margin-left: 0;
- text-align: left;
- }
-}
-
-@media screen and (max-width: @screen-sm) {
- .detail {
- display: block;
- }
-}
diff --git a/src/components/PageHeaderWrapper/index.tsx b/src/components/PageHeaderWrapper/index.tsx
deleted file mode 100644
index ff0083424ce8e2c997412c8d933e26934c073325..0000000000000000000000000000000000000000
--- a/src/components/PageHeaderWrapper/index.tsx
+++ /dev/null
@@ -1,146 +0,0 @@
-import React from 'react';
-import { formatMessage } from 'umi-plugin-react/locale';
-import { PageHeader, Tabs, Typography } from 'antd';
-import { connect } from 'dva';
-import classNames from 'classnames';
-import GridContent from './GridContent';
-import ConnectState from '@/models/connect';
-import { ContentWidth } from 'config/defaultSettings';
-import styles from './index.less';
-import { conversionBreadcrumbList } from './Breadcrumb';
-import { MenuDataItem } from '../SiderMenu';
-import * as H from 'history';
-
-const { Title } = Typography;
-
-/**
- * render Footer tabList
- * In order to be compatible with the old version of the PageHeader
- * basically all the functions are implemented.
- */
-const renderFooter = ({
- tabList,
- onTabChange,
- tabBarExtraContent,
-}: Partial) => {
- return tabList && tabList.length ? (
- {
- if (onTabChange) {
- onTabChange(key);
- }
- }}
- tabBarExtraContent={tabBarExtraContent}
- >
- {tabList.map(item => (
-
- ))}
-
- ) : null;
-};
-
-export interface PageHeaderWrapperProps {
- title?: React.ReactNode | string | number;
- logo?: React.ReactNode | string;
- action?: React.ReactNode | string;
- content?: React.ReactNode;
- extraContent?: React.ReactNode;
- breadcrumbList?: Array<{ title: string; href: string }>;
- tabList?: Array<{ key: string; tab: React.ReactNode }>;
- tabActiveKey?: string;
- onTabChange?: (key: string) => void;
- tabBarExtraContent?: React.ReactNode;
- style?: React.CSSProperties;
- home?: string;
- wide?: boolean;
- contentWidth?: ContentWidth;
- className?: string;
- children?: React.ReactNode;
- wrapperClassName?: string;
- top?: React.ReactNode;
- location?: H.Location;
- breadcrumbNameMap?: { [path: string]: MenuDataItem };
-}
-
-class PageHeaderWrapper extends React.Component {
- mergePropsAndChildren = (): PageHeaderWrapperProps => {
- return {
- ...this.props,
- };
- };
- renderPageHeader = () => {
- const {
- children,
- contentWidth,
- wrapperClassName,
- top,
- title,
- content,
- logo,
- extraContent,
- ...restProps
- } = this.mergePropsAndChildren();
- let pageTitle = title;
- const breadcrumb = conversionBreadcrumbList({
- ...restProps,
- home: formatMessage({
- id: 'menu.home',
- defaultMessage: 'Home',
- }),
- });
- if (!title && breadcrumb.routes) {
- const router = breadcrumb.routes[breadcrumb.routes.length - 1];
- if (router) {
- pageTitle = router.breadcrumbName;
- }
- }
- if (!pageTitle && !content) {
- return;
- }
- return (
-
- {pageTitle}
-
- }
- {...restProps}
- breadcrumb={breadcrumb}
- className={styles.pageHeader}
- footer={renderFooter(restProps)}
- >
-
- {logo &&
{logo}
}
-
-
- {content &&
{content}
}
- {extraContent &&
{extraContent}
}
-
-
-
- {children ? (
-
- {children}
-
- ) : null}
-