@fe-free/core 3.0.37 → 3.0.38

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @fe-free/core
 
+## 3.0.38
+
+### Patch Changes
+
+- feat: some
+  - @fe-free/icons@3.0.38
+  - @fe-free/tool@3.0.38
+
 ## 3.0.37
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fe-free/core",
-  "version": "3.0.37",
+  "version": "3.0.38",
   "description": "",
   "main": "./src/index.ts",
   "author": "",
@@ -46,8 +46,8 @@
     "antd": "^5.27.1",
     "dayjs": "~1.11.10",
     "react": "^19.2.0",
-    "@fe-free/tool": "3.0.37",
-    "@fe-free/icons": "3.0.37"
+    "@fe-free/tool": "3.0.38",
+    "@fe-free/icons": "3.0.38"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/src/crud/crud_delete.tsx

@@ -1,5 +1,5 @@
 import { DeleteOutlined } from '@fe-free/icons';
-import { Modal, Tooltip } from 'antd';
+import { App, Tooltip } from 'antd';
 import { useCallback } from 'react';
 
 interface Params {
@@ -12,10 +12,11 @@ interface Params {
 
 function useDelete(params: Params) {
   const { name, desc, onDelete } = params;
+  const { modal } = App.useApp();
 
   const doDelete = useCallback(async () => {
     await new Promise((resolve) => {
-      Modal.confirm({
+      modal.confirm({
         title: `确认删除 “${name}” 吗？`,
         content: desc || '删除后不可恢复，请谨慎操作',
         okText: '确定',
@@ -28,7 +29,7 @@ function useDelete(params: Params) {
         },
       });
     });
-  }, [name, desc, onDelete]);
+  }, [modal, name, desc, onDelete]);
 
   return {
     doDelete,

package/src/crud/crud_detail.tsx

@@ -1,5 +1,5 @@
 import { DrawerForm, ProForm } from '@ant-design/pro-components';
-import { message, Spin } from 'antd';
+import { App, Spin } from 'antd';
 import classNames from 'classnames';
 import { isString } from 'lodash-es';
 import { useCallback, useMemo, useState } from 'react';
@@ -54,6 +54,7 @@ function CRUDDetail(props: CRUDDetailProps) {
   const [isOpen, setIsOpen] = useState(false);
   const [loading, setLoading] = useState(id ? true : false);
   const [form] = ProForm.useForm(detailFormInstance);
+  const { message } = App.useApp();
 
   const handleFinish = useCallback(
     async (values) => {

package/src/crud/use_row_selection.tsx

@@ -1,5 +1,5 @@
 import type { ActionType } from '@ant-design/pro-components';
-import { Modal } from 'antd';
+import { App } from 'antd';
 import type { MutableRefObject } from 'react';
 import { useCallback, useMemo } from 'react';
 import { LoadingButton } from '../button';
@@ -14,6 +14,8 @@ function useRowSelection<DataSource, Key>({
   batchActions?: CRUDProps<DataSource, Key>['batchActions'];
   actionRef?: MutableRefObject<ActionType | undefined>;
 }) {
+  const { modal } = App.useApp();
+
   const rowSelection = useMemo(
     () => ({
       ...originRowSelection,
@@ -48,7 +50,7 @@ function useRowSelection<DataSource, Key>({
               onClick={async (event) => {
                 if (action.danger) {
                   await new Promise((resolve) => {
-                    Modal.confirm({
+                    modal.confirm({
                       title: `确定要执行 ${action.btnText} 吗？`,
                       onOk: () => {
                         resolve(
@@ -79,7 +81,7 @@ function useRowSelection<DataSource, Key>({
         </div>
       );
     },
-    [actionRef, batchActions],
+    [actionRef, batchActions, modal],
   );
 
   if (!batchActions || batchActions.length === 0) {

package/src/global/error.ts

@@ -1,3 +1,4 @@
+// eslint-disable-next-line no-restricted-imports
 import { message } from 'antd';
 import type { AxiosRequestConfig, AxiosResponse } from 'axios';
 import { AxiosError } from 'axios';

package/src/upload/index.tsx

@@ -1,6 +1,6 @@
 import { DeleteOutlined, InboxOutlined, PlusOutlined, UploadOutlined } from '@fe-free/icons';
 import type { UploadProps as AntdUploadProps, UploadFile } from 'antd';
-import { Upload as AntdUpload, Avatar, Button, message } from 'antd';
+import { Upload as AntdUpload, App, Avatar, Button } from 'antd';
 import type { UploadChangeParam } from 'antd/es/upload';
 import classNames from 'classnames';
 import type { ReactNode } from 'react';
@@ -26,6 +26,7 @@ interface UploadProps extends UploadBaseProps {
 function useUpload(
   props: ImageUploadProps & { onChangeOriginal?: (info: UploadChangeParam<UploadFile>) => void },
 ) {
+  const { message } = App.useApp();
   const { value, onChange, multiple, maxCount, onChangeOriginal } = props;
   // 转换成 Upload 格式。
   const defaultFileList = useMemo(() => {