wargerm 0.7.80 → 0.7.82

package/dist/index.esm.js

@@ -1,7 +1,7 @@
 import React, { useRef, useEffect, useMemo, useState, useCallback, useImperativeHandle, memo, forwardRef, createRef } from 'react';
 import { cloneDeep, uniqBy, omit, chunk, isEmpty } from 'lodash-es';
 import { useSyncExternalStore } from 'use-sync-external-store/shim';
-import { Menu, Dropdown, Button, Input, Upload as Upload$1, Modal as Modal$2, message, InputNumber, DatePicker, Radio, Space, Checkbox, Select, Switch, Tooltip, TreeSelect as TreeSelect$1, Cascader, Form, Row, Col, Spin, Pagination, Breadcrumb, ConfigProvider, notification } from 'antd';
+import { Menu, Dropdown, Button, Input, Upload as Upload$1, Modal as Modal$2, message, InputNumber, DatePicker, Radio, Space, Checkbox, Select, Switch, Tooltip, TreeSelect as TreeSelect$1, Cascader, Tree as Tree$1, Form, Row, Col, Spin, Pagination, Breadcrumb, ConfigProvider, notification } from 'antd';
 import { createFromIconfontCN, PlusOutlined, CloseCircleOutlined, SearchOutlined, ReloadOutlined, MinusOutlined, FullscreenOutlined, EllipsisOutlined, ExclamationCircleOutlined, EyeOutlined, EditOutlined, DeleteOutlined, LeftOutlined, RightOutlined, CloseOutlined } from '@ant-design/icons';
 import FileViewer from 'react-file-viewer';
 import classnames from 'classnames';
@@ -3446,7 +3446,253 @@ var WCheckboxGroup = function WCheckboxGroup(props) {
 };
 WCheckboxGroup.defaultProps = {};
 
