@zat-design/sisyphus-react 3.13.13 → 4.0.0-beta.2

package/lib/ProTree/components/ProTreeSelect/index.js

@@ -5,24 +5,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.ProTreeSelect = void 0;
-require("antd/es/tooltip/style");
-var _tooltip = _interopRequireDefault(require("antd/es/tooltip"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-require("antd/es/input/style");
-var _input = _interopRequireDefault(require("antd/es/input"));
-require("antd/es/message/style");
-var _message2 = _interopRequireDefault(require("antd/es/message"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-require("antd/es/tree-select/style");
-var _treeSelect = _interopRequireDefault(require("antd/es/tree-select"));
 var _debounce2 = _interopRequireDefault(require("lodash/debounce"));
 var _cloneDeep2 = _interopRequireDefault(require("lodash/cloneDeep"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _ahooks = require("ahooks");
+var _antd = require("antd");
 var _classnames3 = _interopRequireDefault(require("classnames"));
 var _react = require("react");
 var _locale = _interopRequireDefault(require("../../../locale"));
@@ -33,9 +25,11 @@ var _excluded = ["disabled", "code", "dataSource", "defaultDisableValue", "onCha
   _excluded2 = ["children"];
 /* eslint-disable react/no-danger */
 /* eslint-disable react/jsx-closing-tag-location */
-var SHOW_PARENT = _treeSelect.default.SHOW_PARENT;
+function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i.return) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
+function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { if (r) i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n;else { var o = function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); }; o("next", 0), o("throw", 1), o("return", 2); } }, _regeneratorDefine2(e, r, n, t); }
+var SHOW_PARENT = _antd.TreeSelect.SHOW_PARENT;
 var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
-  var _useRequest$options;
+  var _useRequest$options, _selectProps$classNam, _selectProps$classNam2, _selectProps$classNam3, _selectProps$styles, _selectProps$styles2, _selectProps$styles2$;
   // 全局属性配置在ConfigProvider
   var _ref = (0, _ProConfigProvider.useProConfig)('ProTreeSelect') || {},
     _ref$fieldNames = _ref.fieldNames,
@@ -170,7 +164,7 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
       msg = res.message,
       data = res.data;
     if (status !== 200) {
-      _message2.default.error(msg);
+      _antd.message.error(msg);
       return;
     }
     var resultData = transferDataSource(data, showCodeName);
@@ -189,7 +183,7 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
       msg = _ref4.message,
       data = _ref4.data;
     if (status !== 200) {
-      _message2.default.error(msg);
+      _antd.message.error(msg);
       return;
     }
     return data;
@@ -223,7 +217,6 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
     if (fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.data, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : _useRequest$options2.cacheKey) {
       if (transformResponse && typeof transformResponse === 'function') {
         var responseData = transformResponse(fetchFunction.data);
-        // debugger;
         var resultData = transferDataSource(responseData, showCodeName);
         setState({
           selectList: countChild(resultData),
@@ -274,7 +267,7 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
   if (defaultDisableValue) {
     return (0, _jsxRuntime.jsx)("span", {
       title: defaultDisableValue,
-      children: (0, _jsxRuntime.jsx)(_input.default, {
+      children: (0, _jsxRuntime.jsx)(_antd.Input, {
         disabled: true,
         defaultValue: defaultDisableValue,
         style: props === null || props === void 0 ? void 0 : props.style
@@ -390,7 +383,7 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
       });
     }
     if (!children) {
-      return (0, _jsxRuntime.jsx)(_treeSelect.default.TreeNode, {
+      return (0, _jsxRuntime.jsx)(_antd.TreeSelect.TreeNode, {
         value: value,
         title: title,
         label: searchKey,
@@ -401,7 +394,7 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
       }, key);
     }
     var sonGrade = grade + 1;
-    return (0, _jsxRuntime.jsx)(_treeSelect.default.TreeNode, {
+    return (0, _jsxRuntime.jsx)(_antd.TreeSelect.TreeNode, {
       value: value,
       title: title,
       label: searchKey,
@@ -446,27 +439,26 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
     return sourceList;
   }
   var searchTreeEvent = (0, _debounce2.default)(/*#__PURE__*/function () {
-    var _ref6 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(searchVal) {
+    var _ref6 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator().m(function _callee(searchVal) {
       var result;
-      return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+      return _regenerator().w(function (_context) {
+        while (1) switch (_context.n) {
           case 0:
             if (searchVal) {
-              _context.next = 3;
+              _context.n = 1;
               break;
             }
             setState({
               selectList: (0, _cloneDeep2.default)(origDataSource || [])
             });
-            return _context.abrupt("return", null);
-          case 3:
+            return _context.a(2, null);
+          case 1:
             result = filterTree((0, _cloneDeep2.default)(origDataSource || []), searchVal);
             setState({
               selectList: result || []
             });
-          case 5:
-          case "end":
-            return _context.stop();
+          case 2:
+            return _context.a(2);
         }
       }, _callee);
     }));
@@ -579,7 +571,7 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
   var dropDownClassName = (0, _classnames3.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({
     'pro-tree-select-drop-down-container': true
   }, "".concat(innerClass), true), "".concat(popupClassName), popupClassName));
-  var treeProps = (0, _objectSpread2.default)({
+  var treeProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({
     disabled: disabled,
     showSearch: showSearch,
     treeDefaultExpandAll: defaultExpandAll,
@@ -588,30 +580,39 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
     showCheckedStrategy: SHOW_PARENT,
     value: value,
     onChange: handleChange,
-    dropdownStyle: (0, _objectSpread2.default)({
-      maxHeight: 320,
-      paddingTop: '0px',
-      maxWidth: '580px'
-    }, dropdownStyle),
     listHeight: listHeight || 320,
     style: (0, _objectSpread2.default)({
       width: width || '100%'
     }, style),
-    popupClassName: dropDownClassName,
     onSearch: searchTreeEvent,
     allowClear: allowClear || true,
-    showArrow: true,
     treeNodeFilterProp: treeNodeFilterProp,
     virtual: true,
     treeCheckStrictly: checkStrictly
-  }, selectProps);
+  }, selectProps), {}, {
+    // 使用新的 API 替代弃用的 popupClassName 和 dropdownStyle
+    classNames: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, selectProps === null || selectProps === void 0 ? void 0 : selectProps.classNames), {}, {
+      popup: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, selectProps === null || selectProps === void 0 ? void 0 : (_selectProps$classNam = selectProps.classNames) === null || _selectProps$classNam === void 0 ? void 0 : _selectProps$classNam.popup), {}, {
+        root: [selectProps === null || selectProps === void 0 ? void 0 : (_selectProps$classNam2 = selectProps.classNames) === null || _selectProps$classNam2 === void 0 ? void 0 : (_selectProps$classNam3 = _selectProps$classNam2.popup) === null || _selectProps$classNam3 === void 0 ? void 0 : _selectProps$classNam3.root, dropDownClassName].filter(Boolean).join(' ')
+      })
+    }),
+    styles: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, selectProps === null || selectProps === void 0 ? void 0 : selectProps.styles), {}, {
+      popup: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, selectProps === null || selectProps === void 0 ? void 0 : (_selectProps$styles = selectProps.styles) === null || _selectProps$styles === void 0 ? void 0 : _selectProps$styles.popup), {}, {
+        root: (0, _objectSpread2.default)((0, _objectSpread2.default)({
+          maxHeight: 320,
+          paddingTop: '0px',
+          maxWidth: '580px'
+        }, dropdownStyle), selectProps === null || selectProps === void 0 ? void 0 : (_selectProps$styles2 = selectProps.styles) === null || _selectProps$styles2 === void 0 ? void 0 : (_selectProps$styles2$ = _selectProps$styles2.popup) === null || _selectProps$styles2$ === void 0 ? void 0 : _selectProps$styles2$.root)
+      })
+    })
+  });
   if (value === null) {
     delete treeProps.value;
   }
   return (0, _jsxRuntime.jsx)("div", {
     onClick: nodeChangeEvent,
     className: cls,
-    children: (0, _jsxRuntime.jsx)(_treeSelect.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+    children: (0, _jsxRuntime.jsx)(_antd.TreeSelect, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       placeholder: placeholder || _locale.default.ProForm.treeSelectPlaceholder,
       maxTagPlaceholder: function maxTagPlaceholder(rest) {
         var _rest = rest.map(function (tag) {
@@ -619,7 +620,7 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
           return ((tag === null || tag === void 0 ? void 0 : (_tag$label = tag.label) === null || _tag$label === void 0 ? void 0 : (_tag$label$props = _tag$label.props) === null || _tag$label$props === void 0 ? void 0 : _tag$label$props.children) ? tag === null || tag === void 0 ? void 0 : (_tag$label2 = tag.label) === null || _tag$label2 === void 0 ? void 0 : (_tag$label2$props = _tag$label2.props) === null || _tag$label2$props === void 0 ? void 0 : (_tag$label2$props$chi = _tag$label2$props.children) === null || _tag$label2$props$chi === void 0 ? void 0 : (_tag$label2$props$chi2 = _tag$label2$props$chi.props) === null || _tag$label2$props$chi2 === void 0 ? void 0 : (_tag$label2$props$chi3 = _tag$label2$props$chi2.dangerouslySetInnerHTML) === null || _tag$label2$props$chi3 === void 0 ? void 0 : _tag$label2$props$chi3.__html : tag === null || tag === void 0 ? void 0 : (_tag$label3 = tag.label) === null || _tag$label3 === void 0 ? void 0 : (_tag$label3$props = _tag$label3.props) === null || _tag$label3$props === void 0 ? void 0 : (_tag$label3$props$dan = _tag$label3$props.dangerouslySetInnerHTML) === null || _tag$label3$props$dan === void 0 ? void 0 : _tag$label3$props$dan.__html) || tag.label;
         });
         var _str = _rest.join('、');
-        return (0, _jsxRuntime.jsx)(_tooltip.default, {
+        return (0, _jsxRuntime.jsx)(_antd.Tooltip, {
           title: (0, _jsxRuntime.jsx)("div", {
             children: _str
           }),

package/lib/ProTree/components/ProTreeSelect/style/index.less

@@ -1,5 +1,5 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
+/* @root-entry-name: 'default'; */
+/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 .pro-tree-select{
     .@{ant-prefix}-select-selector{

package/lib/ProTree/components/Tree.js

@@ -6,30 +6,22 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/tree/style");
-var _tree = _interopRequireDefault(require("antd/es/tree"));
-require("antd/es/popover/style");
-var _popover = _interopRequireDefault(require("antd/es/popover"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = _interopRequireWildcard(require("react"));
+var _antd = require("antd");
 var _ahooks = require("ahooks");
 var _icons = require("@ant-design/icons");
 var _SearchTitle = _interopRequireDefault(require("./SearchTitle"));
 var _utils = require("../utils");
 var _locale = _interopRequireDefault(require("../../locale"));
 var _excluded = ["checkedValues", "disabled", "searchStr", "originalTreeData", "showCodeName", "checkStrictly", "flatTreeData", "mode", "fieldNames", "tags", "onCheck", "optionRender", "treeData", "showLine", "switcherIcon", "checkable", "menu", "innerExpandKeys", "selectedKey", "disabledMode", "isRadioSelect"];
-/*
- *@Date: 2023-07-25 13:49:35
- * @LastEditTime: 2024-05-20 11:47:45
- *@Author: liudongliang
- *@Description: 树每行节点渲染组件，复选时阻止点击事件冒泡，只有点击树节点文本会向上触发onSelect事件
- */
 /* eslint-disable no-plusplus */
+function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i.return) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
+function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { if (r) i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n;else { var o = function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); }; o("next", 0), o("throw", 1), o("return", 2); } }, _regeneratorDefine2(e, r, n, t); }
 var tagsBgColors = ['rgba(0, 106, 255,0.16)', 'rgba(0, 196, 74,0.16)', 'rgba(255, 140, 0,0.16)', 'rgba(255, 80, 80,0.16)', 'rgba(97, 97, 97, 0.16)'];
 var tagsColors = ['#006AFF', '#00C44A', '#FF8C00', '#FF5050', '#616161'];
 function List(props) {
@@ -118,18 +110,18 @@ function List(props) {
     }
   }, [selectedKey]);
   var onSelect = /*#__PURE__*/function () {
-    var _ref = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(value, item) {
+    var _ref = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator().m(function _callee(value, item) {
       var _props$onSelect;
       var val;
-      return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+      return _regenerator().w(function (_context) {
+        while (1) switch (_context.n) {
           case 0:
             if (!handing) {
-              _context.next = 2;
+              _context.n = 1;
               break;
             }
-            return _context.abrupt("return", null);
-          case 2:
+            return _context.a(2, null);
+          case 1:
             val = value;
             if (!isRadioSelect && value === currentClickTreeNode) {
               // 如果当前点击了已经选中节点，那么取消选择
@@ -139,15 +131,14 @@ function List(props) {
               currentClickTreeNode: val,
               handing: true
             });
-            _context.next = 7;
+            _context.n = 2;
             return props === null || props === void 0 ? void 0 : (_props$onSelect = props.onSelect) === null || _props$onSelect === void 0 ? void 0 : _props$onSelect.call(props, val, item);
-          case 7:
+          case 2:
             setState({
               handing: false
             });
-          case 8:
-          case "end":
-            return _context.stop();
+          case 3:
+            return _context.a(2);
         }
       }, _callee);
     }));
@@ -286,8 +277,10 @@ function List(props) {
           onClick: function onClick(e) {
             e.stopPropagation();
           },
-          children: (operateButton === null || operateButton === void 0 ? void 0 : operateButton.length) > 1 ? (0, _jsxRuntime.jsx)(_popover.default, {
-            overlayClassName: "pro-tree-operate-container",
+          children: (operateButton === null || operateButton === void 0 ? void 0 : operateButton.length) > 1 ? (0, _jsxRuntime.jsx)(_antd.Popover, {
+            classNames: {
+              root: 'pro-tree-operate-container'
+            },
             content: (0, _jsxRuntime.jsx)("div", {
               className: "pro-tree-operate-btn-popover",
               onClick: hide,
@@ -364,7 +357,7 @@ function List(props) {
   }
   return (0, _jsxRuntime.jsx)("div", {
     className: disabledMode === 'hide' ? 'hide-disable-node' : '',
-    children: (_treeData === null || _treeData === void 0 ? void 0 : _treeData.length) ? (0, _jsxRuntime.jsx)(_tree.default, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, others), additionProps), {}, {
+    children: (_treeData === null || _treeData === void 0 ? void 0 : _treeData.length) ? (0, _jsxRuntime.jsx)(_antd.Tree, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, others), additionProps), {}, {
       disabled: disabled,
       style: {
         width: '100%'

package/lib/ProTree/index.js

@@ -9,14 +9,6 @@ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/obje
 var _jsxRuntime = require("react/jsx-runtime");
 var _ProTree = _interopRequireDefault(require("./components/ProTree"));
 var _ProTreeSelect = _interopRequireDefault(require("./components/ProTreeSelect"));
-/* eslint-disable jsx-a11y/anchor-is-valid */
-/*
- *@Date: 2023-07-11 16:07:12
- *@LastEditTime: 2023-07-11 16:07:12
- *@Author: liudongliang
- *@Description: ProTree组件，集成了tree和treeSelect
- */
-
 var ProTreeHandle = function ProTreeHandle(props) {
   var _props$mode = props.mode,
     mode = _props$mode === void 0 ? 'tree' : _props$mode;

package/lib/ProTree/propsType.d.ts

@@ -200,7 +200,7 @@ export interface ProTreeType extends ProTreeSelectType {
      * @description value 改变的回调
      * @default undefined
      */
-    onChange?: (values: string[] | ProTreeValueType, options?: object[]) => void;
+    onChange?: (value: any, labelList?: ReactNode[], extra?: any) => void;
     /**
      * 选择回调
      * @description 点击树节点触发

package/lib/ProTree/style/index.less

@@ -1,5 +1,5 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
+/* @root-entry-name: 'default'; */
+/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 .pro-tree-wrap-ellipse {
   display: block;
@@ -73,6 +73,14 @@
       flex      : 1 1;
       overflow-y: auto;
       overflow-x: auto;
+      .@{ant-prefix}-tree-switcher:not(.@{ant-prefix}-tree-switcher-noop):hover:before{
+        background-color: transparent;
+      }
+      .@{ant-prefix}-tree-checkbox{
+        margin-top: 11px;
+        align-self: flex-start;
+      }
+
     }
 
     .tree-title-box {
@@ -107,10 +115,6 @@
       }
     }
 
-    .@{ant-prefix}-tree-checkbox {
-      margin-top: 11px;
-    }
-
     .@{ant-prefix}-tree-switcher {
       line-height: 44px;
     }

package/lib/ProTreeModal/components/Cascader.js

@@ -6,11 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-require("antd/es/checkbox/style");
-var _checkbox = _interopRequireDefault(require("antd/es/checkbox"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = require("react");
+var _antd = require("antd");
 var _ahooks = require("ahooks");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _SearchTitle = _interopRequireDefault(require("./SearchTitle"));
@@ -69,7 +68,7 @@ var Cascader = function Cascader(props) {
         })
       }), (0, _jsxRuntime.jsx)("div", {
         className: "pro-tree-modal-cascader-warp",
-        children: (0, _jsxRuntime.jsx)(_checkbox.default.Group, {
+        children: (0, _jsxRuntime.jsx)(_antd.Checkbox.Group, {
           disabled: disabled,
           style: {
             width: '100%'
@@ -84,7 +83,7 @@ var Cascader = function Cascader(props) {
                   label: title,
                   searchStr: searchStr
                 })
-              }) : (0, _jsxRuntime.jsx)(_checkbox.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
+              }) : (0, _jsxRuntime.jsx)(_antd.Checkbox, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
                 onChange: function onChange(e) {
                   return handleOnChange(e, item[fieldNameValue]);
                 },

package/lib/ProTreeModal/components/List.js

@@ -5,15 +5,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/col/style");
-var _col = _interopRequireDefault(require("antd/es/col"));
-require("antd/es/row/style");
-var _row = _interopRequireDefault(require("antd/es/row"));
-require("antd/es/checkbox/style");
-var _checkbox = _interopRequireDefault(require("antd/es/checkbox"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = require("react");
+var _antd = require("antd");
 var _core = require("@dnd-kit/core");
 var _sortable = require("@dnd-kit/sortable");
 var _ahooks = require("ahooks");
@@ -36,7 +31,6 @@ function List(props, ref) {
     fieldNames = props.fieldNames,
     draggable = props.draggable,
     modeType = props.modeType,
-    flatTreeData = props.flatTreeData,
     handleOnChange = props.handleOnChange,
     handleFilterClose = props.handleFilterClose,
     optionRender = props.optionRender,
@@ -195,9 +189,9 @@ function List(props, ref) {
     });
   }
   // 编辑状态
-  if (!isRowCols) {
+  if (!isRowCols && mode === 'render') {
     return (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
-      children: (0, _jsxRuntime.jsx)(_checkbox.default.Group, {
+      children: (0, _jsxRuntime.jsx)(_antd.Checkbox.Group, {
         disabled: disabled,
         style: {
           width: '100%'
@@ -212,7 +206,7 @@ function List(props, ref) {
           },
           children: (0, _jsxRuntime.jsx)("div", {
             ref: wrapperRef,
-            children: (0, _jsxRuntime.jsx)(_row.default, {
+            children: (0, _jsxRuntime.jsx)(_antd.Row, {
               children: list.map(function (_item) {
                 var item = _item.data;
                 var title = handleGetTitle(item);
@@ -220,15 +214,15 @@ function List(props, ref) {
                   label: title,
                   searchStr: searchStr
                 });
-                return (0, _jsxRuntime.jsx)(_col.default, {
+                return (0, _jsxRuntime.jsx)(_antd.Col, {
                   span: span || 24,
                   className: !span || span === 24 ? 'pro-tree-modal-checkbox-content' : '',
                   style: {
                     marginBottom: span ? 16 : 12
                   },
-                  children: (0, _jsxRuntime.jsx)(_checkbox.default, {
+                  children: (0, _jsxRuntime.jsx)(_antd.Checkbox, {
                     onChange: function onChange(e) {
-                      return handleOnChange(e, item[fieldNameValue]);
+                      return handleOnChange === null || handleOnChange === void 0 ? void 0 : handleOnChange(e, item[fieldNameValue]);
                     },
                     value: item[fieldNameValue],
                     disabled: item.disabled,
@@ -245,26 +239,26 @@ function List(props, ref) {
   // 编辑状态
   if (isRowCols) {
     return (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
-      children: (0, _jsxRuntime.jsx)(_checkbox.default.Group, {
+      children: (0, _jsxRuntime.jsx)(_antd.Checkbox.Group, {
         disabled: disabled,
         style: {
           width: '100%'
         },
         value: checkedValues,
-        children: (0, _jsxRuntime.jsx)(_row.default, {
+        children: (0, _jsxRuntime.jsx)(_antd.Row, {
           children: treeData.map(function (item) {
             var title = handleGetTitle(item);
             var content = optionRender ? optionRender(item, searchStr) : (0, _jsxRuntime.jsx)(_SearchTitle.default, {
               label: title,
               searchStr: searchStr
             });
-            return (0, _jsxRuntime.jsx)(_col.default, {
+            return (0, _jsxRuntime.jsx)(_antd.Col, {
               span: span || 24,
               className: !span || span === 24 ? 'pro-tree-modal-checkbox-content' : '',
               style: {
                 marginBottom: span ? 16 : 12
               },
-              children: (0, _jsxRuntime.jsx)(_checkbox.default, {
+              children: (0, _jsxRuntime.jsx)(_antd.Checkbox, {
                 onChange: function onChange(e) {
                   return handleOnChange(e, item[fieldNameValue]);
                 },

package/lib/ProTreeModal/components/SortableItem.js

@@ -5,10 +5,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/tag/style");
-var _tag = _interopRequireDefault(require("antd/es/tag"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _jsxRuntime = require("react/jsx-runtime");
+var _antd = require("antd");
 var _sortable = require("@dnd-kit/sortable");
 var _utilities = require("@dnd-kit/utilities");
 var _ProIcon = _interopRequireDefault(require("../../ProIcon"));
@@ -43,7 +42,7 @@ var SortableItem = function SortableItem(props) {
     style: style,
     className: "checked-item ".concat(item.disabled || disabled ? 'disabled' : '', " ").concat(drag ? 'dragable' : '')
   }, item.disabled ? {} : attributes), {}, {
-    children: (0, _jsxRuntime.jsxs)(_tag.default, {
+    children: (0, _jsxRuntime.jsxs)(_antd.Tag, {
       closable: true,
       onClose: function onClose(e) {
         return _onClose(e);

package/lib/ProTreeModal/components/Tree.js

@@ -5,13 +5,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/tree/style");
-var _tree = _interopRequireDefault(require("antd/es/tree"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = require("react");
+var _antd = require("antd");
 var _List = _interopRequireDefault(require("./List"));
 var _SearchTitle = _interopRequireDefault(require("./SearchTitle"));
 var _CloseIcon = _interopRequireDefault(require("./CloseIcon"));
@@ -184,7 +183,7 @@ function List(props, ref) {
     setAutoExpandParent(false);
   };
   if (mode === 'render') {
-    return (0, _jsxRuntime.jsx)(_tree.default, {
+    return (0, _jsxRuntime.jsx)(_antd.Tree, {
       disabled: disabled,
       style: {
         width: '100%'
@@ -211,7 +210,7 @@ function List(props, ref) {
       showCodeName: showCodeName,
       disabled: disabled,
       ref: ref
-    }, restProps)) : (0, _jsxRuntime.jsx)(_tree.default, {
+    }, restProps)) : (0, _jsxRuntime.jsx)(_antd.Tree, {
       style: {
         width: '100%'
       },

package/lib/ProTreeModal/components/Trigger.js

@@ -6,17 +6,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/input/style");
-var _input = _interopRequireDefault(require("antd/es/input"));
-require("antd/es/select/style");
-var _select = _interopRequireDefault(require("antd/es/select"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-require("antd/es/space/style");
-var _space = _interopRequireDefault(require("antd/es/space"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = require("react");
 var _classnames = _interopRequireDefault(require("classnames"));
+var _antd = require("antd");
 var _icons = require("@ant-design/icons");
 var _reactSvg = require("react-svg");
 var _ahooks = require("ahooks");
@@ -104,10 +99,10 @@ function Trigger(props) {
   };
   var TriggerComponent = function TriggerComponent(props) {
     if (appoint) {
-      return (0, _jsxRuntime.jsxs)(_space.default.Compact, {
+      return (0, _jsxRuntime.jsxs)(_antd.Space.Compact, {
         block: true,
         style: (0, _objectSpread2.default)({}, triggerStyle),
-        children: [(0, _jsxRuntime.jsxs)(_select.default, {
+        children: [(0, _jsxRuntime.jsxs)(_antd.Select, {
           style: {
             width: 'auto'
           },
@@ -116,11 +111,11 @@ function Trigger(props) {
           defaultValue: "appoint",
           value: state.mode,
           onChange: onAppointChange,
-          children: [(0, _jsxRuntime.jsx)(_select.default.Option, {
+          children: [(0, _jsxRuntime.jsx)(_antd.Select.Option, {
             value: "all",
             disabled: allDisabled,
             children: _locale.default === null || _locale.default === void 0 ? void 0 : _locale.default.ProTreeModal.specifyMode[0]
-          }), (0, _jsxRuntime.jsx)(_select.default.Option, {
+          }), (0, _jsxRuntime.jsx)(_antd.Select.Option, {
             value: "appoint",
             disabled: specifyDisabled,
             children: _locale.default === null || _locale.default === void 0 ? void 0 : _locale.default.ProTreeModal.specifyMode[1]
@@ -131,7 +126,7 @@ function Trigger(props) {
     return props.children;
   };
   return (0, _jsxRuntime.jsx)(TriggerComponent, {
-    children: (0, _jsxRuntime.jsx)(_input.default, {
+    children: (0, _jsxRuntime.jsx)(_antd.Input, {
       className: (0, _classnames.default)(afterDisabled ? 'trigger-no-hover' : '', appoint ? 'pro-tree-modal-input-appoint' : ''),
       onClick: handleClick,
       value: checkedValues.length === 0 ? null : state.mode === 'all' ? (0, _locale.formatMessage)(_locale.default === null || _locale.default === void 0 ? void 0 : _locale.default.ProTreeModal.checkAll1, {

package/lib/ProTreeModal/index.d.ts

@@ -1,5 +1,4 @@
 import type { ProTreeModalType } from './propsType';
-import './style/index.less';
 export declare const CASCADER = "CASCADER";
 declare const ProTreeModal: (props: ProTreeModalType) => import("react/jsx-runtime").JSX.Element;
 export default ProTreeModal;