Merge 1.x-stable

components/menu/style/index.less

@@ -219,6 +219,13 @@
     }
   }
 
+  &-vertical &-submenu-selected {
+    color: @primary-color;
+    > a {
+      color: @primary-color;
+    }
+  }
+
   &-horizontal {
     border: 0;
     border-bottom: 1px solid @border-color-split;
@@ -347,6 +354,7 @@
   &-dark &-item:hover,
   &-dark &-item-active,
   &-dark &-submenu-active,
+  &-dark &-submenu-selected,
   &-dark &-submenu:hover,
   &-dark &-submenu-title:hover {
     background-color: transparent;

components/tree-select/demo/checkable.md

@@ -17,10 +17,6 @@ const treeData = [{
     label: '子节点一',
     value: '0-0-0',
     key: '0-0-0',
-  }, {
-    label: '子节点二',
-    value: '0-0-1',
-    key: '0-0-1',
   }],
 }, {
   label: '节点二',
@@ -34,6 +30,10 @@ const treeData = [{
     label: '子节点四',
     value: '0-1-1',
     key: '0-1-1',
+  }, {
+    label: '子节点五',
+    value: '0-1-2',
+    key: '0-1-2',
   }],
 }];
 

components/tree-select/index.md

@@ -39,7 +39,7 @@ english: TreeSelect
 | filterTreeNode | 是否根据输入项进行筛选，默认用 treeNodeFilterProp 的值作为要筛选的 TreeNode 的属性值 | bool/Function(inputValue:string, treeNode:TreeNode) (函数需要返回bool值) | Function |
 | treeNodeFilterProp | 输入项过滤对应的 treeNode 属性 | String | 'value' |
 | treeNodeLabelProp | 作为显示的prop设置 | String | 'title' |
-| treeData | treeNodes数据，如果设置则不需要手动构造TreeNode节点（value在整个树范围内唯一）| array<{value, label, children, [disabled]}> | [] |
+| treeData | treeNodes数据，如果设置则不需要手动构造TreeNode节点（value在整个树范围内唯一）| array<{value, label, children, [disabled,selectable]}> | [] |
 |treeDataSimpleMode | 使用简单格式的treeData，具体设置参考可设置的类型 (此时treeData应变为这样的数据结构: [{"id":1, "pId":0, "label":"test1"},...], `pId`是父节点的id) | bool/object{id:'id', pId:'pId', rootPId:null} | false |
 | loadData | 异步加载数据 | function(node) | - |
 

package.json

@@ -50,7 +50,7 @@
     "rc-editor-mention": "~0.1.10",
     "rc-form": "~0.17.1",
     "rc-input-number": "~2.5.14",
-    "rc-menu": "~4.12.4",
+    "rc-menu": "~4.13.0",
     "rc-notification": "~1.3.4",
     "rc-pagination": "~1.5.3",
     "rc-progress": "~1.0.4",
@@ -66,7 +66,7 @@
     "rc-time-picker": "~1.1.6",
     "rc-tooltip": "~3.4.2",
     "rc-tree": "~1.3.6",
-    "rc-tree-select": "~1.7.8",
+    "rc-tree-select": "~1.7.9",
     "rc-upload": "~1.13.3",
     "rc-util": "~3.3.0",
     "react-addons-pure-render-mixin": "^15.0.0",
@@ -80,7 +80,7 @@
     "babel-jest": "^13.2.2",
     "babel-plugin-antd": "^0.4.0",
     "bisheng": "^0.7.1",
-    "bisheng-plugin-antd": "0.1.0",
+    "bisheng-plugin-antd": "~0.1.3",
     "bisheng-plugin-description": "^0.1.1",
     "bisheng-plugin-react": "^0.2.0",
     "bisheng-plugin-toc": "0.2.0",
@@ -91,11 +91,11 @@
     "eslint-config-airbnb": "^9.0.1",
     "eslint-plugin-babel": "^3.0.0",
     "eslint-plugin-import": "^1.6.1",
-    "eslint-plugin-jsx-a11y": "^1.0.4",
+    "eslint-plugin-jsx-a11y": "^2.0.1",
     "eslint-plugin-markdown": "*",
     "eslint-plugin-react": "^5.0.1",
     "eslint-tinker": "^0.3.1",
-    "history": "^2.0.1",
+    "history": "^3.0.0",
     "intl": "^1.2.2",
     "intl-locales-supported": "^1.0.0",
     "jest-cli": "^13.2.3",

site/bisheng.config.js

@@ -22,6 +22,7 @@ module.exports = {
   },
   webpackConfig(config) {
     config.resolve.alias = {
+      'antd/lib': path.join(process.cwd(), 'components'),
       antd: process.cwd(),
       site: path.join(process.cwd(), 'site'),
     };