ztxkui 4.3.26 → 4.3.27

package/dist/UI/Modal/hooks.d.ts

@@ -0,0 +1,15 @@
+import dayjs from 'dayjs';
+export declare const RANGEPICKER_RANGES: any;
+export declare function useForm(): {
+    items: any[];
+    outsideParams: {
+        test1: string;
+        test2: number;
+        createTime: dayjs.Dayjs[];
+    };
+    dateTransformToString: any;
+};
+export declare function useTable(): {
+    columns: any;
+    tablePropsReset: any;
+};

package/dist/UI/Modal/hooks.js

@@ -0,0 +1,170 @@
+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);
+};
+import React, { useMemo } from 'react';
+import { Input, EnhanceSelect, DatePicker } from '../../index';
+import { Select } from 'antd';
+import dayjs from 'dayjs';
+var getLastMonth = function () {
+    var date = [];
+    var start = dayjs().subtract(1, 'month').format('YYYY-MM') + '-01';
+    var end = dayjs(start)
+        .subtract(-1, 'month')
+        .add(-1, 'days')
+        .format('YYYY-MM-DD');
+    date.push(dayjs(start));
+    date.push(dayjs(end));
+    return date;
+};
+export var RANGEPICKER_RANGES = {
+    此刻: [dayjs(), dayjs()],
+    最近7天: [dayjs().subtract(6, 'days'), dayjs().subtract(0, 'days')],
+    最近30天: [dayjs().subtract(29, 'days'), dayjs().subtract(0, 'days')],
+    上月: getLastMonth(),
+    本月: [dayjs().startOf('month'), dayjs().endOf('month')],
+    上季度: [
+        dayjs()
+            .quarter(dayjs().quarter() - 1)
+            .startOf('quarter'),
+        dayjs()
+            .quarter(dayjs().quarter() - 1)
+            .endOf('quarter'),
+    ],
+    本季度: [dayjs().startOf('quarter'), dayjs().endOf('quarter')],
+    上一年: [
+        dayjs()
+            .year(dayjs().year() - 1)
+            .startOf('year'),
+        dayjs()
+            .year(dayjs().year() - 1)
+            .endOf('year'),
+    ],
+    本年: [dayjs().startOf('year'), dayjs().endOf('year')],
+};
+export function useForm() {
+    var items = useMemo(function () {
+        return [
+            {
+                name: 'test1',
+                label: '测试1',
+                render: function (itemProps) { return React.createElement(Input, __assign({}, itemProps, { allowClear: true })); },
+            },
+            {
+                name: 'test2',
+                label: '测试2',
+                render: function (itemProps) { return (React.createElement(Select, __assign({}, itemProps, { allowClear: true }),
+                    React.createElement(Select.Option, { value: 1 }, "1"),
+                    React.createElement(Select.Option, { value: 2 }, "2"))); },
+            },
+            {
+                name: 'companyId',
+                label: '公司',
+                render: function (itemProps) { return (React.createElement(EnhanceSelect, __assign({}, itemProps, { list: [
+                        { id: '1', name: '小明' },
+                        { id: '2', name: '小虎' },
+                    ], allowClear: true }))); },
+            },
+            {
+                name: 'depId',
+                label: '部门',
+                render: function (itemProps) { return (React.createElement(EnhanceSelect, __assign({}, itemProps, { list: [
+                        { id: '1', name: '小明' },
+                        { id: '2', name: '小虎' },
+                    ], allowClear: true }))); },
+            },
+            {
+                name: 'createTime',
+                label: '时间',
+                render: function (itemProps) { return (React.createElement(DatePicker.RangePicker, __assign({}, itemProps, { ranges: RANGEPICKER_RANGES }))); },
+            },
+            {
+                name: 'oneTime',
+                label: '时间1',
+                render: function (itemProps) { return React.createElement(DatePicker, __assign({}, itemProps)); },
+            },
+        ];
+    }, []);
+    // 时间转换
+    var dateTransformToString = useMemo(function () {
+        return {
+            fromKey: ['createTime', 'oneTime'],
+            toKey: [['startTime', 'endTime'], 'oneTimeEnd'],
+            format: ['YYYY-MM-DD HH:mm:ss', 'YYYY-MM-DD'],
+            type: 'string',
+        };
+    }, []);
+    // 外部初始值
+    var outsideParams = useMemo(function () {
+        return {
+            test1: '22',
+            test2: 1,
+            createTime: [dayjs().subtract(30, 'days'), dayjs().subtract(0, 'days')],
+        };
+    }, []);
+    return {
+        items: items,
+        outsideParams: outsideParams,
+        dateTransformToString: dateTransformToString,
+    };
+}
+export function useTable() {
+    var columns = [
+        {
+            title: '测试列3',
+            width: 100,
+            dataIndex: 'test3',
+            key: 'test3',
+            // 普通输入框配置
+            editable: true,
+            // 配置列的验证规则，这种是最普通的非空校验
+            validate: {},
+            shouldCellUpdate: function (record, preRecord) {
+                return record.test3 !== preRecord.test3;
+            },
+        },
+        {
+            title: '测试列2',
+            width: 100,
+            dataIndex: 'test2',
+            key: 'test2',
+            // 普通输入框配置
+            editable: true,
+            // 配置列的验证规则，这种是最普通的非空校验
+            validate: {},
+            shouldCellUpdate: function (record, preRecord) {
+                return record.test2 !== preRecord.test2;
+            },
+        },
+        {
+            title: '测试列1',
+            width: 100,
+            dataIndex: 'test1',
+            key: 'test1',
+            // 普通输入框配置
+            editable: true,
+            // 配置列的验证规则，这种是最普通的非空校验
+            validate: {},
+            shouldCellUpdate: function (record, preRecord) {
+                return record.test1 !== preRecord.test1;
+            },
+        },
+    ];
+    var tablePropsReset = useMemo(function () {
+        return {
+            isEdit: true,
+            scroll: { x: 1000, y: 500 },
+        };
+    }, []);
+    return {
+        columns: columns,
+        tablePropsReset: tablePropsReset,
+    };
+}

package/dist/UI/Modal/index.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+declare const Modal: React.FC;
+export default Modal;

package/dist/UI/Modal/index.js

