@pointcloud/pcloud-components 0.1.14 → 0.1.16

package/dist/esm/DTable/index.js

@@ -9,7 +9,7 @@ var _excluded = ["loadMore", "defaultColumnProps", "actionColumn", "showErrorMsg
  * @LastEditTime : 2023-08-16 16:45:15
  * @Description  : 基于antd的Table组件
  */
-import React, { forwardRef, useEffect, useRef, useState, useContext } from 'react';
+import React, { forwardRef, useEffect, useRef, useState, useContext, useMemo } from 'react';
 import { message, Table } from 'antd';
 import { ConfigContext } from "../ConfigProvider";
 import "./index.less";
@@ -125,13 +125,15 @@ function InternalTable(props, ref) {
   var _className = "".concat(getPrefixCls('table'), " ").concat(className || '', " ").concat(_pagination ? 'height-on-page' : '');
 
   // loading 默认延迟 600ms
-  var _loading = typeof loading === 'boolean' ? {
-    spinning: loading,
-    delay: 600
-  } : _objectSpread({
-    delay: 600,
-    spinning: false
-  }, loading);
+  var _loading = useMemo(function () {
+    return typeof loading === 'boolean' ? {
+      spinning: loading,
+      delay: 500
+    } : _objectSpread({
+      delay: 500,
+      spinning: false
+    }, loading);
+  }, [loading]);
 
   // 加载数据
   var loadData = function loadData(params) {
@@ -172,7 +174,7 @@ function InternalTable(props, ref) {
       setTableParams(_objectSpread(_objectSpread({}, getTablePage(_pagination)), params));
       setTableSource({
         total: total,
-        loading: false,
+        loading: !!loading,
         records: dataSource
       });
     }
@@ -212,7 +214,7 @@ function InternalTable(props, ref) {
     dataSource: tableSource.records,
     pagination: _tablePagination,
     scroll: _scroll,
-    loading: _objectSpread(_objectSpread({}, _loading), {}, {
+    loading: dataSource ? _loading : _objectSpread(_objectSpread({}, _loading), {}, {
       spinning: tableSource.loading
     })
   }));