@antsoo-lib/core 2.0.5 → 3.0.1

package/src/render/TreeSelect.tsx

@@ -1,81 +1,81 @@
-import { TreeSelect } from '@antsoo-lib/components'
-import type { VoidFunction } from '@antsoo-lib/shared'
-import { isFunction } from '@antsoo-lib/utils'
-
-import { computed, markRaw } from 'vue'
-import type { VNode } from 'vue'
-
-import type { ToolbarState } from './state'
-import type { ToolbarItem, TreeSelectToolbarItem } from './types'
-
-// 树选择器渲染函数
-export function renderTreeSelect(item: ToolbarItem, toolbarState: ToolbarState): VNode {
-  const treeItem = item as TreeSelectToolbarItem
-  const { key, events = {} } = treeItem
-  const processedEvents: Record<string, VoidFunction> = {}
-  const { props = {}, disabled = false } = treeItem
-
-  const isDisabled = isFunction(disabled)
-    ? disabled(toolbarState.getAllValues(), toolbarState)
-    : disabled
-
-  // 从props中提取treeData，避免在展开props时覆盖处理后的treeData
-  const { options: originalTreeData, ...otherProps } = props
-
-  // 响应式计算 treeData，增加对ref对象的处理
-  const computedTreeData = computed(() => {
-    if (isFunction(originalTreeData)) {
-      return originalTreeData(toolbarState.getAllValues())
-    }
-    // 处理ref对象
-    if (originalTreeData && typeof originalTreeData === 'object' && 'value' in originalTreeData) {
-      return originalTreeData.value || []
-    }
-    return originalTreeData || []
-  })
-
-  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)
-    }
-  }
-  // 计算安全的当前值
-  const rawVal = toolbarState.getValue(key)
-  const propVal = props.value
-  const isMulti = otherProps.multiple || otherProps.treeCheckable
-
-  const safeValue =
-    rawVal !== undefined && rawVal !== null
-      ? rawVal
-      : propVal !== undefined && propVal !== null
-        ? propVal
-        : isMulti
-          ? []
-          : undefined
-
-  const finalProps = { ...otherProps, disabled: isDisabled }
-
-  const Comp = markRaw(TreeSelect)
-  return (
-    <Comp
-      key={key}
-      value={safeValue}
-      {...finalProps}
-      treeData={computedTreeData.value as any[]}
-      {...processedEvents}
-    />
-  )
-}
+import { TreeSelect } from '@antsoo-lib/components'
+import type { VoidFunction } from '@antsoo-lib/shared'
+import { isFunction } from '@antsoo-lib/utils'
+
+import { computed, markRaw } from 'vue'
+import type { VNode } from 'vue'
+
+import type { ToolbarState } from './state'
+import type { ToolbarItem, TreeSelectToolbarItem } from './types'
+
+// 树选择器渲染函数
+export function renderTreeSelect(item: ToolbarItem, toolbarState: ToolbarState): VNode {
+  const treeItem = item as TreeSelectToolbarItem
+  const { key, events = {} } = treeItem
+  const processedEvents: Record<string, VoidFunction> = {}
+  const { props = {}, disabled = false } = treeItem
+
+  const isDisabled = isFunction(disabled)
+    ? disabled(toolbarState.getAllValues(), toolbarState)
+    : disabled
+
+  // 从props中提取treeData，避免在展开props时覆盖处理后的treeData
+  const { options: originalTreeData, ...otherProps } = props
+
+  // 响应式计算 treeData，增加对ref对象的处理
+  const computedTreeData = computed(() => {
+    if (isFunction(originalTreeData)) {
+      return originalTreeData(toolbarState.getAllValues())
+    }
+    // 处理ref对象
+    if (originalTreeData && typeof originalTreeData === 'object' && 'value' in originalTreeData) {
+      return originalTreeData.value || []
+    }
+    return originalTreeData || []
+  })
+
+  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)
+    }
+  }
+  // 计算安全的当前值
+  const rawVal = toolbarState.getValue(key)
+  const propVal = props.value
+  const isMulti = otherProps.multiple || otherProps.treeCheckable
+
+  const safeValue =
+    rawVal !== undefined && rawVal !== null
+      ? rawVal
+      : propVal !== undefined && propVal !== null
+        ? propVal
+        : isMulti
+          ? []
+          : undefined
+
+  const finalProps = { ...otherProps, disabled: isDisabled }
+
+  const Comp = markRaw(TreeSelect)
+  return (
+    <Comp
+      key={key}
+      value={safeValue}
+      {...finalProps}
+      treeData={computedTreeData.value as any[]}
+      {...processedEvents}
+    />
+  )
+}

package/src/render/Upload.tsx