@@ -0,0 +1,46 @@
+import React, { useState, useCallback } from 'react';
+import ProModal, { useVisible } from 'components/ProModal';
+import { Button } from '../../index';
+import { data2 } from '../Table/data';
+import { useForm, useTable } from './hooks';
+function request(params) {
+    return new Promise(function (resolve) {
+        setTimeout(function () {
+            resolve(data2);
+        }, 2000);
+    });
+}
+var Modal = function () {
+    var _a = useVisible(), visible = _a.visible, onClose = _a.onClose, onOpen = _a.onOpen;
+    // 表单配置相关信息
+    var _b = useForm(), items = _b.items, outsideParams = _b.outsideParams, dateTransformToString = _b.dateTransformToString;
+    // 已选中的选择项
+    var _c = useState(), selectedRowKeys = _c[0], setSelectedRowKeys = _c[1];
+    var _d = useState(), selectedRows = _d[0], setSelectedRows = _d[1];
+    var tablePropsChoiceFilterHandle = useCallback(function (record, selectedRowKeys, selectedRows) {
+        return {};
+    }, []);
+    // 选中后点击确认选择回调
+    var tablePropsOnSelectedRowChange = useCallback(function (selectedRowKeys, selectedRows) {
+        setSelectedRowKeys(selectedRowKeys);
+        setSelectedRows(selectedRows);
+    }, []);
+    // 当前选中项回调
+    var _e = useState(), childContent = _e[0], setChildContent = _e[1];
+    var tablePropsOnSelect = useCallback(function (record, selected, selectedRows) {
+        console.log(record, selected, selectedRows);
+        setChildContent(record);
+    }, []);
+    // 表格配置相关信息
+    var _f = useTable(), columns = _f.columns, tablePropsReset = _f.tablePropsReset;
+    return (React.createElement(React.Fragment, null,
+        React.createElement(Button, { onClick: function () { return onOpen(); } }, "\u5F00\u542F\u5F39\u6846"),
+        React.createElement(Button, { onClick: function () {
+                console.log(selectedRowKeys, selectedRows);
+            } }, "\u83B7\u53D6\u6570\u636E"),
+        React.createElement(ProModal, { title: "\u8BF7\u9009\u62E9", visible: visible, onClose: onClose, request: request, outsideParams: outsideParams, formPropsItems: items, formPropsDateTransform: dateTransformToString, tablePropsColumns: columns, tablePropsRowKey: "id", tablePropsReset: tablePropsReset, tablePropsIsChoice: true, tablePropsIsChoiceFilter: true, tablePropsSelectedRowKeys: selectedRowKeys, tablePropsSelectedRows: selectedRows, tablePropsChoiceFilterHandle: tablePropsChoiceFilterHandle, tablePropsOnSelectedRowChange: tablePropsOnSelectedRowChange, tablePropsOnSelect: tablePropsOnSelect, tablePropsIsRepeatChoice: true },
+            React.createElement("div", null,
+                "\u6211\u662F\u5B50\u8868",
+                JSON.stringify(childContent)))));
+};
+export default Modal;

package/dist/UI/Table/EditTable.js

@@ -34,8 +34,19 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 // 带编辑属性的表格使用
-import { useState, useCallback, useRef } from 'react';
+import { useState, useEffect, useCallback, useRef } from 'react';
 import { data2 } from './data';
 import ProEditTable from 'components/ProTable';
 import { Button, message, EnhanceSelect } from '../../index';
@@ -47,7 +58,7 @@ import { Button, message, EnhanceSelect } from '../../index';
 // 3. 可以通过配置校验规则 验证表格
 // 4. 自定义render 需要调用表格提供的修改数据方法
 function useColumns(tableHandleRef) {
-    var _a = useState(data2), data = _a[0], setData = _a[1];
+    var _a = useState([]), data = _a[0], setData = _a[1];
     var columns = [
         {
             title: '序号',
@@ -159,38 +170,45 @@ function useColumns(tableHandleRef) {
                             name: '小李',
                         },
                     ], onChange: function (value, option, fullData) {
-                        var _a, _b, _c;
+                        var _a;
                         var newRecord = {
                             test6: value,
                             test6Name: fullData.name,
                         };
-                        var realyIndex = (_b = (_a = tableHandleRef.current) === null || _a === void 0 ? void 0 : _a.getRealyIndex) === null || _b === void 0 ? void 0 : _b.call(_a, index);
-                        (_c = tableHandleRef.current) === null || _c === void 0 ? void 0 : _c.onEditableSaveHandle(newRecord, realyIndex);
+                        (_a = tableHandleRef.current) === null || _a === void 0 ? void 0 : _a.onEditableSaveHandle(newRecord, index);
                     } }));
             },
         },
     ];
-    // useEffect(() => {
-    //   setTimeout(() => {
-    //     setData(data2);
-    //   }, 300);
-    // }, []);
+    useEffect(function () {
+        setTimeout(function () {
+            setData(data2);
+        }, 300);
+    }, []);
     return { columns: columns, data: data, setData: setData };
 }
 export default function EditTable() {
     var _this = this;
-    console.log('table render');
     var tableHandleRef = useRef({});
     var _a = useColumns(tableHandleRef), columns = _a.columns, data = _a.data, setData = _a.setData;
     var _b = useState(1), num = _b[0], setNum = _b[1];
+    useEffect(function () {
+        setNum(2);
+    }, []);
     // 触发onChange事件
-    var onChange = useCallback(function (dataSource) {
+    var onChange = useCallback(function (dataSource, info) {
         setData(dataSource);
-        setNum(function (n) { return n + 1; });
     }, [setData]);
+    // 选中相关
+    var _c = useState(), selectedRowKeys = _c[0], setSelectedRowKeys = _c[1];
+    var _d = useState(), setSelectedRows = _d[1];
+    var onSelectedRowChange = useCallback(function (selectedRowKeys, selectedRows) {
+        setSelectedRowKeys(selectedRowKeys);
+        setSelectedRows(selectedRows);
+    }, []);
     return (React.createElement("div", null,
         React.createElement(Button, { onClick: function () {
-                console.log(data);
+                console.log(data, selectedRowKeys);
             } },
             "\u83B7\u53D6\u6570\u636E",
             num),
@@ -228,9 +246,14 @@ export default function EditTable() {
             // 是否开启增减行
             showDelIcon: true, showAddIcon: true, 
             // 增加数据的规则 是增加空白行 还是 复制一行
-            addDataMode: "blank", 
+            addDataMode: "blank", addDataReturnRecord: useCallback(function (record) {
+                var id = record.id, resetRecord = __rest(record, ["id"]);
+                return resetRecord;
+            }, []), 
             // 是否记录列宽，但是又不要显示那个按钮
             showColumnDynamic: true, showColumnDynamicKey: "single-110011", hiddenColumnDynamicIcon: true, 
             // 开启内部分页
-            showInnerPagination: true, defaultInnerPageSize: 20, onChange: onChange })));
+            showInnerPagination: true, defaultInnerPageSize: 10, 
+            // 是否选择
+            isChoice: true, selectedRowKeys: selectedRowKeys, onSelectedRowChange: onSelectedRowChange, onChange: onChange })));
 }

