@antsoo-lib/core 2.0.5 → 3.0.1

package/src/index.ts

@@ -1,17 +1,17 @@
-import BaseSearch from './BaseSearch/index.vue'
-import BaseTable from './BaseTable/index.vue'
-import CoreForm from './Form/CoreForm.vue'
-import SSelectPage from './SSelectPage/index.vue'
-import { registerRenderer } from './render'
-import type { Renderer } from './render'
-
-export { BaseSearch, BaseTable, CoreForm, registerRenderer, SSelectPage }
-export type { Renderer }
-
-export const version = '0.0.0'
-
-export * from './render/registry'
-export * from './render/types'
-export * from './render/state'
-export * from './render'
-export * from './Form/types'
+import BaseSearch from './BaseSearch/index.vue'
+import BaseTable from './BaseTable/index.vue'
+import CoreForm from './Form/CoreForm.vue'
+import SSelectPage from './SSelectPage/index.vue'
+import { registerRenderer } from './render'
+import type { Renderer } from './render'
+
+export { BaseSearch, BaseTable, CoreForm, registerRenderer, SSelectPage }
+export type { Renderer }
+
+export const version = '0.0.0'
+
+export * from './render/registry'
+export * from './render/types'
+export * from './render/state'
+export * from './render'
+export * from './Form/types'

package/src/render/AreaCascader.tsx

@@ -1,64 +1,64 @@
-import type { AnyObject } from '@antsoo-lib/shared'
-import { isFunction } from '@antsoo-lib/utils'
-
-import { markRaw } from 'vue'
-import type { VNode } from 'vue'
-
-import { getRegisteredComponent } from './registry'
-import type { ToolbarState } from './state'
-import type { AreaCascaderProps, AreaCascaderToolbarItem } from './types'
-
-// 渲染地区级联选择器
-export function renderAreaCascader(
-  config: AreaCascaderToolbarItem,
-  toolbarState: ToolbarState,
-  allValues?: AnyObject,
-): VNode {
-  const { key = '', props = {}, events = {}, disabled = false } = config
-
-  // 处理动态禁用逻辑
-  const isDisabled = isFunction(disabled)
-    ? disabled(toolbarState.getAllValues(), toolbarState)
-    : disabled
-  const finalProps: AreaCascaderProps = { ...props, disabled: isDisabled }
-
-  // 计算安全的当前值（优先取 toolbarState，再兜底 props.value），不做任何业务级聚合
-  const safeValue =
-    toolbarState.getValue(key) !== undefined ? toolbarState.getValue(key) : props.value
-
-  // 处理事件，统一注入上下文，保持中立
-  const processedEvents: AnyObject = {}
-  Object.keys(events).forEach((eventName) => {
-    const handler = events[eventName as keyof typeof events]
-    if (!handler || !isFunction(handler)) return
-    const normalizedName = eventName.startsWith('on')
-      ? eventName
-      : `on${eventName.charAt(0).toUpperCase()}${eventName.slice(1)}`
-    processedEvents[normalizedName] = (...args: any[]) => {
-      handler(...args, allValues ?? toolbarState.getAllValues(), toolbarState)
-    }
-  })
-
-  // 默认的 v-model 更新（仅当存在 key 时写入状态）
-  if (!processedEvents['onUpdate:value']) {
-    processedEvents['onUpdate:value'] = (val: any) => {
-      if (key) toolbarState.setValue(key, val)
-    }
-  }
-
-  const AreaCascaderComp = getRegisteredComponent('AreaCascader')
-  if (!AreaCascaderComp) {
-    return <span style={{ color: 'red' }}>AreaCascader component missing</span>
-  }
-
-  const Comp = markRaw(AreaCascaderComp) as any
-  return (
-    <Comp
-      key={key}
-      value={safeValue}
-      {...finalProps}
-      {...(config.attr ? { attr: config.attr } : {})}
-      {...processedEvents}
-    />
-  )
-}
+import type { AnyObject } from '@antsoo-lib/shared'
+import { isFunction } from '@antsoo-lib/utils'
+
+import { markRaw } from 'vue'
+import type { VNode } from 'vue'
+
+import { getRegisteredComponent } from './registry'
+import type { ToolbarState } from './state'
+import type { AreaCascaderProps, AreaCascaderToolbarItem } from './types'
+
+// 渲染地区级联选择器
+export function renderAreaCascader(
+  config: AreaCascaderToolbarItem,
+  toolbarState: ToolbarState,
+  allValues?: AnyObject,
+): VNode {
+  const { key = '', props = {}, events = {}, disabled = false } = config
+
+  // 处理动态禁用逻辑
+  const isDisabled = isFunction(disabled)
+    ? disabled(toolbarState.getAllValues(), toolbarState)
+    : disabled
+  const finalProps: AreaCascaderProps = { ...props, disabled: isDisabled }
+
+  // 计算安全的当前值（优先取 toolbarState，再兜底 props.value），不做任何业务级聚合
+  const safeValue =
+    toolbarState.getValue(key) !== undefined ? toolbarState.getValue(key) : props.value
+
+  // 处理事件，统一注入上下文，保持中立
+  const processedEvents: AnyObject = {}
+  Object.keys(events).forEach((eventName) => {
+    const handler = events[eventName as keyof typeof events]
+    if (!handler || !isFunction(handler)) return
+    const normalizedName = eventName.startsWith('on')
+      ? eventName
+      : `on${eventName.charAt(0).toUpperCase()}${eventName.slice(1)}`
+    processedEvents[normalizedName] = (...args: any[]) => {
+      handler(...args, allValues ?? toolbarState.getAllValues(), toolbarState)
+    }
+  })
+
+  // 默认的 v-model 更新（仅当存在 key 时写入状态）
+  if (!processedEvents['onUpdate:value']) {
+    processedEvents['onUpdate:value'] = (val: any) => {
+      if (key) toolbarState.setValue(key, val)
+    }
+  }
+
+  const AreaCascaderComp = getRegisteredComponent('AreaCascader')
+  if (!AreaCascaderComp) {
+    return <span style={{ color: 'red' }}>AreaCascader component missing</span>
+  }
+
+  const Comp = markRaw(AreaCascaderComp) as any
+  return (
+    <Comp
+      key={key}
+      value={safeValue}
+      {...finalProps}
+      {...(config.attr ? { attr: config.attr } : {})}
+      {...processedEvents}
+    />
+  )
+}

