瀏覽代碼

DatePicker: fix editable and readonly in range pick

Leopoldthecoder 7 年之前
父節點
當前提交
343e9fa438
共有 4 個文件被更改,包括 35 次插入44 次删除
  1. 1 1
      examples/docs/en-US/upload.md
  2. 1 1
      examples/docs/zh-CN/upload.md
  3. 2 0
      packages/date-picker/src/picker.vue
  4. 31 42
      test/unit/specs/popover.spec.js

+ 1 - 1
examples/docs/en-US/upload.md

@@ -247,7 +247,7 @@ Use `list-type` to change the fileList style.
   :on-remove="handleRemove">
   <i class="el-icon-plus"></i>
 </el-upload>
-<el-dialog v-model="dialogVisible" size="tiny">
+<el-dialog :visible.sync="dialogVisible" size="tiny">
   <img width="100%" :src="dialogImageUrl" alt="">
 </el-dialog>
 <script>

+ 1 - 1
examples/docs/zh-CN/upload.md

@@ -247,7 +247,7 @@
   :on-remove="handleRemove">
   <i class="el-icon-plus"></i>
 </el-upload>
-<el-dialog v-model="dialogVisible" size="tiny">
+<el-dialog :visible.sync="dialogVisible" size="tiny">
   <img width="100%" :src="dialogImageUrl" alt="">
 </el-dialog>
 <script>

+ 2 - 0
packages/date-picker/src/picker.vue

@@ -49,6 +49,7 @@
       :value="displayValue && displayValue[0]"
       :disabled="disabled"
       :id="id && id[0]"
+      :readonly="!editable || readonly"
       :name="name && name[0]"
       @input="handleStartInput"
       @change="handleStartChange"
@@ -60,6 +61,7 @@
       :value="displayValue && displayValue[1]"
       :disabled="disabled"
       :id="id && id[1]"
+      :readonly="!editable || readonly"
       :name="name && name[1]"
       @input="handleEndInput"
       @change="handleEndChange"

+ 31 - 42
test/unit/specs/popover.spec.js

@@ -205,57 +205,46 @@ describe('Popover', () => {
     });
   });
 
-  describe('event', (done) => {
-    const createVM = (trigger) => {
-      return createVue({
-        template: `
-          <div>
-            <el-popover
-              ref="popover"
-              trigger="${trigger}"
-              @show="handleShow"
-              @hide="handleHide"
-              content="content">
-              <button slot="reference">trigger ${trigger}</button>
-            </el-popover>
-          </div>
-        `,
+  it('show/hide events', done => {
+    vm = createVue({
+      template: `
+        <div>
+          <el-popover
+            ref="popover"
+            trigger="click"
+            @show="handleShow"
+            @hide="handleHide"
+            content="content">
+            <button slot="reference">trigger</button>
+          </el-popover>
+        </div>
+      `,
 
-        methods: {
-          handleShow() {
-            this.trigger = true;
-          },
-          handleHide() {
-            this.trigger = false;
-          }
+      methods: {
+        handleShow() {
+          this.trigger = true;
         },
-
-        data() {
-          return {
-            trigger: false
-          };
+        handleHide() {
+          this.trigger = false;
         }
-      }, true);
-    };
+      },
 
-    it('show/hide', () => {
-      vm = createVM('click');
-      const compo = vm.$refs.popover;
+      data() {
+        return {
+          trigger: false
+        };
+      }
+    }, true);
 
-      vm.$el.querySelector('button').click();
-      expect(compo.showPopper).to.true;
-      expect(vm.trigger).to.false;
+    vm.$el.querySelector('button').click();
+    setTimeout(_ => {
+      expect(vm.trigger).to.true;
       document.body.click();
-      expect(compo.showPopper).to.false;
       setTimeout(_ => {
-        expect(vm.trigger).to.true;
-        document.body.click();
-        setTimeout(_ => {
-          expect(vm.trigger).to.false;
-        }, 50);
+        expect(vm.trigger).to.false;
         done();
       }, 50);
-    });
+    }, 50);
   });
 
   it('destroy event', () => {