package/dist/UI/Table/data.js

@@ -5,7 +5,7 @@ export var data1 = new Array(50).fill(1).map(function (item, index) {
         test2: index + 100,
     };
 });
-export var data2 = new Array(1).fill(1).map(function (item, index) {
+export var data2 = new Array(40).fill(1).map(function (item, index) {
     return {
         id: "id-" + index,
         test1: "test1-" + index,

package/dist/UI/index.js

@@ -3,16 +3,20 @@ import { Link, Switch, Route } from 'react-router-dom';
 import DefaultTable from './Table/DefaultTable';
 import EditTable from './Table/EditTable';
 import Form from './Form';
+import Modal from './Modal';
 export default function UIComponent() {
     return (React.createElement("div", { style: { padding: '10px' } },
         React.createElement(Link, { to: "/ui/default-table", style: { marginRight: '10px' } }, "\u7B80\u5355\u8868\u683C"),
         React.createElement(Link, { to: "/ui/edit-table", style: { marginRight: '10px' } }, "\u53EF\u7F16\u8F91\u8868\u683C"),
         React.createElement(Link, { to: "/ui/form", style: { marginRight: '10px' } }, "\u8868\u5355"),
+        React.createElement(Link, { to: "/ui/modal", style: { marginRight: '10px' } }, "\u5F39\u6846"),
         React.createElement(Switch, null,
             React.createElement(Route, { path: "/ui/default-table" },
                 React.createElement(DefaultTable, null)),
             React.createElement(Route, { path: "/ui/edit-table" },
                 React.createElement(EditTable, null)),
             React.createElement(Route, { path: "/ui/form" },
-                React.createElement(Form, null)))));
+                React.createElement(Form, null)),
+            React.createElement(Route, { path: "/ui/modal" },
+                React.createElement(Modal, null)))));
 }

package/dist/components/ProModal/ModalForm.d.ts

@@ -0,0 +1,8 @@
+/**
+ * 弹出框基本布局
+ */
+import React from 'react';
+import { IProModalFormProps } from './interface';
+declare function ModalForm(props: IProModalFormProps): JSX.Element;
+declare const _default: React.MemoExoticComponent<typeof ModalForm>;
+export default _default;

package/dist/components/ProModal/ModalForm.js

@@ -0,0 +1,32 @@
+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 __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+/**
+ * 弹出框基本布局
+ */
+import React, { memo } from 'react';
+import ProForm from '../ProForm';
+function ModalForm(props) {
+    var formReset = __rest(props, []);
+    return React.createElement(ProForm, __assign({ rightWrapVisible: true }, formReset));
+}
+export default memo(ModalForm);

package/dist/components/ProModal/ModalTable.d.ts

@@ -0,0 +1,8 @@
+/**
+ * 表格
+ */
+import React from 'react';
+import { IProModalTableProps } from './interface';
+declare function ModalTable(props: IProModalTableProps): JSX.Element;
+declare const _default: React.MemoExoticComponent<typeof ModalTable>;
+export default _default;

package/dist/components/ProModal/ModalTable.js

@@ -0,0 +1,32 @@
+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 __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+/**
+ * 表格
+ */
+import React, { memo } from 'react';
+import ProTable from '../ProTable';
+function ModalTable(props) {
+    var tableReset = __rest(props, []);
+    return React.createElement(ProTable, __assign({}, tableReset));
+}
+export default memo(ModalTable);

package/dist/components/ProModal/hooks.d.ts

@@ -0,0 +1,33 @@
+/// <reference types="react" />
+import { IProModalProps } from './interface';
+import { IFooterDom } from '../business/Footer';
+interface IUseData {
+    visible?: boolean;
+    request?: IProModalProps['request'];
+}
+export declare function useData({ visible, request }: IUseData, fetchParams: any): {
+    loading: boolean;
+    data: any;
+    setData: import("react").Dispatch<any>;
+};
+export declare function useModalForm(outsideParams?: any, formPropsDateTransform?: any, visible?: boolean): {
+    form: import("antd").FormInstance<any>;
+    initialValues: any;
+    fetchParams: any;
+    onSearchHandle: () => void;
+    onResetHandle: () => void;
+};
+export declare function useModalTable(choiceOptions: any, setData: any): {
+    innerSelectedRowKeys: any;
+    setInnerSelectedRowKeys: import("react").Dispatch<any>;
+    innerSelectedRows: any;
+    setInnerSelectedRows: import("react").Dispatch<any>;
+    onSelectedRowChange: (selectedRowKeys: React.Key[], selectedRows: any[]) => void;
+    choiceFilterHandle: (record: any, selectedRowKeys: React.Key[], selectedRows: any[]) => any;
+    onTableChange: (newData: any) => void;
+};
+export declare function useFooter(onClose: any, choiceOptions: any, data: any): {
+    footerDom: IFooterDom[];
+    onCloseHandle: () => void;
+};
+export {};

package/dist/components/ProModal/hooks.js

@@ -0,0 +1,193 @@
+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);
+};
+import { useState, useEffect, useCallback, useMemo } from 'react';
+import { unstable_batchedUpdates } from 'react-dom';
+import { message } from '../../index';
+import { useForm } from '../ProForm';
+import { timeTransfrom } from 'ztxkutils/dist/tools';
+// 数据获取相关逻辑
+var initData = [];
+export function useData(_a, fetchParams) {
+    var visible = _a.visible, request = _a.request;
+    var _b = useState(false), loading = _b[0], setLoading = _b[1];
+    var _c = useState(initData), data = _c[0], setData = _c[1];
+    // 只有当模态框被打开时，才发送数据请求
+    useEffect(function () {
+        if (visible) {
+            setLoading(true);
+            if (request) {
+                request(fetchParams)
+                    .then(function (data) {
+                    unstable_batchedUpdates(function () {
+                        setLoading(false);
+                        setData(data);
+                    });
+                })
+                    .catch(function () {
+                    unstable_batchedUpdates(function () {
+                        setLoading(false);
+                        setData(initData);
+                    });
+                });
+            }
+        }
+    }, [visible, request, fetchParams]);
+    return {
+        loading: loading,
+        data: data,
+        setData: setData,
+    };
+}
+// 弹出框表单逻辑
+export function useModalForm(outsideParams, formPropsDateTransform, visible) {
+    if (outsideParams === void 0) { outsideParams = {}; }
+    if (formPropsDateTransform === void 0) { formPropsDateTransform = {}; }
+    var form = useForm()[0];
+    var _a = useState(outsideParams), fetchParams = _a[0], setFetchParams = _a[1];
+    // 初始化表单赋值
+    var initialValues = useMemo(function () {
+        return outsideParams;
+    }, [outsideParams]);
+    useEffect(function () {
+        if (visible) {
+            form.resetFields();
+        }
+    }, [visible, form]);
+    // 查询事件
+    var onSearchHandle = useCallback(function () {
+        var formParams = form.getFieldsValue(); // 表单数据
+        var currentParams = __assign(__assign({}, outsideParams), formParams);
+        // 将日期格式转换成数据查询时 所需要的格式
+        var newParams = timeTransfrom(__assign({ params: currentParams }, formPropsDateTransform));
+        setFetchParams(newParams);
+    }, [form, outsideParams, formPropsDateTransform]);
+    // 重置事件
+    var onResetHandle = useCallback(function () {
+        form.resetFields();
+    }, [form]);
+    return {
+        form: form,
+        initialValues: initialValues,
+        fetchParams: fetchParams,
+        onSearchHandle: onSearchHandle,
+        onResetHandle: onResetHandle,
+    };
+}
+// 模态表格相关逻辑
+var initSelectedRowKeys = [];
+var initSelectedRows = [];
+export function useModalTable(choiceOptions, setData) {
+    var tablePropsChoiceFilterHandle = choiceOptions.tablePropsChoiceFilterHandle, tablePropsSelectedRowKeys = choiceOptions.tablePropsSelectedRowKeys, tablePropsSelectedRows = choiceOptions.tablePropsSelectedRows, tablePropsIsRepeatChoice = choiceOptions.tablePropsIsRepeatChoice, visible = choiceOptions.visible;
+    // 内部管理已选中行
+    var _a = useState(initSelectedRowKeys), innerSelectedRowKeys = _a[0], setInnerSelectedRowKeys = _a[1];
+    var _b = useState(initSelectedRows), innerSelectedRows = _b[0], setInnerSelectedRows = _b[1];
+    // 是否要默认选中，如果设置了默认选中，那么模态框展示的时候 需要默认选中
+    useEffect(function () {
+        if (visible) {
+            if (tablePropsIsRepeatChoice) {
+                setInnerSelectedRowKeys(tablePropsSelectedRowKeys);
+                setInnerSelectedRows(tablePropsSelectedRows);
+            }
+        }
+    }, [
+        visible,
+        tablePropsIsRepeatChoice,
+        tablePropsSelectedRowKeys,
+        tablePropsSelectedRows,
+    ]);
+    // 选中行 触发事件
+    var onSelectedRowChange = useCallback(function (selectedRowKeys, selectedRows) {
+        setInnerSelectedRowKeys(selectedRowKeys);
+        setInnerSelectedRows(selectedRows);
+    }, []);
+    // 过滤规则
+    var choiceFilterHandle = useCallback(function (record, selectedRowKeys, selectedRows) {
+        if (tablePropsChoiceFilterHandle) {
+            return tablePropsChoiceFilterHandle(record, selectedRowKeys, selectedRows);
+        }
+        return {};
+    }, [tablePropsChoiceFilterHandle]);
+    // 表格onChange事件
+    var onTableChange = useCallback(function (newData) {
+        setData(newData);
+    }, [setData]);
+    return {
+        innerSelectedRowKeys: innerSelectedRowKeys,
+        setInnerSelectedRowKeys: setInnerSelectedRowKeys,
+        innerSelectedRows: innerSelectedRows,
+        setInnerSelectedRows: setInnerSelectedRows,
+        onSelectedRowChange: onSelectedRowChange,
+        choiceFilterHandle: choiceFilterHandle,
+        onTableChange: onTableChange,
+    };
+}
+// 底部按钮相关
+export function useFooter(onClose, choiceOptions, data) {
+    var innerSelectedRowKeys = choiceOptions.innerSelectedRowKeys, setInnerSelectedRowKeys = choiceOptions.setInnerSelectedRowKeys, setInnerSelectedRows = choiceOptions.setInnerSelectedRows, tablePropsOnSelectedRowChange = choiceOptions.tablePropsOnSelectedRowChange, tablePropsRowKey = choiceOptions.tablePropsRowKey; // 内部选中项
+    // 点击确认选择 触发回调 清空内部选中项
+    // 重置值为最新值
+    var onSureHandle = useCallback(function () {
+        if (!Array.isArray(innerSelectedRowKeys) ||
+            innerSelectedRowKeys.length === 0) {
+            message.info('请选择数据！');
+            return;
+        }
+        // 找到真实得数据
+        var newInnerSelectedRows = [];
+        if (Array.isArray(data)) {
+            innerSelectedRowKeys.forEach(function (rowKey) {
+                var item = data.find(function (dataItem) { return dataItem[tablePropsRowKey] === rowKey; });
+                if (item) {
+                    newInnerSelectedRows.push(item);
+                }
+            });
+        }
+        tablePropsOnSelectedRowChange &&
+            tablePropsOnSelectedRowChange(innerSelectedRowKeys, newInnerSelectedRows);
+        setInnerSelectedRowKeys(initSelectedRowKeys);
+        setInnerSelectedRows(initSelectedRows);
+        onClose && onClose();
+    }, [
+        innerSelectedRowKeys,
+        setInnerSelectedRowKeys,
+        setInnerSelectedRows,
+        tablePropsOnSelectedRowChange,
+        onClose,
+        data,
+        tablePropsRowKey,
+    ]);
+    var onCloseHandle = useCallback(function () {
+        setInnerSelectedRowKeys(initSelectedRowKeys);
+        setInnerSelectedRows(initSelectedRows);
+        onClose && onClose();
+    }, [onClose, setInnerSelectedRowKeys, setInnerSelectedRows]);
+    var footerDom = useMemo(function () {
+        return [
+            {
+                DOMType: 'button',
+                type: 'default',
+                text: '取消',
+                onClick: onCloseHandle,
+            },
+            {
+                DOMType: 'button',
+                type: 'primary',
+                text: '确认选择',
+                onClick: onSureHandle,
+            },
+        ];
+    }, [onCloseHandle, onSureHandle]);
+    return {
+        footerDom: footerDom,
+        onCloseHandle: onCloseHandle,
+    };
+}

