@xmszm/core 0.0.2 → 0.0.3

package/src/table/opr/{useDataColumn.jsx → useDataColumn.tsx}

@@ -1,25 +1,32 @@
 import { checkPermission } from '../../utils/config'
 import { NButton, NImage, NSpace, NSpin } from 'naive-ui'
-import { ref } from 'vue'
-import DataColumnCollet from './DataColumnCollet.jsx'
-import OprButton from './useDataColumnButton.jsx'
-import Pop from './useDataColumnPop.jsx'
+import { ref, type VNode } from 'vue'
+import type { ActionOption, TableColumn } from '../../../types/components'
+import DataColumnCollet from './DataColumnCollet'
+import OprButton from './useDataColumnButton'
+import Pop from './useDataColumnPop'
 import { createDialogOptions } from '../../utils/dialog'
+import { getDialogInstance } from '../../utils/dialog'
 
-export const rowIndexKey = (row, index) => (row ? JSON.stringify(row) : index)
+export const rowIndexKey = (row: any, index: number): string =>
+  row ? JSON.stringify(row) : String(index)
+
+interface CollectParams {
+  max: number
+  width: number
+}
 
 export function createActionColumnJsx(
-  defaultOption,
-  oprParams = null,
-  collectParams,
-) {
+  defaultOption: ActionOption[],
+  oprParams: Record<string, any> | null = null,
+  collectParams?: boolean | CollectParams,
+): TableColumn | undefined {
   // 粗滤计算操作栏占用宽度
-  // 粗滤计算操作栏占用宽度
-  const defaultCollectParams = {
+  const defaultCollectParams: CollectParams = {
     max: 4,
     width: 80,
   }
-  let collect = false
+  let collect: CollectParams | false = false
   if (typeof collectParams === 'boolean')
     collect = defaultCollectParams
   else if (typeof collectParams === 'object')
@@ -31,9 +38,9 @@ export function createActionColumnJsx(
     throw new TypeError('需要配置数组')
   }
   console.log('ddd')
-  let actions = []
+  let actions: ActionOption[] = []
   let width = 0
-  const filterAction = []
+  const filterAction: ActionOption[] = []
   const isLoading = false
 
   if (Array.isArray(defaultOption)) {
@@ -41,36 +48,21 @@ export function createActionColumnJsx(
     actions.forEach((itm, idx) => {
       if (itm.permission) {
         if (checkPermission(itm.permission)) {
-          if (!collectParams || idx < collect.max)
-            width += itm?.label?.length * 12 + 36
+          if (!collectParams || (typeof collect === 'object' && idx < collect.max))
+            width += (typeof itm?.label === 'string' ? itm?.label?.length : 10) * 12 + 36
 
           filterAction.push(itm)
         }
       }
       else {
-        if (!collectParams || idx < collect.max)
-          width += itm?.label?.length * 12 + 36
+        if (!collectParams || (typeof collect === 'object' && idx < collect.max))
+          width += (typeof itm?.label === 'string' ? itm?.label?.length : 10) * 12 + 36
         filterAction.push(itm)
       }
     })
-
-    // for (const item of actions) {
-    //   if (!isLoading && item?.loading) isLoading = true
-    //   if (item.permission && item?.label) {
-    //     if (hasPermission(item.permission)) {
-    //       width += item?.label?.length * 12 + 36
-    //       filterAction.push(item)
-    //     }
-    //   } else if (item?.label) {
-    //     width += item?.label?.length * 12 + 36
-    //     filterAction.push(item)
-    //   }
-    // }
   }
 
   width = Math.max(80, width)
-  // return filterAction.length
-  //   ?
   width += isLoading ? 20 : 0
 
   if (collect)
@@ -84,7 +76,7 @@ export function createActionColumnJsx(
       align: 'left',
       width,
       ...oprParams,
-      render(row, index) {
+      render(row: any, index: number): VNode {
         const vNodes = collect
           ? (
             <DataColumnCollet
@@ -108,7 +100,7 @@ export function createActionColumnJsx(
                   },
                   i,
                 ) => {
-                  return isRender?.(row)
+                  return (typeof isRender === 'function' ? isRender(row) : isRender)
                     ? (
                       mode === 'pop'
                         ? (
@@ -121,8 +113,8 @@ export function createActionColumnJsx(
                           >
                             <NButton
                               text
-                              disabled={disabled && disabled(row)}
-                              type={disabled && disabled(row) ? 'default' : type}
+                              disabled={typeof disabled === 'function' ? disabled(row) : disabled}
+                              type={typeof disabled === 'function' && disabled(row) ? 'default' : type}
                               {...action}
                             >
                               {typeof action?.label === 'function'
@@ -148,11 +140,11 @@ export function createActionColumnJsx(
                     : undefined
                 },
               )
-              .filter(v => v)
+              .filter((v): v is VNode => v !== undefined)
           )
-        return oprParams?.isRender
+        return (oprParams as any)?.isRender
           ? (
-            oprParams?.render(row)
+            (oprParams as any)?.render(row)
           )
           : (
             <NSpace
@@ -171,9 +163,9 @@ export function createActionColumnJsx(
 
 /**
  * 创建二维码弹窗
- * @param {Object} row - 行数据
- * @param {Function} fn - 获取二维码的函数
- * @returns {Promise<boolean>}
+ * @param row - 行数据
+ * @param fn - 获取二维码的函数
+ * @returns Promise<boolean>
  * 
  * @example
  * import { useQRCode } from '@xmszm/core'
@@ -192,14 +184,17 @@ export function createActionColumnJsx(
  *   }
  * })
  */
-export async function createQRCode(row, fn = null) {
+export async function createQRCode(
+  row: any,
+  fn: (() => Promise<string> | string) | null = null,
+): Promise<boolean> {
   const dialogInstance = getDialogInstance()
   
   if (!dialogInstance) {
     throw new Error('无法获取 dialog 实例。请使用 useQRCode hook 或在组件中通过 setupConfig 注册 dialog 实例。')
   }
   
-  const code = ref(null)
+  const code = ref<string | null>(null)
   const loading = ref(false)
   
   const dialogOptions = createDialogOptions({
@@ -210,12 +205,12 @@ export async function createQRCode(row, fn = null) {
       height: '350px',
     },
     content: () => (
-      <div className="qr-box">
+      <div class="qr-box">
         {loading.value ? <NSpin class="qr-spin" show /> : ''}
-        <div className="qr-img">
+        <div class="qr-img">
           <NImage src={code.value} style={{ width: '100%' }} />
         </div>
-        <div className="qr-title">{loading.value ? '' : row.name}</div>
+        <div class="qr-title">{loading.value ? '' : row.name}</div>
       </div>
     ),
   }, dialogInstance)

package/src/table/opr/{useDataColumnButton.jsx → useDataColumnButton.tsx}

@@ -1,8 +1,15 @@
 import { NButton } from 'naive-ui'
-import { defineComponent, ref } from 'vue'
+import { defineComponent, ref, type VNode } from 'vue'
+import type { ActionOption } from '../../../types/components'
+
+interface Props {
+  action: ActionOption | null
+  row: any
+  index: number
+}
 
 export default defineComponent(
-  ({ action, row,index }) => {
+  ({ action, row, index }: Props) => {
     const {
       onClick,
       disabled,
@@ -10,7 +17,7 @@ export default defineComponent(
       loading = false,
       label = null,
       ...other
-    } = action
+    } = action || {}
     const oprBtnLoading = ref(false)
     return () => (
       <NButton
@@ -21,16 +28,16 @@ export default defineComponent(
               if (loading) {
                 oprBtnLoading.value = true
               }
-              await onClick(row,index)
+              await onClick(row)
             }
             finally {
               setTimeout(() => (oprBtnLoading.value = false), 500)
             }
           }
         }}
-        disabled={disabled && disabled(row)}
+        disabled={typeof disabled === 'function' ? disabled(row) : disabled}
         loading={oprBtnLoading.value}
-        type={disabled && disabled(row) ? 'default' : type}
+        type={typeof disabled === 'function' && disabled(row) ? 'default' : type}
         {...other}
       >
         {typeof label === 'function' ? label?.(row) : label}

package/src/table/opr/{useDataColumnPop.jsx → useDataColumnPop.tsx}

@@ -1,8 +1,16 @@
 import { NPopconfirm } from 'naive-ui'
-import { defineComponent, ref } from 'vue'
+import { defineComponent, ref, type VNode } from 'vue'
+import type { ActionOption } from '../../../types/components'
+
+interface Props {
+  onClick: ((row: any, index: number) => void | Promise<void>) | null
+  row: any
+  index: number
+  action: ActionOption | null
+}
 
 export default defineComponent(
-  ({ onClick, row, index,action }, { slots }) => {
+  ({ onClick, row, index, action }: Props, { slots }) => {
     const popLoading = ref(false)
     return () => (
       <NPopconfirm
@@ -14,7 +22,7 @@ export default defineComponent(
           try {
             if (onClick) {
               popLoading.value = true
-              await onClick(row,index)
+              await onClick(row, index)
               popLoading.value = false
               return true
             }
@@ -29,7 +37,7 @@ export default defineComponent(
         {{
           trigger: slots.default,
           default: () =>
-            action?.popProps?.content || action?.content || '确定删除该记录？',
+            action?.popProps?.content || (action as any)?.content || '确定删除该记录？',
         }}
       </NPopconfirm>
     )
@@ -37,7 +45,7 @@ export default defineComponent(
   {
     props: {
       onClick: {
-        type: [Function, null],
+        type: Function as any,
         default: null,
       },
       row: {

package/src/utils/{array.js → array.ts}

@@ -5,11 +5,9 @@ import {
 } from '../enum/options'
 
 export function ArrayToObject(
-  arr = [],
-  { labelField = globalLabelField, valueField = globalValueField } = {
-    labelField: globalLabelField,
-    valueField: globalValueField,
-  },
+  arr: any[] = [],
+  labelField: string = globalLabelField,
+  valueField: string = globalValueField,
 ) {
   return unref(arr).reduce((o, n) => {
     o[n[valueField]] = {
@@ -21,6 +19,6 @@ export function ArrayToObject(
   }, {})
 }
 
-export function toArray(v) {
+export function toArray(v: any) {
   return Array.isArray(v) ? v : [v]
 }

package/src/utils/{config.js → config.ts}

@@ -3,10 +3,24 @@
  * 用于统一管理库的外部依赖配置
  */
 
+/**
+ * 配置对象类型定义
+ */
+interface ConfigType {
+  baseURL: string
+  hasPermission: ((permission: string) => boolean) | null
+  uploadMethod: ((config: any) => Promise<any>) | null
+  dialog: {
+    instance: any
+    inheritTheme: boolean
+    themeOverrides: any
+  }
+}
+
 /**
  * 配置对象
  */
-const config = {
+const config: ConfigType = {
   // API 基础地址
   baseURL: '',
 
@@ -54,7 +68,7 @@ const config = {
  *   }
  * })
  */
-export function setupConfig(options = {}) {
+export function setupConfig(options: Partial<ConfigType> = {}) {
   if (options.baseURL !== undefined) {
     config.baseURL = options.baseURL
   }

package/src/utils/{dialog.js → dialog.ts}

@@ -42,7 +42,7 @@ export function getDialogInstance() {
  * @param {Object} dialogInstance - dialog 实例（从 useDialog 获取）
  * @returns {Object} 处理后的 dialog 选项
  */
-export function createDialogOptions(options = {}, dialogInstance = null) {
+export function createDialogOptions(options: Record<string, any> = {}, dialogInstance: any = null) {
   const dialogConfig = getDialogConfig()
 
   // 如果配置了不继承主题色，则添加 themeOverrides
@@ -66,7 +66,7 @@ export function createDialogOptions(options = {}, dialogInstance = null) {
  * @param {Object} options - dialog 选项
  * @returns {Object} dialog 返回的对象
  */
-export function createDialog(dialogInstance, options = {}) {
+export function createDialog(dialogInstance: any, options: Record<string, any> = {}) {
   if (!dialogInstance) {
     throw new Error('dialogInstance 是必需的。请在组件中使用 useDialog() 获取实例，然后传递给此函数。')
   }

package/src/utils/{object.js → object.ts}

@@ -1,3 +1,4 @@
+import { unref } from 'vue'
 import {
   labelField as globalLabelField,
   valueField as globalValueField,

package/src/utils/{upload.js → upload.ts}

@@ -23,12 +23,12 @@ export function registryUpload(fn) {
  * @param {AxiosRequestConfig} args - 上传参数
  * @returns {UploadDataPromise} 上传结果Promise
  */
-export function customUpload(...args) {
+export function customUpload(...args: any[]) {
   const uploadMethod = getUploadMethod()
   if (typeof uploadMethod !== 'function') {
     throw new TypeError('请先通过 setupConfig({ uploadMethod: fn }) 或 registryUpload(fn) 注册上传实现')
   }
-  return uploadMethod(...args)
+  return (uploadMethod as any)(...args)
 }
 
 /**
@@ -37,7 +37,7 @@ export function customUpload(...args) {
  * @param {number|null} ossSize - OSS 样式尺寸
  * @returns {string} 完整的文件 URL
  */
-export function getFileUrl(url, ossSize = null) {
+export function getFileUrl(url: string, ossSize: number | null = null) {
   if (url && !url?.startsWith('http')) {
     const baseURL = getBaseURL()
     if (!baseURL) {