@ant-design/pro-components 2.3.6 → 2.3.8

package/dist/components.js

@@ -24875,6 +24875,7 @@ __webpack_require__.d(__webpack_exports__, {
   "ProFormMoney": function() { return /* reexport */ components_Money; },
   "ProFormRadio": function() { return /* reexport */ components_Radio; },
   "ProFormRate": function() { return /* reexport */ components_Rate; },
+  "ProFormSegmented": function() { return /* reexport */ components_Segmented; },
   "ProFormSelect": function() { return /* reexport */ components_Select; },
   "ProFormSlider": function() { return /* reexport */ components_Slider; },
   "ProFormSwitch": function() { return /* reexport */ components_Switch; },
@@ -24975,6 +24976,7 @@ __webpack_require__.d(__webpack_exports__, {
   "useMountMergeState": function() { return /* reexport */ useMergedState/* default */.Z; },
   "usePrevious": function() { return /* reexport */ usePrevious; },
   "useRefFunction": function() { return /* reexport */ useRefFunction; },
+  "useSafeState": function() { return /* reexport */ useSafeState; },
   "useStyle": function() { return /* reexport */ useStyle; },
   "useToken": function() { return /* reexport */ useStyle_useToken; },
   "version": function() { return /* reexport */ version_version; },
@@ -28757,7 +28759,7 @@ var Utility_assign = Object.assign;
  */
 
 function hash(value, length) {
-  return (((length << 2 ^ charat(value, 0)) << 2 ^ charat(value, 1)) << 2 ^ charat(value, 2)) << 2 ^ charat(value, 3);
+  return charat(value, 0) ^ 45 ? (((length << 2 ^ charat(value, 0)) << 2 ^ charat(value, 1)) << 2 ^ charat(value, 2)) << 2 ^ charat(value, 3) : 0;
 }
 /**
  * @param {string} value
@@ -29218,7 +29220,7 @@ function parse(value, root, parent, rule, rules, rulesets, pseudo, points, decla
     switch (previous = character, character = next()) {
       // (
       case 40:
-        if (previous != 108 && characters.charCodeAt(length - 1) == 58) {
+        if (previous != 108 && charat(characters, length - 1) == 58) {
           if (indexof(characters += replace(delimit(character), '&', '&\f'), '&\f') != -1) ampersand = -1;
           break;
         }
@@ -29714,7 +29716,7 @@ var styleValidate = function styleValidate(key, value) {
       return;
 
     case 'animation':
-      if (hashId) {
+      if (hashId && value !== 'none') {
         util_warning("You seem to be using hashed animation '".concat(value, "', in which case 'animationName' with Keyframe as value is recommended."), path);
       }
 
@@ -29892,7 +29894,6 @@ function useStyleRegister(info, styleFn) {
     var styleObj = styleFn();
     var styleStr = normalizeStyle(parseStyle(styleObj, hashId, path.join('-')));
     var styleId = uniqueHash(fullPath, styleStr); // Clear animation statistics
-    // Clear animation statistics
 
     animationStatistics = {};
 
@@ -29902,10 +29903,8 @@ function useStyleRegister(info, styleFn) {
         prepend: 'queue'
       });
       style[CSS_IN_JS_INSTANCE] = CSS_IN_JS_INSTANCE_ID; // Used for `useCacheToken` to remove on batch when token removed
-      // Used for `useCacheToken` to remove on batch when token removed
 
       style.setAttribute(StyleContext_ATTR_TOKEN, tokenKey); // Dev usage to find which cache path made this easily
-      // Dev usage to find which cache path made this easily
 
       if (false) {}
     }
@@ -32323,25 +32322,6 @@ var tryParse = function tryParse(v) {
   return isNaN(n) ? v : n;
 };
 
-var operatorResMap = {
-  '>': [1],
-  '>=': [0, 1],
-  '=': [0],
-  '<=': [-1, 0],
-  '<': [-1]
-};
-var allowedOperators = Object.keys(operatorResMap);
-
-var assertValidOperator = function assertValidOperator(op) {
-  if (typeof op !== 'string') {
-    throw new TypeError("Invalid operator type, expected string but got ".concat(_typeof(op)));
-  }
-
-  if (allowedOperators.indexOf(op) === -1) {
-    throw new Error("Invalid operator, expected one of ".concat(allowedOperators.join('|')));
-  }
-};
-
 var forceType = function forceType(a, b) {
   return typeof_typeof(a) !== typeof_typeof(b) ? [String(a), String(b)] : [a, b];
 };
@@ -32410,91 +32390,6 @@ var compareVersions = function compareVersions(v1, v2) {
 
   return 0;
 };
-/**
- * Validate [semver](https://semver.org/) version strings.
- *
- * @param version Version number to validate
- * @returns `true` if the version number is a valid semver version number, `false` otherwise.
- *
- * @example
- * ```
- * validate('1.0.0-rc.1'); // return true
- * validate('1.0-rc.1'); // return false
- * validate('foo'); // return false
- * ```
- */
-
-var validate = function validate(version) {
-  return typeof version === 'string' && /^[v\d]/.test(version) && semver.test(version);
-};
-/**
- * Compare [semver](https://semver.org/) version strings using the specified operator.
- *
- * @param v1 First version to compare
- * @param v2 Second version to compare
- * @param operator Allowed arithmetic operator to use
- * @returns `true` if the comparison between the firstVersion and the secondVersion satisfies the operator, `false` otherwise.
- *
- * @example
- * ```
- * compare('10.1.8', '10.0.4', '>'); // return true
- * compare('10.0.1', '10.0.1', '='); // return true
- * compare('10.1.1', '10.2.2', '<'); // return true
- * compare('10.1.1', '10.2.2', '<='); // return true
- * compare('10.1.1', '10.2.2', '>='); // return false
- * ```
- */
-
-var compare = function compare(v1, v2, operator) {
-  // validate input operator
-  assertValidOperator(operator); // since result of compareVersions can only be -1 or 0 or 1
-  // a simple map can be used to replace switch
-
-  var res = compareVersions(v1, v2);
-  return operatorResMap[operator].includes(res);
-};
-/**
- * Match [npm semver](https://docs.npmjs.com/cli/v6/using-npm/semver) version range.
- *
- * @param version Version number to match
- * @param range Range pattern for version
- * @returns `true` if the version number is within the range, `false` otherwise.
- *
- * @example
- * ```
- * satisfies('1.1.0', '^1.0.0'); // return true
- * satisfies('1.1.0', '~1.0.0'); // return false
- * ```
- */
-
-var satisfies = function satisfies(version, range) {
-  // if no range operator then "="
-  var m = range.match(/^([<>=~^]+)/);
-  var op = m ? m[1] : '='; // if gt/lt/eq then operator compare
-
-  if (op !== '^' && op !== '~') return compare(version, range, op); // else range of either "~" or "^" is assumed
-
-  var _validateAndParse = validateAndParse(version),
-      _validateAndParse2 = _slicedToArray(_validateAndParse, 3),
-      v1 = _validateAndParse2[0],
-      v2 = _validateAndParse2[1],
-      v3 = _validateAndParse2[2];
-
-  var _validateAndParse3 = validateAndParse(range),
-      _validateAndParse4 = _slicedToArray(_validateAndParse3, 3),
-      r1 = _validateAndParse4[0],
-      r2 = _validateAndParse4[1],
-      r3 = _validateAndParse4[2];
-
-  if (compareStrings(v1, r1) !== 0) return false;
-
-  if (op === '^') {
-    return compareSegments([v2, v3], [r2, r3]) >= 0;
-  }
-
-  if (compareStrings(v2, r2) !== 0) return false;
-  return compareStrings(v3, r3) >= 0;
-};
 ;// CONCATENATED MODULE: ./packages/utils/es/components/FilterDropdown/style.js
 
 
@@ -32560,7 +32455,7 @@ var FilterDropdown = function FilterDropdown(props) {
       wrapSSR = _useStyle.wrapSSR,
       hashId = _useStyle.hashId;
 
-  var dropdownOpenProps = compareVersions(external_antd_.version, '4.23.0') ? {
+  var dropdownOpenProps = compareVersions(external_antd_.version, '4.23.0') > -1 ? {
     visible: open || visible,
     onVisibleChange: onOpenChange || onVisibleChange
   } : {
@@ -32745,7 +32640,7 @@ var InlineErrorFormItemPopover = function InlineErrorFormItemPopover(_ref) {
       setErrorList(inputProps.errors);
     }
   }, [inputProps.errors, inputProps.validateStatus]);
-  var drawerOpenProps = compareVersions(external_antd_.version, '4.23.0') ? {
+  var drawerOpenProps = compareVersions(external_antd_.version, '4.23.0') > -1 ? {
     open: errorStringList.length < 1 ? false : open,
     onOpenChange: function onOpenChange(changeOpen) {
       if (changeOpen === open) return;
@@ -32887,7 +32782,7 @@ var LabelIconTip_style_genProStyle = function genProStyle(token) {
       marginInlineStart: '4px',
       cursor: 'pointer',
       '&:hover': {
-        color: token.colorPrimaryBgHover
+        color: token.colorPrimary
       }
     },
     '&-title': {
@@ -35560,6 +35455,40 @@ function useEditableMap(props) {
     cancelEditable: cancelEditable
   };
 }
+;// CONCATENATED MODULE: ./packages/utils/es/useSafeState/index.js
+
+
+/**
+ * Same as React.useState but `setState` accept `ignoreDestroy` param to not to setState after destroyed.
+ * We do not make this auto is to avoid real memory leak.
+ * Developer should confirm it's safe to ignore themselves.
+ */
+
+function useSafeState(defaultValue) {
+  var destroyRef = external_React_.useRef(false);
+
+  var _React$useState = external_React_.useState(defaultValue),
+      _React$useState2 = slicedToArray_slicedToArray(_React$useState, 2),
+      value = _React$useState2[0],
+      setValue = _React$useState2[1];
+
+  external_React_.useEffect(function () {
+    destroyRef.current = false;
+    return function () {
+      destroyRef.current = true;
+    };
+  }, []);
+
+  function safeSetState(updater, ignoreDestroy) {
+    if (ignoreDestroy && destroyRef.current) {
+      return;
+    }
+
+    setValue(updater);
+  }
+
+  return [value, safeSetState];
+}
 ;// CONCATENATED MODULE: ./packages/utils/es/index.js
 
 
@@ -35603,6 +35532,7 @@ function useEditableMap(props) {
 
 
 
+
 
 
 ;// CONCATENATED MODULE: ./node_modules/omit.js/es/index.js
@@ -35957,9 +35887,9 @@ var CheckCard_style_genProStyle = function genProStyle(token) {
       width: 0,
       height: 0,
       border: "6px solid ".concat(token.colorPrimary),
-      borderBottom: '6px solid transparent',
-      borderLeft: '6px solid transparent',
-      borderTopRightRadius: '2px',
+      borderBlockEnd: '6px solid transparent',
+      borderInlineStart: '6px solid transparent',
+      borderStartEndRadius: '2px',
       content: "''"
     }
   })), defineProperty_defineProperty(_token$componentCls, '&-disabled', proCheckCardDisabled(token)), defineProperty_defineProperty(_token$componentCls, '&[disabled]', proCheckCardDisabled(token)), defineProperty_defineProperty(_token$componentCls, '&-lg', {
@@ -36715,6 +36645,108 @@ var Loading = function Loading(props) {
 };
 
 /* harmony default export */ var components_Loading = (Loading);
+// EXTERNAL MODULE: ./node_modules/rc-util/lib/Children/toArray.js
+var Children_toArray = __webpack_require__(5994);
+;// CONCATENATED MODULE: ./packages/card/es/components/TabPane/index.js
+
+
+var TabPane_excluded = ["tab", "children"],
+    TabPane_excluded2 = ["key", "tab", "tabKey", "disabled", "destroyInactiveTabPane", "children", "className", "style", "cardProps"];
+
+
+
+
+
+
+
+
+function filter(items) {
+  return items.filter(function (item) {
+    return item;
+  });
+}
+
+function useLegacyItems(items, children, tabs) {
+  if (items) {
+    return items.map(function (item) {
+      return objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, item), {}, {
+        children: (0,jsx_runtime.jsx)(components_Card, objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, tabs === null || tabs === void 0 ? void 0 : tabs.cardProps), {}, {
+          children: item.children
+        }))
+      });
+    });
+  }
+
+  (0,lib_warning.noteOnce)(!tabs, 'Tabs.TabPane is deprecated. Please use `items` directly.');
+  var childrenItems = (0,Children_toArray/* default */.Z)(children).map(function (node) {
+    if ( /*#__PURE__*/external_React_default().isValidElement(node)) {
+      var key = node.key,
+          props = node.props;
+
+      var _ref = props || {},
+          tab = _ref.tab,
+          tempChild = _ref.children,
+          restProps = objectWithoutProperties_objectWithoutProperties(_ref, TabPane_excluded);
+
+      var item = objectSpread2_objectSpread2(objectSpread2_objectSpread2({
+        key: String(key)
+      }, restProps), {}, {
+        children: (0,jsx_runtime.jsx)(components_Card, objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, tabs === null || tabs === void 0 ? void 0 : tabs.cardProps), {}, {
+          children: tempChild
+        })),
+        label: tab
+      });
+
+      return item;
+    }
+
+    return null;
+  });
+  return filter(childrenItems);
+}
+/**
+ * @deprecated ProComponets 3.0
+ */
+
+var TabPane = function TabPane(props) {
+  var _useContext = (0,external_React_.useContext)(external_antd_.ConfigProvider.ConfigContext),
+      getPrefixCls = _useContext.getPrefixCls; // 如果是antd v5 则返回为空
+
+
+  if (external_antd_.version.startsWith('5')) {
+    return (0,jsx_runtime.jsx)(jsx_runtime.Fragment, {});
+  } else {
+    var key = props.key,
+        tab = props.tab,
+        tabKey = props.tabKey,
+        disabled = props.disabled,
+        destroyInactiveTabPane = props.destroyInactiveTabPane,
+        children = props.children,
+        className = props.className,
+        style = props.style,
+        cardProps = props.cardProps,
+        rest = objectWithoutProperties_objectWithoutProperties(props, TabPane_excluded2);
+
+    var prefixCls = getPrefixCls('pro-card-tabpane');
+    var tabPaneClassName = classnames_default()(prefixCls, className);
+    return (0,jsx_runtime.jsx)(external_antd_.Tabs.TabPane, objectSpread2_objectSpread2(objectSpread2_objectSpread2({
+      tabKey: tabKey,
+      tab: tab,
+      className: tabPaneClassName,
+      style: style,
+      disabled: disabled,
+      destroyInactiveTabPane: destroyInactiveTabPane
+    }, rest), {}, {
+      children: (0,jsx_runtime.jsx)(components_Card, objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, cardProps), {}, {
+        children: children
+      }))
+    }), key);
+  }
+};
+
+if (false) {}
+
+/* harmony default export */ var components_TabPane = (TabPane);
 ;// CONCATENATED MODULE: ./packages/card/es/components/Card/style.js
 
 