package/dist/components/ProModal/index.d.ts

@@ -0,0 +1,17 @@
+/**
+ * 模态框封装
+ * 是否需要每次打开模态框都是初始状态
+ * 1. 表单部分
+ * 2. 表格部分
+ * 3. 子表部分
+ */
+import React from 'react';
+import { IProModalProps } from './interface';
+declare function ProModal(props: IProModalProps): JSX.Element;
+export declare function useVisible(): {
+    visible: boolean;
+    onClose: () => void;
+    onOpen: () => void;
+};
+declare const _default: React.MemoExoticComponent<typeof ProModal>;
+export default _default;

package/dist/components/ProModal/index.js

@@ -0,0 +1,81 @@
+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 __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+/**
+ * 模态框封装
+ * 是否需要每次打开模态框都是初始状态
+ * 1. 表单部分
+ * 2. 表格部分
+ * 3. 子表部分
+ */
+import React, { memo, useState, useCallback } from 'react';
+import Modal from '../Modal';
+import ModalForm from './ModalForm';
+import ModalTable from './ModalTable';
+import Footer from '../business/Footer';
+import { useData, useModalForm, useModalTable, useFooter } from './hooks';
+function ProModal(props) {
+    console.log('ProModal render');
+    // 属性提取
+    var children = props.children, request = props.request, visible = props.visible, onClose = props.onClose, value = props.value, onChange = props.onChange, outsideParams = props.outsideParams, formPropsItems = props.formPropsItems, formPropsShowDynamic = props.formPropsShowDynamic, formPropsShowDynamicKey = props.formPropsShowDynamicKey, formPropsDateTransform = props.formPropsDateTransform, formPropsReset = props.formPropsReset, tablePropsColumns = props.tablePropsColumns, tablePropsRowKey = props.tablePropsRowKey, tablePropsShowColumnDynamic = props.tablePropsShowColumnDynamic, tablePropsShowColumnDynamicKey = props.tablePropsShowColumnDynamicKey, tablePropsReset = props.tablePropsReset, tablePropsIsChoice = props.tablePropsIsChoice, tablePropsIsChoiceMode = props.tablePropsIsChoiceMode, tablePropsIsChoiceFilter = props.tablePropsIsChoiceFilter, tablePropsChoiceFilterHandle = props.tablePropsChoiceFilterHandle, tablePropsSelectedRowKeys = props.tablePropsSelectedRowKeys, tablePropsSelectedRows = props.tablePropsSelectedRows, tablePropsOnSelectedRowChange = props.tablePropsOnSelectedRowChange, tablePropsOnSelect = props.tablePropsOnSelect, tablePropsIsRepeatChoice = props.tablePropsIsRepeatChoice, modalReset = __rest(props, ["children", "request", "visible", "onClose", "value", "onChange", "outsideParams", "formPropsItems", "formPropsShowDynamic", "formPropsShowDynamicKey", "formPropsDateTransform", "formPropsReset", "tablePropsColumns", "tablePropsRowKey", "tablePropsShowColumnDynamic", "tablePropsShowColumnDynamicKey", "tablePropsReset", "tablePropsIsChoice", "tablePropsIsChoiceMode", "tablePropsIsChoiceFilter", "tablePropsChoiceFilterHandle", "tablePropsSelectedRowKeys", "tablePropsSelectedRows", "tablePropsOnSelectedRowChange", "tablePropsOnSelect", "tablePropsIsRepeatChoice"]);
+    // 获取表单相关信息
+    var _a = useModalForm(outsideParams, formPropsDateTransform, visible), form = _a.form, initialValues = _a.initialValues, fetchParams = _a.fetchParams, onSearchHandle = _a.onSearchHandle, onResetHandle = _a.onResetHandle;
+    // 弹出框内部获取数据相关逻辑
+    var _b = useData({ visible: visible, request: request }, fetchParams), loading = _b.loading, data = _b.data, setData = _b.setData;
+    // 弹出表格选中事件处理
+    var _c = useModalTable({
+        tablePropsChoiceFilterHandle: tablePropsChoiceFilterHandle,
+        tablePropsSelectedRowKeys: tablePropsSelectedRowKeys,
+        tablePropsSelectedRows: tablePropsSelectedRows,
+        tablePropsIsRepeatChoice: tablePropsIsRepeatChoice,
+        visible: visible,
+    }, setData), innerSelectedRowKeys = _c.innerSelectedRowKeys, setInnerSelectedRowKeys = _c.setInnerSelectedRowKeys, innerSelectedRows = _c.innerSelectedRows, setInnerSelectedRows = _c.setInnerSelectedRows, choiceFilterHandle = _c.choiceFilterHandle, onSelectedRowChange = _c.onSelectedRowChange, onTableChange = _c.onTableChange;
+    // 确定 取消相关事件
+    var _d = useFooter(onClose, {
+        innerSelectedRowKeys: innerSelectedRowKeys,
+        setInnerSelectedRowKeys: setInnerSelectedRowKeys,
+        innerSelectedRows: innerSelectedRows,
+        setInnerSelectedRows: setInnerSelectedRows,
+        tablePropsOnSelectedRowChange: tablePropsOnSelectedRowChange,
+        tablePropsRowKey: tablePropsRowKey,
+    }, data), footerDom = _d.footerDom, onCloseHandle = _d.onCloseHandle;
+    return (React.createElement(Modal, __assign({ loading: loading, visible: visible, onCancel: onCloseHandle, width: "80%", destroyOnClose: true, footer: null }, modalReset),
+        React.createElement(ModalForm, __assign({ items: formPropsItems, form: form, showDynamic: formPropsShowDynamic, showDynamicKey: formPropsShowDynamicKey, onSearchHandle: onSearchHandle, onResetHandle: onResetHandle, initialValues: initialValues }, formPropsReset)),
+        React.createElement(ModalTable, __assign({ columns: tablePropsColumns, rowKey: tablePropsRowKey, showColumnDynamic: tablePropsShowColumnDynamic, showColumnDynamicKey: tablePropsShowColumnDynamicKey, dataSource: data, isChoice: tablePropsIsChoice, choiceMode: tablePropsIsChoiceMode, isChoiceFilter: tablePropsIsChoiceFilter, selectedRowKeys: innerSelectedRowKeys, selectedRows: innerSelectedRows, choiceFilterHandle: choiceFilterHandle, onSelectedRowChange: onSelectedRowChange, onSelect: tablePropsOnSelect, onChange: onTableChange }, tablePropsReset)),
+        children,
+        React.createElement(Footer, { footerDom: footerDom, style: { marginTop: '10px' }, align: "right" })));
+}
+export function useVisible() {
+    var _a = useState(false), visible = _a[0], setVisible = _a[1];
+    var onClose = useCallback(function () {
+        setVisible(false);
+    }, []);
+    var onOpen = useCallback(function () {
+        setVisible(true);
+    }, []);
+    return {
+        visible: visible,
+        onClose: onClose,
+        onOpen: onOpen,
+    };
+}
+export default memo(ProModal);

