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

package/lib/ProSelect/components/AdaptiveTooltip.js

@@ -5,9 +5,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/tooltip/style");
-var _tooltip = _interopRequireDefault(require("antd/es/tooltip"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _antd = require("antd");
 var _react = require("react");
 var _jsxRuntime = require("react/jsx-runtime");
 var AdaptiveTooltip = _ref => {
@@ -35,7 +34,7 @@ var AdaptiveTooltip = _ref => {
       window.removeEventListener('resize', handleResize);
     };
   }, [children]);
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.default, {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Tooltip, {
     placement: placement,
     title: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       onMouseDown: e => e.stopPropagation(),

package/lib/ProSelect/index.js

@@ -6,18 +6,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.ProSelect = void 0;
-require("antd/es/space/style");
-var _space = _interopRequireDefault(require("antd/es/space"));
-require("antd/es/input/style");
-var _input = _interopRequireDefault(require("antd/es/input"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-require("antd/es/message/style");
-var _message2 = _interopRequireDefault(require("antd/es/message"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-require("antd/es/select/style");
-var _select = _interopRequireDefault(require("antd/es/select"));
 var _ahooks = require("ahooks");
+var _antd = require("antd");
 var _react = _interopRequireWildcard(require("react"));
 var _lodash = require("lodash");
 var _ProConfigProvider = require("../ProConfigProvider");
@@ -29,7 +22,7 @@ var _utils = require("./utils");
 require("./index.less");
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["dataSource", "defaultDisableValue", "useRequest", "fieldNames", "tooltip", "otherProps", "labelInValue", "filterInList", "scrollFollowParent", "defaultOne", "onSearch", "optionRender", "onChange", "updateDataSource", "transformResponse", "getValueProps", "isView"];
-var Option = _select.default.Option;
+var Option = _antd.Select.Option;
 var ProSelect = (props, ref) => {
   var _selectProps$showCode, _useRequest$options3, _locale$ProSelect;
   var _ref = (0, _ProConfigProvider.useProConfig)('ProSelect') || {},
@@ -92,7 +85,7 @@ var ProSelect = (props, ref) => {
       msg = res.message,
       data = res.data;
     if (status !== 200) {
-      _message2.default.error(msg);
+      _antd.message.error(msg);
       return;
     }
     setSelectList(data || []);
@@ -107,7 +100,7 @@ var ProSelect = (props, ref) => {
       msg = _ref3.message,
       data = _ref3.data;
     if (status !== 200) {
-      _message2.default.error(msg);
+      _antd.message.error(msg);
       return;
     }
     return data;
@@ -176,7 +169,7 @@ var ProSelect = (props, ref) => {
   if (defaultDisableValue) {
     return /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
       title: defaultDisableValue,
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_input.default, {
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Input, {
         disabled: true,
         defaultValue: defaultDisableValue,
         style: props === null || props === void 0 ? void 0 : props.style
@@ -217,7 +210,7 @@ var ProSelect = (props, ref) => {
       record.forEach(item => {
         arr.push(props.optionRender(item));
       });
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_space.default, {
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Space, {
         direction: "vertical",
         size: 4,
         children: arr.map(item => /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.default.Fragment, {
@@ -327,10 +320,9 @@ var ProSelect = (props, ref) => {
   return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
     style: props.style,
     className: "pro-select",
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_select.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Select, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       placeholder: _locale.default === null || _locale.default === void 0 || (_locale$ProSelect = _locale.default.ProSelect) === null || _locale$ProSelect === void 0 ? void 0 : _locale$ProSelect.select,
       allowClear: true,
-      showArrow: true,
       loading: fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.loading,
       onChange: handleChange,
       showSearch: true,

package/lib/ProSelect/index.less

@@ -1,5 +1,3 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
 
 .pro-select-ellipse {
   display: block;

package/lib/ProSelect/propsType.d.ts

@@ -10,7 +10,7 @@ export interface DataOptionType {
      * @description 展示标签
      * @default -
      */
-    label?: string;
+    label?: ReactNode;
     /**
      * @description 选项值
      * @default -

package/lib/ProStep/components/Anchor/index.js

@@ -5,9 +5,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.MenuItem = void 0;
-require("antd/es/badge/style");
-var _badge = _interopRequireDefault(require("antd/es/badge"));
 var _classnames = _interopRequireDefault(require("classnames"));
+var _antd = require("antd");
 var _utils = require("../../utils");
 var _jsxRuntime = require("react/jsx-runtime");
 var AnchorSvg = _ref => {
@@ -107,7 +106,7 @@ var MenuItem = props => {
       className: "pro-step-checked-status",
       children: [isChecked && /*#__PURE__*/(0, _jsxRuntime.jsx)(SuccessSvg, {}), errorNum > 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
         className: "pro-step-error-dot",
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_badge.default, {
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Badge, {
           count: errorNum
         })
       })]

package/lib/ProStep/components/Item/index.js

@@ -14,7 +14,7 @@ var _lodash = require("lodash");
 var _index = require("../../index");
 var _ProCollapse = _interopRequireDefault(require("../../../ProLayout/components/ProCollapse"));
 var _jsxRuntime = require("react/jsx-runtime");
-var _excluded = ["id", "title", "collapse", "children", "lazyLoad", "order"];
+var _excluded = ["id", "title", "collapse", "children", "lazyLoad", "order"]; // @ts-nocheck
 // 默认的懒加载配置
 var defaultLazyLoadConfig = {
   height: 200,

package/lib/ProStep/components/Step/index.js

@@ -69,6 +69,7 @@ var Step = _ref => {
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_index.default, {
         src: _catalog.default,
         className: "pro-step-menu-icon",
+        size: 48,
         actionMap: {}
       }), onOff && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
         children: _locale.default === null || _locale.default === void 0 || (_locale$ProStep = _locale.default.ProStep) === null || _locale$ProStep === void 0 ? void 0 : _locale$ProStep.catalogue

package/lib/ProStep/style/index.less

@@ -1,5 +1,3 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
 
 .pro-step-wrapper {
   padding-right: 48px;
@@ -8,7 +6,7 @@
 .pro-step {
   position: fixed;
   right: 0;
-  z-index: 999;
+  z-index: 99;
   min-width: 48px;
   min-height: 48px;
   overflow-x: hidden;
@@ -33,7 +31,7 @@
       justify-content: center;
       width: 48px;
       height: 24px;
-      > .pro-step-menu-icon {
+      .pro-step-menu-icon {
         width: auto !important;
         height: auto !important;
         font-size: var(--zaui-font-size-lg-title, 24px);

package/lib/ProTable/components/FormatColumn/index.js

@@ -6,14 +6,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getParentElement = exports.formatColumn = void 0;
-require("antd/es/space/style");
-var _space = _interopRequireDefault(require("antd/es/space"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
-var _moment15 = _interopRequireDefault(require("moment"));
+var _dayjs15 = _interopRequireDefault(require("dayjs"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _reactDom = _interopRequireDefault(require("react-dom"));
+var _antd = require("antd");
 var _lodash = require("lodash");
 var _utils = require("@zat-design/utils");
 var _TooltipTitle = _interopRequireDefault(require("../TooltipTitle"));
@@ -21,7 +20,7 @@ var _RenderColumn = _interopRequireDefault(require("../RenderColumn"));
 var _utils2 = require("../../utils");
 var _utils3 = require("../../../utils");
 var _getEnumLabel = _interopRequireDefault(require("../../../ProEnum/utils/getEnumLabel"));
-var _ProForm = _interopRequireDefault(require("../../../ProForm"));
+var _index = require("../../../ProForm/components/index");
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["title", "valueType", "format", "precision", "ellipsis", "code", "copyable", "width", "tooltip", "transform", "prefix", "suffix", "dataIndex", "toolTipProps", "minWidth", "onDiff"];
 /**
@@ -250,7 +249,7 @@ var formatColumn = _ref2 => {
           children: "-"
         });
       }
-      var node = /*#__PURE__*/(0, _jsxRuntime.jsxs)(_space.default, {
+      var node = /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space, {
         size: 8,
         children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
       });
@@ -284,7 +283,7 @@ var formatColumn = _ref2 => {
       if ((0, _utils3.isEmpty)(originalValue)) {
         originalRenderValue = '-';
       }
-      var node = /*#__PURE__*/(0, _jsxRuntime.jsxs)(_space.default, {
+      var node = /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space, {
         size: 8,
         children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
       });
@@ -313,34 +312,34 @@ var formatColumn = _ref2 => {
     };
   } else if (['datePicker', 'date', 'dateTime', 'dateStartTime', 'dateEndTime', 'dateStartEndTime'].includes(valueType)) {
     column.render = (value, record, index) => {
-      var _moment, _moment2, _moment3, _moment4, _moment5, _moment6, _moment7, _moment8, _moment9, _moment10, _moment11, _moment12, _moment13, _moment14;
-      var renderValue = (_moment = (0, _moment15.default)(value)) === null || _moment === void 0 ? void 0 : _moment.format(format);
+      var _dayjs, _dayjs2, _dayjs3, _dayjs4, _dayjs5, _dayjs6, _dayjs7, _dayjs8, _dayjs9, _dayjs10, _dayjs11, _dayjs12, _dayjs13, _dayjs14;
+      var renderValue = (_dayjs = (0, _dayjs15.default)(value)) === null || _dayjs === void 0 ? void 0 : _dayjs.format(format);
       var originalResult = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
       var isChanged = originalResult.isChanged,
         originalValue = originalResult.originalValue,
         isAddCell = originalResult.isAddCell;
       otherProps.isChanged = isChanged;
-      var originalRenderValue = (_moment2 = (0, _moment15.default)(originalValue)) === null || _moment2 === void 0 ? void 0 : _moment2.format(format);
+      var originalRenderValue = (_dayjs2 = (0, _dayjs15.default)(originalValue)) === null || _dayjs2 === void 0 ? void 0 : _dayjs2.format(format);
       switch (valueType) {
         case 'date':
-          renderValue = (_moment3 = (0, _moment15.default)(value)) === null || _moment3 === void 0 ? void 0 : _moment3.format('YYYY-MM-DD');
-          originalRenderValue = (_moment4 = (0, _moment15.default)(originalValue)) === null || _moment4 === void 0 ? void 0 : _moment4.format('YYYY-MM-DD');
+          renderValue = (_dayjs3 = (0, _dayjs15.default)(value)) === null || _dayjs3 === void 0 ? void 0 : _dayjs3.format('YYYY-MM-DD');
+          originalRenderValue = (_dayjs4 = (0, _dayjs15.default)(originalValue)) === null || _dayjs4 === void 0 ? void 0 : _dayjs4.format('YYYY-MM-DD');
           break;
         case 'dateTime':
-          renderValue = (_moment5 = (0, _moment15.default)(value)) === null || _moment5 === void 0 ? void 0 : _moment5.format('YYYY-MM-DD HH:mm:ss');
-          originalRenderValue = (_moment6 = (0, _moment15.default)(originalValue)) === null || _moment6 === void 0 ? void 0 : _moment6.format('YYYY-MM-DD HH:mm:ss');
+          renderValue = (_dayjs5 = (0, _dayjs15.default)(value)) === null || _dayjs5 === void 0 ? void 0 : _dayjs5.format('YYYY-MM-DD HH:mm:ss');
+          originalRenderValue = (_dayjs6 = (0, _dayjs15.default)(originalValue)) === null || _dayjs6 === void 0 ? void 0 : _dayjs6.format('YYYY-MM-DD HH:mm:ss');
           break;
         case 'dateStartTime':
-          renderValue = `${(_moment7 = (0, _moment15.default)(value)) === null || _moment7 === void 0 ? void 0 : _moment7.format('YYYY-MM-DD')} 00:00:00`;
-          originalRenderValue = `${(_moment8 = (0, _moment15.default)(originalValue)) === null || _moment8 === void 0 ? void 0 : _moment8.format('YYYY-MM-DD')} 00:00:00`;
+          renderValue = `${(_dayjs7 = (0, _dayjs15.default)(value)) === null || _dayjs7 === void 0 ? void 0 : _dayjs7.format('YYYY-MM-DD')} 00:00:00`;
+          originalRenderValue = `${(_dayjs8 = (0, _dayjs15.default)(originalValue)) === null || _dayjs8 === void 0 ? void 0 : _dayjs8.format('YYYY-MM-DD')} 00:00:00`;
           break;
         case 'dateEndTime':
-          renderValue = `${(_moment9 = (0, _moment15.default)(value)) === null || _moment9 === void 0 ? void 0 : _moment9.format('YYYY-MM-DD')} 23:59:59`;
-          originalRenderValue = `${(_moment10 = (0, _moment15.default)(originalValue)) === null || _moment10 === void 0 ? void 0 : _moment10.format('YYYY-MM-DD')} 23:59:59`;
+          renderValue = `${(_dayjs9 = (0, _dayjs15.default)(value)) === null || _dayjs9 === void 0 ? void 0 : _dayjs9.format('YYYY-MM-DD')} 23:59:59`;
+          originalRenderValue = `${(_dayjs10 = (0, _dayjs15.default)(originalValue)) === null || _dayjs10 === void 0 ? void 0 : _dayjs10.format('YYYY-MM-DD')} 23:59:59`;
           break;
         case 'dateStartEndTime':
-          renderValue = `${(_moment11 = (0, _moment15.default)(value === null || value === void 0 ? void 0 : value[0])) === null || _moment11 === void 0 ? void 0 : _moment11.format('YYYY-MM-DD')} 00:00:00~${(_moment12 = (0, _moment15.default)(value === null || value === void 0 ? void 0 : value[1])) === null || _moment12 === void 0 ? void 0 : _moment12.format('YYYY-MM-DD')} 23:59:59`;
-          originalRenderValue = `${(_moment13 = (0, _moment15.default)(originalValue === null || originalValue === void 0 ? void 0 : originalValue[0])) === null || _moment13 === void 0 ? void 0 : _moment13.format('YYYY-MM-DD')} 00:00:00~${(_moment14 = (0, _moment15.default)(originalValue === null || originalValue === void 0 ? void 0 : originalValue[1])) === null || _moment14 === void 0 ? void 0 : _moment14.format('YYYY-MM-DD')} 23:59:59`;
+          renderValue = `${(_dayjs11 = (0, _dayjs15.default)(value === null || value === void 0 ? void 0 : value[0])) === null || _dayjs11 === void 0 ? void 0 : _dayjs11.format('YYYY-MM-DD')} 00:00:00~${(_dayjs12 = (0, _dayjs15.default)(value === null || value === void 0 ? void 0 : value[1])) === null || _dayjs12 === void 0 ? void 0 : _dayjs12.format('YYYY-MM-DD')} 23:59:59`;
+          originalRenderValue = `${(_dayjs13 = (0, _dayjs15.default)(originalValue === null || originalValue === void 0 ? void 0 : originalValue[0])) === null || _dayjs13 === void 0 ? void 0 : _dayjs13.format('YYYY-MM-DD')} 00:00:00~${(_dayjs14 = (0, _dayjs15.default)(originalValue === null || originalValue === void 0 ? void 0 : originalValue[1])) === null || _dayjs14 === void 0 ? void 0 : _dayjs14.format('YYYY-MM-DD')} 23:59:59`;
           break;
       }
       if (!value) {
@@ -349,7 +348,7 @@ var formatColumn = _ref2 => {
       if (!originalValue) {
         originalRenderValue = '-';
       }
-      var node = /*#__PURE__*/(0, _jsxRuntime.jsxs)(_space.default, {
+      var node = /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space, {
         size: 8,
         children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
       });
@@ -400,7 +399,7 @@ var formatColumn = _ref2 => {
           });
         }
       }
-      var node = /*#__PURE__*/(0, _jsxRuntime.jsxs)(_space.default, {
+      var node = /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space, {
         size: 8,
         children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
       });
@@ -428,7 +427,7 @@ var formatColumn = _ref2 => {
         isAddCell = originalResult.isAddCell;
       otherProps.isChanged = isChanged;
       var originalRenderValue = originalValue === 'number' ? originalValue.toFixed(precision) : originalValue;
-      var node = /*#__PURE__*/(0, _jsxRuntime.jsxs)(_space.default, {
+      var node = /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space, {
         size: 8,
         children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
       });
@@ -480,23 +479,26 @@ var formatColumn = _ref2 => {
       var className = (0, _classnames.default)({
         'empty-cell': isEmpty
       });
-      var renderValue = /*#__PURE__*/(0, _jsxRuntime.jsx)(_ProForm.default.ProCascader, {
+
+      // 处理 code 为函数的情况
+      var realCode = typeof code === 'function' ? code(value, record) : code;
+      var renderValue = /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.ProCascader, {
         isView: true,
         mode: "address",
-        code: code,
+        code: realCode,
         value: realValue
       });
-      var originalRenderValue = /*#__PURE__*/(0, _jsxRuntime.jsx)(_ProForm.default.ProCascader, {
+      var originalRenderValue = /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.ProCascader, {
         isView: true,
         mode: "address",
-        code: code,
+        code: realCode,
         value: originalRealValue
       });
-      var renderNode = /*#__PURE__*/(0, _jsxRuntime.jsx)(_ProForm.default.ProCascader, {
+      var renderNode = /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.ProCascader, {
         className: className,
         isView: true,
         mode: "address",
-        code: code,
+        code: realCode,
         value: realValue,
         tooltip: false
       });
@@ -518,7 +520,7 @@ var formatColumn = _ref2 => {
   } else if (copyable) {
     column.render = (value, record, index) => {
       var isInNewRowFlag = isInNewRow(record);
-      return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_space.default, {
+      return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space, {
         size: 8,
         children: [prefixNode(value, record, index), /*#__PURE__*/(0, _jsxRuntime.jsx)(_RenderColumn.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), {}, {
           valueType: valueType,
@@ -550,7 +552,7 @@ var formatColumn = _ref2 => {
         });
       }
       var isInNewRowFlag = isInNewRow(record);
-      return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_space.default, {
+      return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space, {
         size: 8,
         children: [prefixNode(value, record, index), /*#__PURE__*/(0, _jsxRuntime.jsx)(_RenderColumn.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), {}, {
           valueType: valueType,
@@ -574,7 +576,7 @@ var formatColumn = _ref2 => {
         originalValue = originalResult.originalValue,
         isAddCell = originalResult.isAddCell;
       otherProps.isChanged = isChanged;
-      var node = /*#__PURE__*/(0, _jsxRuntime.jsxs)(_space.default, {
+      var node = /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space, {
         size: 8,
         children: [prefixNode(value, record, index), value, suffixNode(value, record, index)]
       });

package/lib/ProTable/components/RcTable/components/BaseTable/index.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="react" />
-import '../../../../style/index.less';
 declare const _default: import("react").MemoExoticComponent<({ dataSource, tableProps, draggableProps, summaryProps, emptyTextProps, ...restProps }: {
     [x: string]: any;
     dataSource: any;

package/lib/ProTable/components/RcTable/components/BaseTable/index.js

@@ -6,12 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-require("antd/es/table/style");
-var _table = _interopRequireDefault(require("antd/es/table"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _antd = require("antd");
 var _react = require("react");
 var _index = require("../../../index");
-require("../../../../style/index.less");
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["dataSource", "tableProps", "draggableProps", "summaryProps", "emptyTextProps"];
 var BaseTable = _ref => {
@@ -31,7 +29,7 @@ var BaseTable = _ref => {
     }
     return null;
   };
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_table.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Table, (0, _objectSpread2.default)((0, _objectSpread2.default)({
     components: renderComponents(),
     columns: columns,
     locale: {

package/lib/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/index.js

@@ -45,24 +45,27 @@ var Row = props => {
     ref: setNodeRef,
     style: style
   }, attributes), {}, {
-    children: _react.default.Children.map(children, child => {
-      if (child.key === 'RC_TABLE_KEY') {
+    children: _react.default.Children.map(children, (child, index) => {
+      // 在第一列（通常是rowSelection列）显示拖拽图标
+      if (index === 0) {
         var _ref = (child === null || child === void 0 ? void 0 : child.props) || {},
           render = _ref.render,
           record = _ref.record,
           renderIndex = _ref.renderIndex;
         return /*#__PURE__*/_react.default.cloneElement(child, {
-          children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
-            className: `drag-wrapper${props['data-hide'] ? ' no-check' : ''}`,
-            children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_ProIcon.default, (0, _objectSpread2.default)({
-              className: "drag-icon",
-              style: {
-                touchAction: 'none',
-                cursor: disabled ? 'no-drop' : 'move'
-              },
-              type: "drag",
-              size: 20
-            }, listeners)), props['data-hide'] ? null : render === null || render === void 0 ? void 0 : render(null, record, renderIndex)]
+          children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+            children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+              className: `pro-table-drag-wrapper${props['data-hide'] ? ' no-check' : ''}`,
+              children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_ProIcon.default, (0, _objectSpread2.default)({
+                className: "drag-icon",
+                style: {
+                  touchAction: 'none',
+                  cursor: disabled ? 'no-drop' : 'move'
+                },
+                type: "drag",
+                size: 20
+              }, listeners))
+            }), props['data-hide'] ? null : render === null || render === void 0 ? void 0 : render(null, record, renderIndex)]
           })
         });
       }

package/lib/ProTable/components/RcTable/components/DraggableTable/index.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="react" />
-import '../../../../style/index.less';
 declare const _default: import("react").MemoExoticComponent<({ dataSource, tableProps, draggableProps, summaryProps, emptyTextProps, ...restProps }: {
     [x: string]: any;
     dataSource: any;

package/lib/ProTable/components/RcTable/components/DraggableTable/index.js

@@ -7,13 +7,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-require("antd/es/table/style");
-var _table = _interopRequireDefault(require("antd/es/table"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _antd = require("antd");
 var _react = require("react");
 var _DndWrapper = _interopRequireWildcard(require("./components/DndWrapper"));
 var _index = require("../../../index");
-require("../../../../style/index.less");
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["dataSource", "tableProps", "draggableProps", "summaryProps", "emptyTextProps"];
 var DraggableTable = _ref => {
@@ -40,7 +38,7 @@ var DraggableTable = _ref => {
     rowKey: rowKey,
     onDragStartGuard: onDragStartGuard,
     onDragEndGuard: onDragEndGuard,
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_table.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Table, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       className: "pro-edit-table-drag",
       components: {
         body: {

package/lib/ProTable/components/RenderColumn/index.d.ts

@@ -9,7 +9,7 @@ interface Props {
     ellipsis?: any;
     width?: number | string;
     originalValue?: any;
-    toolTipProps?: TooltipProps & React.RefAttributes<unknown>;
+    toolTipProps?: TooltipProps;
     minWidth?: number;
     isInNewRowFlag?: boolean;
     isChanged?: boolean;

package/lib/ProTable/components/RenderColumn/index.js

@@ -5,15 +5,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/space/style");
-var _space = _interopRequireDefault(require("antd/es/space"));
-require("antd/es/tooltip/style");
-var _tooltip = _interopRequireDefault(require("antd/es/tooltip"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-require("antd/es/typography/style");
-var _typography = _interopRequireDefault(require("antd/es/typography"));
 var _react = require("react");
+var _antd = require("antd");
 var _ahooks = require("ahooks");
 var _lodash = require("lodash");
 var _classnames = _interopRequireDefault(require("classnames"));
@@ -23,8 +18,8 @@ var _utils = require("../../utils");
 var _utils2 = require("../../../utils");
 var _copy = _interopRequireDefault(require("../../../assets/copy.svg"));
 var _jsxRuntime = require("react/jsx-runtime");
-var Paragraph = _typography.default.Paragraph,
-  Text = _typography.default.Text;
+var Paragraph = _antd.Typography.Paragraph,
+  Text = _antd.Typography.Text;
 // @ts-ignore
 var RenderColumn = props => {
   var valueType = props.valueType,
@@ -100,7 +95,7 @@ var RenderColumn = props => {
       });
       if ((props === null || props === void 0 ? void 0 : props.isChanged) === false) {
         if (ellipsis) {
-          return /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+          return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Tooltip, (0, _objectSpread2.default)((0, _objectSpread2.default)({
             title: currentValue,
             onOpenChange: open => {
               setState({
@@ -132,27 +127,29 @@ var RenderColumn = props => {
         }
         return !(0, _utils2.isEmpty)(originalValue) ? originalValue : '-';
       };
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Tooltip, (0, _objectSpread2.default)((0, _objectSpread2.default)({
         className: cellDiffCls,
         style: {
           width,
           minWidth
         },
-        overlayClassName: "original-value-tooltip",
-        destroyTooltipOnHide: true,
+        classNames: {
+          root: 'original-value-tooltip'
+        },
+        destroyOnHidden: true,
         placement: "topLeft",
         autoAdjustOverflow: false,
-        title: /*#__PURE__*/(0, _jsxRuntime.jsx)(_space.default, {
+        title: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Space, {
           direction: "vertical",
           className: "changed-tooltip",
           children: props !== null && props !== void 0 && props.isChanged && !(props !== null && props !== void 0 && props.isAddCell) ? /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-            children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_space.default, {
+            children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space, {
               align: "start",
               className: "original-value-container",
               children: ["\u521D\u59CB\u503C\uFF1A", originalValueCalc()]
-            }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_space.default, {
+            }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Space, {
               className: "current-value-container",
-              children: ellipsis ? /*#__PURE__*/(0, _jsxRuntime.jsxs)(_space.default, {
+              children: ellipsis ? /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space, {
                 children: ["\u5F53\u524D\u503C\uFF1A", currentValue]
               }) : null
             })]
@@ -203,9 +200,9 @@ var RenderColumn = props => {
       });
     }
     var calculatedWidth = updateCalculatedWidth(textRef.current);
-    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Tooltip, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       title: value,
-      destroyTooltipOnHide: true,
+      destroyOnHidden: true,
       onOpenChange: () => {
         setState({
           tooltip: false

package/lib/ProTable/components/RenderSummary/index.js

@@ -1,12 +1,10 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/table/style");
-var _table = _interopRequireDefault(require("antd/es/table"));
+var _antd = require("antd");
 var _lodash = require("lodash");
 var _utils = require("@zat-design/utils");
 var _utils2 = require("../../../ProUtils/utils");
@@ -24,9 +22,9 @@ var renderSummary = props => {
   if (!(dataSource !== null && dataSource !== void 0 && dataSource.length)) {
     return null;
   }
-  return (0, _lodash.isObject)(summary) ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_table.default.Summary, {
+  return (0, _lodash.isObject)(summary) ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Table.Summary, {
     fixed: fixed,
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_table.default.Summary.Row, {
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Table.Summary.Row, {
       children: columns === null || columns === void 0 ? void 0 : columns.map(_ref2 => {
         var key = _ref2.key,
           dataIndex = _ref2.dataIndex,
@@ -50,7 +48,7 @@ var renderSummary = props => {
           }, 0);
           text = format ? format(sum, precision !== null && precision !== void 0 ? precision : 2) : sum;
         }
-        return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_table.default.Summary.Cell, {
+        return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Table.Summary.Cell, {
           index: index,
           colSpan: colSpan,
           children: [prefix, text, suffix]

package/lib/ProTable/components/RenderTableHeader/index.js

@@ -1,12 +1,10 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/button/style");
-var _button = _interopRequireDefault(require("antd/es/button"));
+var _antd = require("antd");
 var _reactSvg = require("react-svg");
 var _index = require("../../../index");
 var _jsxRuntime = require("react/jsx-runtime");
@@ -36,7 +34,7 @@ var RenderTableHeader = props => {
       children: headerRender ? typeof headerRender === 'function' ? headerRender() : headerRender : null
     }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       className: "right-actions",
-      children: [resizeColumn && /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.default, {
+      children: [resizeColumn && /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Button, {
         icon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, {
           className: "anticon",
           wrapper: "span",
@@ -53,7 +51,7 @@ var RenderTableHeader = props => {
         value: checkColumns,
         allValue: "all",
         onChange: handleColumnConfig,
-        trigger: /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.default, {
+        trigger: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Button, {
           className: "custom-column-btn",
           icon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, {
             className: "anticon",