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

package/es/HwTableBody/index.js

@@ -9,55 +9,56 @@ import _Object$defineProperties from '@babel/runtime-corejs3/core-js/object/defi
 import _Object$defineProperty from '@babel/runtime-corejs3/core-js/object/define-property';
 import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
 import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
+import _keysInstanceProperty from '@babel/runtime-corejs3/core-js/instance/keys';
+import _Number$parseInt from '@babel/runtime-corejs3/core-js/number/parse-int';
 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 { ConfigProvider, Empty } from 'antd';
+import '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) {
-  _ref.loading;
-    var configData = _ref.configData;
-    _ref.pagination;
-    _ref.onPageChange;
-    var _ref$rowSelection = _ref.rowSelection,
+  var loading = _ref.loading,
+    configData = _ref.configData,
+    _ref$pagination = _ref.pagination,
+    pagination = _ref$pagination === void 0 ? {} : _ref$pagination,
+    onPageChange = _ref.onPageChange,
+    _ref$rowSelection = _ref.rowSelection,
     rowSelection = _ref$rowSelection === void 0 ? {} : _ref$rowSelection,
     _ref$rowKey = _ref.rowKey,
     rowKey = _ref$rowKey === void 0 ? "id" : _ref$rowKey,
     emptyRender = _ref.emptyRender,
     errorRender = _ref.errorRender,
-    tableStyle = _ref.tableStyle;
-    _objectWithoutProperties(_ref, _excluded);
-  var selectedRowKeys = rowSelection.selectedRowKeys;
-    rowSelection.onChange;
+    tableStyle = _ref.tableStyle,
+    props = _objectWithoutProperties(_ref, _excluded);
+  var selectedRowKeys = rowSelection.selectedRowKeys,
+    onChange = rowSelection.onChange;
   var _useHTableContext = useHTableContext(),
     tableInstance = _useHTableContext.tableInstance,
-    data = _useHTableContext.data;
-    _useHTableContext.selectedRowData;
-    _useHTableContext.rowOnChange;
-    var error = _useHTableContext.error;
-  var _useHTableConfigConte = useHTableConfigContext({
+    data = _useHTableContext.data,
+    selectedRowData = _useHTableContext.selectedRowData,
+    rowOnChange = _useHTableContext.rowOnChange;
+    _useHTableContext.error;
+  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;
-    _ref2.size;
-    _ref2.current;
-    _ref2.total;
-  useCols(configData, tableInstance);
+    records = _ref2.records,
+    size = _ref2.size,
+    current = _ref2.current,
+    total = _ref2.total;
+  var cols = useCols(configData, tableInstance);
+  var change = function change(key, rowData) {
+    if (onChange) {
+      return onChange(key, rowData);
+    }
+    rowOnChange(key, rowData);
+  };
   useSynchronousKeys({
     selectedRowKeys: selectedRowKeys,
     records: records,
@@ -69,17 +70,32 @@ var Body = (function (_ref) {
       overflow: "hidden"
     }, tableStyle),
     className: "hw_table_body",
-    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);
+    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("div", {
-        children: "ff"
-      })
-    })
+      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/HwTableBody/index.js

@@ -12,55 +12,56 @@ var _Object$defineProperties = require('@babel/runtime-corejs3/core-js/object/de
 var _Object$defineProperty = require('@babel/runtime-corejs3/core-js/object/define-property');
 var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
 var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
+var _keysInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/keys');
+var _Number$parseInt = require('@babel/runtime-corejs3/core-js/number/parse-int');
 var jsxRuntime = require('react/jsx-runtime');
+var ProTable = require('@ant-design/pro-table');
 var hooks = require('./hooks.js');
 var context = require('../context.js');
-var antd = require('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) {
-  _ref.loading;
-    var configData = _ref.configData;
-    _ref.pagination;
-    _ref.onPageChange;
-    var _ref$rowSelection = _ref.rowSelection,
+  var loading = _ref.loading,
+    configData = _ref.configData,
+    _ref$pagination = _ref.pagination,
+    pagination = _ref$pagination === void 0 ? {} : _ref$pagination,
+    onPageChange = _ref.onPageChange,
+    _ref$rowSelection = _ref.rowSelection,
     rowSelection = _ref$rowSelection === void 0 ? {} : _ref$rowSelection,
     _ref$rowKey = _ref.rowKey,
     rowKey = _ref$rowKey === void 0 ? "id" : _ref$rowKey,
     emptyRender = _ref.emptyRender,
     errorRender = _ref.errorRender,
-    tableStyle = _ref.tableStyle;
-    _objectWithoutProperties(_ref, _excluded);
-  var selectedRowKeys = rowSelection.selectedRowKeys;
-    rowSelection.onChange;
+    tableStyle = _ref.tableStyle,
+    props = _objectWithoutProperties(_ref, _excluded);
+  var selectedRowKeys = rowSelection.selectedRowKeys,
+    onChange = rowSelection.onChange;
   var _useHTableContext = context.useHTableContext(),
     tableInstance = _useHTableContext.tableInstance,
-    data = _useHTableContext.data;
-    _useHTableContext.selectedRowData;
-    _useHTableContext.rowOnChange;
-    var error = _useHTableContext.error;
-  var _useHTableConfigConte = TableConfig.useHTableConfigContext({
+    data = _useHTableContext.data,
+    selectedRowData = _useHTableContext.selectedRowData,
+    rowOnChange = _useHTableContext.rowOnChange;
+    _useHTableContext.error;
+  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;
-    _ref2.size;
-    _ref2.current;
-    _ref2.total;
-  hooks.useCols(configData, tableInstance);
+    records = _ref2.records,
+    size = _ref2.size,
+    current = _ref2.current,
+    total = _ref2.total;
+  var cols = hooks.useCols(configData, tableInstance);
+  var change = function change(key, rowData) {
+    if (onChange) {
+      return onChange(key, rowData);
+    }
+    rowOnChange(key, rowData);
+  };
   hooks.useSynchronousKeys({
     selectedRowKeys: selectedRowKeys,
     records: records,
@@ -72,17 +73,32 @@ var Body = (function (_ref) {
       overflow: "hidden"
     }, tableStyle),
     className: "hw_table_body",
-    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);
+    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("div", {
-        children: "ff"
-      })
-    })
+      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/package.json

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

package/src/components/HwTableBody/index.tsx

@@ -55,16 +55,31 @@ export default ({
       style={{ borderRadius: 4, overflow: "hidden", ...tableStyle }}
       className="hw_table_body"
     >
-      <ConfigProvider
-        renderEmpty={() => {
-          if (error) {
-            return tableErrorRender?.(tableInstance, error);
-          }
-          return tableEmptyRender?.(tableInstance);
-        }}
-      >
-       <div>ff</div>
-      </ConfigProvider>
+      <ProTable
+          {...props}
+          columns={cols}
+          tableAlertRender={false}
+          search={false}
+          rowSelection={{
+            ...rowSelection,
+            selectedRowKeys: selectedRowData.keys,
+            onChange: change,
+          }}
+          loading={loading}
+          rowKey={rowKey}
+          dataSource={records}
+          onChange={(paginationData) => {
+            const { pageSize: ps, current: pn } = paginationData;
+            onPageChange?.({ size: ps, current: pn });
+          }}
+          pagination={pagination===false?pagination:{
+            current: Number.parseInt(current || "1", 10),
+            total: Number.parseInt(total || "0", 10),
+            pageSize: Number.parseInt(size || "10", 10),
+            showQuickJumper: true,
+            ...pagination,
+          }}
+      />
     </div>
   );
 };