wargerm 0.7.67 → 0.7.69

package/dist/components/Checkbox/index.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
-import { CheckboxProps, CheckboxGroupProps } from 'antd/lib/Checkbox';
+import { CheckboxProps } from 'antd';
+import { CheckboxGroupProps } from 'antd/es/checkbox';
 export interface ICheckbox extends CheckboxProps {
 }
 export type IndexComponent = React.FC<ICheckbox> & {

package/dist/components/CheckboxGroup/index.d.ts

@@ -0,0 +1,10 @@
+import { FC } from 'react';
+import { CheckboxGroupProps } from 'antd/es/checkbox';
+export interface ICheckboxGroup extends CheckboxGroupProps {
+    request?: () => Promise<any>;
+    valueEnum?: Record<string, any>;
+    params?: Record<string, any>;
+    onLoad?: (options: Record<string, any>[]) => void;
+}
+declare const WCheckboxGroup: FC<ICheckboxGroup>;
+export default WCheckboxGroup;

package/dist/components/Radio/index.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { RadioProps, RadioGroupProps } from 'antd/lib/Radio';
+import { RadioProps, RadioGroupProps } from 'antd';
 export interface IRadio extends RadioProps {
     sideButtonStyle?: string;
 }

package/dist/components/RadioGroup/index.d.ts

@@ -0,0 +1,10 @@
+import { FC } from 'react';
+import { RadioGroupProps } from 'antd';
+export interface IRadioGroup extends RadioGroupProps {
+    request?: () => Promise<any>;
+    valueEnum?: Record<string, any>;
+    params?: Record<string, any>;
+    onLoad?: (options: Record<string, any>[]) => void;
+}
+declare const WRadioGroup: FC<IRadioGroup>;
+export default WRadioGroup;

package/dist/components/Select/index.d.ts

@@ -1,5 +1,5 @@
 import React, { ReactNode } from 'react';
-import { SelectProps, OptionProps } from 'antd/lib/Select';
+import { OptionProps, SelectProps } from 'antd/es/select';
 export interface IOptionProps extends OptionProps {
 }
 export interface ISelect extends SelectProps<any> {

package/dist/index.d.ts

@@ -16,7 +16,9 @@ export { default as Upload } from './components/Upload';
 export { default as InputNumber } from './components/InputNumber';
 export { default as Table } from './components/Table';
 export { default as Checkbox } from './components/Checkbox';
+export { default as CheckboxGroup } from './components/CheckboxGroup';
 export { default as Radio } from './components/Radio';
+export { default as RadioGroup } from './components/RadioGroup';
 export { default as Select } from './components/Select';
 export { default as RequestRenderDom } from './components/RequestRenderDom';
 export { default as DatePicker } from './components/DatePicker';

package/dist/index.esm.js

@@ -8,6 +8,7 @@ import classnames from 'classnames';
 import zhCN from 'antd/es/date-picker/locale/zh_CN';
 import dayjs, { extend, weekdaysMin } from 'dayjs';
 import 'dayjs/locale/zh-cn';
+import { Checkbox as Checkbox$1 } from 'antd/lib';
 import CountUp from 'react-countup';
 import { Swiper, SwiperSlide } from 'swiper/react';
 import SwiperCore, { Pagination as Pagination$1, Navigation, Autoplay, Virtual } from 'swiper';
@@ -3299,7 +3300,145 @@ var WCascader = function WCascader(props) {
   }, extraProps));
 };
 
-var _excluded$9 = ["columns", "extraColumns", "className", "style", "search", "disabled", "disabledHideInSearch", "disabledRuler", "onFormChange", "onSubmit", "onReset", "setForm", "deps"];
+var _excluded$9 = ["request", "valueEnum", "onLoad", "params"];
+var WRadioGroup = function WRadioGroup(props) {
+  var request = props.request,
+    valueEnum = props.valueEnum,
+    onLoad = props.onLoad,
+    params = props.params,
+    extraProps = _objectWithoutProperties(props, _excluded$9);
+  var _useState = useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    options = _useState2[0],
+    setOptions = _useState2[1];
+  useEffect(function () {
+    var isMounted = true;
+    _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var res;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (!request) {
+              _context.next = 8;
+              break;
+            }
+            _context.next = 3;
+            return request();
+          case 3:
+            res = _context.sent;
+            if (isMounted) {
+              _context.next = 6;
+              break;
+            }
+            return _context.abrupt("return");
+          case 6:
+            setOptions(res);
+            onLoad && onLoad(res);
+          case 8:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }))();
+    var valueEnumOptions = [];
+    if (valueEnum) {
+      for (var key in valueEnum) {
+        var text = '';
+        if (typeof valueEnum[key] === 'string') {
+          text = valueEnum[key];
+        } else {
+          var _valueEnum$key;
+          text = (_valueEnum$key = valueEnum[key]) === null || _valueEnum$key === void 0 ? void 0 : _valueEnum$key.text;
+        }
+        valueEnumOptions.push({
+          label: text,
+          value: key
+        });
+      }
+    }
+    if (!isMounted) return;
+    onLoad && onLoad(valueEnumOptions);
+    setOptions(valueEnumOptions);
+    return function () {
+      isMounted = false;
+    };
+  }, [JSON.stringify(params || {})]);
+  return /*#__PURE__*/React.createElement(Radio.Group, _objectSpread2({
+    options: options
+  }, extraProps));
+};
+WRadioGroup.defaultProps = {};
+
+var _excluded$a = ["request", "valueEnum", "onLoad", "params"];
+var WCheckboxGroup = function WCheckboxGroup(props) {
+  var request = props.request,
+    valueEnum = props.valueEnum,
+    onLoad = props.onLoad,
+    params = props.params,
+    extraProps = _objectWithoutProperties(props, _excluded$a);
+  var _useState = useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    options = _useState2[0],
+    setOptions = _useState2[1];
+  useEffect(function () {
+    var isMounted = true;
+    _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var res;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (!request) {
+              _context.next = 8;
+              break;
+            }
+            _context.next = 3;
+            return request();
+          case 3:
+            res = _context.sent;
+            if (isMounted) {
+              _context.next = 6;
+              break;
+            }
+            return _context.abrupt("return");
+          case 6:
+            setOptions(res);
+            onLoad && onLoad(res);
+          case 8:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }))();
+    var valueEnumOptions = [];
+    if (valueEnum) {
+      for (var key in valueEnum) {
+        var text = '';
+        if (typeof valueEnum[key] === 'string') {
+          text = valueEnum[key];
+        } else {
+          var _valueEnum$key;
+          text = (_valueEnum$key = valueEnum[key]) === null || _valueEnum$key === void 0 ? void 0 : _valueEnum$key.text;
+        }
+        valueEnumOptions.push({
+          label: text,
+          value: key
+        });
+      }
+    }
+    if (!isMounted) return;
+    onLoad && onLoad(valueEnumOptions);
+    setOptions(valueEnumOptions);
+    return function () {
+      isMounted = false;
+    };
+  }, [JSON.stringify(params || {})]);
+  return /*#__PURE__*/React.createElement(Checkbox$1.Group, _objectSpread2({
+    options: options
+  }, extraProps));
+};
+WCheckboxGroup.defaultProps = {};
+
+var _excluded$b = ["columns", "extraColumns", "className", "style", "search", "disabled", "disabledHideInSearch", "disabledRuler", "onFormChange", "onSubmit", "onReset", "setForm", "deps"];
 var RangePicker$2 = Index$6.RangePicker;
 var WForm = function WForm(props, ref) {
   var columns = props.columns,
@@ -3315,7 +3454,7 @@ var WForm = function WForm(props, ref) {
     onReset = props.onReset,
     setForm = props.setForm,
     deps = props.deps,
-    extraProps = _objectWithoutProperties(props, _excluded$9);
+    extraProps = _objectWithoutProperties(props, _excluded$b);
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -3328,11 +3467,31 @@ var WForm = function WForm(props, ref) {
     columnsFields = _useState4[0],
     setColumnsFields = _useState4[1];
   var filterFormColumns = deepCopy(columns).filter(function (c) {
+    if (c.type == 'group') {
+      var _c$children;
+      c.children = (_c$children = c.children) === null || _c$children === void 0 ? void 0 : _c$children.filter(function (itm) {
+        if (disabledHideInSearch) return true;
+        if (itm.hideInSearch || itm.disabledHideInSearch) {
+          return false;
+        }
+        return true;
+      });
+    }
     return !c.hideInSearch || disabledHideInSearch;
   }).sort(function (a, b) {
     return (b.order || 0) - (a.order || 0);
   });
   var filterExtraFormColumns = deepCopy(extraColumns || []).filter(function (c) {
+    if (c.type == 'group') {
+      var _c$children2;
+      c.children = (_c$children2 = c.children) === null || _c$children2 === void 0 ? void 0 : _c$children2.filter(function (itm) {
+        if (disabledHideInSearch) return true;
+        if (itm.hideInSearch || itm.disabledHideInSearch) {
+          return false;
+        }
+        return true;
+      });
+    }
     return !c.hideInSearch || disabledHideInSearch;
   }).sort(function (a, b) {
     return (b.order || 0) - (a.order || 0);
@@ -3544,31 +3703,25 @@ var WForm = function WForm(props, ref) {
         disabled: disabled
       }, _showTime), c.fieldProps))));
     } else if (c.valueType === 'checkbox') {
-      var options = [];
-      if (c.valueEnum) {
-        for (var key in c.valueEnum) {
-          var text = c.valueEnum[key].text;
-          options.push({
-            label: text,
-            value: key
-          });
-        }
-      }
-      if (c.options) {
-        options = c.options;
+      var _extraProps4 = {};
+      if (c.request) {
+        _extraProps4.request = c.request;
+      } else if (c.valueEnum) {
+        _extraProps4.valueEnum = c.valueEnum;
+      } else {
+        _extraProps4.options = c.options;
       }
-      // if (columnsFieldsRef.current) {
-      //   columnsFieldsRef.current[c.dataIndex] = options;
-      // }
-      setColumnsFields(function (preColumnsFields) {
-        return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, options));
-      });
       var _labelCol6 = {};
       if (search && search.labelWidth) {
         _labelCol6.style = {
           width: search.labelWidth
         };
       }
