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

package/es/ProTree/index.js

@@ -1,12 +1,5 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { jsx as _jsx } from "react/jsx-runtime";
-/* 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
- */
 import ProTree from './components/ProTree';
 import ProTreeSelect from './components/ProTreeSelect';
 var ProTreeHandle = function ProTreeHandle(props) {

package/es/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/es/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/es/ProTreeModal/components/Cascader.js

@@ -1,9 +1,8 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import "antd/es/checkbox/style";
-import _Checkbox from "antd/es/checkbox";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useEffect } from 'react';
+import { Checkbox } from 'antd';
 import { useSetState } from 'ahooks';
 import classNames from 'classnames';
 import SearchTitle from './SearchTitle';
@@ -62,7 +61,7 @@ var Cascader = function Cascader(props) {
         })
       }), _jsx("div", {
         className: "pro-tree-modal-cascader-warp",
-        children: _jsx(_Checkbox.Group, {
+        children: _jsx(Checkbox.Group, {
           disabled: disabled,
           style: {
             width: '100%'
@@ -77,7 +76,7 @@ var Cascader = function Cascader(props) {
                   label: title,
                   searchStr: searchStr
                 })
-              }) : _jsx(_Checkbox, _objectSpread(_objectSpread({}, item), {}, {
+              }) : _jsx(Checkbox, _objectSpread(_objectSpread({}, item), {}, {
                 onChange: function onChange(e) {
                   return handleOnChange(e, item[fieldNameValue]);
                 },

package/es/ProTreeModal/components/List.js

@@ -1,13 +1,8 @@
-import "antd/es/col/style";
-import _Col from "antd/es/col";
-import "antd/es/row/style";
-import _Row from "antd/es/row";
-import "antd/es/checkbox/style";
-import _Checkbox from "antd/es/checkbox";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 /* eslint-disable brace-style */
 import { forwardRef, useImperativeHandle, useMemo, useRef } from 'react';
+import { Checkbox, Col, Row } from 'antd';
 import { DndContext } from '@dnd-kit/core';
 import { arrayMove, SortableContext, verticalListSortingStrategy } from '@dnd-kit/sortable';
 import { useDeepCompareEffect, useSetState, useVirtualList } from 'ahooks';
@@ -28,7 +23,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,
@@ -187,9 +181,9 @@ function List(props, ref) {
     });
   }
   // 编辑状态
-  if (!isRowCols) {
+  if (!isRowCols && mode === 'render') {
     return _jsx(_Fragment, {
-      children: _jsx(_Checkbox.Group, {
+      children: _jsx(Checkbox.Group, {
         disabled: disabled,
         style: {
           width: '100%'
@@ -204,7 +198,7 @@ function List(props, ref) {
           },
           children: _jsx("div", {
             ref: wrapperRef,
-            children: _jsx(_Row, {
+            children: _jsx(Row, {
               children: list.map(function (_item) {
                 var item = _item.data;
                 var title = handleGetTitle(item);
@@ -212,15 +206,15 @@ function List(props, ref) {
                   label: title,
                   searchStr: searchStr
                 });
-                return _jsx(_Col, {
+                return _jsx(Col, {
                   span: span || 24,
                   className: !span || span === 24 ? 'pro-tree-modal-checkbox-content' : '',
                   style: {
                     marginBottom: span ? 16 : 12
                   },
-                  children: _jsx(_Checkbox, {
+                  children: _jsx(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,
@@ -237,26 +231,26 @@ function List(props, ref) {
   // 编辑状态
   if (isRowCols) {
     return _jsx(_Fragment, {
-      children: _jsx(_Checkbox.Group, {
+      children: _jsx(Checkbox.Group, {
         disabled: disabled,
         style: {
           width: '100%'
         },
         value: checkedValues,
-        children: _jsx(_Row, {
+        children: _jsx(Row, {
           children: treeData.map(function (item) {
             var title = handleGetTitle(item);
             var content = optionRender ? optionRender(item, searchStr) : _jsx(SearchTitle, {
               label: title,
               searchStr: searchStr
             });
-            return _jsx(_Col, {
+            return _jsx(Col, {
               span: span || 24,
               className: !span || span === 24 ? 'pro-tree-modal-checkbox-content' : '',
               style: {
                 marginBottom: span ? 16 : 12
               },
-              children: _jsx(_Checkbox, {
+              children: _jsx(Checkbox, {
                 onChange: function onChange(e) {
                   return handleOnChange(e, item[fieldNameValue]);
                 },

package/es/ProTreeModal/components/SortableItem.js

@@ -1,7 +1,6 @@
-import "antd/es/tag/style";
-import _Tag from "antd/es/tag";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { Tag } from 'antd';
 import { useSortable } from '@dnd-kit/sortable';
 import { CSS } from '@dnd-kit/utilities';
 import ProIcon from '../../ProIcon';
@@ -36,7 +35,7 @@ var SortableItem = function SortableItem(props) {
     style: style,
     className: "checked-item ".concat(item.disabled || disabled ? 'disabled' : '', " ").concat(drag ? 'dragable' : '')
   }, item.disabled ? {} : attributes), {}, {
-    children: _jsxs(_Tag, {
+    children: _jsxs(Tag, {
       closable: true,
       onClose: function onClose(e) {
         return _onClose(e);

package/es/ProTreeModal/components/Tree.js

@@ -1,5 +1,3 @@
-import "antd/es/tree/style";
-import _Tree from "antd/es/tree";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
@@ -7,6 +5,7 @@ var _excluded = ["checkedValues", "disabled", "treeData", "searchStr", "original
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 /* eslint-disable no-plusplus */
 import { forwardRef, useEffect, useMemo, useState } from 'react';
+import { Tree } from 'antd';
 import ListComponent from './List';
 import SearchTitle from './SearchTitle';
 import CloseIcon from './CloseIcon';
@@ -177,7 +176,7 @@ function List(props, ref) {
     setAutoExpandParent(false);
   };
   if (mode === 'render') {
-    return _jsx(_Tree, {
+    return _jsx(Tree, {
       disabled: disabled,
       style: {
         width: '100%'
@@ -204,7 +203,7 @@ function List(props, ref) {
       showCodeName: showCodeName,
       disabled: disabled,
       ref: ref
-    }, restProps)) : _jsx(_Tree, {
+    }, restProps)) : _jsx(Tree, {
       style: {
         width: '100%'
       },

package/es/ProTreeModal/components/Trigger.js

@@ -1,14 +1,9 @@
-import "antd/es/input/style";
-import _Input from "antd/es/input";
-import "antd/es/select/style";
-import _Select from "antd/es/select";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import "antd/es/space/style";
-import _Space from "antd/es/space";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect } from 'react';
 import classNames from 'classnames';
+import { Input, Select, Space } from 'antd';
 import { CloseOutlined } from '@ant-design/icons';
 import { ReactSVG } from 'react-svg';
 import { useSetState } from 'ahooks';
@@ -96,10 +91,10 @@ function Trigger(props) {
   };
   var TriggerComponent = function TriggerComponent(props) {
     if (appoint) {
-      return _jsxs(_Space.Compact, {
+      return _jsxs(Space.Compact, {
         block: true,
         style: _objectSpread({}, triggerStyle),
-        children: [_jsxs(_Select, {
+        children: [_jsxs(Select, {
           style: {
             width: 'auto'
           },
@@ -108,11 +103,11 @@ function Trigger(props) {
           defaultValue: "appoint",
           value: state.mode,
           onChange: onAppointChange,
-          children: [_jsx(_Select.Option, {
+          children: [_jsx(Select.Option, {
             value: "all",
             disabled: allDisabled,
             children: locale === null || locale === void 0 ? void 0 : locale.ProTreeModal.specifyMode[0]
-          }), _jsx(_Select.Option, {
+          }), _jsx(Select.Option, {
             value: "appoint",
             disabled: specifyDisabled,
             children: locale === null || locale === void 0 ? void 0 : locale.ProTreeModal.specifyMode[1]
@@ -123,7 +118,7 @@ function Trigger(props) {
     return props.children;
   };
   return _jsx(TriggerComponent, {
-    children: _jsx(_Input, {
+    children: _jsx(Input, {
       className: classNames(afterDisabled ? 'trigger-no-hover' : '', appoint ? 'pro-tree-modal-input-appoint' : ''),
       onClick: handleClick,
       value: checkedValues.length === 0 ? null : state.mode === 'all' ? formatMessage(locale === null || locale === void 0 ? void 0 : locale.ProTreeModal.checkAll1, {

package/es/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;

package/es/ProTreeModal/index.js

@@ -1,13 +1,5 @@
-import "antd/es/button/style";
-import _Button from "antd/es/button";
-import "antd/es/input/style";
-import _Input from "antd/es/input";
-import "antd/es/checkbox/style";
-import _Checkbox from "antd/es/checkbox";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _typeof from "@babel/runtime/helpers/esm/typeof";
-import "antd/es/message/style";
-import _message from "antd/es/message";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _isFunction from "lodash/isFunction";
@@ -15,6 +7,7 @@ import _cloneDeep from "lodash/cloneDeep";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import React, { useEffect, useMemo, useRef } from 'react';
 import { useDeepCompareEffect, useSetState, useRequest as useRequestFunc, useDebounceFn } from 'ahooks';
+import { Button, Checkbox, Input, message } from 'antd';
 import { ReactSVG } from 'react-svg';
 import classNames from 'classnames';
 import { ProDrawerForm, useProConfig } from '../index';
@@ -23,16 +16,15 @@ import { getFlatTreeData, filterCheckedNodes, getChildrenKeys, findTreeNodeByKey
 import { transformTreeToArray, treeNodeFind } from '../ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/utils/index';
 import searchSVG from '../assets/input-search.svg';
 import locale, { formatMessage } from '../locale';
-import './style/index.less';
 var LIST = 'LIST';
 var TREE = 'TREE';
 export var CASCADER = 'CASCADER';
 var ProTreeModal = function ProTreeModal(props) {
-  var _locale$ProTreeModal, _props$otherProps, _props$otherProps2, _locale$ProTreeModal9, _locale$ProTreeModal10, _locale$ProTreeModal11, _locale$ProTreeModal12;
+  var _locale$ProTreeModal, _props$otherProps, _props$otherProps2, _locale$ProTreeModal9, _locale$ProTreeModal0, _locale$ProTreeModal1, _locale$ProTreeModal10;
   var _useProConfig = useProConfig('ProEnum'),
     _useProConfig$dics = _useProConfig.dics,
     dics = _useProConfig$dics === void 0 ? {} : _useProConfig$dics;
-  var listRef = useRef();
+  var listRef = useRef(null);
   var open = props.open,
     value = props.value,
     onChange = props.onChange,
@@ -109,7 +101,7 @@ var ProTreeModal = function ProTreeModal(props) {
         responseData = transformResponse(res);
       }
       if (status !== 200) {
-        _message.error(msg);
+        message.error(msg);
         return;
       }
       setState({
@@ -262,7 +254,7 @@ var ProTreeModal = function ProTreeModal(props) {
       if (min) {
         if (values.length < min) {
           var _locale$ProTreeModal3;
-          _message.error(formatMessage(locale === null || locale === void 0 ? void 0 : (_locale$ProTreeModal3 = locale.ProTreeModal) === null || _locale$ProTreeModal3 === void 0 ? void 0 : _locale$ProTreeModal3.selectMin, {
+          message.error(formatMessage(locale === null || locale === void 0 ? void 0 : (_locale$ProTreeModal3 = locale.ProTreeModal) === null || _locale$ProTreeModal3 === void 0 ? void 0 : _locale$ProTreeModal3.selectMin, {
             min: min
           }));
           return;
@@ -292,7 +284,6 @@ var ProTreeModal = function ProTreeModal(props) {
     })) === null || _state$flatTreeData$f === void 0 ? void 0 : _state$flatTreeData$f.map(function (item) {
       return item[fieldNameValue];
     }) : [];
-    onChange === null || onChange === void 0 ? void 0 : onChange([]);
     setState({
       checkedValues: _checkedValues,
       beforeClearAllValues: state.checkedValues,
@@ -309,7 +300,6 @@ var ProTreeModal = function ProTreeModal(props) {
       checkedValues: state.beforeClearAllValues,
       beforeClearAllValues: []
     });
-    // onChange?.(state.beforeClearAllValues);
     openChange === null || openChange === void 0 ? void 0 : openChange(false);
   };
   /**
@@ -341,7 +331,7 @@ var ProTreeModal = function ProTreeModal(props) {
     }
     if (max && checkedValues.length > max) {
       var _locale$ProTreeModal4;
-      _message.error(maxMessage ? transformMessage({
+      message.error(maxMessage ? transformMessage({
         max: max
       }, maxMessage) : formatMessage(locale === null || locale === void 0 ? void 0 : (_locale$ProTreeModal4 = locale.ProTreeModal) === null || _locale$ProTreeModal4 === void 0 ? void 0 : _locale$ProTreeModal4.selectMax, {
         max: max
@@ -453,7 +443,7 @@ var ProTreeModal = function ProTreeModal(props) {
     }
     if (max && checkedValues.length > max) {
       var _locale$ProTreeModal5;
-      _message.error(maxMessage ? transformMessage({
+      message.error(maxMessage ? transformMessage({
         max: max
       }, maxMessage) : formatMessage(locale === null || locale === void 0 ? void 0 : (_locale$ProTreeModal5 = locale.ProTreeModal) === null || _locale$ProTreeModal5 === void 0 ? void 0 : _locale$ProTreeModal5.selectMax, {
         max: max
@@ -626,7 +616,7 @@ var ProTreeModal = function ProTreeModal(props) {
     }
     if (max && checkedValues.length > max) {
       var _locale$ProTreeModal6;
-      _message.error(maxMessage ? transformMessage({
+      message.error(maxMessage ? transformMessage({
         max: max
       }, maxMessage) : formatMessage(locale === null || locale === void 0 ? void 0 : (_locale$ProTreeModal6 = locale.ProTreeModal) === null || _locale$ProTreeModal6 === void 0 ? void 0 : _locale$ProTreeModal6.selectMax, {
         max: max
@@ -779,7 +769,7 @@ var ProTreeModal = function ProTreeModal(props) {
         title: title,
         showType: "Modal",
         className: "pro-tree-modal-container",
-        extraLeft: allValue !== undefined ? _jsx(_Checkbox, {
+        extraLeft: allValue !== undefined ? _jsx(Checkbox, {
           checked: state.checkAll,
           disabled: disabled,
           onChange: handleAllCheck,
@@ -789,11 +779,11 @@ var ProTreeModal = function ProTreeModal(props) {
           className: "pro-tree-modal-content",
           children: [_jsxs("div", {
             className: classNames('pro-tree-modal-box', modeType === CASCADER || modeType === LIST && span ? 'pro-tree-modal-cascader-box' : ''),
-            children: [_jsx(_Input, {
+            children: [_jsx(Input, {
               disabled: disabled,
               allowClear: true,
               value: state.searchStr,
-              placeholder: placeholder || (locale === null || locale === void 0 ? void 0 : (_locale$ProTreeModal10 = locale.ProTreeModal) === null || _locale$ProTreeModal10 === void 0 ? void 0 : _locale$ProTreeModal10.input),
+              placeholder: placeholder || (locale === null || locale === void 0 ? void 0 : (_locale$ProTreeModal0 = locale.ProTreeModal) === null || _locale$ProTreeModal0 === void 0 ? void 0 : _locale$ProTreeModal0.input),
               className: "pro-tree-modal-search",
               onChange: function onChange(e) {
                 return handleSetSearchStr(e.target.value);
@@ -811,12 +801,12 @@ var ProTreeModal = function ProTreeModal(props) {
             children: [_jsxs("div", {
               className: "pro-tree-modal-box-header",
               children: [_jsxs("span", {
-                children: [locale === null || locale === void 0 ? void 0 : (_locale$ProTreeModal11 = locale.ProTreeModal) === null || _locale$ProTreeModal11 === void 0 ? void 0 : _locale$ProTreeModal11.check, " (", state.checkedValues.length, "/", max || state.flatTreeData.length, ")"]
-              }), _jsx(_Button, {
+                children: [locale === null || locale === void 0 ? void 0 : (_locale$ProTreeModal1 = locale.ProTreeModal) === null || _locale$ProTreeModal1 === void 0 ? void 0 : _locale$ProTreeModal1.check, " (", state.checkedValues.length, "/", max || state.flatTreeData.length, ")"]
+              }), _jsx(Button, {
                 disabled: disabled,
                 type: "link",
                 onClick: handleClearAll,
-                children: locale === null || locale === void 0 ? void 0 : (_locale$ProTreeModal12 = locale.ProTreeModal) === null || _locale$ProTreeModal12 === void 0 ? void 0 : _locale$ProTreeModal12.clearAll
+                children: locale === null || locale === void 0 ? void 0 : (_locale$ProTreeModal10 = locale.ProTreeModal) === null || _locale$ProTreeModal10 === void 0 ? void 0 : _locale$ProTreeModal10.clearAll
               })]
             }), _jsx("div", {
               className: "pro-tree-modal-tree-warp  pro-transfer-right",

package/es/ProTreeModal/style/index.less

@@ -1,8 +1,8 @@
-@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-modal-container .@{ant-prefix}-modal-content .@{ant-prefix}-modal-body {
-  max-height: 498px;
+  max-height: 498px !important;
 }
 
 .pro-tree-modal {
@@ -26,8 +26,16 @@
     flex-direction: row;
     height: 482px;
     margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
+    .checked-container {
+      .@{ant-prefix}-btn {
+        &:active {
+          background: transparent;
+        }
+      }
+    }
 
     .@{ant-prefix}-tree-checkbox {
+      align-self: flex-start;
       margin-top: 2px;
     }
 
@@ -238,6 +246,9 @@
 }
 
 .pro-transfer-right {
+  .@{ant-prefix}-checkbox {
+    align-items: flex-start;
+  }
   .checked-item {
     margin: var(--zaui-space-size-sm, 8px) 0;
     &.dragable {

package/es/ProUpload/components/ButtonRender.js

@@ -1,11 +1,9 @@
-import "antd/es/button/style";
-import _Button from "antd/es/button";
-import "antd/es/upload/style";
-import _Upload from "antd/es/upload";
-import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+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); }
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { Button, Upload } from 'antd';
 import { DndContext } from '@dnd-kit/core';
 import { SortableContext, rectSortingStrategy } from '@dnd-kit/sortable';
 import { CloudUploadOutlined } from '@ant-design/icons';
@@ -42,25 +40,24 @@ var ButtonRender = function ButtonRender(props) {
           isConfirmDelete: isConfirmDelete,
           onPreview: onPreview,
           onRemove: function () {
-            var _onRemove2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(file) {
+            var _onRemove2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(file) {
               var res;
-              return _regeneratorRuntime().wrap(function _callee$(_context) {
-                while (1) switch (_context.prev = _context.next) {
+              return _regenerator().w(function (_context) {
+                while (1) switch (_context.n) {
                   case 0:
-                    _context.next = 2;
+                    _context.n = 1;
                     return _onRemove === null || _onRemove === void 0 ? void 0 : _onRemove(file);
-                  case 2:
-                    res = _context.sent;
+                  case 1:
+                    res = _context.v;
                     if (!(res === false)) {
-                      _context.next = 5;
+                      _context.n = 2;
                       break;
                     }
-                    return _context.abrupt("return");
-                  case 5:
+                    return _context.a(2);
+                  case 2:
                     actions.remove(file);
-                  case 6:
-                  case "end":
-                    return _context.stop();
+                  case 3:
+                    return _context.a(2);
                 }
               }, _callee);
             }));
@@ -84,10 +81,10 @@ var ButtonRender = function ButtonRender(props) {
           return i.uid;
         }),
         strategy: rectSortingStrategy,
-        children: _jsx(_Upload, _objectSpread(_objectSpread({}, buttonUploadProps), {}, {
+        children: _jsx(Upload, _objectSpread(_objectSpread({}, buttonUploadProps), {}, {
           children: !isView && _jsxs("div", {
             className: "pro-upload-button-inner",
-            children: [_jsxs(_Button, _objectSpread(_objectSpread({}, buttonProps), {}, {
+            children: [_jsxs(Button, _objectSpread(_objectSpread({}, buttonProps), {}, {
               disabled: disabled || isView,
               children: [_jsx(CloudUploadOutlined, {}), buttonText]
             })), afterRender ? _jsx("div", {
@@ -102,7 +99,7 @@ var ButtonRender = function ButtonRender(props) {
       })
     }), extraTipText && _jsx("div", {
       className: "upload-tip-txt",
-      children: extraTipText
+      children: typeof extraTipText === 'function' ? extraTipText() : extraTipText
     })]
   });
 };

package/es/ProUpload/components/DragRender.js

@@ -1,15 +1,14 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import "antd/es/upload/style";
-import _Upload from "antd/es/upload";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useRef } from 'react';
+import { Upload } from 'antd';
 import { DndContext } from '@dnd-kit/core';
 import { SortableContext, rectSortingStrategy } from '@dnd-kit/sortable';
 import { CloudUploadOutlined } from '@ant-design/icons';
 import { DragSingleFileItem, FileItem, getFileExt, getFileIcon } from './FileItem';
 import { DraggableUploadListItem } from './DraggableUploadListItem';
 import locale from '../../locale';
-var Dragger = _Upload.Dragger;
+var Dragger = Upload.Dragger;
 var DragRender = function DragRender(props) {
   var _locale$ProUpload3, _locale$ProUpload4, _locale$ProUpload5, _locale$ProUpload6;
   var isView = props.isView,

package/es/ProUpload/components/FileItem.d.ts

@@ -1,6 +1,5 @@
 import React from 'react';
 import { UploadFile } from 'antd/es/upload/interface';
-import '../style/fileItem.less';
 /**
  * @description: b 转成 Kb
  * @param {*} num