package/dist/components/ProModal/interface.d.ts

@@ -0,0 +1,47 @@
+/// <reference types="react" />
+import { IProFormProps } from '../ProForm/interface';
+import { ColumnsType } from '../Table';
+import { IProps as IProTableProps } from '../ProTable/interface';
+import { ModalProps } from 'antd/lib/modal';
+export interface IDateTransform {
+    fromKey: (string | string[])[];
+    toKey: (string | string[])[];
+    type?: 'string' | 'object';
+    format?: string | string[];
+}
+export interface IProModalProps extends ModalProps {
+    children?: React.ReactNode;
+    request?: (params: any) => Promise<any>;
+    visible?: boolean;
+    onClose?: () => void;
+    value?: any;
+    onChange?: (value: any) => void;
+    /** 外部的查询参数 */
+    outsideParams?: any;
+    /** 表单配置 */
+    formPropsItems: IProFormProps['items'];
+    formPropsShowDynamic?: boolean;
+    formPropsShowDynamicKey?: string;
+    formPropsReset?: Partial<IProFormProps>;
+    formPropsDateTransform?: IDateTransform;
+    /** 表格配置 */
+    tablePropsColumns: ColumnsType<any>;
+    tablePropsRowKey: string;
+    tablePropsShowColumnDynamic?: boolean;
+    tablePropsShowColumnDynamicKey?: string;
+    tablePropsReset?: Partial<IProTableProps<any>>;
+    tablePropsIsChoice?: boolean;
+    tablePropsIsChoiceMode?: IProTableProps<any>['choiceMode'];
+    tablePropsIsChoiceFilter?: boolean;
+    tablePropsChoiceFilterHandle?: IProTableProps<any>['choiceFilterHandle'];
+    tablePropsSelectedRowKeys?: IProTableProps<any>['selectedRowKeys'];
+    tablePropsSelectedRows?: IProTableProps<any>['selectedRows'];
+    tablePropsOnSelectedRowChange?: IProTableProps<any>['onSelectedRowChange'];
+    tablePropsOnSelect?: IProTableProps<any>['onSelect'];
+    /** 模态框是否可以重复选择 */
+    tablePropsIsRepeatChoice?: boolean;
+}
+export interface IProModalFormProps extends IProFormProps {
+}
+export interface IProModalTableProps extends IProTableProps<any> {
+}

