@hw-component/table 0.0.7-beta-v18 → 0.0.8-beta-v1

package/es/HTableBody/Options/index.js

@@ -32,8 +32,12 @@ var Options = (function (_ref) {
   useEffect(function () {
     var _defaultKeys = defaultKeys(columns),
       changeKeys = _keysInstanceProperty(_defaultKeys),
-      allKeys = _defaultKeys.allKeys;
-    tableInstance.table.settingKeys = allKeys;
+      allKeys = _defaultKeys.allKeys,
+      checkCols = _defaultKeys.checkCols;
+    tableInstance.table.settingKeys = {
+      keys: allKeys,
+      checkCols: checkCols
+    };
     setKeys(changeKeys);
   }, [columns]);
   var SizeItem = function SizeItem() {

package/es/HTableBody/Options/utils.d.ts

@@ -2,4 +2,5 @@ import { ConfigDataModal } from "../../modal";
 export declare const defaultKeys: (cols: ConfigDataModal) => {
     keys: string[];
     allKeys: string[];
+    checkCols: ConfigDataModal;
 };

package/es/HTableBody/Options/utils.js

@@ -3,12 +3,35 @@ import _toConsumableArray from '@babel/runtime-corejs3/helpers/toConsumableArray
 import 'core-js/modules/es.object.to-string.js';
 import 'core-js/modules/es.regexp.to-string.js';
 import _forEachInstanceProperty from '@babel/runtime-corejs3/core-js/instance/for-each';
+import _keysInstanceProperty from '@babel/runtime-corejs3/core-js/instance/keys';
 
+var childDataIndexProvider = function childDataIndexProvider(data, title) {
+  var keys = [];
+  var cols = [];
+  _forEachInstanceProperty(data).call(data, function (value) {
+    if (typeof value === "string") {
+      keys.push(value);
+      cols.push({
+        title: title,
+        dataIndex: value
+      });
+      return;
+    }
+    keys.push(value.dataIndex);
+    cols.push(value);
+  });
+  return {
+    keys: keys,
+    cols: cols
+  };
+};
 var defaultKeys = function defaultKeys(cols) {
   var keys = [];
   var allKeys = [];
+  var checkCols = [];
   _forEachInstanceProperty(cols).call(cols, function (value) {
-    var dataIndex = value.dataIndex,
+    var title = value.title,
+      dataIndex = value.dataIndex,
       hideInTable = value.hideInTable,
       childrenDataIndex = value.childrenDataIndex;
     if (hideInTable || !dataIndex) {
@@ -16,14 +39,20 @@ var defaultKeys = function defaultKeys(cols) {
     }
     keys.push(dataIndex.toString());
     if (childrenDataIndex) {
-      allKeys.push.apply(allKeys, _toConsumableArray(childrenDataIndex));
+      var _childDataIndexProvid = childDataIndexProvider(childrenDataIndex, title),
+        childKeys = _keysInstanceProperty(_childDataIndexProvid),
+        childCols = _childDataIndexProvid.cols;
+      allKeys.push.apply(allKeys, _toConsumableArray(childKeys));
+      checkCols.push.apply(checkCols, _toConsumableArray(childCols));
       return;
     }
     allKeys.push(dataIndex.toString());
+    checkCols.push(value);
   });
   return {
     keys: keys,
-    allKeys: allKeys
+    allKeys: allKeys,
+    checkCols: checkCols
   };
 };
 

package/es/Table.d.ts

@@ -1,3 +1,3 @@
 import type { HTableProps } from "./modal";
-declare const _default: ({ request, configData, searchSpan, table, hideHeader, headerStyle, tableStyle, action, spaceSize, className, paginationStyle, rowKey, ...props }: HTableProps) => JSX.Element;
+declare const _default: ({ request, configData, searchSpan, table, hideHeader, headerStyle, tableStyle, action, spaceSize, className, paginationStyle, rowKey, onFinish, ...props }: HTableProps) => JSX.Element;
 export default _default;

package/es/Table.js

@@ -21,7 +21,7 @@ import useReq from './hooks/useReq.js';
 import useDispatch from './hooks/useDispatch.js';
 import { useState } from 'react';
 
-var _excluded = ["request", "configData", "searchSpan", "table", "hideHeader", "headerStyle", "tableStyle", "action", "spaceSize", "className", "paginationStyle", "rowKey"];
+var _excluded = ["request", "configData", "searchSpan", "table", "hideHeader", "headerStyle", "tableStyle", "action", "spaceSize", "className", "paginationStyle", "rowKey", "onFinish"];
 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 Table = (function (_ref) {
@@ -41,6 +41,7 @@ var Table = (function (_ref) {
     var paginationStyle = _ref.paginationStyle,
     _ref$rowKey = _ref.rowKey,
     rowKey = _ref$rowKey === void 0 ? "id" : _ref$rowKey,
+    onFinish = _ref.onFinish,
     props = _objectWithoutProperties(_ref, _excluded);
   var _useReq = useReq({
       request: request
@@ -106,7 +107,8 @@ var Table = (function (_ref) {
       },
       children: [!hideHeader && jsx(Header, {
         searchSpan: searchSpan,
-        headerStyle: headerStyle
+        headerStyle: headerStyle,
+        onFinish: onFinish
       }), jsx(Body, _objectSpread({
         tableStyle: hideHeader ? _objectSpread({
           paddingTop: 24

package/es/modal.d.ts

@@ -21,15 +21,16 @@ export interface ParamsModal extends Record<string, any> {
     size?: number;
     current?: number;
 }
-interface HColumns extends Omit<ProColumns, "render"> {
+interface HColumns extends Omit<ProColumns, "render" | "title"> {
     render?: (dom: React.ReactNode, data: any, index: number, tableInstance: HTableInstance) => React.ReactNode;
     showSearch?: boolean;
     searchType?: HItemProps["type"];
     searchRender?: HItemProps["render"];
     rowSelectionTitle?: boolean;
+    title?: string;
 }
 interface BcItemModal {
-    childrenDataIndex?: string[];
+    childrenDataIndex?: ConfigItemModal[] | string[];
 }
 export type ConfigItemModal = Omit<HItemProps, "render" | "type"> & HColumns & BcItemModal;
 export type ConfigDataModal = ConfigItemModal[];
@@ -67,6 +68,7 @@ export interface HTableProps extends Omit<ProTableProps<any, any>, "request" | "
     affixProps?: AffixProps | false;
     goTop?: boolean;
     optionsRender?: (node: React.ReactNode) => React.ReactNode;
+    onFinish?: (value: any) => Promise<any>;
 }
 export interface TableInstance {
     reload: (params?: ParamsModal) => Promise<any>;
@@ -74,7 +76,10 @@ export interface TableInstance {
     dispatch: (key: string, params: any) => void;
     reloadWithParams: (params?: ParamsModal) => Promise<any>;
     getParams: () => any;
-    settingKeys: string[];
+    settingKeys: {
+        keys?: string[];
+        checkCols?: ConfigDataModal;
+    };
 }
 export interface HTableInstance {
     form: HFormInstance;

package/lib/HTableBody/Options/index.js

@@ -35,8 +35,12 @@ var Options = (function (_ref) {
   React.useEffect(function () {
     var _defaultKeys = utils.defaultKeys(columns),
       changeKeys = _keysInstanceProperty(_defaultKeys),
-      allKeys = _defaultKeys.allKeys;
-    tableInstance.table.settingKeys = allKeys;
+      allKeys = _defaultKeys.allKeys,
+      checkCols = _defaultKeys.checkCols;
+    tableInstance.table.settingKeys = {
+      keys: allKeys,
+      checkCols: checkCols
+    };
     setKeys(changeKeys);
   }, [columns]);
   var SizeItem = function SizeItem() {

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

@@ -2,4 +2,5 @@ import { ConfigDataModal } from "../../modal";
 export declare const defaultKeys: (cols: ConfigDataModal) => {
     keys: string[];
     allKeys: string[];
+    checkCols: ConfigDataModal;
 };

package/lib/HTableBody/Options/utils.js

@@ -4,12 +4,35 @@ var _toConsumableArray = require('@babel/runtime-corejs3/helpers/toConsumableArr
 require('core-js/modules/es.object.to-string.js');
 require('core-js/modules/es.regexp.to-string.js');
 var _forEachInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/for-each');
+var _keysInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/keys');
 
+var childDataIndexProvider = function childDataIndexProvider(data, title) {
+  var keys = [];
+  var cols = [];
+  _forEachInstanceProperty(data).call(data, function (value) {
+    if (typeof value === "string") {
+      keys.push(value);
+      cols.push({
+        title: title,
+        dataIndex: value
+      });
+      return;
+    }
+    keys.push(value.dataIndex);
+    cols.push(value);
+  });
+  return {
+    keys: keys,
+    cols: cols
+  };
+};
 var defaultKeys = function defaultKeys(cols) {
   var keys = [];
   var allKeys = [];
+  var checkCols = [];
   _forEachInstanceProperty(cols).call(cols, function (value) {
-    var dataIndex = value.dataIndex,
+    var title = value.title,
+      dataIndex = value.dataIndex,
       hideInTable = value.hideInTable,
       childrenDataIndex = value.childrenDataIndex;
     if (hideInTable || !dataIndex) {
@@ -17,14 +40,20 @@ var defaultKeys = function defaultKeys(cols) {
     }
     keys.push(dataIndex.toString());
     if (childrenDataIndex) {
-      allKeys.push.apply(allKeys, _toConsumableArray(childrenDataIndex));
+      var _childDataIndexProvid = childDataIndexProvider(childrenDataIndex, title),
+        childKeys = _keysInstanceProperty(_childDataIndexProvid),
+        childCols = _childDataIndexProvid.cols;
+      allKeys.push.apply(allKeys, _toConsumableArray(childKeys));
+      checkCols.push.apply(checkCols, _toConsumableArray(childCols));
       return;
     }
     allKeys.push(dataIndex.toString());
+    checkCols.push(value);
   });
   return {
     keys: keys,
-    allKeys: allKeys
+    allKeys: allKeys,
+    checkCols: checkCols
   };
 };
 

package/lib/Table.d.ts

@@ -1,3 +1,3 @@
 import type { HTableProps } from "./modal";
-declare const _default: ({ request, configData, searchSpan, table, hideHeader, headerStyle, tableStyle, action, spaceSize, className, paginationStyle, rowKey, ...props }: HTableProps) => JSX.Element;
+declare const _default: ({ request, configData, searchSpan, table, hideHeader, headerStyle, tableStyle, action, spaceSize, className, paginationStyle, rowKey, onFinish, ...props }: HTableProps) => JSX.Element;
 export default _default;

package/lib/Table.js

@@ -24,7 +24,7 @@ var useReq = require('./hooks/useReq.js');
 var useDispatch = require('./hooks/useDispatch.js');
 var React = require('react');
 
-var _excluded = ["request", "configData", "searchSpan", "table", "hideHeader", "headerStyle", "tableStyle", "action", "spaceSize", "className", "paginationStyle", "rowKey"];
+var _excluded = ["request", "configData", "searchSpan", "table", "hideHeader", "headerStyle", "tableStyle", "action", "spaceSize", "className", "paginationStyle", "rowKey", "onFinish"];
 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 Table = (function (_ref) {
@@ -44,6 +44,7 @@ var Table = (function (_ref) {
     var paginationStyle = _ref.paginationStyle,
     _ref$rowKey = _ref.rowKey,
     rowKey = _ref$rowKey === void 0 ? "id" : _ref$rowKey,
+    onFinish = _ref.onFinish,
     props = _objectWithoutProperties(_ref, _excluded);
   var _useReq = useReq.default({
       request: request
@@ -109,7 +110,8 @@ var Table = (function (_ref) {
       },
       children: [!hideHeader && jsxRuntime.jsx(index.default, {
         searchSpan: searchSpan,
-        headerStyle: headerStyle
+        headerStyle: headerStyle,
+        onFinish: onFinish
       }), jsxRuntime.jsx(index$1.default, _objectSpread({
         tableStyle: hideHeader ? _objectSpread({
           paddingTop: 24

package/lib/modal.d.ts

@@ -21,15 +21,16 @@ export interface ParamsModal extends Record<string, any> {
     size?: number;
     current?: number;
 }
-interface HColumns extends Omit<ProColumns, "render"> {
+interface HColumns extends Omit<ProColumns, "render" | "title"> {
     render?: (dom: React.ReactNode, data: any, index: number, tableInstance: HTableInstance) => React.ReactNode;
     showSearch?: boolean;
     searchType?: HItemProps["type"];
     searchRender?: HItemProps["render"];
     rowSelectionTitle?: boolean;
+    title?: string;
 }
 interface BcItemModal {
-    childrenDataIndex?: string[];
+    childrenDataIndex?: ConfigItemModal[] | string[];
 }
 export type ConfigItemModal = Omit<HItemProps, "render" | "type"> & HColumns & BcItemModal;
 export type ConfigDataModal = ConfigItemModal[];
@@ -67,6 +68,7 @@ export interface HTableProps extends Omit<ProTableProps<any, any>, "request" | "
     affixProps?: AffixProps | false;
     goTop?: boolean;
     optionsRender?: (node: React.ReactNode) => React.ReactNode;
+    onFinish?: (value: any) => Promise<any>;
 }
 export interface TableInstance {
     reload: (params?: ParamsModal) => Promise<any>;
@@ -74,7 +76,10 @@ export interface TableInstance {
     dispatch: (key: string, params: any) => void;
     reloadWithParams: (params?: ParamsModal) => Promise<any>;
     getParams: () => any;
-    settingKeys: string[];
+    settingKeys: {
+        keys?: string[];
+        checkCols?: ConfigDataModal;
+    };
 }
 export interface HTableInstance {
     form: HFormInstance;

package/package.json

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

package/src/components/HTableBody/Options/Title.tsx

@@ -18,7 +18,6 @@ export const Title = ({ columns, onChange, checkKeys }: ItemProps) => {
       if (!dataIndex) {
         return;
       }
-
       newCols[index] = {
         ...item,
         hideInTable,

package/src/components/HTableBody/Options/index.tsx

@@ -29,8 +29,11 @@ export default ({
   const [keys, setKeys] = useState<string[]>([]);
   const { tableInstance } = useHTableContext();
   useEffect(() => {
-    const { keys: changeKeys, allKeys } = defaultKeys(columns);
-    tableInstance.table.settingKeys = allKeys;
+    const { keys: changeKeys, allKeys,checkCols } = defaultKeys(columns);
+    tableInstance.table.settingKeys ={
+      keys:allKeys,
+      checkCols:checkCols
+    };
     setKeys(changeKeys);
   }, [columns]);//同步改变
   const SizeItem = () => {

package/src/components/HTableBody/Options/utils.ts

@@ -1,22 +1,46 @@
-import {ConfigDataModal} from "../../modal";
-
+import {ConfigDataModal, ConfigItemModal} from "../../modal";
+const childDataIndexProvider = (data: ConfigItemModal[]|string[],title?:string) => {
+     const keys:string[]=[];
+     const cols:ConfigDataModal=[];
+     data.forEach((value)=>{
+         if (typeof value==="string"){
+             keys.push(value);
+             cols.push({
+                 title,
+                 dataIndex:value
+             });
+             return;
+         }
+         keys.push(value.dataIndex);
+         cols.push(value);
+     });
+     return {
+         keys,
+         cols
+     }
+}
 export const defaultKeys = (cols: ConfigDataModal) => {
     const keys: string[] = [];
     const allKeys: string[] = [];
+    const checkCols:ConfigDataModal=[]
     cols.forEach((value) => {
-        const { dataIndex, hideInTable, childrenDataIndex } = value;
+        const {title, dataIndex, hideInTable, childrenDataIndex } = value;
         if (hideInTable || !dataIndex) {
             return;
         }
         keys.push(dataIndex.toString());
         if (childrenDataIndex) {
-            allKeys.push(...childrenDataIndex);
+            const {keys:childKeys,cols:childCols}=childDataIndexProvider(childrenDataIndex,title);
+            allKeys.push(...childKeys);
+            checkCols.push(...childCols);
             return;
         }
         allKeys.push(dataIndex.toString());
+        checkCols.push(value);
     });
     return {
         keys,
         allKeys,
+        checkCols
     };
 };

package/src/components/Table.tsx

@@ -21,6 +21,7 @@ export default ({
   className,
   paginationStyle,
   rowKey = "id",
+   onFinish,
   ...props
 }: HTableProps) => {
   const { run, loading, data, error, saveParams } = useReq({ request });
@@ -68,7 +69,7 @@ export default ({
     >
       <Space direction={"vertical"} size={0} style={{ width: "100%" }}>
         {!hideHeader && (
-          <Header searchSpan={searchSpan} headerStyle={headerStyle} />
+          <Header searchSpan={searchSpan} headerStyle={headerStyle} onFinish={onFinish}/>
         )}
         <Body
           tableStyle={

package/src/components/modal.ts

@@ -25,7 +25,7 @@ export interface ParamsModal extends Record<string, any> {
   size?: number;
   current?: number;
 }
-interface HColumns extends Omit<ProColumns, "render"> {
+interface HColumns extends Omit<ProColumns, "render"|"title"> {
   render?: (
     dom: React.ReactNode,
     data: any,
@@ -36,9 +36,10 @@ interface HColumns extends Omit<ProColumns, "render"> {
   searchType?: HItemProps["type"];
   searchRender?: HItemProps["render"];
   rowSelectionTitle?: boolean;
+  title?:string;
 }
 interface BcItemModal {
-  childrenDataIndex?: string[];
+  childrenDataIndex?: ConfigItemModal[]|string[];
 }
 export type ConfigItemModal = Omit<HItemProps, "render" | "type"> &
   HColumns &
@@ -100,6 +101,7 @@ export interface HTableProps
   affixProps?: AffixProps | false;
   goTop?: boolean;
   optionsRender?:(node:React.ReactNode)=>React.ReactNode;
+  onFinish?:(value:any)=>Promise<any>;
 }
 export interface TableInstance {
   reload: (params?: ParamsModal) => Promise<any>;
@@ -107,7 +109,10 @@ export interface TableInstance {
   dispatch: (key: string, params: any) => void;
   reloadWithParams: (params?: ParamsModal) => Promise<any>;
   getParams: () => any;
-  settingKeys: string[];
+  settingKeys:{
+    keys?:string[],
+    checkCols?:ConfigDataModal
+  };
 }
 export interface HTableInstance {
   form: HFormInstance;