@hw-component/table 1.9.92 → 1.9.94

package/lib/EditTable/index.js

@@ -0,0 +1,184 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _asyncToGenerator = require('@babel/runtime-corejs3/helpers/asyncToGenerator');
+var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
+var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
+var _regeneratorRuntime = require('@babel/runtime-corejs3/regenerator');
+var _Array$isArray = require('@babel/runtime-corejs3/core-js-stable/array/is-array');
+var _Object$keys = require('@babel/runtime-corejs3/core-js-stable/object/keys');
+var _Object$getOwnPropertySymbols = require('@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols');
+var _filterInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/filter');
+var _Object$getOwnPropertyDescriptor = require('@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor');
+var _forEachInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/for-each');
+var _Object$getOwnPropertyDescriptors = require('@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptors');
+var _Object$defineProperties = require('@babel/runtime-corejs3/core-js-stable/object/define-properties');
+var _Object$defineProperty = require('@babel/runtime-corejs3/core-js-stable/object/define-property');
+var jsxRuntime = require('react/jsx-runtime');
+var ProTable = require('@ant-design/pro-table');
+var index = require('../hooks/index.js');
+var index$1 = require('../HTablePagination/index.js');
+var antd = require('antd');
+var defaultRender = require('../HTableBody/defaultRender.js');
+var TableConfig = require('../TableConfig.js');
+var hooks = require('./hooks.js');
+
+var _excluded = ["configData", "rowKey", "creatorButtonText", "recordCreatorProps", "defaultRecordValue", "pagination", "editable", "dataSource", "request", "manual", "emptyRender", "errorRender", "onAdd", "onEdit", "actionRef", "editableFormRef"],
+  _excluded2 = ["index", "id"];
+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 _context3, _context4; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context3 = ownKeys(Object(t), !0)).call(_context3, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context4 = ownKeys(Object(t))).call(_context4, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
+var EditTable = (function (_ref) {
+  var configData = _ref.configData,
+    _ref$rowKey = _ref.rowKey,
+    rowKey = _ref$rowKey === void 0 ? "id" : _ref$rowKey,
+    _ref$creatorButtonTex = _ref.creatorButtonText,
+    creatorButtonText = _ref$creatorButtonTex === void 0 ? "新增一列" : _ref$creatorButtonTex,
+    _ref$recordCreatorPro = _ref.recordCreatorProps,
+    recordCreatorProps = _ref$recordCreatorPro === void 0 ? {} : _ref$recordCreatorPro;
+    _ref.defaultRecordValue;
+    var pagination = _ref.pagination,
+    _ref$editable = _ref.editable,
+    editable = _ref$editable === void 0 ? {} : _ref$editable,
+    dataSource = _ref.dataSource,
+    request = _ref.request,
+    manual = _ref.manual,
+    emptyRender = _ref.emptyRender,
+    errorRender = _ref.errorRender,
+    onAdd = _ref.onAdd,
+    onEdit = _ref.onEdit,
+    actionRef = _ref.actionRef,
+    editableFormRef = _ref.editableFormRef,
+    props = _objectWithoutProperties(_ref, _excluded);
+  var tableBody = index.useClassName("hw-table-body");
+  var _useListRequest = hooks.useListRequest({
+      request: request,
+      dataSource: dataSource
+    }),
+    loading = _useListRequest.loading,
+    data = _useListRequest.data,
+    error = _useListRequest.error,
+    run = _useListRequest.run;
+  var _useHTableConfigConte = TableConfig.useHTableConfigContext({
+      emptyRender: emptyRender,
+      errorRender: errorRender
+    }),
+    _useHTableConfigConte2 = _useHTableConfigConte.emptyRender,
+    tableEmptyRender = _useHTableConfigConte2 === void 0 ? defaultRender.emptyDefaultRender : _useHTableConfigConte2,
+    _useHTableConfigConte3 = _useHTableConfigConte.errorRender,
+    tableErrorRender = _useHTableConfigConte3 === void 0 ? defaultRender.errorDefaultRender : _useHTableConfigConte3;
+  var isLocalData = _Array$isArray(data);
+  var values = isLocalData ? data : data === null || data === void 0 ? void 0 : data.record;
+  var _useCuRef = hooks.useCuRef({
+      actionRef: actionRef,
+      editableFormRef: editableFormRef
+    }),
+    cuActionRef = _useCuRef.cuActionRef,
+    cuEditableFormRef = _useCuRef.cuEditableFormRef;
+  return jsxRuntime.jsxs("div", {
+    className: tableBody,
+    children: [jsxRuntime.jsx(antd.ConfigProvider, {
+      renderEmpty: function renderEmpty() {
+        if (error) {
+          return tableErrorRender === null || tableErrorRender === void 0 ? void 0 : tableErrorRender({
+            reload: cuActionRef.current.reload,
+            error: error
+          });
+        }
+        return tableEmptyRender === null || tableEmptyRender === void 0 ? void 0 : tableEmptyRender();
+      },
+      children: jsxRuntime.jsx(ProTable.EditableProTable, _objectSpread({
+        columns: configData,
+        loading: loading,
+        rowKey: rowKey,
+        editableFormRef: cuEditableFormRef,
+        manualRequest: manual,
+        request: run,
+        actionRef: cuActionRef,
+        value: values,
+        recordCreatorProps: _objectSpread({
+          position: "bottom",
+          record: function record() {
+            return {
+              id: "add"
+            };
+          },
+          creatorButtonText: creatorButtonText
+        }, recordCreatorProps),
+        editable: _objectSpread({
+          type: "single",
+          onCancel: function () {
+            var _onCancel = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(keys) {
+              var _cuEditableFormRef$cu;
+              return _regeneratorRuntime.wrap(function _callee$(_context) {
+                while (1) switch (_context.prev = _context.next) {
+                  case 0:
+                    (_cuEditableFormRef$cu = cuEditableFormRef.current) === null || _cuEditableFormRef$cu === void 0 || _cuEditableFormRef$cu.resetFields([keys]);
+                  case 1:
+                  case "end":
+                    return _context.stop();
+                }
+              }, _callee);
+            }));
+            function onCancel(_x) {
+              return _onCancel.apply(this, arguments);
+            }
+            return onCancel;
+          }(),
+          actionRender: function actionRender(trow, tconfig, defaultDoms) {
+            return [defaultDoms.save, defaultDoms.cancel];
+          },
+          onSave: function () {
+            var _onSave = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(key, row) {
+              var _cuEditableFormRef$cu3, _cuActionRef$current2;
+              var id, oRow, _cuEditableFormRef$cu2, _cuActionRef$current;
+              return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+                while (1) switch (_context2.prev = _context2.next) {
+                  case 0:
+                    row.index, id = row.id, oRow = _objectWithoutProperties(row, _excluded2);
+                    if (!(key === "add")) {
+                      _context2.next = 7;
+                      break;
+                    }
+                    _context2.next = 4;
+                    return onAdd === null || onAdd === void 0 ? void 0 : onAdd(oRow);
+                  case 4:
+                    (_cuEditableFormRef$cu2 = cuEditableFormRef.current) === null || _cuEditableFormRef$cu2 === void 0 || _cuEditableFormRef$cu2.resetFields(["add"]);
+                    (_cuActionRef$current = cuActionRef.current) === null || _cuActionRef$current === void 0 || _cuActionRef$current.reload();
+                    return _context2.abrupt("return");
+                  case 7:
+                    _context2.next = 9;
+                    return onEdit === null || onEdit === void 0 ? void 0 : onEdit(_objectSpread({
+                      id: id
+                    }, oRow));
+                  case 9:
+                    (_cuEditableFormRef$cu3 = cuEditableFormRef.current) === null || _cuEditableFormRef$cu3 === void 0 || _cuEditableFormRef$cu3.resetFields(["key"]);
+                    (_cuActionRef$current2 = cuActionRef.current) === null || _cuActionRef$current2 === void 0 || _cuActionRef$current2.reload();
+                  case 11:
+                  case "end":
+                    return _context2.stop();
+                }
+              }, _callee2);
+            }));
+            function onSave(_x2, _x3) {
+              return _onSave.apply(this, arguments);
+            }
+            return onSave;
+          }()
+        }, editable)
+      }, props))
+    }), jsxRuntime.jsx(index$1.default, _objectSpread(_objectSpread({
+      data: isLocalData ? null : data
+    }, pagination), {}, {
+      onChange: function onChange(page, pageSize) {
+        run({
+          size: pageSize,
+          current: page
+        });
+      }
+    }))]
+  });
+});
+
+exports.default = EditTable;
+// powered by h

