@wzyjs/uis 0.3.29 → 0.3.30

package/src/components/Crud/components/CreateUpdate/index.tsx

@@ -1,179 +0,0 @@
-'use client'
-
-import { useMemo, useState } from 'react'
-import { Button, type DrawerProps, type ModalProps } from 'antd'
-import { PlusOutlined, EditOutlined  } from '@ant-design/icons'
-import { BetaSchemaForm } from '@ant-design/pro-components'
-
-import type { CreateUpdateProps, ProColumnsPro } from '../../types'
-
-const isActionColumn = (column: ProColumnsPro) => (
-  column.valueType === 'option'
-  || column.key === 'option'
-  || column.key === 'action'
-  || column.title === '操作'
-)
-
-const getFormColumns = (columns: ProColumnsPro[]) => {
-  return columns
-    .filter(column => !column.hideInForm && !isActionColumn(column) && column.key !== '__drag_sort__')
-    .map((column) => {
-      const {
-        fixed,
-        sorter,
-        sortOrder,
-        defaultSortOrder,
-        filters,
-        onFilter,
-        onCell,
-        onHeaderCell,
-        ellipsis,
-        copyable,
-        render,
-        renderText,
-        width,
-        ...formColumn
-      } = column as ProColumnsPro & Record<string, unknown>
-
-      return formColumn as ProColumnsPro
-    })
-}
-
-export const CreateUpdate = (props: CreateUpdateProps) => {
-  const { crud, columns, config, record } = props
-
-  const isEdit = !!record
-  const [open, setOpen] = useState(false)
-  const [formRendered, setFormRendered] = useState(false)
-
-  const {
-    mode = 'drawer',
-    title = isEdit ? '编辑' : '新建',
-    buttonProps = {},
-    formProps = {},
-    transformData,
-    coverData,
-    width,
-  } = config
-
-  const {
-    drawerProps,
-    modalProps,
-    initialValues,
-    onOpenChange,
-    onVisibleChange,
-    open: _open,
-    visible: _visible,
-    ...formSafeProps
-  } = formProps as unknown as {
-    drawerProps?: DrawerProps
-    modalProps?: ModalProps
-    initialValues?: Record<string, unknown>
-    onOpenChange?: (open: boolean) => void
-    onVisibleChange?: (open: boolean) => void
-    open?: boolean
-    visible?: boolean
-  } & Record<string, unknown>
-
-  const layoutType = mode === 'modal' ? 'ModalForm' : 'DrawerForm'
-
-  const formColumns = useMemo(() => getFormColumns(columns), [columns])
-
-  const handleOpenChange = (nextOpen: boolean) => {
-    setOpen(nextOpen)
-    if (nextOpen) {
-      setFormRendered(true)
-    }
-    onOpenChange?.(nextOpen)
-    onVisibleChange?.(nextOpen)
-  }
-
-  const openForm = (event: any) => {
-    buttonProps.onClick?.(event)
-    if (event.defaultPrevented) {
-      return
-    }
-    setFormRendered(true)
-    setOpen(true)
-  }
-
-  const onFinish = async (values: Record<string, unknown>) => {
-    const finalValues = transformData ? await transformData(values, record) : values
-
-    if (isEdit) {
-      await crud.updateState.mutateAsync(record.id, finalValues)
-    } else {
-      await crud.createState.mutateAsync(finalValues)
-    }
-    return true
-  }
-
-  const formKey = (() => {
-    if (isEdit && record) {
-      return record.id
-    }
-
-    if (!initialValues) {
-      return 'create'
-    }
-
-    if (typeof initialValues !== 'object') {
-      return `create-${JSON.stringify(initialValues)}`
-    }
-
-    try {
-      return `create-${JSON.stringify(initialValues)}`
-    } catch {
-      return 'create'
-    }
-  })()
-
-  const finalInitialValues = {
-    ...(record ?? {}),
-    ...(initialValues ?? {}),
-    ...(coverData ? coverData(record) : {}),
-  }
-
-  const trigger = isEdit ? (
-    <Button
-      type='link'
-      size='small'
-      icon={<EditOutlined />}
-      {...buttonProps}
-      onClick={openForm}
-    />
-  ) : (
-    <Button
-      type='primary'
-      icon={<PlusOutlined />}
-      {...buttonProps}
-      onClick={openForm}
-    >
-      新建
-    </Button>
-  )
-
-  return (
-    <>
-      {trigger}
-      {formRendered ? (
-        <BetaSchemaForm
-          key={formKey}
-          layoutType={layoutType as any}
-          title={title}
-          width={width}
-          columns={formColumns as any}
-          onFinish={onFinish}
-          layout='horizontal'
-          labelCol={{ span: 4 }}
-          initialValues={finalInitialValues}
-          open={open}
-          onOpenChange={handleOpenChange}
-          {...(drawerProps ? { drawerProps } : {})}
-          {...(modalProps ? { modalProps } : {})}
-          {...formSafeProps}
-        />
-      ) : null}
-    </>
-  )
-}

