fixed iview#528

AshitaKaze · Mar 29, 2017 · 7b7178f · 7b7178f
1 parent f7674b5
commit 7b7178f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,7 @@
 *.bak
 .DS_Store
 node_modules/
+node_modules2/
 .project
 .settings
 npm-debug.log

diff --git a/examples/routers/date.vue b/examples/routers/date.vue
@@ -1,7 +1,7 @@
 <template>
     <div>
         {{ val1 }}
-        <Date-picker v-model="val1" type="daterange" placeholder="选择日期" style="width: 200px"></Date-picker>
+        <Date-picker v-model="val1" type="date" placeholder="选择日期" style="width: 200px"></Date-picker>
         <div @click="val1 = '2017-03-02'">change</div>
     </div>
 </template>

diff --git a/src/components/date-picker/picker.vue b/src/components/date-picker/picker.vue
@@ -359,8 +359,11 @@
                 this.showClose = false;
             },
             handleIconClick () {
-                if (!this.showClose) return;
-                this.handleClear();
+                if (this.showClose) {
+                    this.handleClear();
+                } else {
+                    this.handleFocus();
+                }
             },
             handleClear () {
                 this.visible = false;