package/lib/EditTable/modal.d.ts

@@ -0,0 +1,19 @@
+import { EditableProTableProps } from "@ant-design/pro-table/lib/components/EditableTable";
+import { ParamsType } from "@ant-design/pro-provider";
+import { IPaginationProps } from "../HTablePagination";
+import { EmptyPageRender, ErrorPageRender } from "../modal";
+import { ProColumns } from "@ant-design/pro-table/lib/typing";
+export interface EditTableProps<T = any> extends Omit<EditableProTableProps<T, ParamsType>, "recordCreatorProps" | "request" | "pagination"> {
+    creatorButtonText?: string;
+    defaultRecordValue?: T;
+    recordCreatorProps?: Partial<EditableProTableProps<T, ParamsType>["recordCreatorProps"]>;
+    dataSource?: any[];
+    request?: (params: Record<string, any>) => Promise<T>;
+    pagination?: IPaginationProps;
+    manual?: boolean;
+    emptyRender?: EmptyPageRender;
+    errorRender?: ErrorPageRender;
+    onAdd?: (data: T) => Promise<void>;
+    onEdit?: (data: T) => Promise<void>;
+    configData?: ProColumns<T>[];
+}

package/lib/HTableBody/Options/hooks.d.ts

@@ -15,5 +15,5 @@ interface UseTreeKeysModal {
     treeData: ColDataNode[];
     checkKeys: string[];
 }
