@gm-mobile/c-react 3.9.6 → 3.9.7-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gm-mobile/c-react",
-  "version": "3.9.6",
+  "version": "3.9.7-beta.4",
   "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",
-    "@gm-mobile/c-tool": "^3.9.6",
-    "@gm-mobile/locales": "^3.9.6"
+    "@gm-mobile/c-font": "^3.9.7-beta.4",
+    "@gm-mobile/c-tool": "^3.9.7-beta.4",
+    "@gm-mobile/locales": "^3.9.7-beta.4"
   },
   "peerDependencies": {
     "@tarojs/components": "3.0.18",
@@ -33,5 +33,5 @@
     "prop-types": "^15.7.2",
     "react": "^16.13.1"
   },
-  "gitHead": "695c72ec31adad0a9a4f6d1253394491cc2fae83"
+  "gitHead": "4424cdf414312317331f3c649cc6e5902257d5fb"
 }

package/src/component/digital_keyboard/Base.tsx

@@ -14,6 +14,7 @@ export const defaultDigitalKeys = [
   ...['1', '2', '3'].map((v, _) => new DKBtn({ label: v })),
   ...['4', '5', '6'].map((v, _) => new DKBtn({ label: v })),
   ...['7', '8', '9'].map((v, _) => new DKBtn({ label: v })),
+  new DKBtn({ label: '0' }),
   new DKBtn({
     label: '.',
     fn: (value = '') => {
@@ -27,7 +28,6 @@ export const defaultDigitalKeys = [
       }
     },
   }),
-  new DKBtn({ label: '0' }),
   new DKBtn({ label: '清零', className: 'btn-clear', fn: (_) => '' }),
 ]
 
@@ -62,6 +62,7 @@ export interface KeyboardProps
   show?: boolean
   /** 整数类型键盘 */
   int?: boolean
+  isClearBtn?: boolean
 }
 
 export const Keyboard: FC<KeyboardProps> = ({
@@ -72,6 +73,7 @@ export const Keyboard: FC<KeyboardProps> = ({
   digitalKeys = defaultDigitalKeys,
   show = true,
   className,
+  isClearBtn = true,
   int,
   ...rest
 }) => {
@@ -104,27 +106,33 @@ export const Keyboard: FC<KeyboardProps> = ({
     >
       <Flex>
         <Flex flex={3} wrap>
-          {digitalKeys.map((btn, i) => {
-            return (
-              <Flex
-                key={i}
-                width='33.33333%'
-                alignCenter
-                justifyCenter
-                className='keyboard-item'
-              >
-                <View
-                  className={classNames(
-                    'keyboard-button digital m-text-22',
-                    btn.className
-                  )}
-                  onClick={() => handleInput(btn)}
+          {digitalKeys
+            .filter((f) => (isClearBtn ? f : f.label !== '清零'))
+            .map((btn, i) => {
+              return (
+                <Flex
+                  key={i}
+                  width={
+                    !isClearBtn && btn.label === '0'
+                      ? '66.666666%'
+                      : '33.33333%'
+                  }
+                  alignCenter
+                  justifyCenter
+                  className='keyboard-item'
                 >
-                  {btn.label}
-                </View>
-              </Flex>
-            )
-          })}
+                  <View
+                    className={classNames(
+                      'keyboard-button digital m-text-22',
+                      btn.className
+                    )}
+                    onClick={() => handleInput(btn)}
+                  >
+                    {btn.label}
+                  </View>
+                </Flex>
+              )
+            })}
         </Flex>
         <Flex flex={1} column>
           {actionKeys.map((btn, keyIndex) => {

package/src/component/digital_keyboard/base.less

@@ -14,7 +14,7 @@
   }
   .keyboard-item {
     padding: 3.5px;
-    height: 44px;
+    height: 60px;
     .keyboard-button {
       display: flex;
       font-family: DINPro-Medium, DINPro;
@@ -59,21 +59,19 @@
     .bt-delete {
       padding-right: 10px;
       .square {
-        width: 18px;
-        height: 18px;
+        width: 20px;
+        height: 20px;
         background: #000000;
         border-bottom-right-radius: 2px;
         border-top-right-radius: 2px;
-        border-top-left-radius: 3px;
-        border-bottom-left-radius: 3px;
+        padding-right: 2px;
       }
 
       .triangle {
         width: 0;
         height: 0;
-        border: 9px solid;
+        border: 10px solid;
         border-color: transparent #000000 transparent transparent;
-        margin-right: -2px;
       }
     }
   }