+      if (c.options) {
+        setColumnsFields(function (preColumnsFields) {
+          return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, c.options));
+        });
+      }
       return /*#__PURE__*/React.createElement(Col, _objectSpread2(_objectSpread2({
         className: "pl12 pr12"
       }, colProps), {}, {
@@ -3579,30 +3732,23 @@ var WForm = function WForm(props, ref) {
         name: c.dataIndex,
         label: c.title,
         labelCol: _labelCol6
-      }), /*#__PURE__*/React.createElement(Index$4.Group, _objectSpread2({
-        disabled: disabled,
-        options: options
-      }, c.fieldProps))));
-    } else if (c.valueType === 'radio' || c.valueType === 'radioButton') {
-      var _options = [];
-      if (c.options) {
-        _options = c.options;
-      }
-      if (c.valueEnum) {
-        for (var _key in c.valueEnum) {
-          var _text = c.valueEnum[_key].text;
-          _options.push({
-            label: _text,
-            value: _key
+      }), /*#__PURE__*/React.createElement(WCheckboxGroup, _objectSpread2(_objectSpread2({
+        onLoad: function onLoad(opt) {
+          setColumnsFields(function (preColumnsFields) {
+            return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, opt));
           });
-        }
+        },
+        disabled: disabled
+      }, c.fieldProps), _extraProps4))));
+    } else if (c.valueType === 'radio' || c.valueType === 'radioButton') {
+      var _extraProps5 = {};
+      if (c.request) {
+        _extraProps5.request = c.request;
+      } else if (c.valueEnum) {
+        _extraProps5.valueEnum = c.valueEnum;
+      } else {
+        _extraProps5.options = c.options;
       }
-      // if (columnsFieldsRef.current) {
-      //   columnsFieldsRef.current[c.dataIndex] = options;
-      // }
-      setColumnsFields(function (preColumnsFields) {
-        return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, _options));
-      });
       var _labelCol7 = {};
       if (search && search.labelWidth) {
         _labelCol7.style = {
@@ -3616,6 +3762,11 @@ var WForm = function WForm(props, ref) {
           buttonStyle: 'solid'
         };
       }
+      if (c.options) {
+        setColumnsFields(function (preColumnsFields) {
+          return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, c.options));
+        });
+      }
       return /*#__PURE__*/React.createElement(Col, _objectSpread2(_objectSpread2({
         className: "pl12 pr12"
       }, colProps), {}, {
@@ -3626,19 +3777,22 @@ var WForm = function WForm(props, ref) {
         name: c.dataIndex,
         label: c.title,
         labelCol: _labelCol7
-      }), /*#__PURE__*/React.createElement(Index$3.Group, _objectSpread2(_objectSpread2({
+      }), /*#__PURE__*/React.createElement(WRadioGroup, _objectSpread2(_objectSpread2(_objectSpread2({
+        onLoad: function onLoad(opt) {
+          setColumnsFields(function (preColumnsFields) {
+            return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, opt));
+          });
+        },
         disabled: disabled
-      }, radioButtonProps), {}, {
-        options: _options
-      }, c.fieldProps))));
+      }, radioButtonProps), c.fieldProps), _extraProps5))));
     } else if (c.valueType === 'switch') {
-      var _options2 = [];
+      var options = [];
       if (c.valueEnum) {
-        for (var _key2 in c.valueEnum) {
-          var _text2 = c.valueEnum[_key2].text;
-          _options2.push({
-            label: _text2,
-            value: _key2
+        for (var key in c.valueEnum) {
+          var text = c.valueEnum[key].text;
+          options.push({
+            label: text,
+            value: key
           });
         }
       }
@@ -3652,7 +3806,7 @@ var WForm = function WForm(props, ref) {
       //   columnsFieldsRef.current[c.dataIndex] = options;
       // }
       setColumnsFields(function (preColumnsFields) {
-        return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, _options2));
+        return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, options));
       });
       return /*#__PURE__*/React.createElement(Col, _objectSpread2(_objectSpread2({
         className: "pl12 pr12"
@@ -4011,7 +4165,7 @@ var WForm = function WForm(props, ref) {
 };
 var WForm$1 = /*#__PURE__*/React.forwardRef(WForm);
 
-var _excluded$a = ["columns", "dataSource", "request", "onLoad", "params", "onSubmit", "rowKey", "onRow", "className", "rowClassName", "rowSelection", "style", "tbodyStyle", "thStyle", "border", "scroll", "pagination", "search", "frameBoxTable", "frameBoxDirection", "formRef", "none"];
+var _excluded$c = ["columns", "dataSource", "request", "onLoad", "params", "onSubmit", "rowKey", "onRow", "className", "rowClassName", "rowSelection", "style", "tbodyStyle", "thStyle", "border", "scroll", "pagination", "search", "frameBoxTable", "frameBoxDirection", "formRef", "none"];
 function Table(_ref) {
   var _formSearchRef$curren4, _columns$, _columns$2;
   var columns = _ref.columns,
@@ -4042,7 +4196,7 @@ function Table(_ref) {
     frameBoxDirection = _ref$frameBoxDirectio === void 0 ? 'out' : _ref$frameBoxDirectio,
     formRef = _ref.formRef,
     none = _ref.none,
-    props = _objectWithoutProperties(_ref, _excluded$a);
+    props = _objectWithoutProperties(_ref, _excluded$c);
   var _useState = useState(_toConsumableArray((rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRowKeys) || [])),
     _useState2 = _slicedToArray(_useState, 2),
     selectedRowKeys = _useState2[0],
@@ -4529,7 +4683,7 @@ Table.defaultProps = {
 };
 var index = /*#__PURE__*/memo(Table);
 
-var _excluded$b = ["value", "renderDom", "onLoad", "params", "onChange", "request"];
+var _excluded$d = ["value", "renderDom", "onLoad", "params", "onChange", "request"];
 function Index$8(props, ref) {
   var value = props.value,
     renderDom = props.renderDom,
@@ -4537,7 +4691,7 @@ function Index$8(props, ref) {
     params = props.params,
     onChange = props.onChange,
     request = props.request,
-    rest = _objectWithoutProperties(props, _excluded$b);
+    rest = _objectWithoutProperties(props, _excluded$d);
   var _useState = useState(''),
     _useState2 = _slicedToArray(_useState, 2),
     areaValue = _useState2[0],
@@ -4592,7 +4746,7 @@ function Index$8(props, ref) {
 }
 var index$1 = /*#__PURE__*/React.forwardRef(Index$8);
 
-var _excluded$c = ["height", "width", "count", "style", "numberStyle"],
+var _excluded$e = ["height", "width", "count", "style", "numberStyle"],
   _excluded2$2 = ["count", "numberCount", "width", "height", "marginRight"];
 var Number$1 = function Number(_ref) {
   var height = _ref.height,
@@ -4601,7 +4755,7 @@ var Number$1 = function Number(_ref) {
     count = _ref$count === void 0 ? 0 : _ref$count,
     style = _ref.style,
     numberStyle = _ref.numberStyle,
-    props = _objectWithoutProperties(_ref, _excluded$c);
+    props = _objectWithoutProperties(_ref, _excluded$e);
   // 上次的值
   var _useState = useState(0),
     _useState2 = _slicedToArray(_useState, 2),
@@ -4751,12 +4905,12 @@ var Index$9 = function Index(props) {
   }));
 };
 
-var _excluded$d = ["duration", "className"];
+var _excluded$f = ["duration", "className"];
 var Index$a = function Index(props) {
   var _props$duration = props.duration,
     duration = _props$duration === void 0 ? 2.75 : _props$duration,
     className = props.className,
-    extraProps = _objectWithoutProperties(props, _excluded$d);
+    extraProps = _objectWithoutProperties(props, _excluded$f);
   return /*#__PURE__*/React.createElement(CountUp, _objectSpread2(_objectSpread2({
     duration: duration
   }, extraProps), {}, {
@@ -4765,7 +4919,7 @@ var Index$a = function Index(props) {
 };
 Index$a.defaultProps = {};
 
-var _excluded$e = ["list", "render", "none", "partSize"];
+var _excluded$g = ["list", "render", "none", "partSize"];
 function AutoScroll(props) {
   var inner1 = useRef();
   var inner2 = useRef();
@@ -4842,7 +4996,7 @@ var Index$b = function Index(_ref) {
     none = _ref.none,
     _ref$partSize = _ref.partSize,
     partSize = _ref$partSize === void 0 ? 4 : _ref$partSize,
-    otherProps = _objectWithoutProperties(_ref, _excluded$e);
+    otherProps = _objectWithoutProperties(_ref, _excluded$g);
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     partA = _useState2[0],
@@ -4916,7 +5070,7 @@ var Index$b = function Index(_ref) {
   }, none || '暂无数据'));
 };
 
-var _excluded$f = ["data", "onClick", "slidesPerView", "rowKey", "onSwiperChange", "renderItem", "noMove"];
+var _excluded$h = ["data", "onClick", "slidesPerView", "rowKey", "onSwiperChange", "renderItem", "noMove"];
 // install Swiper modules
 SwiperCore.use([Pagination$1, Navigation, Autoplay, Virtual]);
 var Index$c = /*#__PURE__*/forwardRef(function (props, ref) {
@@ -4928,7 +5082,7 @@ var Index$c = /*#__PURE__*/forwardRef(function (props, ref) {
     onSwiperChange = props.onSwiperChange,
     renderItem = props.renderItem,
     noMove = props.noMove,
-    extraProps = _objectWithoutProperties(props, _excluded$f);
+    extraProps = _objectWithoutProperties(props, _excluded$h);
   var _useState = useState(null),
     _useState2 = _slicedToArray(_useState, 2),
     controlledSwiper = _useState2[0],
@@ -5577,7 +5731,7 @@ function createBrowserHistory(props) {
   return history;
 }
 
-var _excluded$g = ["routes", "className"];
+var _excluded$i = ["routes", "className"];
 var history = createBrowserHistory();
 function itemRender(route, params, routes, paths) {
   var last = routes.indexOf(route) === routes.length - 1;
@@ -5593,7 +5747,7 @@ function itemRender(route, params, routes, paths) {
 var Index$d = function Index(_ref) {
   var routes = _ref.routes,
     className = _ref.className,
-    props = _objectWithoutProperties(_ref, _excluded$g);
+    props = _objectWithoutProperties(_ref, _excluded$i);
   return /*#__PURE__*/React.createElement(Breadcrumb, _objectSpread2({
     className: className || 'default',
     separator: ">>",
@@ -5602,7 +5756,7 @@ var Index$d = function Index(_ref) {
   }, props));
 };
 
-var _excluded$h = ["title", "className", "headerTail", "headerCenter", "sliderTabs"];
+var _excluded$j = ["title", "className", "headerTail", "headerCenter", "sliderTabs"];
 var Index$e = function Index(_ref, ref) {
   var _sliderTabs$component, _sliderTabs$tabs;
   var title = _ref.title,
@@ -5611,7 +5765,7 @@ var Index$e = function Index(_ref, ref) {
     headerTail = _ref.headerTail,
     headerCenter = _ref.headerCenter,
     sliderTabs = _ref.sliderTabs,
-    props = _objectWithoutProperties(_ref, _excluded$h);
+    props = _objectWithoutProperties(_ref, _excluded$j);
   useImperativeHandle(ref, function () {
     return {
       activeTab: activeTab
@@ -5827,7 +5981,7 @@ function DialogModel(props, ref) {
 }
 var Dialog = /*#__PURE__*/React.forwardRef(DialogModel);
 
-var _excluded$i = ["open", "width", "closeCb", "onClose", "className", "style", "isDrag", "wrapClassName"],
+var _excluded$k = ["open", "width", "closeCb", "onClose", "className", "style", "isDrag", "wrapClassName"],
   _excluded2$3 = ["open"];
 var Modal = /*#__PURE__*/function (_React$PureComponent) {
   _inherits(Modal, _React$PureComponent);
@@ -5959,7 +6113,7 @@ var Modal = /*#__PURE__*/function (_React$PureComponent) {
         style = _this$props4.style,
         isDrag = _this$props4.isDrag,
         wrapClassName = _this$props4.wrapClassName,
-        other = _objectWithoutProperties(_this$props4, _excluded$i);
+        other = _objectWithoutProperties(_this$props4, _excluded$k);
       return /*#__PURE__*/React.createElement(Dialog, _objectSpread2({
         ref: this.containerRef,
         closeCb: closeCb,
@@ -6124,7 +6278,7 @@ function DialogModel$1(props) {
   return renderChildren;
 }
 
-var _excluded$j = ["open"];
+var _excluded$l = ["open"];
 var Modal$1 = /*#__PURE__*/function (_React$PureComponent) {
   _inherits(Modal, _React$PureComponent);
   var _super = _createSuper(Modal);
@@ -6246,7 +6400,7 @@ Modal$1.show = function (config) {
       setShow = _useState2[1];
     manager.setShow = setShow;
     var open = props.open,
-      trueProps = _objectWithoutProperties(props, _excluded$j);
+      trueProps = _objectWithoutProperties(props, _excluded$l);
     useEffect(function () {
       manager.mounted = true;
       setShow(open);
@@ -6418,7 +6572,7 @@ function DragBox(_ref) {
   }, children))) : ( /*#__PURE__*/React.createElement(React.Fragment, null));
 }
 
-var _excluded$k = ["columns", "extraColumns", "search", "open", "setOpen", "modalFormOpend", "disabled", "submitMethod", "onSubmitSuccess", "title", "record", "onFormChange", "formItemChild", "onCancel", "modalHeaderSlot", "modalFooterSlot", "formProps"];
+var _excluded$m = ["columns", "extraColumns", "search", "open", "setOpen", "modalFormOpend", "disabled", "submitMethod", "onSubmitSuccess", "title", "record", "onFormChange", "formItemChild", "onCancel", "modalHeaderSlot", "modalFooterSlot", "formProps"];
 var ModalForm = function ModalForm(props, ref) {
   var columns = props.columns,
     extraColumns = props.extraColumns,
@@ -6437,7 +6591,7 @@ var ModalForm = function ModalForm(props, ref) {
     modalHeaderSlot = props.modalHeaderSlot,
     modalFooterSlot = props.modalFooterSlot,
     formProps = props.formProps,
-    extraProps = _objectWithoutProperties(props, _excluded$k);
+    extraProps = _objectWithoutProperties(props, _excluded$m);
   var formRef = useRef(null);
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -6562,7 +6716,7 @@ var ModalForm = function ModalForm(props, ref) {
 };
 var ModalForm$1 = /*#__PURE__*/React.forwardRef(ModalForm);
 
-var _excluded$l = ["columns", "extraColumns", "request", "modalFormSearch", "search", "tableAction", "filterAction", "renderTableBar", "renderTableBarDeps", "className", "style", "onFormChange", "modalConfig", "searchFormConfig", "optionColumnConfig", "pagination", "noBordered", "showIndex", "searchTableSlot"];
+var _excluded$n = ["columns", "extraColumns", "request", "modalFormSearch", "search", "tableAction", "filterAction", "renderTableBar", "renderTableBarDeps", "className", "style", "onFormChange", "modalConfig", "searchFormConfig", "optionColumnConfig", "pagination", "noBordered", "showIndex", "searchTableSlot"];
 var TabelCard = function TabelCard(props, ref) {
   var columns = props.columns,
     extraColumns = props.extraColumns,
@@ -6586,7 +6740,7 @@ var TabelCard = function TabelCard(props, ref) {
     noBordered = props.noBordered,
     showIndex = props.showIndex,
     searchTableSlot = props.searchTableSlot,
-    extraProps = _objectWithoutProperties(props, _excluded$l);
+    extraProps = _objectWithoutProperties(props, _excluded$n);
   var actionRef = useRef();
   var modalFormRef = useRef(null);
   var searchFormRef = useRef(null);
@@ -10842,7 +10996,7 @@ function DhPlayer(_ref, ref) {
 }
 var index$6 = /*#__PURE__*/forwardRef(DhPlayer);
 
-var _excluded$m = ["id", "videoUrls", "definitionList", "isLoop", "muted", "currentIndex", "setCurrentIndex", "className", "style", "open", "autoplay", "videoInit", "enableMemory", "lastPlayTimeHideDelay"];
+var _excluded$o = ["id", "videoUrls", "definitionList", "isLoop", "muted", "currentIndex", "setCurrentIndex", "className", "style", "open", "autoplay", "videoInit", "enableMemory", "lastPlayTimeHideDelay"];
 // 默认速度控制
 var DEFAULT_PLAY_BACK_RATE = [0.5, 0.75, 1, 1.5, 2];
 // 默认记忆提示文字展示时长(s)
@@ -10873,7 +11027,7 @@ var index$7 = (function (_ref) {
     enableMemory = _ref$enableMemory === void 0 ? false : _ref$enableMemory,
     _ref$lastPlayTimeHide = _ref.lastPlayTimeHideDelay,
     lastPlayTimeHideDelay = _ref$lastPlayTimeHide === void 0 ? DEFAULT_LAST_PLAY_TIME_DELAY : _ref$lastPlayTimeHide,
-    props = _objectWithoutProperties(_ref, _excluded$m);
+    props = _objectWithoutProperties(_ref, _excluded$o);
   var player = useRef();
   var currentPlayerIndex = useRef(0);
   // 内置的 index 状态管理
@@ -11043,7 +11197,7 @@ var index$7 = (function (_ref) {
   });
 });
 
-var _excluded$n = ["className", "frameStyle", "style", "direction", "children"];
+var _excluded$p = ["className", "frameStyle", "style", "direction", "children"];
 function FrameBox$1(_ref) {
   var className = _ref.className,
     frameStyle = _ref.frameStyle,
@@ -11051,7 +11205,7 @@ function FrameBox$1(_ref) {
     _ref$direction = _ref.direction,
     direction = _ref$direction === void 0 ? 'in' : _ref$direction,
     children = _ref.children,
-    props = _objectWithoutProperties(_ref, _excluded$n);
+    props = _objectWithoutProperties(_ref, _excluded$p);
   return /*#__PURE__*/React.createElement("div", _objectSpread2({
     className: classnames(_defineProperty(_defineProperty({}, 'frame', true), className || '', true)),
     style: style
@@ -11078,7 +11232,7 @@ function FrameBox$1(_ref) {
   }), children);
 }
 
-var _excluded$o = ["columns", "dataSource", "request", "onLoad", "params", "onSubmit", "rowKey", "onRow", "className", "rowClassName", "rowSelection", "style", "tbodyStyle", "thStyle", "border", "scroll", "pagination", "search", "frameBoxTable", "frameBoxDirection", "formRef", "none"];
+var _excluded$q = ["columns", "dataSource", "request", "onLoad", "params", "onSubmit", "rowKey", "onRow", "className", "rowClassName", "rowSelection", "style", "tbodyStyle", "thStyle", "border", "scroll", "pagination", "search", "frameBoxTable", "frameBoxDirection", "formRef", "none"];
 function NtTable(_ref, ref) {
   var _formSearchRef$curren4, _columns$, _columns$2;
   var columns = _ref.columns,
@@ -11109,7 +11263,7 @@ function NtTable(_ref, ref) {
     frameBoxDirection = _ref$frameBoxDirectio === void 0 ? 'out' : _ref$frameBoxDirectio,
     formRef = _ref.formRef,
     none = _ref.none,
-    props = _objectWithoutProperties(_ref, _excluded$o);
+    props = _objectWithoutProperties(_ref, _excluded$q);
   var _useState = useState(_toConsumableArray((rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRowKeys) || [])),
     _useState2 = _slicedToArray(_useState, 2),
     selectedRowKeys = _useState2[0],
@@ -12365,7 +12519,7 @@ function WaterLevelCharts(config) {
 /*
  * @Author: lijin
  * @Date: 2021-09-09 11:02:54
- * @LastEditTime: 2023-09-18 17:44:13
+ * @LastEditTime: 2023-12-25 19:04:08
  * @LastEditors: lijin
  * @Description:
  * @FilePath: \wargerm\src\index.ts
@@ -12377,4 +12531,4 @@ if (REACT_APP_ENV == 'development') {
   document.documentElement.setAttribute(COLOR_ATTR_NAME, 'sd');
 }
 
-export { Index$b as AutoScroll, Index$d as Breadcrumb, WButton as Button, index$4 as Calendar, index$2 as Card, WCascader as Cascader, Index$4 as Checkbox, Index$a as CountUp, Index$2 as DatePicker, index$6 as DhPlayer, DragBox, IconFont, Index as Input, WInputNumber as InputNumber, LineEcharts, Modal, ModalForm$1 as ModalForm, Modal$1 as ModalTips, index$8 as NtTable, Index$9 as Number, NumericInput, Index$3 as Radio, index$1 as RequestRenderDom, Index$5 as Select, Index$c as Swiper, WSwitch as Switch, index$3 as TabelCard, index as Table, TableEdit, Index$7 as TreeSelect, Upload, index$7 as Video, index$5 as VideoPlayer, Index$6 as WDatePicker, WForm$1 as WForm, WaterLevelCharts, WebsocketHeart, useEventEmitter, useStateWithCall, wTracing, create as whox, wmox };
+export { Index$b as AutoScroll, Index$d as Breadcrumb, WButton as Button, index$4 as Calendar, index$2 as Card, WCascader as Cascader, Index$4 as Checkbox, WCheckboxGroup as CheckboxGroup, Index$a as CountUp, Index$2 as DatePicker, index$6 as DhPlayer, DragBox, IconFont, Index as Input, WInputNumber as InputNumber, LineEcharts, Modal, ModalForm$1 as ModalForm, Modal$1 as ModalTips, index$8 as NtTable, Index$9 as Number, NumericInput, Index$3 as Radio, WRadioGroup as RadioGroup, index$1 as RequestRenderDom, Index$5 as Select, Index$c as Swiper, WSwitch as Switch, index$3 as TabelCard, index as Table, TableEdit, Index$7 as TreeSelect, Upload, index$7 as Video, index$5 as VideoPlayer, Index$6 as WDatePicker, WForm$1 as WForm, WaterLevelCharts, WebsocketHeart, useEventEmitter, useStateWithCall, wTracing, create as whox, wmox };

package/dist/index.js

@@ -12,6 +12,7 @@ var classnames = require('classnames');
 var zhCN = require('antd/es/date-picker/locale/zh_CN');
 var dayjs = require('dayjs');
 require('dayjs/locale/zh-cn');
+var lib = require('antd/lib');
 var CountUp = require('react-countup');
 var react = require('swiper/react');
 var SwiperCore = require('swiper');
@@ -3343,7 +3344,145 @@ var WCascader = function WCascader(props) {
   }, extraProps));
 };
 
-var _excluded$9 = ["columns", "extraColumns", "className", "style", "search", "disabled", "disabledHideInSearch", "disabledRuler", "onFormChange", "onSubmit", "onReset", "setForm", "deps"];
+var _excluded$9 = ["request", "valueEnum", "onLoad", "params"];
+var WRadioGroup = function WRadioGroup(props) {
+  var request = props.request,
+    valueEnum = props.valueEnum,
+    onLoad = props.onLoad,
+    params = props.params,
+    extraProps = _objectWithoutProperties(props, _excluded$9);
+  var _useState = React.useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    options = _useState2[0],
+    setOptions = _useState2[1];
+  React.useEffect(function () {
+    var isMounted = true;
+    _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var res;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (!request) {
+              _context.next = 8;
+              break;
+            }
+            _context.next = 3;
+            return request();
+          case 3:
+            res = _context.sent;
+            if (isMounted) {
+              _context.next = 6;
+              break;
+            }
+            return _context.abrupt("return");
+          case 6:
+            setOptions(res);
+            onLoad && onLoad(res);
+          case 8:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }))();
+    var valueEnumOptions = [];
+    if (valueEnum) {
+      for (var key in valueEnum) {
+        var text = '';
+        if (typeof valueEnum[key] === 'string') {
+          text = valueEnum[key];
+        } else {
+          var _valueEnum$key;
+          text = (_valueEnum$key = valueEnum[key]) === null || _valueEnum$key === void 0 ? void 0 : _valueEnum$key.text;
+        }
+        valueEnumOptions.push({
+          label: text,
+          value: key
+        });
+      }
+    }
+    if (!isMounted) return;
+    onLoad && onLoad(valueEnumOptions);
+    setOptions(valueEnumOptions);
+    return function () {
+      isMounted = false;
+    };
+  }, [JSON.stringify(params || {})]);
+  return /*#__PURE__*/React__default['default'].createElement(antd.Radio.Group, _objectSpread2({
+    options: options
+  }, extraProps));
+};
+WRadioGroup.defaultProps = {};
+
+var _excluded$a = ["request", "valueEnum", "onLoad", "params"];
+var WCheckboxGroup = function WCheckboxGroup(props) {
+  var request = props.request,
+    valueEnum = props.valueEnum,
+    onLoad = props.onLoad,
+    params = props.params,
+    extraProps = _objectWithoutProperties(props, _excluded$a);
+  var _useState = React.useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    options = _useState2[0],
+    setOptions = _useState2[1];
+  React.useEffect(function () {
+    var isMounted = true;
+    _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var res;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (!request) {
+              _context.next = 8;
+              break;
+            }
+            _context.next = 3;
+            return request();
+          case 3:
+            res = _context.sent;
+            if (isMounted) {
+              _context.next = 6;
+              break;
+            }
+            return _context.abrupt("return");
+          case 6:
+            setOptions(res);
+            onLoad && onLoad(res);
+          case 8:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }))();
+    var valueEnumOptions = [];
+    if (valueEnum) {
+      for (var key in valueEnum) {
+        var text = '';
+        if (typeof valueEnum[key] === 'string') {
+          text = valueEnum[key];
+        } else {
+          var _valueEnum$key;
+          text = (_valueEnum$key = valueEnum[key]) === null || _valueEnum$key === void 0 ? void 0 : _valueEnum$key.text;
+        }
+        valueEnumOptions.push({
+          label: text,
+          value: key
+        });
+      }
+    }
+    if (!isMounted) return;
+    onLoad && onLoad(valueEnumOptions);
+    setOptions(valueEnumOptions);
+    return function () {
+      isMounted = false;
+    };
+  }, [JSON.stringify(params || {})]);
+  return /*#__PURE__*/React__default['default'].createElement(lib.Checkbox.Group, _objectSpread2({
+    options: options
+  }, extraProps));
+};
+WCheckboxGroup.defaultProps = {};
+
+var _excluded$b = ["columns", "extraColumns", "className", "style", "search", "disabled", "disabledHideInSearch", "disabledRuler", "onFormChange", "onSubmit", "onReset", "setForm", "deps"];
 var RangePicker$2 = Index$6.RangePicker;
 var WForm = function WForm(props, ref) {
   var columns = props.columns,
@@ -3359,7 +3498,7 @@ var WForm = function WForm(props, ref) {
     onReset = props.onReset,
     setForm = props.setForm,
     deps = props.deps,
-    extraProps = _objectWithoutProperties(props, _excluded$9);
+    extraProps = _objectWithoutProperties(props, _excluded$b);
   var _Form$useForm = antd.Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -3372,11 +3511,31 @@ var WForm = function WForm(props, ref) {
     columnsFields = _useState4[0],
     setColumnsFields = _useState4[1];
   var filterFormColumns = deepCopy(columns).filter(function (c) {
+    if (c.type == 'group') {
+      var _c$children;
+      c.children = (_c$children = c.children) === null || _c$children === void 0 ? void 0 : _c$children.filter(function (itm) {
+        if (disabledHideInSearch) return true;
+        if (itm.hideInSearch || itm.disabledHideInSearch) {
+          return false;
+        }
+        return true;
+      });
+    }
     return !c.hideInSearch || disabledHideInSearch;
   }).sort(function (a, b) {
     return (b.order || 0) - (a.order || 0);
   });
   var filterExtraFormColumns = deepCopy(extraColumns || []).filter(function (c) {
+    if (c.type == 'group') {
+      var _c$children2;
+      c.children = (_c$children2 = c.children) === null || _c$children2 === void 0 ? void 0 : _c$children2.filter(function (itm) {
+        if (disabledHideInSearch) return true;
+        if (itm.hideInSearch || itm.disabledHideInSearch) {
+          return false;
+        }
+        return true;
+      });
+    }
     return !c.hideInSearch || disabledHideInSearch;
   }).sort(function (a, b) {
     return (b.order || 0) - (a.order || 0);
@@ -3588,31 +3747,25 @@ var WForm = function WForm(props, ref) {
         disabled: disabled
       }, _showTime), c.fieldProps))));
     } else if (c.valueType === 'checkbox') {
-      var options = [];
-      if (c.valueEnum) {
-        for (var key in c.valueEnum) {
-          var text = c.valueEnum[key].text;
-          options.push({
-            label: text,
-            value: key
-          });
-        }
-      }
-      if (c.options) {
-        options = c.options;
+      var _extraProps4 = {};
+      if (c.request) {
+        _extraProps4.request = c.request;
+      } else if (c.valueEnum) {
+        _extraProps4.valueEnum = c.valueEnum;
+      } else {
+        _extraProps4.options = c.options;
       }
-      // if (columnsFieldsRef.current) {
-      //   columnsFieldsRef.current[c.dataIndex] = options;
-      // }
-      setColumnsFields(function (preColumnsFields) {
-        return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, options));
-      });
       var _labelCol6 = {};
       if (search && search.labelWidth) {
         _labelCol6.style = {
           width: search.labelWidth
         };
       }
+      if (c.options) {
+        setColumnsFields(function (preColumnsFields) {
+          return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, c.options));
+        });
+      }
       return /*#__PURE__*/React__default['default'].createElement(antd.Col, _objectSpread2(_objectSpread2({
         className: "pl12 pr12"
       }, colProps), {}, {
@@ -3623,30 +3776,23 @@ var WForm = function WForm(props, ref) {
         name: c.dataIndex,
         label: c.title,
         labelCol: _labelCol6
-      }), /*#__PURE__*/React__default['default'].createElement(Index$4.Group, _objectSpread2({
-        disabled: disabled,
-        options: options
-      }, c.fieldProps))));
-    } else if (c.valueType === 'radio' || c.valueType === 'radioButton') {
-      var _options = [];
-      if (c.options) {
-        _options = c.options;
-      }
-      if (c.valueEnum) {
-        for (var _key in c.valueEnum) {
-          var _text = c.valueEnum[_key].text;
-          _options.push({
-            label: _text,
-            value: _key
+      }), /*#__PURE__*/React__default['default'].createElement(WCheckboxGroup, _objectSpread2(_objectSpread2({
+        onLoad: function onLoad(opt) {
+          setColumnsFields(function (preColumnsFields) {
+            return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, opt));
           });
-        }
+        },
+        disabled: disabled
+      }, c.fieldProps), _extraProps4))));
+    } else if (c.valueType === 'radio' || c.valueType === 'radioButton') {
+      var _extraProps5 = {};
+      if (c.request) {
+        _extraProps5.request = c.request;
+      } else if (c.valueEnum) {
+        _extraProps5.valueEnum = c.valueEnum;
+      } else {
+        _extraProps5.options = c.options;
       }
-      // if (columnsFieldsRef.current) {
-      //   columnsFieldsRef.current[c.dataIndex] = options;
-      // }
-      setColumnsFields(function (preColumnsFields) {
-        return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, _options));
-      });
       var _labelCol7 = {};
       if (search && search.labelWidth) {
         _labelCol7.style = {
@@ -3660,6 +3806,11 @@ var WForm = function WForm(props, ref) {
           buttonStyle: 'solid'
         };
       }
+      if (c.options) {
+        setColumnsFields(function (preColumnsFields) {
+          return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, c.options));
+        });
+      }
       return /*#__PURE__*/React__default['default'].createElement(antd.Col, _objectSpread2(_objectSpread2({
         className: "pl12 pr12"
       }, colProps), {}, {
@@ -3670,19 +3821,22 @@ var WForm = function WForm(props, ref) {
         name: c.dataIndex,
         label: c.title,
         labelCol: _labelCol7
-      }), /*#__PURE__*/React__default['default'].createElement(Index$3.Group, _objectSpread2(_objectSpread2({
+      }), /*#__PURE__*/React__default['default'].createElement(WRadioGroup, _objectSpread2(_objectSpread2(_objectSpread2({
+        onLoad: function onLoad(opt) {
+          setColumnsFields(function (preColumnsFields) {
+            return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, opt));
+          });
+        },
         disabled: disabled
-      }, radioButtonProps), {}, {
-        options: _options
-      }, c.fieldProps))));
+      }, radioButtonProps), c.fieldProps), _extraProps5))));
     } else if (c.valueType === 'switch') {
-      var _options2 = [];
+      var options = [];
       if (c.valueEnum) {
-        for (var _key2 in c.valueEnum) {
-          var _text2 = c.valueEnum[_key2].text;
-          _options2.push({
-            label: _text2,
-            value: _key2
+        for (var key in c.valueEnum) {
+          var text = c.valueEnum[key].text;
+          options.push({
+            label: text,
+            value: key
           });
         }
       }
@@ -3696,7 +3850,7 @@ var WForm = function WForm(props, ref) {
       //   columnsFieldsRef.current[c.dataIndex] = options;
       // }
       setColumnsFields(function (preColumnsFields) {
-        return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, _options2));
+        return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, options));
       });
       return /*#__PURE__*/React__default['default'].createElement(antd.Col, _objectSpread2(_objectSpread2({
         className: "pl12 pr12"
@@ -4055,7 +4209,7 @@ var WForm = function WForm(props, ref) {
 };
 var WForm$1 = /*#__PURE__*/React__default['default'].forwardRef(WForm);
 
-var _excluded$a = ["columns", "dataSource", "request", "onLoad", "params", "onSubmit", "rowKey", "onRow", "className", "rowClassName", "rowSelection", "style", "tbodyStyle", "thStyle", "border", "scroll", "pagination", "search", "frameBoxTable", "frameBoxDirection", "formRef", "none"];
+var _excluded$c = ["columns", "dataSource", "request", "onLoad", "params", "onSubmit", "rowKey", "onRow", "className", "rowClassName", "rowSelection", "style", "tbodyStyle", "thStyle", "border", "scroll", "pagination", "search", "frameBoxTable", "frameBoxDirection", "formRef", "none"];
 function Table(_ref) {
   var _formSearchRef$curren4, _columns$, _columns$2;
   var columns = _ref.columns,
@@ -4086,7 +4240,7 @@ function Table(_ref) {
     frameBoxDirection = _ref$frameBoxDirectio === void 0 ? 'out' : _ref$frameBoxDirectio,
     formRef = _ref.formRef,
     none = _ref.none,
-    props = _objectWithoutProperties(_ref, _excluded$a);
+    props = _objectWithoutProperties(_ref, _excluded$c);
   var _useState = React.useState(_toConsumableArray((rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRowKeys) || [])),
     _useState2 = _slicedToArray(_useState, 2),
     selectedRowKeys = _useState2[0],
@@ -4573,7 +4727,7 @@ Table.defaultProps = {
 };
 var index = /*#__PURE__*/React.memo(Table);
 
-var _excluded$b = ["value", "renderDom", "onLoad", "params", "onChange", "request"];
+var _excluded$d = ["value", "renderDom", "onLoad", "params", "onChange", "request"];
 function Index$8(props, ref) {
   var value = props.value,
     renderDom = props.renderDom,
@@ -4581,7 +4735,7 @@ function Index$8(props, ref) {
     params = props.params,
     onChange = props.onChange,
     request = props.request,
-    rest = _objectWithoutProperties(props, _excluded$b);
+    rest = _objectWithoutProperties(props, _excluded$d);
   var _useState = React.useState(''),
     _useState2 = _slicedToArray(_useState, 2),
     areaValue = _useState2[0],
@@ -4636,7 +4790,7 @@ function Index$8(props, ref) {
 }
 var index$1 = /*#__PURE__*/React__default['default'].forwardRef(Index$8);
 
-var _excluded$c = ["height", "width", "count", "style", "numberStyle"],
+var _excluded$e = ["height", "width", "count", "style", "numberStyle"],
   _excluded2$2 = ["count", "numberCount", "width", "height", "marginRight"];
 var Number$1 = function Number(_ref) {
   var height = _ref.height,
@@ -4645,7 +4799,7 @@ var Number$1 = function Number(_ref) {
     count = _ref$count === void 0 ? 0 : _ref$count,
     style = _ref.style,
     numberStyle = _ref.numberStyle,
-    props = _objectWithoutProperties(_ref, _excluded$c);
+    props = _objectWithoutProperties(_ref, _excluded$e);
   // 上次的值
   var _useState = React.useState(0),
     _useState2 = _slicedToArray(_useState, 2),
@@ -4795,12 +4949,12 @@ var Index$9 = function Index(props) {
   }));
 };
 
-var _excluded$d = ["duration", "className"];
+var _excluded$f = ["duration", "className"];
 var Index$a = function Index(props) {
   var _props$duration = props.duration,
     duration = _props$duration === void 0 ? 2.75 : _props$duration,
     className = props.className,
-    extraProps = _objectWithoutProperties(props, _excluded$d);
+    extraProps = _objectWithoutProperties(props, _excluded$f);
   return /*#__PURE__*/React__default['default'].createElement(CountUp__default['default'], _objectSpread2(_objectSpread2({
     duration: duration
   }, extraProps), {}, {
@@ -4809,7 +4963,7 @@ var Index$a = function Index(props) {
 };
 Index$a.defaultProps = {};
 
-var _excluded$e = ["list", "render", "none", "partSize"];
+var _excluded$g = ["list", "render", "none", "partSize"];
 function AutoScroll(props) {
   var inner1 = React.useRef();
   var inner2 = React.useRef();
@@ -4886,7 +5040,7 @@ var Index$b = function Index(_ref) {
     none = _ref.none,
     _ref$partSize = _ref.partSize,
     partSize = _ref$partSize === void 0 ? 4 : _ref$partSize,
-    otherProps = _objectWithoutProperties(_ref, _excluded$e);
+    otherProps = _objectWithoutProperties(_ref, _excluded$g);
   var _useState = React.useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     partA = _useState2[0],
@@ -4960,7 +5114,7 @@ var Index$b = function Index(_ref) {
   }, none || '暂无数据'));
 };
 
-var _excluded$f = ["data", "onClick", "slidesPerView", "rowKey", "onSwiperChange", "renderItem", "noMove"];
+var _excluded$h = ["data", "onClick", "slidesPerView", "rowKey", "onSwiperChange", "renderItem", "noMove"];
 // install Swiper modules
 SwiperCore__default['default'].use([SwiperCore.Pagination, SwiperCore.Navigation, SwiperCore.Autoplay, SwiperCore.Virtual]);
 var Index$c = /*#__PURE__*/React.forwardRef(function (props, ref) {
@@ -4972,7 +5126,7 @@ var Index$c = /*#__PURE__*/React.forwardRef(function (props, ref) {
     onSwiperChange = props.onSwiperChange,
     renderItem = props.renderItem,
     noMove = props.noMove,
-    extraProps = _objectWithoutProperties(props, _excluded$f);
+    extraProps = _objectWithoutProperties(props, _excluded$h);
   var _useState = React.useState(null),
     _useState2 = _slicedToArray(_useState, 2),
     controlledSwiper = _useState2[0],
@@ -5621,7 +5775,7 @@ function createBrowserHistory(props) {
   return history;
 }
 
-var _excluded$g = ["routes", "className"];
+var _excluded$i = ["routes", "className"];
 var history = createBrowserHistory();
 function itemRender(route, params, routes, paths) {
   var last = routes.indexOf(route) === routes.length - 1;
@@ -5637,7 +5791,7 @@ function itemRender(route, params, routes, paths) {
 var Index$d = function Index(_ref) {
   var routes = _ref.routes,
     className = _ref.className,
-    props = _objectWithoutProperties(_ref, _excluded$g);
+    props = _objectWithoutProperties(_ref, _excluded$i);
   return /*#__PURE__*/React__default['default'].createElement(antd.Breadcrumb, _objectSpread2({
     className: className || 'default',
     separator: ">>",
@@ -5646,7 +5800,7 @@ var Index$d = function Index(_ref) {
   }, props));
 };
 
-var _excluded$h = ["title", "className", "headerTail", "headerCenter", "sliderTabs"];
+var _excluded$j = ["title", "className", "headerTail", "headerCenter", "sliderTabs"];
 var Index$e = function Index(_ref, ref) {
   var _sliderTabs$component, _sliderTabs$tabs;
   var title = _ref.title,
@@ -5655,7 +5809,7 @@ var Index$e = function Index(_ref, ref) {
     headerTail = _ref.headerTail,
     headerCenter = _ref.headerCenter,
     sliderTabs = _ref.sliderTabs,
-    props = _objectWithoutProperties(_ref, _excluded$h);
+    props = _objectWithoutProperties(_ref, _excluded$j);
   React.useImperativeHandle(ref, function () {
     return {
       activeTab: activeTab
@@ -5871,7 +6025,7 @@ function DialogModel(props, ref) {
 }
 var Dialog = /*#__PURE__*/React__default['default'].forwardRef(DialogModel);
 
-var _excluded$i = ["open", "width", "closeCb", "onClose", "className", "style", "isDrag", "wrapClassName"],
+var _excluded$k = ["open", "width", "closeCb", "onClose", "className", "style", "isDrag", "wrapClassName"],
   _excluded2$3 = ["open"];
 var Modal = /*#__PURE__*/function (_React$PureComponent) {
   _inherits(Modal, _React$PureComponent);
@@ -6003,7 +6157,7 @@ var Modal = /*#__PURE__*/function (_React$PureComponent) {
         style = _this$props4.style,
         isDrag = _this$props4.isDrag,
         wrapClassName = _this$props4.wrapClassName,
-        other = _objectWithoutProperties(_this$props4, _excluded$i);
+        other = _objectWithoutProperties(_this$props4, _excluded$k);
       return /*#__PURE__*/React__default['default'].createElement(Dialog, _objectSpread2({
         ref: this.containerRef,
         closeCb: closeCb,
@@ -6168,7 +6322,7 @@ function DialogModel$1(props) {
   return renderChildren;
 }
 
-var _excluded$j = ["open"];
+var _excluded$l = ["open"];
 var Modal$1 = /*#__PURE__*/function (_React$PureComponent) {
   _inherits(Modal, _React$PureComponent);
   var _super = _createSuper(Modal);
@@ -6290,7 +6444,7 @@ Modal$1.show = function (config) {
       setShow = _useState2[1];
     manager.setShow = setShow;
     var open = props.open,
-      trueProps = _objectWithoutProperties(props, _excluded$j);
+      trueProps = _objectWithoutProperties(props, _excluded$l);
     React.useEffect(function () {
       manager.mounted = true;
       setShow(open);
@@ -6462,7 +6616,7 @@ function DragBox(_ref) {
   }, children))) : ( /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null));
 }
 
-var _excluded$k = ["columns", "extraColumns", "search", "open", "setOpen", "modalFormOpend", "disabled", "submitMethod", "onSubmitSuccess", "title", "record", "onFormChange", "formItemChild", "onCancel", "modalHeaderSlot", "modalFooterSlot", "formProps"];
+var _excluded$m = ["columns", "extraColumns", "search", "open", "setOpen", "modalFormOpend", "disabled", "submitMethod", "onSubmitSuccess", "title", "record", "onFormChange", "formItemChild", "onCancel", "modalHeaderSlot", "modalFooterSlot", "formProps"];
 var ModalForm = function ModalForm(props, ref) {
   var columns = props.columns,
     extraColumns = props.extraColumns,
@@ -6481,7 +6635,7 @@ var ModalForm = function ModalForm(props, ref) {
     modalHeaderSlot = props.modalHeaderSlot,
     modalFooterSlot = props.modalFooterSlot,
     formProps = props.formProps,
-    extraProps = _objectWithoutProperties(props, _excluded$k);
+    extraProps = _objectWithoutProperties(props, _excluded$m);
   var formRef = React.useRef(null);
   var _useState = React.useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -6606,7 +6760,7 @@ var ModalForm = function ModalForm(props, ref) {
 };
 var ModalForm$1 = /*#__PURE__*/React__default['default'].forwardRef(ModalForm);
 
-var _excluded$l = ["columns", "extraColumns", "request", "modalFormSearch", "search", "tableAction", "filterAction", "renderTableBar", "renderTableBarDeps", "className", "style", "onFormChange", "modalConfig", "searchFormConfig", "optionColumnConfig", "pagination", "noBordered", "showIndex", "searchTableSlot"];
+var _excluded$n = ["columns", "extraColumns", "request", "modalFormSearch", "search", "tableAction", "filterAction", "renderTableBar", "renderTableBarDeps", "className", "style", "onFormChange", "modalConfig", "searchFormConfig", "optionColumnConfig", "pagination", "noBordered", "showIndex", "searchTableSlot"];
 var TabelCard = function TabelCard(props, ref) {
   var columns = props.columns,
     extraColumns = props.extraColumns,
@@ -6630,7 +6784,7 @@ var TabelCard = function TabelCard(props, ref) {
     noBordered = props.noBordered,
     showIndex = props.showIndex,
     searchTableSlot = props.searchTableSlot,
-    extraProps = _objectWithoutProperties(props, _excluded$l);
+    extraProps = _objectWithoutProperties(props, _excluded$n);
   var actionRef = React.useRef();
   var modalFormRef = React.useRef(null);
   var searchFormRef = React.useRef(null);
@@ -10886,7 +11040,7 @@ function DhPlayer(_ref, ref) {
 }
 var index$6 = /*#__PURE__*/React.forwardRef(DhPlayer);
 
-var _excluded$m = ["id", "videoUrls", "definitionList", "isLoop", "muted", "currentIndex", "setCurrentIndex", "className", "style", "open", "autoplay", "videoInit", "enableMemory", "lastPlayTimeHideDelay"];
+var _excluded$o = ["id", "videoUrls", "definitionList", "isLoop", "muted", "currentIndex", "setCurrentIndex", "className", "style", "open", "autoplay", "videoInit", "enableMemory", "lastPlayTimeHideDelay"];
 // 默认速度控制
 var DEFAULT_PLAY_BACK_RATE = [0.5, 0.75, 1, 1.5, 2];
 // 默认记忆提示文字展示时长(s)
@@ -10917,7 +11071,7 @@ var index$7 = (function (_ref) {
     enableMemory = _ref$enableMemory === void 0 ? false : _ref$enableMemory,
     _ref$lastPlayTimeHide = _ref.lastPlayTimeHideDelay,
     lastPlayTimeHideDelay = _ref$lastPlayTimeHide === void 0 ? DEFAULT_LAST_PLAY_TIME_DELAY : _ref$lastPlayTimeHide,
-    props = _objectWithoutProperties(_ref, _excluded$m);
+    props = _objectWithoutProperties(_ref, _excluded$o);
   var player = React.useRef();
   var currentPlayerIndex = React.useRef(0);
   // 内置的 index 状态管理
@@ -11087,7 +11241,7 @@ var index$7 = (function (_ref) {
   });
 });
 
-var _excluded$n = ["className", "frameStyle", "style", "direction", "children"];
+var _excluded$p = ["className", "frameStyle", "style", "direction", "children"];
 function FrameBox$1(_ref) {
   var className = _ref.className,
     frameStyle = _ref.frameStyle,
@@ -11095,7 +11249,7 @@ function FrameBox$1(_ref) {
     _ref$direction = _ref.direction,
     direction = _ref$direction === void 0 ? 'in' : _ref$direction,
     children = _ref.children,
-    props = _objectWithoutProperties(_ref, _excluded$n);
+    props = _objectWithoutProperties(_ref, _excluded$p);
   return /*#__PURE__*/React__default['default'].createElement("div", _objectSpread2({
     className: classnames__default['default'](_defineProperty(_defineProperty({}, 'frame', true), className || '', true)),
     style: style
@@ -11122,7 +11276,7 @@ function FrameBox$1(_ref) {
   }), children);
 }
 
-var _excluded$o = ["columns", "dataSource", "request", "onLoad", "params", "onSubmit", "rowKey", "onRow", "className", "rowClassName", "rowSelection", "style", "tbodyStyle", "thStyle", "border", "scroll", "pagination", "search", "frameBoxTable", "frameBoxDirection", "formRef", "none"];
+var _excluded$q = ["columns", "dataSource", "request", "onLoad", "params", "onSubmit", "rowKey", "onRow", "className", "rowClassName", "rowSelection", "style", "tbodyStyle", "thStyle", "border", "scroll", "pagination", "search", "frameBoxTable", "frameBoxDirection", "formRef", "none"];
 function NtTable(_ref, ref) {
   var _formSearchRef$curren4, _columns$, _columns$2;
   var columns = _ref.columns,
@@ -11153,7 +11307,7 @@ function NtTable(_ref, ref) {
     frameBoxDirection = _ref$frameBoxDirectio === void 0 ? 'out' : _ref$frameBoxDirectio,
     formRef = _ref.formRef,
     none = _ref.none,
-    props = _objectWithoutProperties(_ref, _excluded$o);
+    props = _objectWithoutProperties(_ref, _excluded$q);
   var _useState = React.useState(_toConsumableArray((rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRowKeys) || [])),
     _useState2 = _slicedToArray(_useState, 2),
     selectedRowKeys = _useState2[0],
@@ -12409,7 +12563,7 @@ function WaterLevelCharts(config) {
 /*
  * @Author: lijin
  * @Date: 2021-09-09 11:02:54
- * @LastEditTime: 2023-09-18 17:44:13
+ * @LastEditTime: 2023-12-25 19:04:08
  * @LastEditors: lijin
  * @Description:
  * @FilePath: \wargerm\src\index.ts
@@ -12428,6 +12582,7 @@ exports.Calendar = index$4;
 exports.Card = index$2;
 exports.Cascader = WCascader;
 exports.Checkbox = Index$4;
+exports.CheckboxGroup = WCheckboxGroup;
 exports.CountUp = Index$a;
 exports.DatePicker = Index$2;
 exports.DhPlayer = index$6;
@@ -12443,6 +12598,7 @@ exports.NtTable = index$8;
 exports.Number = Index$9;
 exports.NumericInput = NumericInput;
 exports.Radio = Index$3;
+exports.RadioGroup = WRadioGroup;
 exports.RequestRenderDom = index$1;
 exports.Select = Index$5;
 exports.Swiper = Index$c;

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "wargerm",
-  "version": "0.7.67",
+  "version": "0.7.69",
   "scripts": {
     "dev": "dumi dev",
     "docs:build": "dumi build",