@hw-component/table 1.10.11 → 1.10.13

package/es/index.css

@@ -1,60 +1,60 @@
 .ant-hw-table-content .ant-hw-table-body {
-  padding-top: 0px;
-  border-top-left-radius: 0px;
-  border-top-right-radius: 0px;
+  padding-top: 0;
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
 }
 .ant-hw-table-content .ant-hw-table-header {
-  border-bottom-left-radius: 0px !important;
-  border-bottom-right-radius: 0px !important;
+  border-bottom-right-radius: 0 !important;
+  border-bottom-left-radius: 0 !important;
 }
 .ant-hw-table-body {
-  background-color: #fff;
   position: relative;
+  padding-top: 16px;
   padding-right: 20px;
   padding-left: 20px;
-  padding-top: 16px;
+  background-color: #fff;
   border-radius: 4px;
 }
 .ant-hw-table-body .ant-hw-table-pagination {
+  margin-right: -20px;
+  margin-left: -20px;
   padding: 12px 24px;
-  background-color: #ffffff;
-  border-bottom-left-radius: 4px;
+  background-color: #fff;
   border-bottom-right-radius: 4px;
-  margin-left: -20px;
-  margin-right: -20px;
+  border-bottom-left-radius: 4px;
 }
 .ant-hw-table-body .ant-hw-table-pagination .ant-select {
   width: auto;
 }
 .ant-hw-table-body .ant-pro-card-body {
-  padding-bottom: 0px;
+  padding-bottom: 0;
 }
 .ant-hw-table-body .ant-pro-table-list-toolbar-container {
-  padding-top: 0px;
+  padding-top: 0;
 }
 .ant-hw-table-body .ant-pro-table > .ant-pro-card > .ant-pro-card-body {
-  padding: 0px;
+  padding: 0;
 }
 .ant-hw-table-pagination {
+  position: relative;
   padding: 12px 24px;
+  background-color: #fff;
   border-radius: 4px;
-  background-color: #ffffff;
-  position: relative;
 }
 .ant-hw-top-btn {
   position: absolute;
   right: 10px;
   bottom: 54px;
   z-index: 9;
-  cursor: pointer;
   width: 48px;
   height: 48px;
   background: url("./GoTop/goTop.png") no-repeat;
   background-size: 100%;
+  cursor: pointer;
 }
 .ant-hw-table-header {
+  padding-bottom: 0;
   border-radius: 4px !important;
-  padding-bottom: 0px;
 }
 .ant-hw-table-header .ant-hw-table-header-item-hide {
   display: none;
@@ -74,7 +74,7 @@
 }
 .ant-hw-table-body-option-setting-title {
   width: 198px;
-  margin: 0px -16px;
+  margin: 0 -16px;
   padding: 6px 8px;
 }
 .ant-hw-table-body-option-setting-content-title {
@@ -84,8 +84,8 @@
   display: flex;
 }
 .ant-hw-table-op-tree-content {
-  padding: 6px 6px 6px 0px;
   width: 100%;
+  padding: 6px 6px 6px 0;
 }
 .ant-hw-table-body-option-tree .ant-tree-treenode {
   width: 100%;
@@ -98,10 +98,10 @@
           flex: 1;
 }
 .ant-hw-table-body-option-tree .ant-tree-switcher {
-  width: 0px;
+  width: 0;
 }
 .ant-hw-table-body-option-tree .ant-tree-treenode-draggable {
-  padding-left: 0px !important;
+  padding-left: 0 !important;
 }
 .ant-hw-table-pointer {
   cursor: pointer;
@@ -113,18 +113,18 @@
   cursor: pointer;
 }
 .ant-hw-table-header-title-box {
-  -webkit-box-flex: 1;
-  -webkit-flex: 1;
-      -ms-flex: 1;
-          flex: 1;
+  position: relative;
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  position: relative;
+  -webkit-box-flex: 1;
+  -webkit-flex: 1;
+      -ms-flex: 1;
+          flex: 1;
   box-sizing: border-box;
-  margin: -10px 0px;
-  padding: 10px 0px;
+  margin: -10px 0;
+  padding: 10px 0;
 }
 .ant-hw-table-header-title-box .ant-hw-table-header-title-box-content {
   white-space: nowrap;
@@ -134,16 +134,15 @@
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
+  -webkit-align-content: center;
+      -ms-flex-line-pack: center;
+          align-content: center;
   -webkit-box-pack: justify;
   -webkit-justify-content: space-between;
       -ms-flex-pack: justify;
           justify-content: space-between;
-  -webkit-align-content: center;
-      -ms-flex-line-pack: center;
-          align-content: center;
 }
 .ant-hw-table-header-right-node {
-  padding-left: 12px;
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -152,6 +151,7 @@
   -webkit-align-items: center;
       -ms-flex-align: center;
           align-items: center;
+  padding-left: 12px;
 }
 .ant-hw-table-render-copy {
   margin-bottom: 0 !important;
@@ -161,17 +161,17 @@
 .ant-hw-table-render-text-basic {
   width: 100%;
 }
-.ant-hw-table-col-hr:after {
+.ant-hw-table-col-hr::after {
   position: absolute;
-  top: 50%;
-  left: 0;
-  width: 1px;
+  top: 50% !important;
+  left: 0 !important;
+  width: 1px !important;
   height: 1.6em;
   background-color: rgba(0, 0, 0, 0.06);
-  -webkit-transform: translateY(-50%);
-      -ms-transform: translateY(-50%);
-          transform: translateY(-50%);
+  -webkit-transform: translateY(-50%) !important;
+      -ms-transform: translateY(-50%) !important;
+          transform: translateY(-50%) !important;
   -webkit-transition: background-color 0.3s;
   transition: background-color 0.3s;
-  content: '';
+  content: "";
 }

package/es/modal.d.ts

@@ -26,7 +26,7 @@ export interface ParamsModal extends Record<string, any> {
     size?: number;
     current?: number;
 }
-interface HColumns extends Omit<ProColumns, "render" | "title"> {
+interface HColumns extends Omit<ProColumns, "render" | "title" | "children"> {
     render?: (dom: React.ReactNode, data: any, index: number, tableInstance: HTableInstance) => React.ReactNode;
     showSearch?: boolean;
     searchType?: HItemProps["type"];
@@ -34,6 +34,7 @@ interface HColumns extends Omit<ProColumns, "render" | "title"> {
     rowSelectionTitle?: boolean;
     title?: string | React.ReactNode;
     valueTypeProps?: Record<string, any>;
+    children?: ConfigItemModal[];
 }
 interface BcItemModal {
     childrenDataIndex?: ConfigItemModal[] | string[];

package/lib/EditTable/hooks.d.ts

@@ -2,7 +2,7 @@ import { HEditTableProps } from "./modal";
 import { MutableRefObject } from "react";
 import type { ActionType } from "@ant-design/pro-table";
 import { EditableFormInstance } from "@ant-design/pro-table/lib/components/EditableTable";
-export declare const useListRequest: ({ request, dataSource }: HEditTableProps) => import("@ahooksjs/use-request/lib/types").BaseResult<any, [params?: any]>;
+export declare const useListRequest: ({ request, dataSource, manual }: HEditTableProps) => import("@ahooksjs/use-request/lib/types").BaseResult<any, [params?: any]>;
 export declare const useCuRef: ({ actionRef, editableFormRef }: HEditTableProps) => {
     cuActionRef: MutableRefObject<ActionType>;
     cuEditableFormRef: MutableRefObject<EditableFormInstance>;

package/lib/EditTable/hooks.js

@@ -21,7 +21,9 @@ function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymb
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context2, _context3; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context2 = ownKeys(Object(t), !0)).call(_context2, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context3 = ownKeys(Object(t))).call(_context3, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 var useListRequest = function useListRequest(_ref) {
   var request = _ref.request,
-    dataSource = _ref.dataSource;
+    dataSource = _ref.dataSource,
+    manual = _ref.manual;
+  var relManual = request ? manual : false;
   var saveParams = React.useMemo(function () {
     return {
       params: {
@@ -59,7 +61,7 @@ var useListRequest = function useListRequest(_ref) {
       }
     }, _callee);
   })), {
-    manual: true,
+    manual: relManual,
     refreshDeps: [dataSource]
   });
 };

package/lib/EditTable/index.js

@@ -54,7 +54,8 @@ var HEditTable = (function (_ref) {
   var tableBody = index.useClassName("hw-table-body");
   var _useListRequest = hooks.useListRequest({
       request: request,
-      dataSource: dataSource
+      dataSource: dataSource,
+      manual: manual
     }),
     loading = _useListRequest.loading,
     data = _useListRequest.data,
@@ -96,7 +97,7 @@ var HEditTable = (function (_ref) {
         loading: loading,
         rowKey: rowKey,
         editableFormRef: cuEditableFormRef,
-        manualRequest: manual,
+        manualRequest: true,
         request: run,
         actionRef: cuActionRef,
         value: values,

package/lib/HTableBody/hooks/useColData.js

@@ -8,11 +8,11 @@ var _Object$defineProperties = require('@babel/runtime-corejs3/core-js-stable/ob
 var _Object$defineProperty = require('@babel/runtime-corejs3/core-js-stable/object/define-property');
 var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
 var _slicedToArray = require('@babel/runtime-corejs3/helpers/slicedToArray');
+var _mapInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/map');
 var _indexOfInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/index-of');
 var _concatInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/concat');
 var _filterInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/filter');
 var _spliceInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/splice');
-var _mapInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/map');
 var _forEachInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/for-each');
 var context = require('../../context.js');
 var React = require('react');
@@ -50,7 +50,15 @@ var useCols = function useCols(_ref) {
     var childLen = children.length;
     return !childLen && !!lastChildLen ? trClassname : "";
   };
-  var itemProvider = function itemProvider(item, lastItem) {
+  var colChild = function colChild(children) {
+    if (!children) {
+      return children;
+    }
+    return _mapInstanceProperty(children).call(children, function (item) {
+      return itemProvider(item);
+    });
+  };
+  function itemProvider(item, lastItem) {
     var _context2;
     var _ref2 = lastItem || {},
       _ref2$children = _ref2.children,
@@ -71,14 +79,16 @@ var useCols = function useCols(_ref) {
       return _objectSpread(_objectSpread({}, item), {}, {
         ellipsis: ellipsis,
         className: _concatInstanceProperty(_context = "".concat(className, " ")).call(_context, trClassName),
-        render: index$1.default(item, table, valueTypeConfig)
+        render: index$1.default(item, table, valueTypeConfig),
+        children: colChild(children)
       });
     }
     return _objectSpread(_objectSpread({}, item), {}, {
       className: _concatInstanceProperty(_context2 = "".concat(className, " ")).call(_context2, trClassName),
-      render: index$1.default(item, table, valueTypeConfig)
+      render: index$1.default(item, table, valueTypeConfig),
+      children: colChild(children)
     });
-  };
+  }
   var changeConfigData = function changeConfigData(data) {
     var colsArray = _filterInstanceProperty(data).call(data, function (item) {
       return !item.hideInTable;

package/lib/index.css

@@ -1,60 +1,60 @@
 .ant-hw-table-content .ant-hw-table-body {
-  padding-top: 0px;
-  border-top-left-radius: 0px;
-  border-top-right-radius: 0px;
+  padding-top: 0;
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
 }
 .ant-hw-table-content .ant-hw-table-header {
-  border-bottom-left-radius: 0px !important;
-  border-bottom-right-radius: 0px !important;
+  border-bottom-right-radius: 0 !important;
+  border-bottom-left-radius: 0 !important;
 }
 .ant-hw-table-body {
-  background-color: #fff;
   position: relative;
+  padding-top: 16px;
   padding-right: 20px;
   padding-left: 20px;
-  padding-top: 16px;
+  background-color: #fff;
   border-radius: 4px;
 }
 .ant-hw-table-body .ant-hw-table-pagination {
+  margin-right: -20px;
+  margin-left: -20px;
   padding: 12px 24px;
-  background-color: #ffffff;
-  border-bottom-left-radius: 4px;
+  background-color: #fff;
   border-bottom-right-radius: 4px;
-  margin-left: -20px;
-  margin-right: -20px;
+  border-bottom-left-radius: 4px;
 }
 .ant-hw-table-body .ant-hw-table-pagination .ant-select {
   width: auto;
 }
 .ant-hw-table-body .ant-pro-card-body {
-  padding-bottom: 0px;
+  padding-bottom: 0;
 }
 .ant-hw-table-body .ant-pro-table-list-toolbar-container {
-  padding-top: 0px;
+  padding-top: 0;
 }
 .ant-hw-table-body .ant-pro-table > .ant-pro-card > .ant-pro-card-body {
-  padding: 0px;
+  padding: 0;
 }
 .ant-hw-table-pagination {
+  position: relative;
   padding: 12px 24px;
+  background-color: #fff;
   border-radius: 4px;
-  background-color: #ffffff;
-  position: relative;
 }
 .ant-hw-top-btn {
   position: absolute;
   right: 10px;
   bottom: 54px;
   z-index: 9;
-  cursor: pointer;
   width: 48px;
   height: 48px;
   background: url("./GoTop/goTop.png") no-repeat;
   background-size: 100%;
+  cursor: pointer;
 }
 .ant-hw-table-header {
+  padding-bottom: 0;
   border-radius: 4px !important;
-  padding-bottom: 0px;
 }
 .ant-hw-table-header .ant-hw-table-header-item-hide {
   display: none;
@@ -74,7 +74,7 @@
 }
 .ant-hw-table-body-option-setting-title {
   width: 198px;
-  margin: 0px -16px;
+  margin: 0 -16px;
   padding: 6px 8px;
 }
 .ant-hw-table-body-option-setting-content-title {
@@ -84,8 +84,8 @@
   display: flex;
 }
 .ant-hw-table-op-tree-content {
-  padding: 6px 6px 6px 0px;
   width: 100%;
+  padding: 6px 6px 6px 0;
 }
 .ant-hw-table-body-option-tree .ant-tree-treenode {
   width: 100%;
@@ -98,10 +98,10 @@
           flex: 1;
 }
 .ant-hw-table-body-option-tree .ant-tree-switcher {
-  width: 0px;
+  width: 0;
 }
 .ant-hw-table-body-option-tree .ant-tree-treenode-draggable {
-  padding-left: 0px !important;
+  padding-left: 0 !important;
 }
 .ant-hw-table-pointer {
   cursor: pointer;
@@ -113,18 +113,18 @@
   cursor: pointer;
 }
 .ant-hw-table-header-title-box {
-  -webkit-box-flex: 1;
-  -webkit-flex: 1;
-      -ms-flex: 1;
-          flex: 1;
+  position: relative;
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  position: relative;
+  -webkit-box-flex: 1;
+  -webkit-flex: 1;
+      -ms-flex: 1;
+          flex: 1;
   box-sizing: border-box;
-  margin: -10px 0px;
-  padding: 10px 0px;
+  margin: -10px 0;
+  padding: 10px 0;
 }
 .ant-hw-table-header-title-box .ant-hw-table-header-title-box-content {
   white-space: nowrap;
@@ -134,16 +134,15 @@
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
+  -webkit-align-content: center;
+      -ms-flex-line-pack: center;
+          align-content: center;
   -webkit-box-pack: justify;
   -webkit-justify-content: space-between;
       -ms-flex-pack: justify;
           justify-content: space-between;
-  -webkit-align-content: center;
-      -ms-flex-line-pack: center;
-          align-content: center;
 }
 .ant-hw-table-header-right-node {
-  padding-left: 12px;
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -152,6 +151,7 @@
   -webkit-align-items: center;
       -ms-flex-align: center;
           align-items: center;
+  padding-left: 12px;
 }
 .ant-hw-table-render-copy {
   margin-bottom: 0 !important;
@@ -161,17 +161,17 @@
 .ant-hw-table-render-text-basic {
   width: 100%;
 }
-.ant-hw-table-col-hr:after {
+.ant-hw-table-col-hr::after {
   position: absolute;
-  top: 50%;
-  left: 0;
-  width: 1px;
+  top: 50% !important;
+  left: 0 !important;
+  width: 1px !important;
   height: 1.6em;
   background-color: rgba(0, 0, 0, 0.06);
-  -webkit-transform: translateY(-50%);
-      -ms-transform: translateY(-50%);
-          transform: translateY(-50%);
+  -webkit-transform: translateY(-50%) !important;
+      -ms-transform: translateY(-50%) !important;
+          transform: translateY(-50%) !important;
   -webkit-transition: background-color 0.3s;
   transition: background-color 0.3s;
-  content: '';
+  content: "";
 }

package/lib/modal.d.ts

@@ -26,7 +26,7 @@ export interface ParamsModal extends Record<string, any> {
     size?: number;
     current?: number;
 }
-interface HColumns extends Omit<ProColumns, "render" | "title"> {
+interface HColumns extends Omit<ProColumns, "render" | "title" | "children"> {
     render?: (dom: React.ReactNode, data: any, index: number, tableInstance: HTableInstance) => React.ReactNode;
     showSearch?: boolean;
     searchType?: HItemProps["type"];
@@ -34,6 +34,7 @@ interface HColumns extends Omit<ProColumns, "render" | "title"> {
     rowSelectionTitle?: boolean;
     title?: string | React.ReactNode;
     valueTypeProps?: Record<string, any>;
+    children?: ConfigItemModal[];
 }
 interface BcItemModal {
     childrenDataIndex?: ConfigItemModal[] | string[];

package/package.json

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

package/src/components/EditTable/hooks.ts

@@ -1,11 +1,12 @@
 import { useRequest } from "ahooks";
 import { HEditTableProps } from "./modal";
-import { MutableRefObject, useMemo, useRef } from "react";
+import {MutableRefObject, useEffect, useMemo, useRef} from "react";
 import type { ActionType } from "@ant-design/pro-table";
 import { EditableFormInstance } from "@ant-design/pro-table/lib/components/EditableTable";
 import config from "../render/config";
 
-export const useListRequest = ({ request, dataSource }: HEditTableProps) => {
+export const useListRequest = ({ request, dataSource ,manual}: HEditTableProps) => {
+  const relManual=request?manual:false;
   const saveParams = useMemo(() => {
     return {
       params: {
@@ -14,7 +15,7 @@ export const useListRequest = ({ request, dataSource }: HEditTableProps) => {
       },
     };
   }, []);
-  return useRequest(
+  return  useRequest(
     async (params = {}) => {
       const newParams = {
         ...saveParams.params,
@@ -29,7 +30,7 @@ export const useListRequest = ({ request, dataSource }: HEditTableProps) => {
       }
       return dataSource;
     },
-    { manual: true, refreshDeps: [dataSource] }
+    { manual: relManual,refreshDeps:[dataSource]}
   );
 };
 

package/src/components/EditTable/index.tsx

@@ -34,6 +34,7 @@ export default ({
   const { loading, data, error, run } = useListRequest({
     request,
     dataSource,
+    manual,
   });
   const {
     emptyRender: tableEmptyRender = emptyDefaultRender,
@@ -65,7 +66,7 @@ export default ({
           loading={loading}
           rowKey={rowKey}
           editableFormRef={cuEditableFormRef}
-          manualRequest={manual}
+          manualRequest={true}
           request={run}
           actionRef={cuActionRef}
           value={values}

package/src/components/HTableBody/RowCheckBox/hooks.ts

@@ -12,7 +12,7 @@ const getCuData = (data, rowKey) => {
   const rowKeys: Key[] = [];
   const rowObjs: Record<string, any> = {};
   data.forEach((item, index) => {
-    if (!item){
+    if (!item) {
       return;
     }
     const key = getRowKey(item, index, rowKey);

package/src/components/HTableBody/hooks/useColData.tsx

@@ -39,10 +39,16 @@ export const useCols = ({
     const childLen = children.length;
     return !childLen && !!lastChildLen ? trClassname : "";
   };
-
-  const itemProvider = (item: ConfigItemModal, lastItem?: ConfigItemModal) => {
+  const colChild = (children?: ConfigItemModal[]) => {
+    if (!children) {
+      return children;
+    }
+    return children.map((item) => {
+      return itemProvider(item);
+    });
+  };
+  function itemProvider(item: ConfigItemModal, lastItem?: ConfigItemModal) {
     const { children: lastChildren = [] } = lastItem || {};
-
     const {
       valueType = "",
       valueTypeProps = {},
@@ -54,7 +60,6 @@ export const useCols = ({
       ? ""
       : itemClassNameMk(children as any[], lastChildren as any[]);
     const itemType = valueType as string;
-
     if (textTypes.indexOf(itemType) !== -1) {
       const { ellipsis } = valueTypeProps;
       return {
@@ -62,6 +67,7 @@ export const useCols = ({
         ellipsis: ellipsis,
         className: `${className} ${trClassName}`,
         render: configRender(item, table as HTableInstance, valueTypeConfig),
+        children: colChild(children),
       };
     }
 
@@ -69,8 +75,9 @@ export const useCols = ({
       ...item,
       className: `${className} ${trClassName}`,
       render: configRender(item, table as HTableInstance, valueTypeConfig),
+      children: colChild(children),
     };
-  };
+  }
 
   const changeConfigData = (data: ConfigDataModal) => {
     const colsArray = data.filter((item) => {

package/src/components/HTableHeader/modal.ts

@@ -1,4 +1,8 @@
-import type { ConfigDataModal, ConfigItemModal,HTableInstance } from "../modal";
+import type {
+  ConfigDataModal,
+  ConfigItemModal,
+  HTableInstance,
+} from "../modal";
 import type { ColProps } from "antd";
 import type React from "react";
 

package/src/components/Table.tsx

@@ -74,8 +74,8 @@ export default ({
       tableInstance={tableInstance}
       onFinish={(value) => {
         rowSelectionReload();
-        const {size}=(saveParams.old as Record<string, any>);
-        return run({ ...value, current: 1 ,size});
+        const { size } = saveParams.old as Record<string, any>;
+        return run({ ...value, current: 1, size });
       }}
       selectedRowData={selectedRowData}
       rowOnChange={rowOnChange}