@antsoo-lib/core 3.0.0 → 3.0.1

package/src/render/SselectPage.tsx

@@ -1,107 +1,107 @@
-import type { VoidFunction } from '@antsoo-lib/shared'
-import { isFunction } from '@antsoo-lib/utils'
-
-import { computed, markRaw, nextTick } from 'vue'
-import type { ComponentPublicInstance, VNode } from 'vue'
-
-import { getRegisteredComponent } from './registry'
-import type { ToolbarState } from './state'
-import type { SselectPageProps, SselectPageToolbarItem, ToolbarItem } from './types'
-
-export function renderSselectPage(item: ToolbarItem, toolbarState: ToolbarState): VNode {
-  const sselectPageItem = item as SselectPageToolbarItem
-  const { key, events = {} } = sselectPageItem
-  const { props = {} as SselectPageProps, disabled = false } = sselectPageItem
-
-  // 处理动态禁用逻辑
-  const isDisabled = isFunction(disabled)
-    ? disabled(toolbarState.getAllValues(), toolbarState)
-    : disabled
-
-  // 处理事件，注入工具栏状态
-  const processedEvents: Record<string, VoidFunction> = {}
-  Object.keys(events).forEach((eventName) => {
-    processedEvents[eventName] = (...args: any[]) => {
-      // 对于 SselectPage，先更新状态，再调用外部事件处理函数
-      if (eventName === 'onUpdate:value' || eventName === 'onChange') {
-        const value = args[0] // SselectPage 的第一个参数是选中的值
-        // 立即更新工具栏状态，确保外部事件处理函数能获取到最新值
-        toolbarState.setValue(key, value)
-
-        // 对于 onChange 事件，使用 nextTick 确保在下一个 tick 中执行外部处理函数
-        if (eventName === 'onChange') {
-          nextTick(() => {
-            ;(events[eventName] as VoidFunction)?.(
-              ...args,
-              toolbarState.getAllValues(),
-              toolbarState,
-            )
-          })
-          return // 提前返回，避免重复执行
-        }
-      }
-
-      // 调用原始事件处理函数，传入完整的上下文
-      events[eventName]?.(...args, toolbarState.getAllValues(), toolbarState)
-    }
-  })
-
-  // 如果没有设置 onChange 事件，添加默认的状态更新
-  if (!processedEvents['onUpdate:value'] && !processedEvents.onChange) {
-    processedEvents['onUpdate:value'] = (value: any) => {
-      toolbarState.setValue(key, value)
-    }
-  }
-
-  // 处理 extraParams 的响应式更新
-  // 如果 props.extraParams 是函数，则动态计算
-  const computedProps = computed(() => {
-    const allValues = toolbarState.getAllValues()
-    const dynamicProps: any = { ...props, disabled: isDisabled }
-
-    // 动态计算 extraParams
-    if (isFunction(props.extraParams)) {
-      dynamicProps.extraParams = props.extraParams(allValues, toolbarState)
-    }
-
-    return dynamicProps
-  })
-
-  // 如果需要自动聚焦，添加 ref 处理
-  if (props.autoFocus) {
-    processedEvents.ref = (el: ComponentPublicInstance | null) => {
-      const component = el
-      if (component) {
-        // 使用 nextTick 确保 DOM 已经渲染完成
-        nextTick(() => {
-          try {
-            ;(component as any)?.$refs?.selectRef?.focus?.()
-          } catch {
-            // 忽略焦点设置失败的错误
-          }
-        })
-      }
-    }
-  }
-
-  // 计算安全的默认值
-  const rawVal = toolbarState.getValue(key)
-  const propVal = props.value
-  const safeValue =
-    rawVal !== undefined && rawVal !== null
-      ? rawVal
-      : propVal !== undefined && propVal !== null
-        ? propVal
-        : undefined
-
-  const SselectPageComponent = getRegisteredComponent('SselectPage')
-  if (!SselectPageComponent) {
-    console.warn('BaseTable: SselectPage component is not registered.')
-    return <span style={{ color: 'red' }}>SselectPage component missing</span>
-  }
-
-  const Comp = markRaw(SselectPageComponent) as any
-  return (
-    <Comp key={key} value={safeValue} allowClear {...computedProps.value} {...processedEvents} />
-  )
-}
+import type { VoidFunction } from '@antsoo-lib/shared'
+import { isFunction } from '@antsoo-lib/utils'
+
+import { computed, markRaw, nextTick } from 'vue'
+import type { ComponentPublicInstance, VNode } from 'vue'
+
+import { getRegisteredComponent } from './registry'
+import type { ToolbarState } from './state'
+import type { SselectPageProps, SselectPageToolbarItem, ToolbarItem } from './types'
+
+export function renderSselectPage(item: ToolbarItem, toolbarState: ToolbarState): VNode {
+  const sselectPageItem = item as SselectPageToolbarItem
+  const { key, events = {} } = sselectPageItem
+  const { props = {} as SselectPageProps, disabled = false } = sselectPageItem
+
+  // 处理动态禁用逻辑
+  const isDisabled = isFunction(disabled)
+    ? disabled(toolbarState.getAllValues(), toolbarState)
+    : disabled
+
+  // 处理事件，注入工具栏状态
+  const processedEvents: Record<string, VoidFunction> = {}
+  Object.keys(events).forEach((eventName) => {
+    processedEvents[eventName] = (...args: any[]) => {
+      // 对于 SselectPage，先更新状态，再调用外部事件处理函数
+      if (eventName === 'onUpdate:value' || eventName === 'onChange') {
+        const value = args[0] // SselectPage 的第一个参数是选中的值
+        // 立即更新工具栏状态，确保外部事件处理函数能获取到最新值
+        toolbarState.setValue(key, value)
+
+        // 对于 onChange 事件，使用 nextTick 确保在下一个 tick 中执行外部处理函数
+        if (eventName === 'onChange') {
+          nextTick(() => {
+            ;(events[eventName] as VoidFunction)?.(
+              ...args,
+              toolbarState.getAllValues(),
+              toolbarState,
+            )
+          })
+          return // 提前返回，避免重复执行
+        }
+      }
+
+      // 调用原始事件处理函数，传入完整的上下文
+      events[eventName]?.(...args, toolbarState.getAllValues(), toolbarState)
+    }
+  })
+
+  // 如果没有设置 onChange 事件，添加默认的状态更新
+  if (!processedEvents['onUpdate:value'] && !processedEvents.onChange) {
+    processedEvents['onUpdate:value'] = (value: any) => {
+      toolbarState.setValue(key, value)
+    }
+  }
+
+  // 处理 extraParams 的响应式更新
+  // 如果 props.extraParams 是函数，则动态计算
+  const computedProps = computed(() => {
+    const allValues = toolbarState.getAllValues()
+    const dynamicProps: any = { ...props, disabled: isDisabled }
+
+    // 动态计算 extraParams
+    if (isFunction(props.extraParams)) {
+      dynamicProps.extraParams = props.extraParams(allValues, toolbarState)
+    }
+
+    return dynamicProps
+  })
+
+  // 如果需要自动聚焦，添加 ref 处理
+  if (props.autoFocus) {
+    processedEvents.ref = (el: ComponentPublicInstance | null) => {
+      const component = el
+      if (component) {
+        // 使用 nextTick 确保 DOM 已经渲染完成
+        nextTick(() => {
+          try {
+            ;(component as any)?.$refs?.selectRef?.focus?.()
+          } catch {
+            // 忽略焦点设置失败的错误
+          }
+        })
+      }
+    }
+  }
+
+  // 计算安全的默认值
+  const rawVal = toolbarState.getValue(key)
+  const propVal = props.value
+  const safeValue =
+    rawVal !== undefined && rawVal !== null
+      ? rawVal
+      : propVal !== undefined && propVal !== null
+        ? propVal
+        : undefined
+
+  const SselectPageComponent = getRegisteredComponent('SselectPage')
+  if (!SselectPageComponent) {
+    console.warn('BaseTable: SselectPage component is not registered.')
+    return <span style={{ color: 'red' }}>SselectPage component missing</span>
+  }
+
+  const Comp = markRaw(SselectPageComponent) as any
+  return (
+    <Comp key={key} value={safeValue} allowClear {...computedProps.value} {...processedEvents} />
+  )
+}

