@hw-component/table 0.0.2-beta-v12 → 0.0.2-beta-v14

package/es/{HwTableBody → HTableBody}/index.js

@@ -15,12 +15,17 @@ import { jsx } from 'react/jsx-runtime';
 import ProTable from '@ant-design/pro-table';
 import { useCols, useSynchronousKeys } from './hooks.js';
 import { useHTableContext } from '../context.js';
-import 'antd';
+import { ConfigProvider, Empty } from 'antd';
 import { useHTableConfigContext } from '../TableConfig.js';
 
 var _excluded = ["loading", "configData", "pagination", "onPageChange", "rowSelection", "rowKey", "emptyRender", "errorRender", "tableStyle"];
 function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context2 = ownKeys(Object(t))).call(_context2, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
+var defaultRender = function defaultRender() {
+  return jsx(Empty, {
+    image: Empty.PRESENTED_IMAGE_SIMPLE
+  });
+};
 var Body = (function (_ref) {
   var loading = _ref.loading,
     configData = _ref.configData,
@@ -41,12 +46,16 @@ var Body = (function (_ref) {
     tableInstance = _useHTableContext.tableInstance,
     data = _useHTableContext.data,
     selectedRowData = _useHTableContext.selectedRowData,
-    rowOnChange = _useHTableContext.rowOnChange;
-    _useHTableContext.error;
-  useHTableConfigContext({
+    rowOnChange = _useHTableContext.rowOnChange,
+    error = _useHTableContext.error;
+  var _useHTableConfigConte = useHTableConfigContext({
       emptyRender: emptyRender,
       errorRender: errorRender
-    });
+    }),
+    _useHTableConfigConte2 = _useHTableConfigConte.emptyRender,
+    tableEmptyRender = _useHTableConfigConte2 === void 0 ? defaultRender : _useHTableConfigConte2,
+    _useHTableConfigConte3 = _useHTableConfigConte.errorRender,
+    tableErrorRender = _useHTableConfigConte3 === void 0 ? defaultRender : _useHTableConfigConte3;
   var _ref2 = data || {},
     records = _ref2.records,
     size = _ref2.size,
@@ -70,32 +79,40 @@ var Body = (function (_ref) {
       overflow: "hidden"
     }, tableStyle),
     className: "hw_table_body",
-    children: jsx(ProTable, _objectSpread(_objectSpread({}, props), {}, {
-      columns: cols,
-      tableAlertRender: false,
-      search: false,
-      rowSelection: _objectSpread(_objectSpread({}, rowSelection), {}, {
-        selectedRowKeys: _keysInstanceProperty(selectedRowData),
-        onChange: change
-      }),
-      loading: loading,
-      rowKey: rowKey,
-      dataSource: records,
-      onChange: function onChange(paginationData) {
-        var ps = paginationData.pageSize,
-          pn = paginationData.current;
-        onPageChange === null || onPageChange === void 0 || onPageChange({
-          size: ps,
-          current: pn
-        });
+    children: jsx(ConfigProvider, {
+      renderEmpty: function renderEmpty() {
+        if (error) {
+          return tableErrorRender === null || tableErrorRender === void 0 ? void 0 : tableErrorRender(tableInstance, error);
+        }
+        return tableEmptyRender === null || tableEmptyRender === void 0 ? void 0 : tableEmptyRender(tableInstance);
       },
-      pagination: pagination === false ? pagination : _objectSpread({
-        current: _Number$parseInt(current || "1", 10),
-        total: _Number$parseInt(total || "0", 10),
-        pageSize: _Number$parseInt(size || "10", 10),
-        showQuickJumper: true
-      }, pagination)
-    }))
+      children: jsx(ProTable, _objectSpread(_objectSpread({}, props), {}, {
+        columns: cols,
+        tableAlertRender: false,
+        search: false,
+        rowSelection: _objectSpread(_objectSpread({}, rowSelection), {}, {
+          selectedRowKeys: _keysInstanceProperty(selectedRowData),
+          onChange: change
+        }),
+        loading: loading,
+        rowKey: rowKey,
+        dataSource: records,
+        onChange: function onChange(paginationData) {
+          var ps = paginationData.pageSize,
+            pn = paginationData.current;
+          onPageChange === null || onPageChange === void 0 || onPageChange({
+            size: ps,
+            current: pn
+          });
+        },
+        pagination: pagination === false ? pagination : _objectSpread({
+          current: _Number$parseInt(current || "1", 10),
+          total: _Number$parseInt(total || "0", 10),
+          pageSize: _Number$parseInt(size || "10", 10),
+          showQuickJumper: true
+        }, pagination)
+      }))
+    })
   });
 });
 

package/es/Table.js

@@ -10,12 +10,12 @@ import _Object$defineProperty from '@babel/runtime-corejs3/core-js/object/define
 import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
 import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
 import { jsx, jsxs } from 'react/jsx-runtime';
-import Header from './HwTableHeader/index.js';
-import Body from './HwTableBody/index.js';
+import Header from './HTableHeader/index.js';
+import Body from './HTableBody/index.js';
 import { useRequest } from 'ahooks';
 import { useMemo } from 'react';
 import useCurrentTable from './hooks/useCurrentTable.js';
-import Footer from './HwTableFooter/index.js';
+import Footer from './HTableFooter/index.js';
 import useRowObj from './hooks/useRowObj.js';
 import { HTableContext } from './context.js';
 import { Space } from 'antd';

package/es/TestProTable/index.d.ts

@@ -0,0 +1,2 @@
+declare const _default: () => JSX.Element;
+export default _default;

package/lib/{HwTableBody → HTableBody}/index.js

@@ -18,12 +18,17 @@ var jsxRuntime = require('react/jsx-runtime');
 var ProTable = require('@ant-design/pro-table');
 var hooks = require('./hooks.js');
 var context = require('../context.js');
-require('antd');
+var antd = require('antd');
 var TableConfig = require('../TableConfig.js');
 
 var _excluded = ["loading", "configData", "pagination", "onPageChange", "rowSelection", "rowKey", "emptyRender", "errorRender", "tableStyle"];
 function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context2 = ownKeys(Object(t))).call(_context2, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
+var defaultRender = function defaultRender() {
+  return jsxRuntime.jsx(antd.Empty, {
+    image: antd.Empty.PRESENTED_IMAGE_SIMPLE
+  });
+};
 var Body = (function (_ref) {
   var loading = _ref.loading,
     configData = _ref.configData,
@@ -44,12 +49,16 @@ var Body = (function (_ref) {
     tableInstance = _useHTableContext.tableInstance,
     data = _useHTableContext.data,
     selectedRowData = _useHTableContext.selectedRowData,
-    rowOnChange = _useHTableContext.rowOnChange;
-    _useHTableContext.error;
-  TableConfig.useHTableConfigContext({
+    rowOnChange = _useHTableContext.rowOnChange,
+    error = _useHTableContext.error;
+  var _useHTableConfigConte = TableConfig.useHTableConfigContext({
       emptyRender: emptyRender,
       errorRender: errorRender
-    });
+    }),
+    _useHTableConfigConte2 = _useHTableConfigConte.emptyRender,
+    tableEmptyRender = _useHTableConfigConte2 === void 0 ? defaultRender : _useHTableConfigConte2,
+    _useHTableConfigConte3 = _useHTableConfigConte.errorRender,
+    tableErrorRender = _useHTableConfigConte3 === void 0 ? defaultRender : _useHTableConfigConte3;
   var _ref2 = data || {},
     records = _ref2.records,
     size = _ref2.size,
@@ -73,32 +82,40 @@ var Body = (function (_ref) {
       overflow: "hidden"
     }, tableStyle),
     className: "hw_table_body",
-    children: jsxRuntime.jsx(ProTable, _objectSpread(_objectSpread({}, props), {}, {
-      columns: cols,
-      tableAlertRender: false,
-      search: false,
-      rowSelection: _objectSpread(_objectSpread({}, rowSelection), {}, {
-        selectedRowKeys: _keysInstanceProperty(selectedRowData),
-        onChange: change
-      }),
-      loading: loading,
-      rowKey: rowKey,
-      dataSource: records,
-      onChange: function onChange(paginationData) {
-        var ps = paginationData.pageSize,
-          pn = paginationData.current;
-        onPageChange === null || onPageChange === void 0 || onPageChange({
-          size: ps,
-          current: pn
-        });
+    children: jsxRuntime.jsx(antd.ConfigProvider, {
+      renderEmpty: function renderEmpty() {
+        if (error) {
+          return tableErrorRender === null || tableErrorRender === void 0 ? void 0 : tableErrorRender(tableInstance, error);
+        }
+        return tableEmptyRender === null || tableEmptyRender === void 0 ? void 0 : tableEmptyRender(tableInstance);
       },
-      pagination: pagination === false ? pagination : _objectSpread({
-        current: _Number$parseInt(current || "1", 10),
-        total: _Number$parseInt(total || "0", 10),
-        pageSize: _Number$parseInt(size || "10", 10),
-        showQuickJumper: true
-      }, pagination)
-    }))
+      children: jsxRuntime.jsx(ProTable, _objectSpread(_objectSpread({}, props), {}, {
+        columns: cols,
+        tableAlertRender: false,
+        search: false,
+        rowSelection: _objectSpread(_objectSpread({}, rowSelection), {}, {
+          selectedRowKeys: _keysInstanceProperty(selectedRowData),
+          onChange: change
+        }),
+        loading: loading,
+        rowKey: rowKey,
+        dataSource: records,
+        onChange: function onChange(paginationData) {
+          var ps = paginationData.pageSize,
+            pn = paginationData.current;
+          onPageChange === null || onPageChange === void 0 || onPageChange({
+            size: ps,
+            current: pn
+          });
+        },
+        pagination: pagination === false ? pagination : _objectSpread({
+          current: _Number$parseInt(current || "1", 10),
+          total: _Number$parseInt(total || "0", 10),
+          pageSize: _Number$parseInt(size || "10", 10),
+          showQuickJumper: true
+        }, pagination)
+      }))
+    })
   });
 });
 

package/lib/Table.js

@@ -13,12 +13,12 @@ var _Object$defineProperty = require('@babel/runtime-corejs3/core-js/object/defi
 var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
 var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
 var jsxRuntime = require('react/jsx-runtime');
-var index = require('./HwTableHeader/index.js');
-var index$1 = require('./HwTableBody/index.js');
+var index = require('./HTableHeader/index.js');
+var index$1 = require('./HTableBody/index.js');
 var ahooks = require('ahooks');
 var React = require('react');
 var useCurrentTable = require('./hooks/useCurrentTable.js');
-var index$2 = require('./HwTableFooter/index.js');
+var index$2 = require('./HTableFooter/index.js');
 var useRowObj = require('./hooks/useRowObj.js');
 var context = require('./context.js');
 var antd = require('antd');

package/lib/TestProTable/index.d.ts

@@ -0,0 +1,2 @@
+declare const _default: () => JSX.Element;
+export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hw-component/table",
-  "version": "0.0.2-beta-v12",
+  "version": "0.0.2-beta-v14",
   "description": "基于antd二次开发table组件",
   "keywords": [
     "table"

package/src/components/{HwTableBody → HTableBody}/index.tsx

@@ -55,7 +55,15 @@ export default ({
       style={{ borderRadius: 4, overflow: "hidden", ...tableStyle }}
       className="hw_table_body"
     >
-      <ProTable
+      <ConfigProvider
+        renderEmpty={() => {
+          if (error) {
+            return tableErrorRender?.(tableInstance, error);
+          }
+          return tableEmptyRender?.(tableInstance);
+        }}
+      >
+        <ProTable
           {...props}
           columns={cols}
           tableAlertRender={false}
@@ -79,7 +87,8 @@ export default ({
             showQuickJumper: true,
             ...pagination,
           }}
-      />
+        />
+      </ConfigProvider>
     </div>
   );
 };

package/src/components/Table.tsx

@@ -1,9 +1,9 @@
-import Header from "./HwTableHeader";
-import Body from "./HwTableBody";
+import Header from "./HTableHeader";
+import Body from "./HTableBody";
 import { useRequest } from "ahooks";
 import { useMemo } from "react";
 import useCurrentTable from "./hooks/useCurrentTable";
-import Footer from "./HwTableFooter";
+import Footer from "./HTableFooter";
 import useRowObj from "./hooks/useRowObj";
 import { HTableContext } from "./context";
 import { Space } from "antd";

package/src/components/TestProTable/index.tsx

@@ -0,0 +1,10 @@
+import ProTable from "@ant-design/pro-table";
+import React from "react";
+
+export default ()=>{
+  return  <ProTable
+      columns={[]}
+      tableAlertRender={false}
+      search={false}
+  />
+}

package/src/pages/Test/index.tsx

@@ -1,6 +1,6 @@
 import { HTable, useHTable } from "../../components";
 import { Button } from "antd";
-import Body from "../../components/HwTableBody";
+import Body from "../../components/HTableBody";
 import {HTableContext} from "../../components/context";
 const configData = [
   {