@@ -1,91 +1,91 @@
-import type { UploadFile } 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 { getRegisteredComponent } from './registry'
-import type { ToolbarState } from './state'
-import type { ToolbarItem, UploadToolbarItem } from './types'
-
-// 上传渲染函数
-export function renderUpload(item: ToolbarItem, toolbarState: ToolbarState): VNode {
-  const uploadItem = item as UploadToolbarItem
-  const { key, events = {}, passage } = uploadItem
-  const { props = {}, disabled = false } = uploadItem
-
-  const isDisabled = isFunction(disabled)
-    ? disabled(toolbarState.getAllValues(), toolbarState)
-    : disabled
-  const allValues = toolbarState.getAllValues()
-
-  const resolveExtraParams = () => {
-    if (!props.extraParams) return {}
-    return isFunction(props.extraParams)
-      ? props.extraParams(allValues, toolbarState)
-      : props.extraParams
-  }
-
-  const apiConfig = props.api
-    ? {
-        url: props.api.url,
-        method: props.api.method || 'POST',
-        headers: props.api.headers || {},
-      }
-    : {
-        url: undefined as string | undefined, // 使用组件默认全局上传地址
-        method: 'POST',
-        headers: {},
-      }
-
-  // 当前表单值（期望：[{ name, path }]）
-  const currentValue = toolbarState.getValue(key) || props.value || []
-
-  // 组件触发值更新（仅写入规范化值）
-  const onUpdateValue = (value: UploadFile[]) => {
-    toolbarState.setValue(key, value)
-    events['onUpdate:value']?.(value, allValues, toolbarState)
-  }
-
-  const onChange = (info: UploadFile[]) => {
-    events.onChange?.(info, allValues, toolbarState)
-  }
-
-  const onSuccess = (response: AnyObject, file: UploadFile) => {
-    events.onSuccess?.(response, file, allValues, toolbarState)
-  }
-
-  const onError = (error: AnyObject, file: UploadFile) => {
-    events.onError?.(error, file, allValues, toolbarState)
-  }
-
-  const UploadComponent = getRegisteredComponent('Upload')
-  if (!UploadComponent) {
-    console.warn(
-      'BaseTable: Upload component is not registered. Please use registerBaseTableComponents to register it.',
-    )
-    return <span style={{ color: 'red' }}>Upload component missing</span>
-  }
-
-  const finalProps: Record<string, any> = {
-    ...props,
-    disabled: isDisabled,
-    api: apiConfig,
-    extraParams: resolveExtraParams(),
-  }
-
-  const Comp = markRaw(UploadComponent) as any
-  return (
-    <Comp
-      key={key}
-      value={currentValue}
-      passage={passage}
-      props={finalProps}
-      onSuccess={onSuccess}
-      onError={onError}
-      onChange={onChange}
-      onUpdate:value={onUpdateValue}
-    />
-  )
-}
+import type { UploadFile } 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 { getRegisteredComponent } from './registry'
+import type { ToolbarState } from './state'
+import type { ToolbarItem, UploadToolbarItem } from './types'
+
+// 上传渲染函数
+export function renderUpload(item: ToolbarItem, toolbarState: ToolbarState): VNode {
+  const uploadItem = item as UploadToolbarItem
+  const { key, events = {}, passage } = uploadItem
+  const { props = {}, disabled = false } = uploadItem
+
+  const isDisabled = isFunction(disabled)
+    ? disabled(toolbarState.getAllValues(), toolbarState)
+    : disabled
+  const allValues = toolbarState.getAllValues()
+
+  const resolveExtraParams = () => {
+    if (!props.extraParams) return {}
+    return isFunction(props.extraParams)
+      ? props.extraParams(allValues, toolbarState)
+      : props.extraParams
+  }
+
+  const apiConfig = props.api
+    ? {
+        url: props.api.url,
+        method: props.api.method || 'POST',
+        headers: props.api.headers || {},
+      }
+    : {
+        url: undefined as string | undefined, // 使用组件默认全局上传地址
+        method: 'POST',
+        headers: {},
+      }
+
+  // 当前表单值（期望：[{ name, path }]）
+  const currentValue = toolbarState.getValue(key) || props.value || []
+
+  // 组件触发值更新（仅写入规范化值）
+  const onUpdateValue = (value: UploadFile[]) => {
+    toolbarState.setValue(key, value)
+    events['onUpdate:value']?.(value, allValues, toolbarState)
+  }
+
+  const onChange = (info: UploadFile[]) => {
+    events.onChange?.(info, allValues, toolbarState)
+  }
+
+  const onSuccess = (response: AnyObject, file: UploadFile) => {
+    events.onSuccess?.(response, file, allValues, toolbarState)
+  }
+
+  const onError = (error: AnyObject, file: UploadFile) => {
+    events.onError?.(error, file, allValues, toolbarState)
+  }
+
+  const UploadComponent = getRegisteredComponent('Upload')
+  if (!UploadComponent) {
+    console.warn(
+      'BaseTable: Upload component is not registered. Please use registerBaseTableComponents to register it.',
+    )
+    return <span style={{ color: 'red' }}>Upload component missing</span>
+  }
+
+  const finalProps: Record<string, any> = {
+    ...props,
+    disabled: isDisabled,
+    api: apiConfig,
+    extraParams: resolveExtraParams(),
+  }
+
+  const Comp = markRaw(UploadComponent) as any
+  return (
+    <Comp
+      key={key}
+      value={currentValue}
+      passage={passage}
+      props={finalProps}
+      onSuccess={onSuccess}
+      onError={onError}
+      onChange={onChange}
+      onUpdate:value={onUpdateValue}
+    />
+  )
+}