-export declare const useTreeKeys: ({ treeData, checkKeys, }: UseTreeKeysModal) => string[];
+export declare const useTreeKeys: ({ treeData, checkKeys }: UseTreeKeysModal) => string[];
 export {};

package/lib/HTableBody/defaultRender.d.ts

@@ -1,4 +1,10 @@
 /// <reference types="react" />
 import type { HTableInstance } from "../modal";
 export declare const emptyDefaultRender: () => JSX.Element;
-export declare const errorDefaultRender: (tableInstance: HTableInstance, error: Error) => JSX.Element;
+interface errorDefaultRenderParams {
+    reload?: () => void;
+    error: Error;
+    tableInstance?: HTableInstance;
+}
+export declare const errorDefaultRender: ({ error, tableInstance, reload, }: errorDefaultRenderParams) => JSX.Element;
+export {};

package/lib/HTableBody/defaultRender.js

@@ -30,7 +30,16 @@ var emptyDefaultRender = function emptyDefaultRender() {
     description: "\u6682\u65E0\u6570\u636E~"
   }, pubProps));
 };
-var errorDefaultRender = function errorDefaultRender(tableInstance, error) {
+var errorDefaultRender = function errorDefaultRender(_ref) {
+  var error = _ref.error,
+    tableInstance = _ref.tableInstance,
+    reload = _ref.reload;
+  var pageReload = function pageReload() {
+    if (tableInstance) {
+      return tableInstance.table.reloadWithParams();
+    }
+    return reload === null || reload === void 0 ? void 0 : reload();
+  };
   return jsxRuntime.jsx(antd.Empty, _objectSpread(_objectSpread({
     image: error_bg.default,
     description: error.message
@@ -41,9 +50,7 @@ var errorDefaultRender = function errorDefaultRender(tableInstance, error) {
       style: {
         borderRadius: 16
       },
-      onClick: function onClick() {
-        tableInstance.table.reloadWithParams();
-      },
+      onClick: pageReload,
       children: "\u5237\u65B0"
     })
   }));

package/lib/HTableBody/index.js

@@ -158,7 +158,10 @@ var Body = (function (bodyProps) {
       }), jsxRuntime.jsxs(antd.ConfigProvider, {
         renderEmpty: function renderEmpty() {
           if (error) {
-            return tableErrorRender === null || tableErrorRender === void 0 ? void 0 : tableErrorRender(tableInstance, error);
+            return tableErrorRender === null || tableErrorRender === void 0 ? void 0 : tableErrorRender({
+              tableInstance: tableInstance,
+              error: error
+            });
           }
           return tableEmptyRender === null || tableEmptyRender === void 0 ? void 0 : tableEmptyRender(tableInstance);
         },

package/lib/HTableBody/modal.d.ts

@@ -2,7 +2,7 @@ import type { OptionConfig } from "@ant-design/pro-table/lib/components/ToolBar"
 import type { Key } from "react";
 import type React from "react";
 import type { ProTableProps } from "@ant-design/pro-table";
-import type { ActionRenderFn, ConfigDataModal, HRowSelection, HTableInstance, ParamsModal } from "@/components/modal";
+import { ActionRenderFn, ConfigDataModal, EmptyPageRender, ErrorPageRender, HRowSelection, HTableInstance, ParamsModal } from "../modal";
 import type { AffixProps } from "antd/lib/affix";
 import type { IPaginationProps } from "@/components/HTablePagination";
 export interface OptionModal extends OptionConfig {
@@ -11,8 +11,8 @@ export interface OptionModal extends OptionConfig {
 export interface HTableBodyProps extends Omit<ProTableProps<any, any>, "dataSource" | "rowSelection" | "options" | "pagination"> {
     configData?: ConfigDataModal;
     onPageChange?: (params: ParamsModal) => void;
-    emptyRender?: (tableInstance: HTableInstance) => React.ReactNode;
-    errorRender?: (tableInstance: HTableInstance, error: Error) => React.ReactNode;
+    emptyRender?: EmptyPageRender;
+    errorRender?: ErrorPageRender;
     tableStyle?: React.CSSProperties;
     paginationStyle?: React.CSSProperties;
     actionRender?: ActionRenderFn;

package/lib/HTablePagination/index.d.ts

@@ -10,6 +10,7 @@ export interface IPaginationProps extends Omit<PaginationProps, "showTotal"> {
     actionRender?: (tableInstance: HTableInstance) => React.ReactNode;
     table?: HTableInstance;
     showTotal?: false | PaginationProps["showTotal"];
+    data?: Record<string, any>;
 }
-declare const _default: ({ onPageChange, paginationStyle, affixProps, goTop, actionRender, table, showTotal, ...props }: IPaginationProps) => JSX.Element;
+declare const _default: ({ onPageChange, paginationStyle, affixProps, goTop, actionRender, table, showTotal, data, ...props }: IPaginationProps) => JSX.Element;
 export default _default;

package/lib/HTablePagination/index.js

@@ -23,7 +23,7 @@ var React = require('react');
 var index$1 = require('../GoTop/index.js');
 var TableConfig = require('../TableConfig.js');
 
-var _excluded = ["onPageChange", "paginationStyle", "affixProps", "goTop", "actionRender", "table", "showTotal"],
+var _excluded = ["onPageChange", "paginationStyle", "affixProps", "goTop", "actionRender", "table", "showTotal", "data"],
   _excluded2 = ["offsetBottom"];
 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 _context3, _context4; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context3 = ownKeys(Object(t), !0)).call(_context3, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context4 = ownKeys(Object(t))).call(_context4, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -43,18 +43,20 @@ var HTablePagination = (function (_ref3) {
     table = _ref3.table,
     _ref3$showTotal = _ref3.showTotal,
     showTotal = _ref3$showTotal === void 0 ? defaultShowTotal : _ref3$showTotal,
+    data = _ref3.data,
     props = _objectWithoutProperties(_ref3, _excluded);
   var _useHTableContext = context.useHTableContext(),
     contextOnPageChange = _useHTableContext.onPageChange,
-    data = _useHTableContext.data,
+    contextData = _useHTableContext.data,
     contextTableInstance = _useHTableContext.tableInstance;
   var _useHTableConfigConte = TableConfig.useHTableConfigContext({
       paginationStyle: paginationStyle
     }),
     defaultPaginationStyle = _useHTableConfigConte.paginationStyle;
+  var cuData = data || contextData;
   var tableInstance = table || contextTableInstance;
   var tableOnPageChange = onPageChange || contextOnPageChange;
-  var _ref4 = data || {},
+  var _ref4 = cuData || {},
     size = _ref4.size,
     current = _ref4.current,
     total = _ref4.total;
@@ -67,7 +69,7 @@ var HTablePagination = (function (_ref3) {
     style = _useState2[0],
     setStyle = _useState2[1];
   var cuShowTotal = showTotal === false ? undefined : showTotal;
-  if (!data) {
+  if (!cuData) {
     return jsxRuntime.jsx(jsxRuntime.Fragment, {});
   }
   if (affixProps === false) {

package/lib/Table.js

@@ -114,7 +114,7 @@ var Table = (function (_ref) {
       configData: configData,
       onFinish: function onFinish(value) {
         rowSelectionReload();
-        return run(_objectSpread(_objectSpread(_objectSpread({}, saveParams.old), value), {}, {
+        return run(_objectSpread(_objectSpread({}, value), {}, {
           current: 1
         }));
       },

package/lib/TableConfig.d.ts

@@ -1,8 +1,8 @@
 import React from "react";
-import type { HTableInstance, ValueTypeConfigModal } from "./modal";
+import { EmptyPageRender, ErrorPageRender, ValueTypeConfigModal } from "./modal";
 interface HTableConfigContextModal {
-    emptyRender?: (table: HTableInstance) => React.ReactNode;
-    errorRender?: (table: HTableInstance, error: Error) => React.ReactNode;
+    emptyRender?: EmptyPageRender;
+    errorRender?: ErrorPageRender;
     headerStyle?: React.CSSProperties;
     tableStyle?: React.CSSProperties;
     paginationStyle?: React.CSSProperties;
@@ -11,8 +11,8 @@ interface HTableConfigContextModal {
 }
 export declare const HTableConfigContext: React.Context<HTableConfigContextModal | null>;
 export declare const useHTableConfigContext: ({ emptyRender, errorRender, headerStyle, tableStyle, paginationStyle, }: HTableConfigContextModal) => {
-    errorRender: ((table: HTableInstance, error: Error) => React.ReactNode) | undefined;
-    emptyRender: ((table: HTableInstance) => React.ReactNode) | undefined;
+    errorRender: ErrorPageRender | undefined;
+    emptyRender: EmptyPageRender | undefined;
     headerStyle: React.CSSProperties | undefined;
     tableStyle: React.CSSProperties | undefined;
     paginationStyle: React.CSSProperties | undefined;

package/lib/index.d.ts

@@ -12,3 +12,5 @@ export { default as HModalTable } from "./DialogTable/ModalTable";
 export { useHDialogTable } from "./DialogTable/hooks";
 export { default as HDwTable } from "./DialogTable/DwTable";
 export { DefaultSubComponent as HTableHeaderSubBtn } from "./HTableHeader/defaultSubComponent";
+export { default as EditTable } from "./EditTable";
+export { default as ModalEditTable } from "./DialogTable/ModalEditTable";

package/lib/index.js

@@ -12,6 +12,8 @@ var ModalTable = require('./DialogTable/ModalTable.js');
 var hooks = require('./DialogTable/hooks.js');
 var DwTable = require('./DialogTable/DwTable.js');
 var defaultSubComponent = require('./HTableHeader/defaultSubComponent.js');
+var index$4 = require('./EditTable/index.js');
+var ModalEditTable = require('./DialogTable/ModalEditTable.js');
 
 
 
@@ -27,4 +29,6 @@ exports.HModalTable = ModalTable.default;
 exports.useHDialogTable = hooks.useHDialogTable;
 exports.HDwTable = DwTable.default;
 exports.HTableHeaderSubBtn = defaultSubComponent.DefaultSubComponent;
+exports.EditTable = index$4.default;
+exports.ModalEditTable = ModalEditTable.default;
 // powered by h

package/lib/modal.d.ts

@@ -9,7 +9,8 @@ import type { TableProps } from "antd/lib/table";
 import type { AffixProps } from "antd/lib/affix";
 import type { OptionModal } from "./HTableBody/modal";
 import type { DrawerProps } from "antd";
-import type { IPaginationProps } from "@/components/HTablePagination";
+import type { IPaginationProps } from "./HTablePagination";
+import { EditTableProps } from "./EditTable/modal";
 export interface RowObj {
     keys?: React.Key[];
     rowData?: any[];
@@ -56,8 +57,8 @@ export interface HTableProps extends Omit<ProTableProps<any, any>, "request" | "
     searchSpan?: ColProps;
     table?: HTableInstance;
     actionRender?: ActionRenderFn;
-    emptyRender?: (tableInstance: HTableInstance) => React.ReactNode;
-    errorRender?: (tableInstance: HTableInstance, error: Error) => React.ReactNode;
+    emptyRender?: EmptyPageRender;
+    errorRender?: ErrorPageRender;
     hideHeader?: boolean;
     action?: Record<string, actionFn>;
     headerStyle?: React.CSSProperties;
@@ -128,16 +129,24 @@ export interface DwTableProps extends DrawerProps {
     request?: HTableProps["request"];
     contentRender?: (node: React.ReactNode) => React.ReactNode;
 }
-export interface ModalTableProps extends Omit<ModalProps, "onOk"> {
+export interface ModalTableProps<T = HTableProps["configData"]> extends Omit<ModalProps, "onOk"> {
     tableProps?: Omit<HTableProps, "configData" | "request">;
     dialogTable?: HDiaLogTableInstance;
     params?: Record<string, any>;
-    configData?: HTableProps["configData"];
+    configData?: T;
     request?: HTableProps["request"];
     contentRender?: (node: React.ReactNode) => React.ReactNode;
     dataSource?: any[];
     onOk?: (e?: React.MouseEvent<HTMLElement>) => void;
+    editTableProps?: Omit<EditTableProps, "configData" | "request">;
 }
 export type ValueTypeConfigRenderFn = (config: ConfigItemModal, itemData: any, index: number, tableInstance: HTableInstance) => React.ReactNode;
 export type ValueTypeConfigModal = Record<string, ValueTypeConfigRenderFn>;
+interface ErrorRenderParams {
+    error: Error;
+    tableInstance?: HTableInstance;
+    reload?: VoidFunction;
+}
+export type ErrorPageRender = (params: ErrorRenderParams) => React.ReactNode;
+export type EmptyPageRender = (tableInstance?: HTableInstance) => React.ReactNode;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hw-component/table",
-  "version": "1.9.92",
+  "version": "1.9.94",
   "description": "基于antd二次开发table组件",
   "keywords": [
     "table"
@@ -23,8 +23,9 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "lint-staged": {
-    "**/*.{js,jsx,ts,tsx}": "npm run lint:fix",
-    "**/*.{js,jsx,tsx,ts,md,json}": [
+    "src/**/*.less": "npm run lint:style",
+    "src/**/*.{js,jsx,ts,tsx}": "npm run lint:js",
+    "src/**/*.{js,jsx,tsx,ts,less,md,json}": [
       "prettier --write"
     ]
   },

package/src/components/DialogTable/Content.tsx

@@ -1,7 +1,9 @@
 import Table from "@/components/Table";
-import type { ModalTableProps } from "@/components/modal";
+import type { ModalTableProps } from "../modal";
+import { EditTable } from "@/components";
+import { ProColumns } from "@ant-design/pro-table/lib/typing";
 
-export default ({
+export const TableContent = ({
   tableProps,
   configData,
   dialogTable,
@@ -21,3 +23,24 @@ export default ({
   );
   return <>{contentRender ? contentRender(node) : node}</>;
 };
+
+export const EditTableContent = ({
+  editTableProps,
+  configData,
+  request,
+  contentRender,
+  dataSource,
+}: ModalTableProps<ProColumns[]>) => {
+  const node = (
+    <EditTable
+      {...editTableProps}
+      configData={configData || []}
+      request={request}
+      pagination={{
+        affixProps: false,
+      }}
+      dataSource={dataSource}
+    />
+  );
+  return <>{contentRender ? contentRender(node) : node}</>;
+};

package/src/components/DialogTable/DwTable.tsx

@@ -1,9 +1,10 @@
 import { Drawer } from "antd";
 import type { DwTableProps } from "../modal";
 import { useCurrentTable, useTableProps, useVisible } from "./hooks";
-import Content from "./Content";
+import { TableContent } from "./Content";
 import { CloseOutlined } from "@ant-design/icons";
 import { useClassName } from "../hooks";
+
 export default ({
   configData: configDataProps,
   request: requestProps,
@@ -96,7 +97,7 @@ export default ({
         afterVisibleChange?.(changeVisible);
       }}
     >
-      <Content
+      <TableContent
         contentRender={contentRender}
         tableProps={tableProps}
         configData={configData || []}

package/src/components/DialogTable/ModalEditTable.tsx

@@ -0,0 +1,99 @@
+import { Modal } from "antd";
+import type { ModalTableProps } from "../modal";
+import { useCurrentTable, useTableProps, useVisible } from "./hooks";
+import { EditTableContent } from "./Content";
+import { ProColumns } from "@ant-design/pro-table/lib/typing";
+
+export default ({
+  configData: configDataProps,
+  request: requestProps,
+  editTableProps = {},
+  dialogTable,
+  visible = false,
+  onCancel,
+  bodyStyle = {},
+  afterClose,
+  contentRender,
+  width = 666,
+  footer = null,
+  ...props
+}: ModalTableProps<ProColumns[]>) => {
+  const { modalVisible, setModalVisible } = useVisible(visible);
+  const { modalTableParams, setModalTableParams } = useTableProps<ProColumns[]>(
+    {
+      ...props,
+      configData: configDataProps,
+      request: requestProps,
+    }
+  );
+  const currentTable = useCurrentTable({
+    show: (showParams) => {
+      if (showParams) {
+        setModalTableParams((oldParams) => {
+          const {
+            configData,
+            request,
+            title,
+            params: oldP,
+            dataSource: oldDataSource,
+          } = oldParams;
+          const {
+            title: showTitle = title,
+            configData: showConfigData = configData,
+            request: showReq = request,
+            dataSource = oldDataSource,
+            params = oldP,
+          } = showParams;
+          currentTable.params = params;
+          return {
+            title: showTitle,
+            request: showReq,
+            configData: showConfigData as any,
+            params,
+            dataSource,
+          };
+        });
+      }
+      setModalVisible(true);
+    },
+    hide: () => {
+      setModalVisible(false);
+    },
+    dialogTable,
+  });
+
+  const { configData, dataSource, request, title, params } = modalTableParams;
+  const req = request
+    ? (reqParams) => {
+        return request({ ...params, ...reqParams });
+      }
+    : undefined;
+  return (
+    <Modal
+      {...props}
+      footer={footer}
+      visible={modalVisible}
+      onCancel={(e) => {
+        setModalVisible(false);
+        onCancel?.(e);
+      }}
+      destroyOnClose
+      title={title}
+      width={width}
+      bodyStyle={{ padding: "0px 0px 12px", ...bodyStyle }}
+      afterClose={() => {
+        currentTable.form.resetFields();
+        afterClose?.();
+      }}
+    >
+      <EditTableContent
+        contentRender={contentRender}
+        editTableProps={editTableProps}
+        configData={configData || []}
+        dialogTable={currentTable}
+        request={req}
+        dataSource={dataSource}
+      />
+    </Modal>
+  );
+};

package/src/components/DialogTable/ModalTable.tsx

@@ -1,7 +1,8 @@
 import { Modal } from "antd";
 import type { ModalTableProps } from "../modal";
 import { useCurrentTable, useTableProps, useVisible } from "./hooks";
-import Content from "./Content";
+import { TableContent } from "./Content";
+
 export default ({
   configData: configDataProps,
   request: requestProps,
@@ -82,7 +83,7 @@ export default ({
         afterClose?.();
       }}
     >
-      <Content
+      <TableContent
         contentRender={contentRender}
         tableProps={tableProps}
         configData={configData || []}