From 186f19cb65b1f4d3b2185df57e92b9c27816e718 Mon Sep 17 00:00:00 2001 From: zuiidea Date: Wed, 30 Nov 2016 18:57:19 +0800 Subject: [PATCH] sider --- package.json | 2 +- src/components/layout/common.less | 3 - src/components/layout/main.less | 41 +++- src/components/vars.less | 352 +++++++++++++++--------------- src/models/users.js | 1 + yarn.lock | 258 ++++++++++++++-------- 6 files changed, 380 insertions(+), 277 deletions(-) diff --git a/package.json b/package.json index e1dbf38..d2a0a3d 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "index": "./src/index.js" }, "dependencies": { - "antd": "^2.3.1", + "antd": "^2.5.0", "classnames": "^2.2.5", "dva": "1.0.0", "js-cookie": "^2.1.3", diff --git a/src/components/layout/common.less b/src/components/layout/common.less index d840e7e..7befa29 100644 --- a/src/components/layout/common.less +++ b/src/components/layout/common.less @@ -56,9 +56,6 @@ body { .ant-table-tbody > tr > td { text-align: center; - &:last-child{ - border-right: none; - } } &.ant-table-small { diff --git a/src/components/layout/main.less b/src/components/layout/main.less index 39f49b1..dbcc1a1 100644 --- a/src/components/layout/main.less +++ b/src/components/layout/main.less @@ -17,6 +17,7 @@ :global{ .ant-menu-root{ + width: 100%; &>.ant-menu-item { padding: 0; text-align: center; @@ -48,11 +49,12 @@ .sider { width: 224px; - background: #404040; + background: @heading-color; position: absolute; overflow: visible; padding-bottom: 24px; height: 100vh; + transition: @transition-ease-out; .logo { text-align: center; @@ -60,12 +62,13 @@ line-height: 40px; cursor: pointer; margin: 28px 0; - transition: @transition-ease-in-out; + transition: @transition-ease-out; + overflow: hidden; img { width: 40px; margin-right: 8px; - transition: @transition-ease-in-out; + transition: @transition-ease-out; } span { @@ -76,7 +79,7 @@ } .anticon{ - transition: @transition-ease-in-out; + transition: @transition-ease-out; } } .switchtheme{ @@ -84,11 +87,17 @@ position: absolute; bottom: 0; height: 42px; - background-color: #494949; + background-color: @dark-half; display: flex; justify-content: space-between; align-items: center; padding: 0 16px 0 24px; + overflow: hidden; + + span{ + white-space: nowrap; + overflow: hidden; + } :global{ .anticon{ min-width: 14px; @@ -97,6 +106,15 @@ } } } + :global{ + .ant-menu{ + transition: @transition-ease-out; + .ant-menu-item, .ant-menu-submenu-title{ + overflow: hidden; + white-space: normal; + } + } + } } .header { @@ -106,7 +124,7 @@ } border: none; } - box-shadow: 0 0 20px rgba(0, 0, 0, 0.05); + box-shadow: @shadow-2; position: relative; .siderbutton{ height: 47px; @@ -135,6 +153,7 @@ margin-left: 224px; overflow: auto; height: 100vh; + transition: @transition-ease-out; .container { margin: 24px; @@ -159,7 +178,7 @@ font-size: 12px; color: #999; background: #fff; - box-shadow: 0 0 20px rgba(0, 0, 0, 0.05); + box-shadow: @shadow-2; width: 100%; } } @@ -174,7 +193,7 @@ color: @primary-color; &:not(.ant-menu-submenu-open) { - background-color: rgba(255,255,255,0.05); + background-color: @dark-half; } } @@ -186,18 +205,18 @@ &.ant-menu-inline { .ant-menu-item-selected { - background-color: rgba(255,255,255,0.05); + background-color: @dark-half; } } .ant-menu-item-selected { color: @primary-color; - background-color: rgba(255,255,255,0.05); + background-color: @dark-half; & > a { color: @primary-color; } &:hover{ - background-color: rgba(255,255,255,0.05); + background-color: @dark-half; } } } diff --git a/src/components/vars.less b/src/components/vars.less index eb1fb30..562add5 100644 --- a/src/components/vars.less +++ b/src/components/vars.less @@ -1,188 +1,192 @@ -// @import "../../node_modules/antd/lib/style/themes/default.less"; -// Prefix -@ant-prefix : ant; - -// Color -@primary-color : #2db7f5; -@info-color : #2db7f5; -@success-color : #87d068; -@error-color : #f50; -@warning-color : #fa0; -@normal-color : #d9d9d9; - -// ------ Base & Require ------ -@body-background : #fff; -@font-family : -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", SimSun, sans-serif; -@code-family : Consolas,Menlo,Courier,monospace; -@text-color : #666; -@heading-color : #404040; -@font-size-base : 12px; -@line-height-base : 1.5; -@line-height-computed : floor((@font-size-base * @line-height-base)); -@border-radius-base : 6px; -@border-radius-sm : 4px; - -// ICONFONT -@iconfont-css-prefix : anticon; -@icon-url : "https://at.alicdn.com/t/font_1473840929_824008"; - -// LINK -@link-color : #2db7f5; -@link-hover-color : tint(@link-color, 20%); -@link-active-color : shade(@link-color, 5%); -@link-hover-decoration : none; - -// Disabled cursor for form controls and buttons. -@cursor-disabled : not-allowed; - -// Animation -@ease-out : cubic-bezier(0.215, 0.61, 0.355, 1); -@ease-in : cubic-bezier(0.55, 0.055, 0.675, 0.19); -@ease-in-out : cubic-bezier(0.645, 0.045, 0.355, 1); -@ease-out-back : cubic-bezier(0.12, 0.4, 0.29, 1.46); -@ease-in-back : cubic-bezier(0.71, -0.46, 0.88, 0.6); -@ease-in-out-back : cubic-bezier(0.71, -0.46, 0.29, 1.46); -@ease-out-circ : cubic-bezier(0.08, 0.82, 0.17, 1); -@ease-in-circ : cubic-bezier(0.6, 0.04, 0.98, 0.34); -@ease-in-out-circ : cubic-bezier(0.78, 0.14, 0.15, 0.86); -@ease-out-quint : cubic-bezier(0.23, 1, 0.32, 1); -@ease-in-quint : cubic-bezier(0.755, 0.05, 0.855, 0.06); -@ease-in-out-quint : cubic-bezier(0.86, 0, 0.07, 1); - -// Border color -@border-color-base : #d9d9d9; // base border outline a component -@border-color-split : #e9e9e9; // split border inside a component - -// Outline -@outline-blur-size : 0; -@outline-width : 2px; -@outline-color : @primary-color; - -// Background color -@background-color-base : #f7f7f7; // basic gray background - -// Shadow -@shadow-color : rgba(100, 100, 100, .2); -@box-shadow-base : @shadow-1-down; -@shadow-1-up : 0 -1px 6px @shadow-color; -@shadow-1-down : 0 1px 6px @shadow-color; -@shadow-1-left : -1px 0 6px @shadow-color; -@shadow-1-right : 1px 0 6px @shadow-color; -@shadow-2 : 0 1px 8px @shadow-color; - -// Buttons -@btn-font-weight : 500; -@btn-border-radius-base : @border-radius-base; -@btn-border-radius-sm : @border-radius-sm; - -@btn-primary-color : #fff; -@btn-primary-bg : @primary-color; -@btn-group-border : shade(@primary-color, 5%); - -@btn-default-color : @text-color; -@btn-default-bg : @background-color-base; -@btn-default-border : @border-color-base; - -@btn-ghost-color : @text-color; -@btn-ghost-bg : transparent; -@btn-ghost-border : @border-color-base; - -@btn-disable-color : #ccc; -@btn-disable-bg : @background-color-base; -@btn-disable-border : @border-color-base; - -@btn-padding-base : 4px 15px; - -@btn-font-size-lg : 14px; -@btn-padding-lg : 4px 15px 5px 15px; - -@btn-padding-sm : 1px 7px; - -@btn-circle-size : 28px; -@btn-circle-size-lg : 32px; -@btn-circle-size-sm : 22px; - -// Media queries breakpoints -// Extra small screen / phone -@screen-xs : 480px; -@screen-xs-min : @screen-xs; -@screen-xs-max : (@screen-xs-min - 1); - -// Small screen / tablet -@screen-sm : 768px; -@screen-sm-min : @screen-sm; -@screen-sm-max : (@screen-sm-min - 1); - -// Medium screen / desktop -@screen-md : 992px; -@screen-md-min : @screen-md; -@screen-md-max : (@screen-md-min - 1); - -// Large screen / wide desktop -@screen-lg : 1200px; -@screen-lg-min : @screen-lg; -@screen-lg-max : (@screen-lg-min - 1); - -// Layout and Grid system -@grid-columns : 24; -@grid-gutter-width : 0; - -// Container sizes -@container-sm : (720px + @grid-gutter-width); -@container-md : (940px + @grid-gutter-width); -@container-lg : (1140px + @grid-gutter-width); - -// z-index list -@zindex-affix : 10; -@zindex-back-top : 10; -@zindex-modal-mask : 1000; -@zindex-modal : 1000; -@zindex-notification : 1010; -@zindex-message : 1010; -@zindex-popover : 1030; -@zindex-picker : 1050; -@zindex-dropdown : 1050; -@zindex-tooltip : 1060; - -// Form -// -------------------------------- -// Legend -@legend-color : #999; -@legend-border-color : @border-color-base; -// Label -@label-required-color : #f50; -@label-color : @text-color; -// Input -@input-height-base: 28px; -@input-height-lg: 32px; -@input-height-sm: 22px; - -@input-padding-horizontal : 7px; -@input-padding-vertical-base : 4px; -@input-padding-vertical-sm : 1px; -@input-padding-vertical-lg : 6px; - -@input-placeholder-color : #ccc; -@input-color : @text-color; -@input-border-color : @border-color-base; -@input-bg : #fff; - -@input-hover-border-color : @primary-color; -@input-disabled-bg : @background-color-base; - -@form-item-margin-bottom : 24px; +@import "../../node_modules/antd/lib/style/themes/default.less"; +// // Prefix +// @ant-prefix : ant; +// +// // Color +// @primary-color : #2db7f5; +// @info-color : #2db7f5; +// @success-color : #87d068; +// @error-color : #f50; +// @warning-color : #fa0; +// @normal-color : #d9d9d9; +// +// // ------ Base & Require ------ +// @body-background : #fff; +// @font-family : -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", SimSun, sans-serif; +// @code-family : Consolas,Menlo,Courier,monospace; +// @text-color : #666; +// @heading-color : #404040; +// @font-size-base : 12px; +// @line-height-base : 1.5; +// @line-height-computed : floor((@font-size-base * @line-height-base)); +// @border-radius-base : 6px; +// @border-radius-sm : 4px; +// +// // ICONFONT +// @iconfont-css-prefix : anticon; +// @icon-url : "https://at.alicdn.com/t/font_1473840929_824008"; +// +// // LINK +// @link-color : #2db7f5; +// @link-hover-color : tint(@link-color, 20%); +// @link-active-color : shade(@link-color, 5%); +// @link-hover-decoration : none; +// +// // Disabled cursor for form controls and buttons. +// @cursor-disabled : not-allowed; +// +// // Animation +// @ease-out : cubic-bezier(0.215, 0.61, 0.355, 1); +// @ease-in : cubic-bezier(0.55, 0.055, 0.675, 0.19); +// @ease-in-out : cubic-bezier(0.645, 0.045, 0.355, 1); +// @ease-out-back : cubic-bezier(0.12, 0.4, 0.29, 1.46); +// @ease-in-back : cubic-bezier(0.71, -0.46, 0.88, 0.6); +// @ease-in-out-back : cubic-bezier(0.71, -0.46, 0.29, 1.46); +// @ease-out-circ : cubic-bezier(0.08, 0.82, 0.17, 1); +// @ease-in-circ : cubic-bezier(0.6, 0.04, 0.98, 0.34); +// @ease-in-out-circ : cubic-bezier(0.78, 0.14, 0.15, 0.86); +// @ease-out-quint : cubic-bezier(0.23, 1, 0.32, 1); +// @ease-in-quint : cubic-bezier(0.755, 0.05, 0.855, 0.06); +// @ease-in-out-quint : cubic-bezier(0.86, 0, 0.07, 1); +// +// // Border color +// @border-color-base : #d9d9d9; // base border outline a component +// @border-color-split : #e9e9e9; // split border inside a component +// +// // Outline +// @outline-blur-size : 0; +// @outline-width : 2px; +// @outline-color : @primary-color; +// +// // Background color +// @background-color-base : #f7f7f7; // basic gray background +// +// // Shadow +// @shadow-color : rgba(100, 100, 100, .2); +// @box-shadow-base : @shadow-1-down; +// @shadow-1-up : 0 -1px 6px @shadow-color; +// @shadow-1-down : 0 1px 6px @shadow-color; +// @shadow-1-left : -1px 0 6px @shadow-color; +// @shadow-1-right : 1px 0 6px @shadow-color; +// @shadow-2 : 0 1px 8px @shadow-color; +// +// // Buttons +// @btn-font-weight : 500; +// @btn-border-radius-base : @border-radius-base; +// @btn-border-radius-sm : @border-radius-sm; +// +// @btn-primary-color : #fff; +// @btn-primary-bg : @primary-color; +// @btn-group-border : shade(@primary-color, 5%); +// +// @btn-default-color : @text-color; +// @btn-default-bg : @background-color-base; +// @btn-default-border : @border-color-base; +// +// @btn-ghost-color : @text-color; +// @btn-ghost-bg : transparent; +// @btn-ghost-border : @border-color-base; +// +// @btn-disable-color : #ccc; +// @btn-disable-bg : @background-color-base; +// @btn-disable-border : @border-color-base; +// +// @btn-padding-base : 4px 15px; +// +// @btn-font-size-lg : 14px; +// @btn-padding-lg : 4px 15px 5px 15px; +// +// @btn-padding-sm : 1px 7px; +// +// @btn-circle-size : 28px; +// @btn-circle-size-lg : 32px; +// @btn-circle-size-sm : 22px; +// +// // Media queries breakpoints +// // Extra small screen / phone +// @screen-xs : 480px; +// @screen-xs-min : @screen-xs; +// @screen-xs-max : (@screen-xs-min - 1); +// +// // Small screen / tablet +// @screen-sm : 768px; +// @screen-sm-min : @screen-sm; +// @screen-sm-max : (@screen-sm-min - 1); +// +// // Medium screen / desktop +// @screen-md : 992px; +// @screen-md-min : @screen-md; +// @screen-md-max : (@screen-md-min - 1); +// +// // Large screen / wide desktop +// @screen-lg : 1200px; +// @screen-lg-min : @screen-lg; +// @screen-lg-max : (@screen-lg-min - 1); +// +// // Layout and Grid system +// @grid-columns : 24; +// @grid-gutter-width : 0; +// +// // Container sizes +// @container-sm : (720px + @grid-gutter-width); +// @container-md : (940px + @grid-gutter-width); +// @container-lg : (1140px + @grid-gutter-width); +// +// // z-index list +// @zindex-affix : 10; +// @zindex-back-top : 10; +// @zindex-modal-mask : 1000; +// @zindex-modal : 1000; +// @zindex-notification : 1010; +// @zindex-message : 1010; +// @zindex-popover : 1030; +// @zindex-picker : 1050; +// @zindex-dropdown : 1050; +// @zindex-tooltip : 1060; +// +// // Form +// // -------------------------------- +// // Legend +// @legend-color : #999; +// @legend-border-color : @border-color-base; +// // Label +// @label-required-color : #f50; +// @label-color : @text-color; +// // Input +// @input-height-base: 28px; +// @input-height-lg: 32px; +// @input-height-sm: 22px; +// +// @input-padding-horizontal : 7px; +// @input-padding-vertical-base : 4px; +// @input-padding-vertical-sm : 1px; +// @input-padding-vertical-lg : 6px; +// +// @input-placeholder-color : #ccc; +// @input-color : @text-color; +// @input-border-color : @border-color-base; +// @input-bg : #fff; +// +// @input-hover-border-color : @primary-color; +// @input-disabled-bg : @background-color-base; +// +// @form-item-margin-bottom : 24px; /*========================*/ /*=======Antd Admin=======*/ /*========================*/ +//Color + +@dark-half:#494949; + // Shadow @shadow-1 : 4px 4px 20px 0 rgba(0,0,0,0.01); @shadow-2 : 4px 4px 40px 0 rgba(0,0,0,0.05); //transition @transition-ease-in : all .3s @ease-in; -@transition-ease-in-out : all .3s @ease-in-out; +@transition-ease-out : all .3s @ease-out; //mix .text-overflow(){ diff --git a/src/models/users.js b/src/models/users.js index 93d3390..4b5359e 100644 --- a/src/models/users.js +++ b/src/models/users.js @@ -17,6 +17,7 @@ export default { showTotal: total => `共 ${total} 条`, current:1, total:null, + size:'default' } }, diff --git a/yarn.lock b/yarn.lock index 56fbca1..3de47d4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -81,21 +81,19 @@ ansi-styles@^2.2.1: version "2.2.1" resolved "http://registry.npm.taobao.org/ansi-styles/download/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" -antd@^2.3.1: - version "2.4.3" - resolved "http://registry.npm.taobao.org/antd/download/antd-2.4.3.tgz#b3a16012e9a95c6ca581e8196bd36e7b3fba5027" +antd@^2.5.0: + version "2.5.0" + resolved "http://registry.npm.taobao.org/antd/download/antd-2.5.0.tgz#9c2bd8750b49fdc2c164cb5d184fa6f2c9d6208f" dependencies: array-tree-filter "~1.0.0" babel-runtime "6.x" classnames "~2.2.0" css-animation "^1.2.5" - gregorian-calendar "~4.1.0" - gregorian-calendar-format "~4.1.0" moment "~2.15.1" object-assign "~4.1.0" omit.js "^0.1.0" rc-animate "~2.3.0" - rc-calendar "~7.4.1" + rc-calendar "~7.5.1" rc-cascader "~0.10.1" rc-checkbox "~1.4.0" rc-collapse "~1.6.4" @@ -106,15 +104,15 @@ antd@^2.3.1: rc-input-number "~2.7.0" rc-menu "~5.0.1" rc-notification "~1.3.4" - rc-pagination "~1.5.3" + rc-pagination "~1.6.0" rc-progress "~2.0.1" rc-radio "~2.0.0" rc-rate "~1.1.2" rc-select "~6.6.1" - rc-slider "~5.2.0" + rc-slider "~5.3.0" rc-steps "~2.2.0" rc-switch "~1.4.2" - rc-table "~5.0.0" + rc-table "~5.2.0" rc-tabs "~7.0.5" rc-time-picker "~2.2.1" rc-tooltip "~3.4.2" @@ -230,8 +228,8 @@ async@^1.3.0, async@^1.5.0: resolved "http://registry.npm.taobao.org/async/download/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" async@^2.0.1: - version "2.1.2" - resolved "http://registry.npm.taobao.org/async/download/async-2.1.2.tgz#612a4ab45ef42a70cde806bad86ee6db047e8385" + version "2.1.4" + resolved "http://registry.npm.taobao.org/async/download/async-2.1.4.tgz#2d2160c7788032e4dd6cbe2502f1f9a2c8f6cde4" dependencies: lodash "^4.14.0" @@ -275,8 +273,8 @@ atool-build@^0.7.6: webpack "~1.12.2" atool-monitor@0.x: - version "0.3.3" - resolved "http://registry.npm.taobao.org/atool-monitor/download/atool-monitor-0.3.3.tgz#1c428cbedf3b0ce80fa321710d99aeac6dc4f276" + version "0.3.4" + resolved "http://registry.npm.taobao.org/atool-monitor/download/atool-monitor-0.3.4.tgz#2145bf4ba544ecc32a9daa894b8fb5371be5a346" dependencies: form-data "^1.0.0-rc4" is-ali-env "^0.1.0" @@ -1016,10 +1014,6 @@ balanced-match@^0.4.1, balanced-match@^0.4.2: version "0.4.2" resolved "http://registry.npm.taobao.org/balanced-match/download/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838" -balanced-match@~0.1.0: - version "0.1.0" - resolved "http://registry.npm.taobao.org/balanced-match/download/balanced-match-0.1.0.tgz#b504bd05869b39259dd0c5efc35d843176dccc4a" - base64-js@^1.0.2: version "1.2.0" resolved "http://registry.npm.taobao.org/base64-js/download/base64-js-1.2.0.tgz#a39992d723584811982be5e290bb6a53d86700f1" @@ -1130,8 +1124,8 @@ can-use-dom@^0.1.0: resolved "http://registry.npm.taobao.org/can-use-dom/download/can-use-dom-0.1.0.tgz#22cc4a34a0abc43950f42c6411024a3f6366b45a" caniuse-db@^1.0.30000539, caniuse-db@^1.0.30000578: - version "1.0.30000585" - resolved "http://registry.npm.taobao.org/caniuse-db/download/caniuse-db-1.0.30000585.tgz#9509aeb2bd1df72155cc7d80074f2ad79560ae28" + version "1.0.30000590" + resolved "http://registry.npm.taobao.org/caniuse-db/download/caniuse-db-1.0.30000590.tgz#306e2b133ce467e8341b2accd223256b4040b2be" caseless@~0.11.0: version "0.11.0" @@ -1362,7 +1356,7 @@ core-js@^1.0.0: version "1.2.7" resolved "http://registry.npm.taobao.org/core-js/download/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636" -core-js@^2.4.0: +core-js@^2.4.0, core-js@^2.4.1: version "2.4.1" resolved "http://registry.npm.taobao.org/core-js/download/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e" @@ -1448,8 +1442,8 @@ cssesc@^0.1.0: resolved "http://registry.npm.taobao.org/cssesc/download/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4" "cssnano@>=2.6.1 <4": - version "3.8.0" - resolved "http://registry.npm.taobao.org/cssnano/download/cssnano-3.8.0.tgz#bb90ac5292f42b679d9a05f6da0e9697556bb80d" + version "3.8.1" + resolved "http://registry.npm.taobao.org/cssnano/download/cssnano-3.8.1.tgz#008a482148ee948cf0af2ee6e44bd97c53f886ec" dependencies: autoprefixer "^6.3.1" decamelize "^1.1.2" @@ -1497,13 +1491,67 @@ d@^0.1.1, d@~0.1.1: dependencies: es5-ext "~0.10.2" +d3-array@1: + version "1.0.2" + resolved "http://registry.npm.taobao.org/d3-array/download/d3-array-1.0.2.tgz#174237bf356a852fadd6af87743d928631de7655" + +d3-collection@1: + version "1.0.2" + resolved "http://registry.npm.taobao.org/d3-collection/download/d3-collection-1.0.2.tgz#df5acb5400443e9eabe9c1379896c67e52426b39" + +d3-color@1: + version "1.0.2" + resolved "http://registry.npm.taobao.org/d3-color/download/d3-color-1.0.2.tgz#83cb4b3a9474e40795f009d97e97a15649830bbc" + +d3-format@1: + version "1.0.2" + resolved "http://registry.npm.taobao.org/d3-format/download/d3-format-1.0.2.tgz#138618320b4bbeb43b5c0ff30519079fbbd7375e" + +d3-interpolate@1: + version "1.1.2" + resolved "http://registry.npm.taobao.org/d3-interpolate/download/d3-interpolate-1.1.2.tgz#b52e6927a04fe1fe2a4cffc139e5389ed3e5e790" + dependencies: + d3-color "1" + +d3-path@1: + version "1.0.3" + resolved "http://registry.npm.taobao.org/d3-path/download/d3-path-1.0.3.tgz#60103d0dea9a6cd6ca58de86c6d56724002d3fde" + +d3-scale@^1.0.3: + version "1.0.4" + resolved "http://registry.npm.taobao.org/d3-scale/download/d3-scale-1.0.4.tgz#50e28bf6a193b706745528515ed9b3d44205a033" + dependencies: + d3-array "1" + d3-collection "1" + d3-color "1" + d3-format "1" + d3-interpolate "1" + d3-time "1" + d3-time-format "2" + +d3-shape@^1.0.3: + version "1.0.4" + resolved "http://registry.npm.taobao.org/d3-shape/download/d3-shape-1.0.4.tgz#145ee100ccbec42f8e3f1996cd05c786f79fe1c6" + dependencies: + d3-path "1" + +d3-time-format@2: + version "2.0.3" + resolved "http://registry.npm.taobao.org/d3-time-format/download/d3-time-format-2.0.3.tgz#3241569b74ddc9c42e0689c0e8a903579fd6280a" + dependencies: + d3-time "1" + +d3-time@1: + version "1.0.4" + resolved "http://registry.npm.taobao.org/d3-time/download/d3-time-1.0.4.tgz#2ceba09a76b7450c992a1ded4e10fc6195e69649" + damerau-levenshtein@^1.0.0: version "1.0.3" resolved "http://registry.npm.taobao.org/damerau-levenshtein/download/damerau-levenshtein-1.0.3.tgz#ae4f4ce0b62acae10ff63a01bb08f652f5213af2" dashdash@^1.12.0: - version "1.14.0" - resolved "http://registry.npm.taobao.org/dashdash/download/dashdash-1.14.0.tgz#29e486c5418bf0f356034a993d51686a33e84141" + version "1.14.1" + resolved "http://registry.npm.taobao.org/dashdash/download/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" dependencies: assert-plus "^1.0.0" @@ -2219,24 +2267,13 @@ globby@^5.0.0: pinkie-promise "^2.0.0" graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9: - version "4.1.10" - resolved "http://registry.npm.taobao.org/graceful-fs/download/graceful-fs-4.1.10.tgz#f2d720c22092f743228775c75e3612632501f131" + version "4.1.11" + resolved "http://registry.npm.taobao.org/graceful-fs/download/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" "graceful-readlink@>= 1.0.0": version "1.0.1" resolved "http://registry.npm.taobao.org/graceful-readlink/download/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725" -gregorian-calendar-format@~4.1.0: - version "4.1.3" - resolved "http://registry.npm.taobao.org/gregorian-calendar-format/download/gregorian-calendar-format-4.1.3.tgz#d93e6b68996402c5f5274fec8811fffe0ab97248" - dependencies: - gregorian-calendar "4.x" - warning "2.x" - -gregorian-calendar@~4.1.0, gregorian-calendar@4.x: - version "4.1.6" - resolved "http://registry.npm.taobao.org/gregorian-calendar/download/gregorian-calendar-4.1.6.tgz#1051b693d6a5e95483ba5f1d10646b9cf6420a03" - hammerjs@^2.0.8: version "2.0.8" resolved "http://registry.npm.taobao.org/hammerjs/download/hammerjs-2.0.8.tgz#04ef77862cff2bb79d30f7692095930222bf60f1" @@ -2697,8 +2734,8 @@ json2mq@^0.2.0: string-convert "^0.2.0" json5@^0.5.0: - version "0.5.0" - resolved "http://registry.npm.taobao.org/json5/download/json5-0.5.0.tgz#9b20715b026cbe3778fd769edccd822d8332a5b2" + version "0.5.1" + resolved "http://registry.npm.taobao.org/json5/download/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" jsonfile@^2.1.0: version "2.4.0" @@ -2978,7 +3015,7 @@ lodash.words@^3.0.0: dependencies: lodash._root "^3.0.0" -lodash@^4.0.0, lodash@^4.1.0, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0: +lodash@^4.0.0, lodash@^4.1.0, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.16.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0: version "4.17.2" resolved "http://registry.npm.taobao.org/lodash/download/lodash-4.17.2.tgz#34a3055babe04ce42467b607d700072c7ff6bf42" @@ -2999,8 +3036,8 @@ loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0: js-tokens "^2.0.0" lru-cache@^4.0.0: - version "4.0.1" - resolved "http://registry.npm.taobao.org/lru-cache/download/lru-cache-4.0.1.tgz#1343955edaf2e37d9b9e7ee7241e27c4b9fb72be" + version "4.0.2" + resolved "http://registry.npm.taobao.org/lru-cache/download/lru-cache-4.0.2.tgz#1d17679c069cda5d040991a09dbc2c0db377e55e" dependencies: pseudomap "^1.0.1" yallist "^2.0.0" @@ -3140,8 +3177,8 @@ moment@~2.15.1: resolved "http://registry.npm.taobao.org/moment/download/moment-2.15.2.tgz#1bfdedf6a6e345f322fe956d5df5bd08a8ce84dc" moment@2.x: - version "2.16.0" - resolved "http://registry.npm.taobao.org/moment/download/moment-2.16.0.tgz#f38f2c97c9889b0ee18fc6cc392e1e443ad2da8e" + version "2.17.0" + resolved "http://registry.npm.taobao.org/moment/download/moment-2.17.0.tgz#a4c292e02aac5ddefb29a6eed24f51938dd3b74f" ms@0.6.2: version "0.6.2" @@ -3160,8 +3197,8 @@ mute-stream@0.0.5: resolved "http://registry.npm.taobao.org/mute-stream/download/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0" mz@^2.3.1: - version "2.5.0" - resolved "http://registry.npm.taobao.org/mz/download/mz-2.5.0.tgz#2859025df03d46b57bb317174b196477ce64cec1" + version "2.6.0" + resolved "http://registry.npm.taobao.org/mz/download/mz-2.6.0.tgz#c8b8521d958df0a4f2768025db69c719ee4ef1ce" dependencies: any-promise "^1.0.0" object-assign "^4.0.1" @@ -3224,14 +3261,14 @@ node-fetch@^1.0.1, node-fetch@^1.4.1: vm-browserify "0.0.4" node-pre-gyp@^0.6.29: - version "0.6.31" - resolved "http://registry.npm.taobao.org/node-pre-gyp/download/node-pre-gyp-0.6.31.tgz#d8a00ddaa301a940615dbcc8caad4024d58f6017" + version "0.6.32" + resolved "http://registry.npm.taobao.org/node-pre-gyp/download/node-pre-gyp-0.6.32.tgz#fc452b376e7319b3d255f5f34853ef6fd8fe1fd5" dependencies: mkdirp "~0.5.1" nopt "~3.0.6" - npmlog "^4.0.0" + npmlog "^4.0.1" rc "~1.1.6" - request "^2.75.0" + request "^2.79.0" rimraf "~2.5.4" semver "~5.3.0" tar "~2.2.1" @@ -3268,7 +3305,7 @@ npm-install-webpack-plugin-cn@^2.0.2: lodash.kebabcase "^3.1.0" which "^1.2.4" -npmlog@^4.0.0: +npmlog@^4.0.1: version "4.0.1" resolved "http://registry.npm.taobao.org/npmlog/download/npmlog-4.0.1.tgz#d14f503b4cd79710375553004ba96e6662fbc0b8" dependencies: @@ -3431,6 +3468,10 @@ pbkdf2-compat@2.0.1: version "2.0.1" resolved "http://registry.npm.taobao.org/pbkdf2-compat/download/pbkdf2-compat-2.0.1.tgz#b6e0c8fa99494d94e0511575802a59a5c142f288" +performance-now@~0.2.0: + version "0.2.0" + resolved "http://registry.npm.taobao.org/performance-now/download/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5" + pify@^2.0.0: version "2.3.0" resolved "http://registry.npm.taobao.org/pify/download/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" @@ -3506,8 +3547,8 @@ postcss-colormin@^2.1.8: postcss-value-parser "^3.2.3" postcss-convert-values@^2.3.4: - version "2.4.1" - resolved "http://registry.npm.taobao.org/postcss-convert-values/download/postcss-convert-values-2.4.1.tgz#45dce4d4e33b7d967b97a4d937f270ea98d2fe7a" + version "2.5.0" + resolved "http://registry.npm.taobao.org/postcss-convert-values/download/postcss-convert-values-2.5.0.tgz#570aceb04b3061fb25f6f46bd0329e7ab6263c0b" dependencies: postcss "^5.0.11" postcss-value-parser "^3.1.2" @@ -3791,15 +3832,16 @@ postcss-will-change@^1.0.0: postcss "^5.0.16" postcss-zindex@^2.0.1: - version "2.1.1" - resolved "http://registry.npm.taobao.org/postcss-zindex/download/postcss-zindex-2.1.1.tgz#ea3fbe656c9738aa8729e2ee96ec2a46089b720f" + version "2.2.0" + resolved "http://registry.npm.taobao.org/postcss-zindex/download/postcss-zindex-2.2.0.tgz#d2109ddc055b91af67fc4cb3b025946639d2af22" dependencies: + has "^1.0.1" postcss "^5.0.4" uniqs "^2.0.0" postcss@^5.0, postcss@^5.0.0, postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.19, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.5: - version "5.2.5" - resolved "http://registry.npm.taobao.org/postcss/download/postcss-5.2.5.tgz#ec428c27dffc7fac65961340a9b022fa4af5f056" + version "5.2.6" + resolved "http://registry.npm.taobao.org/postcss/download/postcss-5.2.6.tgz#a252cd67cd52585035f17e9ad12b35137a7bdd9e" dependencies: chalk "^1.1.3" js-base64 "^2.1.9" @@ -3899,9 +3941,15 @@ querystring@^0.2.0, querystring@0.2.0: version "0.2.0" resolved "http://registry.npm.taobao.org/querystring/download/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" +raf@^3.2.0: + version "3.3.0" + resolved "http://registry.npm.taobao.org/raf/download/raf-3.3.0.tgz#93845eeffc773f8129039f677f80a36044eee2c3" + dependencies: + performance-now "~0.2.0" + randomatic@^1.1.3: - version "1.1.5" - resolved "http://registry.npm.taobao.org/randomatic/download/randomatic-1.1.5.tgz#5e9ef5f2d573c67bd2b8124ae90b5156e457840b" + version "1.1.6" + resolved "http://registry.npm.taobao.org/randomatic/download/randomatic-1.1.6.tgz#110dcabff397e9dcff7c0789ccc0a49adf1ec5bb" dependencies: is-number "^2.0.2" kind-of "^3.0.2" @@ -3923,9 +3971,9 @@ rc-animate@^2.0.2, rc-animate@^2.3.0, rc-animate@~2.3.0, rc-animate@2.x: dependencies: css-animation "^1.3.0" -rc-calendar@~7.4.1: - version "7.4.4" - resolved "http://registry.npm.taobao.org/rc-calendar/download/rc-calendar-7.4.4.tgz#4104da97529684d93261666cebcfff31cf456fd0" +rc-calendar@~7.5.1: + version "7.5.1" + resolved "http://registry.npm.taobao.org/rc-calendar/download/rc-calendar-7.5.1.tgz#b110cb7c74a1e7b45ae6d4451cf4c7236e347f44" dependencies: babel-runtime "6.x" classnames "2.x" @@ -3980,8 +4028,8 @@ rc-editor-core@^0.5.1, rc-editor-core@~0.5.5: rc-editor-plugin-image "0.0.3" rc-editor-mention@~0.3.0: - version "0.3.3" - resolved "http://registry.npm.taobao.org/rc-editor-mention/download/rc-editor-mention-0.3.3.tgz#9fa765d7dd5277bdc3d8d353b2c4213c581e4cf9" + version "0.3.4" + resolved "http://registry.npm.taobao.org/rc-editor-mention/download/rc-editor-mention-0.3.4.tgz#19c8a504c93c43410aaaae30fd5e02054197fa4b" dependencies: classnames "^2.2.5" dom-scroll-into-view "^1.2.0" @@ -4019,8 +4067,8 @@ rc-input-number@~2.7.0: classnames "^2.2.0" rc-menu@~5.0.1, "rc-menu@5.x || 4.x": - version "5.0.6" - resolved "http://registry.npm.taobao.org/rc-menu/download/rc-menu-5.0.6.tgz#3b82ce58767cc46ea2f1911b6d7f0c755e6503c8" + version "5.0.7" + resolved "http://registry.npm.taobao.org/rc-menu/download/rc-menu-5.0.7.tgz#186d47afe3f76b110d146fea3d77b26638f47f37" dependencies: babel-runtime "6.x" classnames "2.x" @@ -4036,9 +4084,9 @@ rc-notification@~1.3.4: rc-animate "2.x" rc-util "3.x" -rc-pagination@~1.5.3: - version "1.5.5" - resolved "http://registry.npm.taobao.org/rc-pagination/download/rc-pagination-1.5.5.tgz#c298a7bee5538e272947632e00d49a7a83a8e747" +rc-pagination@~1.6.0: + version "1.6.1" + resolved "http://registry.npm.taobao.org/rc-pagination/download/rc-pagination-1.6.1.tgz#6c3eb0d43d60b239067f261dbf6c83dab77fe986" rc-progress@~2.0.1: version "2.0.3" @@ -4055,8 +4103,8 @@ rc-rate@~1.1.2: resolved "http://registry.npm.taobao.org/rc-rate/download/rc-rate-1.1.2.tgz#97706ef0615b5a0f4ee873898a743a4d7229f574" rc-select@~6.6.1: - version "6.6.7" - resolved "http://registry.npm.taobao.org/rc-select/download/rc-select-6.6.7.tgz#d430e01a67a30124763a84aa72a7aba27d8fee5f" + version "6.6.9" + resolved "http://registry.npm.taobao.org/rc-select/download/rc-select-6.6.9.tgz#b5faa42220ab02dbb6c8619349d15ac59e4e5c39" dependencies: babel-runtime "6.x" classnames "2.x" @@ -4068,9 +4116,9 @@ rc-select@~6.6.1: rc-util "3.x" warning "2.x" -rc-slider@~5.2.0: - version "5.2.1" - resolved "http://registry.npm.taobao.org/rc-slider/download/rc-slider-5.2.1.tgz#58e4526a5296cf40c2a1515fe8fda3736fb611af" +rc-slider@~5.3.0: + version "5.3.5" + resolved "http://registry.npm.taobao.org/rc-slider/download/rc-slider-5.3.5.tgz#8398cadb044c90196d3c635b677583e50516a69b" dependencies: babel-runtime "6.x" classnames "^2.2.5" @@ -4090,9 +4138,9 @@ rc-switch@~1.4.2: dependencies: classnames "^2.2.1" -rc-table@~5.0.0: - version "5.0.6" - resolved "http://registry.npm.taobao.org/rc-table/download/rc-table-5.0.6.tgz#25d4a5df4fb3a47bbbb4a1c6b523ecc10481b4a7" +rc-table@~5.2.0: + version "5.2.1" + resolved "http://registry.npm.taobao.org/rc-table/download/rc-table-5.2.1.tgz#fbe1160e1ac2361dab2e8ac592b1d74bdccb1b08" dependencies: object-path "^0.11.1" rc-util "3.x" @@ -4181,9 +4229,13 @@ rc@~1.1.6: minimist "^1.2.0" strip-json-comments "~1.0.4" +"react-addons-transition-group@^0.14.0 || ^15.0.0": + version "15.4.1" + resolved "http://registry.npm.taobao.org/react-addons-transition-group/download/react-addons-transition-group-15.4.1.tgz#27d92717089c5e2db202e654a85b76a41b703acc" + react-dom@^15.1.0: - version "15.4.0" - resolved "http://registry.npm.taobao.org/react-dom/download/react-dom-15.4.0.tgz#6a97a69000966570db48c746bc4b7b0ca50d1534" + version "15.4.1" + resolved "http://registry.npm.taobao.org/react-dom/download/react-dom-15.4.1.tgz#d54c913261aaedb17adc20410d029dcc18a1344a" dependencies: fbjs "^0.8.1" loose-envify "^1.1.0" @@ -4224,6 +4276,10 @@ react-resizable@^1.4.2: dependencies: react-draggable "^2.1.0" +react-resize-detector@^0.3.3: + version "0.3.3" + resolved "http://registry.npm.taobao.org/react-resize-detector/download/react-resize-detector-0.3.3.tgz#ca07443072324843586666d9443a6356da7c0501" + react-responsive-mixin@^0.4.0: version "0.4.0" resolved "http://registry.npm.taobao.org/react-responsive-mixin/download/react-responsive-mixin-0.4.0.tgz#9504218a17d49346d9a09a1f5945f629afdb624b" @@ -4256,9 +4312,17 @@ react-slick@~0.14.2: react-responsive-mixin "^0.4.0" slick-carousel "^1.6.0" +react-smooth@^0.1.15: + version "0.1.16" + resolved "http://registry.npm.taobao.org/react-smooth/download/react-smooth-0.1.16.tgz#efcb26ab51edb63ccc6849962f4ff4cfb5aae0cb" + dependencies: + lodash "^4.16.4" + raf "^3.2.0" + react-addons-transition-group "^0.14.0 || ^15.0.0" + react@^15.1.0: - version "15.4.0" - resolved "http://registry.npm.taobao.org/react/download/react-15.4.0.tgz#736c1c7c542e8088127106e1f450b010f86d172b" + version "15.4.1" + resolved "http://registry.npm.taobao.org/react/download/react-15.4.1.tgz#498e918602677a3983cd0fd206dfe700389a0dd6" dependencies: fbjs "^0.8.4" loose-envify "^1.1.0" @@ -4331,6 +4395,24 @@ readline2@^1.0.1: is-fullwidth-code-point "^1.0.0" mute-stream "0.0.5" +recharts: + version "0.19.0" + resolved "http://registry.npm.taobao.org/recharts/download/recharts-0.19.0.tgz#228ac3558a60c48a14f54f087baafdb5d856398a" + dependencies: + classnames "^2.2.5" + core-js "^2.4.1" + d3-scale "^1.0.3" + d3-shape "^1.0.3" + lodash "^4.16.4" + react-resize-detector "^0.3.3" + react-smooth "^0.1.15" + recharts-scale "^0.2.1" + reduce-css-calc "^1.3.0" + +recharts-scale@^0.2.1: + version "0.2.1" + resolved "http://registry.npm.taobao.org/recharts-scale/download/recharts-scale-0.2.1.tgz#378f543ed17c3245e4d9afb10aaf6298240d2fcb" + redbox-react@^1.2.10: version "1.3.3" resolved "http://registry.npm.taobao.org/redbox-react/download/redbox-react-1.3.3.tgz#63ec9c2cb9c620c46e2b9f8543b4898f1b787e41" @@ -4338,7 +4420,7 @@ redbox-react@^1.2.10: error-stack-parser "^1.3.6" object-assign "^4.0.1" -reduce-css-calc@^1.2.6, reduce-css-calc@^1.2.7: +reduce-css-calc@^1.2.6, reduce-css-calc@^1.2.7, reduce-css-calc@^1.3.0: version "1.3.0" resolved "http://registry.npm.taobao.org/reduce-css-calc/download/reduce-css-calc-1.3.0.tgz#747c914e049614a4c9cfbba629871ad1d2927716" dependencies: @@ -4347,10 +4429,10 @@ reduce-css-calc@^1.2.6, reduce-css-calc@^1.2.7: reduce-function-call "^1.0.1" reduce-function-call@^1.0.1: - version "1.0.1" - resolved "http://registry.npm.taobao.org/reduce-function-call/download/reduce-function-call-1.0.1.tgz#fa02e126e695824263cab91d3a5b0fdc1dd27a9a" + version "1.0.2" + resolved "http://registry.npm.taobao.org/reduce-function-call/download/reduce-function-call-1.0.2.tgz#5a200bf92e0e37751752fe45b0ab330fd4b6be99" dependencies: - balanced-match "~0.1.0" + balanced-match "^0.4.2" reduce-reducers@^0.1.0: version "0.1.2" @@ -4431,7 +4513,7 @@ repeating@^2.0.0: dependencies: is-finite "^1.0.0" -request@^2.51.0, request@^2.75.0: +request@^2.51.0, request@^2.79.0: version "2.79.0" resolved "http://registry.npm.taobao.org/request/download/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de" dependencies: @@ -4946,8 +5028,8 @@ util@~0.10.3, util@0.10.3: inherits "2.0.1" uuid@^3.0.0: - version "3.0.0" - resolved "http://registry.npm.taobao.org/uuid/download/uuid-3.0.0.tgz#6728fc0459c450d796a99c31837569bdf672d728" + version "3.0.1" + resolved "http://registry.npm.taobao.org/uuid/download/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1" vary@^1.0.0, vary@~1.1.0: version "1.1.0"