package/src/render/Switch.tsx

@@ -1,60 +1,60 @@
-import { Switch } from '@antsoo-lib/components'
-import type { SwitchProps } 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 type { ToolbarState } from './state'
-import type { SwitchToolbarItem, ToolbarItem } from './types'
-
-// 开关渲染函数
-export function renderSwitch(item: ToolbarItem, toolbarState: ToolbarState): VNode {
-  const { key, events = {} } = item
-  const switchItem = item as SwitchToolbarItem
-  const { props = {}, disabled = false } = switchItem
-  // SwitchProps doesn't have 'value', it uses 'checked'.
-  // Remove 'value' to avoid warning if passed by mistake
-  const { value: _ignored, ...otherProps } = props as any
-
-  const isDisabled = isFunction(disabled)
-    ? disabled(toolbarState.getAllValues(), toolbarState)
-    : disabled
-  const finalProps: Partial<SwitchProps> & { disabled?: boolean; checked?: boolean } = {
-    ...otherProps,
-    disabled: isDisabled,
-  }
-
-  // 处理事件，注入工具栏状态
-  const processedEvents: Record<string, VoidFunction> = {}
-  Object.keys(events).forEach((eventName) => {
-    processedEvents[eventName] = (...args: any[]) => {
-      // 对于开关，自动更新状态
-      if (eventName === 'onUpdate:checked' || eventName === 'onChange') {
-        const checked = args[0]?.target?.checked ?? args[0]
-        toolbarState.setValue(key, checked)
-      }
-
-      // 调用原始事件处理函数
-      events[eventName]?.(...args, toolbarState.getAllValues(), toolbarState)
-    }
-  })
-
-  // 如果没有设置onChange事件，添加默认的状态更新
-  if (!processedEvents['onUpdate:checked'] && !processedEvents.onChange) {
-    processedEvents['onUpdate:checked'] = (checked: boolean) => {
-      toolbarState.setValue(key, checked)
-    }
-  }
-
-  const Comp = markRaw(Switch)
-  return (
-    <Comp
-      key={key}
-      checked={toolbarState.getValue(key) ?? finalProps.checked ?? false}
-      {...finalProps}
-      {...processedEvents}
-    />
-  )
-}
+import { Switch } from '@antsoo-lib/components'
+import type { SwitchProps } 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 type { ToolbarState } from './state'
+import type { SwitchToolbarItem, ToolbarItem } from './types'
+
+// 开关渲染函数
+export function renderSwitch(item: ToolbarItem, toolbarState: ToolbarState): VNode {
+  const { key, events = {} } = item
+  const switchItem = item as SwitchToolbarItem
+  const { props = {}, disabled = false } = switchItem
+  // SwitchProps doesn't have 'value', it uses 'checked'.
+  // Remove 'value' to avoid warning if passed by mistake
+  const { value: _ignored, ...otherProps } = props as any
+
+  const isDisabled = isFunction(disabled)
+    ? disabled(toolbarState.getAllValues(), toolbarState)
+    : disabled
+  const finalProps: Partial<SwitchProps> & { disabled?: boolean; checked?: boolean } = {
+    ...otherProps,
+    disabled: isDisabled,
+  }
+
+  // 处理事件，注入工具栏状态
+  const processedEvents: Record<string, VoidFunction> = {}
+  Object.keys(events).forEach((eventName) => {
+    processedEvents[eventName] = (...args: any[]) => {
+      // 对于开关，自动更新状态
+      if (eventName === 'onUpdate:checked' || eventName === 'onChange') {
+        const checked = args[0]?.target?.checked ?? args[0]
+        toolbarState.setValue(key, checked)
+      }
+
+      // 调用原始事件处理函数
+      events[eventName]?.(...args, toolbarState.getAllValues(), toolbarState)
+    }
+  })
+
+  // 如果没有设置onChange事件，添加默认的状态更新
+  if (!processedEvents['onUpdate:checked'] && !processedEvents.onChange) {
+    processedEvents['onUpdate:checked'] = (checked: boolean) => {
+      toolbarState.setValue(key, checked)
+    }
+  }
+
+  const Comp = markRaw(Switch)
+  return (
+    <Comp
+      key={key}
+      checked={toolbarState.getValue(key) ?? finalProps.checked ?? false}
+      {...finalProps}
+      {...processedEvents}
+    />
+  )
+}

