111

oceanbase · Jul 26, 2024 · 85617a6 · 85617a6
1 parent 721d1b0
commit 85617a6
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 34 deletions.
diff --git a/packages/design/src/segmented/style/index.ts b/packages/design/src/segmented/style/index.ts
@@ -15,8 +15,8 @@ export const genSegmentedStyle: GenerateStyle<SegmentedToken> = (
 };
 
 export default (prefixCls: string) => {
-  const useStyle = genComponentStyleHook('Segmented', (token: SegmentedToken) => {
-    return [genSegmentedStyle(token)];
+  const useStyle = genComponentStyleHook('Segmented', token => {
+    return [genSegmentedStyle(token as SegmentedToken)];
   });
   return useStyle(prefixCls);
 };
diff --git a/packages/design/src/select/style/index.ts b/packages/design/src/select/style/index.ts
@@ -16,8 +16,8 @@ export const genSelectStyle: GenerateStyle<SelectToken> = (token: SelectToken):
 };
 
 export default (prefixCls: string) => {
-  const useStyle = genComponentStyleHook('Select', (token: SelectToken) => {
-    return [genSelectStyle(token)];
+  const useStyle = genComponentStyleHook('Select', token => {
+    return [genSelectStyle(token as SelectToken)];
   });
   return useStyle(prefixCls);
 };
diff --git a/packages/design/src/space/style/index.ts b/packages/design/src/space/style/index.ts
@@ -29,8 +29,8 @@ export const genSpaceStyle: GenerateStyle<SpaceToken> = (token: SpaceToken): CSS
 };
 
 export default (prefixCls: string) => {
-  const useStyle = genComponentStyleHook('Space', (token: SpaceToken) => {
-    return [genSpaceStyle(token)];
+  const useStyle = genComponentStyleHook('Space', token => {
+    return [genSpaceStyle(token as SpaceToken)];
   });
   return useStyle(prefixCls);
 };
diff --git a/packages/design/src/table/index.tsx b/packages/design/src/table/index.tsx
@@ -34,13 +34,13 @@ export interface TableProps<T> extends AntTableProps<T> {
   collapseText?: string;
   openText?: string;
   hiddenCancelBtn?: boolean;
-  toolOptionsRender?: (selectedRowKeys, selectedRows) => ReactNode[];
-  toolAlertRender?: false | ((selectedRowKeys, selectedRows) => ReactNode);
-  toolSelectedContent?: (selectedRowKeys, selectedRows) => ReactNode;
+  toolOptionsRender?: (selectedRowKeys: React.Key[], selectedRows: T[]) => ReactNode[];
+  toolAlertRender?: false | ((selectedRowKeys: React.Key[], selectedRows: T[]) => ReactNode);
+  toolSelectedContent?: (selectedRowKeys: React.Key[], selectedRows: T[]) => ReactNode;
   locale?: TableLocale;
 }
 
-function Table<T>(props: TableProps<T>, ref: React.Ref<Reference>) {
+function Table<T extends Record<string, any>>(props: TableProps<T>, ref: React.Ref<Reference>) {
   const {
     locale: customLocale,
     columns,
@@ -99,7 +99,7 @@ function Table<T>(props: TableProps<T>, ref: React.Ref<Reference>) {
                 showTitle: false,
                 ...item.ellipsis,
               },
-        render: (text, record, index) => {
+        render: (text: any, record: T, index: number) => {
           const element = (
             item.render ? item.render(text, record, index) : record[(item as any).dataIndex]
           ) as ReactElement | undefined;
@@ -125,14 +125,14 @@ function Table<T>(props: TableProps<T>, ref: React.Ref<Reference>) {
     return item;
   });
 
-  const handleSelectedData = (selectedRowKeys, selectedRows, info) => {
+  const handleSelectedData = (selectedRowKeys: React.Key[], selectedRows: T[], info: any) => {
     setCurrentSelectedRowKeys(selectedRowKeys);
     setCurrentSelectedRows(selectedRows);
     setCurrentSelectedInfo(info);
   };
 
   const handleOptionsCancel = () => {
-    rowSelection?.onChange([], [], currentSelectedInfo);
+    rowSelection?.onChange?.([], [], currentSelectedInfo);
     handleSelectedData([], [], currentSelectedInfo);
   };
 
@@ -182,8 +182,8 @@ function Table<T>(props: TableProps<T>, ref: React.Ref<Reference>) {
               >
                 <a onClick={() => setOpenPopover(!openPopover)}>
                   {openPopover
-                    ? collapseText ?? batchOperationBar?.collapse
-                    : openText ?? batchOperationBar?.open}
+                    ? (collapseText ?? batchOperationBar?.collapse)
+                    : (openText ?? batchOperationBar?.open)}
                 </a>
               </Popover>
             )}
@@ -221,7 +221,7 @@ function Table<T>(props: TableProps<T>, ref: React.Ref<Reference>) {
                 }
               ) => {
                 handleSelectedData(selectedRowKeys, selectedRows, info);
-                rowSelection?.onChange(selectedRowKeys, selectedRows, info);
+                rowSelection?.onChange?.(selectedRowKeys, selectedRows, info);
               },
             }
           : undefined

diff --git a/packages/design/src/tag/style/index.ts b/packages/design/src/tag/style/index.ts
@@ -66,14 +66,14 @@ export const genTagStyle: GenerateStyle<TagToken> = (token: TagToken): CSSObject
 };
 
 export default (prefixCls: string) => {
-  const useStyle = genComponentStyleHook('Tag', (token: TagToken) => {
+  const useStyle = genComponentStyleHook('Tag', token => {
     return [
-      genTagStyle(token),
-      genPresetStyle(token),
-      genTagPresetStatusStyle(token, 'success'),
-      genTagPresetStatusStyle(token, 'error'),
-      genTagPresetStatusStyle(token, 'processing'),
-      genTagPresetStatusStyle(token, 'warning'),
+      genTagStyle(token as TagToken),
+      genPresetStyle(token as TagToken),
+      genTagPresetStatusStyle(token as TagToken, 'success'),
+      genTagPresetStatusStyle(token as TagToken, 'error'),
+      genTagPresetStatusStyle(token as TagToken, 'processing'),
+      genTagPresetStatusStyle(token as TagToken, 'warning'),
     ];
   });
   return useStyle(prefixCls);

diff --git a/packages/design/src/theme/default.ts b/packages/design/src/theme/default.ts
@@ -118,10 +118,10 @@ const defaultTheme: ThemeConfig = {
 defaultTheme.token = {
   ...defaultTheme.token,
   // preset colors below should be same with semantic colors
-  blue: defaultTheme.token.colorInfo,
-  green: defaultTheme.token.colorSuccess,
-  yellow: defaultTheme.token.colorWarning,
-  red: defaultTheme.token.colorError,
+  blue: defaultTheme?.token?.colorInfo,
+  green: defaultTheme?.token?.colorSuccess,
+  yellow: defaultTheme?.token?.colorWarning,
+  red: defaultTheme?.token?.colorError,
 };
 
 export default formatTheme(defaultTheme);
diff --git a/packages/design/src/theme/util/format.ts b/packages/design/src/theme/util/format.ts
@@ -2,15 +2,16 @@ import type { ThemeConfig } from 'antd';
 import { isString, toLower } from 'lodash';
 
 export function formatTheme(theme: ThemeConfig) {
-  const token = theme.token;
+  const token = (theme.token || {}) as Record<string, any>;
   // convert token color value to lower case
   Object.keys(token).forEach(key => {
     if (isString(token[key])) {
       token[key] = toLower(token[key]);
     }
   });
-  Object.keys(theme.components).forEach(componentName => {
-    const componentToken = theme.components[componentName] || {};
+  const components = (theme.components || {}) as Record<string, any>;
+  Object.keys(components).forEach(componentName => {
+    const componentToken = components[componentName] || {};
     // convert token color value to lower case
     Object.keys(componentToken).forEach(key => {
       if (isString(componentToken[key])) {

diff --git a/packages/design/src/tooltip/MouseTooltip.tsx b/packages/design/src/tooltip/MouseTooltip.tsx
@@ -1,6 +1,7 @@
 import { useMouse, useSize } from 'ahooks';
 import type { TooltipPropsWithTitle as AntTooltipPropsWithTitle } from 'antd/es/tooltip';
 import React, { useRef, useState } from 'react';
+// @ts-ignore
 import ReactStickyMouseTooltip from 'react-sticky-mouse-tooltip';
 import theme from '../theme';
 

diff --git a/packages/design/src/tree-select/style/index.ts b/packages/design/src/tree-select/style/index.ts
@@ -11,8 +11,8 @@ export const genTreeSelectStyle: GenerateStyle<TreeSelectToken> = (
 };
 
 export default (prefixCls: string) => {
-  const useStyle = genComponentStyleHook('TreeSelect', (token: TreeSelectToken) => {
-    return [genTreeSelectStyle(token)];
+  const useStyle = genComponentStyleHook('TreeSelect', token => {
+    return [genTreeSelectStyle(token as TreeSelectToken)];
   });
   return useStyle(prefixCls);
 };
diff --git a/packages/design/src/typography/style/index.ts b/packages/design/src/typography/style/index.ts
@@ -23,8 +23,8 @@ export const genTypographyStyle: GenerateStyle<TypographyToken> = (
 };
 
 export default (prefixCls: string) => {
-  const useStyle = genComponentStyleHook('Typography', (token: TypographyToken) => {
-    return [genTypographyStyle(token)];
+  const useStyle = genComponentStyleHook('Typography', token => {
+    return [genTypographyStyle(token as TypographyToken)];
   });
   return useStyle(prefixCls);
 };