From 61c768fa919dd95eac250d496b5f9d36a1ddbf62 Mon Sep 17 00:00:00 2001
From: eiinu <eiinu@qq.com>
Date: Tue, 7 May 2024 14:47:33 +0800
Subject: [PATCH] =?UTF-8?q?feat(number-keyboard):=20=E6=96=B0=E5=A2=9E=20c?=
 =?UTF-8?q?onfirm=20=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../__VUE/numberkeyboard/doc.en-US.md         |  1 +
 src/packages/__VUE/numberkeyboard/doc.md      |  1 +
 src/packages/__VUE/numberkeyboard/doc.taro.md |  1 +
 .../__VUE/numberkeyboard/index.taro.vue       | 82 ++++++++-----------
 src/packages/__VUE/numberkeyboard/index.vue   | 80 ++++++++----------
 5 files changed, 67 insertions(+), 98 deletions(-)

diff --git a/src/packages/__VUE/numberkeyboard/doc.en-US.md b/src/packages/__VUE/numberkeyboard/doc.en-US.md
index 88569bb99b..5176239a08 100644
--- a/src/packages/__VUE/numberkeyboard/doc.en-US.md
+++ b/src/packages/__VUE/numberkeyboard/doc.en-US.md
@@ -63,6 +63,7 @@ app.use(NumberKeyboard)
 | delete | Emitted when the delete key is pressed | - |
 | close | Emitted when the close button or non-keyboard area is clicked is clicked | - |
 | blur | Emitted when the close button is clicked or the keyboard is blurred | - |
+| confirm `version` | Emitted when the confirm button is clicked | - |
 
 ## Theming
 
diff --git a/src/packages/__VUE/numberkeyboard/doc.md b/src/packages/__VUE/numberkeyboard/doc.md
index a054adfc62..e60325b026 100644
--- a/src/packages/__VUE/numberkeyboard/doc.md
+++ b/src/packages/__VUE/numberkeyboard/doc.md
@@ -62,6 +62,7 @@ app.use(NumberKeyboard)
 | delete | 点击删除键时触发 | - |
 | close | 点击关闭按钮时触发 | - |
 | blur | 点击关闭按钮或非键盘区域时触发 | - |
+| confirm `version` | 点击确认按钮 | - |
 
 ## 主题定制
 
diff --git a/src/packages/__VUE/numberkeyboard/doc.taro.md b/src/packages/__VUE/numberkeyboard/doc.taro.md
index 68c30af9ab..c454dc4710 100644
--- a/src/packages/__VUE/numberkeyboard/doc.taro.md
+++ b/src/packages/__VUE/numberkeyboard/doc.taro.md
@@ -62,6 +62,7 @@ app.use(NumberKeyboard)
 | input | 点击按键时触发 | 按键内容 |
 | delete | 点击删除键时触发 | - |
 | close | 点击关闭按钮或非键盘区域时触发 | - |
+| confirm `version` | 点击确认按钮 | - |
 
 ## 主题定制
 
diff --git a/src/packages/__VUE/numberkeyboard/index.taro.vue b/src/packages/__VUE/numberkeyboard/index.taro.vue
index c1e4b9352a..32f817b666 100644
--- a/src/packages/__VUE/numberkeyboard/index.taro.vue
+++ b/src/packages/__VUE/numberkeyboard/index.taro.vue
@@ -1,14 +1,7 @@
 <template>
-  <nut-popup
-    v-model:visible="show"
-    position="bottom"
-    :pop-class="popClass"
-    :overlay="overlay"
-    overlay-class="nut-number-keyboard-overlay"
-    :lock-scroll="lockScroll"
-    :catch-move="lockScroll"
-    @click-overlay="closeBoard()"
-  >
+  <nut-popup v-model:visible="show" position="bottom" :pop-class="popClass" :overlay="overlay"
+             overlay-class="nut-number-keyboard-overlay" :lock-scroll="lockScroll" :catch-move="lockScroll"
+             @click-overlay="closeBoard()">
     <div ref="root" class="nut-number-keyboard">
       <div v-if="title" class="nut-number-keyboard__header">
         <h3 class="nut-number-keyboard__title">{{ title }}</h3>
@@ -18,54 +11,38 @@
       </div>
       <div class="nut-number-keyboard__body">
         <div class="nut-number-keyboard__keys">