package/src/render/Tree.tsx

@@ -1,136 +1,136 @@
-import { Tree } from '@antsoo-lib/components'
-import type { AnyObject } from '@antsoo-lib/shared'
-import { isFunction } from '@antsoo-lib/utils'
-
-import { markRaw } from 'vue'
-import type { VNode } from 'vue'
-
-import type { ToolbarState } from './state'
-import type { ToolbarItem, TreeToolbarItem } from './types'
-
-/**
- * 按工具栏项缓存树展开状态，避免表单重渲染后丢失展开态
- */
-const treeExpandedKeysCache = new WeakMap<object, any[]>()
-
-/**
- * 解析树组件选中值
- * @description 优先级：formValues -> toolbarState -> props.checkedKeys
- */
-function resolveTreeCheckedKeys(
-  key: string | undefined,
-  props: AnyObject,
-  toolbarState: ToolbarState,
-  formValues?: AnyObject,
-): any[] {
-  if (key && formValues && formValues[key] !== undefined) {
-    return formValues[key] ?? []
-  }
-  if (key) {
-    const stateValue = toolbarState.getValue(key)
-    if (stateValue !== undefined) {
-      return stateValue ?? []
-    }
-  }
-  const propValue = props?.checkedKeys
-  if (isFunction(propValue)) {
-    return propValue(toolbarState.getAllValues(), toolbarState) ?? []
-  }
-  return propValue ?? []
-}
-
-/**
- * 标准化树勾选值
- * @description 兼容 strict 模式下 { checked, halfChecked } 结构
- */
-function normalizeCheckedKeys(value: any): any {
-  if (Array.isArray(value)) return value
-  if (value && typeof value === 'object' && Array.isArray(value.checked)) return value.checked
-  return value
-}
-
-/**
- * 渲染树控件
- * @description 提供 checkedKeys 与 expandedKeys 的同步能力，并桥接到 CoreForm 事件系统
- */
-export function renderTree(
-  item: ToolbarItem,
-  toolbarState: ToolbarState,
-  formValues?: AnyObject,
-): VNode {
-  const treeItem = item as TreeToolbarItem
-  const { key, events = {} } = treeItem
-  const { props = {}, disabled } = treeItem
-  const finalDisabled = isFunction(disabled)
-    ? disabled(toolbarState.getAllValues(), toolbarState)
-    : disabled
-
-  const { treeData: originalTreeData, ...otherProps } = props as AnyObject
-  const treeData = (() => {
-    if (isFunction(originalTreeData)) {
-      return originalTreeData(toolbarState.getAllValues())
-    }
-    if (originalTreeData && typeof originalTreeData === 'object' && 'value' in originalTreeData) {
-      return (originalTreeData as AnyObject).value || []
-    }
-    return originalTreeData || []
-  })()
-
-  const allValues = () => toolbarState.getAllValues()
-  const cachedExpanded = treeExpandedKeysCache.get(treeItem as object)
-  const expandedKeys = (props as AnyObject).expandedKeys ?? cachedExpanded
-
-  /**
-   * 同步勾选键值
-   */
-  const syncCheckedKeys = (value: any) => {
-    const normalized = normalizeCheckedKeys(value)
-    if (key) {
-      toolbarState.setValue(key, normalized)
-    }
-    const values = allValues()
-    events['onUpdate:checkedKeys']?.(normalized, values, toolbarState)
-    ;(events as AnyObject)['onUpdate:value']?.(normalized, values, toolbarState)
-    events.onChange?.(normalized, values, toolbarState)
-  }
-
-  /**
-   * 同步展开键值
-   */
-  const syncExpandedKeys = (value: any) => {
-    treeExpandedKeysCache.set(treeItem as object, value)
-    const values = allValues()
-    ;(events as AnyObject)['onUpdate:expandedKeys']?.(value, values, toolbarState)
-    ;(events as AnyObject).onExpand?.(value, values, toolbarState)
-  }
-
-  const Comp = markRaw(Tree)
-  return (
-    <div
-      style={{
-        border: '1px solid rgba(228, 229, 235, 1)',
-        borderRadius: '6px',
-        padding: '8px 0 8px 8px',
-      }}
-    >
-      <Comp
-        key={key}
-        checkedKeys={resolveTreeCheckedKeys(key, props as AnyObject, toolbarState, formValues)}
-        treeData={treeData}
-        disabled={finalDisabled}
-        {...(expandedKeys !== undefined ? { expandedKeys } : {})}
-        {...otherProps}
-        onUpdate:checkedKeys={syncCheckedKeys}
-        onCheck={(checked: any, info: any) => {
-          syncCheckedKeys(checked)
-          ;(events as AnyObject).onCheck?.(checked, info, allValues(), toolbarState)
-        }}
-        onUpdate:expandedKeys={syncExpandedKeys}
-        onExpand={(keys: any, info: any) => {
-          syncExpandedKeys(keys)
-          ;(events as AnyObject).onExpand?.(keys, info, allValues(), toolbarState)
-        }}
-      />
-    </div>
-  )
-}
+import { Tree } from '@antsoo-lib/components'
+import type { AnyObject } from '@antsoo-lib/shared'
+import { isFunction } from '@antsoo-lib/utils'
+
+import { markRaw } from 'vue'
+import type { VNode } from 'vue'
+
+import type { ToolbarState } from './state'
+import type { ToolbarItem, TreeToolbarItem } from './types'
+
+/**
+ * 按工具栏项缓存树展开状态，避免表单重渲染后丢失展开态
+ */
+const treeExpandedKeysCache = new WeakMap<object, any[]>()
+
+/**
+ * 解析树组件选中值
+ * @description 优先级：formValues -> toolbarState -> props.checkedKeys
+ */
+function resolveTreeCheckedKeys(
+  key: string | undefined,
+  props: AnyObject,
+  toolbarState: ToolbarState,
+  formValues?: AnyObject,
+): any[] {
+  if (key && formValues && formValues[key] !== undefined) {
+    return formValues[key] ?? []
+  }
+  if (key) {
+    const stateValue = toolbarState.getValue(key)
+    if (stateValue !== undefined) {
+      return stateValue ?? []
+    }
+  }
+  const propValue = props?.checkedKeys
+  if (isFunction(propValue)) {
+    return propValue(toolbarState.getAllValues(), toolbarState) ?? []
+  }
+  return propValue ?? []
+}
+
+/**
+ * 标准化树勾选值
+ * @description 兼容 strict 模式下 { checked, halfChecked } 结构
+ */
+function normalizeCheckedKeys(value: any): any {
+  if (Array.isArray(value)) return value
+  if (value && typeof value === 'object' && Array.isArray(value.checked)) return value.checked
+  return value
+}
+
+/**
+ * 渲染树控件
+ * @description 提供 checkedKeys 与 expandedKeys 的同步能力，并桥接到 CoreForm 事件系统
+ */
+export function renderTree(
+  item: ToolbarItem,
+  toolbarState: ToolbarState,
+  formValues?: AnyObject,
+): VNode {
+  const treeItem = item as TreeToolbarItem
+  const { key, events = {} } = treeItem
+  const { props = {}, disabled } = treeItem
+  const finalDisabled = isFunction(disabled)
+    ? disabled(toolbarState.getAllValues(), toolbarState)
+    : disabled
+
+  const { treeData: originalTreeData, ...otherProps } = props as AnyObject
+  const treeData = (() => {
+    if (isFunction(originalTreeData)) {
+      return originalTreeData(toolbarState.getAllValues())
+    }
+    if (originalTreeData && typeof originalTreeData === 'object' && 'value' in originalTreeData) {
+      return (originalTreeData as AnyObject).value || []
+    }
+    return originalTreeData || []
+  })()
+
+  const allValues = () => toolbarState.getAllValues()
+  const cachedExpanded = treeExpandedKeysCache.get(treeItem as object)
+  const expandedKeys = (props as AnyObject).expandedKeys ?? cachedExpanded
+
+  /**
+   * 同步勾选键值
+   */
+  const syncCheckedKeys = (value: any) => {
+    const normalized = normalizeCheckedKeys(value)
+    if (key) {
+      toolbarState.setValue(key, normalized)
+    }
+    const values = allValues()
+    events['onUpdate:checkedKeys']?.(normalized, values, toolbarState)
+    ;(events as AnyObject)['onUpdate:value']?.(normalized, values, toolbarState)
+    events.onChange?.(normalized, values, toolbarState)
+  }
+
+  /**
+   * 同步展开键值
+   */
+  const syncExpandedKeys = (value: any) => {
+    treeExpandedKeysCache.set(treeItem as object, value)
+    const values = allValues()
+    ;(events as AnyObject)['onUpdate:expandedKeys']?.(value, values, toolbarState)
+    ;(events as AnyObject).onExpand?.(value, values, toolbarState)
+  }
+
+  const Comp = markRaw(Tree)
+  return (
+    <div
+      style={{
+        border: '1px solid rgba(228, 229, 235, 1)',
+        borderRadius: '6px',
+        padding: '8px 0 8px 8px',
+      }}
+    >
+      <Comp
+        key={key}
+        checkedKeys={resolveTreeCheckedKeys(key, props as AnyObject, toolbarState, formValues)}
+        treeData={treeData}
+        disabled={finalDisabled}
+        {...(expandedKeys !== undefined ? { expandedKeys } : {})}
+        {...otherProps}
+        onUpdate:checkedKeys={syncCheckedKeys}
+        onCheck={(checked: any, info: any) => {
+          syncCheckedKeys(checked)
+          ;(events as AnyObject).onCheck?.(checked, info, allValues(), toolbarState)
+        }}
+        onUpdate:expandedKeys={syncExpandedKeys}
+        onExpand={(keys: any, info: any) => {
+          syncExpandedKeys(keys)
+          ;(events as AnyObject).onExpand?.(keys, info, allValues(), toolbarState)
+        }}
+      />
+    </div>
+  )
+}