@teamix/pro 1.5.7 → 1.5.8

package/dist/pro.js

@@ -92480,7 +92480,7 @@ if (!((_window = window) != null && _window.TEAMIXPRO_WITHOUT_ICON)) {
 
 
 
-var version = '1.5.7';
+var version = '1.5.8';
 
 
 /***/ }),
@@ -97020,14 +97020,18 @@ var CardView = function CardView(props) {
   // 加载状态变化回调
   (0,react__WEBPACK_IMPORTED_MODULE_0__.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__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
@@ -98862,7 +98866,7 @@ var FullScreen = function FullScreen(props) {
     filterEnableRef.current.fullscreen = false;
     // 移除类名
     if (document && (_document = document) != null && _document.body) {
-      document.body.classList.remove('teamix-pro-table-fullscreen');
+      document.body.classList.remove('teamix-pro-table-fullscreen-for-body');
     }
   };
 
@@ -98883,7 +98887,7 @@ var FullScreen = function FullScreen(props) {
     filterEnableRef.current.normal = false;
     // 为 body 添加类名，用于判断是否全屏
     if (document && (_document2 = document) != null && _document2.body) {
-      document.body.classList.add('teamix-pro-table-fullscreen');
+      document.body.classList.add('teamix-pro-table-fullscreen-for-body');
     }
 
     // 消息提示
@@ -99323,7 +99327,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,
@@ -99376,7 +99380,7 @@ var ProTable = function ProTable(props) {
   var _useState5 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(props.sort || {}),
     sort = _useState5[0],
     setSort = _useState5[1];
-  var _useState6 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(!propsDataSource && requestWhenMount && propsShowSkeleton),
+  var _useState6 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(!propsDataSource && requestWhenMount && propsShowSkeleton && !!url),
     showSkeleton = _useState6[0],
     setShowSkeleton = _useState6[1]; // 首次加载，渲染骨架屏
   var skeletonDataSource = new Array(skeletonSize).fill({});
@@ -99416,9 +99420,10 @@ var ProTable = function ProTable(props) {
   // 存储定时器 id
   var autoRefreshTimerRef = (0,react__WEBPACK_IMPORTED_MODULE_0__.useRef)();
   var onResize = null;
-  (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
-    setShowSkeleton(propsShowSkeleton);
-  }, [propsShowSkeleton]);
+
+  // useEffect(() => {
+  //   setShowSkeleton(propsShowSkeleton);
+  // }, [propsShowSkeleton]);
 
   // useEffect(() => {
   //   console.log('传入的props变化', propsLoading);
@@ -99739,7 +99744,7 @@ var ProTable = function ProTable(props) {
     },
     refresh: function refresh(params) {
       // card视角的刷新等于重新请求
-      if (switchViewState === 'card') {
+      if (switchViewState === 'card' && !propsDataSource) {
         var _extends2;
         setCurrentPage(1);
         _request(_extends({}, params, (_extends2 = {}, _extends2[targetPageKey] = 1, _extends2)));
@@ -99823,6 +99828,7 @@ var ProTable = function ProTable(props) {
         setPageSize((_cardViewProps$pageSi = cardViewProps == null ? void 0 : cardViewProps.pageSize) != null ? _cardViewProps$pageSi : 12);
         if (!propsDataSource) {
           var _cardViewProps$pageSi2, _request5;
+          setShowSkeleton(true);
           _request((_request5 = {}, _request5[targetPageSizeKey] = (_cardViewProps$pageSi2 = cardViewProps == null ? void 0 : cardViewProps.pageSize) != null ? _cardViewProps$pageSi2 : 12, _request5[targetPageKey] = 1, _request5));
         }
       }
@@ -100261,7 +100267,7 @@ var ProTable = function ProTable(props) {
     return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
       className: cls({
         '': true,
-        fullscreen: fullscreenState
+        fullscreen: isFullScreen
         // 'footer-suction': footerSuctionState && footerSuction,
       }),