From 53e64d229fef3095cb98cc18119596749d82e9bd Mon Sep 17 00:00:00 2001 From: neverland Date: Thu, 9 Jul 2020 14:39:07 +0800 Subject: [PATCH 01/14] fix(Field): can't display six characters in iOS (#6743) --- src/field/README.md | 2 +- src/field/README.zh-CN.md | 2 +- src/form/README.md | 2 +- src/form/README.zh-CN.md | 2 +- src/style/var.less | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/field/README.md b/src/field/README.md index a6850bbe1..5986afd9f 100644 --- a/src/field/README.md +++ b/src/field/README.md @@ -243,7 +243,7 @@ Use `input-align` prop to align the input value. | format-trigger `v2.8.7` | When to format value，can be set to `onBlur` | _string_ | `onChange` | | arrow-direction `v2.0.4` | Can be set to `left` `up` `down` | _string_ | `right` | | label-class | Label className | _any_ | - | -| label-width | Label width | _number \| string_ | `6em` | +| label-width | Label width | _number \| string_ | `6.2em` | | label-align | Label align, can be set to `center` `right` | _string_ | `left` | | input-align | Input align, can be set to `center` `right` | _string_ | `left` | | error-message-align | Error message align, can be set to `center` `right` | _string_ | `left` | diff --git a/src/field/README.zh-CN.md b/src/field/README.zh-CN.md index c2ec8df32..2f5516bd8 100644 --- a/src/field/README.zh-CN.md +++ b/src/field/README.zh-CN.md @@ -268,7 +268,7 @@ export default { | format-trigger `v2.8.7` | 格式化函数触发的时机，可选值为 `onBlur` | _string_ | `onChange` | | arrow-direction `v2.0.4` | 箭头方向，可选值为 `left` `up` `down` | _string_ | `right` | | label-class | 左侧文本额外类名 | _any_ | - | -| label-width | 左侧文本宽度，默认单位为`px` | _number \| string_ | `6em` | +| label-width | 左侧文本宽度，默认单位为`px` | _number \| string_ | `6.2em` | | label-align | 左侧文本对齐方式，可选值为 `center` `right` | _string_ | `left` | | input-align | 输入框对齐方式，可选值为 `center` `right` | _string_ | `left` | | error-message-align | 错误提示文案对齐方式，可选值为 `center` `right` | _string_ | `left` | diff --git a/src/form/README.md b/src/form/README.md index 4cfeb15fc..84727dae7 100644 --- a/src/form/README.md +++ b/src/form/README.md @@ -424,7 +424,7 @@ export default { | Attribute | Description | Type | Default | | --- | --- | --- | --- | -| label-width | Field label width | _number \| string_ | `6em` | +| label-width | Field label width | _number \| string_ | `6.2em` | | label-align | Field label align, can be set to `center` `right` | _string_ | `left` | | input-align | Field input align, can be set to `center` `right` | _string_ | `left` | | error-message-align | Error message align, can be set to `center` `right` | _string_ | `left` | diff --git a/src/form/README.zh-CN.md b/src/form/README.zh-CN.md index e6e326a5c..f9fd463b9 100644 --- a/src/form/README.zh-CN.md +++ b/src/form/README.zh-CN.md @@ -459,7 +459,7 @@ export default { | 参数 | 说明 | 类型 | 默认值 | | --- | --- | --- | --- | -| label-width | 表单项 label 宽度，默认单位为`px` | _number \| string_ | `6em` | +| label-width | 表单项 label 宽度，默认单位为`px` | _number \| string_ | `6.2em` | | label-align |  表单项 label 对齐方式，可选值为 `center` `right` | _string_ | `left` | | input-align | 输入框对齐方式，可选值为 `center` `right` | _string_ | `left` | | error-message-align | 错误提示文案对齐方式，可选值为 `center` `right` | _string_ | `left` | diff --git a/src/style/var.less b/src/style/var.less index 4ddc2770a..e0df055d9 100644 --- a/src/style/var.less +++ b/src/style/var.less @@ -343,7 +343,7 @@ @empty-bottom-margin-top: 24px; // Field -@field-label-width: 6em; +@field-label-width: 6.2em; @field-label-color: @gray-7; @field-label-margin-right: @padding-sm; @field-input-text-color: @text-color; From 1824389276b887044c7337adb7985c86bcc19c64 Mon Sep 17 00:00:00 2001 From: neverland Date: Fri, 10 Jul 2020 10:47:24 +0800 Subject: [PATCH 02/14] style(Uploader): remove round border radius (#6748) --- src/style/var.less | 1 - src/uploader/index.less | 4 ---- 2 files changed, 5 deletions(-) diff --git a/src/style/var.less b/src/style/var.less index e0df055d9..aad337538 100644 --- a/src/style/var.less +++ b/src/style/var.less @@ -812,7 +812,6 @@ @uploader-icon-color: @gray-4; @uploader-text-color: @gray-6; @uploader-text-font-size: @font-size-sm; -@uploader-upload-border-radius: 8px; @uploader-upload-background-color: @gray-1; @uploader-upload-active-color: @active-color; @uploader-delete-color: @gray-6; diff --git a/src/uploader/index.less b/src/uploader/index.less index 230486207..bffa9589d 100644 --- a/src/uploader/index.less +++ b/src/uploader/index.less @@ -43,7 +43,6 @@ height: @uploader-size; margin: 0 @padding-xs @padding-xs 0; background-color: @uploader-upload-background-color; - border-radius: @uploader-upload-border-radius; &:active { background-color: @uploader-upload-active-color; @@ -71,7 +70,6 @@ width: @uploader-size; height: @uploader-size; overflow: hidden; - border-radius: @uploader-upload-border-radius; } &-delete { @@ -105,7 +103,6 @@ justify-content: center; color: @white; background-color: @uploader-mask-background-color; - border-radius: @uploader-upload-border-radius; &-icon { font-size: @uploader-mask-icon-size; @@ -133,7 +130,6 @@ width: @uploader-size; height: @uploader-size; background-color: @uploader-file-background-color; - border-radius: @uploader-upload-border-radius; &-icon { color: @uploader-file-icon-color; From c5d860df4b39fbc1bf132b5bc163eef8b1625ff6 Mon Sep 17 00:00:00 2001 From: Aaron Date: Fri, 10 Jul 2020 21:18:17 +0800 Subject: [PATCH 03/14] feat(PasswordInput): add focus item className (#6739) --- src/password-input/index.tsx | 5 ++- .../test/__snapshots__/demo.spec.js.snap | 44 +++++++++---------- 2 files changed, 26 insertions(+), 23 deletions(-) diff --git a/src/password-input/index.tsx b/src/password-input/index.tsx index b40c19cf5..4b1258f06 100644 --- a/src/password-input/index.tsx +++ b/src/password-input/index.tsx @@ -40,7 +40,10 @@ function PasswordInput( } Points.push( -
  • +
  • {mask ? ( ) : ( diff --git a/src/password-input/test/__snapshots__/demo.spec.js.snap b/src/password-input/test/__snapshots__/demo.spec.js.snap index cc1a24920..52ca0fd65 100644 --- a/src/password-input/test/__snapshots__/demo.spec.js.snap +++ b/src/password-input/test/__snapshots__/demo.spec.js.snap @@ -5,14 +5,14 @@ exports[`renders demo correctly 1`] = `
      -
      • -
      • -
      • -
    • +
      • +
      • +
      • +
      • -
      • -
      • +
      • +
    密码为 6 位数字
    @@ -42,34 +42,34 @@ exports[`renders demo correctly 1`] = `
      -
      • -
      • -
      • -
      • +
      • +
      • +
      • +
      -
    • 1
      • -
    • 2
      • -
    • 3
      • -
    • -
    • -
    • +
    • 1
      • +
    • 2
      • +
    • 3
      • +
    • +
    • +
      -
      • -
      • -
      • -
      • -
      • -
      • +
      • +
      • +
      • +
      • +
      • +
    From 16e9829173f077477b175fec5da9578009f327db Mon Sep 17 00:00:00 2001 From: neverland Date: Sat, 11 Jul 2020 10:03:59 +0800 Subject: [PATCH 04/14] style(ActionSheet): subname vertical align (#6756) --- src/action-sheet/README.md | 2 +- src/action-sheet/README.zh-CN.md | 2 +- src/action-sheet/demo/index.vue | 4 ++-- src/action-sheet/index.less | 9 +++++---- src/action-sheet/index.tsx | 2 +- src/action-sheet/test/__snapshots__/index.spec.js.snap | 3 ++- src/style/var.less | 3 ++- 7 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/action-sheet/README.md b/src/action-sheet/README.md index a79ac6ccc..819482acd 100644 --- a/src/action-sheet/README.md +++ b/src/action-sheet/README.md @@ -121,7 +121,7 @@ export default { return { show: false, actions: [ - { name: 'Colored Option', color: '#07c160' }, + { name: 'Colored Option', color: '#ee0a24' }, { name: 'Disabled Option', disabled: true }, { name: 'Loading Option', loading: true }, ], diff --git a/src/action-sheet/README.zh-CN.md b/src/action-sheet/README.zh-CN.md index 0993e4e71..afd55d34b 100644 --- a/src/action-sheet/README.zh-CN.md +++ b/src/action-sheet/README.zh-CN.md @@ -125,7 +125,7 @@ export default { return { show: false, actions: [ - { name: '着色选项', color: '#07c160' }, + { name: '着色选项', color: '#ee0a24' }, { name: '禁用选项', disabled: true }, { name: '加载选项', loading: true }, ], diff --git a/src/action-sheet/demo/index.vue b/src/action-sheet/demo/index.vue index e909e348f..758420870 100644 --- a/src/action-sheet/demo/index.vue +++ b/src/action-sheet/demo/index.vue @@ -58,7 +58,7 @@