@gm-mobile/c-react 3.9.6-beta.2 → 3.9.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gm-mobile/c-react",
-  "version": "3.9.6-beta.2",
+  "version": "3.9.6",
   "description": "> TODO: description",
   "author": "liyatang <liyatang@qq.com>",
   "homepage": "https://github.com/gmfe/gm-mobile#readme",
@@ -21,9 +21,9 @@
     "url": "https://github.com/gmfe/gm-mobile/issues"
   },
   "dependencies": {
-    "@gm-mobile/c-font": "^3.9.6-beta.2",
-    "@gm-mobile/c-tool": "^3.9.6-beta.2",
-    "@gm-mobile/locales": "^3.9.6-beta.2"
+    "@gm-mobile/c-font": "^3.9.6",
+    "@gm-mobile/c-tool": "^3.9.6",
+    "@gm-mobile/locales": "^3.9.6"
   },
   "peerDependencies": {
     "@tarojs/components": "3.0.18",
@@ -33,5 +33,5 @@
     "prop-types": "^15.7.2",
     "react": "^16.13.1"
   },
-  "gitHead": "6017ff553c0db37b691ec6bcfc00c226b96ecf48"
+  "gitHead": "695c72ec31adad0a9a4f6d1253394491cc2fae83"
 }

package/src/component/digital_keyboard/Base.tsx

@@ -11,10 +11,9 @@ import { Flex } from '../flex'
 
 /** 数字按钮 */
 export const defaultDigitalKeys = [
-  ...['7', '8', '9'].map((v, _) => new DKBtn({ label: v })),
-  ...['4', '5', '6'].map((v, _) => new DKBtn({ label: v })),
   ...['1', '2', '3'].map((v, _) => new DKBtn({ label: v })),
-  new DKBtn({ label: '0' }),
+  ...['4', '5', '6'].map((v, _) => new DKBtn({ label: v })),
+  ...['7', '8', '9'].map((v, _) => new DKBtn({ label: v })),
   new DKBtn({
     label: '.',
     fn: (value = '') => {
@@ -28,13 +27,8 @@ export const defaultDigitalKeys = [
       }
     },
   }),
-  new DKBtn({
-    className: 'iconfont icon-backspace',
-    fn: (value) => {
-      if (value.length === 0) return value
-      return value.slice(0, value.length - 1)
-    },
-  }),
+  new DKBtn({ label: '0' }),
+  new DKBtn({ label: '清零', className: 'btn-clear', fn: (_) => '' }),
 ]
 
 /** 右侧功能按钮  */
@@ -121,7 +115,7 @@ export const Keyboard: FC<KeyboardProps> = ({
               >
                 <View
                   className={classNames(
-                    'keyboard-button digital m-text-20',
+                    'keyboard-button digital m-text-22',
                     btn.className
                   )}
                   onClick={() => handleInput(btn)}
@@ -150,7 +144,20 @@ export const Keyboard: FC<KeyboardProps> = ({
                   )}
                   onClick={() => handleInput(btn)}
                 >
-                  {btn.label}
+                  {btn.label ? (
+                    btn.label
+                  ) : (
+                    <Flex alignCenter justifyCenter className='bt-delete'>
+                      <View className='triangle' />
+                      <Flex
+                        alignCenter
+                        justifyCenter
+                        className='m-text-14 m-text-white square'
+                      >
+                        x
+                      </Flex>
+                    </Flex>
+                  )}
                 </View>
               </Flex>
             )

package/src/component/digital_keyboard/base.less

@@ -1,5 +1,5 @@
 .keyboard {
-  @background: darken(white, 3);
+  @background: darken(white, 8);
   @btn: white;
   @text: black;
   background-color: @background;
@@ -13,17 +13,18 @@
     top: 0;
   }
   .keyboard-item {
-    padding: 3px;
-    height: 60px;
+    padding: 3.5px;
+    height: 44px;
     .keyboard-button {
       display: flex;
+      font-family: DINPro-Medium, DINPro;
       justify-content: center;
       align-items: center;
       width: 100%;
       height: 100%;
       color: @text;
-      // font-weight: bold;
-      border-radius: 5px;
+      font-weight: bold;
+      border-radius: 4px;
       background-color: @btn;
       overflow: hidden;
       cursor: pointer;
@@ -45,5 +46,35 @@
         }
       }
     }
+
+    .btn-ok {
+      background-color: #06C160;
+    }
+
+    .btn-clear {
+      font-size: 15px !important;
+      font-weight: 500;
+    }
+
+    .bt-delete {
+      padding-right: 10px;
+      .square {
+        width: 18px;
+        height: 18px;
+        background: #000000;
+        border-bottom-right-radius: 2px;
+        border-top-right-radius: 2px;
+        border-top-left-radius: 3px;
+        border-bottom-left-radius: 3px;
+      }
+
+      .triangle {
+        width: 0;
+        height: 0;
+        border: 9px solid;
+        border-color: transparent #000000 transparent transparent;
+        margin-right: -2px;
+      }
+    }
   }
 }

package/src/component/digital_keyboard/index.tsx

@@ -165,19 +165,26 @@ export class DigitalKeyboard {
   /** 自定义功能按钮 */
   get actionKeys() {
     return [
-      new DKBtn({ label: '清零', fn: (_) => '' }),
+      new DKBtn({
+        label: '',
+        // className: 'iconfont icon-backspace m-text-26',
+        fn: (value) => {
+          if (value.length === 0) return value
+          return value.slice(0, value.length - 1)
+        },
+      }),
       new DKBtn({
         label: '下一个',
-        className: 'm-bg-primary m-text-white',
+        className: 'm-text-black btn-clear',
         fn: (value) => {
           this.next()
           return this.form[this.active]
         },
       }),
       new DKBtn({
-        label: '确认',
+        label: '确定',
         flex: 2,
-        className: 'm-bg-primary m-text-white',
+        className: 'btn-ok m-text-white',
         fn: (value) => {
           return this.form[this.active]
         },