@teamix/pro 1.5.32-beta → 1.5.33-beta

package/es/index.d.ts

@@ -30,5 +30,5 @@ export * from './sidebar';
 export * from './utils';
 export * from './timeline';
 export * from './image';
-declare const version = "1.5.32-beta";
+declare const version = "1.5.33-beta";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, TeamixIcon, ProImage, hooks, nocode, templates, utils, };

package/es/index.js

@@ -37,7 +37,7 @@ export * from './sidebar';
 export * from './utils';
 export * from './timeline';
 export * from './image';
-var version = '1.5.32-beta';
+var version = '1.5.33-beta';
 // By TeamixTest
 window.postMessage({
   source: 'teamix-test-devtools',

package/es/table/index.js

@@ -22,7 +22,6 @@ import Pagination from './components/Pagination';
 import TableContent from './components/TableContent';
 import genProColumnToColumn from './utils/genProColumnToColumn';
 import { getGlobalConfig, useRequest, request as utilResquest, getDeepValue, getMessage, pickProps, usePrefixCls, getTargetValue } from '@teamix/utils';
-import { ProSkeletonRaw as Skeleton } from '../skeleton';
 import './index.scss';
 import Layout from './components/Layout';
 import { actionRefUseStateOn, emit, initActionRef, processDefaultFilter, useActionType } from './utils';
@@ -1061,6 +1060,7 @@ var ProTable = function ProTable(props) {
     } else return footerAction;
   };
   var onChangePagination = useCallback(function (currentPage) {
+    var _objectSpread4;
     var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     // 翻页默认清空选择
     if (!reserveSelectedRecords) {
@@ -1068,8 +1068,8 @@ var ProTable = function ProTable(props) {
       (_actionRef$current8 = actionRef.current) === null || _actionRef$current8 === void 0 ? void 0 : (_actionRef$current8$c = _actionRef$current8.clearRowSelection) === null || _actionRef$current8$c === void 0 ? void 0 : _actionRef$current8$c.call(_actionRef$current8);
     }
     setCurrentPage(currentPage);
-    _request(_objectSpread(_defineProperty({}, targetPageKey, currentPage), params));
-  }, [reserveSelectedRecords, targetPageKey, actionRef]);
+    _request(_objectSpread((_objectSpread4 = {}, _defineProperty(_objectSpread4, targetPageKey, currentPage), _defineProperty(_objectSpread4, "pageSize", pageSize), _objectSpread4), params));
+  }, [reserveSelectedRecords, targetPageKey, actionRef, pageSize]);
   var onChangePaginationSize = useCallback(function (currentPageSize) {
     var _request10;
     // 翻页默认清空选择
@@ -1080,14 +1080,12 @@ var ProTable = function ProTable(props) {
     setPageSize(currentPageSize);
     setCurrentPage(1);
     _request((_request10 = {}, _defineProperty(_request10, targetPageSizeKey, currentPageSize), _defineProperty(_request10, targetPageKey, 1), _request10));
-  }, [reserveSelectedRecords, actionRef, targetPageSizeKey, targetPageKey]);
+  }, [reserveSelectedRecords, actionRef, targetPageSizeKey, targetPageKey, currentPage]);
   var renderFooter = function renderFooter() {
     function renderRowSelection() {
       if (rowSelection) {
         if (showSkeleton) {
-          return /*#__PURE__*/React.createElement("div", {
-            className: cls('footer-left-wrapper')
-          }, /*#__PURE__*/React.createElement(Skeleton.Footer.Operation, null));
+          return null;
         } else {
           return /*#__PURE__*/React.createElement("div", {
             className: cls('footer-left-wrapper')
@@ -1101,9 +1099,7 @@ var ProTable = function ProTable(props) {
         }
       } else if (footerAction) {
         if (showSkeleton) {
-          return /*#__PURE__*/React.createElement("div", {
-            className: cls('footer-left-wrapper')
-          }, /*#__PURE__*/React.createElement(Skeleton.Footer.Operation, null));
+          return null;
         } else {
           return /*#__PURE__*/React.createElement("div", {
             className: cls('footer-left-wrapper')
@@ -1124,7 +1120,7 @@ var ProTable = function ProTable(props) {
         })
       }, renderRowSelection(), /*#__PURE__*/React.createElement("div", {
         className: cls('footer-right-wrapper')
-      }, showSkeleton ? /*#__PURE__*/React.createElement(Skeleton.Footer.Pagination, null) : /*#__PURE__*/React.createElement(React.Fragment, null, data.length > 0 && /*#__PURE__*/React.createElement(Pagination, _objectSpread({
+      }, showSkeleton ? null : /*#__PURE__*/React.createElement(React.Fragment, null, data.length > 0 && /*#__PURE__*/React.createElement(Pagination, _objectSpread({
         className: cls('pagination'),
         onChange: function onChange(number, e) {
           onChangePagination(number);
@@ -1152,7 +1148,7 @@ var ProTable = function ProTable(props) {
         })
       }, renderRowSelection(), /*#__PURE__*/React.createElement("div", {
         className: cls('footer-right-wrapper')
-      }, showSkeleton ? /*#__PURE__*/React.createElement(Skeleton.Footer.Pagination, null) : footer));
+      }, showSkeleton ? null : footer));
     }
   };
   // 判断是否需要吸底

package/es/table/utils/genProColumnToColumn.js

@@ -1,4 +1,5 @@
 var _excluded = ["filters", "dataIndex", "children"];
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -31,8 +32,24 @@ showSkeleton, actionRef) {
         sortable: false,
         dataIndex: dataIndex === null || dataIndex === void 0 ? void 0 : dataIndex.toString(),
         title: /*#__PURE__*/React.createElement(Skeleton.Table.TH, null),
-        cell: function cell() {
-          return /*#__PURE__*/React.createElement(Skeleton.Table.TD, null);
+        cell: function cell(value, rowIndex) {
+          var _columnProps$render;
+          // 按默认5行做渐变
+          var opacity = Math.min(Math.max(1 - rowIndex * 0.2, 0), 1);
+          // 如果是field并且有descrition字段，就认为是两行，其他情况默认一行
+          return _typeof(columnProps === null || columnProps === void 0 ? void 0 : columnProps.render) === 'object' && (columnProps === null || columnProps === void 0 ? void 0 : (_columnProps$render = columnProps.render) === null || _columnProps$render === void 0 ? void 0 : _columnProps$render.description) ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Skeleton.Table.TD, {
+            style: {
+              opacity: opacity
+            }
+          }), /*#__PURE__*/React.createElement(Skeleton.Table.TD, {
+            style: {
+              opacity: opacity
+            }
+          })) : /*#__PURE__*/React.createElement(Skeleton.Table.TD, {
+            style: {
+              opacity: opacity
+            }
+          });
         }
       });
     }

package/lib/index.d.ts

@@ -30,5 +30,5 @@ export * from './sidebar';
 export * from './utils';
 export * from './timeline';
 export * from './image';
-declare const version = "1.5.32-beta";
+declare const version = "1.5.33-beta";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, TeamixIcon, ProImage, hooks, nocode, templates, utils, };

package/lib/index.js

@@ -299,7 +299,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 if (!((_window = window) === null || _window === void 0 ? void 0 : _window.TEAMIXPRO_WITHOUT_ICON)) {
   _icon.default.setConfig(_utils.default.getTeamixIconConfig());
 }
-var version = '1.5.32-beta';
+var version = '1.5.33-beta';
 // By TeamixTest
 exports.version = version;
 window.postMessage({

package/lib/table/index.js

@@ -11,7 +11,6 @@ var _Pagination = _interopRequireDefault(require("./components/Pagination"));
 var _TableContent = _interopRequireDefault(require("./components/TableContent"));
 var _genProColumnToColumn = _interopRequireDefault(require("./utils/genProColumnToColumn"));
 var _utils = require("@teamix/utils");
-var _skeleton = require("../skeleton");
 require("./index.scss");
 var _Layout = _interopRequireDefault(require("./components/Layout"));
 var _utils2 = require("./utils");
@@ -1082,6 +1081,7 @@ var ProTable = function ProTable(props) {
     } else return footerAction;
   };
   var onChangePagination = (0, _react.useCallback)(function (currentPage) {
+    var _objectSpread4;
     var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     // 翻页默认清空选择
     if (!reserveSelectedRecords) {
@@ -1089,8 +1089,8 @@ var ProTable = function ProTable(props) {
       (_actionRef$current8 = actionRef.current) === null || _actionRef$current8 === void 0 ? void 0 : (_actionRef$current8$c = _actionRef$current8.clearRowSelection) === null || _actionRef$current8$c === void 0 ? void 0 : _actionRef$current8$c.call(_actionRef$current8);
     }
     setCurrentPage(currentPage);
-    _request(_objectSpread(_defineProperty({}, targetPageKey, currentPage), params));
-  }, [reserveSelectedRecords, targetPageKey, actionRef]);
+    _request(_objectSpread((_objectSpread4 = {}, _defineProperty(_objectSpread4, targetPageKey, currentPage), _defineProperty(_objectSpread4, "pageSize", pageSize), _objectSpread4), params));
+  }, [reserveSelectedRecords, targetPageKey, actionRef, pageSize]);
   var onChangePaginationSize = (0, _react.useCallback)(function (currentPageSize) {
     var _request10;
     // 翻页默认清空选择
@@ -1101,14 +1101,12 @@ var ProTable = function ProTable(props) {
     setPageSize(currentPageSize);
     setCurrentPage(1);
     _request((_request10 = {}, _defineProperty(_request10, targetPageSizeKey, currentPageSize), _defineProperty(_request10, targetPageKey, 1), _request10));
-  }, [reserveSelectedRecords, actionRef, targetPageSizeKey, targetPageKey]);
+  }, [reserveSelectedRecords, actionRef, targetPageSizeKey, targetPageKey, currentPage]);
   var renderFooter = function renderFooter() {
     function renderRowSelection() {
       if (rowSelection) {
         if (showSkeleton) {
-          return /*#__PURE__*/_react.default.createElement("div", {
-            className: cls('footer-left-wrapper')
-          }, /*#__PURE__*/_react.default.createElement(_skeleton.ProSkeletonRaw.Footer.Operation, null));
+          return null;
         } else {
           return /*#__PURE__*/_react.default.createElement("div", {
             className: cls('footer-left-wrapper')
@@ -1122,9 +1120,7 @@ var ProTable = function ProTable(props) {
         }
       } else if (footerAction) {
         if (showSkeleton) {
-          return /*#__PURE__*/_react.default.createElement("div", {
-            className: cls('footer-left-wrapper')
-          }, /*#__PURE__*/_react.default.createElement(_skeleton.ProSkeletonRaw.Footer.Operation, null));
+          return null;
         } else {
           return /*#__PURE__*/_react.default.createElement("div", {
             className: cls('footer-left-wrapper')
@@ -1145,7 +1141,7 @@ var ProTable = function ProTable(props) {
         })
       }, renderRowSelection(), /*#__PURE__*/_react.default.createElement("div", {
         className: cls('footer-right-wrapper')
-      }, showSkeleton ? /*#__PURE__*/_react.default.createElement(_skeleton.ProSkeletonRaw.Footer.Pagination, null) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, data.length > 0 && /*#__PURE__*/_react.default.createElement(_Pagination.default, _objectSpread({
+      }, showSkeleton ? null : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, data.length > 0 && /*#__PURE__*/_react.default.createElement(_Pagination.default, _objectSpread({
         className: cls('pagination'),
         onChange: function onChange(number, e) {
           onChangePagination(number);
@@ -1173,7 +1169,7 @@ var ProTable = function ProTable(props) {
         })
       }, renderRowSelection(), /*#__PURE__*/_react.default.createElement("div", {
         className: cls('footer-right-wrapper')
-      }, showSkeleton ? /*#__PURE__*/_react.default.createElement(_skeleton.ProSkeletonRaw.Footer.Pagination, null) : footer));
+      }, showSkeleton ? null : footer));
     }
   };
   // 判断是否需要吸底

package/lib/table/utils/genProColumnToColumn.js

@@ -11,6 +11,7 @@ var _utils = require("@teamix/utils");
 var _Cell = _interopRequireDefault(require("../components/Cell"));
 var _excluded = ["filters", "dataIndex", "children"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -38,8 +39,24 @@ showSkeleton, actionRef) {
         sortable: false,
         dataIndex: dataIndex === null || dataIndex === void 0 ? void 0 : dataIndex.toString(),
         title: /*#__PURE__*/_react.default.createElement(_skeleton.ProSkeletonRaw.Table.TH, null),
-        cell: function cell() {
-          return /*#__PURE__*/_react.default.createElement(_skeleton.ProSkeletonRaw.Table.TD, null);
+        cell: function cell(value, rowIndex) {
+          var _columnProps$render;
+          // 按默认5行做渐变
+          var opacity = Math.min(Math.max(1 - rowIndex * 0.2, 0), 1);
+          // 如果是field并且有descrition字段，就认为是两行，其他情况默认一行
+          return _typeof(columnProps === null || columnProps === void 0 ? void 0 : columnProps.render) === 'object' && (columnProps === null || columnProps === void 0 ? void 0 : (_columnProps$render = columnProps.render) === null || _columnProps$render === void 0 ? void 0 : _columnProps$render.description) ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_skeleton.ProSkeletonRaw.Table.TD, {
+            style: {
+              opacity: opacity
+            }
+          }), /*#__PURE__*/_react.default.createElement(_skeleton.ProSkeletonRaw.Table.TD, {
+            style: {
+              opacity: opacity
+            }
+          })) : /*#__PURE__*/_react.default.createElement(_skeleton.ProSkeletonRaw.Table.TD, {
+            style: {
+              opacity: opacity
+            }
+          });
         }
       });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamix/pro",
-  "version": "1.5.32-beta",
+  "version": "1.5.33-beta",
   "description": "TeamixPro大包",
   "keywords": [
     "aliyun",