@rainbow-oh/yee-c 0.15.0 → 0.15.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rainbow-oh/yee-c",
-  "version": "0.15.0",
+  "version": "0.15.2",
   "description": "yee basic components",
   "keywords": [
     "react",

package/src/InputNumber/demo/basic.tsx

@@ -8,7 +8,7 @@ import React from 'react';
 export default () => {
   return (
     <InputNumber
-      defaultValue={0}
+      defaultValue={123}
       placeholder="Enter a number"
       onChange={(value) => console.log('value:', value)}
     />

package/src/InputNumber/index.en-US.md

@@ -63,8 +63,8 @@ Enter a number within certain range with the mouse or keyboard.
 | Property | Type | Description | Default |
 | --- | --- | --- | --- |
 | prefixCls | `string` | Custom class name prefix | - |
-| value | `number \| null` | Current value | - |
-| defaultValue | `number \| null` | Default value | - |
+| value | `number \| string \| null` | Current value (`''` is treated as empty and never renders as 0 with a formatter) | - |
+| defaultValue | `number \| string \| null` | Default value | - |
 | min | `number` | Minimum value | -Infinity |
 | max | `number` | Maximum value | Infinity |
 | step | `number` | Step value | `1` |

package/src/InputNumber/index.zh-CN.md

@@ -67,8 +67,8 @@ toc: 'content'
 | 属性名 | 类型 | 描述 | 默认值 |
 | --- | --- | --- | --- |
 | prefixCls | `string` | 自定义类名前缀 | - |
-| value | `number \| null` | 受控的值 | - |
-| defaultValue | `number \| null` | 默认值 | - |
+| value | `number \| string \| null` | 受控的值（`''` 视为空值，配 formatter 也不会渲染成 0） | - |
+| defaultValue | `number \| string \| null` | 默认值 | - |
 | min | `number` | 最小值 | -Infinity |
 | max | `number` | 最大值 | Infinity |
 | step | `number` | 步长 | `1` |

package/src/InputNumber/input-number.tsx

@@ -49,7 +49,7 @@ const InputNumber = forwardRef<HTMLInputElement, InputNumberProps>(
       ...rest
     } = props;
 
-    const [mergedValue, setMergedValue] = useMergedState<number | null>(null, {
+    const [mergedValue, setMergedValue] = useMergedState<number | string | null>(null, {
       value,
       defaultValue,
     });
@@ -57,9 +57,24 @@ const InputNumber = forwardRef<HTMLInputElement, InputNumberProps>(
     const [focused, setFocused] = useState(false);
     const inputRef = useRef<HTMLInputElement>(null);
 
+    /** 字符串值（表单 store 常见）参与算术/比较前转数字；不可解析返回 null */
+    function toNumber(val: number | string | null | undefined): number | null {
+      if (val === null || val === undefined || val === '') return null;
+      const n = Number(val);
+      return Number.isNaN(n) ? null : n;
+    }
+
     // Format value
-    function formatValue(val: number | null | undefined): string {
-      if (val === null || val === undefined || isNaN(val)) return '';
+    function formatValue(val: number | string | null | undefined): string {
+      // '' 与 null/undefined 同为空值：Number('') === 0，若不拦截会被
+      // formatter/precision 格式化成 '0'（如全局千分位 formatter 场景）
+      if (
+        val === null ||
+        val === undefined ||
+        val === '' ||
+        isNaN(val as number)
+      )
+        return '';
 
       let formattedVal =
         precision !== undefined ? Number(val).toFixed(precision) : val;
@@ -149,7 +164,7 @@ const InputNumber = forwardRef<HTMLInputElement, InputNumberProps>(
       if (disabled || readOnly) return;
 
       const offset = type === 'up' ? step : -step;
-      const currentValue = mergedValue ?? 0;
+      const currentValue = toNumber(mergedValue) ?? 0;
       const newValue = currentValue + offset;
 
       updateValue(newValue);
@@ -259,7 +274,10 @@ const InputNumber = forwardRef<HTMLInputElement, InputNumberProps>(
                     {
                       [`${prefixCls}-handler-disabled`]:
                         disabled ||
-                        (mergedValue !== null && mergedValue >= max),
+                        (() => {
+                          const n = toNumber(mergedValue);
+                          return n !== null && n >= max;
+                        })(),
                     },
                   )}
                   onClick={() => handleStep('up')}
@@ -273,7 +291,10 @@ const InputNumber = forwardRef<HTMLInputElement, InputNumberProps>(
                     {
                       [`${prefixCls}-handler-disabled`]:
                         disabled ||
-                        (mergedValue !== null && mergedValue <= min),
+                        (() => {
+                          const n = toNumber(mergedValue);
+                          return n !== null && n <= min;
+                        })(),
                     },
                   )}
                   onClick={() => handleStep('down')}

package/src/InputNumber/interface.ts

@@ -34,13 +34,13 @@ export interface InputNumberProps extends Omit<
    */
   size?: 'small' | 'default' | 'large';
   /**
-   * Controlled value
+   * Controlled value（'' 视为空值，配合 formatter 不会渲染成 0）
    */
-  value?: number | null;
+  value?: number | string | null;
   /**
    * Default value
    */
-  defaultValue?: number | null;
+  defaultValue?: number | string | null;
   /**
    * Minimum value
    */

package/src/Table/index.en-US.md

@@ -104,7 +104,7 @@ Filter configuration of `ColumnProps.filter`.
 | searchable | `boolean` | Whether searchable; renders a search input when `items` is unset | `true` |
 | filterOnClose | `boolean` | Whether to apply the filter when the panel closes | `true` |
 | icon | `(filtered: boolean) => React.ReactNode` | Custom filter icon | - |
-| render | `() => React.ReactNode` | Custom filter panel content | - |
+| render | `(ctx: { close: () => void }) => React.ReactNode` | Custom filter panel content; `ctx.close()` closes the filter popover | - |
 | onFilter | `(value: FilterValue, record: object) => boolean` | Local filter function; falls back to default string-includes matching when unset | - |
 | filtered | `boolean` | Force the filter icon highlight (takes precedence over `filteredValue`) | - |
 | filteredValue | `FilterValue \| FilterValue[]` | (Controlled) Filter value. When set, the column's filter state is fully controlled: panel echo, icon highlight and the `filters` in `onChange` all derive from it; reset with `''` / `[]` | - |

package/src/Table/index.zh-CN.md

@@ -109,7 +109,7 @@ toc: 'content'
 | searchable    | `boolean`                                   | 是否可搜索；未配置 `items` 时渲染搜索输入框                                                           | `true` |
 | filterOnClose | `boolean`                                   | 关闭筛选面板时是否自动应用筛选                                                                        | `true` |
 | icon          | `(filtered: boolean) => React.ReactNode`    | 自定义筛选图标                                                                                        | -      |
-| render        | `() => React.ReactNode`                     | 自定义筛选面板内容                                                                                    | -      |
+| render        | `(ctx: { close: () => void }) => React.ReactNode` | 自定义筛选面板内容；`ctx.close()` 关闭筛选弹层        | -      |
 | onFilter      | `(value: FilterValue, record: object) => boolean` | 本地过滤函数；不配置时使用默认的字符串包含匹配                                                  | -      |
 | filtered      | `boolean`                                   | 强制筛选图标高亮（优先级高于由 `filteredValue` 派生的高亮）                                          | -      |
 | filteredValue | `FilterValue \| FilterValue[]`              | （受控）筛选值。配置后该列筛选状态完全受控：面板回显、图标高亮、`onChange` 的 `filters` 均以其为准；重置传 `''` / `[]` | -      |

package/src/Table/interface.ts

@@ -234,7 +234,7 @@ export interface ColumnProps {
     /**
      * Custom filter function, e.g. custom search
      */
-    render?: () => React.ReactNode;
+    render?: (ctx: { close: () => void }) => React.ReactNode;
     /**
      * Filter callback function
      */

package/src/Table/theader/filter.tsx

@@ -149,7 +149,7 @@ const HeaderFilter = React.memo((props: any) => {
   ) : null;
 
   if (render) {
-    popup = render();
+    popup = render({ close: () => setOpen(false) });
   } else if (items) {
     let dataSource = [];
     const inputValue = getStrLower(searchValue);

package/src/version.ts

@@ -4,7 +4,7 @@ declare global {
   }
 }
 
-export const version = "0.15.0";
+export const version = "0.15.2";
 
 if (typeof window !== 'undefined') {
   window.__yee_c_version__ = version;