@ant-design/pro-components 3.0.0-beta.3 → 3.0.2-0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (134) hide show
  1. package/dist/pro-components.min.js +1 -1
  2. package/es/card/components/Statistic/style.js +2 -6
  3. package/es/descriptions/index.js +2 -1
  4. package/es/field/ValueTypeToComponent.js +4 -4
  5. package/es/field/components/Cascader/index.d.ts +2 -2
  6. package/es/field/components/Checkbox/index.d.ts +1 -1
  7. package/es/field/components/ColorPicker/index.d.ts +1 -1
  8. package/es/field/components/DatePicker/index.d.ts +2 -2
  9. package/es/field/components/Percent/util.d.ts +1 -1
  10. package/es/field/components/Radio/index.d.ts +1 -1
  11. package/es/field/components/RangePicker/index.d.ts +2 -2
  12. package/es/field/components/Segmented/index.d.ts +1 -1
  13. package/es/field/components/Select/LightSelect/index.d.ts +1 -1
  14. package/es/field/components/Select/index.d.ts +1 -1
  15. package/es/field/components/Switch/index.d.ts +1 -1
  16. package/es/field/components/TreeSelect/index.d.ts +2 -2
  17. package/es/form/BaseForm/BaseForm.js +3 -2
  18. package/es/form/components/Cascader/index.js +1 -1
  19. package/es/form/components/Checkbox/index.js +1 -1
  20. package/es/form/components/ColorPicker/index.js +1 -1
  21. package/es/form/components/DatePicker/BaseDatePicker.js +21 -13
  22. package/es/form/components/DatePicker/DatePicker.js +1 -1
  23. package/es/form/components/DatePicker/DateTimePicker.js +1 -1
  24. package/es/form/components/DatePicker/MonthPicker.js +1 -1
  25. package/es/form/components/DatePicker/QuarterPicker.js +1 -1
  26. package/es/form/components/DatePicker/TimePicker.js +1 -1
  27. package/es/form/components/DatePicker/WeekPicker.js +1 -1
  28. package/es/form/components/DatePicker/YearPicker.js +1 -1
  29. package/es/form/components/DateRangePicker/BaseDateRanger.js +39 -14
  30. package/es/form/components/DateRangePicker/DateMonthRangePicker.js +1 -1
  31. package/es/form/components/DateRangePicker/DateQuarterRangePicker.js +1 -1
  32. package/es/form/components/DateRangePicker/DateTimeRangePicker.js +1 -1
  33. package/es/form/components/DateRangePicker/DateWeekRangePicker.js +1 -1
  34. package/es/form/components/DateRangePicker/DateYearRangePicker.js +1 -1
  35. package/es/form/components/DateRangePicker/TimeRangePicker.js +1 -1
  36. package/es/form/components/DateRangePicker/index.js +1 -1
  37. package/es/form/components/Digit/DigitRange.d.ts +1 -1
  38. package/es/form/components/Digit/DigitRange.js +1 -1
  39. package/es/form/components/Digit/index.js +1 -1
  40. package/es/form/components/FormItem/warpField.js +11 -11
  41. package/es/form/components/Money/index.js +1 -1
  42. package/es/form/components/Radio/index.js +49 -14
  43. package/es/form/components/Rate/index.js +1 -1
  44. package/es/form/components/SchemaForm/index.js +1 -2
  45. package/es/form/components/Segmented/index.js +1 -1
  46. package/es/form/components/Select/index.js +2 -2
  47. package/es/form/components/Slider/index.js +1 -1
  48. package/es/form/components/Switch/index.js +1 -1
  49. package/es/form/components/Text/index.js +3 -3
  50. package/es/form/components/TreeSelect/index.js +1 -1
  51. package/es/form/components/UploadButton/index.d.ts +1 -1
  52. package/es/form/components/UploadButton/index.js +3 -3
  53. package/es/form/layouts/ProForm/index.d.ts +1 -1
  54. package/es/form/typing.d.ts +1 -1
  55. package/es/layout/ProLayout.js +3 -0
  56. package/es/layout/components/SiderMenu/index.js +4 -2
  57. package/es/layout/index.d.ts +0 -1
  58. package/es/layout/index.js +2 -1
  59. package/es/table/Table.js +52 -75
  60. package/es/table/components/ColumnSetting/index.js +12 -2
  61. package/es/table/typing.d.ts +29 -7
  62. package/es/table/utils/genProColumnToColumn.d.ts +2 -2
  63. package/es/table/utils/genProColumnToColumn.js +5 -17
  64. package/es/table/utils/index.d.ts +58 -5
  65. package/es/table/utils/index.js +155 -18
  66. package/es/utils/conversionMomentValue/index.js +14 -2
  67. package/es/utils/hooks/useDocumentTitle/index.js +1 -1
  68. package/lib/card/components/Statistic/style.js +2 -6
  69. package/lib/descriptions/index.js +2 -1
  70. package/lib/field/ValueTypeToComponent.js +4 -4
  71. package/lib/field/components/Cascader/index.d.ts +2 -2
  72. package/lib/field/components/Checkbox/index.d.ts +2 -2
  73. package/lib/field/components/ColorPicker/index.d.ts +2 -2
  74. package/lib/field/components/DatePicker/index.d.ts +2 -2
  75. package/lib/field/components/Percent/util.d.ts +1 -1
  76. package/lib/field/components/Radio/index.d.ts +1 -1
  77. package/lib/field/components/RangePicker/index.d.ts +2 -2
  78. package/lib/field/components/Segmented/index.d.ts +1 -1
  79. package/lib/field/components/Select/LightSelect/index.d.ts +1 -1
  80. package/lib/field/components/Select/index.d.ts +2 -2
  81. package/lib/field/components/Switch/index.d.ts +1 -1
  82. package/lib/field/components/TreeSelect/index.d.ts +2 -2
  83. package/lib/form/BaseForm/BaseForm.js +3 -2
  84. package/lib/form/components/Cascader/index.js +1 -1
  85. package/lib/form/components/Checkbox/index.js +1 -1
  86. package/lib/form/components/ColorPicker/index.js +1 -1
  87. package/lib/form/components/DatePicker/BaseDatePicker.js +20 -12
  88. package/lib/form/components/DatePicker/DatePicker.js +1 -1
  89. package/lib/form/components/DatePicker/DateTimePicker.js +1 -1
  90. package/lib/form/components/DatePicker/MonthPicker.js +1 -1
  91. package/lib/form/components/DatePicker/QuarterPicker.js +1 -1
  92. package/lib/form/components/DatePicker/TimePicker.js +1 -1
  93. package/lib/form/components/DatePicker/WeekPicker.js +1 -1
  94. package/lib/form/components/DatePicker/YearPicker.js +1 -1
  95. package/lib/form/components/DateRangePicker/BaseDateRanger.js +38 -13
  96. package/lib/form/components/DateRangePicker/DateMonthRangePicker.js +1 -1
  97. package/lib/form/components/DateRangePicker/DateQuarterRangePicker.js +1 -1
  98. package/lib/form/components/DateRangePicker/DateTimeRangePicker.js +1 -1
  99. package/lib/form/components/DateRangePicker/DateWeekRangePicker.js +1 -1
  100. package/lib/form/components/DateRangePicker/DateYearRangePicker.js +1 -1
  101. package/lib/form/components/DateRangePicker/TimeRangePicker.js +1 -1
  102. package/lib/form/components/DateRangePicker/index.js +1 -1
  103. package/lib/form/components/Digit/DigitRange.d.ts +1 -1
  104. package/lib/form/components/Digit/DigitRange.js +1 -1
  105. package/lib/form/components/Digit/index.js +1 -1
  106. package/lib/form/components/FormItem/warpField.js +11 -11
  107. package/lib/form/components/Money/index.js +1 -1
  108. package/lib/form/components/Radio/index.js +49 -14
  109. package/lib/form/components/Rate/index.js +1 -1
  110. package/lib/form/components/SchemaForm/index.js +1 -2
  111. package/lib/form/components/Segmented/index.js +1 -1
  112. package/lib/form/components/Select/index.js +2 -2
  113. package/lib/form/components/Slider/index.js +1 -1
  114. package/lib/form/components/Switch/index.js +1 -1
  115. package/lib/form/components/Text/index.js +3 -3
  116. package/lib/form/components/TreeSelect/index.js +1 -1
  117. package/lib/form/components/UploadButton/index.d.ts +1 -1
  118. package/lib/form/components/UploadButton/index.js +3 -3
  119. package/lib/form/layouts/ProForm/index.d.ts +1 -1
  120. package/lib/form/typing.d.ts +1 -1
  121. package/lib/layout/ProLayout.js +3 -0
  122. package/lib/layout/components/SiderMenu/index.js +4 -2
  123. package/lib/layout/index.d.ts +0 -1
  124. package/lib/layout/index.js +2 -9
  125. package/lib/table/Table.js +69 -92
  126. package/lib/table/components/ColumnSetting/index.js +12 -2
  127. package/lib/table/typing.d.ts +29 -7
  128. package/lib/table/utils/genProColumnToColumn.d.ts +2 -2
  129. package/lib/table/utils/genProColumnToColumn.js +4 -16
  130. package/lib/table/utils/index.d.ts +58 -5
  131. package/lib/table/utils/index.js +157 -20
  132. package/lib/utils/conversionMomentValue/index.js +14 -2
  133. package/lib/utils/hooks/useDocumentTitle/index.js +1 -1
  134. package/package.json +49 -45
