diff --git a/components/form/demo/disabled.md b/components/form/demo/disabled.md index 58d34df96f..50adec7677 100644 --- a/components/form/demo/disabled.md +++ b/components/form/demo/disabled.md @@ -1,6 +1,6 @@ # 禁用状态 -- order: 3 +- order: 2 1) 单独为输入框设置 `disabled` 属性； diff --git a/components/form/demo/form-controls.md b/components/form/demo/form-controls.md index af5180ff05..669f184654 100644 --- a/components/form/demo/form-controls.md +++ b/components/form/demo/form-controls.md @@ -1,6 +1,6 @@ # 表单控件 -- order: 2 +- order: 3 展示所有支持的表单控件。 diff --git a/components/form/demo/horizontal-form.md b/components/form/demo/horizontal-form.md index 97a9674caa..afd6ab79a4 100644 --- a/components/form/demo/horizontal-form.md +++ b/components/form/demo/horizontal-form.md @@ -44,6 +44,7 @@ React.render(
+

随便写点什么

diff --git a/components/form/demo/inputs.md b/components/form/demo/inputs.md index 0e52f181c6..01ea963afa 100644 --- a/components/form/demo/inputs.md +++ b/components/form/demo/inputs.md @@ -2,79 +2,99 @@ - order: 5 - -带标签的输入框：使用 `.ant-input-group` 类并结合 `.ant-input-group-addon` `.ant-input-group-btn` 类可以创建带标签、按钮的 Input 输入框。 +带标签的输入框：使用 `.ant-input-group` 类并结合 `.ant-input-group-addon` 类可以创建带标签的输入框。 输入框组合：`.ant-inputs` 类由多个 `.ant-inputs-item` 组成，使多个 Input 可以在一行显示出来。 --- -````html -
-
- -
-
- Http:// - +````jsx +var Select = antd.Select; +var Option = Select.Option; + +React.render( + +
+ +
+
+ Http:// + +
+
+
+
+ +
+
+ Http:// + + .com
-
- -
-
- Http:// - - .com +
+ +
+
+ +
+ +
-
- -
-
-
- +
+ +
+
+
+
-
- +
+
-
- +
+
-
- +
+
-
- -
-
-
- +
+ +
+
+
+
-
-

--

+
+

--

-
-
-
- +
+
+
+
-
- +
+
-
- +
+
-

请输入正确的电话号码

+

请输入正确的电话号码

+, document.getElementById('components-form-demo-inputs')); ```` diff --git a/components/form/demo/mix.md b/components/form/demo/mix.md index 2f4f25ed8c..82a683061c 100644 --- a/components/form/demo/mix.md +++ b/components/form/demo/mix.md @@ -79,21 +79,6 @@ React.render(
-
- -
-
- -
- - - -
-
-
-
diff --git a/index.js b/index.js index 0f19ad41a0..78dad62408 100644 --- a/index.js +++ b/index.js @@ -29,7 +29,3 @@ var antd = { module.exports = antd; antd.version = require('./package.json').version; - -if (typeof window !== undefined) { - window.antd = antd; -} diff --git a/style/components/form.less b/style/components/form.less index eb5fb85333..670014211c 100644 --- a/style/components/form.less +++ b/style/components/form.less @@ -34,7 +34,7 @@ label { //== Style for input-group: input with label, with button or dropdown... .@{css-prefix}input-group { - .input-group(~"@{css-prefix}input"; @btnClass) + .input-group(~"@{css-prefix}input"); } // Radio && Checkbox @@ -122,11 +122,43 @@ form { } .@{css-prefix}input, .@{css-prefix}input-group .@{css-prefix}input, - .@{css-prefix}input-group .@{css-prefix}input-group-addon, - .@{css-prefix}input-group .@{css-prefix}input-group-btn .@{btnClass} { + .@{css-prefix}input-group .@{css-prefix}input-group-addon { height: @input-height-lg; font-size: @font-size-base; - padding: @input-padding-horizontal; + padding: 6px 7px; + } + + // Input combined with select + .@{css-prefix}input-group { + .@{selectPrefixCls}-selection { + border-bottom-left-radius: 0; + border-top-left-radius: 0; + &:hover { + border-color: #d9d9d9; + } + } + + .@{selectPrefixCls}-selection--single { + margin-left: -1px; + height: @input-height-lg; + background-color: #eee; + .@{selectPrefixCls}-selection__rendered { + padding-left: 8px; + padding-right: 25px; + line-height: 32px; + } + } + .@{selectPrefixCls}-arrow { + right: 8px; + height: 32px; + line-height: 32px; + width: auto; + } + + .@{selectPrefixCls}-open .@{selectPrefixCls}-selection { + border-color: #d9d9d9; + box-shadow: none; + } } // input[type=file] diff --git a/style/components/inputNumber.less b/style/components/inputNumber.less index 05d7e6c5fa..f03bcf1627 100644 --- a/style/components/inputNumber.less +++ b/style/components/inputNumber.less @@ -109,7 +109,7 @@ .handler-disabled() { opacity: 0.72; - color: #ccc; + color: #ccc!important; cursor: default; &:hover { color: #ccc; diff --git a/style/mixins/input.less b/style/mixins/input.less index 4f3168a7ab..f68fcedffe 100644 --- a/style/mixins/input.less +++ b/style/mixins/input.less @@ -99,7 +99,7 @@ } // label input -.input-group(@inputClass; @btnclass) { +.input-group(@inputClass) { position: relative; display: table; border-collapse: separate; @@ -116,7 +116,7 @@ } &-addon, - &-btn, + &-wrap, > .@{inputClass} { display: table-cell; @@ -126,7 +126,7 @@ } &-addon, - &-btn { + &-wrap { width: 1%; white-space: nowrap; vertical-align: middle; @@ -152,24 +152,6 @@ border-radius: @border-radius-base; } - .@{btnclass} { - border-radius: @border-radius-base; - .button-variant(@input-color; #eee; @input-border-color); - margin-left: -1px; - - &:hover { - .button-color(@input-color; tint(#eee, 20%); @input-border-color); - } - &:active, &.active { - .button-color(@input-color; shade(#eee, 5%); @input-border-color); - } - - .@{iconfont-css-prefix} { - line-height: 1; - margin-left: 8px; - } - } - // Reset rounded corners > .@{inputClass}:first-child, &-addon:first-child { @@ -185,26 +167,19 @@ } > .@{inputClass}:last-child, - &-addon:last-child, - &-btn .@{btnclass}{ + &-addon:last-child { border-bottom-left-radius: 0; border-top-left-radius: 0; } // Sizing options &-lg .@{inputClass}, - &-lg > &-addon, - &-lg > &-btn .@{btnclass} { + &-lg > &-addon { .input-lg(); } &-sm .@{inputClass}, - &-sm > &-addon, - &-sm > &-btn .@{btnclass} { + &-sm > &-addon { .input-sm(); } - - &-sm > &-btn .@{btnclass} { - margin-top: ~"-2px \9"; - } } diff --git a/webpack.config.js b/webpack.config.js index 29c71c8a91..0ea83f06af 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -17,12 +17,24 @@ module.exports = { output: { path: path.join(process.cwd(), 'dist'), - filename: '[name].js' + filename: '[name].js', + library: 'antd', + libraryTarget: 'umd' }, externals: { - react: "React", - jquery:"jQuery" + 'react': { + root: 'React', + commonjs2: 'react', + commonjs: 'react', + amd: 'react' + }, + 'jquery': { + root: 'jQuery', + commonjs2: 'jquery', + commonjs: 'jquery', + amd: 'jquery' + } }, module: {