@ant-design/pro-components 3.1.12-0 → 3.1.13-0

package/es/field/components/TreeSelect/FieldTreeSelectRead.js

@@ -0,0 +1,24 @@
+import { objectToMap, proFieldParsingText } from "../../../utils";
+import { Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
+export function FieldTreeSelectRead(props) {
+  const {
+    mode,
+    render,
+    fieldProps,
+    optionsValueEnum,
+    options,
+    ...rest
+  } = props;
+  const dom = /*#__PURE__*/_jsx(_Fragment, {
+    children: proFieldParsingText(rest.text, objectToMap(rest.valueEnum || optionsValueEnum))
+  });
+  if (render) {
+    return render(rest.text, {
+      mode,
+      ...fieldProps,
+      treeData: options
+    }, dom) ?? null;
+  }
+  return dom;
+}

package/es/field/components/TreeSelect/index.d.ts

@@ -1,22 +1,15 @@
-import type { TreeSelectProps } from 'antd';
 import React from 'react';
-export type TreeSelectFieldProps = TreeSelectProps & {
-    /**
-     * 当搜索关键词发生变化时是否请求远程数据
-     *
-     * @default true
-     */
-    fetchDataOnSearch?: boolean;
-};
+import type { TreeSelectFieldProps } from './types';
+export type { TreeSelectFieldProps };
 declare const _default: React.ForwardRefExoticComponent<import("../../../provider").BaseProFieldFC & import("../../../provider").ProRenderFieldPropsType & {
     text: string;
-    valueEnum?: import("src/utils/typing").ProFieldValueEnumType | undefined;
+    valueEnum?: import("src/utils").ProFieldValueEnumType | undefined;
     debounceTime?: number | undefined;
-    request?: import("src/utils/typing").ProFieldRequestData | undefined;
+    request?: import("src/utils").ProFieldRequestData | undefined;
     params?: any;
     fieldProps?: any;
-    variant?: "outlined" | "filled" | "borderless" | undefined;
+    variant?: "outlined" | "borderless" | "filled" | undefined;
     id?: string | undefined;
     defaultKeyWords?: string | undefined;
-} & import("../../PureProField").ProFieldLightProps & React.RefAttributes<any>>;
+} & import("../../types").ProFieldLightProps & React.RefAttributes<any>>;
 export default _default;

package/es/field/components/TreeSelect/index.js

@@ -1,13 +1,13 @@
 import { omit, useControlledState } from '@rc-component/util';