@@ -33,13 +33,9 @@ var genProStyle = function genProStyle(token) {
33
33
  transform: 'rotate(180deg)'
34
34
  }
35
35
  },
36
- '&-content': _defineProperty({
36
+ '&-content': {
37
37
  width: '100%'
38
- }, "".concat(token.antCls, "-statistic-content"), {
39
- '&-value-int': {
40
- fontSize: token.fontSizeHeading3
41
- }
42
- }),
38
+ },
43
39
  '&-description': {
44
40
  width: '100%'
45
41
  }
@@ -171,7 +171,8 @@ export var FieldRender = function FieldRender(props) {
171
171
  marginTop: -5,
172
172
  marginBottom: -5,
173
173
  marginLeft: 0,
174
- marginRight: 0
174
+ marginRight: 0,
175
+ width: '100%'
175
176
  },
176
177
  children: renderDom()
177
178
  });
@@ -754,22 +754,22 @@ var ValueTypeToComponentMap = {
754
754
  render: function render(text, props) {
755
755
  var fieldProps = pickProProps(props.fieldProps);
756
756
  var placeholder = typeof props.placeholder === 'string' ? props.placeholder : undefined;
757
- return /*#__PURE__*/_jsx(FieldCascader, {
757
+ return /*#__PURE__*/_jsx(FieldCascader, _objectSpread(_objectSpread({}, props), {}, {
758
758
  mode: props.mode,
759
759
  text: text,
760
760
  placeholder: placeholder,
761
761
  fieldProps: fieldProps
762
- });
762
+ }));
763
763
  },
764
764
  formItemRender: function formItemRender(text, props) {
765
765
  var fieldProps = pickProProps(props.fieldProps);
766
766
  var placeholder = typeof props.placeholder === 'string' ? props.placeholder : undefined;
767
- return /*#__PURE__*/_jsx(FieldCascader, {
767
+ return /*#__PURE__*/_jsx(FieldCascader, _objectSpread(_objectSpread({}, props), {}, {
768
768
  mode: props.mode,
769
769
  text: text,
770
770
  placeholder: placeholder,
771
771
  fieldProps: fieldProps
772
- });
772
+ }));
773
773
  }
774
774
  },
