From 344681e822421aa7becbb480c889ffce41766587 Mon Sep 17 00:00:00 2001 From: michael <156257964@qq.com> Date: Sun, 4 Nov 2018 11:56:56 +0800 Subject: [PATCH 01/19] =?UTF-8?q?Ellipsis=E7=BB=84=E4=BB=B6tooltip?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E6=94=AF=E6=8C=81TooltipProps,=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8DException=E7=9A=84linkElement=E7=9A=84=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E9=94=99=E8=AF=AF=20(#2713)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat:(https://github.com/ant-design/ant-design-pro/issues/2649) * fix:(https://github.com/ant-design/ant-design-pro/issues/2674) --- src/components/Ellipsis/index.d.ts | 9 ++++- src/components/Ellipsis/index.js | 55 ++++++++++++++--------------- src/components/Exception/index.d.ts | 2 +- 3 files changed, 36 insertions(+), 30 deletions(-) diff --git a/src/components/Ellipsis/index.d.ts b/src/components/Ellipsis/index.d.ts index 03264aa9..6c95bc0a 100644 --- a/src/components/Ellipsis/index.d.ts +++ b/src/components/Ellipsis/index.d.ts @@ -1,6 +1,13 @@ import * as React from 'react'; +import { TooltipProps } from 'antd/lib/tooltip'; + +export interface IEllipsisTooltipProps extends TooltipProps { + title?: undefined; + overlayStyle?: undefined; +} + export interface IEllipsisProps { - tooltip?: boolean; + tooltip?: boolean | IEllipsisTooltipProps; length?: number; lines?: number; style?: React.CSSProperties; diff --git a/src/components/Ellipsis/index.js b/src/components/Ellipsis/index.js index 72fae052..a75df638 100644 --- a/src/components/Ellipsis/index.js +++ b/src/components/Ellipsis/index.js @@ -38,6 +38,18 @@ export const cutStrByFullLength = (str = '', maxLength) => { }, ''); }; +const getTooltip = ({ tooltip, overlayStyle, title, children }) => { + if(tooltip) { + const props = tooltip === true ? { overlayStyle, title } : { ...tooltip, overlayStyle, title }; + return ( + + {children} + + ) + } + return children; +} + const EllipsisText = ({ text, length, tooltip, fullWidthRecognition, ...other }) => { if (typeof text !== 'string') { throw new Error('Ellipsis children must be string.'); @@ -54,23 +66,19 @@ const EllipsisText = ({ text, length, tooltip, fullWidthRecognition, ...other }) displayText = fullWidthRecognition ? cutStrByFullLength(text, length) : text.slice(0, length); } - if (tooltip) { - return ( - - + const spanAttrs = tooltip ? {} : { ...other }; + return getTooltip( + { + tooltip, + overlayStyle:TooltipOverlayStyle, + title: text, + children: ( + {displayText} {tail} - - ); - } - - return ( - - {displayText} - {tail} - - ); + ) + }); }; export default class Ellipsis extends Component { @@ -230,13 +238,7 @@ export default class Ellipsis extends Component { ); - return tooltip ? ( - - {node} - - ) : ( - node - ); + return getTooltip({ tooltip, overlayStyle:TooltipOverlayStyle, title: children, children: node }); } const childNode = ( @@ -246,16 +248,13 @@ export default class Ellipsis extends Component { ); + return (
- {tooltip ? ( - - {childNode} - - ) : ( - childNode - )} + { + getTooltip({ tooltip, overlayStyle:TooltipOverlayStyle, title: text, children: childNode }) + }
{children}
diff --git a/src/components/Exception/index.d.ts b/src/components/Exception/index.d.ts index d62c1771..a74abb1f 100644 --- a/src/components/Exception/index.d.ts +++ b/src/components/Exception/index.d.ts @@ -5,7 +5,7 @@ export interface IExceptionProps { desc?: React.ReactNode; img?: string; actions?: React.ReactNode; - linkElement?: React.ReactNode; + linkElement?: string | React.ComponentType; style?: React.CSSProperties; className?: string; backText?: React.ReactNode; From 54db4e59d3f8fd84464f92c16cbfca82baf42f43 Mon Sep 17 00:00:00 2001 From: "EcmaProSrc.P/ka" Date: Sun, 4 Nov 2018 21:40:21 +0800 Subject: [PATCH 02/19] Update nginx.conf (#2742) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 禁用 image/jpeg image/gif image/png，因为图片启用Gzip压缩会适得其反； 启用 application/json，支持 json 数据的 Gzip 压缩。 --- docker/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/nginx.conf b/docker/nginx.conf index a8e283a6..5f86992c 100644 --- a/docker/nginx.conf +++ b/docker/nginx.conf @@ -4,7 +4,7 @@ server { gzip on; gzip_min_length 1k; gzip_comp_level 9; - gzip_types text/plain application/javascript application/x-javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png; + gzip_types text/plain text/css text/javascript application/json application/javascript application/x-javascript application/xml; gzip_vary on; gzip_disable "MSIE [1-6]\."; From df47a9f788641cd7b100c35002ba522f6092b7ff Mon Sep 17 00:00:00 2001 From: "imgbot[bot]" Date: Mon, 5 Nov 2018 11:10:41 +0800 Subject: [PATCH 03/19] [ImgBot] Optimize images (#2765) /public/favicon.png -- 6.56kb -> 2.78kb (57.58%) --- public/favicon.png | Bin 6716 -> 2849 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/public/favicon.png b/public/favicon.png index cc277683068cf1c96474a0a49f045e147b3a0c84..ece59ce54690c0e1c1e6984ec9dd815645ab4cb8 100644 GIT binary patch literal 2849 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 literal 6716 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 From 918d67ff64acbc50ef9e1c08b9bc23603d206991 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=B8=85?= Date: Mon, 5 Nov 2018 11:35:23 +0800 Subject: [PATCH 04/19] fix #2763, change to lower case --- src/pages/User/Login.js | 2 +- src/pages/User/Register.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/User/Login.js b/src/pages/User/Login.js index 3937cc80..4075edf2 100644 --- a/src/pages/User/Login.js +++ b/src/pages/User/Login.js @@ -114,7 +114,7 @@ class LoginPage extends Component { - +
diff --git a/src/pages/User/Register.js b/src/pages/User/Register.js index 15ef53f6..addc4c4c 100644 --- a/src/pages/User/Register.js +++ b/src/pages/User/Register.js @@ -321,7 +321,7 @@ class Register extends Component { > - + From d190f9c72cce2671e54a4746d4749c72cc8c2818 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=B8=85?= Date: Mon, 5 Nov 2018 14:28:32 +0800 Subject: [PATCH 05/19] Increase timeout limit --- package.json | 10 +++++----- src/e2e/layout.e2e.js | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index f3b1655b..297c7722 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "dependencies": { "@antv/data-set": "^0.9.6", "@babel/runtime": "^7.1.2", - "antd": "^3.10.0", + "antd": "^3.10.4", "bizcharts": "^3.2.2", "bizcharts-plugin-slider": "^2.0.3", "classnames": "^2.2.6", @@ -73,9 +73,6 @@ "eslint-plugin-jsx-a11y": "^6.1.2", "eslint-plugin-markdown": "^1.0.0-beta.6", "eslint-plugin-react": "^7.11.1", - "tslint": "^5.10.0", - "tslint-config-prettier": "^1.10.0", - "tslint-react": "^3.6.0", "gh-pages": "^2.0.1", "husky": "^1.1.2", "lint-staged": "^7.2.0", @@ -86,12 +83,15 @@ "stylelint": "^9.4.0", "stylelint-config-prettier": "^4.0.0", "stylelint-config-standard": "^18.0.0", + "tslint": "^5.10.0", + "tslint-config-prettier": "^1.10.0", + "tslint-react": "^3.6.0", "umi": "^2.2.1", "umi-plugin-ga": "^1.1.3", "umi-plugin-react": "^1.2.0" }, "optionalDependencies": { - "puppeteer": "^1.9.0" + "puppeteer": "^1.10.0" }, "lint-staged": { "**/*.{js,jsx,less}": [ diff --git a/src/e2e/layout.e2e.js b/src/e2e/layout.e2e.js index 58525bc9..3d95dc1d 100644 --- a/src/e2e/layout.e2e.js +++ b/src/e2e/layout.e2e.js @@ -28,6 +28,7 @@ describe('Homepage', () => { }; beforeAll(async () => { + jest.setTimeout(1000000); browser = await puppeteer.launch({ args: ['--no-sandbox'] }); page = await browser.newPage(); }); From 2cc3e8460a03c0a286d6fe62016bde7a2bd08840 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=B8=85?= Date: Mon, 5 Nov 2018 14:33:05 +0800 Subject: [PATCH 06/19] add home.e2e.js timeout --- src/e2e/home.e2e.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/e2e/home.e2e.js b/src/e2e/home.e2e.js index 914ed7c1..4b55b607 100644 --- a/src/e2e/home.e2e.js +++ b/src/e2e/home.e2e.js @@ -3,6 +3,9 @@ import puppeteer from 'puppeteer'; const BASE_URL = `http://localhost:${process.env.PORT || 8000}`; describe('Homepage', () => { + beforeAll(async () => { + jest.setTimeout(1000000); + }); it('it should have logo text', async () => { const browser = await puppeteer.launch({ args: ['--no-sandbox'] }); const page = await browser.newPage(); From 49b674b6cf675e19fe0d2a99426af6c249df83cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=B8=85?= Date: Mon, 5 Nov 2018 15:24:25 +0800 Subject: [PATCH 07/19] Fix #logo does not exist for bugs --- src/e2e/home.e2e.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/e2e/home.e2e.js b/src/e2e/home.e2e.js index 4b55b607..cadac245 100644 --- a/src/e2e/home.e2e.js +++ b/src/e2e/home.e2e.js @@ -10,9 +10,9 @@ describe('Homepage', () => { const browser = await puppeteer.launch({ args: ['--no-sandbox'] }); const page = await browser.newPage(); await page.goto(BASE_URL, { waitUntil: 'networkidle2' }); - await page.waitForSelector('#logo h1'); - const text = await page.evaluate(() => document.body.innerHTML); - expect(text).toContain('

Ant Design Pro

'); + const text = await page.evaluate(() => document.getElementsByTagName('h1')[0].innerText); + expect(text).toContain('Ant Design Pro'); + await page.close(); browser.close(); }); From b46f6ea81b00e9d3f678c61ab8b8dd76a29caebb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=B8=85?= Date: Mon, 5 Nov 2018 19:00:31 +0800 Subject: [PATCH 08/19] bump 2.1.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 297c7722..19b368fd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ant-design-pro", - "version": "2.1.0", + "version": "2.1.1", "description": "An out-of-box UI solution for enterprise applications", "private": true, "scripts": { From cc4f465ca0366e160fc9616aa8d8e393a905d946 Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 6 Nov 2018 13:50:48 +0800 Subject: [PATCH 09/19] Fix monitor page margin between cards --- src/pages/Dashboard/Monitor.js | 6 +++--- src/pages/Dashboard/Monitor.less | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/Dashboard/Monitor.js b/src/pages/Dashboard/Monitor.js index a6d68905..62909174 100644 --- a/src/pages/Dashboard/Monitor.js +++ b/src/pages/Dashboard/Monitor.js @@ -145,7 +145,7 @@ class Monitor extends PureComponent { - + - + - + Date: Tue, 6 Nov 2018 13:53:07 +0800 Subject: [PATCH 10/19] upgrade lint-staged --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 19b368fd..57b2296e 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "eslint-plugin-react": "^7.11.1", "gh-pages": "^2.0.1", "husky": "^1.1.2", - "lint-staged": "^7.2.0", + "lint-staged": "^8.0.4", "merge-umi-mock-data": "^0.0.3", "mockjs": "^1.0.1-beta3", "prettier": "1.14.3", From cdf711da61ae05f6526c47c111f99d9ff4fb4fed Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 6 Nov 2018 14:16:29 +0800 Subject: [PATCH 11/19] upgrade deps --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 57b2296e..7dbd2723 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "docker-prod:build": "docker-compose -f ./docker/docker-compose.yml build" }, "dependencies": { - "@antv/data-set": "^0.9.6", + "@antv/data-set": "^0.10.0", "@babel/runtime": "^7.1.2", "antd": "^3.10.4", "bizcharts": "^3.2.2", @@ -58,7 +58,7 @@ "devDependencies": { "@types/react": "^16.4.16", "@types/react-dom": "^16.0.9", - "antd-pro-merge-less": "^0.0.9", + "antd-pro-merge-less": "^0.1.0", "antd-theme-webpack-plugin": "^1.1.8", "babel-eslint": "^10.0.1", "cross-env": "^5.1.1", From 128e780c6a98ce6c688ea1657622013d6fce055d Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 6 Nov 2018 14:51:04 +0800 Subject: [PATCH 12/19] Fix Chart Card field style --- src/components/Charts/Field/index.js | 4 ++-- src/components/Charts/Field/index.less | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/components/Charts/Field/index.js b/src/components/Charts/Field/index.js index 0f9ace22..22dca86c 100644 --- a/src/components/Charts/Field/index.js +++ b/src/components/Charts/Field/index.js @@ -4,8 +4,8 @@ import styles from './index.less'; const Field = ({ label, value, ...rest }) => (
- {label} - {value} + {label} + {value}
); diff --git a/src/components/Charts/Field/index.less b/src/components/Charts/Field/index.less index aeafbcb8..170ddc1d 100644 --- a/src/components/Charts/Field/index.less +++ b/src/components/Charts/Field/index.less @@ -5,12 +5,13 @@ overflow: hidden; text-overflow: ellipsis; margin: 0; - span { + .label, + .number { font-size: @font-size-base; line-height: 22px; } - span:last-child { - margin-left: 8px; + .number { color: @heading-color; + margin-left: 8px; } } From 6e0163ad13d1380d40c9e48e290a8e74a9580767 Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 7 Nov 2018 11:57:51 +0800 Subject: [PATCH 13/19] upgrade heading font and fix light menu hightlight border --- src/components/SiderMenu/SiderMenu.js | 2 +- src/components/SiderMenu/index.less | 2 +- src/layouts/UserLayout.less | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/SiderMenu/SiderMenu.js b/src/components/SiderMenu/SiderMenu.js index 2d366b9b..e457f2f5 100644 --- a/src/components/SiderMenu/SiderMenu.js +++ b/src/components/SiderMenu/SiderMenu.js @@ -118,7 +118,7 @@ export default class SiderMenu extends PureComponent { mode="inline" handleOpenChange={this.handleOpenChange} onOpenChange={this.handleOpenChange} - style={{ padding: '16px 0', width: '100%', overflowX: 'hidden' }} + style={{ padding: '16px 0', width: '100%' }} {...defaultProps} /> diff --git a/src/components/SiderMenu/index.less b/src/components/SiderMenu/index.less index 06d5f6ab..7ffba1b1 100644 --- a/src/components/SiderMenu/index.less +++ b/src/components/SiderMenu/index.less @@ -21,7 +21,7 @@ vertical-align: middle; font-size: 20px; margin: 0 0 0 12px; - font-family: 'Myriad Pro', 'Helvetica Neue', Arial, Helvetica, sans-serif; + font-family: Avenir, 'Helvetica Neue', Arial, Helvetica, sans-serif; font-weight: 600; } } diff --git a/src/layouts/UserLayout.less b/src/layouts/UserLayout.less index d4ac3861..0e1ff2f0 100644 --- a/src/layouts/UserLayout.less +++ b/src/layouts/UserLayout.less @@ -57,7 +57,7 @@ .title { font-size: 33px; color: @heading-color; - font-family: 'Myriad Pro', 'Helvetica Neue', Arial, Helvetica, sans-serif; + font-family: Avenir, 'Helvetica Neue', Arial, Helvetica, sans-serif; font-weight: 600; position: relative; top: 2px; From 7c9026a9a22132d21308926992de4995c0ecfd37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=9E=E5=BF=97=E5=88=9A?= Date: Fri, 9 Nov 2018 19:29:19 +0800 Subject: [PATCH 14/19] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E7=A0=81=E6=8C=89=E9=92=AE=E5=9B=BD=E9=99=85=E5=8C=96=EF=BC=8C?= =?UTF-8?q?=20Fix=20#2790=20.=20(#2810)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: PangZhiGang <306888588@qq.com> --- src/components/Login/LoginItem.js | 9 ++++++--- src/components/Login/index.less | 5 +++++ src/layouts/UserLayout.less | 2 +- src/locales/en-US.js | 2 ++ src/locales/pt-BR.js | 2 ++ src/locales/zh-CN.js | 2 ++ src/locales/zh-TW.js | 2 ++ 7 files changed, 20 insertions(+), 4 deletions(-) diff --git a/src/components/Login/LoginItem.js b/src/components/Login/LoginItem.js index cc32ec1d..0f45a7fd 100644 --- a/src/components/Login/LoginItem.js +++ b/src/components/Login/LoginItem.js @@ -1,5 +1,6 @@ import React, { Component } from 'react'; import { Form, Input, Button, Row, Col } from 'antd'; +import { formatMessage } from 'umi/locale'; import omit from 'omit.js'; import styles from './index.less'; import ItemMap from './map'; @@ -9,7 +10,8 @@ const FormItem = Form.Item; class WrapFormItem extends Component { static defaultProps = { - buttonText: '获取验证码', + getCaptchaButtonText: formatMessage({ id: 'form.captcha' }), + getCaptchaSecondText: formatMessage({ id: 'form.captcha.second' }), }; constructor(props) { @@ -83,7 +85,8 @@ class WrapFormItem extends Component { defaultValue, rules, name, - buttonText, + getCaptchaButtonText, + getCaptchaSecondText, updateActive, type, ...restProps @@ -108,7 +111,7 @@ class WrapFormItem extends Component { size="large" onClick={this.onGetCaptcha} > - {count ? `${count} s` : buttonText} + {count ? `${count} ${getCaptchaSecondText}` : getCaptchaButtonText} diff --git a/src/components/Login/index.less b/src/components/Login/index.less index 995b68d2..646b6631 100644 --- a/src/components/Login/index.less +++ b/src/components/Login/index.less @@ -13,6 +13,11 @@ } } + .getCaptcha { + display: block; + width: 100%; + } + .icon { font-size: 24px; color: rgba(0, 0, 0, 0.2); diff --git a/src/layouts/UserLayout.less b/src/layouts/UserLayout.less index 0e1ff2f0..5eb257a4 100644 --- a/src/layouts/UserLayout.less +++ b/src/layouts/UserLayout.less @@ -32,7 +32,7 @@ } .content { - padding: 72px 0 24px 0; + padding: 32px 0 24px 0; } } diff --git a/src/locales/en-US.js b/src/locales/en-US.js index 3bb7a89b..fcc702c0 100644 --- a/src/locales/en-US.js +++ b/src/locales/en-US.js @@ -20,6 +20,8 @@ export default { 'validation.date.required': 'Please select the start and end date', 'validation.goal.required': 'Please enter a description of the goal', 'validation.standard.required': 'Please enter a metric', + 'form.captcha': 'Get Captcha', + 'form.captcha.second': 'sec', 'form.optional': ' (optional) ', 'form.submit': 'Submit', 'form.save': 'Save', diff --git a/src/locales/pt-BR.js b/src/locales/pt-BR.js index 241600f5..f4677986 100644 --- a/src/locales/pt-BR.js +++ b/src/locales/pt-BR.js @@ -16,6 +16,8 @@ export default { 'validation.phone-number.required': 'Por favor insira seu telefone!', 'validation.phone-number.wrong-format': 'Formato de telefone errado!', 'validation.verification-code.required': 'Por favor insira seu código de verificação!', + 'form.captcha': 'Get Captcha', + 'form.captcha.second': 'sec', 'form.email.placeholder': 'Email', 'form.password.placeholder': 'Senha', 'form.confirm-password.placeholder': 'Confirme a senha', diff --git a/src/locales/zh-CN.js b/src/locales/zh-CN.js index 376d3cb9..d34cd287 100644 --- a/src/locales/zh-CN.js +++ b/src/locales/zh-CN.js @@ -19,6 +19,8 @@ export default { 'validation.date.required': '请选择起止日期', 'validation.goal.required': '请输入目标描述', 'validation.standard.required': '请输入衡量标准', + 'form.captcha': '获取验证码', + 'form.captcha.second': '秒', 'form.optional': '（选填）', 'form.submit': '提交', 'form.save': '保存', diff --git a/src/locales/zh-TW.js b/src/locales/zh-TW.js index 56cef40d..863dda85 100644 --- a/src/locales/zh-TW.js +++ b/src/locales/zh-TW.js @@ -19,6 +19,8 @@ export default { 'validation.date.required': '請選擇起止日期', 'validation.goal.required': '請輸入目標描述', 'validation.standard.required': '請輸入衡量標淮', + 'form.captcha': '獲取驗證碼', + 'form.captcha.second': '秒', 'form.optional': '（選填）', 'form.submit': '提交', 'form.save': '保存', From dc2b86c14fa1d3730fe327de07483a9aebe0a0be Mon Sep 17 00:00:00 2001 From: wingsico Date: Fri, 9 Nov 2018 19:31:28 +0800 Subject: [PATCH 15/19] Update index.zh-CN.md (#2805) --- src/components/NoticeIcon/index.zh-CN.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/components/NoticeIcon/index.zh-CN.md b/src/components/NoticeIcon/index.zh-CN.md index 056e3768..3c78dba1 100644 --- a/src/components/NoticeIcon/index.zh-CN.md +++ b/src/components/NoticeIcon/index.zh-CN.md @@ -21,6 +21,7 @@ popupAlign | 弹出卡片的位置配置 | Object [alignConfig](https://github.c onPopupVisibleChange | 弹出卡片显隐的回调 | function(visible) | - popupVisible | 控制弹层显隐 | boolean | - locale | 默认文案 | Object | `{ emptyText: '暂无数据', clear: '清空' }` +clearClose | 点击清空按钮后关闭通知菜单 | boolean | false ### NoticeIcon.Tab @@ -43,3 +44,4 @@ title | 标题 | ReactNode | - description | 描述信息 | ReactNode | - datetime | 时间戳 | ReactNode | - extra | 额外信息，在列表项右上角 | ReactNode | - +clickClose | 点击列表项关闭通知菜单 | boolean | false From 197caddeb9e68865e3228d630838ec7d6525749a Mon Sep 17 00:00:00 2001 From: beysong <415613212@qq.com> Date: Fri, 9 Nov 2018 19:31:59 +0800 Subject: [PATCH 16/19] =?UTF-8?q?Guade=E7=BB=84=E4=BB=B6=E6=8C=87=E9=92=88?= =?UTF-8?q?=E6=8C=87=E5=90=91=E4=B8=8D=E5=87=86=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20(#2804)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Charts/Gauge/index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/Charts/Gauge/index.js b/src/components/Charts/Gauge/index.js index 165869ba..2249211a 100644 --- a/src/components/Charts/Gauge/index.js +++ b/src/components/Charts/Gauge/index.js @@ -72,7 +72,7 @@ class Gauge extends React.Component { nice: true, }, }; - const data = [{ value: percent }]; + const data = [{ value: percent / 10 }]; return ( @@ -134,7 +134,7 @@ class Gauge extends React.Component {

${title}

- ${data[0].value}% + ${data[0].value * 10}%

`} /> From d9ffb3ecba49527f346dea55ce33a88e6385ae89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=B8=85?= Date: Mon, 12 Nov 2018 10:27:38 +0800 Subject: [PATCH 17/19] fix #2819,styles.value is not defined in component Trend --- src/components/Trend/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Trend/index.js b/src/components/Trend/index.js index 1cdceb2e..c476ef62 100644 --- a/src/components/Trend/index.js +++ b/src/components/Trend/index.js @@ -14,7 +14,7 @@ const Trend = ({ colorful = true, reverseColor = false, flag, children, classNam ); return (
- {children} + {children} {flag && ( From 57cc63c5c4787606a2f2fe5bd0932f3ccca0bf15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=B8=85?= Date: Mon, 12 Nov 2018 12:10:55 +0800 Subject: [PATCH 18/19] bump dependencies --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 7dbd2723..dcee6062 100644 --- a/package.json +++ b/package.json @@ -29,8 +29,8 @@ "dependencies": { "@antv/data-set": "^0.10.0", "@babel/runtime": "^7.1.2", - "antd": "^3.10.4", - "bizcharts": "^3.2.2", + "antd": "^3.10.7", + "bizcharts": "^3.2.5-beta.4", "bizcharts-plugin-slider": "^2.0.3", "classnames": "^2.2.6", "dva": "^2.4.0", @@ -78,7 +78,7 @@ "lint-staged": "^8.0.4", "merge-umi-mock-data": "^0.0.3", "mockjs": "^1.0.1-beta3", - "prettier": "1.14.3", + "prettier": "1.15.2", "pro-download": "^1.0.1", "stylelint": "^9.4.0", "stylelint-config-prettier": "^4.0.0", From c10d7009fc75d6a46aac571d7c6f0171dd89e02c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=B8=85?= Date: Wed, 14 Nov 2018 10:42:21 +0800 Subject: [PATCH 19/19] bump dependencies --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index dcee6062..2be16730 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ }, "dependencies": { "@antv/data-set": "^0.10.0", - "@babel/runtime": "^7.1.2", + "@babel/runtime": "^7.1.5", "antd": "^3.10.7", "bizcharts": "^3.2.5-beta.4", "bizcharts-plugin-slider": "^2.0.3", @@ -58,7 +58,7 @@ "devDependencies": { "@types/react": "^16.4.16", "@types/react-dom": "^16.0.9", - "antd-pro-merge-less": "^0.1.0", + "antd-pro-merge-less": "^0.2.0", "antd-theme-webpack-plugin": "^1.1.8", "babel-eslint": "^10.0.1", "cross-env": "^5.1.1",