vap1 0.2.3 → 0.2.4

package/components/Tables/TopTable.js

@@ -1,4 +1,15 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -22,24 +33,40 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TopTable = void 0;
-const lodash_1 = __importDefault(require("lodash"));
-const react_1 = __importStar(require("react"));
-const Table_1 = require("../_adapt/Table");
-const utils_1 = require("../../utils");
-const Util_1 = require("./Util");
-const VTable_1 = require("./VTable");
-const TopTable = props => {
+var lodash_1 = __importDefault(require("lodash"));
+var react_1 = __importStar(require("react"));
+var Table_1 = require("../_adapt/Table");
+var utils_1 = require("../../utils");
+var Util_1 = require("./Util");
+var VTable_1 = require("./VTable");
+var TopTable = function (props) {
     var _a;
-    const [columns, setColumns] = (0, react_1.useState)([]);
-    const tableRef = (0, react_1.useRef)(null);
-    let isQuerying = false;
-    let rowKey = 'id';
-    let list = [];
+    var _b = __read((0, react_1.useState)([]), 2), columns = _b[0], setColumns = _b[1];
+    var tableRef = (0, react_1.useRef)(null);
+    var isQuerying = false;
+    var rowKey = 'id';
+    var list = [];
     if (props.list) {
         list = props.list.slice(0);
     }
@@ -60,22 +87,22 @@ const TopTable = props => {
     }
     if (props.rowKey)
         rowKey = props.rowKey;
-    const [scroll, setScroll] = (0, react_1.useState)(undefined);
-    const [selected, setSelected] = (0, react_1.useState)(null);
-    (0, react_1.useEffect)(() => {
-        let cols = [];
+    var _c = __read((0, react_1.useState)(undefined), 2), scroll = _c[0], setScroll = _c[1];
+    var _d = __read((0, react_1.useState)(null), 2), selected = _d[0], setSelected = _d[1];
+    (0, react_1.useEffect)(function () {
+        var cols = [];
         if (props.showIndex !== false) {
             cols.push((0, Util_1.getIdxColumn)({ current: 0 }, props.showIndex, true));
         }
-        props.columns.map(col => {
+        props.columns.map(function (col) {
             if (col.roleCode) {
                 if (!utils_1.PageUtil.hasRole(col.roleCode)) {
                     return;
                 }
             }
             if (col.ik) {
-                let title = utils_1.i18n.txt(col.ik);
-                cols.push(Object.assign(Object.assign({}, col), { title: title == '' ? col.title : title }));
+                var title = utils_1.i18n.txt(col.ik);
+                cols.push(__assign(__assign({}, col), { title: title == '' ? col.title : title }));
             }
             else {
                 cols.push(col);
@@ -83,7 +110,7 @@ const TopTable = props => {
         });
         setColumns(cols);
     }, [props.columns]);
-    const onRowSelect = (0, react_1.useCallback)((data) => {
+    var onRowSelect = (0, react_1.useCallback)(function (data) {
         if (selected == null || data[rowKey] != selected[rowKey]) {
             setSelected(data);
             props.onRowSelect(data);
@@ -94,15 +121,15 @@ const TopTable = props => {
         setSelected(null);
         props.onRowSelect(null);
     }, [selected]);
-    const resizePid = (0, react_1.useRef)(null);
-    const resize = () => {
+    var resizePid = (0, react_1.useRef)(null);
+    var resize = function () {
         if (props.scroll === null)
             return;
         clearTimeout(resizePid.current);
-        resizePid.current = setTimeout(() => {
-            const thead = (0, VTable_1.getHeightByTagName)(tableRef.current, 'thead') || 40;
+        resizePid.current = setTimeout(function () {
+            var thead = (0, VTable_1.getHeightByTagName)(tableRef.current, 'thead') || 40;
             tableRef.current.style.display = 'none';
-            let height = tableRef.current.parentElement.getBoundingClientRect().height;
+            var height = tableRef.current.parentElement.getBoundingClientRect().height;
             if (height == 0) {
                 setScroll(undefined);
             }
@@ -112,34 +139,34 @@ const TopTable = props => {
             tableRef.current.style.display = 'block';
         }, 50);
     };
-    (0, react_1.useEffect)(() => {
+    (0, react_1.useEffect)(function () {
         resize();
         window.addEventListener('resize', resize, false);
-        return () => window.removeEventListener('resize', resize);
+        return function () { return window.removeEventListener('resize', resize); };
     }, []);
-    (0, react_1.useEffect)(() => {
+    (0, react_1.useEffect)(function () {
         if (lodash_1.default.isArray(list) && list.length && props.mustSelect && props.onRowSelect) {
             setSelected(list[0]);
             props.onRowSelect(list[0]);
         }
     }, [props.list, (_a = props.model) === null || _a === void 0 ? void 0 : _a.list]);
-    const tableProps = {
+    var tableProps = {
         tableLayout: 'fixed',
-        rowKey,
+        rowKey: rowKey,
         size: utils_1.GLOBAL.CONFIG.TABLE.SIZE,
         showSorterTooltip: false,
         pagination: false,
     };
     if (lodash_1.default.isFunction(props.onRowSelect)) {
-        tableProps.onRow = row => ({
-            onClick: (event) => {
-                utils_1.PageUtil.stopEvent(event, () => onRowSelect(row));
+        tableProps.onRow = function (row) { return ({
+            onClick: function (event) {
+                utils_1.PageUtil.stopEvent(event, function () { return onRowSelect(row); });
             }
-        });
+        }); };
     }
     return react_1.default.createElement("div", { ref: tableRef, className: 'c-table-top-container' },
-        react_1.default.createElement(Table_1.Table, Object.assign({}, tableProps, props, { rowClassName: (record, i) => {
-                let clazz = [];
+        react_1.default.createElement(Table_1.Table, __assign({}, tableProps, props, { rowClassName: function (record, i) {
+                var clazz = [];
                 if (i <= 3)
                     clazz.push('c-table-top-' + i);
                 if (lodash_1.default.isFunction(props.onRowSelect)) {
@@ -147,7 +174,7 @@ const TopTable = props => {
                         clazz.push('ant-table-row-selected');
                     }
                     else {
-                        clazz.push('c-table-top-cursor');
+                        clazz.push('c-table-cursor');
                     }
                 }
                 return clazz.join(' ');

package/components/Tables/TopTableModal.js

@@ -1,20 +1,31 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TopTableModal = void 0;
-const react_1 = __importDefault(require("react"));
-const lodash_1 = __importDefault(require("lodash"));
-const Modal_1 = require("../_adapt/Modal");
-const TopTable_1 = require("./TopTable");
-const TOP_TABLE_PROPERTIES = [
+var react_1 = __importDefault(require("react"));
+var lodash_1 = __importDefault(require("lodash"));
+var Modal_1 = require("../_adapt/Modal");
+var TopTable_1 = require("./TopTable");
+var TOP_TABLE_PROPERTIES = [
     'mode', 'columns', 'showIndex', 'rowKey', 'autoLoad', 'model', 'list', 'ajaxQuery', 'mustSelect', 'onRowSelect'
 ];
-const TopTableModal = props => {
-    const modalProps = lodash_1.default.omit(props, TOP_TABLE_PROPERTIES);
-    const tableProps = lodash_1.default.pick(props, TOP_TABLE_PROPERTIES);
-    return react_1.default.createElement(Modal_1.Modal, Object.assign({}, modalProps),
-        react_1.default.createElement(TopTable_1.TopTable, Object.assign({}, tableProps)));
+var TopTableModal = function (props) {
+    var modalProps = lodash_1.default.omit(props, TOP_TABLE_PROPERTIES);
+    var tableProps = lodash_1.default.pick(props, TOP_TABLE_PROPERTIES);
+    return react_1.default.createElement(Modal_1.Modal, __assign({}, modalProps),
+        react_1.default.createElement(TopTable_1.TopTable, __assign({}, tableProps)));
 };
 exports.TopTableModal = TopTableModal;

package/components/Tables/Util.d.ts

@@ -1,3 +1,3 @@
 import type { MutableRefObject } from 'react';
-import type { TableColumn } from './index';
-export declare const getIdxColumn: (ref: MutableRefObject<number>, showIndex?: string, isRank?: boolean) => TableColumn;
+import type { ColumnProps } from 'antd/es/table/interface';
+export declare const getIdxColumn: (ref: MutableRefObject<number>, showIndex?: string, isRank?: boolean) => ColumnProps<any>;

package/components/Tables/Util.js

@@ -4,12 +4,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getIdxColumn = void 0;
-const lodash_1 = __importDefault(require("lodash"));
-const utils_1 = require("../../utils");
-const Const_1 = require("../_setup/Const");
-const getIdxColumn = (ref, showIndex = null, isRank = false) => {
-    const idxRender = (x, y, i) => ref.current + i + 1;
-    let title;
+var lodash_1 = __importDefault(require("lodash"));
+var utils_1 = require("../../utils");
+var Const_1 = require("../_setup/Const");
+var getIdxColumn = function (ref, showIndex, isRank) {
+    if (showIndex === void 0) { showIndex = null; }
+    if (isRank === void 0) { isRank = false; }
+    var idxRender = function (x, y, i) { return ref.current + i + 1; };
+    var title;
     if (lodash_1.default.isString(showIndex)) {
         if (utils_1.i18n.hasKey(showIndex)) {
             title = utils_1.i18n.txt(showIndex);
@@ -21,7 +23,7 @@ const getIdxColumn = (ref, showIndex = null, isRank = false) => {
     else {
         title = utils_1.i18n.txt(isRank ? Const_1.V.TXT_RANK : Const_1.V.TXT_IDX);
     }
-    let width = 48;
+    var width = 48;
     if (ref.current < 1000) {
         width = 48;
     }
@@ -33,8 +35,8 @@ const getIdxColumn = (ref, showIndex = null, isRank = false) => {
     }
     return {
         className: '_index',
-        title,
-        width,
+        title: title,
+        width: width,
         render: idxRender
     };
 };

package/components/Tables/VTable.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import type { BaseTableProps, TableColumn } from './index';
+import type { BaseTableProps, TableCol } from './index';
 import type { ListModel } from '../../hooks/_list';
 import type { PlainObject, Key } from '../../basetype';
 export type VTableRef = {
@@ -15,7 +15,7 @@ export type VTableProps = BaseTableProps & {
 };
 export declare const VTable: React.ForwardRefExoticComponent<import("./index").TableDefine & {
     mode?: import("../Box/Box").BoxMode;
-    columns: TableColumn[];
+    columns: TableCol[];
     showIndex?: string | false;
     rowKey?: string;
     select?: true | "DEFAULT" | "QUERY";

package/components/Tables/VTable.js

@@ -1,4 +1,15 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -22,85 +33,122 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VTable = exports.getHeightByTagName = void 0;
-const lodash_1 = __importDefault(require("lodash"));
-const react_1 = __importStar(require("react"));
-const Table_1 = require("../_adapt/Table");
-const antd_1 = require("antd");
-const ActionBar_1 = require("./Components/ActionBar");
-const utils_1 = require("../../utils");
-const Util_1 = require("./Util");
-const HighLight_1 = require("../_common/HighLight");
-const hooks_1 = require("../../hooks");
-const Box_1 = require("../Box/Box");
+var lodash_1 = __importDefault(require("lodash"));
+var react_1 = __importStar(require("react"));
+var Table_1 = require("../_adapt/Table");
+var antd_1 = require("antd");
+var ActionBar_1 = require("./Components/ActionBar");
+var utils_1 = require("../../utils");
+var Util_1 = require("./Util");
+var HighLight_1 = require("../_common/HighLight");
+var hooks_1 = require("../../hooks");
+var Box_1 = require("../Box/Box");
 ;
-const getHeightByTagName = (root, tagName) => {
+var getHeightByTagName = function (root, tagName) {
     if (root == null)
         return 0;
-    let els = root.getElementsByTagName(tagName);
+    var els = root.getElementsByTagName(tagName);
     if (els.length) {
         return els[0].getBoundingClientRect().height;
     }
     return 0;
 };
 exports.getHeightByTagName = getHeightByTagName;
-const _VTable = (0, react_1.forwardRef)((props, ref) => {
-    const update = (0, hooks_1.useUpdate)();
-    const { state, root, resize } = (0, Box_1.useBox)();
+var _VTable = (0, react_1.forwardRef)(function (props, ref) {
+    var update = (0, hooks_1.useUpdate)();
+    var _a = (0, Box_1.useBox)(), state = _a.state, root = _a.root, resize = _a.resize;
     // const [scroll, setScroll] = useState<TableProps<PlainObject>['scroll']>(undefined);
-    const { rowKey, list, isQuerying, pageNo, pageSize, orderBy, query, total } = props.model;
-    let start = (0, react_1.useRef)(0);
-    const tableProps = {};
-    (0, react_1.useEffect)(() => {
+    var _b = props.model, rowKey = _b.rowKey, list = _b.list, isQuerying = _b.isQuerying, pageNo = _b.pageNo, pageSize = _b.pageSize, orderBy = _b.orderBy, query = _b.query, total = _b.total;
+    var start = (0, react_1.useRef)(0);
+    var tableProps = {};
+    (0, react_1.useEffect)(function () {
         var _a;
+        var _b;
         if (state.selected == null)
             return;
-        if (lodash_1.default.isFunction((_a = props.selectBar) === null || _a === void 0 ? void 0 : _a.onSelect)) {
-            let param = props.selectBar.onSelect(...state.selected);
-            query(Object.assign(Object.assign({}, props.default), param));
+        if (lodash_1.default.isFunction((_b = props.selectBar) === null || _b === void 0 ? void 0 : _b.onSelect)) {
+            var param = (_a = props.selectBar).onSelect.apply(_a, __spreadArray([], __read(state.selected), false));
+            query(__assign(__assign({}, props.default), param));
         }
     }, [state.selected]);
     // 更新页数
-    (0, react_1.useLayoutEffect)(() => {
+    (0, react_1.useLayoutEffect)(function () {
         start.current = pageSize * (pageNo - 1);
         // @ts-ignore
         if (props.model.mode == 'static')
             update();
     }, [pageSize, pageNo]);
-    // 计算 clolum
-    const columns = (0, react_1.useMemo)(() => {
-        let cols = [];
+    // 计算 clolum 及 高亮keyword
+    var columns = (0, react_1.useMemo)(function () {
+        var cols = [];
         if (props.showIndex !== false)
             cols.push((0, Util_1.getIdxColumn)(start, props.showIndex));
-        let HighKeys = new Set();
+        var HighKeys = new Set();
         if (!utils_1.GLOBAL.CONFIG.SEARCHBAR.DISABLE_KEYWORD && lodash_1.default.has(props, 'searchBar.keyword')) {
             if (lodash_1.default.isObject(props.searchBar.keyword)) {
-                (props.searchBar.keyword.highlight || []).map(key => HighKeys.add(key));
+                (props.searchBar.keyword.highlight || []).map(function (key) { return HighKeys.add(key); });
             }
             else {
-                props.columns.map(col => {
-                    if (lodash_1.default.isString(col.dataIndex))
-                        HighKeys.add(col.dataIndex);
+                props.columns.map(function (col) {
+                    // @ts-ignore
+                    var isGroup = lodash_1.default.has(col, 'children') && lodash_1.default.isArray(col.children);
+                    if (isGroup) {
+                        col.children.map((function (item) {
+                            if (lodash_1.default.isString(item.dataIndex))
+                                HighKeys.add(item.dataIndex);
+                        }));
+                    }
+                    else {
+                        var dataIndex = col.dataIndex;
+                        if (lodash_1.default.isString(dataIndex))
+                            HighKeys.add(dataIndex);
+                    }
                 });
             }
         }
-        props.columns.map(col => {
+        var convertCol = function (col) {
             if (col.roleCode && !utils_1.PageUtil.hasRole(col.roleCode))
-                return;
-            let item = Object.assign({}, col);
+                return null;
+            var item = __assign({}, col);
             if (col.ik) {
-                let title = utils_1.i18n.txt(col.ik);
+                var title = utils_1.i18n.txt(col.ik);
                 item.title = title == '' ? item.title : title;
             }
             if (HighKeys.has(item.dataIndex) && item.render == null) {
-                item.render = (record) => {
+                item.render = function (record) {
                     if (!lodash_1.default.isString(record))
                         return record;
-                    let keyword = '';
+                    var keyword = '';
                     if (record && keyword) {
                         return react_1.default.createElement(HighLight_1.HighLight, { text: record, keyword: keyword });
                     }
@@ -110,7 +158,7 @@ const _VTable = (0, react_1.forwardRef)((props, ref) => {
             if (!lodash_1.default.has(item, 'ellipsis'))
                 item.ellipsis = true;
             if (!lodash_1.default.has(item, 'width') && lodash_1.default.isString(item.title)) {
-                let clz = item.title.length + (item.sorter ? 2 : 0);
+                var clz = item.title.length + (item.sorter ? 2 : 0);
                 if (col.className) {
                     item.className = 'c-table-col-' + clz + ' ' + col.className;
                 }
@@ -118,14 +166,35 @@ const _VTable = (0, react_1.forwardRef)((props, ref) => {
                     item.className = 'c-table-col-' + clz;
                 }
             }
-            cols.push(item);
+            return item;
+        };
+        props.columns.map(function (col) {
+            // @ts-ignore
+            var isGroup = lodash_1.default.has(col, 'children') && lodash_1.default.isArray(col.children);
+            if (isGroup) {
+                var column_1 = __assign(__assign({}, lodash_1.default.pick(col, ['width', 'align'])), { children: [], title: col.title, className: 'c-table-header-group' });
+                if (col.className)
+                    column_1.className = "c-table-header-group ".concat(col.className);
+                col.children.map((function (item) {
+                    var subCol = convertCol(item);
+                    if (subCol != null)
+                        column_1.children.push(subCol);
+                }));
+                if (column_1.children.length > 0)
+                    cols.push(column_1);
+            }
+            else {
+                var column = convertCol(col);
+                if (column != null)
+                    cols.push(column);
+            }
         });
         return cols;
     }, [props.columns]);
-    (0, react_1.useLayoutEffect)(() => {
+    (0, react_1.useLayoutEffect)(function () {
         resize();
     }, [columns]);
-    (0, react_1.useEffect)(() => {
+    (0, react_1.useEffect)(function () {
         if (props.autoLoad === false)
             return;
         // @ts-ignore
@@ -150,48 +219,51 @@ const _VTable = (0, react_1.forwardRef)((props, ref) => {
     //     // }, 2);
     // }, [state?.height]);
     // @ts-ignore
-    const effectKey = props.model.effect;
-    (0, react_1.useEffect)(() => {
+    var effectKey = props.model.effect;
+    (0, react_1.useEffect)(function () {
         if (effectKey == null)
             return;
-        let effectRow = effectKey;
+        var effectRow = effectKey;
         if (lodash_1.default.isString(effectKey) && lodash_1.default.startsWith(effectKey, '_'))
             effectRow = effectRow.substring(1);
-        const trs = root.current.getElementsByClassName('ant-table-row');
-        let size = trs.length;
+        var trs = root.current.getElementsByClassName('ant-table-row');
+        var size = trs.length;
         if (size <= 0)
             return;
-        for (let i = 0; i < size; i++) {
-            let tr = trs.item(i);
-            let key = tr.getAttribute('data-row-key');
+        var _loop_1 = function (i) {
+            var tr = trs.item(i);
+            var key = tr.getAttribute('data-row-key');
             if (key == effectRow) {
                 if (tr.classList.contains('c-table-high')) {
                     tr.classList.remove('c-table-high');
                 }
-                setTimeout(() => tr.classList.add('c-table-high'), 2);
+                setTimeout(function () { return tr.classList.add('c-table-high'); }, 2);
             }
+        };
+        for (var i = 0; i < size; i++) {
+            _loop_1(i);
         }
     }, [effectKey]);
     if (props.select) {
         tableProps.rowSelection = {
             selectedRowKeys: ref.current.selected[0],
-            onChange: (selectedRowKeys, selectedObjects) => {
+            onChange: function (selectedRowKeys, selectedObjects) {
                 ref.current.selected = [selectedRowKeys, selectedObjects];
                 ref.current.onSelected();
                 update();
             },
-            getCheckboxProps: record => {
+            getCheckboxProps: function (record) {
                 if (!lodash_1.default.has(record, rowKey))
                     return { disabled: true };
                 return { disabled: false };
             },
         };
     }
-    return react_1.default.createElement(Table_1.Table, Object.assign({ rowKey: props.rowKey || rowKey, 
+    return react_1.default.createElement(Table_1.Table, __assign({ rowKey: props.rowKey || rowKey, 
         // scroll={scroll}
         // tableLayout="fixed"
         // showSorterTooltip={false}
-        size: utils_1.GLOBAL.CONFIG.TABLE.SIZE, locale: { emptyText: react_1.default.createElement(antd_1.Empty, { style: { marginTop: 24 } }) } }, props, tableProps, { className: utils_1.StringUtil.className(['c-table'], props.className), pagination: false, columns: columns, dataSource: list, loading: isQuerying, onChange: (x, y, field) => {
+        size: utils_1.GLOBAL.CONFIG.TABLE.SIZE, locale: { emptyText: react_1.default.createElement(antd_1.Empty, { style: { marginTop: 24 } }) } }, props, tableProps, { className: utils_1.StringUtil.className(['c-table'], props.className), pagination: false, columns: columns, dataSource: list, loading: isQuerying, onChange: function (x, y, field) {
             if (field.column) {
                 orderBy(field.field, field.order == 'ascend' ? 'asc' : 'desc');
             }
@@ -200,25 +272,25 @@ const _VTable = (0, react_1.forwardRef)((props, ref) => {
             }
         } }));
 });
-exports.VTable = (0, react_1.forwardRef)((props, ref) => {
-    const { isQuerying, pageNo, pageSize, total, totalAcc, param, pageTo, query, cost } = props.model;
+exports.VTable = (0, react_1.forwardRef)(function (props, ref) {
+    var _a = props.model, isQuerying = _a.isQuerying, pageNo = _a.pageNo, pageSize = _a.pageSize, total = _a.total, totalAcc = _a.totalAcc, param = _a.param, pageTo = _a.pageTo, query = _a.query, cost = _a.cost;
     // 通过 ref 方式交互，后续扩展方法实现定制联页选择
-    const selectedRef = (0, react_1.useRef)({ selected: [[], []], onSelected: () => { }, });
+    var selectedRef = (0, react_1.useRef)({ selected: [[], []], onSelected: function () { }, });
     // 对外提供getSelected方法获取当前选择的数据
-    (0, react_1.useImperativeHandle)(ref, () => {
+    (0, react_1.useImperativeHandle)(ref, function () {
         return {
-            getSelected() {
+            getSelected: function () {
                 return selectedRef.current.selected;
             },
-            getParams: () => {
+            getParams: function () {
                 return props.model.param;
             }
         };
     }, [param]);
-    let boxProps = lodash_1.default.pick(props, ['selectBar', 'style', 'className', 'default', 'mode']);
+    var boxProps = lodash_1.default.pick(props, ['selectBar', 'style', 'className', 'default', 'mode']);
     if (props.searchBar) {
-        boxProps.searchBar = Object.assign(Object.assign({}, props.searchBar), { disabled: isQuerying, onSearch: (data) => {
-                let queryParam = lodash_1.default.extend({}, param, data);
+        boxProps.searchBar = __assign(__assign({}, props.searchBar), { disabled: isQuerying, onSearch: function (data) {
+                var queryParam = lodash_1.default.extend({}, param, data);
                 query(queryParam, true);
                 selectedRef.current.selected = [[], []];
                 selectedRef.current.onSelected();
@@ -253,6 +325,6 @@ exports.VTable = (0, react_1.forwardRef)((props, ref) => {
             }
         }
     }
-    return react_1.default.createElement(Box_1.Box, Object.assign({}, boxProps),
-        react_1.default.createElement(_VTable, Object.assign({}, lodash_1.default.omit(props, ['className', 'style']), { ref: selectedRef })));
+    return react_1.default.createElement(Box_1.Box, __assign({}, boxProps),
+        react_1.default.createElement(_VTable, __assign({}, lodash_1.default.omit(props, ['className', 'style']), { ref: selectedRef })));
 });

package/components/Tables/index.d.ts

@@ -8,7 +8,12 @@ import type { TableActionButton } from './Components/ActionBar';
 import type { PlainObject, BaseItem, ApiModel } from '../../basetype';
 import type { BoxMode } from '../Box/Box';
 import type { SelectBarProps } from '../Box/SelectBar';
-export type TableColumn = BaseItem & ColumnProps<PlainObject>;
+export type TableColumn = BaseItem & Omit<ColumnProps<any>, 'children'>;
+export type TableColumnGroup = Pick<TableColumn, 'className' | 'width' | 'align'> & {
+    title: string;
+    children: TableColumn[];
+};
+export type TableCol = TableColumn | TableColumnGroup;
 /**
  * 说明：为保持各应用 一致性 与 简单性
  * 所有VAP组装 Table 排除一些自定义属性
@@ -19,7 +24,7 @@ export type BaseTableProps = TableDefine & {
     /**
      * 列
     */
-    columns: TableColumn[];
+    columns: TableCol[];
     /**
      * 序号字段
      * 1. 不传   ：显示序号 , 支持国际化