Leopoldthecoder 7 жил өмнө
parent
commit
917b8e78f2

+ 1 - 0
examples/docs/en-US/message-box.md

@@ -393,6 +393,7 @@ The corresponding methods are: `MessageBox`, `MessageBox.alert`, `MessageBox.con
 | closeOnHashChange | whether to close MessageBox when hash changes | boolean | — | true |
 | showInput | whether to show an input | boolean | — | false (true when called with prompt) |
 | inputPlaceholder | placeholder of input | string | — | — |
+| inputType | type of input | string | — | text |
 | inputValue | initial value of input | string | — | — |
 | inputPattern | regexp for the input | regexp | — | — |
 | inputValidator | validation function for the input. Should returns a boolean or string. If a string is returned, it will be assigned to inputErrorMessage | function | — | — |

+ 1 - 0
examples/docs/zh-CN/message-box.md

@@ -391,6 +391,7 @@ import { MessageBox } from 'element-ui';
 | closeOnHashChange | 是否在 hashchange 时关闭 MessageBox | boolean | — | true |
 | showInput | 是否显示输入框 | boolean | — | false(以 prompt 方式调用时为 true)|
 | inputPlaceholder | 输入框的占位符 | string | — | — |
+| inputType | 输入框的类型 | string | — | text |
 | inputValue | 输入框的初始文本 | string | — | — |
 | inputPattern | 输入框的校验表达式 | regexp | — | — |
 | inputValidator | 输入框的校验函数。可以返回布尔值或字符串,若返回一个字符串, 则返回结果会被赋值给 inputErrorMessage | function | — | — |

+ 1 - 1
package.json

@@ -25,7 +25,7 @@
     "dist:all": "node build/bin/build-all.js && npm run build:theme",
     "i18n": "node build/bin/i18n.js",
     "lint": "eslint src/**/* test/**/* packages/**/*.{js,vue} build/**/* --quiet",
-    "pub": "npm run bootstrap && sh build/git-release.sh && sh build/release.sh",
+    "pub": "npm run bootstrap && sh build/git-release.sh && sh build/release.sh && node build/bin/gen-indices.js",
     "pub:all": "npm run dist:all && lerna publish --skip-git && git commit -am 'publish independent packages' && git push eleme dev",
     "test": "npm run lint && npm run build:theme && cross-env CI_ENV=/dev/ karma start test/unit/karma.conf.js --single-run",
     "test:watch": "npm run build:theme && karma start test/unit/karma.conf.js"

+ 9 - 4
packages/date-picker/src/panel/date-range.vue

@@ -204,7 +204,7 @@
     } else if (defaultValue) {
       return [new Date(defaultValue), advanceDate(defaultValue, 24 * 60 * 60 * 1000)];
     } else {
-      return [new Date(), advanceDate(Date.now, 24 * 60 * 60 * 1000)];
+      return [new Date(), advanceDate(Date.now(), 24 * 60 * 60 * 1000)];
     }
   };
 
@@ -378,7 +378,9 @@
           //       should allow them to be set individually in the future
           if (this.minDate) {
             this.leftDate = this.minDate;
-            this.rightDate = nextMonth(this.leftDate);
+            this.rightDate = this.unlinkPanels && this.maxDate
+              ? this.maxDate
+              : nextMonth(this.leftDate);
           } else {
             this.leftDate = calcDefaultValue(this.defaultValue)[0];
             this.rightDate = nextMonth(this.leftDate);
@@ -388,8 +390,11 @@
 
       defaultValue(val) {
         if (!Array.isArray(this.value)) {
-          this.leftDate = calcDefaultValue(val)[0];
-          this.rightDate = nextMonth(this.leftDate);
+          const [left, right] = calcDefaultValue(val);
+          this.leftDate = left;
+          this.rightDate = val && val[1] && this.unlinkPanels
+            ? right
+            : nextMonth(this.leftDate);
         }
       }
     },

+ 1 - 0
packages/message-box/src/main.js

@@ -11,6 +11,7 @@ const defaults = {
   closeOnHashChange: true,
   inputValue: null,
   inputPlaceholder: '',
+  inputType: 'text',
   inputPattern: null,
   inputValidator: null,
   inputErrorMessage: '',

+ 2 - 0
packages/message-box/src/main.vue

@@ -36,6 +36,7 @@
           <div class="el-message-box__input" v-show="showInput">
             <el-input
               v-model="inputValue"
+              :type="inputType"
               @compositionstart.native="handleComposition"
               @compositionupdate.native="handleComposition"
               @compositionend.native="handleComposition"
@@ -307,6 +308,7 @@
         showInput: false,
         inputValue: null,
         inputPlaceholder: '',
+        inputType: 'text',
         inputPattern: null,
         inputValidator: null,
         inputErrorMessage: '',

+ 2 - 2
packages/theme-chalk/src/autocomplete.scss

@@ -20,7 +20,7 @@
 
   @include e(wrap) {
     max-height: 280px;
-    padding: 6px 0;
+    padding: 10px 0;
     box-sizing: border-box;
     overflow: auto;
     background-color: $--color-white;
@@ -36,7 +36,7 @@
   & li {
     padding: 0 20px;
     margin: 0;
-    line-height: 33px;
+    line-height: 34px;
     cursor: pointer;
     color: $--color-text-regular;
     font-size: $--font-size-base;

+ 1 - 1
packages/theme-chalk/src/common/var.scss

@@ -102,7 +102,7 @@ $--index-popper: 2000;
 -------------------------- */
 $--disabled-fill-base: $--background-color-base;
 $--disabled-color-base: $--color-text-placeholder;
-$--disabled-border-base: $--border-color-lighter;
+$--disabled-border-base: $--border-color-light;
 
 /* Icon
 -------------------------- */

+ 2 - 1
packages/theme-chalk/src/date-picker/date-picker.scss

@@ -58,7 +58,8 @@
   }
 
   @include e(header-label) {
-    font-size: 14px;
+    font-size: 16px;
+    font-weight: 500;
     padding: 0 5px;
     line-height: 22px;
     text-align: center;

+ 2 - 1
packages/theme-chalk/src/date-picker/date-range-picker.scss

@@ -34,7 +34,8 @@
     }
 
     div {
-      font-size: 14px;
+      font-size: 16px;
+      font-weight: 500;
       margin-right: 50px;
     }
   }

+ 1 - 0
packages/theme-chalk/src/dropdown.scss

@@ -60,6 +60,7 @@
   margin: 5px 0;
   background-color: $--color-white;
   border: 1px solid $--border-color-lighter;
+  border-radius: $--border-radius-base;
   box-shadow: $--dropdown-menu-box-shadow;
 
   @include e(item) {

+ 1 - 0
packages/theme-chalk/src/input-number.scss

@@ -15,6 +15,7 @@
       -webkit-appearance: none;
       padding-left: #{$--input-height + 10};
       padding-right: #{$--input-height + 10};
+      text-align: center;
     }
   }
 

+ 1 - 1
packages/theme-chalk/src/input.scss

@@ -239,7 +239,7 @@
   @include e(inner) {
     display: block;
     resize: vertical;
-    padding: 5px 7px;
+    padding: 5px 15px;
     line-height: 1.5;
     box-sizing: border-box;
     width: 100%;

+ 4 - 3
packages/theme-chalk/src/option.scss

@@ -4,14 +4,14 @@
 @include b(select-dropdown) {
   @include e(item) {
     font-size: $--select-font-size;
-    padding: 7px 20px;
+    padding: 0 20px;
     position: relative;
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
     color: $--select-option-color;
     height: $--select-option-height;
-    line-height: 1.5;
+    line-height: $--select-option-height;
     box-sizing: border-box;
     cursor: pointer;
 
@@ -30,10 +30,11 @@
 
     &.selected {
       color: $--select-option-selected;
+      font-weight: bold;
     }
 
     & span {
-      line-height: 1.5 !important;
+      line-height: 34px !important;
     }
   }
 }

+ 1 - 1
packages/theme-chalk/src/progress.scss

@@ -90,7 +90,7 @@
   @include e(outer) {
     height: 6px;
     border-radius: 100px;
-    background-color: $--border-color-light;
+    background-color: $--border-color-lighter;
     overflow: hidden;
     position: relative;
     vertical-align: middle;

+ 1 - 1
packages/theme-chalk/src/step.scss

@@ -118,7 +118,7 @@
   }
 
   @include e(title) {
-    font-size: 15px;
+    font-size: 16px;
     line-height: 38px;
 
     @include when(process) {

+ 1 - 8
packages/theme-chalk/src/switch.scss

@@ -88,14 +88,7 @@
   }
 
   @include when(disabled) {
-    .el-switch__core {
-      border-color: $--switch-disabled-color !important;
-      background: $--switch-disabled-color !important;
-    }
-
-    .el-switch__label * {
-      color: $--switch-disabled-text-color !important;
-    }
+    opacity: 0.6;
   }
 
   @include m(wide) {

+ 1 - 0
packages/theme-chalk/src/transfer.scss

@@ -134,6 +134,7 @@
     .el-input__inner {
       height: $--transfer-filter-height;
       width: 100%;
+      font-size: 12px;
       display: inline-block;
       box-sizing: border-box;
       border-radius: #{$--transfer-filter-height / 2};