删除水印组件

Author: chenshuai2144

packages/field/src/components/ColorPicker/old.tsx

@@ -12,7 +12,7 @@ import {
   useMountMergeState,
 } from '@ant-design/pro-utils';
 import { getMatchMenu } from '@umijs/route-utils';
-import type { BreadcrumbProps } from 'antd';
+import type { BreadcrumbProps, WatermarkProps } from 'antd';
 import { ConfigProvider, Layout } from 'antd';
 import type { AnyObject } from 'antd/es/_util/type';
 import type { ItemType } from 'antd/es/breadcrumb/Breadcrumb';
@@ -38,7 +38,6 @@ import { PageLoading } from './components/PageLoading';
 import { SiderMenu } from './components/SiderMenu';
 import type { SiderMenuProps } from './components/SiderMenu/SiderMenu';
 import type { SiderMenuToken } from './components/SiderMenu/style';
-import type { WaterMarkProps } from './components/WaterMark';
 import { RouteContext } from './context/RouteContext';
 import type { ProSettings } from './defaultSettings';
 import { defaultSettings } from './defaultSettings';
@@ -238,7 +237,7 @@ export type ProLayoutProps = GlobalTypes & {
   breadcrumbProps?: Omit<BreadcrumbProps, 'itemRender'> & LayoutBreadcrumbProps;
 
   /** @name 水印的相关配置 */
-  waterMarkProps?: WaterMarkProps;
+  waterMarkProps?: WatermarkProps;
 
   /**
    * @name 操作菜单重新刷新

packages/layout/src/ProLayout.tsx

@@ -6,7 +6,15 @@ import type {
   TabPaneProps,
   TabsProps,
 } from 'antd';
-import { Affix, Breadcrumb, ConfigProvider, SpinProps, Tabs } from 'antd';
+import {
+  Affix,
+  Breadcrumb,
+  ConfigProvider,
+  SpinProps,
+  Tabs,
+  Watermark,
+  WatermarkProps,
+} from 'antd';
 import classNames from 'classnames';
 import type { ReactNode } from 'react';
 import React, { useContext, useEffect, useMemo } from 'react';
@@ -18,8 +26,6 @@ import { GridContent } from '../GridContent';
 import type { PageHeaderProps } from '../PageHeader';
 import { PageHeader } from '../PageHeader';
 import { PageLoading } from '../PageLoading';
-import type { WaterMarkProps } from '../WaterMark';
-import { WaterMark } from '../WaterMark';
 import type { PageContainerToken, pageContainerToken } from './style';
 import { useStyle } from './style';
 import { useStylish } from './style/stylish';
@@ -95,7 +101,7 @@ export type PageContainerProps = {
   breadcrumbRender?: PageHeaderProps['breadcrumbRender'] | false;
 
   /** @name WaterMarkProps 水印的配置 */
-  waterMarkProps?: WaterMarkProps;
+  waterMarkProps?: WatermarkProps;
 
   /** @name BreadcrumbProps 配置面包屑 */
   breadcrumb?: BreadcrumbProps;
@@ -411,7 +417,7 @@ const PageContainerBase: React.FC<PageContainerProps> = (props) => {
         ...value.waterMarkProps,
         ...props.waterMarkProps,
       };
-      return <WaterMark {...waterMarkProps}>{dom}</WaterMark>;
+      return <Watermark {...waterMarkProps}>{dom}</Watermark>;
     }
     return dom;
   }, [props.waterMarkProps, value.waterMarkProps, loadingDom, content]);