package/src/components/Crud/components/Provider/index.tsx

@@ -1,83 +0,0 @@
-'use client'
-
-import { type PropsWithChildren, useContext, useMemo } from 'react'
-import { Tag, Switch } from 'antd'
-import { ProProvider, ProFormSelect } from '@ant-design/pro-components'
-import type { ProRenderFieldPropsType } from '@ant-design/pro-provider'
-
-import type { Crud } from '../../types'
-
-interface ProviderProps extends PropsWithChildren {
-  crud?: Crud
-}
-
-export const Provider = (props: ProviderProps) => {
-  const { children, crud } = props
-
-  const defaultContext = useContext(ProProvider)
-
-  const onSwitchChange = (id: string, enabled: boolean) => {
-    if (crud?.updateState) {
-      crud.updateState.mutate(id, { enabled })
-    }
-  }
-
-  const valueTypeMap = useMemo<Record<string, ProRenderFieldPropsType>>(() => ({
-    ...defaultContext.valueTypeMap,
-    tags: {
-      renderFormItem: (_: unknown, props: any) => {
-        const { options, ...restFieldProps } = props.fieldProps || {}
-
-        let processedOptions = options
-
-        if (Array.isArray(options) && options.length > 0 && typeof options[0] === 'string') {
-          processedOptions = options.map((item: string) => ({
-            label: item,
-            value: item,
-          }))
-        }
-
-        return (
-          <ProFormSelect
-            placeholder='请输入标签'
-            mode='tags'
-            options={processedOptions}
-            {...restFieldProps}
-          />
-        )
-      },
-      render: (tags: string[]) => {
-        return (
-          <>
-            {tags?.map((tag: string) => (
-              <Tag key={tag}>{tag}</Tag>
-            ))}
-          </>
-        )
-      },
-    },
-    enabled: {
-      render: (enabled: boolean, props: any) => {
-        return (
-          <Switch
-            loading={crud?.updateState.isLoading}
-            checked={enabled}
-            onChange={enabled => onSwitchChange(props.record?.id, enabled)}
-            disabled={!crud?.updateState}
-          />
-        )
-      },
-    },
-  }), [crud?.updateState, defaultContext.valueTypeMap])
-
-  return (
-    <ProProvider.Provider
-      value={{
-        ...defaultContext,
-        valueTypeMap,
-      }}
-    >
-      {children}
-    </ProProvider.Provider>
-  )
-}

package/src/components/Crud/components/Remove/index.tsx

@@ -1,56 +0,0 @@
-import { Popconfirm, Button } from 'antd'
-import { DeleteOutlined } from '@ant-design/icons'
-
-import type { RemoveProps } from '../../types'
-
-export const Remove = (props: RemoveProps) => {
-  const { crud, config, record } = props
-
-  const {
-    confirm = true,
-    buttonProps = {},
-    title = '确定要删除吗?',
-    content,
-  } = config
-
-  const onConfirm = () => {
-    crud.removeState.mutate(record.id)
-  }
-
-  // 如果不需要确认，直接执行删除
-  if (!confirm) {
-    return (
-      <Button
-        type='link'
-        danger
-        size='small'
-        icon={<DeleteOutlined />}
-        loading={crud.removeState.isLoading}
-        onClick={onConfirm}
-        {...buttonProps}
-      />
-    )
-  }
-
-  // 需要确认的删除按钮
-  return (
-    <Popconfirm
-      title={title}
-      description={content}
-      onConfirm={onConfirm}
-      okText='确定'
-      cancelText='取消'
-      okButtonProps={{
-        loading: crud.removeState.isLoading,
-      }}
-    >
-      <Button
-        type='link'
-        danger
-        size='small'
-        icon={<DeleteOutlined />}
-        {...buttonProps}
-      />
-    </Popconfirm>
-  )
-}

