@teamix/pro 1.5.7 → 1.5.8

package/es/index.d.ts

@@ -28,5 +28,5 @@ export * from './table';
 export * from './sidebar';
 export * from './utils';
 export * from './timeline';
-declare const version = "1.5.7";
+declare const version = "1.5.8";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, TeamixIcon, hooks, nocode, templates, utils, };

package/es/index.js

@@ -35,7 +35,7 @@ export * from './table';
 export * from './sidebar';
 export * from './utils';
 export * from './timeline';
-var version = '1.5.7';
+var version = '1.5.8';
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo,
 // ProLayout,
 ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, TeamixIcon, hooks, nocode, templates, utils };

package/es/table/components/CardView/index.js

@@ -49,14 +49,18 @@ var CardView = function CardView(props) {
   // 加载状态变化回调
   useEffect(function () {
     setLoadState(loading ? 'loading' : 'loadMore');
-    setSkeletonVisible(showSkeleton);
+    if (cardViewProps.showSkeleton) {
+      setSkeletonVisible(cardViewProps.showSkeleton);
+    } else {
+      setSkeletonVisible(showSkeleton);
+    }
     if (showSkeleton) {
       setLoadState('none');
     }
     if (dataSource.length === 0) {
       setLoadState('none');
     }
-  }, [loading, skeletonVisible, showSkeleton]);
+  }, [loading, skeletonVisible, showSkeleton, cardViewProps.showSkeleton, dataSource]);
   // 数据源变化毁掉
   useEffect(function () {
     if (dataSource.length === 0) {

package/es/table/components/ToolBar/Fullscreen.js

@@ -39,7 +39,7 @@ var FullScreen = function FullScreen(props) {
     filterEnableRef.current.fullscreen = false;
     // 移除类名
     if (document && ((_document = document) === null || _document === void 0 ? void 0 : _document.body)) {
-      document.body.classList.remove('teamix-pro-table-fullscreen');
+      document.body.classList.remove('teamix-pro-table-fullscreen-for-body');
     }
   };
   // 全屏开启之后
@@ -59,7 +59,7 @@ var FullScreen = function FullScreen(props) {
     filterEnableRef.current.normal = false;
     // 为 body 添加类名，用于判断是否全屏
     if (document && ((_document2 = document) === null || _document2 === void 0 ? void 0 : _document2.body)) {
-      document.body.classList.add('teamix-pro-table-fullscreen');
+      document.body.classList.add('teamix-pro-table-fullscreen-for-body');
     }
     // 消息提示
     Message.show({

package/es/table/index.js

@@ -122,7 +122,7 @@ var ProTable = function ProTable(props) {
     pageSizeList = _props$pageSizeList === void 0 ? [5, 10, 20, 50, 100] : _props$pageSizeList,
     responsivePaginationType = props.responsivePaginationType,
     _props$showSkeleton = props.showSkeleton,
-    propsShowSkeleton = _props$showSkeleton === void 0 ? false : _props$showSkeleton,
+    propsShowSkeleton = _props$showSkeleton === void 0 ? true : _props$showSkeleton,
     _props$skeletonSize = props.skeletonSize,
     skeletonSize = _props$skeletonSize === void 0 ? 5 : _props$skeletonSize,
     propsActionRef = props.actionRef,
@@ -180,7 +180,7 @@ var ProTable = function ProTable(props) {
     _useState10 = _slicedToArray(_useState9, 2),
     sort = _useState10[0],
     setSort = _useState10[1];
-  var _useState11 = useState(!propsDataSource && requestWhenMount && propsShowSkeleton),
+  var _useState11 = useState(!propsDataSource && requestWhenMount && propsShowSkeleton && !!url),
     _useState12 = _slicedToArray(_useState11, 2),
     showSkeleton = _useState12[0],
     setShowSkeleton = _useState12[1]; // 首次加载，渲染骨架屏
@@ -224,9 +224,9 @@ var ProTable = function ProTable(props) {
   // 存储定时器 id
   var autoRefreshTimerRef = useRef();
   var onResize = null;
-  useEffect(function () {
-    setShowSkeleton(propsShowSkeleton);
-  }, [propsShowSkeleton]);
+  // useEffect(() => {
+  //   setShowSkeleton(propsShowSkeleton);
+  // }, [propsShowSkeleton]);
   // useEffect(() => {
   //   console.log('传入的props变化', propsLoading);
   //   setShowLoading(propsLoading ?? false);
@@ -532,7 +532,7 @@ var ProTable = function ProTable(props) {
     },
     refresh: function refresh(params) {
       // card视角的刷新等于重新请求
-      if (switchViewState === 'card') {
+      if (switchViewState === 'card' && !propsDataSource) {
         setCurrentPage(1);
         _request(_objectSpread(_objectSpread({}, params), {}, _defineProperty({}, targetPageKey, 1)));
         setShowSkeleton(true);
@@ -614,6 +614,7 @@ var ProTable = function ProTable(props) {
         setPageSize((_cardViewProps$pageSi = cardViewProps === null || cardViewProps === void 0 ? void 0 : cardViewProps.pageSize) !== null && _cardViewProps$pageSi !== void 0 ? _cardViewProps$pageSi : 12);
         if (!propsDataSource) {
           var _cardViewProps$pageSi2, _request5;
+          setShowSkeleton(true);
           _request((_request5 = {}, _defineProperty(_request5, targetPageSizeKey, (_cardViewProps$pageSi2 = cardViewProps === null || cardViewProps === void 0 ? void 0 : cardViewProps.pageSize) !== null && _cardViewProps$pageSi2 !== void 0 ? _cardViewProps$pageSi2 : 12), _defineProperty(_request5, targetPageKey, 1), _request5));
         }
       }
@@ -1038,7 +1039,7 @@ var ProTable = function ProTable(props) {
     return /*#__PURE__*/React.createElement("div", {
       className: cls({
         '': true,
-        fullscreen: fullscreenState
+        fullscreen: isFullScreen
         // 'footer-suction': footerSuctionState && footerSuction,
       }),
       ref: tableRef

package/es/table/typing.d.ts

@@ -356,6 +356,8 @@ export declare type ProTableCardProps = {
     cardProps?: {
         [key in keyof ProCardProps]?: ProCardProps[key] | ((index: number, record: any) => ProCardProps[key]);
     };
+    /** 是否展示卡片骨架 **/
+    showSkeleton?: boolean;
 };
 /** card 视角 Props （内部组件） **/
 export declare type ProTableCardViewProps = {

package/lib/index.d.ts

@@ -28,5 +28,5 @@ export * from './table';
 export * from './sidebar';
 export * from './utils';
 export * from './timeline';
-declare const version = "1.5.7";
+declare const version = "1.5.8";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, TeamixIcon, hooks, nocode, templates, utils, };

package/lib/index.js

@@ -280,5 +280,5 @@ 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.7';
+var version = '1.5.8';
 exports.version = version;

package/lib/table/components/CardView/index.js

@@ -58,14 +58,18 @@ var CardView = function CardView(props) {
   // 加载状态变化回调
   (0, _react.useEffect)(function () {
     setLoadState(loading ? 'loading' : 'loadMore');
-    setSkeletonVisible(showSkeleton);
+    if (cardViewProps.showSkeleton) {
+      setSkeletonVisible(cardViewProps.showSkeleton);
+    } else {
+      setSkeletonVisible(showSkeleton);
+    }
     if (showSkeleton) {
       setLoadState('none');
     }
     if (dataSource.length === 0) {
       setLoadState('none');
     }
-  }, [loading, skeletonVisible, showSkeleton]);
+  }, [loading, skeletonVisible, showSkeleton, cardViewProps.showSkeleton, dataSource]);
   // 数据源变化毁掉
   (0, _react.useEffect)(function () {
     if (dataSource.length === 0) {

package/lib/table/components/ToolBar/Fullscreen.js

@@ -48,7 +48,7 @@ var FullScreen = function FullScreen(props) {
     filterEnableRef.current.fullscreen = false;
     // 移除类名
     if (document && ((_document = document) === null || _document === void 0 ? void 0 : _document.body)) {
-      document.body.classList.remove('teamix-pro-table-fullscreen');
+      document.body.classList.remove('teamix-pro-table-fullscreen-for-body');
     }
   };
   // 全屏开启之后
@@ -68,7 +68,7 @@ var FullScreen = function FullScreen(props) {
     filterEnableRef.current.normal = false;
     // 为 body 添加类名，用于判断是否全屏
     if (document && ((_document2 = document) === null || _document2 === void 0 ? void 0 : _document2.body)) {
-      document.body.classList.add('teamix-pro-table-fullscreen');
+      document.body.classList.add('teamix-pro-table-fullscreen-for-body');
     }
     // 消息提示
     _components.Message.show({

package/lib/table/index.js

@@ -143,7 +143,7 @@ var ProTable = function ProTable(props) {
     pageSizeList = _props$pageSizeList === void 0 ? [5, 10, 20, 50, 100] : _props$pageSizeList,
     responsivePaginationType = props.responsivePaginationType,
     _props$showSkeleton = props.showSkeleton,
-    propsShowSkeleton = _props$showSkeleton === void 0 ? false : _props$showSkeleton,
+    propsShowSkeleton = _props$showSkeleton === void 0 ? true : _props$showSkeleton,
     _props$skeletonSize = props.skeletonSize,
     skeletonSize = _props$skeletonSize === void 0 ? 5 : _props$skeletonSize,
     propsActionRef = props.actionRef,
@@ -201,7 +201,7 @@ var ProTable = function ProTable(props) {
     _useState10 = _slicedToArray(_useState9, 2),
     sort = _useState10[0],
     setSort = _useState10[1];
-  var _useState11 = (0, _react.useState)(!propsDataSource && requestWhenMount && propsShowSkeleton),
+  var _useState11 = (0, _react.useState)(!propsDataSource && requestWhenMount && propsShowSkeleton && !!url),
     _useState12 = _slicedToArray(_useState11, 2),
     showSkeleton = _useState12[0],
     setShowSkeleton = _useState12[1]; // 首次加载，渲染骨架屏
@@ -245,9 +245,9 @@ var ProTable = function ProTable(props) {
   // 存储定时器 id
   var autoRefreshTimerRef = (0, _react.useRef)();
   var onResize = null;
-  (0, _react.useEffect)(function () {
-    setShowSkeleton(propsShowSkeleton);
-  }, [propsShowSkeleton]);
+  // useEffect(() => {
+  //   setShowSkeleton(propsShowSkeleton);
+  // }, [propsShowSkeleton]);
   // useEffect(() => {
   //   console.log('传入的props变化', propsLoading);
   //   setShowLoading(propsLoading ?? false);
@@ -553,7 +553,7 @@ var ProTable = function ProTable(props) {
     },
     refresh: function refresh(params) {
       // card视角的刷新等于重新请求
-      if (switchViewState === 'card') {
+      if (switchViewState === 'card' && !propsDataSource) {
         setCurrentPage(1);
         _request(_objectSpread(_objectSpread({}, params), {}, _defineProperty({}, targetPageKey, 1)));
         setShowSkeleton(true);
@@ -635,6 +635,7 @@ var ProTable = function ProTable(props) {
         setPageSize((_cardViewProps$pageSi = cardViewProps === null || cardViewProps === void 0 ? void 0 : cardViewProps.pageSize) !== null && _cardViewProps$pageSi !== void 0 ? _cardViewProps$pageSi : 12);
         if (!propsDataSource) {
           var _cardViewProps$pageSi2, _request5;
+          setShowSkeleton(true);
           _request((_request5 = {}, _defineProperty(_request5, targetPageSizeKey, (_cardViewProps$pageSi2 = cardViewProps === null || cardViewProps === void 0 ? void 0 : cardViewProps.pageSize) !== null && _cardViewProps$pageSi2 !== void 0 ? _cardViewProps$pageSi2 : 12), _defineProperty(_request5, targetPageKey, 1), _request5));
         }
       }
@@ -1059,7 +1060,7 @@ var ProTable = function ProTable(props) {
     return /*#__PURE__*/_react.default.createElement("div", {
       className: cls({
         '': true,
-        fullscreen: fullscreenState
+        fullscreen: isFullScreen
         // 'footer-suction': footerSuctionState && footerSuction,
       }),
       ref: tableRef

package/lib/table/typing.d.ts

@@ -356,6 +356,8 @@ export declare type ProTableCardProps = {
     cardProps?: {
         [key in keyof ProCardProps]?: ProCardProps[key] | ((index: number, record: any) => ProCardProps[key]);
     };
+    /** 是否展示卡片骨架 **/
+    showSkeleton?: boolean;
 };
 /** card 视角 Props （内部组件） **/
 export declare type ProTableCardViewProps = {

package/package.json

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