package/dist/components/ProModal/interface.js

@@ -0,0 +1 @@
+export {};

package/dist/components/ProTable/hooks.d.ts

@@ -1,4 +1,6 @@
 /// <reference types="react" />
+import { IProps } from './interface';
+import { TableRowSelection } from '../../components/Table/index';
 export declare function useDataSourceRef<D>(dataSource: D[]): import("react").MutableRefObject<D[]>;
 export declare function useAddAndDelRow(showAddIcon: any, showDelIcon: any, dataSourceRef: any, addDataMode: any, addDataReturnRecord: any, onChange: any, rowKey: any, refreshScuCell: any): {
     needAddAndDel: any;
@@ -9,10 +11,18 @@ export declare function useEditRow(onChange: any, dataSourceRef: any, innerTable
     onBatchPastePre: any;
     onBatchPastePost: any;
 }): {
-    onEditableSaveHandle: (record: any, index: number | undefined, _dataIndex?: string) => void;
+    onEditableSaveHandle: (record: any, index: number | undefined, _dataIndex?: string, otherConfig?: any) => void;
     onBatchPasteHandle: (records: any, startIndex: any) => void;
 };
 export declare function useScuRfresh(): {
     refreshScuCell: () => void;
     getRefreshScuCell: () => boolean;
 };
+export declare function useChoice(choiceMode: IProps<any>['choiceMode'], filterOptions: any, selectedRowOptions: {
+    selectedRowKeys: IProps<any>['selectedRowKeys'];
+    selectedRows: IProps<any>['selectedRows'];
+    onSelectedRowChange: IProps<any>['onSelectedRowChange'];
+    onSelect: IProps<any>['onSelect'];
+}): {
+    rowSelection: TableRowSelection<any>;
+};

package/dist/components/ProTable/hooks.js