package/src/components/Crud/components/index.ts

@@ -1,4 +0,0 @@
-export { CreateUpdate } from './CreateUpdate'
-export { Remove } from './Remove'
-export { CardList } from './CardList'
-export { Provider } from './Provider'

package/src/components/Crud/hooks/index.ts

@@ -1,4 +0,0 @@
-export { useColumns } from './useColumns'
-export { useList } from './useList'
-export { useRequest } from './useRequest'
-export { useOrderable } from './useOrderable'

package/src/components/Crud/hooks/useColumns.tsx

@@ -1,169 +0,0 @@
-import React, { useMemo } from 'react'
-
-import { Space } from 'antd'
-import { CreateUpdate, Remove } from '../components'
-
-import type { ProColumnsPro, CrudProps } from '../types'
-
-interface UseColumnsParams {
-  columns: CrudProps['columns']
-  crud: CrudProps['crud']
-  update: CrudProps['update']
-  remove: CrudProps['remove']
-}
-
-const normalizeCellDom = (dom: React.ReactNode): React.ReactNode => {
-  if (!dom || typeof dom !== 'object') {
-    return dom
-  }
-
-  if ('children' in dom && 'props' in dom) {
-    return (dom as any).children
-  }
-
-  return dom
-}
-
-const normalizeRenderResult = (result: unknown) => {
-  if (!result || typeof result !== 'object') {
-    return result
-  }
-
-  if ('children' in result && 'props' in result) {
-    return (result as any).children
-  }
-
-  return result
-}
-
-export const useColumns = ({ columns, crud, update, remove }: UseColumnsParams) => {
-  // 检查是否需要显示操作列
-  const hasActions = update !== false || remove !== false
-
-  // 智能合并操作列
-  const finalColumns: ProColumnsPro[] = useMemo(() => {
-    // const proColumns = transformColumns(columns)
-    const proColumns: ProColumnsPro[] = columns.map((col: ProColumnsPro) => {
-      const isActionColumn: boolean = col.valueType === 'option'
-        || col.key === 'option'
-        || col.key === 'action'
-        || col.title === '操作'
-
-      if (col.render) {
-        const originalRender = col.render
-        return {
-          ...col,
-          render: (dom: any, record: any, index: any, action: any, schema: any) => {
-            return normalizeRenderResult(originalRender(dom, record, index, action, schema)) as any
-          },
-        }
-      }
-
-      if (isActionColumn) {
-        return col
-      }
-
-      return {
-        ...col,
-        // DragSortTable 需要包一层，不然有的字段不显示
-        render: (dom: React.ReactNode): React.ReactNode => normalizeCellDom(dom),
-      }
-    })
-
-    // 生成默认的操作按钮
-    const generateDefaultActions = (record: any) => {
-      const actions = []
-
-      if (update !== false) {
-        actions.push(
-          <CreateUpdate
-            key='update'
-            crud={crud}
-            columns={columns}
-            config={update || {}}
-            record={record}
-          />,
-        )
-      }
-
-      if (remove !== false) {
-        actions.push(
-          <Remove
-            key='remove'
-            crud={crud}
-            config={remove || {}}
-            record={record}
-          />,
-        )
-      }
-
-      return actions
-    }
-
-    // 查找是否已存在操作列
-    const existingActionColumnIndex = proColumns.findIndex(
-      col => col.key === 'option' || col.key === 'action' || col.title === '操作',
-    )
-
-    if (existingActionColumnIndex !== -1) {
-      // 如果已存在操作列，合并操作
-      const existingColumn = proColumns[existingActionColumnIndex]
-      if (!existingColumn) return proColumns
-
-      const originalRender = existingColumn.render
-
-      const mergedColumns = [...proColumns]
-      mergedColumns[existingActionColumnIndex] = {
-        ...existingColumn,
-        render: (text: any, record: any, index: number, action: any, schema: any) => {
-          const defaultActions = hasActions ? generateDefaultActions(record) : []
-
-          // 如果用户定义了自定义渲染，调用它
-          if (originalRender) {
-            const customActions = originalRender(text, record, index, action, schema)
-
-            // 如果自定义渲染返回 ReactElement 或数组，合并操作
-            if (React.isValidElement(customActions) || Array.isArray(customActions)) {
-              return (
-                <Space>
-                  {customActions}
-                  {defaultActions}
-                </Space>
-              )
-            }
-
-            // 如果自定义渲染返回其他内容，直接使用
-            return customActions
-          }
-
-          // 没有自定义渲染时，只显示默认操作
-          return <Space>{defaultActions}</Space>
-        },
-      }
-
-      return mergedColumns
-    } else {
-      // 如果不存在操作列且需要操作，添加新的操作列
-      return [
-        ...proColumns,
-        ...(hasActions ? [{
-          title: '操作',
-          dataIndex: 'action',
-          key: 'action',
-          fixed: 'right' as const,
-          width: 120,
-          search: false,
-          render: (_: any, record: any) => (
-            <Space>
-              {generateDefaultActions(record)}
-            </Space>
-          ),
-        }] : []),
-      ]
-    }
-  }, [columns, hasActions, update, remove, crud])
-
-  return {
-    finalColumns,
-  }
-}