-          <div
-            v-for="item of keysList"
-            :key="'key' + item.id"
-            :class="[
-              'nut-key__wrapper',
-              {
-                'nut-key__wrapper--wider':
-                  item.id == 0 && type == 'rightColumn' && Array.isArray(customKey) && customKey.length == 1
-              }
-            ]"
-          >
-            <div
-              :class="[
-                'nut-key',
-                { 'nut-key--active': item.id == clickKeyIndex },
-                { 'nut-key--lock': item.type == 'lock' },
-                { 'nut-key--delete': item.type == 'delete' }
-              ]"
-              @touchstart="(event: TouchEvent) => onTouchstart(item, event)"
-              @touchmove="(event: TouchEvent) => onTouchMove(event)"
-              @touchend="onTouchEnd"
-            >
+          <div v-for="item of keysList" :key="'key' + item.id" :class="[
+            'nut-key__wrapper',
+            {
+              'nut-key__wrapper--wider':
+                item.id == 0 && type == 'rightColumn' && Array.isArray(customKey) && customKey.length == 1
+            }
+          ]">
+            <div :class="[
+                   'nut-key',
+                   { 'nut-key--active': item.id == clickKeyIndex },
+                   { 'nut-key--lock': item.type == 'lock' },
+                   { 'nut-key--delete': item.type == 'delete' }
+                 ]" @touchstart="(event: TouchEvent) => onTouchstart(item, event)"
+                 @touchmove="(event: TouchEvent) => onTouchMove(event)" @touchend="onTouchEnd">
               <template v-if="item.type == 'number' || item.type == 'custom'">{{ item.id }}</template>
-              <img
-                v-if="item.type == 'lock'"
-                src="https://img11.360buyimg.com/imagetools/jfs/t1/146371/38/8485/738/5f606425Eca239740/14f4b4f5f20d8a68.png"
-              />
-              <img
-                v-if="item.type == 'delete'"
-                src="https://img11.360buyimg.com/imagetools/jfs/t1/129395/8/12735/2030/5f61ac37E70cab338/fb477dc11f46056c.png"
-              />
+              <img v-if="item.type == 'lock'"
+                   src="https://img11.360buyimg.com/imagetools/jfs/t1/146371/38/8485/738/5f606425Eca239740/14f4b4f5f20d8a68.png" />
+              <img v-if="item.type == 'delete'"
+                   src="https://img11.360buyimg.com/imagetools/jfs/t1/129395/8/12735/2030/5f61ac37E70cab338/fb477dc11f46056c.png" />
             </div>
           </div>
         </div>
         <div v-if="type == 'rightColumn'" class="nut-number-keyboard__sidebar">
           <div class="nut-key__wrapper">
-            <div
-              :class="['nut-key', { active: clickKeyIndex == 'delete' }]"
-              @touchstart="(event: TouchEvent) => onTouchstart({ id: 'delete', type: 'delete' }, event)"
-              @touchmove="(event: TouchEvent) => onTouchMove(event)"
-              @touchend="onTouchEnd"
-            >
+            <div :class="['nut-key', { active: clickKeyIndex == 'delete' }]"
+                 @touchstart="(event: TouchEvent) => onTouchstart({ id: 'delete', type: 'delete' }, event)"
+                 @touchmove="(event: TouchEvent) => onTouchMove(event)" @touchend="onTouchEnd">
               <img
-                src="https://img11.360buyimg.com/imagetools/jfs/t1/129395/8/12735/2030/5f61ac37E70cab338/fb477dc11f46056c.png"
-              />
+                src="https://img11.360buyimg.com/imagetools/jfs/t1/129395/8/12735/2030/5f61ac37E70cab338/fb477dc11f46056c.png" />
             </div>
           </div>
-          <div class="nut-key__wrapper nut-key__wrapper--finish" @click="closeBoard()">
+          <div class="nut-key__wrapper nut-key__wrapper--finish" @click="confirm">
             <div :class="['nut-key', 'nut-key--finish ', { activeFinsh: clickKeyIndex == 'finish' }]">
               {{ confirmText || translate('done') }}
             </div>
@@ -138,7 +115,7 @@ export default create({
       default: true
     }
   },
