@antsoo-lib/core 2.0.5 → 3.0.1

package/src/render/InputNumber.tsx

@@ -1,205 +1,205 @@
-import { InputNumber } from '@antsoo-lib/components'
-import { PRECISION } from '@antsoo-lib/shared'
-import type { VoidFunction } from '@antsoo-lib/shared'
-import { isFunction } from '@antsoo-lib/utils'
-
-import { markRaw, nextTick } from 'vue'
-import type { ComponentPublicInstance, VNode } from 'vue'
-
-import { getInputNumberFocusState, renderSlotContent } from './helper'
-import type { ToolbarState } from './state'
-import type { InputNumberToolbarItem, ToolbarItem } from './types'
-
-// 数字输入框渲染函数
-export function renderInputNumber(item: ToolbarItem, toolbarState: ToolbarState): VNode {
-  const inputNumberItem = item as InputNumberToolbarItem
-  const { key, events = {}, slots } = inputNumberItem
-  const { props = {}, disabled = false } = inputNumberItem
-
-  const isDisabled = isFunction(disabled)
-    ? disabled(toolbarState.getAllValues(), toolbarState)
-    : disabled
-
-  // Clone props to avoid mutation
-  const finalProps = { ...props, disabled: isDisabled }
-
-  // 自动处理精度与格式化 (xmoney/xprice/xweight/xtaxrate)
-  const { xmoney, xprice, xweight, xtaxrate } = finalProps
-
-  // 1. 确定精度
-  let precision = finalProps.precision
-  if (precision === undefined) {
-    if (xmoney) precision = PRECISION.amount
-    else if (xprice) precision = PRECISION.price
-    else if (xweight) precision = PRECISION.weight
-    else if (xtaxrate) precision = PRECISION.taxRate
-    else if (finalProps.xnumber) precision = PRECISION.number
-
-    if (precision !== undefined) {
-      finalProps.precision = precision
-    }
-  }
-
-  // 2. 确定步长 (step)
-  if (finalProps.step === undefined && precision !== undefined) {
-    finalProps.step = 1 / 10 ** precision
-  }
-
-  // 以字段 key 维度记录 InputNumber 是否处于聚焦中
-  const focusState = key ? getInputNumberFocusState(toolbarState) : undefined
-
-  const formatValueWithPrecisionOnBlur = (value: any) => {
-    if (value == null || value === '') return ''
-    const rawText = `${value}`
-    if (precision === undefined) return rawText
-    // 聚焦中保持“用户输入原样”，避免输入中间态（如 2. / 2.0）被 toFixed 强制改写
-    if (key && focusState?.get(key)) return rawText
-    const num = Number(rawText)
-    if (!Number.isFinite(num)) return rawText
-    // 失焦时按 precision 补齐尾数 0（同时会发生四舍五入）
-    return num.toFixed(precision)
-  }
-
-  // 3. 默认格式化 (千分位 或 百分比)
-  if (!finalProps.formatter) {
-    if (xtaxrate) {
-      // 税率：先补精度再加 %
-      finalProps.formatter = (value: any) => {
-        const text = formatValueWithPrecisionOnBlur(value)
-        return text === '' ? '' : `${text}%`
-      }
-      finalProps.parser = (value: string | undefined) => (value ? value.replace('%', '') : '')
-    } else {
-      // 默认千分位
-      // 千分位：先补精度再加逗号（确保 2 -> 2.00 之后再变成 2.00 的千分位格式）
-      finalProps.formatter = (value: any) => {
-        const text = formatValueWithPrecisionOnBlur(value)
-        if (text === '') return ''
-        return `${text}`.replace(/\B(?=(?:\d{3})+(?!\d))/g, ',')
-      }
-      finalProps.parser = (value: string | undefined) => (value ? value.replace(/,/g, '') : '')
-    }
-  }
-
-  const processedEvents: Record<string, VoidFunction> = {}
-  Object.keys(events).forEach((eventName) => {
-    processedEvents[eventName] = (...args: any[]) => {
-      // 对于数字输入框，自动更新状态
-      if (eventName === 'onUpdate:value' || eventName === 'onChange') {
-        const value = args[0]
-        toolbarState.setValue(key, value)
-      }
-      // 调用原始事件处理函数
-      events[eventName]?.(...args, toolbarState.getAllValues(), toolbarState)
-    }
-  })
-
-  // 如果没有设置onChange事件，添加默认的状态更新
-  if (!processedEvents['onUpdate:value'] && !processedEvents.onChange) {
-    processedEvents['onUpdate:value'] = (value: any) => {
-      toolbarState.setValue(key, value)
-    }
-  }
-
-  // 自动全选逻辑：合并 onFocus 事件
-  const userOnFocus = processedEvents.onFocus || events.onFocus
-  processedEvents.onFocus = (...args: any[]) => {
-    const e = args[0]
-    if (key) focusState?.set(key, true)
-    try {
-      if (e && e.target && typeof (e.target as HTMLInputElement).select === 'function') {
-        const target = e.target as HTMLInputElement
-        target.select()
-
-        // 阻止鼠标松开时的默认光标定位行为（仅一次），防止全选被取消
-        const preventMouseUp = (ev: Event) => {
-          ev.preventDefault()
-          target.removeEventListener('mouseup', preventMouseUp)
-        }
-
-        target.addEventListener('mouseup', preventMouseUp, { once: true })
-
-        const cleanup = () => {
-          target.removeEventListener('mouseup', preventMouseUp)
-          target.removeEventListener('blur', cleanup)
-        }
-        target.addEventListener('blur', cleanup)
-      }
-    } catch {
-      // ignore
-    }
-    // 执行用户原有逻辑
-    userOnFocus?.(...args, toolbarState.getAllValues(), toolbarState)
-  }
-
-  if (key) {
-    const userOnFocusCapture = processedEvents.onFocusCapture
-    processedEvents.onFocusCapture = (...args: any[]) => {
-      // capture 阶段优先标记“聚焦态”，确保 formatter 在同一事件周期内可读到最新状态
-      focusState?.set(key, true)
-      userOnFocusCapture?.(...args)
-    }
-
-    const userOnBlurCapture = processedEvents.onBlurCapture
-    processedEvents.onBlurCapture = (...args: any[]) => {
-      // capture 阶段优先标记“失焦态”，避免 InputNumber 内部 onBlur flush 时仍被认为是聚焦态
-      focusState?.set(key, false)
-      userOnBlurCapture?.(...args)
-    }
-
-    const userOnBlur = processedEvents.onBlur
-    processedEvents.onBlur = (...args: any[]) => {
-      focusState?.set(key, false)
-      userOnBlur?.(...args)
-    }
-  }
-
-  // 如果需要自动聚焦，添加ref处理
-  if (finalProps.autoFocus) {
-    processedEvents.ref = (el: Element | ComponentPublicInstance | null) => {
-      const element = el as HTMLElement
-      if (element) {
-        // 使用nextTick确保DOM已经渲染完成
-        nextTick(() => {
-          try {
-            element?.focus?.()
-          } catch {
-            // 忽略焦点设置失败的错误
-          }
-        })
-      }
-    }
-  }
-
-  // 构建插槽对象
-  const slotsObject: Record<string, () => VNode | undefined> = {}
-  if (slots) {
-    if (slots.addonBefore) {
-      slotsObject.addonBefore = () => renderSlotContent(slots.addonBefore!, toolbarState)
-    }
-    if (slots.addonAfter) {
-      slotsObject.addonAfter = () => renderSlotContent(slots.addonAfter!, toolbarState)
-    }
-    if (slots.prefix) {
-      slotsObject.prefix = () => renderSlotContent(slots.prefix!, toolbarState)
-    }
-    if (slots.suffix) {
-      slotsObject.suffix = () => renderSlotContent(slots.suffix!, toolbarState)
-    }
-  }
-
-  const Comp = markRaw(InputNumber)
-  return (
-    <Comp
-      key={key}
-      value={
-        toolbarState.getValue(key) !== undefined
-          ? toolbarState.getValue(key)
-          : (finalProps.value ?? null)
-      }
-      {...finalProps}
-      {...processedEvents}
-      v-slots={slotsObject}
-    />
-  )
-}
+import { InputNumber } from '@antsoo-lib/components'
+import { PRECISION } from '@antsoo-lib/shared'
+import type { VoidFunction } from '@antsoo-lib/shared'
+import { isFunction } from '@antsoo-lib/utils'
+
+import { markRaw, nextTick } from 'vue'
+import type { ComponentPublicInstance, VNode } from 'vue'
+
+import { getInputNumberFocusState, renderSlotContent } from './helper'
+import type { ToolbarState } from './state'
+import type { InputNumberToolbarItem, ToolbarItem } from './types'
+
+// 数字输入框渲染函数
+export function renderInputNumber(item: ToolbarItem, toolbarState: ToolbarState): VNode {
+  const inputNumberItem = item as InputNumberToolbarItem
+  const { key, events = {}, slots } = inputNumberItem
+  const { props = {}, disabled = false } = inputNumberItem
+
+  const isDisabled = isFunction(disabled)
+    ? disabled(toolbarState.getAllValues(), toolbarState)
+    : disabled
+
+  // Clone props to avoid mutation
+  const finalProps = { ...props, disabled: isDisabled }
+
+  // 自动处理精度与格式化 (xmoney/xprice/xweight/xtaxrate)
+  const { xmoney, xprice, xweight, xtaxrate } = finalProps
+
+  // 1. 确定精度
+  let precision = finalProps.precision
+  if (precision === undefined) {
+    if (xmoney) precision = PRECISION.amount
+    else if (xprice) precision = PRECISION.price
+    else if (xweight) precision = PRECISION.weight
+    else if (xtaxrate) precision = PRECISION.taxRate
+    else if (finalProps.xnumber) precision = PRECISION.number
+
+    if (precision !== undefined) {
+      finalProps.precision = precision
+    }
+  }
+
+  // 2. 确定步长 (step)
+  if (finalProps.step === undefined && precision !== undefined) {
+    finalProps.step = 1 / 10 ** precision
+  }
+
+  // 以字段 key 维度记录 InputNumber 是否处于聚焦中
+  const focusState = key ? getInputNumberFocusState(toolbarState) : undefined
+
+  const formatValueWithPrecisionOnBlur = (value: any) => {
+    if (value == null || value === '') return ''
+    const rawText = `${value}`
+    if (precision === undefined) return rawText
+    // 聚焦中保持“用户输入原样”，避免输入中间态（如 2. / 2.0）被 toFixed 强制改写
+    if (key && focusState?.get(key)) return rawText
+    const num = Number(rawText)
+    if (!Number.isFinite(num)) return rawText
+    // 失焦时按 precision 补齐尾数 0（同时会发生四舍五入）
+    return num.toFixed(precision)
+  }
+
+  // 3. 默认格式化 (千分位 或 百分比)
+  if (!finalProps.formatter) {
+    if (xtaxrate) {
+      // 税率：先补精度再加 %
+      finalProps.formatter = (value: any) => {
+        const text = formatValueWithPrecisionOnBlur(value)
+        return text === '' ? '' : `${text}%`
+      }
+      finalProps.parser = (value: string | undefined) => (value ? value.replace('%', '') : '')
+    } else {
+      // 默认千分位
+      // 千分位：先补精度再加逗号（确保 2 -> 2.00 之后再变成 2.00 的千分位格式）
+      finalProps.formatter = (value: any) => {
+        const text = formatValueWithPrecisionOnBlur(value)
+        if (text === '') return ''
+        return `${text}`.replace(/\B(?=(?:\d{3})+(?!\d))/g, ',')
+      }
+      finalProps.parser = (value: string | undefined) => (value ? value.replace(/,/g, '') : '')
+    }
+  }
+
+  const processedEvents: Record<string, VoidFunction> = {}
+  Object.keys(events).forEach((eventName) => {
+    processedEvents[eventName] = (...args: any[]) => {
+      // 对于数字输入框，自动更新状态
+      if (eventName === 'onUpdate:value' || eventName === 'onChange') {
+        const value = args[0]
+        toolbarState.setValue(key, value)
+      }
+      // 调用原始事件处理函数
+      events[eventName]?.(...args, toolbarState.getAllValues(), toolbarState)
+    }
+  })
+
+  // 如果没有设置onChange事件，添加默认的状态更新
+  if (!processedEvents['onUpdate:value'] && !processedEvents.onChange) {
+    processedEvents['onUpdate:value'] = (value: any) => {
+      toolbarState.setValue(key, value)
+    }
+  }
+
+  // 自动全选逻辑：合并 onFocus 事件
+  const userOnFocus = processedEvents.onFocus || events.onFocus
+  processedEvents.onFocus = (...args: any[]) => {
+    const e = args[0]
+    if (key) focusState?.set(key, true)
+    try {
+      if (e && e.target && typeof (e.target as HTMLInputElement).select === 'function') {
+        const target = e.target as HTMLInputElement
+        target.select()
+
+        // 阻止鼠标松开时的默认光标定位行为（仅一次），防止全选被取消
+        const preventMouseUp = (ev: Event) => {
+          ev.preventDefault()
+          target.removeEventListener('mouseup', preventMouseUp)
+        }
+
+        target.addEventListener('mouseup', preventMouseUp, { once: true })
+
+        const cleanup = () => {
+          target.removeEventListener('mouseup', preventMouseUp)
+          target.removeEventListener('blur', cleanup)
+        }
+        target.addEventListener('blur', cleanup)
+      }
+    } catch {
+      // ignore
+    }
+    // 执行用户原有逻辑
+    userOnFocus?.(...args, toolbarState.getAllValues(), toolbarState)
+  }
+
+  if (key) {
+    const userOnFocusCapture = processedEvents.onFocusCapture
+    processedEvents.onFocusCapture = (...args: any[]) => {
+      // capture 阶段优先标记“聚焦态”，确保 formatter 在同一事件周期内可读到最新状态
+      focusState?.set(key, true)
+      userOnFocusCapture?.(...args)
+    }
+
+    const userOnBlurCapture = processedEvents.onBlurCapture
+    processedEvents.onBlurCapture = (...args: any[]) => {
+      // capture 阶段优先标记“失焦态”，避免 InputNumber 内部 onBlur flush 时仍被认为是聚焦态
+      focusState?.set(key, false)
+      userOnBlurCapture?.(...args)
+    }
+
+    const userOnBlur = processedEvents.onBlur
+    processedEvents.onBlur = (...args: any[]) => {
+      focusState?.set(key, false)
+      userOnBlur?.(...args)
+    }
+  }
+
+  // 如果需要自动聚焦，添加ref处理
+  if (finalProps.autoFocus) {
+    processedEvents.ref = (el: Element | ComponentPublicInstance | null) => {
+      const element = el as HTMLElement
+      if (element) {
+        // 使用nextTick确保DOM已经渲染完成
+        nextTick(() => {
+          try {
+            element?.focus?.()
+          } catch {
+            // 忽略焦点设置失败的错误
+          }
+        })
+      }
+    }
+  }
+
+  // 构建插槽对象
+  const slotsObject: Record<string, () => VNode | undefined> = {}
+  if (slots) {
+    if (slots.addonBefore) {
+      slotsObject.addonBefore = () => renderSlotContent(slots.addonBefore!, toolbarState)
+    }
+    if (slots.addonAfter) {
+      slotsObject.addonAfter = () => renderSlotContent(slots.addonAfter!, toolbarState)
+    }
+    if (slots.prefix) {
+      slotsObject.prefix = () => renderSlotContent(slots.prefix!, toolbarState)
+    }
+    if (slots.suffix) {
+      slotsObject.suffix = () => renderSlotContent(slots.suffix!, toolbarState)
+    }
+  }
+
+  const Comp = markRaw(InputNumber)
+  return (
+    <Comp
+      key={key}
+      value={
+        toolbarState.getValue(key) !== undefined
+          ? toolbarState.getValue(key)
+          : (finalProps.value ?? null)
+      }
+      {...finalProps}
+      {...processedEvents}
+      v-slots={slotsObject}
+    />
+  )
+}

