From 7dbd7c40d20dc444b64b6d34747bbcc97accb363 Mon Sep 17 00:00:00 2001 From: niko <644506165@qq.com> Date: Fri, 1 Jun 2018 22:39:07 +0800 Subject: [PATCH 1/7] fix length property include "..." tail length (#1592) --- src/components/Ellipsis/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Ellipsis/index.js b/src/components/Ellipsis/index.js index 93c5c235..671bc453 100644 --- a/src/components/Ellipsis/index.js +++ b/src/components/Ellipsis/index.js @@ -20,7 +20,7 @@ const EllipsisText = ({ text, length, tooltip, ...other }) => { if (length - tail.length <= 0) { displayText = ''; } else { - displayText = text.slice(0, length - tail.length); + displayText = text.slice(0, length); } if (tooltip) { From 846d308087731709d606f881f125b8859fb4613b Mon Sep 17 00:00:00 2001 From: Amumu Date: Sat, 2 Jun 2018 01:23:06 +0800 Subject: [PATCH 2/7] Use `submitting` from `props` (#1579) --- src/routes/User/Login.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/routes/User/Login.js b/src/routes/User/Login.js index ade5a11d..ab0d2834 100644 --- a/src/routes/User/Login.js +++ b/src/routes/User/Login.js @@ -53,7 +53,7 @@ export default class LoginPage extends Component { {login.status === 'error' && login.type === 'account' && - !login.submitting && + !submitting && this.renderMessage('账户或密码错误（admin/888888）')} @@ -61,7 +61,7 @@ export default class LoginPage extends Component { {login.status === 'error' && login.type === 'mobile' && - !login.submitting && + !submitting && this.renderMessage('验证码错误')} From 95dbbf9f6cf49226adbf8b40619f05488e4448b3 Mon Sep 17 00:00:00 2001 From: jim Date: Sat, 2 Jun 2018 17:00:54 +0800 Subject: [PATCH 3/7] Fix the IE style exception --- src/components/PageHeader/index.less | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/components/PageHeader/index.less b/src/components/PageHeader/index.less index 2a8c9a6a..13324b97 100644 --- a/src/components/PageHeader/index.less +++ b/src/components/PageHeader/index.less @@ -11,6 +11,7 @@ .row { display: flex; + width: 100%; } .breadcrumb { @@ -66,10 +67,11 @@ .content, .extraContent, .main { - // IE auto is no have height - flex: 1; + flex: 0 1 auto; + } + .main { + width: 100%; } - .title, .action { margin-bottom: 16px; From e68f472b866b80e863c55f8dfa1f123ffa692002 Mon Sep 17 00:00:00 2001 From: Kitten9533 <1173860556@qq.com> Date: Mon, 4 Jun 2018 16:28:45 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8DdigitUppercase(2.01)?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E4=B8=BA=E8=B4=B0=E5=85=83=E6=95=B4=E7=9A=84?= =?UTF-8?q?=EF=BC=8C=E6=95=B0=E5=AD=97=E5=A4=A7=E5=86=99=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=BA=86=E2=80=9C=E4=B8=87=E4=BA=BF=E2=80=9D=20(#1589)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix digitUppercase (2.01) error returned as 贰元整 Signed-off-by: jiangjiahao <1173860556@qq.com> --- src/utils/utils.js | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/utils/utils.js b/src/utils/utils.js index 0dad8d87..37b6eca6 100644 --- a/src/utils/utils.js +++ b/src/utils/utils.js @@ -70,14 +70,23 @@ export function getPlainNode(nodeList, parentPath = '') { return arr; } +function accMul(arg1, arg2) { + let m = 0; + const s1 = arg1.toString(); + const s2 = arg2.toString(); + m += s1.split(".").length > 1 ? s1.split(".")[1].length : 0; + m += s2.split(".").length > 1 ? s2.split(".")[1].length : 0; + return Number(s1.replace(".", "")) * Number(s2.replace(".", "")) / 10 ** m; +} + export function digitUppercase(n) { const fraction = ['角', '分']; const digit = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖']; - const unit = [['元', '万', '亿'], ['', '拾', '佰', '仟']]; + const unit = [['元', '万', '亿'],['', '拾', '佰', '仟', '万']]; let num = Math.abs(n); let s = ''; fraction.forEach((item, index) => { - s += (digit[Math.floor(num * 10 * 10 ** index) % 10] + item).replace(/零./, ''); + s += (digit[Math.floor(accMul(num, 10 * 10 ** index)) % 10] + item).replace(/零./, ''); }); s = s || '整'; num = Math.floor(num); From 536ce374a35984cf29d71eb139901e998c32ae2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=B4=E8=8C=82=E6=BA=90?= Date: Mon, 4 Jun 2018 14:31:41 +0800 Subject: [PATCH 5/7] remove captcha button height --- src/components/Login/index.less | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/Login/index.less b/src/components/Login/index.less index 2894749b..e0a984cd 100644 --- a/src/components/Login/index.less +++ b/src/components/Login/index.less @@ -35,7 +35,6 @@ .getCaptcha { display: block; width: 100%; - height: 42px; } .submit { From 2982d869921e881e04aca6852aae2279983f8aff Mon Sep 17 00:00:00 2001 From: jim Date: Mon, 4 Jun 2018 18:09:23 +0800 Subject: [PATCH 6/7] add ejs file to .prettierignore --- .prettierignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.prettierignore b/.prettierignore index 43ca1976..48e78b84 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,4 +1,5 @@ **/*.md **/*.svg **/*.html +**/*.ejs package.json \ No newline at end of file From 2fbc37b0b4201874b0a38a4afa208dbb35f42172 Mon Sep 17 00:00:00 2001 From: jim Date: Mon, 4 Jun 2018 18:48:31 +0800 Subject: [PATCH 7/7] fix eslint error --- src/components/EditableLinkGroup/index.js | 11 +++++------ src/components/HeaderSearch/index.js | 20 +++++++++++--------- src/components/Login/index.js | 15 +++++++++------ src/components/NoticeIcon/index.js | 3 ++- 4 files changed, 27 insertions(+), 22 deletions(-) diff --git a/src/components/EditableLinkGroup/index.js b/src/components/EditableLinkGroup/index.js index e230c3dd..2d0b4aa8 100644 --- a/src/components/EditableLinkGroup/index.js +++ b/src/components/EditableLinkGroup/index.js @@ -6,18 +6,17 @@ import styles from './index.less'; // TODO: 添加逻辑 class EditableLinkGroup extends PureComponent { - static defaultProps = { - links: [], - onAdd: () => {}, - linkElement: 'a', - }; - static propTypes = { links: PropTypes.array, onAdd: PropTypes.func, linkElement: PropTypes.oneOfType([PropTypes.func, PropTypes.string]), }; + static defaultProps = { + links: [], + onAdd: () => {}, + linkElement: 'a', + }; render() { const { links, linkElement, onAdd } = this.props; return ( diff --git a/src/components/HeaderSearch/index.js b/src/components/HeaderSearch/index.js index 295a837a..855e7ac1 100644 --- a/src/components/HeaderSearch/index.js +++ b/src/components/HeaderSearch/index.js @@ -5,15 +5,6 @@ import classNames from 'classnames'; import styles from './index.less'; export default class HeaderSearch extends PureComponent { - static defaultProps = { - defaultActiveFirstOption: false, - onPressEnter: () => {}, - onSearch: () => {}, - className: '', - placeholder: '', - dataSource: [], - defaultOpen: false, - }; static propTypes = { className: PropTypes.string, placeholder: PropTypes.string, @@ -23,6 +14,17 @@ export default class HeaderSearch extends PureComponent { dataSource: PropTypes.array, defaultOpen: PropTypes.bool, }; + + static defaultProps = { + defaultActiveFirstOption: false, + onPressEnter: () => {}, + onSearch: () => {}, + className: '', + placeholder: '', + dataSource: [], + defaultOpen: false, + }; + state = { searchMode: this.props.defaultOpen, value: '', diff --git a/src/components/Login/index.js b/src/components/Login/index.js index 02aa80c2..58c4e468 100644 --- a/src/components/Login/index.js +++ b/src/components/Login/index.js @@ -8,23 +8,26 @@ import LoginSubmit from './LoginSubmit'; import styles from './index.less'; class Login extends Component { - static defaultProps = { - className: '', - defaultActiveKey: '', - onTabChange: () => {}, - onSubmit: () => {}, - }; static propTypes = { className: PropTypes.string, defaultActiveKey: PropTypes.string, onTabChange: PropTypes.func, onSubmit: PropTypes.func, }; + static childContextTypes = { tabUtil: PropTypes.object, form: PropTypes.object, updateActive: PropTypes.func, }; + + static defaultProps = { + className: '', + defaultActiveKey: '', + onTabChange: () => {}, + onSubmit: () => {}, + }; + state = { type: this.props.defaultActiveKey, tabs: [], diff --git a/src/components/NoticeIcon/index.js b/src/components/NoticeIcon/index.js index be2f44f9..a207be86 100644 --- a/src/components/NoticeIcon/index.js +++ b/src/components/NoticeIcon/index.js @@ -7,6 +7,8 @@ import styles from './index.less'; const { TabPane } = Tabs; export default class NoticeIcon extends PureComponent { + static Tab = TabPane; + static defaultProps = { onItemClick: () => {}, onPopupVisibleChange: () => {}, @@ -19,7 +21,6 @@ export default class NoticeIcon extends PureComponent { }, emptyImage: 'https://gw.alipayobjects.com/zos/rmsportal/wAhyIChODzsoKIOBHcBk.svg', }; - static Tab = TabPane; constructor(props) { super(props); this.state = {};