-  emits: ['input', 'delete', 'close', 'update:modelValue', 'update:visible'],
+  emits: ['input', 'delete', 'close', 'confirm', 'update:modelValue', 'update:visible'],
   setup(props, { emit }) {
     const translate = useLocale(cN)
     const clickKeyIndex: Ref<string | undefined | number> = ref(undefined)
@@ -239,10 +216,15 @@ export default create({
       emit('close')
     }
 
+    const confirm = () => {
+      emit('confirm')
+    }
+
     return {
       clickKeyIndex,
       defaultKey,
       closeBoard,
+      confirm,
       onTouchEnd,
       onTouchMove,
       onTouchstart,
diff --git a/src/packages/__VUE/numberkeyboard/index.vue b/src/packages/__VUE/numberkeyboard/index.vue
index 4a8b983167..a3178a586c 100644
--- a/src/packages/__VUE/numberkeyboard/index.vue
+++ b/src/packages/__VUE/numberkeyboard/index.vue
@@ -1,13 +1,7 @@
 <template>
   <div ref="root">
-    <nut-popup
-      v-model:visible="show"
-      position="bottom"
-      :pop-class="popClass"
-      :overlay="false"
-      :lock-scroll="lockScroll"
-      :teleport-disable="false"
-    >
+    <nut-popup v-model:visible="show" position="bottom" :pop-class="popClass" :overlay="false" :lock-scroll="lockScroll"
+               :teleport-disable="false">
       <div class="nut-number-keyboard">
         <div v-if="title" class="nut-number-keyboard__header">
           <h3 class="nut-number-keyboard__title">{{ title }}</h3>
@@ -17,54 +11,39 @@
         </div>
         <div class="nut-number-keyboard__body">
           <div class="nut-number-keyboard__keys">
-            <div
-              v-for="item of keysList"
-              :key="'key' + item.id"
-              :class="[
-                'nut-key__wrapper',
-                {
-                  'nut-key__wrapper--wider':
-                    item.id == 0 && type == 'rightColumn' && Array.isArray(customKey) && customKey.length == 1
-                }
-              ]"
-            >
-              <div
-                :class="[
-                  'nut-key',
-                  { 'nut-key--active': item.id == clickKeyIndex },
-                  { 'nut-key--lock': item.type == 'lock' },
-                  { 'nut-key--delete': item.type == 'delete' }
-                ]"
-                @touchstart="(event: TouchEvent) => onTouchstart(item, event)"
-                @touchmove="(event: TouchEvent) => onTouchMove(event)"
-                @touchend="(event: TouchEvent) => onTouchEnd(event)"
-              >
+            <div v-for="item of keysList" :key="'key' + item.id" :class="[
+              'nut-key__wrapper',
+              {
+                'nut-key__wrapper--wider':
+                  item.id == 0 && type == 'rightColumn' && Array.isArray(customKey) && customKey.length == 1
+              }
+            ]">
+              <div :class="[
+                     'nut-key',
+                     { 'nut-key--active': item.id == clickKeyIndex },
+                     { 'nut-key--lock': item.type == 'lock' },
+                     { 'nut-key--delete': item.type == 'delete' }
+                   ]" @touchstart="(event: TouchEvent) => onTouchstart(item, event)"
+                   @touchmove="(event: TouchEvent) => onTouchMove(event)"
+                   @touchend="(event: TouchEvent) => onTouchEnd(event)">
                 <template v-if="item.type == 'number' || item.type == 'custom'">{{ item.id }}</template>
-                <img
-                  v-if="item.type == 'lock'"
-                  src="https://img11.360buyimg.com/imagetools/jfs/t1/146371/38/8485/738/5f606425Eca239740/14f4b4f5f20d8a68.png"
-                />
-                <img
-                  v-if="item.type == 'delete'"
-                  src="https://img11.360buyimg.com/imagetools/jfs/t1/129395/8/12735/2030/5f61ac37E70cab338/fb477dc11f46056c.png"
-                />
+                <img v-if="item.type == 'lock'"
+                     src="https://img11.360buyimg.com/imagetools/jfs/t1/146371/38/8485/738/5f606425Eca239740/14f4b4f5f20d8a68.png" />
+                <img v-if="item.type == 'delete'"
+                     src="https://img11.360buyimg.com/imagetools/jfs/t1/129395/8/12735/2030/5f61ac37E70cab338/fb477dc11f46056c.png" />
               </div>
             </div>
           </div>
           <div v-if="type == 'rightColumn'" class="nut-number-keyboard__sidebar">
             <div class="nut-key__wrapper">
-              <div
-                :class="['nut-key', { active: clickKeyIndex == 'delete' }]"
-                @touchstart="(event: TouchEvent) => onTouchstart({ id: 'delete', type: 'delete' }, event)"
-                @touchmove="(event: TouchEvent) => onTouchMove(event)"
-                @touchend="onTouchEnd"
-              >
+              <div :class="['nut-key', { active: clickKeyIndex == 'delete' }]"
+                   @touchstart="(event: TouchEvent) => onTouchstart({ id: 'delete', type: 'delete' }, event)"
+                   @touchmove="(event: TouchEvent) => onTouchMove(event)" @touchend="onTouchEnd">
                 <img
-                  src="https://img11.360buyimg.com/imagetools/jfs/t1/129395/8/12735/2030/5f61ac37E70cab338/fb477dc11f46056c.png"
-                />
+                  src="https://img11.360buyimg.com/imagetools/jfs/t1/129395/8/12735/2030/5f61ac37E70cab338/fb477dc11f46056c.png" />
               </div>
             </div>
-            <div class="nut-key__wrapper nut-key__wrapper--finish" @click="closeBoard()">
+            <div class="nut-key__wrapper nut-key__wrapper--finish" @click="confirm">
               <div :class="['nut-key', 'nut-key--finish ', { activeFinsh: clickKeyIndex == 'finish' }]">
                 {{ confirmText || translate('done') }}
               </div>
@@ -134,7 +113,7 @@ export default create({
       default: true
     }
   },
-  emits: ['input', 'delete', 'close', 'blur', 'update:modelValue', 'update:visible'],
+  emits: ['input', 'delete', 'close', 'blur', 'confirm', 'update:modelValue', 'update:visible'],
   setup(props, { emit }) {
     const translate = useLocale(cN)
     const clickKeyIndex: Ref<string | undefined | number> = ref(undefined)
@@ -253,10 +232,15 @@ export default create({
       emit('close')
     }
 
+    const confirm = () => {
+      emit('confirm')
+    }
+
     return {
       clickKeyIndex,
       defaultKey,
       closeBoard,
+      confirm,
       onTouchEnd,
       onTouchMove,
       onTouchstart,