misc updates and fixes

examples/pages/template/index.tpl

@@ -245,6 +245,9 @@
       <div>
         <img class="jumbotron-plant-2" src="~examples/assets/images/plant-2.png" alt="">
         <img class="jumbotron-web" src="~examples/assets/images/web.png" alt="">
+        <img class="jumbotron-plant-1" src="~examples/assets/images/plant-1.png" alt="">
+        <img class="jumbotron-figure-1" src="~examples/assets/images/figure-1.png" alt="">
+        <img class="jumbotron-figure-2" src="~examples/assets/images/figure-2.png" alt="">
       </div>
       <div data-hover-layer="0">
         <img class="jumbotron-cloud-1" src="~examples/assets/images/cloud-1.png" alt="">
@@ -255,11 +258,6 @@
         <img class="jumbotron-compo-2" src="~examples/assets/images/compo-2.png" alt="">
         <img class="jumbotron-compo-3" src="~examples/assets/images/compo-3.png" alt="">
       </div>
-      <div data-hover-layer="2">
-        <img class="jumbotron-plant-1" src="~examples/assets/images/plant-1.png" alt="">
-        <img class="jumbotron-figure-1" src="~examples/assets/images/figure-1.png" alt="">
-        <img class="jumbotron-figure-2" src="~examples/assets/images/figure-2.png" alt="">
-      </div>
     </div>
     <div class="cards">
       <ul class="container">
@@ -309,17 +307,14 @@
   export default {
     mounted() {
       new Hover('.jumbotron', { // eslint-disable-line
-        max: 1,
+        max: 3,
         scale: 1,
         perspective: 700,
         layers: [{
           multiple: 0.01,
           reverseTranslate: true
         }, {
-          multiple: 0.04,
+          multiple: 0.02,
-          reverseTranslate: true
-        }, {
-          multiple: 0.015,
           reverseTranslate: true
         }]
       });

packages/date-picker/src/picker.vue

@@ -5,6 +5,7 @@
     :readonly="!editable || readonly"
     :disabled="disabled"
     :size="pickerSize"
+    :id="id"
     :name="name"
     v-if="!ranged"
     v-clickoutside="handleClose"
@@ -47,6 +48,7 @@
       :placeholder="startPlaceholder"
       :value="displayValue && displayValue[0]"
       :disabled="disabled"
+      :id="id && id[0]"
       :name="name && name[0]"
       @input="handleStartInput"
       @change="handleStartChange"
@@ -57,6 +59,7 @@
       :placeholder="endPlaceholder"
       :value="displayValue && displayValue[1]"
       :disabled="disabled"
+      :id="id && id[1]"
       :name="name && name[1]"
       @input="handleEndInput"
       @change="handleEndChange"
@@ -272,6 +275,16 @@ const isString = function(val) {
   return typeof val === 'string' || val instanceof String;
 };
 
+const validator = function(val) {
+  // either: String, Array of String, null / undefined
+  return (
+    val === null ||
+    val === undefined ||
+    isString(val) ||
+    (Array.isArray(val) && val.length === 2 && val.every(isString))
+  );
+};
+
 export default {
   mixins: [Emitter, NewPopper, Focus('reference')],
 
@@ -291,21 +304,17 @@ export default {
     endPlaceholder: String,
     name: {
       default: '',
-      validator(val) {
+      validator
-        // either: String, Array of String, null / undefined
-        return (
-          val === null ||
-          val === undefined ||
-          isString(val) ||
-          (Array.isArray(val) && val.length === 2 && val.every(isString))
-        );
-      }
     },
     disabled: Boolean,
     clearable: {
       type: Boolean,
       default: true
     },
+    id: {
+      default: '',
+      validator
+    },
     popperClass: String,
     editable: {
       type: Boolean,

packages/form/src/form-item.vue

@@ -163,6 +163,7 @@
     },
     methods: {
       validate(trigger, callback = noop) {
+        this.validateDisabled = false;
         var rules = this.getFilteredRule(trigger);
         if ((!rules || rules.length === 0) && !this._props.hasOwnProperty('required')) {
           callback();

packages/select/src/select.vue

@@ -49,6 +49,7 @@
       type="text"
       :placeholder="currentPlaceholder"
       :name="name"
+      :id="id"
       :size="selectSize"
       :disabled="disabled"
       :readonly="!filterable || multiple"
@@ -208,6 +209,7 @@
 
     props: {
       name: String,
+      id: String,
       value: {
         required: true
       },

types/index.d.ts

@@ -283,4 +283,4 @@ declare namespace ElementUI {
   export class Upload extends ElUpload {}
 }
 
-export = ElementUI
+export default ElementUI