@@ -36852,7 +36884,8 @@ var genProCardStyle = function genProCardStyle(token) {
   }), defineProperty_defineProperty(_objectSpread2, "".concat(componentCls, "-title"), {
     color: token.colorText,
     fontWeight: 500,
-    fontSize: token.fontSizeLG
+    fontSize: token.fontSizeLG,
+    lineHeight: token.lineHeight
   }), defineProperty_defineProperty(_objectSpread2, "".concat(componentCls, "-extra"), {
     color: token.colorText
   }), defineProperty_defineProperty(_objectSpread2, "".concat(componentCls, "-type-inner"), defineProperty_defineProperty({}, "".concat(componentCls, "-header"), {
@@ -36871,7 +36904,7 @@ var genProCardStyle = function genProCardStyle(token) {
     boxSizing: 'border-box',
     height: '100%',
     paddingInline: token.paddingLG,
-    paddingBlock: token.paddingLG,
+    paddingBlock: token.padding,
     '&-center': {
       display: 'flex',
       alignItems: 'center',
@@ -36956,9 +36989,10 @@ var Card_excluded = ["className", "style", "bodyStyle", "headStyle", "title", "s
 
 
 
+
 var useBreakpoint = external_antd_.Grid.useBreakpoint;
 var Card = /*#__PURE__*/external_React_default().forwardRef(function (props, ref) {
-  var _tabs$items, _classNames2, _classNames3, _classNames4;
+  var _classNames2, _classNames3, _classNames4;
 
   var className = props.className,
       style = props.style,
@@ -37022,13 +37056,7 @@ var Card = /*#__PURE__*/external_React_default().forwardRef(function (props, ref
   var responsiveArray = ['xxl', 'xl', 'lg', 'md', 'sm', 'xs']; // 修改组合传给antd tabs的参数
   // @ts-ignore
 
-  var ModifyTabItemsContant = tabs === null || tabs === void 0 ? void 0 : (_tabs$items = tabs.items) === null || _tabs$items === void 0 ? void 0 : _tabs$items.map(function (item) {
-    return objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, item), {}, {
-      children: (0,jsx_runtime.jsx)(Card, objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, tabs === null || tabs === void 0 ? void 0 : tabs.cardProps), {}, {
-        children: item.children
-      }))
-    });
-  });
+  var ModifyTabItemsContant = useLegacyItems(tabs === null || tabs === void 0 ? void 0 : tabs.items, children, tabs);
   /**
    * 根据响应式获取 gutter, 参考 antd 实现
    *
@@ -37471,55 +37499,6 @@ StatisticCard.Operation = Operation;
 StatisticCard.isProCard = true;
 StatisticCard.Group = StatisticCard_Group;
 /* harmony default export */ var components_StatisticCard = (StatisticCard);
-;// CONCATENATED MODULE: ./packages/card/es/components/TabPane/index.js
-
-
-var TabPane_excluded = ["key", "tab", "tabKey", "disabled", "destroyInactiveTabPane", "children", "className", "style", "cardProps"];
-
-
-
-
-
-
-var TabPane = function TabPane(props) {
-  var _useContext = (0,external_React_.useContext)(external_antd_.ConfigProvider.ConfigContext),
-      getPrefixCls = _useContext.getPrefixCls; // 如果是antd v5 则返回为空
-
-
-  if (external_antd_.version.startsWith('5')) {
-    return (0,jsx_runtime.jsx)(jsx_runtime.Fragment, {});
-  } else {
-    var key = props.key,
-        tab = props.tab,
-        tabKey = props.tabKey,
-        disabled = props.disabled,
-        destroyInactiveTabPane = props.destroyInactiveTabPane,
-        children = props.children,
-        className = props.className,
-        style = props.style,
-        cardProps = props.cardProps,
-        rest = objectWithoutProperties_objectWithoutProperties(props, TabPane_excluded);
-
-    var prefixCls = getPrefixCls('pro-card-tabpane');
-    var tabPaneClassName = classnames_default()(prefixCls, className);
-    return (0,jsx_runtime.jsx)(external_antd_.Tabs.TabPane, objectSpread2_objectSpread2(objectSpread2_objectSpread2({
-      tabKey: tabKey,
-      tab: tab,
-      className: tabPaneClassName,
-      style: style,
-      disabled: disabled,
-      destroyInactiveTabPane: destroyInactiveTabPane
-    }, rest), {}, {
-      children: (0,jsx_runtime.jsx)(components_Card, objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, cardProps), {}, {
-        children: children
-      }))
-    }), key);
-  }
-};
-
-if (false) {}
-
-/* harmony default export */ var components_TabPane = (TabPane);
 ;// CONCATENATED MODULE: ./packages/card/es/ProCard.js
 
 
@@ -43473,14 +43452,14 @@ var useFieldFetchData = function useFieldFetchData(props) {
   var cacheForSwr = props.cacheForSwr,
       fieldProps = props.fieldProps;
 
-  var _useState = (0,external_React_.useState)(props.defaultKeyWords),
-      _useState2 = slicedToArray_slicedToArray(_useState, 2),
-      keyWords = _useState2[0],
-      setKeyWords = _useState2[1];
+  var _useSafeState = useSafeState(props.defaultKeyWords),
+      _useSafeState2 = slicedToArray_slicedToArray(_useSafeState, 2),
+      keyWords = _useSafeState2[0],
+      setKeyWords = _useSafeState2[1];
   /** Key 是用来缓存请求的，如果不在是有问题 */
 
 
-  var _useState3 = (0,external_React_.useState)(function () {
+  var _useState = (0,external_React_.useState)(function () {
     if (props.proFieldKey) {
       return props.proFieldKey.toString();
     }
@@ -43491,8 +43470,8 @@ var useFieldFetchData = function useFieldFetchData(props) {
 
     return 'no-fetch';
   }),
-      _useState4 = slicedToArray_slicedToArray(_useState3, 1),
-      cacheKey = _useState4[0];
+      _useState2 = slicedToArray_slicedToArray(_useState, 1),
+      cacheKey = _useState2[0];
 
   var proFieldKeyRef = (0,external_React_.useRef)(cacheKey);
   var getOptionsFormValueEnum = (0,external_React_.useCallback)(function (coverValueEnum) {
@@ -46691,8 +46670,7 @@ var ColorPicker_excluded = ["mode", "popoverProps"];
 
 var DEFAULT_COLORS = ['#FF9D4E', '#5BD8A6', '#5B8FF9', '#F7664E', '#FF86B7', '#2B9E9D', '#9270CA', '#6DC8EC', '#667796', '#F6BD16' // 9 - 黄色
 ];
-
-var ColorPicker = function ColorPicker(_ref) {
+var ColorPicker = /*#__PURE__*/external_React_default().forwardRef(function (_ref, ref) {
   var mode = _ref.mode,
       popoverProps = _ref.popoverProps,
       rest = objectWithoutProperties_objectWithoutProperties(_ref, ColorPicker_excluded);
@@ -46729,6 +46707,8 @@ var ColorPicker = function ColorPicker(_ref) {
     })
   });
 
+  (0,external_React_.useImperativeHandle)(ref, function () {});
+
   if (mode === 'read') {
     return readDom;
   }
@@ -46763,7 +46743,7 @@ var ColorPicker = function ColorPicker(_ref) {
     }),
     children: readDom
   }));
-};
+});
 /**
  * 颜色组件
  *
@@ -46772,8 +46752,7 @@ var ColorPicker = function ColorPicker(_ref) {
  *     moneySymbol?: string; }
  */
 
-
-var FieldColorPicker = function FieldColorPicker(_ref3) {
+var FieldColorPicker = function FieldColorPicker(_ref3, ref) {
   var text = _ref3.text,
       type = _ref3.mode,
       render = _ref3.render,
@@ -46783,7 +46762,8 @@ var FieldColorPicker = function FieldColorPicker(_ref3) {
   if (type === 'read') {
     var dom = (0,jsx_runtime.jsx)(ColorPicker, {
       value: text,
-      mode: "read"
+      mode: "read",
+      ref: ref
     });
 
     if (render) {
@@ -46796,7 +46776,9 @@ var FieldColorPicker = function FieldColorPicker(_ref3) {
   }
 
   if (type === 'edit' || type === 'update') {
-    var _dom = (0,jsx_runtime.jsx)(ColorPicker, objectSpread2_objectSpread2({}, fieldProps));
+    var _dom = (0,jsx_runtime.jsx)(ColorPicker, objectSpread2_objectSpread2({
+      ref: ref
+    }, fieldProps));
 
     if (renderFormItem) {
       return renderFormItem(text, objectSpread2_objectSpread2({
@@ -46810,7 +46792,7 @@ var FieldColorPicker = function FieldColorPicker(_ref3) {
   return null;
 };
 
-/* harmony default export */ var components_ColorPicker = (FieldColorPicker);
+/* harmony default export */ var components_ColorPicker = (/*#__PURE__*/external_React_default().forwardRef(FieldColorPicker));
 // EXTERNAL MODULE: ./node_modules/dayjs/plugin/weekOfYear.js
 var weekOfYear = __webpack_require__(9855);
 var weekOfYear_default = /*#__PURE__*/__webpack_require__.n(weekOfYear);
@@ -48166,7 +48148,7 @@ var FieldRadio = function FieldRadio(_ref, ref) {
   }); // css
 
   var _useStyle = useStyle('FieldRadioRadio', function (token) {
-    return defineProperty_defineProperty({}, ".".concat(layoutClassName, "-horizontal"), defineProperty_defineProperty({}, "".concat(token.antCls, "-radio-wrapper"), {
+    return defineProperty_defineProperty({}, ".".concat(layoutClassName, "-vertical"), defineProperty_defineProperty({}, "".concat(token.antCls, "-radio-wrapper"), {
       display: 'block',
       marginInlineEnd: 0
     }));
@@ -48207,7 +48189,7 @@ var FieldRadio = function FieldRadio(_ref, ref) {
       ref: radioRef,
       optionType: radioType
     }, rest.fieldProps), {}, {
-      className: classnames_default()((_rest$fieldProps = rest.fieldProps) === null || _rest$fieldProps === void 0 ? void 0 : _rest$fieldProps.className, hashId, "".concat(layoutClassName, "-").concat(rest.fieldProps.layout || 'vertical')),
+      className: classnames_default()((_rest$fieldProps = rest.fieldProps) === null || _rest$fieldProps === void 0 ? void 0 : _rest$fieldProps.className, hashId, "".concat(layoutClassName, "-").concat(rest.fieldProps.layout || 'horizontal')),
       options: options
     })));
 
@@ -48468,6 +48450,100 @@ var Second = function Second(_ref, ref) {
 };
 
 /* harmony default export */ var components_Second = (/*#__PURE__*/external_React_default().forwardRef(Second));
+;// CONCATENATED MODULE: ./packages/field/es/components/Segmented/index.js
+
+
+
+
+var Segmented_excluded = ["mode", "render", "renderFormItem", "fieldProps", "emptyText"];
+
+
+
+
+/**
+ * Segmented https://ant.design/components/segmented-cn/
+ *
+ * @param
+ */
+
+var FieldSegmented = function FieldSegmented(_ref, ref) {
+  var mode = _ref.mode,
+      render = _ref.render,
+      renderFormItem = _ref.renderFormItem,
+      fieldProps = _ref.fieldProps,
+      _ref$emptyText = _ref.emptyText,
+      emptyText = _ref$emptyText === void 0 ? '-' : _ref$emptyText,
+      rest = objectWithoutProperties_objectWithoutProperties(_ref, Segmented_excluded);
+
+  var inputRef = (0,external_React_.useRef)();
+
+  var _useFieldFetchData = useFieldFetchData(rest),
+      _useFieldFetchData2 = slicedToArray_slicedToArray(_useFieldFetchData, 3),
+      loading = _useFieldFetchData2[0],
+      options = _useFieldFetchData2[1],
+      _fetchData = _useFieldFetchData2[2];
+
+  (0,external_React_.useImperativeHandle)(ref, function () {
+    return objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, inputRef.current || {}), {}, {
+      fetchData: function fetchData() {
+        return _fetchData();
+      }
+    });
+  });
+
+  if (loading) {
+    return (0,jsx_runtime.jsx)(external_antd_.Spin, {
+      size: "small"
+    });
+  }
+
+  if (mode === 'read') {
+    var optionsValueEnum = (options === null || options === void 0 ? void 0 : options.length) ? options === null || options === void 0 ? void 0 : options.reduce(function (pre, cur) {
+      var _cur$value;
+
+      return objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, pre), {}, defineProperty_defineProperty({}, (_cur$value = cur.value) !== null && _cur$value !== void 0 ? _cur$value : '', cur.label));
+    }, {}) : undefined;
+
+    var dom = (0,jsx_runtime.jsx)(jsx_runtime.Fragment, {
+      children: proFieldParsingText(rest.text, ObjToMap(rest.valueEnum || optionsValueEnum))
+    });
+
+    if (render) {
+      var _render;
+
+      return (_render = render(rest.text, objectSpread2_objectSpread2({
+        mode: mode
+      }, fieldProps), (0,jsx_runtime.jsx)(jsx_runtime.Fragment, {
+        children: dom
+      }))) !== null && _render !== void 0 ? _render : emptyText;
+    }
+
+    return dom;
+  }
+
+  if (mode === 'edit' || mode === 'update') {
+    var _dom = (0,jsx_runtime.jsx)(external_antd_.Segmented, objectSpread2_objectSpread2(objectSpread2_objectSpread2({
+      ref: inputRef,
+      allowClear: true
+    }, fieldProps), {}, {
+      options: options
+    }));
+
+    if (renderFormItem) {
+      return renderFormItem(rest.text, objectSpread2_objectSpread2(objectSpread2_objectSpread2({
+        mode: mode
+      }, fieldProps), {}, {
+        options: options
+      }), _dom);
+    }
+
+    return _dom;
+  }
+
+  return null;
+};
+
+/* harmony default export */ var Segmented = (/*#__PURE__*/external_React_default().forwardRef(FieldSegmented));
 ;// CONCATENATED MODULE: ./packages/field/es/components/Slider/index.js
 
 
@@ -49282,6 +49358,7 @@ var es_excluded = ["text", "valueType", "mode", "onChange", "renderFormItem", "v
 
 
 
+
 
 
 dayjs_min_default().extend((weekday_default()));
@@ -49702,6 +49779,12 @@ var defaultRenderText = function defaultRenderText(dataValue, valueType, props,
     }, props));
   }
 
+  if (valueType === 'segmented') {
+    return (0,jsx_runtime.jsx)(Segmented, objectSpread2_objectSpread2({
+      text: dataValue
+    }, props));
+  }
+
   return (0,jsx_runtime.jsx)(Text, objectSpread2_objectSpread2({
     text: dataValue
   }, props));
@@ -50432,8 +50515,6 @@ var PlusOutlined_PlusOutlined = function PlusOutlined(props, ref) {
 
 PlusOutlined_PlusOutlined.displayName = 'PlusOutlined';
 /* harmony default export */ var icons_PlusOutlined = (/*#__PURE__*/external_React_.forwardRef(PlusOutlined_PlusOutlined));
-// EXTERNAL MODULE: ./node_modules/rc-util/lib/Children/toArray.js
-var Children_toArray = __webpack_require__(5994);
 ;// CONCATENATED MODULE: ./packages/form/es/components/List/ListItem.js
 
 
@@ -52312,7 +52393,7 @@ function DrawerForm(_ref) {
       return _ref3.apply(this, arguments);
     };
   }());
-  var drawerOpenProps = compareVersions(external_antd_.version, '4.23.0') ? {
+  var drawerOpenProps = compareVersions(external_antd_.version, '4.23.0') > -1 ? {
     open: open,
     onOpenChange: onVisibleChange
   } : {
@@ -52951,7 +53032,7 @@ function ModalForm(_ref) {
       return _ref5.apply(this, arguments);
     };
   }(), [onFinish, setOpen, submitTimeout]);
-  var modalOpenProps = compareVersions(external_antd_.version, '4.23.0') ? {
+  var modalOpenProps = compareVersions(external_antd_.version, '4.23.0') > -1 ? {
     open: open
   } : {
     visible: open
@@ -55705,7 +55786,7 @@ var field = function field(item, _ref) {
   }
 
   return /*#__PURE__*/(0,external_React_.createElement)(components_Field, objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, formFieldProps), {}, {
-    key: "".concat(item.key, "-").concat(item.index),
+    key: [item.key, item.index || 0].join('-'),
     renderFormItem: renderFormItem
   }));
 };
@@ -55997,6 +56078,41 @@ function BetaSchemaForm(props) {
 }
 
 /* harmony default export */ var SchemaForm = (BetaSchemaForm);
+;// CONCATENATED MODULE: ./packages/form/es/components/Segmented/index.js
+
+
+var components_Segmented_excluded = ["fieldProps", "request", "params", "proFieldProps"];
+
+
+
+/**
+ * 分段控制器
+ *
+ * @param
+ */
+
+var ProFormSegmented = function ProFormSegmented(_ref, ref) {
+  var fieldProps = _ref.fieldProps,
+      request = _ref.request,
+      params = _ref.params,
+      proFieldProps = _ref.proFieldProps,
+      rest = objectWithoutProperties_objectWithoutProperties(_ref, components_Segmented_excluded);
+
+  return (0,jsx_runtime.jsx)(components_Field, objectSpread2_objectSpread2({
+    valueType: "segmented",
+    fieldProps: fieldProps,
+    ref: ref,
+    request: request,
+    params: params,
+    filedConfig: {
+      customLightMode: true
+    },
+    proFieldProps: proFieldProps
+  }, rest));
+};
+
+var WarpProFormSegmented = /*#__PURE__*/external_React_default().forwardRef(ProFormSegmented);
+/* harmony default export */ var components_Segmented = (WarpProFormSegmented);
 ;// CONCATENATED MODULE: ./packages/form/es/components/Select/index.js
 
 
@@ -56705,6 +56821,7 @@ var ProFormUploadDragger = createField(BaseProFormUploadDragger, {
 
 
 
+
 
 
 ;// CONCATENATED MODULE: ./packages/form/es/BaseForm/BaseForm.js
@@ -58390,7 +58507,7 @@ var ListSkeleton = function ListSkeleton(_ref4) {
     }), actionButton !== false && (0,jsx_runtime.jsx)(external_antd_.Card, {
       bordered: false,
       style: {
-        borderTopRightRadius: 0,
+        borderStartEndRadius: 0,
         borderTopLeftRadius: 0
       },
       bodyStyle: {
@@ -58773,7 +58890,7 @@ var DescriptionsSkeleton = function DescriptionsSkeleton(_ref5) {
   return (0,jsx_runtime.jsxs)(external_antd_.Card, {
     bordered: false,
     style: {
-      borderTopRightRadius: 0,
+      borderStartEndRadius: 0,
       borderTopLeftRadius: 0
     },
     children: [(0,jsx_runtime.jsx)(external_antd_.Skeleton.Button, {
@@ -59740,8 +59857,6 @@ var ArrowLeftOutlined_default = /*#__PURE__*/__webpack_require__.n(ArrowLeftOutl
 // EXTERNAL MODULE: ./node_modules/@ant-design/icons/ArrowRightOutlined.js
 var ArrowRightOutlined = __webpack_require__(2406);
 var ArrowRightOutlined_default = /*#__PURE__*/__webpack_require__.n(ArrowRightOutlined);
-// EXTERNAL MODULE: ./node_modules/rc-util/lib/hooks/useState.js
-var hooks_useState = __webpack_require__(8594);
 ;// CONCATENATED MODULE: ./packages/layout/es/components/PageHeader/style/index.js
 
 
@@ -59994,10 +60109,10 @@ var renderChildren = function renderChildren(prefixCls, children, hashId) {
 var PageHeader = function PageHeader(props) {
   var _breadcrumbRender, _classNames;
 
-  var _useState = (0,hooks_useState["default"])(false),
-      _useState2 = slicedToArray_slicedToArray(_useState, 2),
-      compact = _useState2[0],
-      updateCompact = _useState2[1];
+  var _useSafeState = useSafeState(false),
+      _useSafeState2 = slicedToArray_slicedToArray(_useSafeState, 2),
+      compact = _useSafeState2[0],
+      updateCompact = _useSafeState2[1];
 
   var onResize = function onResize(_ref) {
     var width = _ref.width;
@@ -60270,8 +60385,8 @@ var genPageContainerStyle = function genPageContainerStyle(token) {
     }))
   }, defineProperty_defineProperty(_token$componentCls, '& &-warp-page-header', defineProperty_defineProperty({
     marginBlockEnd: token.marginBlockPageContainerContent / 2,
-    paddingInlineStart: 40,
-    paddingInlineEnd: 40
+    paddingInlineStart: token.marginInlinePageContainerContent,
+    paddingInlineEnd: token.marginInlinePageContainerContent
   }, "& ~ ".concat(token.proComponentsCls, "-grid-content"), defineProperty_defineProperty({}, "".concat(token.proComponentsCls, "-page-container-children-content"), {
     marginBlock: token.marginBlockPageContainerContent / 3
   }))), defineProperty_defineProperty(_token$componentCls, '&-detail', defineProperty_defineProperty({
@@ -61391,7 +61506,7 @@ var AppsLogoComponents = function AppsLogoComponents(props) {
     });
   }, [appList, baseClassName, hashId]);
   if (!(props === null || props === void 0 ? void 0 : (_props$appList = props.appList) === null || _props$appList === void 0 ? void 0 : _props$appList.length)) return null;
-  var popoverOpenProps = compareVersions(external_antd_.version, '4.23.0') ? {
+  var popoverOpenProps = compareVersions(external_antd_.version, '4.23.0') > -1 ? {
     onOpenChange: setOpen
   } : {
     onVisibleChange: function onVisibleChange() {
@@ -61769,7 +61884,13 @@ var genProLayoutBaseMenuStyle = function genProLayoutBaseMenuStyle(token) {
     borderRadius: token.radiusBase
   }), defineProperty_defineProperty(_collapsed, "".concat(token.componentCls, "-group"), defineProperty_defineProperty({}, "".concat(token.antCls, "-menu-item-group-title"), {
     paddingInline: 0
-  })), _collapsed)), defineProperty_defineProperty(_$concat4, '& &-item-title', defineProperty_defineProperty({
+  })), _collapsed)), defineProperty_defineProperty(_$concat4, "".concat(token.componentCls, "-item-icon"), {
+    height: '14px',
+    '.anticon': {
+      lineHeight: '14px',
+      height: '14px'
+    }
+  }), defineProperty_defineProperty(_$concat4, '& &-item-title', defineProperty_defineProperty({
     display: 'flex',
     flexDirection: 'row',
     alignItems: 'center',
@@ -61866,15 +61987,12 @@ var getIcon = function getIcon(icon) {
 
   if (typeof icon === 'string' && icon !== '') {
     if (isUrl(icon) || isImg(icon)) {
-      return (0,jsx_runtime.jsx)(components_Icon, {
-        component: function component() {
-          return (0,jsx_runtime.jsx)("img", {
-            src: icon,
-            alt: "icon",
-            className: className
-          });
-        }
-      });
+      return (0,jsx_runtime.jsx)("img", {
+        width: 16,
+        src: icon,
+        alt: "icon",
+        className: className
+      }, icon);
     }
 
     if (icon.startsWith(iconPrefixes)) {
@@ -61937,7 +62055,7 @@ var MenuUtil = /*#__PURE__*/_createClass(function MenuUtil(props) {
 
       var shouldHasIcon = level === 0 || isGroup && level === 1; //  get defaultTitle by menuItemRender
 
-      var iconDom = getIcon(item.icon, iconPrefixes, "".concat(baseClassName, "-icon ").concat((_this$props2 = _this.props) === null || _this$props2 === void 0 ? void 0 : _this$props2.hashId));
+      var iconDom = getIcon(item.icon, iconPrefixes, "action ".concat(baseClassName, "-icon ").concat((_this$props2 = _this.props) === null || _this$props2 === void 0 ? void 0 : _this$props2.hashId));
       /**
        * 如果没有icon在收起的时候用首字母代替
        */
@@ -62054,7 +62172,7 @@ var MenuUtil = /*#__PURE__*/_createClass(function MenuUtil(props) {
         className: classnames_default()("".concat(baseClassName, "-item-text"), (_this$props12 = _this.props) === null || _this$props12 === void 0 ? void 0 : _this$props12.hashId, defineProperty_defineProperty({}, "".concat(baseClassName, "-item-text-has-icon"), hasIcon && (icon || defaultIcon))),
         children: name
       })]
-    });
+    }, itemPath);
 
     var isHttpUrl = isUrl(itemPath); // Is it a http link
 
@@ -62076,7 +62194,7 @@ var MenuUtil = /*#__PURE__*/_createClass(function MenuUtil(props) {
           className: classnames_default()("".concat(baseClassName, "-item-text"), (_this$props15 = _this.props) === null || _this$props15 === void 0 ? void 0 : _this$props15.hashId, defineProperty_defineProperty({}, "".concat(baseClassName, "-item-text-has-icon"), hasIcon && (icon || defaultIcon))),
           children: name
         })]
-      });
+      }, itemPath);
     }
 
     if (menuItemRender) {
@@ -62941,8 +63059,8 @@ var TopNavHeader = function TopNavHeader(props) {
         hashed: ((_process$env$NODE_ENV = "production") === null || _process$env$NODE_ENV === void 0 ? void 0 : _process$env$NODE_ENV.toLowerCase()) !== 'test',
         override: {
           Menu: {
-            colorItemBg: 'transparent',
-            colorSubItemBg: 'transparent',
+            colorItemBg: header.colorBgHeader || 'transparent',
+            colorSubItemBg: header.colorBgHeader || 'transparent',
             radiusItem: 4,
             colorItemBgSelected: header.colorBgMenuItemSelected || 'rgba(0, 0, 0, 0.04)',
             colorItemBgActive: header.colorBgMenuItemHover || 'rgba(0, 0, 0, 0.04)',
@@ -62975,7 +63093,7 @@ var TopNavHeader = function TopNavHeader(props) {
     }
 
     return defaultDom;
-  }, [hashId, header.colorBgMenuItemHover, header.colorBgMenuItemSelected, header.colorTextMenu, header.colorTextMenuActive, header.colorTextMenuSelected, headerContentRender, prefixCls, props]);
+  }, [hashId, header.colorBgHeader, header.colorBgMenuItemHover, header.colorBgMenuItemSelected, header.colorTextMenu, header.colorTextMenuActive, header.colorTextMenuSelected, headerContentRender, prefixCls, props]);
   return wrapSSR((0,jsx_runtime.jsx)("div", {
     className: classnames_default()(prefixCls, hashId, propsClassName, defineProperty_defineProperty({}, "".concat(prefixCls, "-light"), true)),
     style: style,
@@ -63032,7 +63150,7 @@ var genGlobalHeaderStyle = function genGlobalHeaderStyle(token) {
     marginInlineEnd: 16
   }), defineProperty_defineProperty(_token$componentCls, '&-collapsed-button', {
     minHeight: '22px',
-    color: token.colorTextHeading,
+    color: token.colorHeaderTitle,
     fontSize: '22px',
     marginInlineStart: '16px'
   }), defineProperty_defineProperty(_token$componentCls, '&-logo', {
@@ -63076,7 +63194,8 @@ function GlobalHeader_style_useStyle(prefixCls) {
   return useStyle('pro-layout-global-header', function (token) {
     var GlobalHeaderToken = objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, token), {}, {
       componentCls: ".".concat(prefixCls),
-      heightLayoutHeader: header.heightLayoutHeader
+      heightLayoutHeader: header.heightLayoutHeader,
+      colorHeaderTitle: header.colorHeaderTitle
     });
 
     return [genGlobalHeaderStyle(GlobalHeaderToken)];
@@ -64700,7 +64819,7 @@ var SettingDrawer = function SettingDrawer(props) {
       wrapSSR = _useStyle.wrapSSR,
       hashId = _useStyle.hashId;
 
-  var drawerOpenProps = compareVersions(external_antd_.version, '4.23.0') ? {
+  var drawerOpenProps = compareVersions(external_antd_.version, '4.23.0') > -1 ? {
     open: open,
     onClose: function onClose() {
       return setOpen(false);
@@ -67250,7 +67369,7 @@ var SiderMenuWrapper = function SiderMenuWrapper(props) {
     return null;
   }
 
-  var drawerOpenProps = compareVersions(external_antd_.version, '4.23.0') ? {
+  var drawerOpenProps = compareVersions(external_antd_.version, '4.23.0') > -1 ? {
     open: !collapsed,
     onClose: function onClose() {
       return onCollapse === null || onCollapse === void 0 ? void 0 : onCollapse(true);
@@ -67443,7 +67562,7 @@ var genProLayoutStyle = function genProLayoutStyle(token) {
     display: 'flex',
     flexDirection: 'column',
     width: '100%',
-    backgroundColor: 'transparent',
+    backgroundColor: token.pageContainer.colorBgPageContainer || 'transparent',
     position: 'relative',
     '*': {
       boxSizing: 'border-box'
@@ -70973,7 +71092,7 @@ function container_useContainer() {
     try {
       storage === null || storage === void 0 ? void 0 : storage.removeItem(persistenceKey);
     } catch (error) {
-      console.error(error);
+      console.warn(error);
     }
   }, [props.columnsState]);
   (0,external_React_.useEffect)(function () {
@@ -70994,7 +71113,8 @@ function container_useContainer() {
     try {
       storage === null || storage === void 0 ? void 0 : storage.setItem(persistenceKey, JSON.stringify(columnsMap));
     } catch (error) {
-      console.error(error);
+      console.warn(error);
+      clearPersistenceStorage();
     } // eslint-disable-next-line react-hooks/exhaustive-deps
 
   }, [(_props$columnsState8 = props.columnsState) === null || _props$columnsState8 === void 0 ? void 0 : _props$columnsState8.persistenceKey, columnsMap, (_props$columnsState9 = props.columnsState) === null || _props$columnsState9 === void 0 ? void 0 : _props$columnsState9.persistenceType]);
@@ -71162,7 +71282,7 @@ VerticalAlignBottomOutlined_VerticalAlignBottomOutlined.displayName = 'VerticalA
 
 
 var ColumnSetting_style_genProStyle = function genProStyle(token) {
-  var _overlay, _$concat2, _ref;
+  var _$concat, _overlay, _$concat2, _ref;
 
   return _ref = {}, defineProperty_defineProperty(_ref, token.componentCls, {
     width: 'auto',
@@ -71186,19 +71306,16 @@ var ColumnSetting_style_genProStyle = function genProStyle(token) {
       backgroundColor: 'transparent'
     }), defineProperty_defineProperty(_overlay, "".concat(token.antCls, "-tree-draggable-icon"), {
       cursor: 'grab'
-    }), defineProperty_defineProperty(_overlay, "".concat(token.antCls, "-tree-treenode"), defineProperty_defineProperty({
+    }), defineProperty_defineProperty(_overlay, "".concat(token.antCls, "-tree-treenode"), (_$concat = {
       alignItems: 'center',
-      '&:hover': defineProperty_defineProperty({
-        backgroundColor: token.controlItemBgActive
-      }, "".concat(token.componentCls, "-list-item-option"), {
+      '&:hover': defineProperty_defineProperty({}, "".concat(token.componentCls, "-list-item-option"), {
         display: 'block'
       })
-    }, "".concat(token.antCls, "-tree-checkbox"), {
-      insetBlockStart: 0,
-      marginBlock: 0,
-      marginInline: 0,
+    }, defineProperty_defineProperty(_$concat, "".concat(token.antCls, "-tree-checkbox"), {
       marginInlineEnd: '4px'
-    })), _overlay)
+    }), defineProperty_defineProperty(_$concat, "".concat(token.antCls, "-tree-title"), {
+      width: '100%'
+    }), _$concat)), _overlay)
   }), defineProperty_defineProperty(_ref, "".concat(token.componentCls, "-list"), (_$concat2 = {
     display: 'flex',
     flexDirection: 'column',
@@ -71305,8 +71422,11 @@ var CheckboxListItem = function CheckboxListItem(_ref2) {
       fixed = _ref2.fixed;
   var intl = useIntl();
 
+  var _useToken = useStyle_useToken(),
+      hashId = _useToken.hashId;
+
   var dom = (0,jsx_runtime.jsxs)("span", {
-    className: "".concat(className, "-list-item-option"),
+    className: "".concat(className, "-list-item-option ").concat(hashId),
     children: [(0,jsx_runtime.jsx)(ToolTipIcon, {
       columnKey: columnKey,
       fixed: "left",
@@ -71329,9 +71449,9 @@ var CheckboxListItem = function CheckboxListItem(_ref2) {
   });
 
   return (0,jsx_runtime.jsxs)("span", {
-    className: "".concat(className, "-list-item"),
+    className: "".concat(className, "-list-item ").concat(hashId),
     children: [(0,jsx_runtime.jsx)("div", {
-      className: "".concat(className, "-list-item-title"),
+      className: "".concat(className, "-list-item-title ").concat(hashId),
       children: title
     }), !isLeaf ? dom : null]
   }, columnKey);
@@ -71350,6 +71470,9 @@ var CheckboxList = function CheckboxList(_ref3) {
       _ref3$listHeight = _ref3.listHeight,
       listHeight = _ref3$listHeight === void 0 ? 280 : _ref3$listHeight;
 
+  var _useToken2 = useStyle_useToken(),
+      hashId = _useToken2.hashId;
+
   var _Container$useContain2 = container.useContainer(),
       columnsMap = _Container$useContain2.columnsMap,
       setColumnsMap = _Container$useContain2.setColumnsMap,
@@ -71360,6 +71483,7 @@ var CheckboxList = function CheckboxList(_ref3) {
   var treeDataConfig = (0,external_React_.useMemo)(function () {
     if (!show) return {};
     var checkedKeys = [];
+    var treeMap = new Map();
 
     var loopData = function loopData(data, parentConfig) {
       return data.map(function (_ref4) {
@@ -71375,7 +71499,7 @@ var CheckboxList = function CheckboxList(_ref3) {
           show: true
         };
 
-        if (config.show !== false && (parentConfig === null || parentConfig === void 0 ? void 0 : parentConfig.show) !== false && !children) {
+        if (config.show !== false && !children) {
           checkedKeys.push(columnKey);
         }
 
@@ -71389,16 +71513,26 @@ var CheckboxList = function CheckboxList(_ref3) {
         });
 
         if (children) {
-          item.children = loopData(children, config);
+          var _item$children;
+
+          item.children = loopData(children, config); // 如果children 已经全部是show了，把自己也设置为show
+
+          if ((_item$children = item.children) === null || _item$children === void 0 ? void 0 : _item$children.every(function (childrenItem) {
+            return checkedKeys === null || checkedKeys === void 0 ? void 0 : checkedKeys.includes(childrenItem.key);
+          })) {
+            checkedKeys.push(columnKey);
+          }
         }
 
+        treeMap.set(key, item);
         return item;
       });
     };
 
     return {
       list: loopData(list),
-      keys: checkedKeys
+      keys: checkedKeys,
+      map: treeMap
     };
   }, [columnsMap, list, show]);
   /** 移动到指定的位置 */
@@ -71438,12 +71572,28 @@ var CheckboxList = function CheckboxList(_ref3) {
   /** 选中反选功能 */
 
   var onCheckTree = useRefFunction(function (e) {
-    var columnKey = e.node.key;
+    var newColumnMap = objectSpread2_objectSpread2({}, columnsMap);
+
+    var loopSetShow = function loopSetShow(key) {
+      var _treeDataConfig$map, _treeDataConfig$map$g;
+
+      var newSetting = objectSpread2_objectSpread2({}, newColumnMap[key]);
+
+      newSetting.show = e.checked; // 如果含有子节点，也要选中
+
+      if ((_treeDataConfig$map = treeDataConfig.map) === null || _treeDataConfig$map === void 0 ? void 0 : (_treeDataConfig$map$g = _treeDataConfig$map.get(key)) === null || _treeDataConfig$map$g === void 0 ? void 0 : _treeDataConfig$map$g.children) {
+        var _treeDataConfig$map2, _treeDataConfig$map2$, _treeDataConfig$map2$2;
+
+        (_treeDataConfig$map2 = treeDataConfig.map) === null || _treeDataConfig$map2 === void 0 ? void 0 : (_treeDataConfig$map2$ = _treeDataConfig$map2.get(key)) === null || _treeDataConfig$map2$ === void 0 ? void 0 : (_treeDataConfig$map2$2 = _treeDataConfig$map2$.children) === null || _treeDataConfig$map2$2 === void 0 ? void 0 : _treeDataConfig$map2$2.forEach(function (item) {
+          return loopSetShow(item.key);
+        });
+      }
 
-    var newSetting = objectSpread2_objectSpread2({}, columnsMap[columnKey]);
+      newColumnMap[key] = newSetting;
+    };
 
-    newSetting.show = e.checked;
-    setColumnsMap(objectSpread2_objectSpread2(objectSpread2_objectSpread2({}, columnsMap), {}, defineProperty_defineProperty({}, columnKey, newSetting)));
+    loopSetShow(e.node.key);
+    setColumnsMap(objectSpread2_objectSpread2({}, newColumnMap));
   });
 
   if (!show) {
@@ -71473,6 +71623,7 @@ var CheckboxList = function CheckboxList(_ref3) {
         children: undefined
       });
 
+      if (!node.title) return null;
       return (0,jsx_runtime.jsx)(CheckboxListItem, objectSpread2_objectSpread2(objectSpread2_objectSpread2({
         className: className
       }, node), {}, {
@@ -71486,7 +71637,7 @@ var CheckboxList = function CheckboxList(_ref3) {
 
   return (0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
     children: [showTitle && (0,jsx_runtime.jsx)("span", {
-      className: "".concat(className, "-list-title"),
+      className: "".concat(className, "-list-title ").concat(hashId),
       children: listTitle
     }), listDom]
   });
@@ -71498,6 +71649,10 @@ var GroupCheckboxList = function GroupCheckboxList(_ref5) {
       draggable = _ref5.draggable,
       checkable = _ref5.checkable,
       listsHeight = _ref5.listsHeight;
+
+  var _useToken3 = useStyle_useToken(),
+      hashId = _useToken3.hashId;
+
   var rightList = [];
   var leftList = [];
   var list = [];
@@ -71525,7 +71680,7 @@ var GroupCheckboxList = function GroupCheckboxList(_ref5) {
   var showRight = rightList && rightList.length > 0;
   var showLeft = leftList && leftList.length > 0;
   return (0,jsx_runtime.jsxs)("div", {
-    className: classnames_default()("".concat(className, "-list"), defineProperty_defineProperty({}, "".concat(className, "-list-group"), showRight || showLeft)),
+    className: classnames_default()("".concat(className, "-list"), hashId, defineProperty_defineProperty({}, "".concat(className, "-list-group"), showRight || showLeft)),
     children: [(0,jsx_runtime.jsx)(CheckboxList, {
       title: intl.getMessage('tableToolBar.leftFixedTitle', '固定在左侧'),
       list: leftList,
@@ -71555,7 +71710,8 @@ var GroupCheckboxList = function GroupCheckboxList(_ref5) {
 function ColumnSetting(props) {
   var _props$checkable, _props$draggable;
 
-  var columnRef = (0,external_React_.useRef)({});
+  var columnRef = (0,external_React_.useRef)({}); // 获得当前上下文的 hashID
+
   var counter = container.useContainer();
   var localColumns = props.columns;
   var _props$checkedReset = props.checkedReset,
@@ -71636,12 +71792,13 @@ function ColumnSetting(props) {
   var className = getPrefixCls('pro-table-column-setting');
 
   var _useStyle = ColumnSetting_style_useStyle(className),
-      wrapSSR = _useStyle.wrapSSR;
+      wrapSSR = _useStyle.wrapSSR,
+      hashId = _useStyle.hashId;
 
   return wrapSSR((0,jsx_runtime.jsx)(external_antd_.Popover, {
     arrowPointAtCenter: true,
     title: (0,jsx_runtime.jsxs)("div", {
-      className: "".concat(className, "-title"),
+      className: "".concat(className, "-title ").concat(hashId),
       children: [(0,jsx_runtime.jsx)(external_antd_.Checkbox, {
         indeterminate: indeterminate,
         checked: unCheckedKeys.length === 0 && unCheckedKeys.length !== localColumns.length,
@@ -71659,7 +71816,7 @@ function ColumnSetting(props) {
         children: props.extra
       }) : null]
     }),
-    overlayClassName: "".concat(className, "-overlay"),
+    overlayClassName: "".concat(className, "-overlay ").concat(hashId),
     trigger: "click",
     placement: "bottomRight",
     content: (0,jsx_runtime.jsx)(GroupCheckboxList, {
@@ -80138,7 +80295,7 @@ function conductCheck(keyList, checked, keyEntities, getCheckDisabled) {
  * Developer should confirm it's safe to ignore themselves.
  */
 
-function useSafeState(defaultValue) {
+function useState_useSafeState(defaultValue) {
   var destroyRef = external_React_.useRef(false);
 
   var _React$useState = external_React_.useState(defaultValue),
@@ -80195,7 +80352,7 @@ function useMergedState_useMergedState(defaultStateValue, option) {
       postState = _ref.postState; // ======================= Init =======================
 
 
-  var _useState = useSafeState(function () {
+  var _useState = useState_useSafeState(function () {
     var finalValue = undefined;
     var source;
 
@@ -82085,7 +82242,7 @@ function isActive(step) {
   return step === STEP_ACTIVE || step === STEP_ACTIVATED;
 }
 /* harmony default export */ var useStepQueue = (function (status, callback) {
-  var _useState = useSafeState(STEP_NONE),
+  var _useState = useState_useSafeState(STEP_NONE),
       _useState2 = slicedToArray_slicedToArray(_useState, 2),
       step = _useState2[0],
       setStep = _useState2[1];
@@ -82211,17 +82368,17 @@ function useStatus(supportMotion, visible, getElement, _ref) {
       onLeaveEnd = _ref.onLeaveEnd,
       onVisibleChanged = _ref.onVisibleChanged; // Used for outer render usage to avoid `visible: false & status: none` to render nothing
 
-  var _useState = useSafeState(),
+  var _useState = useState_useSafeState(),
       _useState2 = slicedToArray_slicedToArray(_useState, 2),
       asyncVisible = _useState2[0],
       setAsyncVisible = _useState2[1];
 
-  var _useState3 = useSafeState(STATUS_NONE),
+  var _useState3 = useState_useSafeState(STATUS_NONE),
       _useState4 = slicedToArray_slicedToArray(_useState3, 2),
       status = _useState4[0],
       setStatus = _useState4[1];
 
-  var _useState5 = useSafeState(null),
+  var _useState5 = useState_useSafeState(null),
       _useState6 = slicedToArray_slicedToArray(_useState5, 2),
       style = _useState6[0],
       setStyle = _useState6[1];
@@ -84549,7 +84706,7 @@ RcAlign.displayName = 'Align';
 
 var StatusQueue = ['measure', 'alignPre', 'align', null, 'motion'];
 /* harmony default export */ var useVisibleStatus = (function (visible, doMeasure) {
-  var _useState = useSafeState(null),
+  var _useState = useState_useSafeState(null),
       _useState2 = slicedToArray_slicedToArray(_useState, 2),
       status = _useState2[0],
       setInternalStatus = _useState2[1];
@@ -90152,7 +90309,7 @@ Item.displayName = 'Item';
  */
 
 function useBatchFrameState() {
-  var _useState = useSafeState({}),
+  var _useState = useState_useSafeState({}),
       _useState2 = slicedToArray_slicedToArray(_useState, 2),
       forceUpdate = _useState2[1];
 
@@ -92582,9 +92739,6 @@ function Divider_Divider(_ref) {
 
 
 
-/** @private Only used for antd internal. Do not use in your production. */
-
-var es_useFullPath = useFullPath;
 
 var ExportMenu = es_Menu;
 ExportMenu.Item = es_MenuItem;
@@ -94542,7 +94696,7 @@ function SubMenu_SubMenu(props) {
   var context = external_React_.useContext(menu_MenuContext);
   var prefixCls = context.prefixCls,
       inlineCollapsed = context.inlineCollapsed;
-  var parentPath = es_useFullPath();
+  var parentPath = useFullPath();
   var titleNode;
 
   if (!icon) {
@@ -97094,17 +97248,17 @@ function BaseProList(props) {
 /* harmony default export */ var list_es = ((/* unused pure expression or super */ null && (ProList)));
 ;// CONCATENATED MODULE: ./packages/components/src/version.ts
 var version_version = {
-  "@ant-design/pro-card": "2.0.3",
-  "@ant-design/pro-components": "2.3.5",
-  "@ant-design/pro-descriptions": "2.0.4",
-  "@ant-design/pro-field": "2.0.4",
-  "@ant-design/pro-form": "2.0.4",
-  "@ant-design/pro-layout": "7.0.3",
-  "@ant-design/pro-list": "2.0.4",
-  "@ant-design/pro-provider": "2.0.2",
-  "@ant-design/pro-skeleton": "2.0.2",
-  "@ant-design/pro-table": "3.0.4",
-  "@ant-design/pro-utils": "2.0.2"
+  "@ant-design/pro-card": "2.0.5",
+  "@ant-design/pro-components": "2.3.7",
+  "@ant-design/pro-descriptions": "2.0.6",
+  "@ant-design/pro-field": "2.0.6",
+  "@ant-design/pro-form": "2.0.6",
+  "@ant-design/pro-layout": "7.0.5",
+  "@ant-design/pro-list": "2.0.6",
+  "@ant-design/pro-provider": "2.0.3",
+  "@ant-design/pro-skeleton": "2.0.3",
+  "@ant-design/pro-table": "3.0.6",
+  "@ant-design/pro-utils": "2.0.4"
 };
 ;// CONCATENATED MODULE: ./packages/components/src/index.tsx