-var _excluded$b = ["columns", "extraColumns", "className", "style", "search", "disabled", "disabledHideInSearch", "disabledRuler", "onFormChange", "onSubmit", "onReset", "setForm", "deps"];
+var _excluded$b = ["request", "params", "onCheck", "dataSource", "value", "onChange"];
+var findParent = function findParent(data, id) {
+  var parent = null;
+  var loop = function loop(node, arr) {
+    for (var i = 0; i < arr.length; i++) {
+      var _item$children;
+      var item = arr[i];
+      if (item.id == id) return parent = node;
+      if ((_item$children = item.children) === null || _item$children === void 0 ? void 0 : _item$children.length) {
+        loop(item, item.children);
+      }
+    }
+  };
+  loop(null, data);
+  return parent;
+};
+var removeId = function removeId(arr, id) {
+  var index = arr.indexOf(id);
+  if (index > -1) {
+    arr.splice(index, 1);
+  }
+  return arr;
+};
+var flatChildren = function flatChildren(data) {
+  var childrenList = [];
+  var loop = function loop(arr) {
+    for (var i = 0; i < arr.length; i++) {
+      var _item$children2;
+      var item = arr[i];
+      childrenList.push(item);
+      if ((_item$children2 = item.children) === null || _item$children2 === void 0 ? void 0 : _item$children2.length) {
+        loop(item.children);
+      }
+    }
+  };
+  loop(data);
+  return childrenList;
+};
+var handleCheck = function handleCheck(_ref) {
+  var parentIds = _ref.parentIds,
+    id = _ref.id,
+    values = _ref.values,
+    treeData = _ref.treeData;
+  var currentId = id;
+  while (currentId) {
+    var _ref2 = findParent(treeData, currentId) || {},
+      _id = _ref2.id,
+      children = _ref2.children;
+    var ids = children === null || children === void 0 ? void 0 : children.map(function (item) {
+      return item.id;
+    });
+    if (!ids) {
+      currentId = null;
+      break;
+    }
+    if (!ids.every(function (item) {
+      return values.checked.includes(item);
+    })) {
+      // 检查每个父 id 都在 checked list 里面，不在则 push半选
+      if (!values.halfChecked.includes(_id)) {
+        // 判断是否存在
+        values.halfChecked.push(_id);
+      }
+      removeId(values.checked, _id);
+    } else if (!values.checked.includes(_id)) {
+      // 每个父 id 是否已存在 checked list ,不在则 push checked list, 并且清空 半选
+      values.checked.push(_id);
+      removeId(values.halfChecked, _id);
+    }
+    if (!ids.some(function (item) {
+      return [].concat(_toConsumableArray(values.checked), _toConsumableArray(values.halfChecked)).includes(item);
+    })) {
+      // 检查每个父 id 都不在 checked list 里面，不在则 清空半选
+      removeId(values.halfChecked, _id);
+    }
+    currentId = parentIds.pop();
+  }
+  return values;
+};
+var WTree = function WTree(props, ref) {
+  var request = props.request,
+    params = props.params,
+    _onCheck = props.onCheck,
+    dataSource = props.dataSource,
+    value = props.value,
+    onChange = props.onChange,
+    extraProps = _objectWithoutProperties(props, _excluded$b);
+  var _useState = useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    treeData = _useState2[0],
+    setTreeData = _useState2[1];
+  var _useState3 = useState([]),
+    _useState4 = _slicedToArray(_useState3, 2),
+    expandedKeys = _useState4[0],
+    setExpandedKeys = _useState4[1];
+  var _useState5 = useState([]),
+    _useState6 = _slicedToArray(_useState5, 2),
+    checkedKeys = _useState6[0],
+    setCheckedKeys = _useState6[1];
+  var _useState7 = useState([]),
+    _useState8 = _slicedToArray(_useState7, 2),
+    selectedData = _useState8[0],
+    setSelectedData = _useState8[1];
+  var allKeysRef = useRef([]);
+  useEffect(function () {
+    setSelectedData(value);
+  }, [value]);
+  useImperativeHandle(ref, function () {
+    return {
+      checkedKeys: checkedKeys,
+      expandedKeys: expandedKeys,
+      selectedData: selectedData
+    };
+  });
+  useEffect(function () {
+    var isMounted = true;
+    _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var data, checked, values, deepFn, treeList, _checked, _values, _deepFn, _treeList;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (!request) {
+              _context.next = 13;
+              break;
+            }
+            _context.next = 3;
+            return request(params);
+          case 3:
+            data = _context.sent;
+            if (isMounted) {
+              _context.next = 6;
+              break;
+            }
+            return _context.abrupt("return");
+          case 6:
+            checked = selectedData || [];
+            values = {
+              checked: checked,
+              halfChecked: []
+            };
+            deepFn = function deepFn(arr) {
+              return arr.map(function (item) {
+                var _item$children3, _ref4, _item$origin, _item$origin2;
+                if (((_item$children3 = item.children) === null || _item$children3 === void 0 ? void 0 : _item$children3.length) > 0) {
+                  item.children = deepFn(item.children);
+                }
+                allKeysRef.current = [].concat(_toConsumableArray(allKeysRef.current), [item.key]);
+                handleCheck({
+                  parentIds: (_ref4 = (item === null || item === void 0 ? void 0 : item.parentIds) || ((_item$origin = item.origin) === null || _item$origin === void 0 ? void 0 : _item$origin.parentIds)) === null || _ref4 === void 0 ? void 0 : _ref4.split(',').slice(1),
+                  id: (item === null || item === void 0 ? void 0 : item.id) || ((_item$origin2 = item.origin) === null || _item$origin2 === void 0 ? void 0 : _item$origin2.id),
+                  values: values,
+                  treeData: treeData
+                });
+                return _objectSpread2(_objectSpread2(_objectSpread2({}, item), item.origin), {}, {
+                  title: item.label
+                });
+              });
+            };
+            treeList = deepFn(data);
+            setExpandedKeys(allKeysRef.current);
+            setTreeData(treeList);
+            setCheckedKeys(values);
+          case 13:
+            if (dataSource) {
+              _checked = selectedData || [];
+              _values = {
+                checked: _checked,
+                halfChecked: []
+              };
+              _deepFn = function _deepFn(arr) {
+                return arr.map(function (item) {
+                  var _item$children4, _ref5, _item$origin3, _item$origin4;
+                  if (((_item$children4 = item.children) === null || _item$children4 === void 0 ? void 0 : _item$children4.length) > 0) {
+                    item.children = _deepFn(item.children);
+                  }
+                  allKeysRef.current = [].concat(_toConsumableArray(allKeysRef.current), [item.key]);
+                  handleCheck({
+                    parentIds: (_ref5 = (item === null || item === void 0 ? void 0 : item.parentIds) || ((_item$origin3 = item.origin) === null || _item$origin3 === void 0 ? void 0 : _item$origin3.parentIds)) === null || _ref5 === void 0 ? void 0 : _ref5.split(',').slice(1),
+                    id: (item === null || item === void 0 ? void 0 : item.id) || ((_item$origin4 = item.origin) === null || _item$origin4 === void 0 ? void 0 : _item$origin4.id),
+                    values: _values,
+                    treeData: dataSource
+                  });
+                  return _objectSpread2(_objectSpread2(_objectSpread2({}, item), item.origin), {}, {
+                    title: item.label
+                  });
+                });
+              };
+              _treeList = _deepFn(dataSource);
+              setExpandedKeys(allKeysRef.current);
+              setTreeData(_treeList);
+              setCheckedKeys(_values);
+            }
+          case 14:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }))();
+    return function () {
+      isMounted = false;
+    };
+  }, [JSON.stringify(params || {}), selectedData, dataSource]);
+  return /*#__PURE__*/React.createElement(Tree$1, _objectSpread2({
+    className: 'w100p',
+    height: 500,
+    checkable: true,
+    checkStrictly: true,
+    checkedKeys: checkedKeys,
+    expandedKeys: expandedKeys,
+    onExpand: function onExpand(values) {
+      return setExpandedKeys(values);
+    },
+    onCheck: function onCheck(values, info) {
+      var _info$node, _info$node$parentIds, _info$node2;
+      var checked = info === null || info === void 0 ? void 0 : info.checked;
+      var parentIds = info === null || info === void 0 ? void 0 : (_info$node = info.node) === null || _info$node === void 0 ? void 0 : (_info$node$parentIds = _info$node.parentIds) === null || _info$node$parentIds === void 0 ? void 0 : _info$node$parentIds.split(',').slice(1);
+      var currentId = info === null || info === void 0 ? void 0 : info.node.id;
+      handleCheck({
+        parentIds: parentIds,
+        id: currentId,
+        values: values,
+        treeData: treeData
+      });
+      var childrenIds = flatChildren((info === null || info === void 0 ? void 0 : (_info$node2 = info.node) === null || _info$node2 === void 0 ? void 0 : _info$node2.children) || []).map(function (item) {
+        return item.id;
+      });
+      // TODO 全选反选
+      if (checked) {
+        values.checked = _toConsumableArray(new Set([].concat(_toConsumableArray(values.checked), _toConsumableArray(childrenIds))));
+      } else {
+        values.checked = values.checked.filter(function (item) {
+          return !childrenIds.includes(item);
+        });
+        values.halfChecked = values.halfChecked.filter(function (item) {
+          return !childrenIds.includes(item);
+        });
+      }
+      setCheckedKeys(values);
+      _onCheck && _onCheck(values, info);
+      onChange && onChange(values, info);
+    },
+    treeData: treeData
+  }, extraProps));
+};
+var Tree = /*#__PURE__*/React.forwardRef(WTree);
+
+var _excluded$c = ["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,
@@ -3462,7 +3708,7 @@ var WForm = function WForm(props, ref) {
     onReset = props.onReset,
     setForm = props.setForm,
     deps = props.deps,
-    extraProps = _objectWithoutProperties(props, _excluded$b);
+    extraProps = _objectWithoutProperties(props, _excluded$c);
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -3642,13 +3888,37 @@ var WForm = function WForm(props, ref) {
         placeholder: "\u8BF7\u9009\u62E9",
         onLoad: function onLoad(opt) {}
       }, c.fieldProps), _extraProps3))));