775
775
  treeSelect: {
@@ -11,7 +11,7 @@ declare const _default: React.ForwardRefExoticComponent<import("../../../provide
11
11
  options?: (string | number | import("antd").CheckboxOptionType<any>)[] | undefined;
12
12
  radioType?: "button" | "radio" | undefined;
13
13
  placeholder?: string | undefined;
14
- variant?: "outlined" | "borderless" | "filled" | undefined;
14
+ variant?: "filled" | "outlined" | "borderless" | undefined;
15
15
  } & {
16
16
  text: string;
17
17
  valueEnum?: import("src/utils/typing").ProFieldValueEnumType | undefined;
@@ -19,7 +19,7 @@ declare const _default: React.ForwardRefExoticComponent<import("../../../provide
19
19
  request?: import("src/utils/typing").ProFieldRequestData | undefined;
20
20
  params?: any;
21
21
  fieldProps?: any;
22
- variant?: "outlined" | "borderless" | "filled" | undefined;
22
+ variant?: "filled" | "outlined" | "borderless" | undefined;
23
23
  id?: string | undefined;
24
24
  children?: React.ReactNode;
25
25
  defaultKeyWords?: string | undefined;
@@ -15,7 +15,7 @@ declare const _default: React.ForwardRefExoticComponent<import("src/provider").B
15
15
  request?: import("src/utils/typing").ProFieldRequestData | undefined;
16
16
  params?: any;
17
17
  fieldProps?: any;
18
- variant?: "outlined" | "borderless" | "filled" | undefined;
18
+ variant?: "filled" | "outlined" | "borderless" | undefined;
19
19
  id?: string | undefined;
20
20
  children?: React.ReactNode;
21
21
  defaultKeyWords?: string | undefined;
@@ -2,6 +2,6 @@ import type { ColorPickerProps } from 'antd';
2
2
  import React from 'react';
3
3
  declare const _default: React.ForwardRefExoticComponent<import("src/provider").BaseProFieldFC & import("src/provider").ProRenderFieldPropsType & {
4
4
  text: string;
5
- mode?: "read" | "edit" | "update" | undefined;
5
+ mode?: "update" | "read" | "edit" | undefined;
6
6
  } & Partial<Omit<ColorPickerProps, "value" | "mode">> & React.RefAttributes<any>>;
7
7
  export default _default;
@@ -4,7 +4,7 @@ declare const _default: React.ForwardRefExoticComponent<import("../../../provide
4
4
  text: string | number;
5
5
  format?: string | undefined;
6
6
  showTime?: boolean | undefined;
7
- variant?: "outlined" | "borderless" | "filled" | undefined;
8
- picker?: "date" | "time" | "month" | "week" | "quarter" | "year" | undefined;
7
+ variant?: "filled" | "outlined" | "borderless" | undefined;
8
+ picker?: "time" | "date" | "month" | "week" | "year" | "quarter" | undefined;
9
9
  } & ProFieldLightProps & React.RefAttributes<any>>;
10
10
  export default _default;
@@ -1,7 +1,7 @@
1
1
  /** 获取展示符号 */
2
2
  export declare function getSymbolByRealValue(realValue: number): "-" | "+" | null;
3
3
  /** 获取颜色 */
4
- export declare function getColorByRealValue(realValue: number /** ,color: string */): "#52c41a" | "#595959" | "#ff4d4f";
4
+ export declare function getColorByRealValue(realValue: number /** ,color: string */): "#595959" | "#52c41a" | "#ff4d4f";
5
5
  /** 获取到最后展示的数字 */
6
6
  export declare function getRealTextWithPrecision(realValue: number, precision?: number): string | number;
7
7
  /**
@@ -15,7 +15,7 @@ declare const _default: React.ForwardRefExoticComponent<import("src/provider").B
15
15
  request?: import("src/utils/typing").ProFieldRequestData | undefined;
16
16
  params?: any;
17
17
  fieldProps?: any;
18
- variant?: "outlined" | "borderless" | "filled" | undefined;
18
+ variant?: "filled" | "outlined" | "borderless" | undefined;
19
19
  id?: string | undefined;
20
20
  children?: React.ReactNode;
21
21
  defaultKeyWords?: string | undefined;
@@ -3,8 +3,8 @@ import type { ProFieldLightProps } from '../../PureProField';
3
3
  declare const _default: React.ForwardRefExoticComponent<import("../../../provider").BaseProFieldFC & import("../../../provider").ProRenderFieldPropsType & {
4
4
  text: string[];
5
5
  format?: string | undefined;
6
- variant?: "outlined" | "borderless" | "filled" | undefined;
6
+ variant?: "filled" | "outlined" | "borderless" | undefined;
7
7
  showTime?: boolean | undefined;
8
- picker?: "date" | "time" | "month" | "week" | "quarter" | "year" | undefined;
8
+ picker?: "time" | "date" | "month" | "week" | "year" | "quarter" | undefined;
9
9
  } & ProFieldLightProps & React.RefAttributes<any>>;
10
10
  export default _default;
@@ -9,7 +9,7 @@ declare const _default: React.ForwardRefExoticComponent<import("src/provider").B
9
9
  request?: import("src/utils/typing").ProFieldRequestData | undefined;
10
10
  params?: any;
11
11
  fieldProps?: any;
12
- variant?: "outlined" | "borderless" | "filled" | undefined;
12
+ variant?: "filled" | "outlined" | "borderless" | undefined;
13
13
  id?: string | undefined;
14
14
  children?: React.ReactNode;
15
15
  defaultKeyWords?: string | undefined;
@@ -30,6 +30,6 @@ declare const _default: React.ForwardRefExoticComponent<SelectProps<any, import(
30
30
  */
31
31
  fetchDataOnSearch?: boolean | undefined;
32
32
  /** 变体类型 */
33
- variant?: "outlined" | "borderless" | "filled" | "underlined" | undefined;
33
+ variant?: "filled" | "outlined" | "borderless" | "underlined" | undefined;
34
34
  } & ProFieldLightProps & SelectProps<any, import("antd/es/select").DefaultOptionType> & React.RefAttributes<any>>;
35
35
  export default _default;
@@ -45,7 +45,7 @@ declare const _default: React.ForwardRefExoticComponent<import("../../../provide
45
45
  params?: any;
46
46
  /** 组件的全局设置 */
47
47
  fieldProps?: any;
48
- variant?: "outlined" | "borderless" | "filled" | undefined;
48
+ variant?: "filled" | "outlined" | "borderless" | undefined;
49
49
  id?: string | undefined;
50
50
  children?: ReactNode;
51
51
  /** 默认搜素条件 */
@@ -3,6 +3,6 @@ import React from 'react';
3
3
  declare const _default: React.ForwardRefExoticComponent<import("../../../provider").BaseProFieldFC & import("../../../provider").ProRenderFieldPropsType & {
4
4
  text: boolean;
5
5
  fieldProps?: SwitchProps | undefined;
6
- variant?: "outlined" | "borderless" | "filled" | undefined;
6
+ variant?: "filled" | "outlined" | "borderless" | undefined;
7
7
  } & React.RefAttributes<any>>;
8
8
  export default _default;
@@ -17,7 +17,7 @@ export type TreeSelectFieldProps = TreeSelectProps<any> & {
17
17
  declare const _default: React.ForwardRefExoticComponent<import("../../../provider").BaseProFieldFC & import("../../../provider").ProRenderFieldPropsType & {
18
18
  options?: (string | number | import("antd").CheckboxOptionType<any>)[] | undefined;
19
19
  radioType?: "button" | "radio" | undefined;
20
- variant?: "outlined" | "borderless" | "filled" | undefined;
20
+ variant?: "filled" | "outlined" | "borderless" | undefined;
21
21
  } & {
22
22
  text: string;
23
23
  valueEnum?: import("src/utils/typing").ProFieldValueEnumType | undefined;
@@ -25,7 +25,7 @@ declare const _default: React.ForwardRefExoticComponent<import("../../../provide
25
25
  request?: import("src/utils/typing").ProFieldRequestData | undefined;
26
26
  params?: any;
27
27
  fieldProps?: any;
28
- variant?: "outlined" | "borderless" | "filled" | undefined;
28
+ variant?: "filled" | "outlined" | "borderless" | undefined;
29
29
  id?: string | undefined;
30
30
  children?: React.ReactNode;
31
31
  defaultKeyWords?: string | undefined;
@@ -46,6 +46,7 @@ var covertFormName = function covertFormName(name) {
46
46
  if (Array.isArray(name)) return name;
47
47
  return [name];
48
48
  };
49
+ var defaultExtraUrlParams = {};
49
50
  function BaseFormComponents(props) {
50
51
  var _ConfigProvider$useCo;
51
52
  var children = props.children,
@@ -61,7 +62,7 @@ function BaseFormComponents(props) {
61
62
  loading = props.loading,
62
63
  formComponentType = props.formComponentType,
63
64
  _props$extraUrlParams = props.extraUrlParams,
64
- extraUrlParams = _props$extraUrlParams === void 0 ? {} : _props$extraUrlParams,
65
+ extraUrlParams = _props$extraUrlParams === void 0 ? defaultExtraUrlParams : _props$extraUrlParams,
65
66
  syncToUrl = props.syncToUrl,
66
67
  onUrlSearchChange = props.onUrlSearchChange,
67
68
  _onReset = props.onReset,
@@ -397,7 +398,7 @@ function BaseFormComponents(props) {
397
398
  var requestFormCacheId = 0;
398
399
  export function BaseForm(props) {
399
400
  var _props$extraUrlParams2 = props.extraUrlParams,
400
- extraUrlParams = _props$extraUrlParams2 === void 0 ? {} : _props$extraUrlParams2,
401
+ extraUrlParams = _props$extraUrlParams2 === void 0 ? defaultExtraUrlParams : _props$extraUrlParams2,
401
402
  syncToUrl = props.syncToUrl,
402
403
  isKeyPressSubmit = props.isKeyPressSubmit,
403
404
  _props$syncToUrlAsImp = props.syncToUrlAsImportant,
@@ -44,7 +44,7 @@ var ProFormCascader = function ProFormCascader(_ref, ref) {
44
44
  ref: ref,
45
45
  request: request,
46
46
  params: params,
47
- filedConfig: {
47
+ fieldConfig: {
48
48
  customLightMode: true
49
49
  },
50
50
  proFieldProps: proFieldProps
@@ -45,7 +45,7 @@ var CheckboxGroup = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
45
45
  valueType: "checkbox",
46
46
  mode: "read",
47
47
  valueEnum: runFunction(valueEnum, undefined),
48
- filedConfig: {
48
+ fieldConfig: {
49
49
  customLightMode: true
50
50
  },
51
51
  fieldProps: _objectSpread({
@@ -40,7 +40,7 @@ var ProFormColorPicker = function ProFormColorPicker(_ref, ref) {
40
40
  }, fieldProps),
41
41
  ref: ref,
42
42
  proFieldProps: proFieldProps,
43
- filedConfig: {
43
+ fieldConfig: {
44
44
  defaultProps: {
45
45
  width: '100%'
46
46
  }
@@ -2,7 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
2
2
  import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
3
3
  import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
4
4
  var _excluded = ["proFieldProps", "fieldProps", "valueType"];
5
- import React, { useContext } from 'react';
5
+ import React, { useCallback, useMemo, useContext } from 'react';
6
6
  import { FieldDatePicker } from "../../../field";
7
7
  import { ProConfigProvider } from "../../../provider";
8
8
  import FieldContext from "../../FieldContext";
@@ -20,26 +20,34 @@ export var BaseDatePicker = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
20
20
  valueType = _ref.valueType,
21
21
  rest = _objectWithoutProperties(_ref, _excluded);
22
22
  var context = useContext(FieldContext);
23
+ var mergedFieldProps = useMemo(function () {
24
+ var nextFieldProps = fieldProps ? _objectSpread({}, fieldProps) : {};
25
+ if (valueType === 'dateTime' && nextFieldProps.showTime === undefined) {
26
+ nextFieldProps.showTime = true;
27
+ }
28
+ return nextFieldProps;
29
+ }, [fieldProps, valueType]);
30
+ var renderFieldDatePicker = useCallback(function (text, props) {
31
+ var _ref2, _fieldPropsFromContex;
32
+ var fieldPropsFromContext = (_ref2 = props.fieldProps) !== null && _ref2 !== void 0 ? _ref2 : mergedFieldProps;
33
+ var format = valueType === 'dateTime' ? (_fieldPropsFromContex = fieldPropsFromContext === null || fieldPropsFromContext === void 0 ? void 0 : fieldPropsFromContext.format) !== null && _fieldPropsFromContex !== void 0 ? _fieldPropsFromContex : 'YYYY-MM-DD HH:mm:ss' : fieldPropsFromContext === null || fieldPropsFromContext === void 0 ? void 0 : fieldPropsFromContext.format;
34
+ return /*#__PURE__*/_jsx(FieldDatePicker, _objectSpread(_objectSpread({}, props), {}, {
35
+ format: format,
36
+ text: text
37
+ }));
38
+ }, [mergedFieldProps, valueType]);
23
39
  return /*#__PURE__*/_jsx(ProConfigProvider, {
24
40
  valueTypeMap: _defineProperty({}, valueType, {
25
- render: function render(text, props) {
26
- return /*#__PURE__*/_jsx(FieldDatePicker, _objectSpread(_objectSpread({}, props), {}, {
27
- text: text
28
- }));
29
- },
30
- formItemRender: function formItemRender(text, props) {
31
- return /*#__PURE__*/_jsx(FieldDatePicker, _objectSpread(_objectSpread({}, props), {}, {
32
- text: text
33
- }));
34
- }
41
+ render: renderFieldDatePicker,
42
+ formItemRender: renderFieldDatePicker
35
43
  }),
36
44
  children: /*#__PURE__*/_jsx(ProFormField, _objectSpread(_objectSpread({
37
45
  valueType: valueType,
38
46
  fieldProps: _objectSpread({
39
47
  getPopupContainer: context.getPopupContainer
40
- }, fieldProps),
48
+ }, mergedFieldProps),
41
49
  proFieldProps: proFieldProps,
42
- filedConfig: {
50
+ fieldConfig: {
43
51
  valueType: valueType,
44
52
  customLightMode: true
45
53
  }
@@ -19,7 +19,7 @@ var ProFormDatePicker = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
19
19
  ref: ref,
20
20
  fieldProps: _objectSpread({}, fieldProps),
21
21
  proFieldProps: proFieldProps,
22
- filedConfig: {
22
+ fieldConfig: {
23
23
  valueType: valueType,
24
24
  customLightMode: true
25
25
  }
@@ -19,7 +19,7 @@ var ProFormDateTimePicker = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
19
19
  ref: ref,
20
20
  valueType: valueType,
21
21
  proFieldProps: proFieldProps,
22
- filedConfig: {
22
+ fieldConfig: {
23
23
  valueType: valueType,
24
24
  customLightMode: true
25
25
  }
@@ -19,7 +19,7 @@ var ProFormDatePicker = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
19
19
  ref: ref,
20
20
  fieldProps: _objectSpread({}, fieldProps),
21
21
  proFieldProps: proFieldProps,
22
- filedConfig: {
22
+ fieldConfig: {
23
23
  valueType: valueType,
24
24
  customLightMode: true
25
25
  }
@@ -19,7 +19,7 @@ var ProFormDatePickerQuarter = /*#__PURE__*/React.forwardRef(function (_ref, ref
19
19
  ref: ref,
20
20
  fieldProps: _objectSpread({}, fieldProps),
21
21
  proFieldProps: proFieldProps,
22
- filedConfig: {
22
+ fieldConfig: {
23
23
  valueType: valueType,
24
24
  customLightMode: true
25
25
  }
@@ -40,7 +40,7 @@ var ProFormTimePicker = function ProFormTimePicker(_ref) {
40
40
  }, fieldProps),
41
41
  valueType: valueType,
42
42
  proFieldProps: proFieldProps,
43
- filedConfig: {
43
+ fieldConfig: {
44
44
  customLightMode: true,
45
45
  valueType: valueType
46
46
  }
@@ -19,7 +19,7 @@ var ProFormDatePickerWeek = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
19
19
  ref: ref,
20
20
  fieldProps: _objectSpread({}, fieldProps),
21
21
  proFieldProps: proFieldProps,
22
- filedConfig: {
22
+ fieldConfig: {
23
23
  valueType: valueType,
24
24
  customLightMode: true
25
25
  }
@@ -19,7 +19,7 @@ var ProFormDatePickerYear = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
19
19
  ref: ref,
20
20
  fieldProps: _objectSpread({}, fieldProps),
21
21
  proFieldProps: proFieldProps,
22
- filedConfig: {
22
+ fieldConfig: {
23
23
  valueType: valueType,
24
24
  customLightMode: true
25
25
  }
@@ -2,7 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
2
2
  import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
3
3
  import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
4
4
  var _excluded = ["fieldProps", "proFieldProps", "valueType"];
5
- import React, { useContext } from 'react';
5
+ import React, { useCallback, useMemo, useContext } from 'react';
6
6
  import { FieldRangePicker } from "../../../field";
7
7
  import { ProConfigProvider } from "../../../provider";
8
8
  import { dateArrayFormatter } from "../../../utils";
@@ -15,30 +15,55 @@ export var BaseDateRanger = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
15
15
  valueType = _ref.valueType,
16
16
  rest = _objectWithoutProperties(_ref, _excluded);
17
17
  var context = useContext(FieldContext);
18
+ var mergedFieldProps = useMemo(function () {
19
+ var nextFieldProps = fieldProps ? _objectSpread({}, fieldProps) : {};
20
+ if (valueType === 'dateTimeRange' && nextFieldProps.showTime === undefined) {
21
+ nextFieldProps.showTime = true;
22
+ }
23
+ return nextFieldProps;
24
+ }, [fieldProps, valueType]);
25
+ var lightFilterFormat = useMemo(function () {
26
+ if (mergedFieldProps.format) return mergedFieldProps.format;
27
+ switch (valueType) {
28
+ case 'dateTimeRange':
29
+ return 'YYYY-MM-DD HH:mm:ss';
30
+ case 'dateWeekRange':
31
+ return 'YYYY-wo';
32
+ case 'dateMonthRange':
33
+ return 'YYYY-MM';
34
+ case 'dateQuarterRange':
35
+ return 'YYYY-[Q]Q';
36
+ case 'dateYearRange':
37
+ return 'YYYY';
38
+ default:
39
+ return 'YYYY-MM-DD';
40
+ }
41
+ }, [mergedFieldProps.format, valueType]);
42
+ var renderFieldRangePicker = useCallback(function (text, props) {
43
+ var _ref2, _fieldPropsFromContex;
44
+ var fieldPropsFromContext = (_ref2 = props.fieldProps) !== null && _ref2 !== void 0 ? _ref2 : mergedFieldProps;
45
+ var format = valueType === 'dateTimeRange' ? (_fieldPropsFromContex = fieldPropsFromContext === null || fieldPropsFromContext === void 0 ? void 0 : fieldPropsFromContext.format) !== null && _fieldPropsFromContex !== void 0 ? _fieldPropsFromContex : 'YYYY-MM-DD HH:mm:ss' : fieldPropsFromContext === null || fieldPropsFromContext === void 0 ? void 0 : fieldPropsFromContext.format;
46
+ return /*#__PURE__*/_jsx(FieldRangePicker, _objectSpread(_objectSpread({}, props), {}, {
47
+ format: format,
48
+ text: text
49
+ }));
50
+ }, [mergedFieldProps, valueType]);
18
51
  return /*#__PURE__*/_jsx(ProConfigProvider, {
19
52
  valueTypeMap: _defineProperty({}, valueType, {
20
- render: function render(text, props) {
21
- return /*#__PURE__*/_jsx(FieldRangePicker, _objectSpread(_objectSpread({}, props), {}, {
22
- text: text
23
- }));
24
- },
25
- formItemRender: function formItemRender(text, props) {
26
- return /*#__PURE__*/_jsx(FieldRangePicker, _objectSpread(_objectSpread({}, props), {}, {
27
- text: text
28
- }));
29
- }
53
+ render: renderFieldRangePicker,
54
+ formItemRender: renderFieldRangePicker
30
55
  }),
31
56
  children: /*#__PURE__*/_jsx(ProField, _objectSpread(_objectSpread({
32
57
  fieldProps: _objectSpread({
33
58
  getPopupContainer: context.getPopupContainer
34
- }, fieldProps),
59
+ }, mergedFieldProps),
35
60
  valueType: valueType,
36
61
  proFieldProps: proFieldProps,
37
- filedConfig: {
62
+ fieldConfig: {
38
63
  valueType: valueType,
39
64
  customLightMode: true,
40
65
  lightFilterLabelFormatter: function lightFilterLabelFormatter(value) {
41
- return dateArrayFormatter(value, (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.format) || 'YYYY-MM');
66
+ return dateArrayFormatter(value, lightFilterFormat);
42
67
  }
43
68
  }
44
69
  }, rest), {}, {
@@ -21,7 +21,7 @@ export var ProFormDateMonthRangePicker = /*#__PURE__*/React.forwardRef(function
21
21
  fieldProps: _objectSpread({}, fieldProps),
22
22
  valueType: valueType,
23
23
  proFieldProps: proFieldProps,
24
- filedConfig: {
24
+ fieldConfig: {
25
25
  valueType: valueType,
26
26
  customLightMode: true,
27
27
  lightFilterLabelFormatter: function lightFilterLabelFormatter(value) {
@@ -21,7 +21,7 @@ export var ProFormDateQuarterRangePicker = /*#__PURE__*/React.forwardRef(functio
21
21
  fieldProps: _objectSpread({}, fieldProps),
22
22
  valueType: valueType,
23
23
  proFieldProps: proFieldProps,
24
- filedConfig: {
24
+ fieldConfig: {
25
25
  valueType: valueType,
26
26
  customLightMode: true,
27
27
  lightFilterLabelFormatter: function lightFilterLabelFormatter(value) {
@@ -21,7 +21,7 @@ export var ProFormDateTimeRangePicker = /*#__PURE__*/React.forwardRef(function (
21
21
  fieldProps: _objectSpread({}, fieldProps),
22
22
  valueType: valueType,
23
23
  proFieldProps: proFieldProps,
24
- filedConfig: {
24
+ fieldConfig: {
25
25
  valueType: valueType,
26
26
  customLightMode: true,
27
27
  lightFilterLabelFormatter: function lightFilterLabelFormatter(value) {
@@ -21,7 +21,7 @@ export var ProFormDateWeekRangePicker = /*#__PURE__*/React.forwardRef(function (
21
21
  fieldProps: _objectSpread({}, fieldProps),
22
22
  valueType: valueType,
23
23
  proFieldProps: proFieldProps,
24
- filedConfig: {
24
+ fieldConfig: {
25
25
  valueType: valueType,
26
26
  customLightMode: true,
27
27
  lightFilterLabelFormatter: function lightFilterLabelFormatter(value) {
@@ -21,7 +21,7 @@ export var ProFormDateYearRangePicker = /*#__PURE__*/React.forwardRef(function (
21
21
  fieldProps: _objectSpread({}, fieldProps),
22
22
  valueType: valueType,
23
23
  proFieldProps: proFieldProps,
24
- filedConfig: {
24
+ fieldConfig: {
25
25
  valueType: valueType,
26
26
  customLightMode: true,
27
27
  lightFilterLabelFormatter: function lightFilterLabelFormatter(value) {
@@ -37,7 +37,7 @@ export var ProFormTimeRangePicker = /*#__PURE__*/React.forwardRef(function (_ref
37
37
  }, fieldProps),
38
38
  valueType: valueType,
39
39
  proFieldProps: proFieldProps,
40
- filedConfig: {
40
+ fieldConfig: {
41
41
  valueType: valueType,
42
42
  customLightMode: true,
43
43
  lightFilterLabelFormatter: function lightFilterLabelFormatter(value) {
@@ -21,7 +21,7 @@ var ProFormDateRangePicker = /*#__PURE__*/React.forwardRef(function (_ref, ref)
21
21
  fieldProps: _objectSpread({}, fieldProps),
22
22
  valueType: valueType,
23
23
  proFieldProps: proFieldProps,
24
- filedConfig: {
24
+ fieldConfig: {
25
25
  valueType: valueType,
26
26
  customLightMode: true,
27
27
  lightFilterLabelFormatter: function lightFilterLabelFormatter(value) {
@@ -13,7 +13,7 @@ export type ProFormDigitRangeProps = ProFormFieldItemProps<RangeInputNumberProps
13
13
  separatorWidth?: number;
14
14
  };
15
15
  declare const ForwardRefProFormDigit: React.ForwardRefExoticComponent<{
16
- fieldProps?: Partial<import("../../typing").FieldProps<any> & Omit<InputNumberProps<number>, "value" | "onChange" | "placeholder" | "defaultValue"> & {
16
+ fieldProps?: Partial<import("../../typing").FieldProps<any> & Omit<InputNumberProps<number>, "value" | "defaultValue" | "onChange" | "placeholder"> & {
17
17
  value?: ValuePair | undefined;
18
18
  defaultValue?: ValuePair | undefined;
19
19
  onChange?: ((value?: ValuePair) => void) | undefined;
@@ -36,7 +36,7 @@ var ProFormDigit = function ProFormDigit(_ref, ref) {
36
36
  valueType: "digitRange",
37
37
  fieldProps: _objectSpread({}, fieldProps),
38
38
  ref: ref,
39
- filedConfig: {
39
+ fieldConfig: {
40
40
  defaultProps: {
41
41
  width: '100%'
42
42
  }
@@ -41,7 +41,7 @@ var ProFormDigit = function ProFormDigit(_ref, ref) {
41
41
  max: max
42
42
  }, fieldProps),
43
43
  ref: ref,
44
- filedConfig: {
44
+ fieldConfig: {
45
45
  defaultProps: {
46
46
  width: '100%'
47
47
  }
@@ -3,7 +3,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
3
3
  import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
4
4
  import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
5
5
  var _excluded = ["valueType", "customLightMode", "lightFilterLabelFormatter", "valuePropName", "ignoreWidth", "defaultProps"],
6
- _excluded2 = ["label", "tooltip", "placeholder", "width", "bordered", "messageVariables", "ignoreFormItem", "transform", "convertValue", "readonly", "allowClear", "colSize", "getFormItemProps", "getFieldProps", "filedConfig", "cacheForSwr", "proFieldProps"];
6
+ _excluded2 = ["label", "tooltip", "placeholder", "width", "bordered", "messageVariables", "ignoreFormItem", "transform", "convertValue", "readonly", "allowClear", "colSize", "getFormItemProps", "getFieldProps", "fieldConfig", "cacheForSwr", "proFieldProps"];
7
7
  import classnames from 'classnames';
8
8
  import { FieldContext as RcFieldContext } from 'rc-field-form';
9
9
  import React, { useContext, useMemo, useState } from 'react';
@@ -48,15 +48,15 @@ export function warpField(Field, config) {
48
48
  // eslint-disable-next-line no-param-reassign
49
49
  Field.displayName = 'ProFormComponent';
50
50
  var FieldWithContext = function FieldWithContext(props) {
51
- var _props$filedConfig$co = _objectSpread(_objectSpread({}, props === null || props === void 0 ? void 0 : props.filedConfig), config),
52
- tmpValueType = _props$filedConfig$co.valueType,
53
- customLightMode = _props$filedConfig$co.customLightMode,
54
- lightFilterLabelFormatter = _props$filedConfig$co.lightFilterLabelFormatter,
55
- _props$filedConfig$co2 = _props$filedConfig$co.valuePropName,
56
- valuePropName = _props$filedConfig$co2 === void 0 ? 'value' : _props$filedConfig$co2,
57
- ignoreWidth = _props$filedConfig$co.ignoreWidth,
58
- defaultProps = _props$filedConfig$co.defaultProps,
59
- defaultFormItemProps = _objectWithoutProperties(_props$filedConfig$co, _excluded);
51
+ var _props$fieldConfig$co = _objectSpread(_objectSpread({}, props === null || props === void 0 ? void 0 : props.fieldConfig), config),
52
+ tmpValueType = _props$fieldConfig$co.valueType,
53
+ customLightMode = _props$fieldConfig$co.customLightMode,
54
+ lightFilterLabelFormatter = _props$fieldConfig$co.lightFilterLabelFormatter,
55
+ _props$fieldConfig$co2 = _props$fieldConfig$co.valuePropName,
56
+ valuePropName = _props$fieldConfig$co2 === void 0 ? 'value' : _props$fieldConfig$co2,
57
+ ignoreWidth = _props$fieldConfig$co.ignoreWidth,
58
+ defaultProps = _props$fieldConfig$co.defaultProps,
59
+ defaultFormItemProps = _objectWithoutProperties(_props$fieldConfig$co, _excluded);
60
60
  var _defaultProps$props = _objectSpread(_objectSpread({}, defaultProps), props),
61
61
  label = _defaultProps$props.label,
62
62
  tooltip = _defaultProps$props.tooltip,
@@ -72,7 +72,7 @@ export function warpField(Field, config) {
72
72
  colSize = _defaultProps$props.colSize,
73
73
  getFormItemProps = _defaultProps$props.getFormItemProps,
74
74
  getFieldProps = _defaultProps$props.getFieldProps,
75
- filedConfig = _defaultProps$props.filedConfig,
75
+ fieldConfig = _defaultProps$props.fieldConfig,
76
76
  cacheForSwr = _defaultProps$props.cacheForSwr,
77
77
  proFieldProps = _defaultProps$props.proFieldProps,
78
78
  rest = _objectWithoutProperties(_defaultProps$props, _excluded2);
@@ -45,7 +45,7 @@ var ProFormMoney = function ProFormMoney(_ref, ref) {
45
45
  max: max
46
46
  }, fieldProps),
47
47
  ref: ref,
48
- filedConfig: {
48
+ fieldConfig: {
49
49
  defaultProps: {
50
50
  width: '100%'
51
51
  }