-import { ConfigProvider, Spin, TreeSelect } from 'antd';
-import { clsx } from 'clsx';
+import { ConfigProvider } from 'antd';
 import React, { useCallback, useContext, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import { useIntl } from "../../../provider";
-import { FieldLabel, objectToMap, proFieldParsingText } from "../../../utils";
+import { isProFieldEditOnlyMode, isProFieldReadMode } from "../../internal/fieldMode";
 import { useFieldFetchData } from "../Select";
-import { Fragment as _Fragment } from "react/jsx-runtime";
+import { FieldTreeSelectEdit } from "./FieldTreeSelectEdit";
+import { FieldTreeSelectLightEdit } from "./FieldTreeSelectLightEdit";
+import { FieldTreeSelectRead } from "./FieldTreeSelectRead";
 import { jsx as _jsx } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
 /**
  * Tree select
  * A function that returns a React component.
@@ -72,7 +72,7 @@ const FieldTreeSelect = ({
     fetchData: keyWord => fetchData(keyWord)
   }));
   const optionsValueEnum = useMemo(() => {
-    if (mode !== 'read') return;
+    if (!isProFieldReadMode(mode)) return;
     /**
      * Support TreeSelect fieldNames
      * @see https://ant.design/components/tree-select-cn
@@ -106,111 +106,55 @@ const FieldTreeSelect = ({
     }
     propsOnChange?.(value, optionList, extra);
   };
-  if (mode === 'read') {
-    const dom = /*#__PURE__*/_jsx(_Fragment, {
-      children: proFieldParsingText(rest.text, objectToMap(rest.valueEnum || optionsValueEnum))
+  if (isProFieldReadMode(mode)) {
+    return /*#__PURE__*/_jsx(FieldTreeSelectRead, {
+      formItemRender: formItemRender,
+      mode: mode,
+      light: light,
+      label: label,
+      render: render,
+      variant: propsVariant,
+      optionsValueEnum: optionsValueEnum,
+      options: options,
+      ...rest
     });
-    if (render) {
-      return render(rest.text, {
-        mode,
-        ...fieldProps,
-        treeData: options
-      }, dom) ?? null;
-    }
-    return dom;
   }
-  if (mode === 'edit') {
-    const valuesLength = Array.isArray(fieldProps?.value) ? fieldProps?.value?.length : 0;
-    let dom = /*#__PURE__*/_jsx(Spin, {
-      spinning: loading,
-      children: /*#__PURE__*/_jsx(TreeSelect, {
-        open: open,
-        onOpenChange: isOpen => {
-          fieldProps?.onOpenChange?.(isOpen);
-          setOpen(isOpen);
-        },
-        ref: treeSelectRef,
-        popupMatchSelectWidth: !light,
-        placeholder: intl.getMessage('tableForm.selectPlaceholder', '请选择'),
-        tagRender: light ? item => {
-          if (valuesLength < 2) return /*#__PURE__*/_jsx(_Fragment, {
-            children: item.label
-          });
-          /**
-           * 性能不好，等我给 antd 提个issue
-           */
-          const itemIndex = fieldProps?.value?.findIndex(v => v === item.value || v.value === item.value);
-          return /*#__PURE__*/_jsxs(_Fragment, {
-            children: [item.label, " ", itemIndex < valuesLength - 1 ? ',' : '']
-          });
-        } : undefined,
-        ...fieldProps,
-        treeData: options,
-        showSearch: showSearch ? {
-          ...showSearchConfig,
-          searchValue: searchValue,
-          autoClearSearchValue: autoClearSearchValue,
-          onSearch: value => {
-            // fix 不支持请求的情况下不刷新options
-            if (fetchDataOnSearch && rest?.request) {
-              fetchData(value);
-            }
-            setSearchValue(value);
-          }
-        } : showSearch,
-        style: {
-          minWidth: 60,
-          ...fieldProps.style
-        },
-        allowClear: fieldProps.allowClear !== false,
-        onClear: () => {
-          onClear?.();
-          fetchData(undefined);
-          if (showSearch) {
-            setSearchValue(undefined);
-          }
-        },
-        onChange: onChange,
-        onBlur: event => {
-          setSearchValue(undefined);
-          fetchData(undefined);
-          onBlur?.(event);
-        },
-        className: clsx(fieldProps?.className, layoutClassName)
-      })
-    });
-    if (formItemRender) {
-      dom = formItemRender(rest.text, {
-        mode,
-        ...fieldProps,
-        options,
-        loading
-      }, dom) ?? null;
-    }
+  if (isProFieldEditOnlyMode(mode)) {
+    const editProps = {
+      ...rest,
+      text: rest.text,
+      mode: 'edit',
+      formItemRender,
+      label,
+      variant,
+      fieldProps,
+      open,
+      setOpen,
+      treeSelectRef,
+      intl,
+      loading,
+      options: options,
+      fetchData,
+      fetchDataOnSearch,
+      hasRequest: !!rest.request,
+      showSearch,
+      showSearchConfig,
+      searchValue,
+      setSearchValue,
+      autoClearSearchValue,
+      onClear,
+      treeSelectOnChange: onChange,
+      onBlur,
+      layoutClassName
+    };
     if (light) {
-      const {
-        disabled,
-        placeholder
-      } = fieldProps;
-      const notEmpty = !!fieldProps.value && fieldProps.value?.length !== 0;
-      return /*#__PURE__*/_jsx(FieldLabel, {
-        label: label,
-        disabled: disabled,
-        placeholder: placeholder,
-        onClick: () => {
-          setOpen(true);
-          fieldProps?.onOpenChange?.(true);
-        },
-        variant: variant,
-        value: notEmpty || open ? dom : null,
-        style: notEmpty ? {
-          paddingInlineEnd: 0
-        } : undefined,
-        allowClear: false,
-        downIcon: false
+      return /*#__PURE__*/_jsx(FieldTreeSelectLightEdit, {
+        ...editProps
       });
     }
-    return dom;
+    return /*#__PURE__*/_jsx(FieldTreeSelectEdit, {
+      ...editProps
+    });
   }
   return null;
 };

package/es/field/components/TreeSelect/types.d.ts

@@ -0,0 +1,9 @@
+import type { TreeSelectProps } from 'antd';
+export type TreeSelectFieldProps = TreeSelectProps & {
+    /**
+     * 当搜索关键词发生变化时是否请求远程数据
+     *
+     * @default true
+     */
+    fetchDataOnSearch?: boolean;
+};

package/es/field/components/TreeSelect/types.js

@@ -0,0 +1 @@
+export {};

package/es/field/initDayjs.d.ts

@@ -0,0 +1 @@
+export {};

package/es/field/initDayjs.js

@@ -0,0 +1,13 @@
+import dayjs from 'dayjs';
+import advancedFormat from 'dayjs/plugin/advancedFormat';
+import isoWeek from 'dayjs/plugin/isoWeek';
+import localeData from 'dayjs/plugin/localeData';
+import weekday from 'dayjs/plugin/weekday';
+import weekOfYear from 'dayjs/plugin/weekOfYear';
+import weekYear from 'dayjs/plugin/weekYear';
+dayjs.extend(localeData);
+dayjs.extend(advancedFormat);
+dayjs.extend(isoWeek);
+dayjs.extend(weekOfYear);
+dayjs.extend(weekYear);
+dayjs.extend(weekday);

package/es/field/internal/ProFieldLightWrapper.d.ts

@@ -0,0 +1,16 @@
+import React from 'react';
+import type { ProFieldLightProps } from '../types';
+/**
+ * Light 筛选专用：区分 label 点击与 clear，向子组件注入 `labelTrigger` / `lightLabel`。
+ * 与只读（read）/ 编辑（edit）无关；read/edit 分支请用 `fieldMode.ts` 中的工具函数。
+ */
+declare function ProFieldLightWrapper<T extends ProFieldLightProps>(props: T & {
+    children: React.ReactNode;
+    isLight?: boolean;
+}): React.JSX.Element;
+/**
+ * 非 light 时直接返回子元素；light 时包一层 {@link ProFieldLightWrapper}。
+ * 用于在需要处包一层 light 行为，避免重复的 JSX 包装。
+ */
+export declare function wrapProFieldLight(isLight: boolean | undefined, child: React.ReactElement): React.ReactNode;
+export default ProFieldLightWrapper;

package/es/field/{FieldHOC/index.js → internal/ProFieldLightWrapper.js}

@@ -1,13 +1,14 @@
 import React, { useCallback, useRef, useState } from 'react';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
-function FieldHOC(props) {
+/**
+ * Light 筛选专用：区分 label 点击与 clear，向子组件注入 `labelTrigger` / `lightLabel`。
+ * 与只读（read）/ 编辑（edit）无关；read/edit 分支请用 `fieldMode.ts` 中的工具函数。
+ */
+function ProFieldLightWrapper(props) {
   const [labelTrigger, setLabelTrigger] = useState(false);
   const lightLabel = useRef(null);
-
-  // 是label且不是label里面的clear图标触发事件
   const isTriggeredByLabel = useCallback(e => {
-    // 两条语句结果分别命名，可读性好点
     const isLabelMouseDown = lightLabel.current?.labelRef?.current?.contains(e.target);
     const isClearMouseDown = lightLabel.current?.clearRef?.current?.contains(e.target);
     return isLabelMouseDown && !isClearMouseDown;
@@ -34,4 +35,18 @@ function FieldHOC(props) {
     children: props.children
   });
 }
-export default FieldHOC;
+
+/**
+ * 非 light 时直接返回子元素；light 时包一层 {@link ProFieldLightWrapper}。
+ * 用于在需要处包一层 light 行为，避免重复的 JSX 包装。
+ */
+export function wrapProFieldLight(isLight, child) {
+  if (!isLight) {
+    return child;
+  }
+  return /*#__PURE__*/_jsx(ProFieldLightWrapper, {
+    isLight: true,
+    children: child
+  });
+}
+export default ProFieldLightWrapper;

package/es/field/internal/fieldMode.d.ts

@@ -0,0 +1,14 @@
+import type { ProFieldFCMode } from '../../provider';
+/**
+ * Shared mode checks for Field* components (read vs edit branches).
+ * Keep semantics aligned with existing code: some components only treat `edit`
+ * as interactive (not `update`); do not collapse those into edit-or-update.
+ *
+ * Light-filter UI (`light` / `isLight`) is separate: use `wrapProFieldLight` in
+ * `./ProFieldLightWrapper`, not these helpers.
+ */
+export declare function isProFieldReadMode(mode: ProFieldFCMode | undefined): boolean;
+/** `edit` or `update` — most Field* interactive branches. */
+export declare function isProFieldEditOrUpdateMode(mode: ProFieldFCMode | undefined): boolean;
+/** Strict `edit` only — used where `update` previously fell through (e.g. Radio). */
+export declare function isProFieldEditOnlyMode(mode: ProFieldFCMode | undefined): boolean;

package/es/field/internal/fieldMode.js

@@ -0,0 +1,21 @@
+/**
+ * Shared mode checks for Field* components (read vs edit branches).
+ * Keep semantics aligned with existing code: some components only treat `edit`
+ * as interactive (not `update`); do not collapse those into edit-or-update.
+ *
+ * Light-filter UI (`light` / `isLight`) is separate: use `wrapProFieldLight` in
+ * `./ProFieldLightWrapper`, not these helpers.
+ */
+export function isProFieldReadMode(mode) {
+  return mode === 'read';
+}
+
+/** `edit` or `update` — most Field* interactive branches. */
+export function isProFieldEditOrUpdateMode(mode) {
+  return mode === 'edit' || mode === 'update';
+}
+
+/** Strict `edit` only — used where `update` previously fell through (e.g. Radio). */
+export function isProFieldEditOnlyMode(mode) {
+  return mode === 'edit';
+}

package/es/field/types.d.ts

@@ -0,0 +1,30 @@
+import type React from 'react';
+import type { BaseProFieldFC, ProFieldFCRenderProps, ProRenderFieldPropsType } from '../provider';
+import type { ProFieldRequestData, ProFieldTextType, ProFieldValueTypeInput } from '../utils';
+export type ProFieldEmptyText = string | false;
+/** 默认的 Field 需要实现的功能 */
+export type ProFieldFC<T = {}> = React.ForwardRefRenderFunction<any, BaseProFieldFC & ProRenderFieldPropsType & T>;
+/** 轻量筛选的 field 属性 */
+export type ProFieldLightProps = {
+    lightLabel?: React.RefObject<{
+        labelRef: React.RefObject<HTMLElement>;
+        clearRef: React.RefObject<HTMLElement>;
+    }>;
+    labelTrigger?: boolean;
+};
+/** Value type by function */
+export type ProFieldValueTypeFunction<T> = (item: T) => ProFieldValueTypeInput;
+/** 传给各模式渲染函数（defaultRenderRead/Edit、pureRenderRead/Edit 等）的合并 props */
+export type ProFieldRenderProps = Omit<ProFieldFCRenderProps, 'text' | 'placeholder'> & ProRenderFieldPropsType & {
+    /** 从服务器读取选项 */
+    request?: ProFieldRequestData;
+    emptyText?: React.ReactNode;
+    open?: boolean;
+    onOpenChange?: (open: boolean) => void;
+    [key: string]: any;
+};
+/** ProField / PureProField 对外 props */
+export type ProFieldPropsType = {
+    text?: ProFieldTextType;
+    valueType?: ProFieldValueTypeInput;
+} & ProFieldRenderProps;

package/es/field/types.js

@@ -0,0 +1 @@
+export {};

package/es/form/BaseForm/BaseForm.d.ts

@@ -135,7 +135,7 @@ export type BaseFormProps<T = Record<string, any>, U = Record<string, any>> = {
     /** 是否回车提交 */
     isKeyPressSubmit?: boolean;
     /** Form 组件的类型，内部使用 */
-    formComponentType?: 'DrawerForm' | 'ModalForm' | 'QueryFilter';
+    formComponentType?: 'DrawerForm' | 'ModalForm' | 'QueryFilter' | 'LightFilter';
 } & Omit<FormProps, 'onFinish'> & CommonFormProps<T, U>;
-export declare function BaseForm<T = Record<string, any>, U = Record<string, any>>(props: BaseFormProps<T, U>): import("react/jsx-runtime").JSX.Element;
+export declare function BaseForm<T = Record<string, any>, U = Record<string, any>>(props: BaseFormProps<T, U>): React.JSX.Element;
 export {};