Merge branch '2.0' of https://github.com/iview/iview into iview-2.0

build/webpack.dev.config.js

@@ -27,7 +27,7 @@ module.exports = merge(webpackBaseConfig, {
     resolve: {
         alias: {
             iview: '../../src/index',
-            // vue: 'vue/dist/vue.js'
+            // vue: 'vue/dist/vue.esm.js'
             vue: 'vue/dist/vue.runtime.js'
         }
     },

examples/routers/date.vue

@@ -1,5 +1,5 @@
 <template>
-    <Date-picker type="daterange" placeholder="选择日期" style="width: 200px"></Date-picker>
+    <Date-picker type="daterange" placeholder="选择日期" disabled style="width: 200px"></Date-picker>
 </template>
 <script>
     export default {

examples/routers/poptip.vue

@@ -1,32 +1,12 @@
 <template>
-    <div style="margin: 100px;">
-        <Poptip
-                confirm
-                title="您确认删除这条内容吗？"
-                @on-ok="ok"
-                @on-cancel="cancel">
-            <Button>删除</Button>
-        </Poptip>
-        <Poptip
-                confirm
-                title="Are you sure delete this task?"
-                @on-ok="ok"
-                @on-cancel="cancel"
-                ok-text="yes"
-                cancel-text="no">
-            <Button>国际化</Button>
+    <div>
+        <Poptip trigger="focus" title="提示标题" content="提示内容">
+            <i-input placeholder="输入框的 focus"></i-input>
         </Poptip>
     </div>
 </template>
 <script>
     export default {
-        methods: {
-            ok () {
-                this.$Message.info('点击了确定');
-            },
-            cancel () {
-                this.$Message.info('点击了取消');
-            }
-        }
+
     }
 </script>

package.json

@@ -88,13 +88,13 @@
     "sinon-chai": "^2.8.0",
     "style-loader": "^0.13.1",
     "url-loader": "^0.5.7",
-    "vue": "^2.2.1",
+    "vue": "^2.3.3",
     "vue-hot-reload-api": "^1.3.3",
     "vue-html-loader": "^1.2.3",
     "vue-loader": "^11.0.0",
     "vue-router": "^2.2.1",
     "vue-style-loader": "^1.0.0",
-    "vue-template-compiler": "^2.2.1",
+    "vue-template-compiler": "^2.3.3",
     "webpack": "^2.2.1",
     "webpack-dev-server": "^2.4.1",
     "webpack-merge": "^3.0.0"

src/components/date-picker/picker.vue

@@ -362,7 +362,7 @@
             handleIconClick () {
                 if (this.showClose) {
                     this.handleClear();
-                } else {
+                } else if (!this.disabled) {
                     this.handleFocus();
                 }
             },

src/components/poptip/poptip.vue

@@ -198,12 +198,14 @@
             }
             // if trigger and children is input or textarea,listen focus & blur event
             if (this.trigger === 'focus') {
-                const $children = this.getInputChildren();
-                if ($children) {
-                    $children.addEventListener('focus', this.handleFocus, false);
-                    $children.addEventListener('blur', this.handleBlur, false);
-                    this.isInput = true;
-                }
+                this.isInput = true;
+                this.$nextTick(() => {
+                    const $children = this.getInputChildren();
+                    if ($children) {
+                        $children.addEventListener('focus', this.handleFocus, false);
+                        $children.addEventListener('blur', this.handleBlur, false);
+                    }
+                });
             }
         },
         beforeDestroy () {