@@ -104,24 +104,35 @@ export function useMoveRow(onChange, dataSourceRef, refreshScuCell) {
 }
 // 编辑行相关
 function objIsEqual(newObj, oldObj) {
-    var keys = Object.keys(newObj);
-    for (var i = 0; i < keys.length; i++) {
-        var key = keys[i];
-        if (oldObj[key] !== newObj[key]) {
+    try {
+        var keys = Object.keys(newObj);
+        var oldKeys = Object.keys(oldObj);
+        if (keys.length !== oldKeys.length) {
             return false;
         }
+        for (var i = 0; i < keys.length; i++) {
+            var key = keys[i];
+            if (oldObj[key] !== newObj[key]) {
+                return false;
+            }
+        }
+        return true;
+    }
+    catch (err) {
+        return false;
     }
-    return true;
 }
 export function useEditRow(onChange, dataSourceRef, innerTableHandleRef, _a) {
     var onBatchPastePre = _a.onBatchPastePre, onBatchPastePost = _a.onBatchPastePost;
-    var onEditableSaveHandle = useCallback(function (record, index, _dataIndex) {
+    var onEditableSaveHandle = useCallback(function (record, index, _dataIndex, otherConfig) {
         var _a;
         var _b, _c, _d, _e;
         if (_dataIndex === void 0) { _dataIndex = ''; }
         if (typeof index === 'number') {
             // TODO:帮助找到真实的index，如果开启内部分页 需要这么做
-            var realyIndex = (_c = (_b = innerTableHandleRef.current) === null || _b === void 0 ? void 0 : _b.getRealyIndex) === null || _c === void 0 ? void 0 : _c.call(_b, index);
+            var realyIndex = otherConfig && otherConfig.isInner
+                ? index
+                : (_c = (_b = innerTableHandleRef.current) === null || _b === void 0 ? void 0 : _b.getRealyIndex) === null || _c === void 0 ? void 0 : _c.call(_b, index);
             var newDataSource = __spreadArray([], dataSourceRef.current);
             var oldRecord = newDataSource[realyIndex];
             // 如果新的record里面的值 老的Record里面有 那么不需要触发onChange
@@ -130,7 +141,9 @@ export function useEditRow(onChange, dataSourceRef, innerTableHandleRef, _a) {
                 return;
             }
             // TODO:清楚错误样式
-            (_e = (_d = innerTableHandleRef === null || innerTableHandleRef === void 0 ? void 0 : innerTableHandleRef.current) === null || _d === void 0 ? void 0 : _d.clearErrorClass) === null || _e === void 0 ? void 0 : _e.call(_d, index);
+            if (!otherConfig || (otherConfig && !otherConfig.isInner)) {
+                (_e = (_d = innerTableHandleRef === null || innerTableHandleRef === void 0 ? void 0 : innerTableHandleRef.current) === null || _d === void 0 ? void 0 : _d.clearErrorClass) === null || _e === void 0 ? void 0 : _e.call(_d, index);
+            }
             var newRecord = _dataIndex
                 ? __assign(__assign(__assign({}, record), oldRecord), (_a = {}, _a[_dataIndex] = record[_dataIndex], _a)) : __assign(__assign({}, oldRecord), record);
             newDataSource.splice(realyIndex, 1, newRecord);
@@ -218,3 +231,42 @@ export function useScuRfresh() {
         getRefreshScuCell: getRefreshScuCell,
     };
 }
+// 选择相关控制
+export function useChoice(choiceMode, filterOptions, selectedRowOptions) {
+    if (choiceMode === void 0) { choiceMode = 'checkbox'; }
+    var isChoiceFilter = filterOptions.isChoiceFilter, choiceFilterHandle = filterOptions.choiceFilterHandle;
+    var selectedRowKeys = selectedRowOptions.selectedRowKeys, selectedRows = selectedRowOptions.selectedRows, onSelectedRowChange = selectedRowOptions.onSelectedRowChange, onSelect = selectedRowOptions.onSelect;
+    var rowSelection = useMemo(function () {
+        return {
+            type: choiceMode,
+            selectedRowKeys: selectedRowKeys,
+            onChange: function (selectedRowKeys, selectedRows) {
+                onSelectedRowChange &&
+                    onSelectedRowChange(selectedRowKeys, selectedRows);
+            },
+            onSelect: function (record, selected, selectedRows) {
+                onSelect && onSelect(record, selected, selectedRows);
+            },
+            // 过滤规则设置
+            getCheckboxProps: function (record) {
+                // 如果不开启过滤 那么全都可以选
+                if (!isChoiceFilter) {
+                    return {};
+                }
+                // 如果传入了过滤函数，那么如何过滤用户自定义
+                if (choiceFilterHandle) {
+                    return choiceFilterHandle(record, selectedRowKeys, selectedRows);
+                }
+            },
+        };
+    }, [
+        choiceMode,
+        isChoiceFilter,
+        choiceFilterHandle,
+        selectedRowKeys,
+        selectedRows,
+        onSelectedRowChange,
+        onSelect,
+    ]);
+    return { rowSelection: rowSelection };
+}

package/dist/components/ProTable/index.js

@@ -25,9 +25,9 @@ var __rest = (this && this.__rest) || function (s, e) {
  */
 import React, { memo, useRef, useImperativeHandle } from 'react';
 import { Table } from '../../index';
-import { useDataSourceRef, useAddAndDelRow, useScuRfresh, useMoveRow, useEditRow, } from './hooks';
+import { useDataSourceRef, useAddAndDelRow, useScuRfresh, useMoveRow, useEditRow, useChoice, } from './hooks';
 function ProEditTable(props) {
-    var rowKey = props.rowKey, dataSource = props.dataSource, columns = props.columns, onChange = props.onChange, showAddIcon = props.showAddIcon, showDelIcon = props.showDelIcon, _a = props.addDataMode, addDataMode = _a === void 0 ? 'blank' : _a, addDataReturnRecord = props.addDataReturnRecord, isMove = props.isMove, isEdit = props.isEdit, isPaste = props.isPaste, tableHandleRef = props.tableHandleRef, onBatchPastePre = props.onBatchPastePre, onBatchPastePost = props.onBatchPastePost, restProps = __rest(props, ["rowKey", "dataSource", "columns", "onChange", "showAddIcon", "showDelIcon", "addDataMode", "addDataReturnRecord", "isMove", "isEdit", "isPaste", "tableHandleRef", "onBatchPastePre", "onBatchPastePost"]);
+    var rowKey = props.rowKey, dataSource = props.dataSource, columns = props.columns, onChange = props.onChange, showAddIcon = props.showAddIcon, showDelIcon = props.showDelIcon, _a = props.addDataMode, addDataMode = _a === void 0 ? 'blank' : _a, addDataReturnRecord = props.addDataReturnRecord, isMove = props.isMove, isEdit = props.isEdit, isPaste = props.isPaste, tableHandleRef = props.tableHandleRef, onBatchPastePre = props.onBatchPastePre, onBatchPastePost = props.onBatchPastePost, isChoice = props.isChoice, choiceMode = props.choiceMode, isChoiceFilter = props.isChoiceFilter, choiceFilterHandle = props.choiceFilterHandle, selectedRowKeys = props.selectedRowKeys, selectedRows = props.selectedRows, onSelectedRowChange = props.onSelectedRowChange, onSelect = props.onSelect, restProps = __rest(props, ["rowKey", "dataSource", "columns", "onChange", "showAddIcon", "showDelIcon", "addDataMode", "addDataReturnRecord", "isMove", "isEdit", "isPaste", "tableHandleRef", "onBatchPastePre", "onBatchPastePost", "isChoice", "choiceMode", "isChoiceFilter", "choiceFilterHandle", "selectedRowKeys", "selectedRows", "onSelectedRowChange", "onSelect"]);
     var innerTableHandleRef = useRef();
     var tableColumns = columns.map(function (item) {
         if (item.shouldCellUpdate) {
@@ -54,6 +54,16 @@ function ProEditTable(props) {
         onBatchPastePre: onBatchPastePre,
         onBatchPastePost: onBatchPastePost,
     }), onEditableSaveHandle = _d.onEditableSaveHandle, onBatchPasteHandle = _d.onBatchPasteHandle;
+    // 选择行相关hook
+    var rowSelection = useChoice(choiceMode, {
+        isChoiceFilter: isChoiceFilter,
+        choiceFilterHandle: choiceFilterHandle,
+    }, {
+        selectedRowKeys: selectedRowKeys,
+        selectedRows: selectedRows,
+        onSelectedRowChange: onSelectedRowChange,
+        onSelect: onSelect,
+    }).rowSelection;
     useImperativeHandle(tableHandleRef, function () { return ({
         validate: innerTableHandleRef.current.validate,
         clearErrorClass: innerTableHandleRef.current.clearErrorClass,
@@ -61,6 +71,6 @@ function ProEditTable(props) {
         getRealyIndex: innerTableHandleRef.current.getRealyIndex,
         onEditableSaveHandle: onEditableSaveHandle,
     }); });
-    return (React.createElement(Table, __assign({ rowKey: rowKey, dataSource: dataSource, columns: tableColumns, hideAddIcon: !showAddIcon, hideDelIcon: !showDelIcon, onAddAndDelHandle: needAddAndDel ? onAddAndDelHandle : undefined, onMoveRow: isMove ? onMoveRowHandle : undefined, onEditableSave: isEdit ? onEditableSaveHandle : undefined, tableHandleRef: innerTableHandleRef, onTableChange: isPaste ? onBatchPasteHandle : undefined }, restProps)));
+    return (React.createElement(Table, __assign({ rowKey: rowKey, dataSource: dataSource, columns: tableColumns, hideAddIcon: !showAddIcon, hideDelIcon: !showDelIcon, onAddAndDelHandle: needAddAndDel ? onAddAndDelHandle : undefined, onMoveRow: isMove ? onMoveRowHandle : undefined, onEditableSave: isEdit ? onEditableSaveHandle : undefined, tableHandleRef: innerTableHandleRef, onTableChange: isPaste ? onBatchPasteHandle : undefined, rowSelection: isChoice ? rowSelection : undefined }, restProps)));
 }
 export default memo(ProEditTable);

package/dist/components/ProTable/interface.d.ts

@@ -29,6 +29,14 @@ export interface IProps<RecordType> extends Omit<TableIProps<RecordType>, 'colum
         currentIndex: number;
         endIndex?: number;
     }) => any[];
+    isChoice?: boolean;
+    choiceMode?: 'radio' | 'checkbox';
+    isChoiceFilter?: boolean;
+    choiceFilterHandle?: (record: any, selectedRowKeys: React.Key[], selectedRows: any[]) => any;
+    selectedRowKeys?: React.Key[];
+    selectedRows?: any[];
+    onSelectedRowChange?: (selectedRowKeys: React.Key[], selectedRows: any[]) => void;
+    onSelect?: (record: any, selected: boolean, selectedRows: any) => void;
     tableHandleRef?: React.Ref<{
         validate: () => Promise<any>;
         clearErrorClass: (index: number) => void;

package/dist/components/business/Footer/index.d.ts

@@ -26,6 +26,7 @@ interface IProps {
     footerDom?: IFooterDom[] | null;
     style?: React.CSSProperties;
     className?: string;
+    align?: 'left' | 'center' | 'right';
 }
 declare const _default: React.NamedExoticComponent<IProps>;
 export default _default;

package/dist/components/business/Footer/index.js

@@ -1,12 +1,26 @@
+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);
+};
 import React, { memo } from 'react';
 import { Pagination, Button, Layout, Dropdown } from '../../../index';
 var pageSizeOptions = ['10', '20', '30', '100'];
-var ZtFooter = Layout.Footer;
 var Footer = function (_a) {
-    var footerDom = _a.footerDom, style = _a.style, className = _a.className;
-    return (React.createElement(ZtFooter, { className: className
+    var footerDom = _a.footerDom, _b = _a.style, style = _b === void 0 ? {} : _b, className = _a.className, _c = _a.align, align = _c === void 0 ? 'left' : _c;
+    return (React.createElement(Layout.Footer, { className: className
             ? "footer hidden-print-footer " + className
-            : 'footer hidden-print-footer', style: style }, footerDom ? (React.createElement("div", { className: "footer__btn-group" }, footerDom.map(function (item, index) {
+            : 'footer hidden-print-footer', style: __assign({ justifyContent: align === 'left'
+                ? 'flex-start'
+                : align === 'center'
+                    ? 'center'
+                    : 'flex-end' }, style) }, footerDom ? (React.createElement("div", { className: "footer__btn-group" }, footerDom.map(function (item, index) {
         if (item.DOMType === 'button') {
             var type = item.type, loading = item.loading, disabled = item.disabled, onClick = item.onClick;
             return (React.createElement(Button, { key: index, type: type, loading: loading, disabled: disabled, onClick: onClick }, item.text));

package/dist/index.d.ts

@@ -15,6 +15,7 @@ export { default as Menu } from './components/Menu';
 export { default as Layout } from './components/Layout';
 export { default as Tabs } from './components/Tabs';
 export { default as Modal } from './components/Modal';
+export { default as ProModal } from './components/ProModal';
 export { default as Pagination } from './components/Pagination';
 export { default as Table } from './components/Table';
 export { default as ProTable } from './components/ProTable';

package/dist/index.js

@@ -143,6 +143,7 @@ export { default as Menu } from './components/Menu';
 export { default as Layout } from './components/Layout';
 export { default as Tabs } from './components/Tabs';
 export { default as Modal } from './components/Modal';
+export { default as ProModal } from './components/ProModal';
 export { default as Pagination } from './components/Pagination';
 export { default as Table } from './components/Table';
 export { default as ProTable } from './components/ProTable';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ztxkui",
-  "version": "4.3.26",
+  "version": "4.3.27",
   "private": false,
   "description": "React components library",
   "author": "zt-front-end",