Merge branch 'dev'

didi · Aug 26, 2022 · fea5f17 · fea5f17
2 parents da61c1c + d9e2643
commit fea5f17
Show file tree

Hide file tree

Showing 37 changed files with 354 additions and 125 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,11 +3,29 @@ title: 更新日志
 toc: hidden
 ---
 
+### 2.6.0
+
+`2022-08-26`
+
+- Design
+  - 🍭金融设计规范更新
+    - 更新主题色，[详情](https://github.com/didi/mand-mobile/pull/755/files#diff-dafec5882d1f310bec1be2ca7fb586a99589509362a07d650e827813eee6136a)
+    - `Toast` 背景色由半透明改为不透明
+    - `Button` 圆角由 `4px` 修改为 `16px`
+    - `Icon` 更新图标整体视觉效果
+
+- Feature
+    - `Toast`
+      -  增加方形样式组件
+    - `NumberKeyboard`
+      - 增加禁用键盘选项
+      - 增加 `00` 按键选项
+
 ### 2.5.20
 
 `2021-07-22`
 
-- Feat
+- Feature
   - 添加更多的国际化支持
 
 ### 2.5.19
@@ -31,7 +49,7 @@ toc: hidden
 
 `2021-03-02`
 
-- Feat
+- Feature
   - 添加国际化支持
 
 ### 2.5.16
@@ -52,7 +70,7 @@ toc: hidden
 
 `2021-01-15`
 
-- Feat
+- Feature
   - `Dialog`使用静态方法时支持传入`transition`[#716](https://github.com/didi/mand-mobile/issues/716)
 - Fix
   - 修复`Tip`组件子组件属性为空时导致报错
@@ -62,7 +80,7 @@ toc: hidden
 
 `2020-09-17`
 
-- Feat
+- Feature
   - `TextareaItem`支持格式化[#699](https://github.com/didi/mand-mobile/issues/699)
 
 - Fix
@@ -97,7 +115,7 @@ toc: hidden
 
 `2020-03-26`
 
-- Feat
+- Feature
   - `CheckGroup`增加方法`toggleAll`用于全选/全不选和反选[#648](https://github.com/didi/mand-mobile/issues/648)
 
 - Fix
@@ -107,7 +125,7 @@ toc: hidden
 
 `2020-02-04`
 
-- Feat
+- Feature
   - `Captcha`增加属性`auto-send`，用于控制验证码弹窗第一次展示时是否自动触发`send`事件
   - `ResultPage`属性增加动态变更响应
 
@@ -123,7 +141,7 @@ toc: hidden
 
 `2019-12-26`
 
-- Feat
+- Feature
   - `Landscape`增加属性`transition`，用于自定义展示动效
 
 - Fix
@@ -150,7 +168,7 @@ toc: hidden
 
 `2019-11-02`
 
-- Feat
+- Feature
   - `ScrollView`增加方法`getOffsets`，用于获取当前滚动距离
 
 - Fix
@@ -163,7 +181,7 @@ toc: hidden
 
 `2019-10-11`
 
-- Feat
+- Feature
   - `TextareaItem`增加属性`clearable`[#589](https://github.com/didi/mand-mobile/issues/589)
 
 - Fix
@@ -174,7 +192,7 @@ toc: hidden
 
 `2019-09-20`
 
-- Feat
+- Feature
   - `Picker`和`DatePicker`增加属性`keep-index`，用于设置当列数据发生变更时，保持上次停留位置
 
 - Fix
@@ -186,7 +204,7 @@ toc: hidden
 
 `2019-09-04`
 
-- Feat
+- Feature
   - 增加部分全局[reset样式](https://github.com/didi/mand-mobile/pull/539/files)
   - 新增组件`Skeleton`
   - 新增组件`TextareaItem`

diff --git a/components/_style/mixin/theme.basic.styl b/components/_style/mixin/theme.basic.styl
@@ -41,6 +41,7 @@ font-weight-semibold = 600
 
 /// Radius Size
 radius-normal = 16px
+radius-medium = 24px
 radius-circle = 50%
 
 /// Border Size

diff --git a/components/_style/mixin/theme.components.styl b/components/_style/mixin/theme.components.styl
@@ -214,7 +214,7 @@ icon-size-xs = 20px
 icon-size-sm = 24px
 icon-size-md = 32px
 icon-size-lg = 42px
-icon-font-family = url("https://manhattan.didistatic.com/static/manhattan/mand-mobile/icon/2.1.0/iconfont.woff") format("woff"), url("https://manhattan.didistatic.com/static/manhattan/mand-mobile/icon/2.1.0/iconfont.ttf") format("truetype")
+icon-font-family = url("https://manhattan.didistatic.com/static/manhattan/mand-mobile-iconfont.2.6.0.woff") format("woff"), url("https://manhattan.didistatic.com/static/manhattan/mand-mobile-iconfont.2.6.0.ttf") format("truetype")
 
 /// image-viewer
 image-viewer-index-font-size = 32px
@@ -402,11 +402,10 @@ tip-shadow = 0 5px 20px rgba(0, 0, 0, .08)
 tip-zindex = 1303
 
 /// toast
-toast-fill = rgba(65, 72, 93, .77)
+toast-fill = #4B5265
 toast-font-size = font-body-large
 toast-color = #fff
 toast-radius = radius-normal
-toast-padding = 20px 30px
+toast-radius-medium = radius-medium
+toast-padding = 20px 32px
 toast-zindex = 1700
-
-
diff --git a/components/_style/mixin/theme.variable.styl b/components/_style/mixin/theme.variable.styl
@@ -35,6 +35,7 @@ font-weight-normal = var(--font-weight-normal)
 font-weight-medium = var(--font-weight-medium)
 font-weight-semibold = var(--font-weight-semibold)
 radius-normal = var(--radius-normal)
+radius-medium = var(--radius-medium)
 radius-circle = var(--radius-circle)
 border-width-base = var(--border-width-base)
 h-gap-xs = var(--h-gap-xs)
@@ -371,5 +372,6 @@ toast-fill = var(--toast-fill)
 toast-font-size = var(--toast-font-size)
 toast-color = var(--toast-color)
 toast-radius = var(--toast-radius)
+toast-radius-medium = var(--toast-radius-medium)
 toast-padding = var(--toast-padding)
 toast-zindex = var(--toast-zindex)
diff --git a/components/action-sheet/index.js b/components/action-sheet/index.js
@@ -1,5 +1,5 @@
 import Vue from 'vue'
-import ActionSheet from './action-sheet.vue'
+import ActionSheet from './action-sheet'
 
 const noop = function() {}
 

diff --git a/components/agree/README.en-US.md b/components/agree/README.en-US.md
@@ -24,7 +24,7 @@ Vue.component(Agree.name, Agree)
 | v-model | checked | Boolean | `false` |-|
 | disabled | - | Boolean | `false` |-|
 | size | size of icon | String | `md` | refer to `Icon` for optional values |
-
+| iconType | select Icon | String | `circle` | optional value `circle` or `square` |
 #### Agree Instance Events
 
 ##### @change(name, checked)

diff --git a/components/agree/README.md b/components/agree/README.md
@@ -24,6 +24,7 @@ Vue.component(Agree.name, Agree)
 |v-model|是否选中|Boolean|`false`|-|
 |disabled|是否禁用|Boolean|`false`|-|
 |size|按钮大小|String|`md`|可选值参考组件`Icon`|
+|iconType|选中图标|string|`circle`|可选值`circle` ｜ `square`|
 
 #### Agree Events
 

diff --git a/components/agree/demo/cases/demo0.vue b/components/agree/demo/cases/demo0.vue
@@ -4,6 +4,7 @@
       v-model="agreeConf.checked"
       :disabled="agreeConf.disabled"
       :size="agreeConf.size"
+      icon-type="square"
       @change="onChange(agreeConf.name, agreeConf.checked, $event)"
     >
       本人承诺投保人已充分了解本保险产品，并保证投保信息的真实性，理解并同意<a>《投保须知》</a>, <a>《保险条款》</a>

diff --git a/components/agree/index.vue b/components/agree/index.vue
@@ -12,8 +12,14 @@
       @click="$_onChange($event)">
       <div class="md-agree-icon-container">
         <slot name="icon" :checked="value">
-          <md-icon name="checked" :size="size"></md-icon>
-          <md-icon name="check" :size="size"></md-icon>
+          <span v-if="iconType === 'square'">
+            <md-icon name="square-checked" :size="size"></md-icon>
+            <md-icon name="square-check" :size="size"></md-icon>
+          </span>
+          <span v-else>
+            <md-icon name="checked" :size="size"></md-icon>
+            <md-icon name="check" :size="size"></md-icon>
+          </span>
         </slot>
       </div>
     </div>
@@ -44,6 +50,10 @@ export default {
       type: String,
       default: 'md',
     },
+    iconType: {
+      type: String,
+      default: 'circle',
+    },
   },
 
   data() {
@@ -89,20 +99,20 @@ export default {
       height auto
       line-height 1
       will-change auto
-      &.md-icon-checked
+      &.md-icon-checked,&.md-icon-square-checked
         position absolute
         top 0
         left 0
         transform scale(0.6)
         color transparent
         transition all .3s ease-in-out-quint
-      &.md-icon-check
+      &.md-icon-check,&.md-icon-square-check
         color agree-fill
   &.checked .md-agree-icon-container
-    .md-icon-checked
+    .md-icon-checked,.md-icon-square-checked
       transform scale(1)
       color agree-fill
-    .md-icon-check
+    .md-icon-check,.md-icon-square-check
       opacity 0.8
 
 .md-agree-content

diff --git a/components/agree/test/__snapshots__/demo.spec.js.snap b/components/agree/test/__snapshots__/demo.spec.js.snap
@@ -4,7 +4,7 @@ exports[`Agree - Demo Disabled selected 1`] = `
 <div class="md-example-child md-example-child-agree md-example-child-2">
   <div class="md-agree disabled">
     <div class="md-agree-icon checked">
-      <div class="md-agree-icon-container"><i class="md-icon icon-font md-icon-checked checked md" style="color:;"></i> <i class="md-icon icon-font md-icon-check check md" style="color:;"></i></div>
+      <div class="md-agree-icon-container"><span><i class="md-icon icon-font md-icon-checked checked md" style="color:;"></i> <i class="md-icon icon-font md-icon-check check md" style="color:;"></i></span></div>
     </div>
     <div class="md-agree-content">
       本人承诺投保人已充分了解本保险产品，并保证投保信息的真实性，理解并同意
@@ -17,7 +17,7 @@ exports[`Agree - Demo Disabled unselected 1`] = `
 <div class="md-example-child md-example-child-agree md-example-child-3">
   <div class="md-agree disabled">
     <div class="md-agree-icon">
-      <div class="md-agree-icon-container"><i class="md-icon icon-font md-icon-checked checked md" style="color:;"></i> <i class="md-icon icon-font md-icon-check check md" style="color:;"></i></div>
+      <div class="md-agree-icon-container"><span><i class="md-icon icon-font md-icon-checked checked md" style="color:;"></i> <i class="md-icon icon-font md-icon-check check md" style="color:;"></i></span></div>
     </div>
     <div class="md-agree-content">
       本人承诺投保人已充分了解本保险产品，并保证投保信息的真实性，理解并同意
@@ -30,7 +30,7 @@ exports[`Agree - Demo Selected 1`] = `
 <div class="md-example-child md-example-child-agree md-example-child-0">
   <div class="md-agree">
     <div class="md-agree-icon checked">
-      <div class="md-agree-icon-container"><i class="md-icon icon-font md-icon-checked checked md" style="color:;"></i> <i class="md-icon icon-font md-icon-check check md" style="color:;"></i></div>
+      <div class="md-agree-icon-container"><span><i class="md-icon icon-font md-icon-checked checked md" style="color:;"></i> <i class="md-icon icon-font md-icon-check check md" style="color:;"></i></span></div>
     </div>
     <div class="md-agree-content">
       本人承诺投保人已充分了解本保险产品，并保证投保信息的真实性，理解并同意<a>《投保须知》</a>, <a>《保险条款》</a></div>
@@ -42,7 +42,7 @@ exports[`Agree - Demo Unselected 1`] = `
 <div class="md-example-child md-example-child-agree md-example-child-1">
   <div class="md-agree">
     <div class="md-agree-icon">
-      <div class="md-agree-icon-container"><i class="md-icon icon-font md-icon-checked checked md" style="color:;"></i> <i class="md-icon icon-font md-icon-check check md" style="color:;"></i></div>
+      <div class="md-agree-icon-container"><span><i class="md-icon icon-font md-icon-checked checked md" style="color:;"></i> <i class="md-icon icon-font md-icon-check check md" style="color:;"></i></span></div>
     </div>
     <div class="md-agree-content">
       本人承诺投保人已充分了解本保险产品，并保证投保信息的真实性，理解并同意

diff --git a/components/date-picker/test/__snapshots__/demo.spec.js.snap b/components/date-picker/test/__snapshots__/demo.spec.js.snap
@@ -224,6 +224,7 @@ exports[`DatePicker - Demo Date & Time selection 1`] = `
               <li class="column-item" style="height: 45px; line-height: 45px;">2039年</li>
               <li class="column-item" style="height: 45px; line-height: 45px;">2040年</li>
               <li class="column-item" style="height: 45px; line-height: 45px;">2041年</li>
+              <li class="column-item" style="height: 45px; line-height: 45px;">2042年</li>
             </ul>
           </div>
           <div class="md-picker-column-item">

diff --git a/components/dialog/index.js b/components/dialog/index.js
@@ -1,6 +1,6 @@
 import Vue from 'vue'
 import {t} from '../_locale'
-import Dialog from './dialog.vue'
+import Dialog from './dialog'
 
 /* istanbul ignore next */
 const noop = function() {}

diff --git a/components/icon/demo/cases/demo0.vue b/components/icon/demo/cases/demo0.vue
@@ -30,6 +30,8 @@ export default {
   data() {
     return {
       iconList: [
+        'square-checked',
+        'square-check',
         'rectangle',
         'right',
         'wrong',

diff --git a/components/icon/iconfont.ttf b/components/icon/iconfont.ttf
diff --git a/components/icon/iconfont.woff b/components/icon/iconfont.woff
diff --git a/components/icon/index.vue b/components/icon/index.vue
@@ -219,7 +219,10 @@ export default {
   content "\e634"
 .md-icon-close:before
   content "\e68c"
-
+.md-icon-square-check:before
+  content "\e695"
+.md-icon-square-checked:before
+  content "\e696"
 @font-face
   font-family Mand-Mobile-Icon
   font-style normal

diff --git a/components/icon/selection.json b/components/icon/selection.json
@@ -1556,6 +1556,34 @@
       "setIdx": 0,
       "setId": 4,
       "iconIdx": 53
+    },
+    {
+      "icon": {
+        "paths": [
+          "M854.624 214.624l-45.248-45.248-297.376 297.376-297.376-297.376-45.248 45.248 297.376 297.376-297.376 297.376 45.248 45.248 297.376-297.376 297.376 297.376 45.248-45.248-297.376-297.376z"
+        ],
+        "isMulticolor": false,
+        "isMulticolor2": false,
+        "tags": ["square-checked"],
+        "defaultCode": 59030,
+        "grid": 16,
+        "attrs": [],
+        "colorPermutations": {
+          "21822122812552552551": [],
+          "25525525516572931": []
+        }
+      },
+      "properties": {
+        "id": 4,
+        "order": 120,
+        "ligatures": "square-checked",
+        "prevSize": 32,
+        "code": 59030,
+        "name": "square-checked"
+      },
+      "setIdx": 0,
+      "setId": 4,
+      "iconIdx": 54
     }
   ],
   "height": 1024,

diff --git a/components/number-keyboard/README.en-US.md b/components/number-keyboard/README.en-US.md
@@ -28,6 +28,8 @@ Vue.component(NumberKeyboard.name, NumberKeyboard)
 |is-hide-confirm|automatically hide the keyboard when confirming|Boolean|`true`| -|
 |text-render|customize value of specified key|Function(value: string): string|-|replaceable key `0,1,...9,.`|
 |ok-text|text of confirmation key|String|`confirm`|-|
+|disabled <sup class="version-after">2.6.0+|to disable the keyboard|Boolean|`false`|-|
+|duplicate-zero <sup class="version-after">2.6.0+</sup>|show `00` key|Boolean|`false`|This props is valid only when `type` is `professional` |
 
 #### NumberKeyboard Slots
 

diff --git a/components/number-keyboard/README.md b/components/number-keyboard/README.md
@@ -28,6 +28,8 @@ Vue.component(NumberKeyboard.name, NumberKeyboard)
 |is-hide-confirm|确认时自动隐藏键盘|Boolean|`true`| -|
 |text-render|自定义指定按键的值|Function(value: string): string|-|可替换键`0,1,...9,.`|
 |ok-text|键盘确认键文案|String|`确认`|-|
+|disabled <sup class="version-after">2.6.0+</sup>|禁用键盘|Boolean|`false`|-|
+|duplicate-zero <sup class="version-after">2.6.0+</sup>|展示 `00` 按键|Boolean|`false`|仅 `type` 为 `professional`模式下生效|
 
 #### NumberKeyboard Slots