-    } else if (c.valueType && ['date', 'dateTime', 'dateMonth', 'dateYear'].includes(c.valueType)) {
+    } else if (c.valueType == 'tree') {
+      var _extraProps4 = {};
+      if (c.request) {
+        _extraProps4.request = c.request;
+      }
       var _labelCol4 = {};
       if (search && search.labelWidth) {
         _labelCol4.style = {
           width: search.labelWidth
         };
       }
+      return /*#__PURE__*/React.createElement(Col, _objectSpread2(_objectSpread2({
+        className: "pl12 pr12"
+      }, colProps), {}, {
+        key: c.dataIndex
+      }), /*#__PURE__*/React.createElement(Form.Item, _objectSpread2(_objectSpread2({
+        initialValue: c.initialValue
+      }, c.formItemProps), {}, {
+        name: c.dataIndex,
+        label: c.title,
+        labelCol: _labelCol4
+      }), /*#__PURE__*/React.createElement(Tree, _objectSpread2(_objectSpread2({
+        disabled: disabled
+      }, c.fieldProps), _extraProps4))));
+    } else if (c.valueType && ['date', 'dateTime', 'dateMonth', 'dateYear'].includes(c.valueType)) {
+      var _labelCol5 = {};
+      if (search && search.labelWidth) {
+        _labelCol5.style = {
+          width: search.labelWidth
+        };
+      }
       var showTime = {};
       var picker = {};
       if (c.valueType == 'dateTime') {
@@ -3677,15 +3947,15 @@ var WForm = function WForm(props, ref) {
       }, c.formItemProps), {}, {
         name: c.dataIndex,
         label: c.title,
-        labelCol: _labelCol4
+        labelCol: _labelCol5
       }), /*#__PURE__*/React.createElement(Index$6, _objectSpread2(_objectSpread2(_objectSpread2({
         disabled: disabled,
         placeholder: "\u8BF7\u8F93\u5165"
       }, picker), showTime), c.fieldProps))));
     } else if (c.valueType === 'dateRange' || c.valueType === 'dateTimeRange') {
-      var _labelCol5 = {};
+      var _labelCol6 = {};
       if (search && search.labelWidth) {
-        _labelCol5.style = {
+        _labelCol6.style = {
           width: search.labelWidth
         };
       }
@@ -3706,22 +3976,22 @@ var WForm = function WForm(props, ref) {
       }, c.formItemProps), {}, {
         name: c.dataIndex,
         label: c.title,
-        labelCol: _labelCol5
+        labelCol: _labelCol6
       }), /*#__PURE__*/React.createElement(RangePicker$2, _objectSpread2(_objectSpread2({
         disabled: disabled
       }, _showTime), c.fieldProps))));
     } else if (c.valueType === 'checkbox') {
-      var _extraProps4 = {};
+      var _extraProps5 = {};
       if (c.request) {
-        _extraProps4.request = c.request;
+        _extraProps5.request = c.request;
       } else if (c.valueEnum) {
-        _extraProps4.valueEnum = c.valueEnum;
+        _extraProps5.valueEnum = c.valueEnum;
       } else {
-        _extraProps4.options = c.options;
+        _extraProps5.options = c.options;
       }
-      var _labelCol6 = {};
+      var _labelCol7 = {};
       if (search && search.labelWidth) {
-        _labelCol6.style = {
+        _labelCol7.style = {
           width: search.labelWidth
         };
       }
@@ -3739,7 +4009,7 @@ var WForm = function WForm(props, ref) {
       }, c.formItemProps), {}, {
         name: c.dataIndex,
         label: c.title,
-        labelCol: _labelCol6
+        labelCol: _labelCol7
       }), /*#__PURE__*/React.createElement(WCheckboxGroup, _objectSpread2(_objectSpread2({
         onLoad: function onLoad(opt) {
           setColumnsFields(function (preColumnsFields) {
@@ -3747,19 +4017,19 @@ var WForm = function WForm(props, ref) {
           });
         },
         disabled: disabled
-      }, c.fieldProps), _extraProps4))));
+      }, c.fieldProps), _extraProps5))));
     } else if (c.valueType === 'radio' || c.valueType === 'radioButton') {
-      var _extraProps5 = {};
+      var _extraProps6 = {};
       if (c.request) {
-        _extraProps5.request = c.request;
+        _extraProps6.request = c.request;
       } else if (c.valueEnum) {
-        _extraProps5.valueEnum = c.valueEnum;
+        _extraProps6.valueEnum = c.valueEnum;
       } else {
-        _extraProps5.options = c.options;
+        _extraProps6.options = c.options;
       }
-      var _labelCol7 = {};
+      var _labelCol8 = {};
       if (search && search.labelWidth) {
-        _labelCol7.style = {
+        _labelCol8.style = {
           width: search.labelWidth
         };
       }
@@ -3784,7 +4054,7 @@ var WForm = function WForm(props, ref) {
       }, c.formItemProps), {}, {
         name: c.dataIndex,
         label: c.title,
-        labelCol: _labelCol7
+        labelCol: _labelCol8
       }), /*#__PURE__*/React.createElement(WRadioGroup, _objectSpread2(_objectSpread2(_objectSpread2({
         onLoad: function onLoad(opt) {
           setColumnsFields(function (preColumnsFields) {
@@ -3792,7 +4062,7 @@ var WForm = function WForm(props, ref) {
           });
         },
         disabled: disabled
-      }, radioButtonProps), c.fieldProps), _extraProps5))));
+      }, radioButtonProps), c.fieldProps), _extraProps6))));
     } else if (c.valueType === 'switch') {
       var options = [];
       if (c.valueEnum) {
@@ -3804,9 +4074,9 @@ var WForm = function WForm(props, ref) {
           });
         }
       }