package/src/render/AutoComplete.tsx

@@ -1,101 +1,101 @@
-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 { AutoCompleteToolbarItem, ToolbarItem } from './types'
-
-export function renderAutoComplete(item: ToolbarItem, toolbarState: ToolbarState): VNode {
-  const { key, events = {} } = item
-  const { props = {}, disabled = false } = item as AutoCompleteToolbarItem
-
-  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]?.(...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(dynamicProps.extraParams)) {
-      dynamicProps.extraParams = dynamicProps.extraParams(allValues, toolbarState)
-    }
-
-    return dynamicProps
-  })
-
-  // 如果需要自动聚焦，添加 ref 处理
-  if (props.autoFocus) {
-    processedEvents.ref = (el: Element | ComponentPublicInstance | null) => {
-      const component = el as ComponentPublicInstance
-      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 AutoCompleteComponent = getRegisteredComponent('AutoComplete')
-  if (!AutoCompleteComponent) {
-    console.warn('BaseTable: AutoComplete component is not registered.')
-    return <span style={{ color: 'red' }}>AutoComplete component missing</span>
-  }
-
-  const Comp = markRaw(AutoCompleteComponent) 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 { AutoCompleteToolbarItem, ToolbarItem } from './types'
+
+export function renderAutoComplete(item: ToolbarItem, toolbarState: ToolbarState): VNode {
+  const { key, events = {} } = item
+  const { props = {}, disabled = false } = item as AutoCompleteToolbarItem
+
+  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]?.(...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(dynamicProps.extraParams)) {
+      dynamicProps.extraParams = dynamicProps.extraParams(allValues, toolbarState)
+    }
+
+    return dynamicProps
+  })
+
+  // 如果需要自动聚焦，添加 ref 处理
+  if (props.autoFocus) {
+    processedEvents.ref = (el: Element | ComponentPublicInstance | null) => {
+      const component = el as ComponentPublicInstance
+      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 AutoCompleteComponent = getRegisteredComponent('AutoComplete')
+  if (!AutoCompleteComponent) {
+    console.warn('BaseTable: AutoComplete component is not registered.')
+    return <span style={{ color: 'red' }}>AutoComplete component missing</span>
+  }
+
+  const Comp = markRaw(AutoCompleteComponent) as any
+  return (
+    <Comp key={key} value={safeValue} allowClear {...computedProps.value} {...processedEvents} />
+  )
+}

package/src/render/Button.tsx

@@ -1,62 +1,62 @@
-import { Button } from '@antsoo-lib/components'
-import type { VoidFunction } from '@antsoo-lib/shared'
-
-import { reactive } from 'vue'
-import type { VNode } from 'vue'
-
-import type { ToolbarState } from './state'
-import type { ButtonToolbarItem, ToolbarItem } from './types'
-
-// 按钮渲染函数
-export function renderButton(item: ToolbarItem, toolbarState: ToolbarState): VNode {
-  const buttonItem = item as ButtonToolbarItem
-  const { key, props = {}, events = {}, disabled = false } = buttonItem
-  const reactiveProps = reactive({ ...props })
-
-  const isDisabled =
-    typeof disabled === 'function'
-      ? disabled(toolbarState.getAllValues(), toolbarState)
-      : !!disabled
-
-  // 为每个按钮创建独立的 loading 状态键
-  const loadingKey = `${key}_loading`
-
-  // 初始化按钮的 loading 状态（如果还未设置）
-  if (toolbarState.getValue(loadingKey) === undefined) {
-    toolbarState.setValue(loadingKey, false)
-  }
-
-  // 创建 loading 控制对象，传入事件方法中
-  const loadingControl = {
-    setLoading: (loading: boolean) => {
-      toolbarState.setValue(loadingKey, loading)
-    },
-    getLoading: () => {
-      return toolbarState.getValue(loadingKey) || false
-    },
-  }
-
-  // 处理事件，注入工具栏状态和 loading 控制
-  const processedEvents: Record<string, VoidFunction> = {}
-  Object.keys(events).forEach((eventName) => {
-    const eventHandler = events[eventName]
-    if (eventHandler) {
-      processedEvents[eventName] = (...args: any[]) => {
-        // 调用原始事件处理函数，并传入 loading 控制对象
-        eventHandler(loadingControl, toolbarState.getAllValues(), toolbarState, ...args)
-      }
-    }
-  })
-
-  const finalProps = {
-    ...reactiveProps,
-    disabled: isDisabled || reactiveProps.disabled || false,
-    loading: toolbarState.getValue(loadingKey) || reactiveProps.loading || false,
-  }
-
-  return (
-    <Button key={key} {...finalProps} {...processedEvents}>
-      {item.label || '按钮'}
-    </Button>
-  )
-}
+import { Button } from '@antsoo-lib/components'
+import type { VoidFunction } from '@antsoo-lib/shared'
+
+import { reactive } from 'vue'
+import type { VNode } from 'vue'
+
+import type { ToolbarState } from './state'
+import type { ButtonToolbarItem, ToolbarItem } from './types'
+
+// 按钮渲染函数
+export function renderButton(item: ToolbarItem, toolbarState: ToolbarState): VNode {
+  const buttonItem = item as ButtonToolbarItem
+  const { key, props = {}, events = {}, disabled = false } = buttonItem
+  const reactiveProps = reactive({ ...props })
+
+  const isDisabled =
+    typeof disabled === 'function'
+      ? disabled(toolbarState.getAllValues(), toolbarState)
+      : !!disabled
+
+  // 为每个按钮创建独立的 loading 状态键
+  const loadingKey = `${key}_loading`
+
+  // 初始化按钮的 loading 状态（如果还未设置）
+  if (toolbarState.getValue(loadingKey) === undefined) {
+    toolbarState.setValue(loadingKey, false)
+  }
+
+  // 创建 loading 控制对象，传入事件方法中
+  const loadingControl = {
+    setLoading: (loading: boolean) => {
+      toolbarState.setValue(loadingKey, loading)
+    },
+    getLoading: () => {
+      return toolbarState.getValue(loadingKey) || false
+    },
+  }
+
+  // 处理事件，注入工具栏状态和 loading 控制
+  const processedEvents: Record<string, VoidFunction> = {}
+  Object.keys(events).forEach((eventName) => {
+    const eventHandler = events[eventName]
+    if (eventHandler) {
+      processedEvents[eventName] = (...args: any[]) => {
+        // 调用原始事件处理函数，并传入 loading 控制对象
+        eventHandler(loadingControl, toolbarState.getAllValues(), toolbarState, ...args)
+      }
+    }
+  })
+
+  const finalProps = {
+    ...reactiveProps,
+    disabled: isDisabled || reactiveProps.disabled || false,
+    loading: toolbarState.getValue(loadingKey) || reactiveProps.loading || false,
+  }
+
+  return (
+    <Button key={key} {...finalProps} {...processedEvents}>
+      {item.label || '按钮'}
+    </Button>
+  )
+}

package/src/render/Cascader.tsx

@@ -1,45 +1,45 @@
-import type { AnyObject } from '@antsoo-lib/shared'
-import { isFunction } from '@antsoo-lib/utils'
-
-import { markRaw } from 'vue'
-import type { VNode } from 'vue'
-
-import { getRegisteredComponent } from './registry'
-import type { ToolbarState } from './state'
-import type { CascaderToolbarItem } from './types'
-
-// 渲染级联选择器
-export function renderCascader(
-  config: CascaderToolbarItem,
-  toolbarState: ToolbarState,
-  allValues: AnyObject,
-): VNode {
-  const { key = '', props = {}, events = {} } = config
-  const value = toolbarState.getValue(key)
-
-  // 处理事件
-  const cascaderEvents: AnyObject = {}
-  Object.keys(events).forEach((eventName) => {
-    const handler = events[eventName as keyof typeof events]
-    if (handler && isFunction(handler)) {
-      cascaderEvents[eventName] = (...args: any[]) => {
-        handler(...args, allValues, toolbarState)
-      }
-    }
-  })
-
-  // 特殊处理 update:value 事件
-  cascaderEvents['update:value'] = (val: any) => {
-    toolbarState.setValue(key, val)
-    events['onUpdate:value']?.(val, allValues, toolbarState)
-  }
-
-  // 渲染组件
-  const CascaderComp = getRegisteredComponent('Cascader')
-  if (!CascaderComp) {
-    return <span style={{ color: 'red' }}>Cascader component missing</span>
-  }
-
-  const Comp = markRaw(CascaderComp) as any
-  return <Comp value={value} {...props} {...cascaderEvents} />
-}
+import type { AnyObject } from '@antsoo-lib/shared'
+import { isFunction } from '@antsoo-lib/utils'
+
+import { markRaw } from 'vue'
+import type { VNode } from 'vue'
+
+import { getRegisteredComponent } from './registry'
+import type { ToolbarState } from './state'
+import type { CascaderToolbarItem } from './types'
+
+// 渲染级联选择器
+export function renderCascader(
+  config: CascaderToolbarItem,
+  toolbarState: ToolbarState,
+  allValues: AnyObject,
+): VNode {
+  const { key = '', props = {}, events = {} } = config
+  const value = toolbarState.getValue(key)
+
+  // 处理事件
+  const cascaderEvents: AnyObject = {}
+  Object.keys(events).forEach((eventName) => {
+    const handler = events[eventName as keyof typeof events]
+    if (handler && isFunction(handler)) {
+      cascaderEvents[eventName] = (...args: any[]) => {
+        handler(...args, allValues, toolbarState)
+      }
+    }
+  })
+
+  // 特殊处理 update:value 事件
+  cascaderEvents['update:value'] = (val: any) => {
+    toolbarState.setValue(key, val)
+    events['onUpdate:value']?.(val, allValues, toolbarState)
+  }
+
+  // 渲染组件
+  const CascaderComp = getRegisteredComponent('Cascader')
+  if (!CascaderComp) {
+    return <span style={{ color: 'red' }}>Cascader component missing</span>
+  }
+
+  const Comp = markRaw(CascaderComp) as any
+  return <Comp value={value} {...props} {...cascaderEvents} />
+}