package/src/components/Crud/hooks/useList.ts

@@ -1,65 +0,0 @@
-import { useState, useEffect, useMemo } from 'react'
-import type { CrudProps } from '../types'
-
-interface UseTabsStateParams {
-  list: CrudProps['list']
-}
-
-export const useList = ({ list }: UseTabsStateParams) => {
-  // 初始化 activeTabKey 状态
-  const [activeTabKey, setTabActiveKey] = useState<string | undefined>(() => {
-    const tabs = list?.toolbar?.tabs as any
-    if (!tabs) {
-      return
-    }
-    return tabs.activeKey ?? tabs.items?.[0]?.key
-  })
-
-  // 同步外部传入的 activeKey
-  useEffect(() => {
-    const tabs = list?.toolbar?.tabs as any
-    if (tabs && tabs.activeKey !== undefined && tabs.activeKey !== activeTabKey) {
-      setTabActiveKey(tabs.activeKey)
-    }
-  }, [list?.toolbar?.tabs])
-
-  // 当 Tab 变化时，将最新的类型通过 onChangeQuery 回传给父组件
-  useEffect(() => {
-    if (activeTabKey !== undefined) {
-      list?.onChangeQuery?.({
-        where: { type: activeTabKey },
-      })
-    }
-  }, [activeTabKey])
-
-  // 构造最终传递给 ProTable 的 list 配置
-  const finalList = useMemo(() => {
-    if (!list?.toolbar?.tabs) return list ?? {}
-
-    const originalTabs: any = list.toolbar.tabs
-
-    const enhancedTabs = {
-      ...originalTabs,
-      activeKey: activeTabKey,
-      onChange: (key: string) => {
-        setTabActiveKey(key)
-        originalTabs.onChange?.(key)
-      },
-    }
-
-    return {
-      ...list,
-      toolbar: {
-        ...list.toolbar,
-        multipleLine: list.toolbar.multipleLine ?? !!list.toolbar.tabs.items?.length,
-        tabs: enhancedTabs,
-      },
-    }
-  }, [activeTabKey, list])
-
-  return {
-    activeTabKey,
-    setTabActiveKey,
-    finalList,
-  }
-}

package/src/components/Crud/hooks/useOrderable.tsx