-      var _labelCol8 = {};
+      var _labelCol9 = {};
       if (search && search.labelWidth) {
-        _labelCol8.style = {
+        _labelCol9.style = {
           width: search.labelWidth
         };
       }
@@ -3826,14 +4096,14 @@ var WForm = function WForm(props, ref) {
       }, c.formItemProps), {}, {
         name: c.dataIndex,
         label: c.title,
-        labelCol: _labelCol8
+        labelCol: _labelCol9
       }), /*#__PURE__*/React.createElement(WSwitch, _objectSpread2({
         disabled: disabled
       }, c.fieldProps))));
     } else if (c.valueType === 'digit') {
-      var _labelCol9 = {};
+      var _labelCol10 = {};
       if (search && search.labelWidth) {
-        _labelCol9.style = {
+        _labelCol10.style = {
           width: search.labelWidth
         };
       }
@@ -3846,15 +4116,15 @@ var WForm = function WForm(props, ref) {
       }, c.formItemProps), {}, {
         name: c.dataIndex,
         label: c.title,
-        labelCol: _labelCol9
+        labelCol: _labelCol10
       }), /*#__PURE__*/React.createElement(NumericInput, _objectSpread2({
         disabled: disabled,
         placeholder: "\u8BF7\u8F93\u5165\u53C2\u6570(double/int)"
       }, c.fieldProps))));
     } else if (c.renderFormItem) {
-      var _labelCol10 = {};
+      var _labelCol11 = {};
       if (search && search.labelWidth) {
-        _labelCol10.style = {
+        _labelCol11.style = {
           width: search.labelWidth
         };
       }
@@ -3874,12 +4144,12 @@ var WForm = function WForm(props, ref) {
       }, c.formItemProps), {}, {
         name: c.dataIndex,
         label: c.title,
-        labelCol: _labelCol10
+        labelCol: _labelCol11
       }), baseitem))) : null;
     } else if (c.valueType === 'textarea') {
-      var _labelCol11 = {};
+      var _labelCol12 = {};
       if (search && search.labelWidth) {
-        _labelCol11.style = {
+        _labelCol12.style = {
           width: search.labelWidth
         };
       }
@@ -3892,16 +4162,16 @@ var WForm = function WForm(props, ref) {
       }, c.formItemProps), {}, {
         name: c.dataIndex,
         label: c.title,
-        labelCol: _labelCol11
+        labelCol: _labelCol12
       }), /*#__PURE__*/React.createElement(Index.TextArea, _objectSpread2({
         rows: 4,
         disabled: disabled,
         placeholder: "\u8BF7\u8F93\u5165"
       }, c.fieldProps))));
     } else if (c.valueType === 'inputNumber') {
-      var _labelCol12 = {};
+      var _labelCol13 = {};
       if (search && search.labelWidth) {
-        _labelCol12.style = {
+        _labelCol13.style = {
           width: search.labelWidth
         };
       }
@@ -3914,15 +4184,15 @@ var WForm = function WForm(props, ref) {
       }, c.formItemProps), {}, {
         name: c.dataIndex,
         label: c.title,
-        labelCol: _labelCol12
+        labelCol: _labelCol13
       }), /*#__PURE__*/React.createElement(WInputNumber, _objectSpread2({
         disabled: disabled,
         placeholder: "\u8BF7\u8F93\u5165"
       }, c.fieldProps))));
     } else {
-      var _labelCol13 = {};
+      var _labelCol14 = {};
       if (search && search.labelWidth) {
-        _labelCol13.style = {
+        _labelCol14.style = {
           width: search.labelWidth
         };
       }
@@ -3935,7 +4205,7 @@ var WForm = function WForm(props, ref) {
       }, c.formItemProps), {}, {
         name: c.dataIndex,
         label: c.title,
-        labelCol: _labelCol13
+        labelCol: _labelCol14
       }), /*#__PURE__*/React.createElement(Index, _objectSpread2({
         disabled: disabled,
         placeholder: "\u8BF7\u8F93\u5165"
@@ -4212,7 +4482,7 @@ var WForm = function WForm(props, ref) {
 };
 var WForm$1 = /*#__PURE__*/React.forwardRef(WForm);
 
-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"];
+var _excluded$d = ["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,
@@ -4243,7 +4513,7 @@ function Table(_ref) {
     frameBoxDirection = _ref$frameBoxDirectio === void 0 ? 'out' : _ref$frameBoxDirectio,
     formRef = _ref.formRef,
     none = _ref.none,
-    props = _objectWithoutProperties(_ref, _excluded$c);
+    props = _objectWithoutProperties(_ref, _excluded$d);
   var _useState = useState(_toConsumableArray((rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRowKeys) || [])),
     _useState2 = _slicedToArray(_useState, 2),
     selectedRowKeys = _useState2[0],
@@ -4730,7 +5000,7 @@ Table.defaultProps = {
 };
 var index = /*#__PURE__*/memo(Table);
 
-var _excluded$d = ["value", "renderDom", "onLoad", "params", "onChange", "request"];
+var _excluded$e = ["value", "renderDom", "onLoad", "params", "onChange", "request"];
 function Index$8(props, ref) {
   var value = props.value,
     renderDom = props.renderDom,
@@ -4738,7 +5008,7 @@ function Index$8(props, ref) {
     params = props.params,
     onChange = props.onChange,
     request = props.request,
-    rest = _objectWithoutProperties(props, _excluded$d);
+    rest = _objectWithoutProperties(props, _excluded$e);
   var _useState = useState(''),
     _useState2 = _slicedToArray(_useState, 2),
     areaValue = _useState2[0],
@@ -4793,7 +5063,7 @@ function Index$8(props, ref) {
 }
 var index$1 = /*#__PURE__*/React.forwardRef(Index$8);
 
-var _excluded$e = ["height", "width", "count", "style", "numberStyle"],
+var _excluded$f = ["height", "width", "count", "style", "numberStyle"],
   _excluded2$2 = ["count", "numberCount", "width", "height", "marginRight"];
 var Number$1 = function Number(_ref) {
   var height = _ref.height,
@@ -4802,7 +5072,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$e);
+    props = _objectWithoutProperties(_ref, _excluded$f);
   // 上次的值
   var _useState = useState(0),
     _useState2 = _slicedToArray(_useState, 2),
@@ -4952,12 +5222,12 @@ var Index$9 = function Index(props) {
   }));
 };
 
-var _excluded$f = ["duration", "className"];
+var _excluded$g = ["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$f);
+    extraProps = _objectWithoutProperties(props, _excluded$g);
   return /*#__PURE__*/React.createElement(CountUp, _objectSpread2(_objectSpread2({
     duration: duration
   }, extraProps), {}, {
@@ -4966,7 +5236,7 @@ var Index$a = function Index(props) {
 };
 Index$a.defaultProps = {};
 
-var _excluded$g = ["list", "render", "none", "partSize"];
+var _excluded$h = ["list", "render", "none", "partSize"];
 function AutoScroll(props) {
   var inner1 = useRef();
   var inner2 = useRef();
@@ -5043,7 +5313,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$g);
+    otherProps = _objectWithoutProperties(_ref, _excluded$h);
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     partA = _useState2[0],
@@ -5117,7 +5387,7 @@ var Index$b = function Index(_ref) {
   }, none || '暂无数据'));
 };
 
-var _excluded$h = ["data", "onClick", "slidesPerView", "rowKey", "onSwiperChange", "renderItem", "noMove"];
+var _excluded$i = ["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) {
@@ -5129,7 +5399,7 @@ var Index$c = /*#__PURE__*/forwardRef(function (props, ref) {
     onSwiperChange = props.onSwiperChange,
     renderItem = props.renderItem,
     noMove = props.noMove,
-    extraProps = _objectWithoutProperties(props, _excluded$h);
+    extraProps = _objectWithoutProperties(props, _excluded$i);
   var _useState = useState(null),
     _useState2 = _slicedToArray(_useState, 2),
     controlledSwiper = _useState2[0],
@@ -5778,7 +6048,7 @@ function createBrowserHistory(props) {
   return history;
 }
 
-var _excluded$i = ["routes", "className"];
+var _excluded$j = ["routes", "className"];
 var history = createBrowserHistory();
 function itemRender(route, params, routes, paths) {
   var last = routes.indexOf(route) === routes.length - 1;
@@ -5794,7 +6064,7 @@ function itemRender(route, params, routes, paths) {
 var Index$d = function Index(_ref) {
   var routes = _ref.routes,
     className = _ref.className,
-    props = _objectWithoutProperties(_ref, _excluded$i);
+    props = _objectWithoutProperties(_ref, _excluded$j);
   return /*#__PURE__*/React.createElement(Breadcrumb, _objectSpread2({
     className: className || 'default',
     separator: ">>",
@@ -5803,7 +6073,7 @@ var Index$d = function Index(_ref) {
   }, props));
 };
 
-var _excluded$j = ["title", "className", "headerTail", "headerCenter", "sliderTabs"];
+var _excluded$k = ["title", "className", "headerTail", "headerCenter", "sliderTabs"];
 var Index$e = function Index(_ref, ref) {
   var _sliderTabs$component, _sliderTabs$tabs;
   var title = _ref.title,
@@ -5812,7 +6082,7 @@ var Index$e = function Index(_ref, ref) {
     headerTail = _ref.headerTail,
     headerCenter = _ref.headerCenter,
     sliderTabs = _ref.sliderTabs,
-    props = _objectWithoutProperties(_ref, _excluded$j);
+    props = _objectWithoutProperties(_ref, _excluded$k);
   useImperativeHandle(ref, function () {
     return {
       activeTab: activeTab
@@ -6028,7 +6298,7 @@ function DialogModel(props, ref) {
 }
 var Dialog = /*#__PURE__*/React.forwardRef(DialogModel);
 
-var _excluded$k = ["open", "width", "closeCb", "onClose", "className", "style", "isDrag", "wrapClassName"],
+var _excluded$l = ["open", "width", "closeCb", "onClose", "className", "style", "isDrag", "wrapClassName"],
   _excluded2$3 = ["open"];
 var Modal = /*#__PURE__*/function (_React$PureComponent) {
   _inherits(Modal, _React$PureComponent);
@@ -6160,7 +6430,7 @@ var Modal = /*#__PURE__*/function (_React$PureComponent) {
         style = _this$props4.style,
         isDrag = _this$props4.isDrag,
         wrapClassName = _this$props4.wrapClassName,
-        other = _objectWithoutProperties(_this$props4, _excluded$k);
+        other = _objectWithoutProperties(_this$props4, _excluded$l);
       return /*#__PURE__*/React.createElement(Dialog, _objectSpread2({
         ref: this.containerRef,
         closeCb: closeCb,
@@ -6325,7 +6595,7 @@ function DialogModel$1(props) {
   return renderChildren;
 }
 
-var _excluded$l = ["open"];
+var _excluded$m = ["open"];
 var Modal$1 = /*#__PURE__*/function (_React$PureComponent) {
   _inherits(Modal, _React$PureComponent);
   var _super = _createSuper(Modal);
@@ -6447,7 +6717,7 @@ Modal$1.show = function (config) {
       setShow = _useState2[1];
     manager.setShow = setShow;
     var open = props.open,
-      trueProps = _objectWithoutProperties(props, _excluded$l);
+      trueProps = _objectWithoutProperties(props, _excluded$m);
     useEffect(function () {
       manager.mounted = true;
       setShow(open);
@@ -6619,7 +6889,7 @@ function DragBox(_ref) {
   }, children))) : ( /*#__PURE__*/React.createElement(React.Fragment, null));
 }
 
-var _excluded$m = ["columns", "extraColumns", "search", "open", "setOpen", "modalFormOpend", "disabled", "submitMethod", "onSubmitSuccess", "title", "record", "onFormChange", "formItemChild", "onCancel", "modalHeaderSlot", "modalFooterSlot", "formProps"];
+var _excluded$n = ["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,
@@ -6638,7 +6908,7 @@ var ModalForm = function ModalForm(props, ref) {
     modalHeaderSlot = props.modalHeaderSlot,
     modalFooterSlot = props.modalFooterSlot,
     formProps = props.formProps,
-    extraProps = _objectWithoutProperties(props, _excluded$m);
+    extraProps = _objectWithoutProperties(props, _excluded$n);
   var formRef = useRef(null);
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -6763,7 +7033,7 @@ var ModalForm = function ModalForm(props, ref) {
 };
 var ModalForm$1 = /*#__PURE__*/React.forwardRef(ModalForm);
 
-var _excluded$n = ["columns", "extraColumns", "request", "modalFormSearch", "search", "tableAction", "filterAction", "renderTableBar", "renderTableBarDeps", "className", "style", "onFormChange", "modalConfig", "searchFormConfig", "optionColumnConfig", "pagination", "noBordered", "showIndex", "searchTableSlot"];
+var _excluded$o = ["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,
@@ -6787,7 +7057,7 @@ var TabelCard = function TabelCard(props, ref) {
     noBordered = props.noBordered,
     showIndex = props.showIndex,
     searchTableSlot = props.searchTableSlot,
-    extraProps = _objectWithoutProperties(props, _excluded$n);
+    extraProps = _objectWithoutProperties(props, _excluded$o);
   var actionRef = useRef();
   var modalFormRef = useRef(null);
   var searchFormRef = useRef(null);
@@ -7449,7 +7719,17 @@ var TabelCard = function TabelCard(props, ref) {
         delete obj.initialValue;
       }
       return obj;
-    }))),
+    }))).map(function (item) {
+      var _item$renderColumn4;
+      if (item.type === 'group') {
+        var _item$children5;
+        item.children = (_item$children5 = item.children) === null || _item$children5 === void 0 ? void 0 : _item$children5.map(function (itm) {
+          var _itm$renderColumn3;
+          return (itm === null || itm === void 0 ? void 0 : (_itm$renderColumn3 = itm.renderColumn) === null || _itm$renderColumn3 === void 0 ? void 0 : _itm$renderColumn3.call(itm, itm, modalFormConfig)) || itm;
+        });
+      }
+      return (item === null || item === void 0 ? void 0 : (_item$renderColumn4 = item.renderColumn) === null || _item$renderColumn4 === void 0 ? void 0 : _item$renderColumn4.call(item, item, modalFormConfig)) || item;
+    }),
     search: false,
     pagination: pagination !== null && pagination !== void 0 ? pagination : {
       showSizeChanger: true,
@@ -11043,7 +11323,7 @@ function DhPlayer(_ref, ref) {
 }
 var index$6 = /*#__PURE__*/forwardRef(DhPlayer);
 
-var _excluded$o = ["id", "videoUrls", "definitionList", "isLoop", "muted", "currentIndex", "setCurrentIndex", "className", "style", "open", "autoplay", "videoInit", "enableMemory", "lastPlayTimeHideDelay"];
+var _excluded$p = ["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)
@@ -11074,7 +11354,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$o);
+    props = _objectWithoutProperties(_ref, _excluded$p);
   var player = useRef();
   var currentPlayerIndex = useRef(0);
   // 内置的 index 状态管理
@@ -11244,7 +11524,7 @@ var index$7 = (function (_ref) {
   });
 });
 
-var _excluded$p = ["className", "frameStyle", "style", "direction", "children"];
+var _excluded$q = ["className", "frameStyle", "style", "direction", "children"];
 function FrameBox$1(_ref) {
   var className = _ref.className,
     frameStyle = _ref.frameStyle,
@@ -11252,7 +11532,7 @@ function FrameBox$1(_ref) {
     _ref$direction = _ref.direction,
     direction = _ref$direction === void 0 ? 'in' : _ref$direction,
     children = _ref.children,
-    props = _objectWithoutProperties(_ref, _excluded$p);
+    props = _objectWithoutProperties(_ref, _excluded$q);
   return /*#__PURE__*/React.createElement("div", _objectSpread2({
     className: classnames(_defineProperty(_defineProperty({}, 'frame', true), className || '', true)),
     style: style
@@ -11279,7 +11559,7 @@ function FrameBox$1(_ref) {
   }), children);
 }
 
-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"];
+var _excluded$r = ["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,
@@ -11310,7 +11590,7 @@ function NtTable(_ref, ref) {
     frameBoxDirection = _ref$frameBoxDirectio === void 0 ? 'out' : _ref$frameBoxDirectio,
     formRef = _ref.formRef,
     none = _ref.none,
-    props = _objectWithoutProperties(_ref, _excluded$q);
+    props = _objectWithoutProperties(_ref, _excluded$r);
   var _useState = useState(_toConsumableArray((rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRowKeys) || [])),
     _useState2 = _slicedToArray(_useState, 2),
     selectedRowKeys = _useState2[0],
@@ -12566,7 +12846,7 @@ function WaterLevelCharts(config) {
 /*
  * @Author: lijin
  * @Date: 2021-09-09 11:02:54
- * @LastEditTime: 2023-12-25 19:04:08
+ * @LastEditTime: 2024-01-02 18:08:42
  * @LastEditors: lijin
  * @Description:
  * @FilePath: \wargerm\src\index.ts
@@ -12578,4 +12858,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, 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 };
+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, Tree, 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 };