From 44037be44255db6f41d20a62a298088312dc23a1 Mon Sep 17 00:00:00 2001 From: zuiidea Date: Wed, 4 Jan 2017 10:33:55 +0800 Subject: [PATCH] antd upgrad --- package.json | 7 ++- src/components/layout/main.less | 30 +++++++++-- src/utils/index.js | 1 - yarn.lock | 92 +++++++++++++++++++++++---------- 4 files changed, 96 insertions(+), 34 deletions(-) diff --git a/package.json b/package.json index fd815fc..ca72a4f 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "index": "./src/index.js" }, "dependencies": { - "antd": "^2.5.0", + "antd": "^2.6.0", "classnames": "^2.2.5", "dva": "^1.1.0", "dva-loading": "^0.2.0", @@ -47,6 +47,9 @@ "theme": "./src/theme.js", "standard": { "parser": "babel-eslint", - "globals":["location","localStorage"] + "globals": [ + "location", + "localStorage" + ] } } diff --git a/src/components/layout/main.less b/src/components/layout/main.less index a90a037..123db11 100644 --- a/src/components/layout/main.less +++ b/src/components/layout/main.less @@ -61,7 +61,7 @@ .sider { width: 224px; - background: @heading-color; + background: #3e3e3e; position: absolute; overflow: visible; padding-bottom: 24px; @@ -69,6 +69,7 @@ transition: @transition-ease-out; box-shadow: @shadow-1; z-index: 1994; + color: #999; &.light { background: #fff; @@ -133,6 +134,11 @@ } :global { + .ant-menu-dark, + .ant-menu-dark .ant-menu-sub { + color: #999; + } + .ant-menu { transition: @transition-ease-out; @@ -215,11 +221,18 @@ } :global .ant-menu-dark { + color: #999; + background-color: #3e3e3e; + .ant-menu-submenu-title:hover, .ant-menu-submenu:hover { color: @primary-color; } + .ant-menu-sub { + color: #999; + } + .ant-menu-submenu-selected { color: @primary-color; @@ -228,7 +241,12 @@ } } - .ant-menu-item { + .ant-menu-item, + .ant-menu-submenu-title { + & > a { + color: #999; + } + &:hover > a { color: @primary-color; } @@ -260,12 +278,16 @@ :global .ant-popover-inner-content { padding: 0; - .ant-menu-inline .ant-menu-item, .ant-menu-vertical .ant-menu-item{ + + .ant-menu-inline .ant-menu-item, + .ant-menu-vertical .ant-menu-item { border-right: 0; height: 48px; line-height: 48px; } - .ant-menu-inline .ant-menu-selected, .ant-menu-inline .ant-menu-item-selected{ + + .ant-menu-inline .ant-menu-item-selected, + .ant-menu-inline .ant-menu-selected { border-right: 0; } } diff --git a/src/utils/index.js b/src/utils/index.js index ef1ec8c..075b5a1 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -2,7 +2,6 @@ import config from './config' import menu from './menu' import request from './request' import classnames from 'classnames' -import mockStorge from './mockStorge' import {color} from './theme' require('./mock.js') diff --git a/yarn.lock b/yarn.lock index 2f8d1bc..c89cf3c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -81,15 +81,15 @@ 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.5.0: - version "2.5.0" - resolved "http://registry.npm.taobao.org/antd/download/antd-2.5.0.tgz#9c2bd8750b49fdc2c164cb5d184fa6f2c9d6208f" +antd: + version "2.6.0" + resolved "http://registry.npm.taobao.org/antd/download/antd-2.6.0.tgz#44dd5d4854cb2a09e940b6ee0c47d3fd08806139" dependencies: array-tree-filter "~1.0.0" babel-runtime "6.x" classnames "~2.2.0" css-animation "^1.2.5" - moment "~2.15.1" + moment "~2.17.0" object-assign "~4.1.0" omit.js "^0.1.0" rc-animate "~2.3.0" @@ -100,8 +100,8 @@ antd@^2.5.0: rc-dialog "~6.5.0" rc-dropdown "~1.4.8" rc-editor-mention "~0.3.0" - rc-form "~1.0.0" - rc-input-number "~2.7.0" + rc-form "~1.1.0" + rc-input-number "~2.8.3" rc-menu "~5.0.1" rc-notification "~1.3.4" rc-pagination "~1.6.0" @@ -109,16 +109,16 @@ antd@^2.5.0: rc-radio "~2.0.0" rc-rate "~1.1.2" rc-select "~6.6.1" - rc-slider "~5.3.0" + rc-slider "~5.4.0" rc-steps "~2.2.0" rc-switch "~1.4.2" rc-table "~5.2.0" - rc-tabs "~7.0.5" + rc-tabs "~7.1.0" rc-time-picker "~2.2.1" rc-tooltip "~3.4.2" rc-tree "~1.4.0" rc-tree-select "~1.8.0" - rc-upload "~2.2.0" + rc-upload "~2.3.0" rc-util "^4.0.1" react-lazy-load "^3.0.10" react-slick "~0.14.2" @@ -2992,6 +2992,14 @@ lodash.findindex@^4.3.0: version "4.6.0" resolved "http://registry.npm.taobao.org/lodash.findindex/download/lodash.findindex-4.6.0.tgz#a3245dee61fb9b6e0624b535125624bb69c11106" +lodash.get@^4.4.2: + version "4.4.2" + resolved "http://registry.npm.taobao.org/lodash.get/download/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" + +lodash.has@^4.5.2: + version "4.5.2" + resolved "http://registry.npm.taobao.org/lodash.has/download/lodash.has-4.5.2.tgz#d19f4dc1095058cccbe2b0cdf4ee0fe4aa37c862" + lodash.indexof@^4.0.5: version "4.0.5" resolved "http://registry.npm.taobao.org/lodash.indexof/download/lodash.indexof-4.0.5.tgz#53714adc2cddd6ed87638f893aa9b6c24e31ef3c" @@ -3027,6 +3035,10 @@ lodash.pickby@^4.0.0: version "4.6.0" resolved "http://registry.npm.taobao.org/lodash.pickby/download/lodash.pickby-4.6.0.tgz#7dea21d8c18d7703a27c704c15d3b84a67e33aff" +lodash.set@^4.3.2: + version "4.3.2" + resolved "http://registry.npm.taobao.org/lodash.set/download/lodash.set-4.3.2.tgz#d8757b1da807dde24816b0d6a84bea1a76230b23" + lodash.throttle@^4.0.0: version "4.1.1" resolved "http://registry.npm.taobao.org/lodash.throttle/download/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4" @@ -3200,9 +3212,9 @@ mockjs@^1.0.1-beta3: dependencies: commander "*" -moment@~2.15.1: - version "2.15.2" - resolved "http://registry.npm.taobao.org/moment/download/moment-2.15.2.tgz#1bfdedf6a6e345f322fe956d5df5bd08a8ce84dc" +moment@~2.17.0: + version "2.17.1" + resolved "http://registry.npm.taobao.org/moment/download/moment-2.17.1.tgz#fed9506063f36b10f066c8b59a144d7faebe1d82" moment@2.x: version "2.17.0" @@ -4081,22 +4093,26 @@ rc-editor-plugin-image@0.0.3: rc-upload "^2.0.4" react-resizable "^1.4.2" -rc-form@~1.0.0: - version "1.0.1" - resolved "http://registry.npm.taobao.org/rc-form/download/rc-form-1.0.1.tgz#f1186a627895701c7ebfe0b5f8e4206246e132bc" +rc-form@~1.1.0: + version "1.1.0" + resolved "http://registry.npm.taobao.org/rc-form/download/rc-form-1.1.0.tgz#6815dc57bf2f02fda241fd4f9b9957c830261670" dependencies: async-validator "1.x" babel-runtime "6.x" dom-scroll-into-view "1.x" hoist-non-react-statics "1.x" + lodash.get "^4.4.2" + lodash.has "^4.5.2" + lodash.set "^4.3.2" warning "^3.0.0" -rc-input-number@~2.7.0: - version "2.7.8" - resolved "http://registry.npm.taobao.org/rc-input-number/download/rc-input-number-2.7.8.tgz#64b01756daa98fd3ec092d0a0a99ddc4a9f4514e" +rc-input-number@~2.8.3: + version "2.8.9" + resolved "http://registry.npm.taobao.org/rc-input-number/download/rc-input-number-2.8.9.tgz#8711e231c53c3bb9cf31af6c4d6b20eb03aa0f0e" dependencies: babel-runtime "6.x" classnames "^2.2.0" + rc-touchable "^1.0.0" rc-menu@~5.0.1, "rc-menu@5.x || 4.x": version "5.0.7" @@ -4148,14 +4164,14 @@ rc-select@~6.6.1: rc-util "3.x" warning "2.x" -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" +rc-slider@~5.4.0: + version "5.4.3" + resolved "http://registry.npm.taobao.org/rc-slider/download/rc-slider-5.4.3.tgz#b4b93181f57398112303404b16782443771b279d" dependencies: babel-runtime "6.x" classnames "^2.2.5" rc-tooltip "^3.4.2" - rc-util "^3.2.1" + rc-util "^4.0.0" warning "^3.0.0" rc-steps@~2.2.0: @@ -4178,9 +4194,9 @@ rc-table@~5.2.0: rc-util "3.x" shallowequal "^0.2.2" -rc-tabs@~7.0.5: - version "7.0.13" - resolved "http://registry.npm.taobao.org/rc-tabs/download/rc-tabs-7.0.13.tgz#b656b5812c452029701a99f5a54de67dcbfc9588" +rc-tabs@~7.1.0: + version "7.1.0" + resolved "http://registry.npm.taobao.org/rc-tabs/download/rc-tabs-7.1.0.tgz#e307b565d08c2f663b601686d2bb8b5030654fd8" dependencies: babel-runtime "6.x" classnames "2.x" @@ -4201,6 +4217,13 @@ rc-tooltip@^3.4.2, rc-tooltip@~3.4.2: dependencies: rc-trigger "1.x" +rc-touchable@^1.0.0: + version "1.0.8" + resolved "http://registry.npm.taobao.org/rc-touchable/download/rc-touchable-1.0.8.tgz#948455909b943a05dda83967322d59d5d45fb586" + dependencies: + babel-runtime "6.x" + object-assign "^4.1.0" + rc-tree-select@~1.8.0: version "1.8.6" resolved "http://registry.npm.taobao.org/rc-tree-select/download/rc-tree-select-1.8.6.tgz#f88d0148bfcbe1dc7b763fa3c9f55f6def9dc013" @@ -4229,7 +4252,7 @@ rc-trigger@^1.7.1, rc-trigger@1.x: rc-animate "2.x" rc-util "^3.3.x" -rc-upload@^2.0.4, rc-upload@~2.2.0: +rc-upload@^2.0.4: version "2.2.0" resolved "http://registry.npm.taobao.org/rc-upload/download/rc-upload-2.2.0.tgz#f22dd791acdc9a429bbec1223c9b4ea61c3ae6d6" dependencies: @@ -4237,7 +4260,15 @@ rc-upload@^2.0.4, rc-upload@~2.2.0: classnames "^2.2.5" warning "2.x" -rc-util@^3.1.2, rc-util@^3.2.1, rc-util@^3.3.x, rc-util@^3.4.1, rc-util@3.x: +rc-upload@~2.3.0: + version "2.3.2" + resolved "http://registry.npm.taobao.org/rc-upload/download/rc-upload-2.3.2.tgz#feeb7b84e45762a9c76523c94c960664ab0d6541" + dependencies: + babel-runtime "6.x" + classnames "^2.2.5" + warning "2.x" + +rc-util@^3.1.2, rc-util@^3.3.x, rc-util@^3.4.1, rc-util@3.x: version "3.4.1" resolved "http://registry.npm.taobao.org/rc-util/download/rc-util-3.4.1.tgz#4b7e0b0c7593bdbcff8ed045d88fbbc773a7b061" dependencies: @@ -4245,6 +4276,13 @@ rc-util@^3.1.2, rc-util@^3.2.1, rc-util@^3.3.x, rc-util@^3.4.1, rc-util@3.x: classnames "2.x" shallowequal "0.2.x" +rc-util@^4.0.0: + version "4.0.2" + resolved "http://registry.npm.taobao.org/rc-util/download/rc-util-4.0.2.tgz#5804f8b141a13c8c14d7c265a7d21d298195af46" + dependencies: + add-dom-event-listener "1.x" + shallowequal "^0.2.2" + rc-util@^4.0.1: version "4.0.1" resolved "http://registry.npm.taobao.org/rc-util/download/rc-util-4.0.1.tgz#9605c86a9768a9640268d4094e32b5b4ceeee228"