ztxkui 4.2.23-2 → 4.2.23-21

package/dist/components/ProModal/index.js

@@ -0,0 +1,80 @@
+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) {
+    // 属性提取
+    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

@@ -0,0 +1,28 @@
+/// <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;
+    onAddAndDelHandle: (type: 'add' | 'del', index: number) => void;
+};
+export declare function useMoveRow(onChange: any, dataSourceRef: any, refreshScuCell: any): (dragIndex: number, hoverIndex: number) => void;
+export declare function useEditRow(onChange: any, dataSourceRef: any, innerTableHandleRef: any, { onBatchPastePre, onBatchPastePost }: {
+    onBatchPastePre: any;
+    onBatchPastePost: any;
+}): {
+    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

@@ -0,0 +1,272 @@
+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 __spreadArray = (this && this.__spreadArray) || function (to, from) {
+    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
+        to[j] = from[i];
+    return to;
+};
+import { useRef, useEffect, useMemo, useCallback } from 'react';
+import update from 'immutability-helper';
+// 设置数据源临时Ref对象
+export function useDataSourceRef(dataSource) {
+    var dataSourceRef = useRef(dataSource);
+    useEffect(function () {
+        dataSourceRef.current = dataSource;
+    }, [dataSource]);
+    return dataSourceRef;
+}
+// 加减行相关
+export function useAddAndDelRow(showAddIcon, showDelIcon, dataSourceRef, addDataMode, addDataReturnRecord, onChange, rowKey, refreshScuCell) {
+    var needAddAndDel = useMemo(function () {
+        return showAddIcon || showDelIcon;
+    }, [showAddIcon, showDelIcon]);
+    // 增减行回调
+    var onAddAndDelHandle = useCallback(function (type, index) {
+        var _a, _b;
+        if (typeof addDataMode === 'function') {
+            var newDataSource_1 = addDataMode(index, dataSourceRef.current, type);
+            refreshScuCell();
+            onChange &&
+                onChange(newDataSource_1, {
+                    currentIndex: index,
+                    type: type,
+                });
+            return;
+        }
+        var newDataSource = __spreadArray([], dataSourceRef.current);
+        var newRecord = {};
+        if (type === 'add') {
+            var currentRecord = newDataSource[index];
+            var outsideRecord = addDataReturnRecord
+                ? addDataReturnRecord(currentRecord)
+                : {};
+            if (addDataMode === 'blank') {
+                // 生成一条空白数据
+                newRecord = __assign((_a = {}, _a[rowKey] = Date.now() + "-" + index, _a.__INNER__ADD__DATA = true, _a), outsideRecord);
+            }
+            else {
+                // 复制当前这条数据
+                newRecord = __assign(__assign(__assign({}, currentRecord), (_b = {}, _b[rowKey] = Date.now() + "-" + index, _b.__INNER__ADD__DATA = true, _b)), outsideRecord);
+            }
+            newDataSource.splice(index + 1, 0, newRecord);
+        }
+        else {
+            newDataSource.splice(index, 1);
+        }
+        refreshScuCell();
+        onChange &&
+            onChange(newDataSource, {
+                currentIndex: index,
+                type: type,
+            });
+    }, [
+        addDataMode,
+        onChange,
+        dataSourceRef,
+        rowKey,
+        refreshScuCell,
+        addDataReturnRecord,
+    ]);
+    return {
+        needAddAndDel: needAddAndDel,
+        onAddAndDelHandle: onAddAndDelHandle,
+    };
+}
+// 拖拽行相关
+export function useMoveRow(onChange, dataSourceRef, refreshScuCell) {
+    var onMoveRowHandle = useCallback(function (dragIndex, hoverIndex) {
+        var copyDataSource = __spreadArray([], dataSourceRef.current);
+        var dragRow = copyDataSource[dragIndex];
+        var newDataSource = update(copyDataSource, {
+            $splice: [
+                [dragIndex, 1],
+                [hoverIndex, 0, dragRow],
+            ],
+        });
+        refreshScuCell();
+        onChange &&
+            onChange(newDataSource, {
+                currentIndex: dragIndex,
+                targetIndex: hoverIndex,
+                type: 'move',
+            });
+    }, [onChange, dataSourceRef, refreshScuCell]);
+    return onMoveRowHandle;
+}
+// 编辑行相关
+function objIsEqual(newObj, oldObj) {
+    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;
+    }
+}
+export function useEditRow(onChange, dataSourceRef, innerTableHandleRef, _a) {
+    var onBatchPastePre = _a.onBatchPastePre, onBatchPastePost = _a.onBatchPastePost;
+    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 = 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
+            // 这里主要是为了优化物料组件带来的多次rerender导致的一些问题
+            if (objIsEqual(record, oldRecord)) {
+                return;
+            }
+            // TODO:清楚错误样式
+            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);
+            onChange &&
+                onChange(newDataSource, {
+                    currentIndex: realyIndex,
+                    type: 'edit',
+                });
+        }
+    }, [dataSourceRef, onChange, innerTableHandleRef]);
+    var onBatchPasteHandle = useCallback(function (records, startIndex) {
+        if (!Array.isArray(records)) {
+            return;
+        }
+        // 前置处理
+        var pasteRecords = onBatchPastePre
+            ? onBatchPastePre(records, {
+                currentIndex: startIndex,
+            })
+            : records;
+        // 计算结束位置
+        var endIndex = startIndex + pasteRecords.length - 1;
+        var currentRecords = Array.isArray(dataSourceRef.current)
+            ? dataSourceRef.current.slice()
+            : [];
+        if (endIndex > currentRecords.length - 1) {
+            endIndex = currentRecords.length - 1;
+        }
+        // 从开始位置开始，替换对应的值
+        var currentIndex = 0;
+        var dataSource = currentRecords.map(function (record, index) {
+            if (index >= startIndex && index <= endIndex) {
+                var obj = __assign(__assign({}, record), pasteRecords[currentIndex]);
+                currentIndex++;
+                return obj;
+            }
+            return record;
+        });
+        // 后置处理
+        var newDataSource = onBatchPastePost
+            ? onBatchPastePost(dataSource, {
+                currentIndex: startIndex,
+                endIndex: endIndex,
+            })
+            : dataSource;
+        // 触发onChange事件
+        onChange &&
+            onChange(newDataSource, {
+                currentIndex: startIndex,
+                endIndex: endIndex,
+                type: 'paste',
+            });
+    }, [dataSourceRef, onChange, onBatchPastePre, onBatchPastePost]);
+    return {
+        onEditableSaveHandle: onEditableSaveHandle,
+        onBatchPasteHandle: onBatchPasteHandle,
+    };
+}
+// SCU刷新逻辑
+// 这么写的原因是 如果拖拽行 增减行后，并不能触发column的scu
+// 之前的写法是，通过useState刷新。但是 setState会触发整个组件的刷新
+// 设置数据后，本身会触发setState。导致执行两次rerender。每个单元格都会执行rerender
+// 通过Ref并不会触发 setState 通过setTimeout也不会导致每一个单元格的刷新出现问题
+export function useScuRfresh() {
+    var timeOutRef = useRef(null);
+    var tableSCURefreshRef = useRef();
+    var refreshScuCell = useCallback(function () {
+        tableSCURefreshRef.current = true;
+    }, []);
+    var getRefreshScuCell = useCallback(function () {
+        if (tableSCURefreshRef.current) {
+            if (timeOutRef.current) {
+                clearTimeout(timeOutRef.current);
+                timeOutRef.current = null;
+            }
+            timeOutRef.current = setTimeout(function () {
+                tableSCURefreshRef.current = false;
+            });
+            return true;
+        }
+        return false;
+    }, []);
+    return {
+        refreshScuCell: refreshScuCell,
+        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.d.ts

@@ -0,0 +1,8 @@
+/**
+ * 业务封装可编辑表格组件
+ */
+import React from 'react';
+import { IProps } from './interface';
+declare function ProEditTable(props: IProps<any>): JSX.Element;
+declare const _default: React.MemoExoticComponent<typeof ProEditTable>;
+export default _default;

package/dist/components/ProTable/index.js

@@ -0,0 +1,76 @@
+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, useRef, useImperativeHandle } from 'react';
+import { Table } from '../../index';
+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, 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) {
+            var fn_1 = item.shouldCellUpdate;
+            item.shouldCellUpdate = function (record, preRecord) {
+                if (getRefreshScuCell()) {
+                    return true;
+                }
+                return fn_1(record, preRecord);
+            };
+        }
+        return item;
+    });
+    // 保存dataSource值存为Ref
+    var dataSourceRef = useDataSourceRef(dataSource);
+    // SCU逻辑
+    var _b = useScuRfresh(), refreshScuCell = _b.refreshScuCell, getRefreshScuCell = _b.getRefreshScuCell;
+    // 增减行相关hook
+    var _c = useAddAndDelRow(showAddIcon, showDelIcon, dataSourceRef, addDataMode, addDataReturnRecord, onChange, rowKey, refreshScuCell), needAddAndDel = _c.needAddAndDel, onAddAndDelHandle = _c.onAddAndDelHandle;
+    // 拖拽行相关hook
+    var onMoveRowHandle = useMoveRow(onChange, dataSourceRef, refreshScuCell);
+    // 修改行相关hook
+    var _d = useEditRow(onChange, dataSourceRef, innerTableHandleRef, {
+        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,
+        getCurrentPage: innerTableHandleRef.current.getCurrentPage,
+        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, rowSelection: isChoice ? rowSelection : undefined }, restProps)));
+}
+export default memo(ProEditTable);

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