@@ -1,107 +0,0 @@
-import { useEffect, useMemo, useState } from 'react'
-import type { CrudProps, ProColumnsPro } from '../types'
-
-const dragSortKey = '__drag_sort__'
-
-const getOrderableConfig = (
-  orderable: CrudProps['orderable'],
-): Exclude<CrudProps['orderable'], boolean | undefined> => {
-  if (orderable && typeof orderable === 'object') {
-    return orderable
-  }
-  return {}
-}
-
-const sortByOrderField = <T extends Record<string, unknown>>(list: T[], orderField: string): T[] => {
-  const indexed = list.map((item, index) => ({ item, index }))
-  indexed.sort((a, b) => {
-    const av = a.item[orderField] as  number | undefined
-    const bv = b.item[orderField] as  number | undefined
-
-    const an = typeof av === 'number' && Number.isFinite(av) ? av : Number.POSITIVE_INFINITY
-    const bn = typeof bv === 'number' && Number.isFinite(bv) ? bv : Number.POSITIVE_INFINITY
-
-    return an - bn
-  })
-  return indexed.map(i => i.item)
-}
-
-export const useOrderable = <T extends Record<string, unknown>>(params: {
-  orderable: CrudProps['orderable']
-  columns: ProColumnsPro<T>[]
-  crud: CrudProps['crud']
-  update: CrudProps['update']
-  readonly?: boolean
-  cardMode?: boolean
-}) => {
-  const { orderable, columns, crud, update, readonly, cardMode } = params
-
-  const enabledFeature = !!orderable && !cardMode
-  const config = useMemo(() => getOrderableConfig(orderable), [orderable])
-
-  const orderField = config.orderField ?? 'sort'
-  const start = config.start ?? 0
-
-  const canUpdate = enabledFeature && !readonly && update !== false && !!crud.updateState?.mutateAsync
-
-  const [dataSource, setDataSource] = useState<T[]>([])
-
-  useEffect(() => {
-    if (!enabledFeature) return
-    const list = (crud.listState.data as T[]) || []
-    setDataSource(sortByOrderField(list, orderField))
-  }, [enabledFeature, crud.listState.data, orderField])
-
-  const tableColumns = useMemo((): ProColumnsPro<T>[] => {
-    if (!enabledFeature) return columns
-
-    return [
-      {
-        title: '',
-        key: dragSortKey,
-        dataIndex: dragSortKey,
-        width: 48,
-        fixed: 'left',
-        hideInSearch: true,
-        hideInForm: true,
-        render: () => null,
-      } as ProColumnsPro<T>,
-      ...columns,
-    ]
-  }, [columns, enabledFeature])
-
-  const onDragSortEnd = async (
-    _beforeIndex: number,
-    _afterIndex: number,
-    newDataSource: T[],
-  ) => {
-    const next = newDataSource.map((row, index) => ({
-      ...row,
-      [orderField]: start + index,
-    })) as T[]
-
-    setDataSource(next)
-
-    if (!canUpdate) return
-
-    await Promise.allSettled(
-      next.map((row) => {
-        const id = row.id
-        if (typeof id !== 'string' || !id) {
-          return Promise.resolve()
-        }
-        return crud.updateState.mutateAsync(id, { [orderField]: row[orderField] })
-      }),
-    )
-
-    await crud.listState.refetch()
-  }
-
-  return {
-    enabledFeature,
-    tableColumns,
-    dragSortKey: enabledFeature ? dragSortKey : undefined,
-    dataSource: enabledFeature ? dataSource : (crud.listState.data as T[] | undefined),
-    onDragSortEnd: enabledFeature ? onDragSortEnd : undefined,
-  }
-}

package/src/components/Crud/hooks/useRequest.ts

@@ -1,41 +0,0 @@
-import type { CrudProps, PaginationState } from '../types'
-import { transformOrder, transformPagination, transformWhere } from '../utils'
-
-interface UseRequest {
-  columns: CrudProps['columns']
-  list: CrudProps['list']
-}
-
-export const useRequest = ({ columns, list }: UseRequest) => {
-  const request = async (params: PaginationState, sort: any, filter: any) => {
-    const { current, pageSize, ...search } = params
-
-    // 转换分页参数
-    const pagination = transformPagination({ current, pageSize })
-
-    // 转换排序参数
-    const orderBy = transformOrder(sort)
-
-    // 转换过滤参数
-    const where = transformWhere(search, columns)
-
-    const query = {
-      ...pagination,
-      ...(orderBy && { orderBy }),
-      ...(where && { where }),
-    }
-    console.log(666, 35, params, sort, search, filter, where, query)
-
-    list?.onChangeQuery?.(query)
-
-    return {
-      data: [],
-      total: 0,
-      success: true,
-    }
-  }
-
-  return {
-    request,
-  }
-}