@zat-design/sisyphus-react 3.4.11-beta.8 → 3.4.12

package/dist/index.esm.css

@@ -1752,6 +1752,34 @@
   display: -ms-flexbox;
   display: flex;
 }
+.ant-tabs-dropdown-menu .pro-tabs-card {
+  width: 200px;
+  padding: calc(9px * var(--zaui-size, 1)) 16px calc(9px * var(--zaui-size, 1)) 24px;
+  border: 1px solid var(--zaui-line, #dddddd);
+}
+.ant-tabs-dropdown-menu .pro-tabs-card .pro-tabs-card-left {
+  width: 104px;
+  text-shadow: none;
+}
+.ant-tabs-dropdown-menu .pro-tabs-card .pro-tabs-card-left .pro-tabs-card-left-total {
+  color: var(--zaui-text, #343434);
+  font-weight: 600;
+  font-size: var(--zaui-font-size-lg-title, 24px);
+}
+.ant-tabs-dropdown-menu .pro-tabs-card .pro-tabs-card-left .pro-tabs-card-left-label {
+  color: var(--aui-text, #343434);
+  font-weight: 400;
+  font-size: var(--zaui-font-size, 14px);
+}
+.ant-tabs-dropdown-menu .pro-tabs-card .pro-tabs-card-right {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+}
+.ant-tabs-dropdown-menu .pro-tabs-card .pro-tabs-card-right img {
+  width: 48px;
+}
 .pro-table.pro-table-bordered .ant-table .ant-table-thead > tr > th {
   border-bottom: 1px solid #f0f0f0;
 }

package/dist/less.esm.css

@@ -1752,6 +1752,34 @@
   display: -ms-flexbox;
   display: flex;
 }
+.ant-tabs-dropdown-menu .pro-tabs-card {
+  width: 200px;
+  padding: calc(9px * var(--zaui-size, 1)) 16px calc(9px * var(--zaui-size, 1)) 24px;
+  border: 1px solid var(--zaui-line, #dddddd);
+}
+.ant-tabs-dropdown-menu .pro-tabs-card .pro-tabs-card-left {
+  width: 104px;
+  text-shadow: none;
+}
+.ant-tabs-dropdown-menu .pro-tabs-card .pro-tabs-card-left .pro-tabs-card-left-total {
+  color: var(--zaui-text, #343434);
+  font-weight: 600;
+  font-size: var(--zaui-font-size-lg-title, 24px);
+}
+.ant-tabs-dropdown-menu .pro-tabs-card .pro-tabs-card-left .pro-tabs-card-left-label {
+  color: var(--aui-text, #343434);
+  font-weight: 400;
+  font-size: var(--zaui-font-size, 14px);
+}
+.ant-tabs-dropdown-menu .pro-tabs-card .pro-tabs-card-right {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+}
+.ant-tabs-dropdown-menu .pro-tabs-card .pro-tabs-card-right img {
+  width: 48px;
+}
 .pro-table.pro-table-bordered .ant-table .ant-table-thead > tr > th {
   border-bottom: 1px solid #f0f0f0;
 }

package/es/ProEditTable/components/DndWrapper/index.d.ts

@@ -1,7 +1,7 @@
 import React, { FC } from 'react';
 interface RowProps extends React.HTMLAttributes<HTMLTableRowElement> {
     'data-row-key': string;
-    hide?: boolean;
+    'data-hide'?: boolean;
     disabled?: boolean;
 }
 export declare const Row: FC<RowProps>;

package/es/ProEditTable/components/DndWrapper/index.js

@@ -1,6 +1,6 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["disabled", "hide", "children"];
+var _excluded = ["disabled", "children"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React from 'react';
 import { DndContext } from '@dnd-kit/core';
@@ -9,7 +9,6 @@ import { CSS } from '@dnd-kit/utilities';
 import ProIcon from '../../../ProIcon';
 export var Row = function Row(props) {
   var disabled = props.disabled,
-    hide = props.hide,
     children = props.children,
     restProps = _objectWithoutProperties(props, _excluded);
   var data = useSortable({
@@ -43,7 +42,7 @@ export var Row = function Row(props) {
           renderIndex = _ref.renderIndex;
         return /*#__PURE__*/React.cloneElement(child, {
           children: _jsxs("span", {
-            className: "drag-wrapper".concat(hide ? ' no-check' : ''),
+            className: "drag-wrapper".concat(props['data-hide'] ? ' no-check' : ''),
             children: [_jsx(ProIcon, _objectSpread({
               className: "drag-icon",
               style: {
@@ -52,7 +51,7 @@ export var Row = function Row(props) {
               },
               type: "drag",
               size: 20
-            }, listeners)), hide ? null : render === null || render === void 0 ? void 0 : render(null, record, renderIndex)]
+            }, listeners)), props['data-hide'] ? null : render === null || render === void 0 ? void 0 : render(null, record, renderIndex)]
           })
         });
       }

package/es/ProEditTable/components/RenderField/index.js

@@ -107,7 +107,9 @@ var RenderField = function RenderField(_ref) {
   var rowParams = [currentValue, rowData, options];
   if (typeof isEditable === 'function') {
     isEditable = isEditable.apply(void 0, rowParams);
-    !isEditable && form.validateFields([cellName]);
+    setTimeout(function () {
+      !isEditable && form.validateFields([cellName]);
+    }, 100);
   }
   // 获取最终的disabled
   _disabled = getDisabled({
@@ -373,10 +375,10 @@ var RenderField = function RenderField(_ref) {
               return [].concat(_toConsumableArray(rowPath), [key]);
             });
             if (validateFieldKeys === null || validateFieldKeys === void 0 ? void 0 : validateFieldKeys.length) {
-              debounceValidate(validateFieldKeys);
+              setTimeout(function () {
+                form.validateFields(validateFieldKeys);
+              }, 100);
             }
-          } else {
-            debounceValidate();
           }
           setState({
             forceUpdate: {

package/es/ProEditTable/index.js

@@ -336,7 +336,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
           onRow: function onRow() {
             return {
               disabled: disabled || virtualKey && !!editingKeys.length,
-              hide: isHideCheckBox,
+              'data-hide': isHideCheckBox,
               onClick: function onClick() {}
             };
           }

package/es/ProEnum/hooks/useEnum.js

@@ -1,6 +1,8 @@
+var _ref;
 /* eslint-disable no-redeclare */
 import { useProConfig } from '../../ProConfigProvider';
 import { getEnumData } from '../utils';
+var baseEnumStorage = (_ref = window.localStorage.getItem('zat-design-pro-component-cacheKey') && JSON.parse(window.localStorage.getItem('zat-design-pro-component-cacheKey'))) !== null && _ref !== void 0 ? _ref : null;
 /**
  * 根据 code 从枚举缓存取出对应的 options 、以及回显
  * @param codes
@@ -9,17 +11,17 @@ import { getEnumData } from '../utils';
  * @returns
  */
 function useEnum(codes, value, compose) {
-  var _ref = useProConfig('globalConfig') || {},
-    _ref$storage = _ref.storage,
-    storage = _ref$storage === void 0 ? 'localStorage' : _ref$storage;
-  var _ref2 = useProConfig('ProEnum') || {},
-    _ref2$cacheKey = _ref2.cacheKey,
-    cacheKey = _ref2$cacheKey === void 0 ? 'zat-design-pro-component-cacheKey' : _ref2$cacheKey,
-    _ref2$fieldNames = _ref2.fieldNames,
-    fieldNames = _ref2$fieldNames === void 0 ? {} : _ref2$fieldNames,
-    _ref2$clear = _ref2.clear,
-    clear = _ref2$clear === void 0 ? true : _ref2$clear;
-  var catchData = getEnumData(storage, cacheKey);
+  var _ref2 = useProConfig('globalConfig') || {},
+    _ref2$storage = _ref2.storage,
+    storage = _ref2$storage === void 0 ? 'localStorage' : _ref2$storage;
+  var _ref3 = useProConfig('ProEnum') || {},
+    _ref3$cacheKey = _ref3.cacheKey,
+    cacheKey = _ref3$cacheKey === void 0 ? 'zat-design-pro-component-cacheKey' : _ref3$cacheKey,
+    _ref3$fieldNames = _ref3.fieldNames,
+    fieldNames = _ref3$fieldNames === void 0 ? {} : _ref3$fieldNames,
+    _ref3$clear = _ref3.clear,
+    clear = _ref3$clear === void 0 ? true : _ref3$clear;
+  var catchData = getEnumData(storage, cacheKey, baseEnumStorage);
   if (!codes) {
     return catchData;
   }

package/es/ProEnum/hooks/useEnumRequest.js

@@ -3,37 +3,39 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _typeof from "@babel/runtime/helpers/esm/typeof";
+var _ref;
 import { useEffect } from 'react';
 import { useDeepCompareEffect, useRequest as useRequestFunc } from 'ahooks';
 import { diffCode, getEnumData, setEnumData, cacheFieldNames } from '../utils';
 import locale from '../../locale';
 import '../utils/eventCenter';
+var baseEnumStorage = (_ref = window.localStorage.getItem('zat-design-pro-component-cacheKey') && JSON.parse(window.localStorage.getItem('zat-design-pro-component-cacheKey'))) !== null && _ref !== void 0 ? _ref : null;
 var useEnumRequest = function useEnumRequest(props, dispatch) {
-  var _ref = props || {},
-    _ref$main = _ref.main,
-    main = _ref$main === void 0 ? false : _ref$main,
-    _ref$share = _ref.share,
-    share = _ref$share === void 0 ? false : _ref$share,
-    _ref$clear = _ref.clear,
-    clear = _ref$clear === void 0 ? true : _ref$clear,
-    _ref$fieldNames = _ref.fieldNames,
-    fieldNames = _ref$fieldNames === void 0 ? {
+  var _ref2 = props || {},
+    _ref2$main = _ref2.main,
+    main = _ref2$main === void 0 ? false : _ref2$main,
+    _ref2$share = _ref2.share,
+    share = _ref2$share === void 0 ? false : _ref2$share,
+    _ref2$clear = _ref2.clear,
+    clear = _ref2$clear === void 0 ? true : _ref2$clear,
+    _ref2$fieldNames = _ref2.fieldNames,
+    fieldNames = _ref2$fieldNames === void 0 ? {
       label: 'label',
       value: 'value',
       children: 'children'
-    } : _ref$fieldNames,
-    _ref$cacheKey = _ref.cacheKey,
-    cacheKey = _ref$cacheKey === void 0 ? 'zat-design-pro-component-cacheKey' : _ref$cacheKey,
-    _ref$requestRefresh = _ref.requestRefresh,
-    requestRefresh = _ref$requestRefresh === void 0 ? false : _ref$requestRefresh,
-    _ref$storage = _ref.storage,
-    storage = _ref$storage === void 0 ? 'localStorage' : _ref$storage,
-    _ref$dataSource = _ref.dataSource,
-    dataSource = _ref$dataSource === void 0 ? {} : _ref$dataSource,
-    useRequest = _ref.useRequest,
-    transformResponse = _ref.transformResponse,
-    _ref$dics = _ref.dics,
-    dics = _ref$dics === void 0 ? {} : _ref$dics;
+    } : _ref2$fieldNames,
+    _ref2$cacheKey = _ref2.cacheKey,
+    cacheKey = _ref2$cacheKey === void 0 ? 'zat-design-pro-component-cacheKey' : _ref2$cacheKey,
+    _ref2$requestRefresh = _ref2.requestRefresh,
+    requestRefresh = _ref2$requestRefresh === void 0 ? false : _ref2$requestRefresh,
+    _ref2$storage = _ref2.storage,
+    storage = _ref2$storage === void 0 ? 'localStorage' : _ref2$storage,
+    _ref2$dataSource = _ref2.dataSource,
+    dataSource = _ref2$dataSource === void 0 ? {} : _ref2$dataSource,
+    useRequest = _ref2.useRequest,
+    transformResponse = _ref2.transformResponse,
+    _ref2$dics = _ref2.dics,
+    dics = _ref2$dics === void 0 ? {} : _ref2$dics;
   if (_typeof(dataSource) === 'object' && dataSource === null) {
     var _locale$ProEnum;
     throw new Error(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum = locale.ProEnum) === null || _locale$ProEnum === void 0 ? void 0 : _locale$ProEnum.errorDataSource);
@@ -100,7 +102,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
                   });
                   res.data = response;
                 }
-                cacheData = getEnumData(storage, cacheKey) || {
+                cacheData = getEnumData(storage, cacheKey, baseEnumStorage) || {
                   data: {}
                 }; // 合并缓存数据
                 res.data = _objectSpread(_objectSpread({}, cacheData === null || cacheData === void 0 ? void 0 : cacheData.data), res.data);
@@ -130,7 +132,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
         return setCache;
       }(),
       getCache: function getCache() {
-        var res = getEnumData(storage, cacheKey) || {
+        var res = getEnumData(storage, cacheKey, baseEnumStorage) || {
           data: {}
         };
         dispatch({
@@ -158,12 +160,12 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
     })),
     run = _useRequestFunc.run;
   var mergeData = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
       var cacheData, _useRequest$options2, _useRequest$options3, enumData, cacheCodes, codes, ignoreCodes, diff, response, res, _locale$ProEnum6;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            cacheData = getEnumData(storage, cacheKey) || {
+            cacheData = getEnumData(storage, cacheKey, baseEnumStorage) || {
               data: {}
             };
             if (!(_typeof(cacheData) === 'object')) {
@@ -245,13 +247,13 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
       }, _callee2);
     }));
     return function mergeData() {
-      return _ref2.apply(this, arguments);
+      return _ref3.apply(this, arguments);
     };
   }();
   useDeepCompareEffect(function () {
     if (useRequest && (useRequest === null || useRequest === void 0 ? void 0 : useRequest.service)) {
-      var _ref3 = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
-        defaultParams = _ref3.defaultParams;
+      var _ref4 = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
+        defaultParams = _ref4.defaultParams;
       if (requestRefresh) {
         window.localStorage.removeItem(cacheKey);
         window.sessionStorage.removeItem(cacheKey);
@@ -260,7 +262,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
       // TODO 这段代码目前看起来是没啥用的、没起到作用
       mergeData();
     } else if (Object.keys(dataSource)) {
-      var res = getEnumData(storage, cacheKey) || {
+      var res = getEnumData(storage, cacheKey, baseEnumStorage) || {
         data: {}
       };
       dispatch({
@@ -268,7 +270,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
         payload: _objectSpread(_objectSpread({}, dataSource), res === null || res === void 0 ? void 0 : res.data)
       });
     } else {
-      var _res = getEnumData(storage, cacheKey) || {
+      var _res = getEnumData(storage, cacheKey, baseEnumStorage) || {
         data: {}
       };
       dispatch({
@@ -279,7 +281,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
   }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.options]);
   var shareProEnumDic = function shareProEnumDic(cacheData) {
     logDebug(cacheData);
-    var storageData = getEnumData(storage, cacheKey) || {
+    var storageData = getEnumData(storage, cacheKey, baseEnumStorage) || {
       data: {}
     };
     dispatch({

package/es/ProEnum/index.js

@@ -166,7 +166,7 @@ var ProEnum = function ProEnum(props) {
     }
     switch (type) {
       case 'ProSelect':
-        return _jsx(ProSelect, _objectSpread(_objectSpread({}, enumProps), {}, {
+        return _jsx(ProSelect, _objectSpread(_objectSpread({}, omit(enumProps, ['showCodeName'])), {}, {
           otherProps: otherProps,
           dataSource: list,
           fieldNames: {
@@ -177,7 +177,7 @@ var ProEnum = function ProEnum(props) {
           onChange: onChange
         }));
       case 'Radio':
-        return _jsx(_Radio.Group, _objectSpread(_objectSpread({}, omit(enumProps, ['fieldNames'])), {}, {
+        return _jsx(_Radio.Group, _objectSpread(_objectSpread({}, omit(enumProps, ['fieldNames', 'showCodeName'])), {}, {
           options: list,
           value: value,
           onChange: onChange,
@@ -190,7 +190,7 @@ var ProEnum = function ProEnum(props) {
           })
         }));
       case 'Checkbox':
-        return _jsx(_Checkbox.Group, _objectSpread(_objectSpread({}, omit(enumProps, ['fieldNames'])), {}, {
+        return _jsx(_Checkbox.Group, _objectSpread(_objectSpread({}, omit(enumProps, ['fieldNames', 'showCodeName'])), {}, {
           options: list,
           value: value,
           onChange: onChange,
@@ -211,7 +211,7 @@ var ProEnum = function ProEnum(props) {
           dataSource: list
         });
       case 'Group':
-        return _jsx(ProEnumGroup, _objectSpread(_objectSpread({}, enumProps), {}, {
+        return _jsx(ProEnumGroup, _objectSpread(_objectSpread({}, omit(enumProps, ['showCodeName'])), {}, {
           value: value,
           onChange: onChange,
           fieldLabel: label,

package/es/ProEnum/utils/index.d.ts

@@ -4,7 +4,7 @@ interface EnumRes {
     data: Record<string, DataOption[]>;
     [key: string]: any;
 }
-export declare function getEnumData(storage: StorageType, cacheKey: string): EnumRes;
+export declare function getEnumData(storage: StorageType, cacheKey: string, baseEnumStorage?: any): EnumRes;
 export declare function setEnumData(storage: StorageType, cacheKey: string, data: Object): void;
 export declare function hasEnumList(storage: StorageType, cacheKey: any, code: string): DataOption[];
 export declare function isObject(obj: any): boolean;

package/es/ProEnum/utils/index.js

@@ -1,7 +1,10 @@
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["children"];
 import { isNull, isUndefined } from 'lodash';
-export function getEnumData(storage, cacheKey) {
+export function getEnumData(storage, cacheKey, baseEnumStorage) {
+  if (baseEnumStorage) {
+    return baseEnumStorage;
+  }
   if (storage === 'localStorage') {
     return JSON.parse(window.localStorage.getItem(cacheKey) || '{}');
   }

package/es/ProForm/components/base/RangePicker/index.d.ts

@@ -1,11 +1,13 @@
 import type { RangePickerProps } from 'antd/es/date-picker';
 import React from 'react';
 import { ProFormOtherProps } from '../../../propsType';
+import { Props as RangeProps } from './useDateRange';
 export type Props = {
     otherProps?: ProFormOtherProps;
     separator?: any;
     showTime?: any;
     isView?: boolean;
+    range?: RangeProps['range'];
 } & Omit<RangePickerProps, 'separator'>;
 declare const RangePicker: React.FC<Props>;
 export default RangePicker;

package/es/ProForm/components/base/RangePicker/index.js

@@ -2,7 +2,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import "antd/es/date-picker/style";
 import _DatePicker from "antd/es/date-picker";
-var _excluded = ["format", "otherProps", "separator"];
+var _excluded = ["format", "otherProps", "separator", "range"];
 import { jsx as _jsx } from "react/jsx-runtime";
 // @ts-check
 
@@ -11,6 +11,7 @@ import moment from 'moment';
 import { useProConfig } from '../../../../ProConfigProvider';
 import ProForm from '../../../../ProForm';
 import Container from '../../Container';
+import { useDateRange } from './useDateRange';
 var AntRangePicker = _DatePicker.RangePicker;
 var RangePicker = function RangePicker(props) {
   var _props$format = props.format,
@@ -18,12 +19,18 @@ var RangePicker = function RangePicker(props) {
     otherProps = props.otherProps,
     _props$separator = props.separator,
     separator = _props$separator === void 0 ? '~' : _props$separator,
+    range = props.range,
     rest = _objectWithoutProperties(props, _excluded);
   var initialConfig = useProConfig('AntRangePicker');
   var _ref = ProForm.useFieldProps() || {},
     isViewCon = _ref.isView,
     viewEmpty = _ref.viewEmpty,
     valueType = _ref.valueType;
+  // 返回函数管理起止时间可选范围
+  var rangeRegulator = useDateRange({
+    range: range,
+    disabledDate: rest.disabledDate
+  });
   var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon;
   var _res = _objectSpread(_objectSpread({}, rest), {}, {
     showTime: !rest.showTime && valueType === 'dateTime' || rest.showTime
@@ -56,6 +63,6 @@ var RangePicker = function RangePicker(props) {
       children: viewChildren
     });
   }
-  return _jsx(AntRangePicker, _objectSpread(_objectSpread({}, initialConfig), omit(_res, ['separator'])));
+  return _jsx(AntRangePicker, _objectSpread(_objectSpread(_objectSpread({}, initialConfig), omit(_res, ['separator'])), rangeRegulator));
 };
 export default RangePicker;

package/es/ProForm/components/base/RangePicker/useDateRange.d.ts

@@ -0,0 +1,15 @@
+import { Moment } from 'moment';
+type unitOfTime = 'year' | 'years' | 'y' | 'month' | 'months' | 'M' | 'week' | 'weeks' | 'w' | 'day' | 'days' | 'd';
+export interface Props {
+    value?: [Moment?, Moment?];
+    range: [number, unitOfTime];
+    disabledDate?: (date: Moment) => boolean;
+}
+/**
+ * 支持传入时间范围作为起止期的间隔时间
+ */
+export declare const useDateRange: (props: Props) => {
+    onCalendarChange: (val?: [Moment?, Moment?]) => void;
+    disabledDate: (current: Moment) => boolean;
+};
+export {};

package/es/ProForm/components/base/RangePicker/useDateRange.js

@@ -0,0 +1,33 @@
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import { useState } from 'react';
+/**
+ * 支持传入时间范围作为起止期的间隔时间
+ */
+export var useDateRange = function useDateRange(props) {
+  var range = props.range,
+    _disabledDate = props.disabledDate;
+  var _useState = useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    dates = _useState2[0],
+    setDates = _useState2[1];
+  if (!range) return;
+  return {
+    onCalendarChange: function onCalendarChange(val) {
+      var _val$, _val$2;
+      if (!val) {
+        setDates(val);
+        return;
+      }
+      var _val = [(_val$ = val[0]) === null || _val$ === void 0 ? void 0 : _val$.clone().startOf('day'), (_val$2 = val[1]) === null || _val$2 === void 0 ? void 0 : _val$2.clone().startOf('day')];
+      setDates(_val);
+    },
+    disabledDate: function disabledDate(current) {
+      if (!dates) return false;
+      var _current = current.clone().startOf('day');
+      var tooLate = dates[0] && _current.diff(dates[0], range[1]) >= range[0];
+      var tooEarly = dates[1] && dates[1].diff(_current, range[1]) >= range[0];
+      var outerDisableDate = _disabledDate === null || _disabledDate === void 0 ? void 0 : _disabledDate(current);
+      return !!tooEarly || !!tooLate || outerDisableDate;
+    }
+  };
+};

package/es/ProForm/components/combination/Group/component/ComRender.d.ts

@@ -13,6 +13,8 @@ interface Props {
     after?: React.ReactNode;
     name?: NamePath;
     valueType: string;
+    valuePropName?: string;
+    getValueProps?: (value: any) => Record<string, unknown>;
 }
 /** 渲染组件 */
 declare const ComRender: React.FC<Props>;

package/es/ProForm/components/combination/Group/component/ComRender.js

@@ -1,7 +1,7 @@
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-var _excluded = ["type", "confirm", "component", "fieldProps", "contextProps", "before", "after"];
+var _excluded = ["type", "confirm", "component", "fieldProps", "contextProps", "before", "after", "getValueProps", "valuePropName"];
 import { jsx as _jsx } from "react/jsx-runtime";
 import React from 'react';
 import ConfirmWrapper from '../../../../components/render/ConfirmWrapper';
@@ -37,9 +37,16 @@ var ComRender = function ComRender(props) {
     contextProps = props.contextProps,
     before = props.before,
     after = props.after,
+    getValueProps = props.getValueProps,
+    _props$valuePropName = props.valuePropName,
+    valuePropName = _props$valuePropName === void 0 ? 'value' : _props$valuePropName,
     rest = _objectWithoutProperties(props, _excluded);
   var TypeComponent = componentMap[type];
-  var componentProps = _objectSpread(_objectSpread({}, fieldProps), rest);
+  var mergedGetValueProps = getValueProps || function (val) {
+    return _defineProperty({}, valuePropName, val);
+  };
+  var _props = mergedGetValueProps(props.value);
+  var componentProps = _objectSpread(_objectSpread(_objectSpread({}, fieldProps), rest), _props);
   var Component = component ? ( /*#__PURE__*/React.cloneElement(component, _objectSpread({}, componentProps))) : _jsx(TypeComponent, _objectSpread({}, componentProps));
   var Com = getComRender(Component, props, componentProps);
   return _jsx(FieldProvider, {

package/es/ProForm/components/combination/Group/propsType.d.ts

@@ -45,4 +45,6 @@ export type GroupColumnProps<Values = any> = {
     toISOString?: boolean;
     clearNotShow?: boolean;
     confirm?: boolean | ModalFuncProps | FunctionArgs<Values, boolean | ModalFuncProps>;
+    valuePropName?: string;
+    getValueProps?: (value: any) => Record<string, unknown>;
 } & ColumnPropsMap & FormItemProps;

package/es/ProForm/components/combination/Group/utils.js

@@ -232,7 +232,7 @@ export var useTransformColumns = function useTransformColumns(params) {
       if ((transform === null || transform === void 0 ? void 0 : transform.normalize) || normalize) {
         var _transform$normalize;
         // @ts-ignore
-        newValue = ((_transform$normalize = transform.normalize) === null || _transform$normalize === void 0 ? void 0 : _transform$normalize.call(transform, newValue)) || (normalize === null || normalize === void 0 ? void 0 : normalize(newValue));
+        newValue = (transform === null || transform === void 0 ? void 0 : (_transform$normalize = transform.normalize) === null || _transform$normalize === void 0 ? void 0 : _transform$normalize.call(transform, newValue)) || (normalize === null || normalize === void 0 ? void 0 : normalize(newValue));
       }
       internalChange === null || internalChange === void 0 ? void 0 : internalChange(newValue, args[1], index);
       var values = form.getFieldValue(namePath);

package/es/ProForm/components/combination/ProCascader/index.js

@@ -49,12 +49,12 @@ var getViewLabel = function getViewLabel(_ref) {
   return viewLabel;
 };
 var ProCascader = function ProCascader(props) {
-  var _value$slice, _ref7, _ref7$filter, _defaultLabel$filter, _locale$ProAddressBar, _locale$ProAddressBar2;
+  var _props$otherProps, _value$slice, _ref7, _ref7$filter, _defaultLabel$filter, _locale$ProAddressBar, _locale$ProAddressBar2;
   var _ref2 = useProConfig('ProAddressBar') || {},
     configDetailMaxLength = _ref2.detailMaxLength,
     configEnumCode = _ref2.enumCode,
     configCode = _ref2.code;
-  var isAddressMode = (props === null || props === void 0 ? void 0 : props.mode) === 'address';
+  var isAddressMode = (props === null || props === void 0 ? void 0 : props.mode) === 'address' || (props === null || props === void 0 ? void 0 : (_props$otherProps = props.otherProps) === null || _props$otherProps === void 0 ? void 0 : _props$otherProps.type) === 'ProAddressBar';
   var _props$className = props.className,
     className = _props$className === void 0 ? '' : _props$className,
     _props$hasDetail = props.hasDetail,

package/es/ProForm/components/index.d.ts

@@ -12,6 +12,7 @@ export { default as TimePicker } from './base/TimePicker';
 export { default as FormList } from './combination/FormList';
 export { default as ProEditTable } from '../../ProEditTable';
 export { default as ProCascader } from './combination/ProCascader';
+export { default as ProAddressBar } from './combination/ProCascader';
 export { default as ProCombination } from './combination/ProCombination';
 export { default as ProNumberRange } from './combination/ProNumberRange';
 export { default as ProModalSelect } from './combination/ProModalSelect';

package/es/ProForm/components/index.js

@@ -14,6 +14,7 @@ export { default as FormList } from './combination/FormList';
 export { default as ProEditTable } from '../../ProEditTable';
 // combination 组合组件
 export { default as ProCascader } from './combination/ProCascader';
+export { default as ProAddressBar } from './combination/ProCascader';
 export { default as ProCombination } from './combination/ProCombination';
 export { default as ProNumberRange } from './combination/ProNumberRange';
 export { default as ProModalSelect } from './combination/ProModalSelect';

package/es/ProForm/components/render/Render.js

@@ -276,7 +276,7 @@ var Render = function Render(props) {
       }, 60);
     }
     // ProTreeSelect返回option
-    if (['ProTree'].includes(type)) {
+    if (['ProTree'].includes(type) && !_args[2].option) {
       var _args2, _args2$;
       _args[2].option = findOptionByValue(lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.dataSource, (_args2 = _args) === null || _args2 === void 0 ? void 0 : (_args2$ = _args2[0]) === null || _args2$ === void 0 ? void 0 : _args2$[0], (lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.fieldNames) || {});
     }

package/es/ProTable/components/RenderColumn/index.js

@@ -41,6 +41,9 @@ var RenderColumn = function RenderColumn(props) {
         title: originalDiffTip ? _jsxs(_Fragment, {
           children: ["\u521D\u59CB\u503C\uFF1A", originalValue, _jsx("br", {}), ellipsis ? "\u5F53\u524D\u503C\uFF1A".concat(currentValue) : undefined]
         }) : node,
+        getPopupContainer: function getPopupContainer(triggerNode) {
+          return triggerNode.parentNode;
+        },
         children: renderNode
       });
     }
@@ -80,7 +83,11 @@ var RenderColumn = function RenderColumn(props) {
         width: width
       },
       ellipsis: {
-        tooltip: true
+        tooltip: {
+          getPopupContainer: function getPopupContainer(triggerNode) {
+            return triggerNode.parentNode;
+          }
+        }
       },
       children: node
     }) : '-';