@wzyjs/uis 0.3.17 → 0.3.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wzyjs/uis",
-  "version": "0.3.17",
+  "version": "0.3.20",
   "description": "description",
   "author": "wzy",
   "sideEffects": false,
@@ -42,7 +42,7 @@
     "@wzyjs/utils": "^0.2.37",
     "antd": "^6.0.0"
   },
-  "gitHead": "2b3434df547bcd524ee9afd17773d6b789cbe2b2",
+  "gitHead": "75ecd6752ea11d3e5d51ef76cd4393dca75c358b",
   "publishConfig": {
     "access": "public"
   }

package/src/antd/form/UploadImage/index.tsx

@@ -212,13 +212,13 @@ export const UploadImage = (props: UploadImageProps) => {
           const imageNode = (
             <div
               className='rounded border overflow-hidden relative group bg-white'
-              style={{ maxWidth: 200, maxHeight: 200 }}
+              style={{ maxWidth: 200 }}
             >
               <img
                 src={image}
                 alt={`图片 ${index + 1}`}
                 className='object-contain'
-                style={{ maxWidth: '100%', maxHeight: '100%', display: 'block' }}
+                style={{ maxWidth: '100%', height: 'auto', display: 'block' }}
               />
               <Button
                 type='text'
@@ -252,8 +252,8 @@ export const UploadImage = (props: UploadImageProps) => {
                     src={image}
                     alt={`预览图片 ${index + 1}`}
                     style={{
-                      maxWidth: '200px',
-                      maxHeight: '200px',
+                      maxWidth: '400px',
+                      height: 'auto',
                       objectFit: 'contain',
                     }}
                   />
@@ -279,7 +279,7 @@ export const UploadImage = (props: UploadImageProps) => {
                 style={{ width: '50px', height: '50px' }}
               >
                 <PlusOutlined style={{ fontSize: '24px', color: '#8c8c8c' }} />
-                <Typography.Text type='secondary' className='mt-1'>上传</Typography.Text>
+                <Typography.Text type='secondary' className='m-2'>上传</Typography.Text>
               </div>
             )}
 
@@ -292,7 +292,7 @@ export const UploadImage = (props: UploadImageProps) => {
                 onClick={handlePasteButton}
               >
                 <PlusOutlined style={{ fontSize: '24px', color: '#8c8c8c' }} />
-                <Typography.Text type='secondary' className='mt-1'>粘贴</Typography.Text>
+                <Typography.Text type='secondary' className='m-2'>粘贴</Typography.Text>
               </div>
             )}
           </Space>

package/src/antd/index.ts

@@ -38,7 +38,8 @@ export type {
   ProFormProps,
   ProColumns,
   ProLayoutProps,
-  ProFormInstance
+  ProFormInstance,
+  ActionType,
 } from '@ant-design/pro-components'
 
 export * from './pro'

package/src/antd/pro/Button/components/Copy.tsx

@@ -2,7 +2,7 @@
 
 import React, { useState, ReactNode } from 'react'
 
-import { Button, ButtonProps, message } from 'antd'
+import { App, Button, ButtonProps } from 'antd'
 import { CheckOutlined } from '@ant-design/icons'
 
 import { copy, readClipboard } from '@wzyjs/utils/web'
@@ -15,6 +15,7 @@ export interface CopyProps extends ButtonProps {
 
 export const Copy = (props: CopyProps) => {
   const [icon, setIcon] = useState<ReactNode>(null)
+  const { message } = App.useApp()
 
   const [value, setValue] = useControllableValue<string>(props, {
     defaultValue: props.value,

package/src/antd/pro/Button/components/Drawer.tsx

@@ -27,7 +27,7 @@ export const Drawer = (props: DrawerProps) => {
         title={btnProps?.children}
         open={open}
         onClose={() => setOpen(false)}
-        destroyOnClose
+        destroyOnHidden
         {..._.omit(props, ['children', 'btnProps'])}
       >
         {children}

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

@@ -23,13 +23,13 @@ export const CreateUpdate = (props: CreateUpdateProps) => {
 
   const layoutType = mode === 'modal' ? 'ModalForm' : 'DrawerForm'
 
-  const finalDrawerProps: DrawerProps | undefined = layoutType === 'DrawerForm'
-    ? { forceRender: true, ...drawerProps }
-    : undefined
-
-  const finalModalProps: ModalProps | undefined = layoutType === 'ModalForm'
-    ? { forceRender: false, ...modalProps }
-    : undefined
+  // const finalDrawerProps: DrawerProps | undefined = layoutType === 'DrawerForm'
+  //   ? { forceRender: false, ...drawerProps }
+  //   : undefined
+  //
+  // const finalModalProps: ModalProps | undefined = layoutType === 'ModalForm'
+  //   ? { forceRender: false, ...modalProps }
+  //   : undefined
 
   const onFinish = async (values: Record<string, unknown>) => {
     const finalValues = transformData ? transformData(values, record) : values
@@ -77,8 +77,8 @@ export const CreateUpdate = (props: CreateUpdateProps) => {
         ...(record ?? {}),
         ...(coverData ? coverData(record) : {}),
       }}
-      {...(finalDrawerProps ? { drawerProps: finalDrawerProps } : {})}
-      {...(finalModalProps ? { modalProps: finalModalProps } : {})}
+      {...(drawerProps ? { drawerProps } : {})}
+      {...(modalProps ? { modalProps } : {})}
       trigger={
         isEdit ? (
           <Button

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

@@ -15,6 +15,14 @@ export const useList = ({ list }: UseTabsStateParams) => {
     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) {
@@ -33,7 +41,10 @@ export const useList = ({ list }: UseTabsStateParams) => {
     const enhancedTabs = {
       ...originalTabs,
       activeKey: activeTabKey,
-      onChange: setTabActiveKey,
+      onChange: (key: string) => {
+        setTabActiveKey(key)
+        originalTabs.onChange?.(key)
+      },
     }
 
     return {

package/src/components/DynamicSelect/index.tsx

@@ -1,8 +1,5 @@
 import React from 'react'
 import { AutoComplete, Button, Space } from 'antd'
-import { type Option } from '@wzyjs/types'
-
-export * from './utils'
 
 interface DynamicSelectProps {
   value?: string[]

package/src/components/DynamicSelect/utils.ts

@@ -1,5 +1,3 @@
-import type { Option } from '@wzyjs/types'
-
 export const transformOptions = (data: string[][]): Option[] => {
   const result: Option[] = []
 
@@ -24,7 +22,7 @@ export const transformOptions = (data: string[][]): Option[] => {
 
         parentNode = currentNode
       } else {
-        currentNode = parentNode?.children?.find(c => c.value === currentValue)
+        currentNode = parentNode?.children?.find((c: Option) => c.value === currentValue)
 
         if (!currentNode) {
           currentNode = {

package/src/components/JsonRenderer/index.tsx

@@ -37,7 +37,6 @@ const ComponentMap = {
   'Typography.Link': Typography.Link,
   Steps,
   Tabs,
-  'Tabs.TabPane': Tabs.TabPane,
   Collapse,
   'Collapse.Panel': Collapse.Panel,
   Description: Descriptions,