feat(numberkeyboard): harmony cpp adaption (#2799)

* feat(numberkeyboard): harmony cpp adaption * feat(numberkeyboard): harmony cpp adaption * fix: sth about re
jdf2e · Dec 11, 2024 · 8564857 · 8564857
1 parent e8fa0d4
commit 8564857
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 9 deletions.
diff --git a/src/config.json b/src/config.json
@@ -579,7 +579,7 @@
           "author": "oasis-cloud"
         },
         {
-          "version": "2.0.0",
+          "version": "3.0.0",
           "name": "NumberKeyboard",
           "type": "component",
           "cName": "数字键盘",

diff --git a/src/packages/numberkeyboard/demos/taro/demo4.tsx b/src/packages/numberkeyboard/demos/taro/demo4.tsx
@@ -1,5 +1,6 @@
 import React, { useState } from 'react'
 import { Cell, NumberKeyboard } from '@nutui/nutui-react-taro'
+import { View } from '@tarojs/components'
 
 const Demo4 = () => {
   const [visible, setVisible] = useState(false)
@@ -15,7 +16,7 @@ const Demo4 = () => {
       <NumberKeyboard
         visible={visible}
         title="标题"
-        rightActions={<span>Done</span>}
+        rightActions={<View>Done</View>}
         custom={['.']}
         onChange={onChange}
         onDelete={onDelete}

diff --git a/src/packages/numberkeyboard/numberkeyboard.scss b/src/packages/numberkeyboard/numberkeyboard.scss
@@ -19,12 +19,15 @@
     &-title {
       color: $color-title;
       display: inline-block;
+      font-size: $popup-title-font-size;
     }
 
     &-close {
       position: absolute;
       display: block;
       right: 0;
+      top: 50%;
+      transform: translateY(-50%);
       padding: $numberkeyboard-header-close-padding;
       color: $numberkeyboard-header-close-color;
       font-size: $numberkeyboard-header-close-font-size;
@@ -47,7 +50,12 @@
     &-wrapper {
       position: relative;
       flex: 1;
+      /* #ifdef harmony */
+      width: 33%;
+      /* #endif */
+      /* #ifndef harmony */
       flex-basis: 33%;
+      /* #endif */
       box-sizing: border-box;
       padding: 0 6px 6px 0;
       background-color: $numberkeyboard-wrapper-background-color;
@@ -76,9 +84,10 @@
   &-sidebar {
     display: flex;
     flex: 1;
+    flex-basis: 33%;
     flex-direction: column;
-
     .nut-numberkeyboard-body-wrapper {
+      width: 100%;
       .key {
         position: absolute;
         top: 0;

diff --git a/src/packages/numberkeyboard/numberkeyboard.taro.tsx b/src/packages/numberkeyboard/numberkeyboard.taro.tsx
@@ -6,6 +6,7 @@ import Popup from '@/packages/popup/index.taro'
 import { PopupProps } from '@/packages/popup/popup.taro'
 import { useConfig } from '@/packages/configprovider/configprovider.taro'
 import { ComponentDefaults } from '@/utils/typings'
+import { mergeProps } from '@/utils/merge-props'
 
 export interface NumberKeyboardProps extends PopupProps {
   visible: boolean
@@ -49,7 +50,7 @@ export const NumberKeyboard: FunctionComponent<
     onClose,
     onConfirm,
     ...rest
-  } = { ...defaultProps, ...props }
+  } = mergeProps(defaultProps, props)
   const classPrefix = 'nut-numberkeyboard'
 
   const getBasicKeys = () => {
@@ -86,8 +87,8 @@ export const NumberKeyboard: FunctionComponent<
     const style = {
       background: `url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAnCAYAAABJ0cukAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyFpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDE0IDc5LjE1MTQ4MSwgMjAxMy8wMy8xMy0xMjowOToxNSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIChXaW5kb3dzKSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDozOUNBQTQ0MkY3RTMxMUVBQjIzNEJCQkYxNDZGQjg5OCIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDozOUNBQTQ0M0Y3RTMxMUVBQjIzNEJCQkYxNDZGQjg5OCI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjM5Q0FBNDQwRjdFMzExRUFCMjM0QkJCRjE0NkZCODk4IiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjM5Q0FBNDQxRjdFMzExRUFCMjM0QkJCRjE0NkZCODk4Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+T12ahwAABClJREFUeNrUWVtIFFEY3pkdrbaCiAINK81VW3d2102pjKLtoXoJrNAswoeEXoyilx7sJXvIh6CHAoMg6yEfSpdECIqE0jCMbMm9qCVYUmR5S8huXmZO39nWOI7mzsy6uzqgM/vvzNnv+y/n/84ZjhBiWMwHF+kA+fn5y0ZHRzNwuTomgDnui9/vfzMvBJxWa7bE87W4tMbY8S8MhNz0BQLVugnY7fZdGORZPNNHJmSPUSf47QD/PN75z3NcpqD1IVEU8wC+dZojDIajyMu6WAG322zBmQf/7LzGnHeAdRtjmuAIKYoleMWxQnUEHA6HVZLldsb0m3oehdQQzzQSVILPJLIcYEw/4HkK/kG86yAsAZvNtgng3059hte/Gf56/uFCaGR8mIJdj3m2hzGNGAkpRM4vCPBzErBYLMko2A//DIQMoQ0WtgcCjWFnCVGswEzxCecqLc0y9Nyww2ariYhAbm7umgRB6GNM/QTgfT7fEzWD4t7dOK0D4TKAcrtcLkENeNx/gUoSpOnx4Gc9BHJyclZNjI8PMqY+judp2jSr1iuENDPi5fDX4WG32WxeogL81NGRIEk3NBNAh10uS9IIY/oIbxR6vd4WLXmJAq9Ayl1kTAUmk8mNyJrUgDfK8hFPV9dnTQSCHiLkO/Ndb8jzrXqKawYJQg4gsu6srKyV4cC/7ujo1CqneRSPxNh74PligPdE3PYVIDHuY6PRWCxPTp7VC35KSvwjwBpwdPP4gXYc86ZdZnr6Pf7S9HqexUs9z0qBLprz8wn+PzWRFknaKGsgjwlvCdLGH42GQ0lg+dqkMP+Enj+lF/yMWYgnJD1qEhhphOWgS2E2yQZDJWa/lEgIvGIa0D2HKJZGA7yiBgaZqO9AermdFstGXQR8fn+BootW4wfPRBE8zXmXoia2SYLgpsJRVwqBBJ2N+pnueRVhPR8l8MGCnaWw8wDCDSWQoasGQCKJnpjGcwkkKqMBfo7ZyQklQCOxWVcRg4QDXmhkSJRjsGvRAD8HCTuNhNPpXKtLzHn9/n0orBqm052GvL2lcfepTMs8PwsJqyRJRbrlNFpBCUBcYWaKE2h4tampqUtV6pP60HNtapuUksTY2NidiLcWUQPnMOhlxvQoITGxxOPxDIVdR2dnb/V2dr7Umn50/Q31261JC4UhUQYSVUxdtPCCUAK10RuvZeQ0LRQ2tD7fddxdyuT3TijJehATF/yinqmJ2wB+jCGRA11TH9xiXAwEQpG4i0gcZHLPjHSqF0Vx76IgEIpEA9a7+3H5K2RK4jnuPvTToXgR0LW9Htpap71iAzPVNsUIMH0XMdXkfLrfD9BdanifksiKW/5w3Emj3mcHBgb6kpKTn6KYzfBCehzg10H6lHPzMdIWq9U8znEpsXE6N4rTO9TjSGgPanG/pfwjwABn1PZcM5XI0AAAAABJRU5ErkJggg0KLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLTkwMjA5MzIyMjIxMzkzMzc2NzAwNjg0MC0tDQo=') no-repeat center`,
       backgroundSize: '100% 100%',
-      width: '28px',
-      height: '24px',
+      width: 28,
+      height: 24,
     }
     return <View style={style} />
   }
@@ -122,7 +123,7 @@ export const NumberKeyboard: FunctionComponent<
       switch (item.type) {
         case 'num':
         case 'custom':
-          return <View>{item.id}</View>
+          return <>{item.id}</>
         case 'delete':
           return <DeleteIcon />
         case 'close':
@@ -168,12 +169,12 @@ export const NumberKeyboard: FunctionComponent<
           <View className={`${classPrefix}-header`}>
             <View className={`${classPrefix}-header-title`}>{title}</View>
             {type === 'default' && (
-              <span
+              <View
                 className={`${classPrefix}-header-close`}
                 onClick={onConfirm}
               >
                 {rightActions || locale.done}
-              </span>
+              </View>
             )}
           </View>
         )}