package/src/render/InputPassword.tsx

@@ -1,81 +1,81 @@
-import { InputPassword } from '@antsoo-lib/components'
-import type { InputProps } from '@antsoo-lib/components'
-import type { VoidFunction } from '@antsoo-lib/shared'
-import { isFunction } from '@antsoo-lib/utils'
-
-import { markRaw } from 'vue'
-import type { VNode } from 'vue'
-
-import { renderSlotContent } from './helper'
-import type { ToolbarState } from './state'
-import type { InputPasswordToolbarItem, ToolbarItem } from './types'
-
-export function renderInputPassword(item: ToolbarItem, toolbarState: ToolbarState): VNode {
-  const inputItem = item as InputPasswordToolbarItem
-  const { key, events = {}, slots } = inputItem
-  const { props = {}, disabled = false } = item
-
-  const isDisabled = isFunction(disabled)
-    ? disabled(toolbarState.getAllValues(), toolbarState)
-    : disabled
-  const finalProps: Partial<InputProps> & { disabled?: boolean; value?: string } = {
-    ...props,
-    disabled: isDisabled,
-  }
-
-  // 处理事件，注入工具栏状态
-  const processedEvents: Record<string, VoidFunction> = {}
-  Object.keys(events).forEach((eventName) => {
-    processedEvents[eventName] = (...args: any[]) => {
-      if (eventName === 'onUpdate:value') {
-        toolbarState.setValue(key, args[0])
-      } else if (eventName === 'onChange') {
-        const firstArg = args[0]
-        const hasTarget = firstArg && typeof firstArg === 'object' && 'target' in firstArg
-        const nextVal = hasTarget ? firstArg.target?.value : undefined
-        if (nextVal !== undefined) toolbarState.setValue(key, nextVal)
-      }
-
-      // 调用原始事件处理函数
-      events[eventName]?.(...args, toolbarState.getAllValues(), toolbarState)
-    }
-  })
-
-  // 如果没有设置onChange事件，添加默认的状态更新
-  if (!processedEvents['onUpdate:value'] && !processedEvents.onChange) {
-    processedEvents['onUpdate:value'] = (value: string) => {
-      toolbarState.setValue(key, value)
-    }
-  }
-
-  // 构建插槽对象
-  const slotsObject: Record<string, () => VNode | undefined> = {}
-  if (slots) {
-    if (slots.addonBefore) {
-      slotsObject.addonBefore = () => renderSlotContent(slots.addonBefore!, toolbarState)
-    }
-    if (slots.addonAfter) {
-      slotsObject.addonAfter = () => renderSlotContent(slots.addonAfter!, toolbarState)
-    }
-    if (slots.prefix) {
-      slotsObject.prefix = () => renderSlotContent(slots.prefix!, toolbarState)
-    }
-    if (slots.suffix) {
-      slotsObject.suffix = () => renderSlotContent(slots.suffix!, toolbarState)
-    }
-  }
-
-  const Comp = markRaw(InputPassword)
-  return (
-    <Comp
-      key={key}
-      value={toolbarState.getValue(key) || finalProps.value || ''}
-      allowClear
-      autocomplete="new-password"
-      maxlength={50}
-      {...finalProps}
-      {...processedEvents}
-      v-slots={slotsObject}
-    />
-  )
-}
+import { InputPassword } from '@antsoo-lib/components'
+import type { InputProps } from '@antsoo-lib/components'
+import type { VoidFunction } from '@antsoo-lib/shared'
+import { isFunction } from '@antsoo-lib/utils'
+
+import { markRaw } from 'vue'
+import type { VNode } from 'vue'
+
+import { renderSlotContent } from './helper'
+import type { ToolbarState } from './state'
+import type { InputPasswordToolbarItem, ToolbarItem } from './types'
+
+export function renderInputPassword(item: ToolbarItem, toolbarState: ToolbarState): VNode {
+  const inputItem = item as InputPasswordToolbarItem
+  const { key, events = {}, slots } = inputItem
+  const { props = {}, disabled = false } = item
+
+  const isDisabled = isFunction(disabled)
+    ? disabled(toolbarState.getAllValues(), toolbarState)
+    : disabled
+  const finalProps: Partial<InputProps> & { disabled?: boolean; value?: string } = {
+    ...props,
+    disabled: isDisabled,
+  }
+
+  // 处理事件，注入工具栏状态
+  const processedEvents: Record<string, VoidFunction> = {}
+  Object.keys(events).forEach((eventName) => {
+    processedEvents[eventName] = (...args: any[]) => {
+      if (eventName === 'onUpdate:value') {
+        toolbarState.setValue(key, args[0])
+      } else if (eventName === 'onChange') {
+        const firstArg = args[0]
+        const hasTarget = firstArg && typeof firstArg === 'object' && 'target' in firstArg
+        const nextVal = hasTarget ? firstArg.target?.value : undefined
+        if (nextVal !== undefined) toolbarState.setValue(key, nextVal)
+      }
+
+      // 调用原始事件处理函数
+      events[eventName]?.(...args, toolbarState.getAllValues(), toolbarState)
+    }
+  })
+
+  // 如果没有设置onChange事件，添加默认的状态更新
+  if (!processedEvents['onUpdate:value'] && !processedEvents.onChange) {
+    processedEvents['onUpdate:value'] = (value: string) => {
+      toolbarState.setValue(key, value)
+    }
+  }
+
+  // 构建插槽对象
+  const slotsObject: Record<string, () => VNode | undefined> = {}
+  if (slots) {
+    if (slots.addonBefore) {
+      slotsObject.addonBefore = () => renderSlotContent(slots.addonBefore!, toolbarState)
+    }
+    if (slots.addonAfter) {
+      slotsObject.addonAfter = () => renderSlotContent(slots.addonAfter!, toolbarState)
+    }
+    if (slots.prefix) {
+      slotsObject.prefix = () => renderSlotContent(slots.prefix!, toolbarState)
+    }
+    if (slots.suffix) {
+      slotsObject.suffix = () => renderSlotContent(slots.suffix!, toolbarState)
+    }
+  }
+
+  const Comp = markRaw(InputPassword)
+  return (
+    <Comp
+      key={key}
+      value={toolbarState.getValue(key) || finalProps.value || ''}
+      allowClear
+      autocomplete="new-password"
+      maxlength={50}
+      {...finalProps}
+      {...processedEvents}
+      v-slots={slotsObject}
+    />
+  )
+}