@teamix/pro 1.5.7-beta.0 → 1.5.7

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-beta.0";
+declare const version = "1.5.7";
 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-beta.0';
+var version = '1.5.7';
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo,
 // ProLayout,
 ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, TeamixIcon, hooks, nocode, templates, utils };

package/es/info/components/baseInfo/index.js

@@ -17,7 +17,9 @@ var ProBaseInfo = function ProBaseInfo(props) {
     actionRef = props.actionRef,
     layout = props.layout,
     size = props.size,
-    context = props.context;
+    context = props.context,
+    _props$disabledAutoSi = props.disabledAutoSize,
+    disabledAutoSize = _props$disabledAutoSi === void 0 ? false : _props$disabledAutoSi;
   var defaultLayout = defaultLayoutMap[getLayout((_size$width = size === null || size === void 0 ? void 0 : size.width) !== null && _size$width !== void 0 ? _size$width : 0)];
   // 获取列内的布局参数
   var getFormItemLayout = function getFormItemLayout(colspan) {
@@ -84,7 +86,7 @@ var ProBaseInfo = function ProBaseInfo(props) {
       }));
     });
   };
-  return /*#__PURE__*/React.createElement(React.Fragment, null, (size === null || size === void 0 ? void 0 : size.width) && /*#__PURE__*/React.createElement(Row, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, ((size === null || size === void 0 ? void 0 : size.width) || disabledAutoSize) && /*#__PURE__*/React.createElement(Row, {
     wrap: true,
     className: "teamix-pro-info-content-row",
     gutter: 20

package/es/info/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["type", "url", "method", "formatResult", "formatParams", "params", "actionRef", "header", "onSuccess", "onError", "beforeRequest", "extendParams", "className", "style", "columns", "layout", "dataSource", "loading", "extra", "context"],
+var _excluded = ["type", "url", "method", "formatResult", "formatParams", "params", "actionRef", "header", "onSuccess", "onError", "beforeRequest", "extendParams", "className", "style", "columns", "layout", "dataSource", "loading", "extra", "context", "disabledAutoSize"],
   _excluded2 = ["context"];
 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; }
@@ -47,6 +47,7 @@ var ProInfo = function ProInfo(props) {
     userLoading = props.loading,
     extra = props.extra,
     infoContext = props.context,
+    disabledAutoSize = props.disabledAutoSize,
     others = _objectWithoutProperties(props, _excluded);
   var _useContext = useContext(ProInfoGroupContext),
     contextUrl = _useContext.url,
@@ -153,7 +154,8 @@ var ProInfo = function ProInfo(props) {
     result: data,
     actionRef: actionRef,
     layout: layout,
-    context: context
+    context: context,
+    disabledAutoSize: disabledAutoSize
   }), type === 'header' && /*#__PURE__*/React.createElement(ProHeaderInfo, {
     dataSource: dataSource,
     columns: columns,
@@ -163,7 +165,8 @@ var ProInfo = function ProInfo(props) {
     actionRef: actionRef,
     layout: layout,
     size: size,
-    context: context
+    context: context,
+    disabledAutoSize: disabledAutoSize
   }), type === 'base' && /*#__PURE__*/React.createElement(ProBaseInfo, {
     dataSource: dataSource,
     columns: columns,
@@ -172,7 +175,8 @@ var ProInfo = function ProInfo(props) {
     actionRef: actionRef,
     layout: layout,
     size: size,
-    context: context
+    context: context,
+    disabledAutoSize: disabledAutoSize
   })));
 };
 ProInfo.Group = ProInfoGroup;

package/es/info/typing.d.ts

@@ -51,6 +51,8 @@ export declare type ProInfoBaseProps = {
     loading?: boolean;
     /** 上下文传递 */
     context?: object;
+    /** 是否在获取宽度之后才渲染Info 是否忽略首次响应式计算 **/
+    disabledAutoSize?: boolean;
 } & ProInfoHeaderProps & ProInfoRequestProps;
 /** ProInfoColumnsProps info 单元格 定义 */
 export declare type ProInfoItemProps = ProInfoColumnsProps;

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

@@ -9,19 +9,21 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { isValidElement, useEffect, useMemo, useState } from 'react';
-import { Grid } from '@alicloudfe/components';
-import { getDeepValue, ProCard, ProInfo } from '../../../';
+import { Grid, Loading } from '@alicloudfe/components';
+import { getDeepValue, getMessage, ProCard, ProInfo } from '../../../';
 import { ProSkeletonRaw } from '../../../skeleton';
 import { usePrefixCls } from '@teamix/utils';
 import './index.scss';
 import { renderCell } from '../../utils/columnRender';
 import LoadMore from '../LoadMore';
+import Result from '@teamix/result';
 var Row = Grid.Row,
   Col = Grid.Col;
 var cls = usePrefixCls('teamix-pro-table-card-view');
 var CardView = function CardView(props) {
   var _cardViewProps$scroll;
-  var dataSource = props.dataSource,
+  var _props$dataSource = props.dataSource,
+    dataSource = _props$dataSource === void 0 ? [] : _props$dataSource,
     _props$columns = props.columns,
     columns = _props$columns === void 0 ? [] : _props$columns,
     _props$loading = props.loading,
@@ -51,7 +53,16 @@ var CardView = function CardView(props) {
     if (showSkeleton) {
       setLoadState('none');
     }
+    if (dataSource.length === 0) {
+      setLoadState('none');
+    }
   }, [loading, skeletonVisible, showSkeleton]);
+  // 数据源变化毁掉
+  useEffect(function () {
+    if (dataSource.length === 0) {
+      setLoadState('none');
+    }
+  }, [dataSource]);
   var getDataIndexValue = function getDataIndexValue(dataIndex, dataSource) {
     if (Array.isArray(dataIndex)) {
       return dataIndex.map(function (item) {
@@ -316,16 +327,17 @@ var CardView = function CardView(props) {
   };
   // 渲染单个卡片
   var renderCard = function renderCard(record, index) {
-    return /*#__PURE__*/React.createElement(Col, {
+    var _cardViewProps$cardRe;
+    return /*#__PURE__*/React.createElement(Col, _objectSpread({
       xxs: 24,
       xs: 12,
-      s: 8,
+      s: 12,
       m: 8,
       l: 6,
       xl: 6,
       key: index,
       className: cls('card-item')
-    }, /*#__PURE__*/React.createElement(ProCard, _objectSpread({
+    }, (_cardViewProps$cardRe = cardViewProps === null || cardViewProps === void 0 ? void 0 : cardViewProps.cardResponsiveProps) !== null && _cardViewProps$cardRe !== void 0 ? _cardViewProps$cardRe : {}), /*#__PURE__*/React.createElement(ProCard, _objectSpread({
       title: renderCardTitle(record, index),
       subTitle: renderCardSubTitle(record, index),
       extra: getProCardExtra(record, index),
@@ -336,24 +348,41 @@ var CardView = function CardView(props) {
       context: {
         record: record,
         index: index
+      },
+      disabledAutoSize: true
+    })));
+  };
+  // 渲染卡片主体
+  var renderCardBox = function renderCardBox() {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, skeletonVisible && /*#__PURE__*/React.createElement(ProSkeletonRaw.Content, null), !skeletonVisible && (dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) === 0 && /*#__PURE__*/React.createElement(Result, {
+      theme: "hybridcloud-container",
+      img: "noData",
+      title: getMessage('noData'),
+      style: {
+        padding: '50px 0 60px'
+      }
+    }), !skeletonVisible && (dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) > 0 && /*#__PURE__*/React.createElement(Row, {
+      gutter: 16,
+      wrap: true,
+      style: {
+        marginTop: '-16px'
       }
+    }, dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (item, index) {
+      return renderCard(item, index);
     })));
   };
   return /*#__PURE__*/React.createElement("div", {
     className: cls()
-  }, /*#__PURE__*/React.createElement(LoadMore, {
+  }, (cardViewProps === null || cardViewProps === void 0 ? void 0 : cardViewProps.useTablePagination) && /*#__PURE__*/React.createElement(Loading, {
+    visible: loading,
+    style: {
+      width: '100%'
+    }
+  }, renderCardBox()), !(cardViewProps === null || cardViewProps === void 0 ? void 0 : cardViewProps.useTablePagination) && /*#__PURE__*/React.createElement(LoadMore, {
     onScrollBottom: onScrollBottom,
     onLoadMore: onLoadMore,
     loadState: loadState,
     scrollHeight: (_cardViewProps$scroll = cardViewProps.scrollHeight) !== null && _cardViewProps$scroll !== void 0 ? _cardViewProps$scroll : scrollHeight
-  }, skeletonVisible && /*#__PURE__*/React.createElement(ProSkeletonRaw.Content, null), !skeletonVisible && /*#__PURE__*/React.createElement(Row, {
-    gutter: 16,
-    wrap: true,
-    style: {
-      marginTop: '-16px'
-    }
-  }, dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (item, index) {
-    return renderCard(item, index);
-  }))));
+  }, renderCardBox()));
 };
 export default CardView;

package/es/table/index.js

@@ -1,4 +1,5 @@
-var _excluded = ["header", "className", "tableClassName", "mainAction", "extra", "dataFilter", "afterDataFilter", "toolBar", "columns", "useRowSelection", "rowSelection", "onChangeRowSelection", "getRowSelection", "primaryKey", "footerAction", "footer", "url", "pageKey", "pageSizeKey", "method", "params", "formatSort", "formatParams", "formatResult", "requestConfig", "requestWhenMount", "showPagination", "pageSizeList", "responsivePaginationType", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "customRequest", "filterColumnType", "defaultFilterParams", "reserveSelectedRecords", "size", "disableSelectAll", "context", "fixedTableBody", "isTree", "toolBarAutoWidth", "data-teamix-spm", "switchCardView", "cardViewProps", "defaultView"];
+var _excluded = ["header", "className", "tableClassName", "mainAction", "extra", "dataFilter", "afterDataFilter", "toolBar", "columns", "useRowSelection", "rowSelection", "onChangeRowSelection", "getRowSelection", "primaryKey", "footerAction", "footer", "url", "pageKey", "pageSizeKey", "method", "params", "formatSort", "formatParams", "formatResult", "requestConfig", "requestWhenMount", "showPagination", "pageSizeList", "responsivePaginationType", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "customRequest", "filterColumnType", "defaultFilterParams", "reserveSelectedRecords", "size", "disableSelectAll", "context", "fixedTableBody", "isTree", "toolBarAutoWidth", "data-teamix-spm", "switchCardView", "cardViewProps", "defaultView"],
+  _excluded2 = ["onChange"];
 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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -121,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 ? true : _props$showSkeleton,
+    propsShowSkeleton = _props$showSkeleton === void 0 ? false : _props$showSkeleton,
     _props$skeletonSize = props.skeletonSize,
     skeletonSize = _props$skeletonSize === void 0 ? 5 : _props$skeletonSize,
     propsActionRef = props.actionRef,
@@ -223,6 +224,13 @@ var ProTable = function ProTable(props) {
   // 存储定时器 id
   var autoRefreshTimerRef = useRef();
   var onResize = null;
+  useEffect(function () {
+    setShowSkeleton(propsShowSkeleton);
+  }, [propsShowSkeleton]);
+  // useEffect(() => {
+  //   console.log('传入的props变化', propsLoading);
+  //   setShowLoading(propsLoading ?? false);
+  // }, [propsLoading]);
   useEffect(function () {
     var _propsDataFilter$sche, _propsDataFilter$sche2;
     getHeaderHeight(fullscreenState);
@@ -555,9 +563,13 @@ var ProTable = function ProTable(props) {
       setCurrentPage(1);
     },
     nextPage: function nextPage() {
+      var _props$paginationProp, _props$paginationProp2;
       var newCurrentPage = currentPage + 1;
       setCurrentPage(newCurrentPage);
-      _request(_defineProperty({}, targetPageKey, newCurrentPage));
+      props === null || props === void 0 ? void 0 : (_props$paginationProp = props.paginationProps) === null || _props$paginationProp === void 0 ? void 0 : (_props$paginationProp2 = _props$paginationProp.onChange) === null || _props$paginationProp2 === void 0 ? void 0 : _props$paginationProp2.call(_props$paginationProp, newCurrentPage, {});
+      if (!propsDataSource) {
+        _request(_defineProperty({}, targetPageKey, newCurrentPage));
+      }
     },
     rowSelection: rowSelection,
     clearRowSelection: function clearRowSelection() {
@@ -586,17 +598,24 @@ var ProTable = function ProTable(props) {
     },
     switchView: function switchView(view) {
       setSwitchViewState(view);
-      setShowSkeleton(true);
-      setCurrentPage(1);
+      if (!propsDataSource) {
+        setCurrentPage(1);
+      }
       if (view === 'table') {
-        var _request4;
         setPageSize(pageSize !== null && pageSize !== void 0 ? pageSize : 20);
-        _request((_request4 = {}, _defineProperty(_request4, targetPageSizeKey, pageSize !== null && pageSize !== void 0 ? pageSize : 20), _defineProperty(_request4, targetPageKey, 1), _request4));
+        if (!propsDataSource) {
+          var _request4;
+          setShowSkeleton(true);
+          _request((_request4 = {}, _defineProperty(_request4, targetPageSizeKey, pageSize !== null && pageSize !== void 0 ? pageSize : 20), _defineProperty(_request4, targetPageKey, 1), _request4));
+        }
       }
       if (view === 'card') {
-        var _cardViewProps$pageSi, _cardViewProps$pageSi2, _request5;
+        var _cardViewProps$pageSi;
         setPageSize((_cardViewProps$pageSi = cardViewProps === null || cardViewProps === void 0 ? void 0 : cardViewProps.pageSize) !== null && _cardViewProps$pageSi !== void 0 ? _cardViewProps$pageSi : 12);
-        _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));
+        if (!propsDataSource) {
+          var _cardViewProps$pageSi2, _request5;
+          _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));
+        }
       }
       getHeaderHeight(fullscreenState);
     }
@@ -953,7 +972,11 @@ var ProTable = function ProTable(props) {
         }
       }
     }
-    if (showPagination && switchViewState === 'table') {
+    if (showPagination && switchViewState === 'table' || (cardViewProps === null || cardViewProps === void 0 ? void 0 : cardViewProps.useTablePagination) && switchViewState === 'card') {
+      var _props$paginationProp3;
+      var _ref6 = (_props$paginationProp3 = props === null || props === void 0 ? void 0 : props.paginationProps) !== null && _props$paginationProp3 !== void 0 ? _props$paginationProp3 : {},
+        onPaginationPropsChange = _ref6.onChange,
+        othersPaginationProps = _objectWithoutProperties(_ref6, _excluded2);
       return /*#__PURE__*/React.createElement("div", {
         className: cls('footer', {
           'footer-has-rowSelection': rowSelection,
@@ -963,8 +986,9 @@ var ProTable = function ProTable(props) {
         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({
         className: cls('pagination'),
-        onChange: function onChange(number) {
-          return onChangePagination(number);
+        onChange: function onChange(number, e) {
+          onChangePagination(number);
+          onPaginationPropsChange === null || onPaginationPropsChange === void 0 ? void 0 : onPaginationPropsChange(number, e);
         },
         total: total,
         responsivePaginationType: responsivePaginationType,
@@ -983,7 +1007,7 @@ var ProTable = function ProTable(props) {
         onPageSizeChange: function onPageSizeChange(number) {
           return onChangePaginationSize(number);
         }
-      }, props.paginationProps)))));
+      }, othersPaginationProps)))));
     } else if (!showPagination && (footerAction || rowSelection || useRowSelection)) {
       return /*#__PURE__*/React.createElement("div", {
         className: cls('footer', {

package/es/table/typing.d.ts

@@ -341,6 +341,17 @@ export declare type ProTableCardProps = {
     scrollDom?: HTMLElement;
     /** 触底事件 **/
     onScrollBottom?: () => void;
+    /** 使用表格分页 **/
+    useTablePagination?: boolean;
+    /** 使用响应式 **/
+    cardResponsiveProps?: {
+        xxs?: number;
+        xs?: number;
+        s?: number;
+        m?: number;
+        l?: number;
+        xl?: number;
+    };
     /** 卡片配置 **/
     cardProps?: {
         [key in keyof ProCardProps]?: ProCardProps[key] | ((index: number, record: any) => ProCardProps[key]);
@@ -367,5 +378,7 @@ export declare type ProTableCardViewProps = {
     showSkeleton?: boolean;
     /** ProCard 卡片配置 **/
     cardProps?: ProTableCardProps['cardProps'];
+    /** 表格分页器参数 **/
+    tablePaginationProps?: PaginationProps;
 };
 export {};

package/es/utils/useRealHistory.js

@@ -23,8 +23,14 @@ var useRealHistory = function useRealHistory() {
       history = window.HistoryLibrary.createBrowserHistory();
       var oldPush = history.push;
       history.push = function (p) {
-        var _window$ICESTARK;
-        oldPush(path.join(((_window$ICESTARK = window.ICESTARK) === null || _window$ICESTARK === void 0 ? void 0 : _window$ICESTARK.basename) || '/', p));
+        if (typeof p === 'string') {
+          var _window$ICESTARK;
+          oldPush(path.join(((_window$ICESTARK = window.ICESTARK) === null || _window$ICESTARK === void 0 ? void 0 : _window$ICESTARK.basename) || '/', p));
+        } else {
+          var _window$ICESTARK2;
+          p.pathname = path.join(((_window$ICESTARK2 = window.ICESTARK) === null || _window$ICESTARK2 === void 0 ? void 0 : _window$ICESTARK2.basename) || '/', p.pathname);
+          oldPush(p);
+        }
       };
       setRealHistory(history);
     }

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-beta.0";
+declare const version = "1.5.7";
 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-beta.0';
+var version = '1.5.7';
 exports.version = version;

package/lib/info/components/baseInfo/index.js

@@ -24,7 +24,9 @@ var ProBaseInfo = function ProBaseInfo(props) {
     actionRef = props.actionRef,
     layout = props.layout,
     size = props.size,
-    context = props.context;
+    context = props.context,
+    _props$disabledAutoSi = props.disabledAutoSize,
+    disabledAutoSize = _props$disabledAutoSi === void 0 ? false : _props$disabledAutoSi;
   var defaultLayout = _layout.default[(0, _utils.getLayout)((_size$width = size === null || size === void 0 ? void 0 : size.width) !== null && _size$width !== void 0 ? _size$width : 0)];
   // 获取列内的布局参数
   var getFormItemLayout = function getFormItemLayout(colspan) {
@@ -91,7 +93,7 @@ var ProBaseInfo = function ProBaseInfo(props) {
       }));
     });
   };
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (size === null || size === void 0 ? void 0 : size.width) && /*#__PURE__*/_react.default.createElement(Row, {
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, ((size === null || size === void 0 ? void 0 : size.width) || disabledAutoSize) && /*#__PURE__*/_react.default.createElement(Row, {
     wrap: true,
     className: "teamix-pro-info-content-row",
     gutter: 20

package/lib/info/index.js

@@ -28,7 +28,7 @@ Object.keys(_typing).forEach(function (key) {
     }
   });
 });
-var _excluded = ["type", "url", "method", "formatResult", "formatParams", "params", "actionRef", "header", "onSuccess", "onError", "beforeRequest", "extendParams", "className", "style", "columns", "layout", "dataSource", "loading", "extra", "context"],
+var _excluded = ["type", "url", "method", "formatResult", "formatParams", "params", "actionRef", "header", "onSuccess", "onError", "beforeRequest", "extendParams", "className", "style", "columns", "layout", "dataSource", "loading", "extra", "context", "disabledAutoSize"],
   _excluded2 = ["context"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -69,6 +69,7 @@ var ProInfo = function ProInfo(props) {
     userLoading = props.loading,
     extra = props.extra,
     infoContext = props.context,
+    disabledAutoSize = props.disabledAutoSize,
     others = _objectWithoutProperties(props, _excluded);
   var _useContext = (0, _react.useContext)(_utils.ProInfoGroupContext),
     contextUrl = _useContext.url,
@@ -175,7 +176,8 @@ var ProInfo = function ProInfo(props) {
     result: data,
     actionRef: actionRef,
     layout: layout,
-    context: context
+    context: context,
+    disabledAutoSize: disabledAutoSize
   }), type === 'header' && /*#__PURE__*/_react.default.createElement(_headerInfo.default, {
     dataSource: dataSource,
     columns: columns,
@@ -185,7 +187,8 @@ var ProInfo = function ProInfo(props) {
     actionRef: actionRef,
     layout: layout,
     size: size,
-    context: context
+    context: context,
+    disabledAutoSize: disabledAutoSize
   }), type === 'base' && /*#__PURE__*/_react.default.createElement(_baseInfo.default, {
     dataSource: dataSource,
     columns: columns,
@@ -194,7 +197,8 @@ var ProInfo = function ProInfo(props) {
     actionRef: actionRef,
     layout: layout,
     size: size,
-    context: context
+    context: context,
+    disabledAutoSize: disabledAutoSize
   })));
 };
 ProInfo.Group = _InfoGroup.default;

package/lib/info/typing.d.ts

@@ -51,6 +51,8 @@ export declare type ProInfoBaseProps = {
     loading?: boolean;
     /** 上下文传递 */
     context?: object;
+    /** 是否在获取宽度之后才渲染Info 是否忽略首次响应式计算 **/
+    disabledAutoSize?: boolean;
 } & ProInfoHeaderProps & ProInfoRequestProps;
 /** ProInfoColumnsProps info 单元格 定义 */
 export declare type ProInfoItemProps = ProInfoColumnsProps;

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

@@ -12,6 +12,7 @@ var _utils = require("@teamix/utils");
 require("./index.scss");
 var _columnRender = require("../../utils/columnRender");
 var _LoadMore = _interopRequireDefault(require("../LoadMore"));
+var _result = _interopRequireDefault(require("@teamix/result"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -30,7 +31,8 @@ var Row = _components.Grid.Row,
 var cls = (0, _utils.usePrefixCls)('teamix-pro-table-card-view');
 var CardView = function CardView(props) {
   var _cardViewProps$scroll;
-  var dataSource = props.dataSource,
+  var _props$dataSource = props.dataSource,
+    dataSource = _props$dataSource === void 0 ? [] : _props$dataSource,
     _props$columns = props.columns,
     columns = _props$columns === void 0 ? [] : _props$columns,
     _props$loading = props.loading,
@@ -60,7 +62,16 @@ var CardView = function CardView(props) {
     if (showSkeleton) {
       setLoadState('none');
     }
+    if (dataSource.length === 0) {
+      setLoadState('none');
+    }
   }, [loading, skeletonVisible, showSkeleton]);
+  // 数据源变化毁掉
+  (0, _react.useEffect)(function () {
+    if (dataSource.length === 0) {
+      setLoadState('none');
+    }
+  }, [dataSource]);
   var getDataIndexValue = function getDataIndexValue(dataIndex, dataSource) {
     if (Array.isArray(dataIndex)) {
       return dataIndex.map(function (item) {
@@ -325,16 +336,17 @@ var CardView = function CardView(props) {
   };
   // 渲染单个卡片
   var renderCard = function renderCard(record, index) {
-    return /*#__PURE__*/_react.default.createElement(Col, {
+    var _cardViewProps$cardRe;
+    return /*#__PURE__*/_react.default.createElement(Col, _objectSpread({
       xxs: 24,
       xs: 12,
-      s: 8,
+      s: 12,
       m: 8,
       l: 6,
       xl: 6,
       key: index,
       className: cls('card-item')
-    }, /*#__PURE__*/_react.default.createElement(_.ProCard, _objectSpread({
+    }, (_cardViewProps$cardRe = cardViewProps === null || cardViewProps === void 0 ? void 0 : cardViewProps.cardResponsiveProps) !== null && _cardViewProps$cardRe !== void 0 ? _cardViewProps$cardRe : {}), /*#__PURE__*/_react.default.createElement(_.ProCard, _objectSpread({
       title: renderCardTitle(record, index),
       subTitle: renderCardSubTitle(record, index),
       extra: getProCardExtra(record, index),
@@ -345,25 +357,42 @@ var CardView = function CardView(props) {
       context: {
         record: record,
         index: index
+      },
+      disabledAutoSize: true
+    })));
+  };
+  // 渲染卡片主体
+  var renderCardBox = function renderCardBox() {
+    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, skeletonVisible && /*#__PURE__*/_react.default.createElement(_skeleton.ProSkeletonRaw.Content, null), !skeletonVisible && (dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) === 0 && /*#__PURE__*/_react.default.createElement(_result.default, {
+      theme: "hybridcloud-container",
+      img: "noData",
+      title: (0, _.getMessage)('noData'),
+      style: {
+        padding: '50px 0 60px'
+      }
+    }), !skeletonVisible && (dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) > 0 && /*#__PURE__*/_react.default.createElement(Row, {
+      gutter: 16,
+      wrap: true,
+      style: {
+        marginTop: '-16px'
       }
+    }, dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (item, index) {
+      return renderCard(item, index);
     })));
   };
   return /*#__PURE__*/_react.default.createElement("div", {
     className: cls()
-  }, /*#__PURE__*/_react.default.createElement(_LoadMore.default, {
+  }, (cardViewProps === null || cardViewProps === void 0 ? void 0 : cardViewProps.useTablePagination) && /*#__PURE__*/_react.default.createElement(_components.Loading, {
+    visible: loading,
+    style: {
+      width: '100%'
+    }
+  }, renderCardBox()), !(cardViewProps === null || cardViewProps === void 0 ? void 0 : cardViewProps.useTablePagination) && /*#__PURE__*/_react.default.createElement(_LoadMore.default, {
     onScrollBottom: onScrollBottom,
     onLoadMore: onLoadMore,
     loadState: loadState,
     scrollHeight: (_cardViewProps$scroll = cardViewProps.scrollHeight) !== null && _cardViewProps$scroll !== void 0 ? _cardViewProps$scroll : scrollHeight
-  }, skeletonVisible && /*#__PURE__*/_react.default.createElement(_skeleton.ProSkeletonRaw.Content, null), !skeletonVisible && /*#__PURE__*/_react.default.createElement(Row, {
-    gutter: 16,
-    wrap: true,
-    style: {
-      marginTop: '-16px'
-    }
-  }, dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (item, index) {
-    return renderCard(item, index);
-  }))));
+  }, renderCardBox()));
 };
 var _default = CardView;
 exports.default = _default;