@@ -0,0 +1,51 @@
+/// <reference types="react" />
+import { ColumnsType } from '../../components/Table';
+import { IProps as TableIProps } from '../../components/Table/table';
+export interface IProps<RecordType> extends Omit<TableIProps<RecordType>, 'columns' | 'onChange' | 'onEditableSave'> {
+    dataSource: any[];
+    columns: ColumnsType<any>;
+    rowKey: string;
+    onChange?: (dataSource: any[], info?: {
+        currentIndex: number;
+        endIndex?: number;
+        targetIndex?: number;
+        type?: string;
+    }) => void;
+    showAddIcon?: boolean;
+    showDelIcon?: boolean;
+    /**
+     * 增加数据的模式 blank add空白数据; copy add复制数据; 自定义增加
+     */
+    addDataMode?: 'blank' | 'copy' | ((index: number, dataSource: any[], type: string) => any[]);
+    addDataReturnRecord?: (record: any) => any;
+    isMove?: boolean;
+    isEdit?: boolean;
+    isPaste?: boolean;
+    onBatchPastePre?: (data: any[], info?: {
+        currentIndex: number;
+        endIndex?: number;
+    }) => any[];
+    onBatchPastePost?: (data: any[], info?: {
+        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;
+        getCurrentPage: () => {
+            page: number;
+            pageSize: number;
+        } | null;
+        getRealyIndex: (index: number) => number;
+        onEditableSaveHandle: (record: any, index: number | undefined, _dataIndex: string) => void;
+        [prop: string]: any;
+    }>;
+}

package/dist/components/ProTable/interface.js

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

package/dist/components/Table/hooks/useColumns.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import { ColumnsType } from '../';
 export interface IConfigInfo {
     [props: string]: {
@@ -9,6 +8,7 @@ export interface IConfigInfo {
 }
 interface IProps<RecordType> {
     columns: ColumnsType<RecordType> | undefined;
+    hiddenColumnDynamicIcon?: boolean;
     showColumnDynamic?: boolean;
     showColumnDynamicKey?: string;
     /**新增行删除行方法 */
@@ -39,8 +39,8 @@ export declare const LOCALSTORAGE_LRU_KEY = "ztui_dynamic_table_lru_key";
 export declare const LOCALSTORAGE_LRU_MAX_SIZE = 500;
 export declare function setDynamicKey(dynamicStorageKey: string, value: any): void;
 declare function useColumns<RecordType>(props: IProps<RecordType>): {
-    newColumns: any;
-    dynamicColumns: any;
-    setNewColumns: React.Dispatch<any>;
+    newColumns: ColumnsType<RecordType>;
+    dynamicColumns: ColumnsType<RecordType>;
+    refreshColumnsHandle: (columns?: any) => void;
 };
 export default useColumns;