feat: Update code

app/js/components/ActionSwitch/index.tsx

@@ -79,6 +79,7 @@ function ActionSwitch<R>({
       autoFocus={autoFocus}
       className={className}
       onChange={onSwitchChange}
+      disabled={restProps.disabled}
       checkedChildren={checkedChildren}
       unCheckedChildren={unCheckedChildren}
       loading={restProps.confirm ? false : loading}

app/js/components/Document/index.tsx

@@ -2,6 +2,7 @@
  * @module index
  */
 
+import 'dayjs/locale/zh-cn';
 import zhCN from 'antd/locale/zh_CN';
 import { ConfigProvider } from 'antd';
 import { memo, useMemo } from 'react';

app/js/components/FallBack/Loading.tsx

@@ -5,9 +5,9 @@
 import React, { memo } from 'react';
 import { Spin, SpinProps } from 'antd';
 
-export interface LoadingFallBackProps extends Pick<SpinProps, 'delay'>, Pick<React.CSSProperties, 'width' | 'height'> {}
+export interface LoadingFallbackProps extends Pick<SpinProps, 'delay'>, Pick<React.CSSProperties, 'width' | 'height'> {}
 
-export default memo(function LoadingFallBack({ delay = 128, width, height = 360 }: LoadingFallBackProps) {
+export default memo(function LoadingFallback({ delay = 128, width, height = 360 }: LoadingFallbackProps) {
   return (
     <Spin delay={delay}>
       <div style={{ width, height }} />

app/js/components/FlexDrawer/index.tsx

@@ -3,25 +3,34 @@
  */
 
 import { isString } from '/js/utils/utils';
-import { memo, useCallback, useRef } from 'react';
 import useMediaQuery from '/js/hooks/useMediaQuery';
-import { ConfigProvider, Drawer, DrawerProps } from 'antd';
+import React, { memo, useCallback, useRef } from 'react';
+import { ConfigProvider, Drawer, DrawerProps, GetProp } from 'antd';
 
 export interface FlexDrawerProps extends DrawerProps {
   breakWidth?: string | number;
   breakHeight?: string | number;
 }
 
+const containerStyle: React.CSSProperties = {
+  minWidth: 'fit-content'
+};
+
+const drawerStyles: GetProp<DrawerProps, 'styles'> = {
+  body: {
+    outline: 'none',
+    position: 'relative'
+  }
+};
+
 export default memo(function FlexDrawer({
   children,
   height = 720,
   width = 1440,
-  keyboard = false,
   closeIcon = false,
-  maskClosable = false,
   breakWidth = '100vw',
   breakHeight = '100vh',
-  styles = { body: { position: 'relative' } },
+  styles = drawerStyles,
   ...restProps
 }: FlexDrawerProps) {
   const containerRef = useRef<HTMLDivElement>(null);
@@ -41,13 +50,11 @@ export default memo(function FlexDrawer({
     <Drawer
       {...restProps}
       styles={styles}
-      keyboard={keyboard}
       closeIcon={closeIcon}
-      maskClosable={maskClosable}
       width={isBreakWidth ? breakWidth : width}
       height={isBreakHeight ? breakHeight : height}
     >
-      <div ref={containerRef}>
+      <div ref={containerRef} style={containerStyle}>
         <ConfigProvider getPopupContainer={getPopupContainer} getTargetContainer={getTargetContainer}>
           {children}
         </ConfigProvider>

app/js/components/FlexLayout/style/index.ts

@@ -60,6 +60,7 @@ export default createStyles(
 
         [`.${prefixCls}-content`]: {
           height: '100%',
+          outline: 'none',
           overflow: 'auto',
           position: 'relative',
           msScrollChaining: 'none',

app/js/components/FormDrawer/index.tsx

@@ -29,18 +29,20 @@ function createFormName(id: string): string {
   return `form_${id.replace(/[^a-z_\d]/gi, '')}`;
 }
 
+export type Trigger = React.ReactElement<{
+  disabled?: boolean;
+  onClick?: (...args: unknown[]) => void;
+}>;
+
 export interface FormDrawerProps<F extends Fields, R>
   extends Omit<FormProps<F>, FormOmitted>,
     Pick<Options<F, R>, SubmitPicked>,
     Pick<FlexDrawerProps, DrawerPicked> {
   action: string;
+  trigger: Trigger;
   onOpen?: () => void;
   onClose?: () => void;
   form?: FormInstance<F>;
-  trigger: React.ReactElement<{
-    disabled?: boolean;
-    onClick?: (...args: unknown[]) => void;
-  }>;
   requestInit?: Omit<Options<F, R>, SubmitPicked>;
   extra?: (submitting: boolean, form: FormInstance<F>, onClose: () => void) => React.ReactNode;
   footer?: (submitting: boolean, form: FormInstance<F>, onClose: () => void) => React.ReactNode;

app/js/components/Paper/style/index.ts

@@ -11,8 +11,6 @@ export default createStyles(['components', 'Paper', prefixCls], token => {
     [`.${prefixCls}`]: {
       margin: token.marginXS,
       padding: token.padding,
-      minWidth: 'fit-content',
-      minHeight: 'fit-content',
       borderRadius: token.borderRadius,
       backgroundColor: token.colorBgContainer
     }

app/js/components/ViewDrawer/index.tsx

@@ -6,13 +6,15 @@ import { Button } from 'antd';
 import FlexDrawer, { FlexDrawerProps } from '/js/components/FlexDrawer';
 import React, { cloneElement, memo, useCallback, useEffect, useMemo, useState } from 'react';
 
+export type Trigger = React.ReactElement<{
+  disabled?: boolean;
+  onClick?: (...args: unknown[]) => void;
+}>;
+
 export interface ViewDrawerProps extends Omit<FlexDrawerProps, 'open' | 'extra' | 'footer'> {
+  trigger: Trigger;
   onOpen?: () => void;
   onClose?: () => void;
-  trigger: React.ReactElement<{
-    disabled?: boolean;
-    onClick?: (...args: unknown[]) => void;
-  }>;
   extra?: (onClose: () => void) => React.ReactNode;
   footer?: (onClose: () => void) => React.ReactNode;
 }
@@ -27,6 +29,7 @@ export default memo(function ViewDrawer({
   trigger,
   onClose,
   children,
+  width = 768,
   extra = defaultExtra,
   ...restProps
 }: ViewDrawerProps) {
@@ -64,6 +67,7 @@ export default memo(function ViewDrawer({
       <FlexDrawer
         {...restProps}
         open={open}
+        width={width}
         onClose={onCloseHandler}
         extra={extra(onCloseHandler)}
         footer={footer?.(onCloseHandler)}

app/js/hooks/createStyles.tsx

@@ -5,13 +5,12 @@
 import {
   AbstractCalculator,
   CSSInterpolation,
-  genCalc,
   token2CSSVar,
   unit,
   useCSSVarRegister,
   useStyleRegister
 } from '@ant-design/cssinjs';
-import genMaxMin from 'antd/es/theme/util/maxmin';
+import { genCalc } from '@ant-design/cssinjs-utils';
 import { isNumber, isString } from '/js/utils/utils';
 import { memo, ReactElement, useId, useMemo } from 'react';
 import { AliasToken, GlobalToken, OverrideToken } from 'antd/es/theme/interface';
@@ -48,8 +47,6 @@ export interface UseStyles {
 export interface CSSUtils {
   unit(value: string | number): string;
   calc(value: number | string): AbstractCalculator;
-  max(...values: (number | string)[]): number | string;
-  min(...values: (number | string)[]): number | string;
 }
 
 export interface Styles<C extends Components = Components> {
@@ -222,10 +219,9 @@ export default function createStyles<C extends Components = never>(path: string[
 
     const utils = useMemo(() => {
       const type = cssVar ? 'css' : 'js';
-      const { max, min } = genMaxMin(type);
       const unitlessCssVar = new Set(Object.keys(unitless));
 
-      return { min, max, unit, calc: genCalc(type, unitlessCssVar) };
+      return { unit, calc: genCalc(type, unitlessCssVar) };
     }, [cssVar, unitless]);
 
     const render = useStyleRegister({ path, theme, token, hashId }, () => {

app/js/hooks/useAction.tsx

@@ -75,8 +75,8 @@ export default function useAction<F extends Fields | null, R>(
 
     if (confirm) {
       const { disabled } = options;
-      const props: PopconfirmProps = isObject(confirm) ? confirm : { title: '警告', description: confirm };
-      const { okButtonProps, placement = 'topRight', icon = <QuestionCircleOutlined style={{ color: '#f00' }} /> } = props;
+      const props = isObject(confirm) ? confirm : { title: '警告', description: confirm };
+      const { okButtonProps, placement = 'topRight', icon = <QuestionCircleOutlined /> } = props;
 
       return (
         <Popconfirm

app/js/hooks/useControllableValue.ts

@@ -119,9 +119,10 @@ export default function useControllableValue<V = undefined>(
 
   const valueRef = useLatestRef(value);
 
-  const setValue = useCallback((value: React.SetStateAction<V | undefined>, ...args: any[]): void => {
+  const setValue = useCallback((value: React.SetStateAction<V | undefined>, ...args: unknown[]): void => {
     if (isMounted()) {
-      const { current: prevState } = valueRef;
+      const { defaultValue } = optionsRef.current;
+      const { current: prevState = defaultValue } = valueRef;
       const state = isFunction(value) ? value(prevState) : value;
 
       if (state !== prevState) {

app/js/hooks/usePagingOptions.ts

@@ -52,7 +52,6 @@ export default function usePagingOptions(opitons?: Options | false): UsePagingOp
         responsive: true,
         showSizeChanger: true,
         showQuickJumper: true,
-        hideOnSinglePage: true,
         ...opitons,
         pageSizeOptions: pageSizeOptions.map(item => item.toString())
       };

app/js/hooks/usePagingRequest.ts

@@ -174,7 +174,7 @@ export default function usePagingRequest<I, E = unknown, T = I>(
 
         if (onError) {
           onError(error);
-        } else {
+        } else if (error.code !== 401) {
           message.error(error.message);
         }
       }

app/js/hooks/useRequest.ts

@@ -23,7 +23,7 @@ export interface Request {
 export interface RequestOptions<R> extends Omit<Options, 'delay'> {
   onComplete?: () => void;
   onSuccess?: (response: R) => void;
-  onError?: (error: RequestError<R>) => void;
+  onError?: (error: RequestError) => void;
 }
 
 export interface Options extends Omit<RequestInit, 'onMessage' | 'onUnauthorized'> {
@@ -32,16 +32,6 @@ export interface Options extends Omit<RequestInit, 'onMessage' | 'onUnauthorized
   onUnauthorized?: (navigate: Navigate, location: Location) => void;
 }
 
-/**
- * @function onUnauthorizedHandler
- * @description 默认未授权操作
- * @param navigate 导航方法
- * @param location 导航信息
- */
-export function onUnauthorizedHandler(navigate: Navigate, location: Location): void {
-  navigate('/login', { state: location });
-}
-
 /**
  * @function useRequest
  * @description [hook] 请求操作
@@ -76,7 +66,7 @@ export default function useRequest(
         if (onUnauthorized) {
           onUnauthorized(navigate, location);
         } else {
-          onUnauthorizedHandler(navigate, location);
+          navigate('/login', { state: location });
         }
       };
 
@@ -90,8 +80,8 @@ export default function useRequest(
         }
       }
 
-      const onMessage = (msg: string) => {
-        notify && message.success(msg);
+      const onMessage = (content: string) => {
+        notify && message.success(content);
       };
 
       fetch<R>(url, { ...requestInit, headers, onMessage, onUnauthorized })
@@ -101,13 +91,13 @@ export default function useRequest(
               requestInit.onSuccess?.(response);
             }
           },
-          (error: RequestError<R>) => {
+          (error: RequestError) => {
             if (isMounted()) {
               const { onError } = requestInit;
 
               if (onError) {
                 onError(error);
-              } else {
+              } else if (error.code !== 401) {
                 message.error(error.message);
               }
             }

app/js/hooks/useResponse.ts

@@ -67,7 +67,7 @@ export default function useResponse<R, T>(
       ...options
     };
 
-    request(urlRef.current, {
+    request<R>(urlRef.current, {
       ...requestInit,
       onSuccess(response) {
         const { transform } = requestInit;

app/js/hooks/useSearchFilters.ts

@@ -8,7 +8,7 @@ import { Query as Filter } from '/js/utils/request';
 export type { Filter };
 
 export type SearchFilters<T extends Filter[]> = {
-  [K in keyof T]: T[K] | false;
+  [K in keyof T]: T[K] extends Filter ? T[K] | false : T[K];
 };
 
 /**

app/js/hooks/useSubmit.ts

@@ -18,7 +18,7 @@ export interface Options<F extends Fields | null, R> extends Omit<RequestOptions
   onComplete?: (fields: F) => void;
   normalize?: (fields: F) => Fields;
   onSuccess?: (response: R, fields: F) => void;
-  onError?: (error: RequestError<R>, fields: F) => void;
+  onError?: (error: RequestError, fields: F) => void;
 }
 
 /**

app/js/hooks/useTable.ts

@@ -142,7 +142,7 @@ export default function useTable<I, E = unknown, T = I>(
     }
   }, []);
 
-  const pagination = useMemo(() => {
+  const pagination = useMemo<GetProp<TableProps<I>, 'pagination'>>(() => {
     const originRefsPagination = originRefs.pagination;
 
     if (hasQuery(originRefsPagination)) {