From aa6e8e49a7c60d45fbb8d9f788582f8c71867632 Mon Sep 17 00:00:00 2001
From: chaishi <974383157@qq.com>
Date: Wed, 19 Jul 2023 21:09:32 +0800
Subject: [PATCH 1/3] revert(input-number): test

---
 src/_common                          |   2 +-
 src/input-number/_example/center.vue | 100 +++++++++------------------
 src/input-number/useInputNumber.tsx  |  10 +--
 3 files changed, 40 insertions(+), 72 deletions(-)

diff --git a/src/_common b/src/_common
index bfabef4242..0ceee2d8d3 160000
--- a/src/_common
+++ b/src/_common
@@ -1 +1 @@
-Subproject commit bfabef4242d7d8a6e2f9931901c0353be8b786fe
+Subproject commit 0ceee2d8d38bac54ce4efa754d97dbc3661633a3
diff --git a/src/input-number/_example/center.vue b/src/input-number/_example/center.vue
index e4f0e04dfc..006e3904e3 100644
--- a/src/input-number/_example/center.vue
+++ b/src/input-number/_example/center.vue
@@ -1,69 +1,37 @@
-<template>
-  <t-space direction="vertical">
-    <t-input-number v-model="value1" :step="0.1" :max="5" auto-width />
-
-    <!-- 失去焦点时，规范超出范围的数字 -->
-    <t-input-number v-model="decimalValue" :step="0.18" :max="5" :allow-input-over-limit="false" style="width: 200px" />
-
-    <!-- 数字超出范围仅提醒，不代用户做任何事情 -->
-    <t-input-number
-      v-model="value2"
-      theme="row"
-      :max="15"
-      :min="-2"
-      :disabled="false"
-      :tips="tips"
-      suffix="个"
-      style="width: 250px"
-      @change="handleChange"
-      @validate="onValidate"
-      @focus="handleFocus"
-      @blur="handleBlur"
-      @keydown-enter="handleKeydownEnter"
-      @keydown="handleKeydown"
-      @keyup="handleKeyup"
-      @keypress="handleKeypress"
-    ></t-input-number>
-  </t-space>
-</template>
-
-<script setup>
-import { ref, computed } from 'vue';
-
-const value1 = ref('');
-const value2 = ref(100);
-const decimalValue = ref(3.41);
-const error = ref(undefined);
-
-const tips = computed(() => {
-  if (error.value === 'exceed-maximum') return 'number can not be exceed maximum';
-  if (error.value === 'below-minimum') return 'number can not be below minimum';
-  return undefined;
+<script setup lang="ts">
+import { ref } from 'vue';
+const model = ref({
+  str: 'str',
+  num: 1,
 });
+</script>
 
-const onValidate = (p) => {
-  error.value = p.error;
-};
+<template>
+  <pre>
+    {{ model }}
+  </pre>
+  <t-input-number v-model="model.num" />
+  <t-form :model="model">
+    <t-form-item label="Str">
+      <t-input v-model="model.str" />
+    </t-form-item>
+    <t-form-item label="Num">
+      <!-- <t-input-number v-model="model.num" /> -->
+    </t-form-item>
+  </t-form>
+</template>
 
-const handleChange = (v, ctx) => {
-  console.info('change', v, ctx);
-};
-const handleFocus = (v, ctx) => {
-  console.info('focus', v, ctx);
-};
-const handleBlur = (v, ctx) => {
-  console.info('blur', v, ctx);
-};
-const handleKeydownEnter = (v, ctx) => {
-  console.info('keydown-enter', v, ctx);
-};
-const handleKeydown = (v, ctx) => {
-  console.info('keydown', v, ctx);
-};
-const handleKeyup = (v, ctx) => {
-  console.info('keyup', v, ctx);
-};
-const handleKeypress = (v, ctx) => {
-  console.info('keypress', v, ctx);
-};
-</script>
+<style scoped>
+.logo {
+  height: 6em;
+  padding: 1.5em;
+  will-change: filter;
+  transition: filter 300ms;
+}
+.logo:hover {
+  filter: drop-shadow(0 0 2em #646cffaa);
+}
+.logo.vue:hover {
+  filter: drop-shadow(0 0 2em #42b883aa);
+}
+</style>
diff --git a/src/input-number/useInputNumber.tsx b/src/input-number/useInputNumber.tsx
index cc18acace5..1da22fcb7e 100644
--- a/src/input-number/useInputNumber.tsx
+++ b/src/input-number/useInputNumber.tsx
@@ -88,13 +88,13 @@ export default function useInputNumber(props: TdInputNumberProps) {
         }
         const fixedNumber = Number(largeNumberToFixed(inputValue, decimalPlaces, largeNumber));
         if (decimalPlaces !== undefined && ![undefined, null].includes(val) && Number(fixedNumber) !== Number(tValue)) {
-          setTValue(fixedNumber, { type: 'props', e: null });
+          setTValue(fixedNumber, { type: 'props', e: undefined });
         }
       }
       if (largeNumber) {
         userInput.value = getUserInput(inputValue);
         if (decimalPlaces !== undefined && largeNumberToFixed(inputValue, decimalPlaces, largeNumber) !== val) {
-          setTValue(userInput.value, { type: 'props', e: null });
+          setTValue(userInput.value, { type: 'props', e: undefined });
         }
       }
     },
@@ -159,7 +159,7 @@ export default function useInputNumber(props: TdInputNumberProps) {
     // 千分位处理
     const val = formatThousandths(inputValue);
 
-    if (!canInputNumber(val, props.largeNumber)) return null;
+    if (!canInputNumber(val, props.largeNumber)) return;
 
     userInput.value = val;
 
@@ -169,14 +169,14 @@ export default function useInputNumber(props: TdInputNumberProps) {
     }
 
     if (canSetValue(String(val), Number(tValue.value))) {
-      const newVal = val === '' ? null : Number(val);
+      const newVal = val === '' ? undefined : Number(val);
       setTValue(newVal, { type: 'input', e });
     }
   };
 
   const handleBlur = (value: string, ctx: { e: FocusEvent }) => {
     const { largeNumber, max, min, decimalPlaces } = props;
-    if (!props.allowInputOverLimit && tValue.value !== null) {
+    if (!props.allowInputOverLimit && tValue.value !== undefined) {
       const r = getMaxOrMinValidateResult({ value: tValue.value, largeNumber, max, min });
       if (r === 'below-minimum') {
         setTValue(min, { type: 'blur', e: ctx.e });

From e1923ea61035bae0b8a82d7d4fc208c3c539eddd Mon Sep 17 00:00:00 2001
From: chaishi <974383157@qq.com>
Date: Thu, 20 Jul 2023 10:37:20 +0800
Subject: [PATCH 2/3] revert(input-number): demo

---
 src/input-number/_example/center.vue | 100 ++++++++++++++++++---------
 1 file changed, 66 insertions(+), 34 deletions(-)

diff --git a/src/input-number/_example/center.vue b/src/input-number/_example/center.vue
index 006e3904e3..e4f0e04dfc 100644
--- a/src/input-number/_example/center.vue
+++ b/src/input-number/_example/center.vue
@@ -1,37 +1,69 @@
-<script setup lang="ts">
-import { ref } from 'vue';
-const model = ref({
-  str: 'str',
-  num: 1,
-});
-</script>
-
 <template>
-  <pre>
-    {{ model }}
-  </pre>
-  <t-input-number v-model="model.num" />
-  <t-form :model="model">
-    <t-form-item label="Str">
-      <t-input v-model="model.str" />
-    </t-form-item>
-    <t-form-item label="Num">
-      <!-- <t-input-number v-model="model.num" /> -->
-    </t-form-item>
-  </t-form>
+  <t-space direction="vertical">
+    <t-input-number v-model="value1" :step="0.1" :max="5" auto-width />
+
+    <!-- 失去焦点时，规范超出范围的数字 -->
+    <t-input-number v-model="decimalValue" :step="0.18" :max="5" :allow-input-over-limit="false" style="width: 200px" />
+
+    <!-- 数字超出范围仅提醒，不代用户做任何事情 -->
+    <t-input-number
+      v-model="value2"
+      theme="row"
+      :max="15"
+      :min="-2"
+      :disabled="false"
+      :tips="tips"
+      suffix="个"
+      style="width: 250px"
+      @change="handleChange"
+      @validate="onValidate"
+      @focus="handleFocus"
+      @blur="handleBlur"
+      @keydown-enter="handleKeydownEnter"
+      @keydown="handleKeydown"
+      @keyup="handleKeyup"
+      @keypress="handleKeypress"
+    ></t-input-number>
+  </t-space>
 </template>
 
-<style scoped>
-.logo {
-  height: 6em;
-  padding: 1.5em;
-  will-change: filter;
-  transition: filter 300ms;
-}
-.logo:hover {
-  filter: drop-shadow(0 0 2em #646cffaa);
-}
-.logo.vue:hover {
-  filter: drop-shadow(0 0 2em #42b883aa);
-}
-</style>
+<script setup>
+import { ref, computed } from 'vue';
+
+const value1 = ref('');
+const value2 = ref(100);
+const decimalValue = ref(3.41);
+const error = ref(undefined);
+
+const tips = computed(() => {
+  if (error.value === 'exceed-maximum') return 'number can not be exceed maximum';
+  if (error.value === 'below-minimum') return 'number can not be below minimum';
+  return undefined;
+});
+
+const onValidate = (p) => {
+  error.value = p.error;
+};
+
+const handleChange = (v, ctx) => {
+  console.info('change', v, ctx);
+};
+const handleFocus = (v, ctx) => {
+  console.info('focus', v, ctx);
+};
+const handleBlur = (v, ctx) => {
+  console.info('blur', v, ctx);
+};
+const handleKeydownEnter = (v, ctx) => {
+  console.info('keydown-enter', v, ctx);
+};
+const handleKeydown = (v, ctx) => {
+  console.info('keydown', v, ctx);
+};
+const handleKeyup = (v, ctx) => {
+  console.info('keyup', v, ctx);
+};
+const handleKeypress = (v, ctx) => {
+  console.info('keypress', v, ctx);
+};
+</script>

From 12ec09d8b142e1a8364abf97454143f5a632c50c Mon Sep 17 00:00:00 2001
From: chaishi <974383157@qq.com>
Date: Thu, 20 Jul 2023 10:37:52 +0800
Subject: [PATCH 3/3] feat(_common): update

---
 src/_common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/_common b/src/_common
index 0ceee2d8d3..ce2b875142 160000
--- a/src/_common
+++ b/src/_common
@@ -1 +1 @@
-Subproject commit 0ceee2d8d38bac54ce4efa754d97dbc3661633a3
+Subproject commit ce2b875142312c34074354f2a689262a4655cd12