zmdms-webui 1.4.0 → 1.4.2

package/dist/es/table/components/EnhanceBodyCell.js

@@ -12,15 +12,22 @@ import { Popover } from 'antd';
 
 var EnhanceCell = function (props) {
     var _a, _b;
-    var record = props.record, propsIndex = props.index, editable = props.editable, editableConfig = props.editableConfig, dataIndex = props.dataIndex, title = props.title, onEditableSave = props.onEditableSave, dataSourceRef = props.dataSourceRef; props.onMouseEnter; props.onMouseLeave; var children = props.children, currentPage = props.currentPage, isValidate = props.isValidate, validate = props.validate, isRealTimeValidate = props.isRealTimeValidate, insertTableFromClipboard = props.insertTableFromClipboard, resetProps = __rest(props, ["record", "index", "editable", "editableConfig", "dataIndex", "title", "onEditableSave", "dataSourceRef", "onMouseEnter", "onMouseLeave", "children", "currentPage", "isValidate", "validate", "isRealTimeValidate", "insertTableFromClipboard"]);
+    var record = props.record, propsIndex = props.index, editable = props.editable, editableConfig = props.editableConfig, dataIndex = props.dataIndex, title = props.title, onEditableSave = props.onEditableSave, dataSourceRef = props.dataSourceRef; props.onMouseEnter; props.onMouseLeave; var children = props.children, currentPage = props.currentPage, isValidate = props.isValidate, validate = props.validate, isRealTimeValidate = props.isRealTimeValidate, insertTableFromClipboard = props.insertTableFromClipboard, filterConfigRef = props.filterConfigRef, __rowKey = props.__rowKey, resetProps = __rest(props, ["record", "index", "editable", "editableConfig", "dataIndex", "title", "onEditableSave", "dataSourceRef", "onMouseEnter", "onMouseLeave", "children", "currentPage", "isValidate", "validate", "isRealTimeValidate", "insertTableFromClipboard", "filterConfigRef", "__rowKey"]);
     // 当前单元格的类型
     var tdType = editableConfig === null || editableConfig === void 0 ? void 0 : editableConfig.type;
     // 设置最新的index
-    var index = getInnerIndex(currentPage, propsIndex);
+    var index = getInnerIndex(currentPage, propsIndex, {
+        filterConfigRef: filterConfigRef,
+        rowKey: __rowKey,
+        record: record,
+        dataSourceRef: dataSourceRef,
+    });
     // 最新的record
-    // const newRecord = dataSourceRef?.current?.[index] || record;
-    // TODO: 这里不能用之前的那种方式取值，因为如果采用过滤的模式，那么数据可能会错行
-    var newRecord = record || ((_a = dataSourceRef === null || dataSourceRef === void 0 ? void 0 : dataSourceRef.current) === null || _a === void 0 ? void 0 : _a[index]);
+    // 支持过滤模式。过滤模式时，必须要通过实际数据找索引。
+    var newRecord = ((_a = dataSourceRef === null || dataSourceRef === void 0 ? void 0 : dataSourceRef.current) === null || _a === void 0 ? void 0 : _a[index]) || record;
+    // TODO: 这里不能用之前的那种方式取值，因为如果采用过滤的模式，那么数据可能会错行。
+    // 20250114：用下面这种方式取值，如果是配置了scu的话，值就会有问题。
+    // const newRecord = record || dataSourceRef?.current?.[index];
     // 当前数据
     var _c = useState(newRecord ? newRecord[dataIndex] : undefined), val = _c[0], setVal = _c[1];
     var iptNumberRef = useRef();

package/dist/es/table/table.js

@@ -1,6 +1,6 @@
 import { __rest, __assign, __awaiter, __generator } from '../_virtual/_tslib.js';
 import { jsx, jsxs } from 'react/jsx-runtime';
-import { memo, useMemo, useCallback, useImperativeHandle } from 'react';
+import { memo, useRef, useMemo, useCallback, useImperativeHandle } from 'react';
 import { Table as Table$1 } from 'antd';
 import { BasicBodyRow, MoveBodyRow } from './components/EnhanceBodyRow.js';
 import EnhanceCell from './components/EnhanceBodyCell.js';
@@ -74,11 +74,14 @@ var Table = function (props) {
     }), paginationConfig = _r.paginationConfig, currentPage = _r.currentPage, setCurrent = _r.setCurrent, pageSize = _r.pageSize;
     // 内部表格编辑事件
     var onEditableSave = useEditChange(dataSourceRef, onTableChange);
+    // 记录表头过滤的一些配置（通过ref记录，key => filter） 复制整列、过滤后修改数据，需要先走过滤
+    var filterConfigRef = useRef({});
     // 内部表格拖拽事件
     var onRow = useMoveRowChange(dataSourceRef, onTableChange, {
         isMove: isMove,
         refreshScuCell: refreshScuCell,
         currentPage: currentPage,
+        filterConfigRef: filterConfigRef,
     }).onRow;
     // 内部表格新增删除事件
     var onAddAndDel = useAddAndDelChange(dataSourceRef, onTableChange, {
@@ -88,6 +91,7 @@ var Table = function (props) {
         refreshScuCell: refreshScuCell,
         isAddAndDelAuto: isAddAndDelAuto,
         currentPage: currentPage,
+        filterConfigRef: filterConfigRef,
     });
     // 处理列配置信息 得到新的列配置信息
     var newColumns = useColumns(columns, {
@@ -125,6 +129,7 @@ var Table = function (props) {
         // 是否隐藏某一列的增加按钮
         hiddenAddBtnHandleRef: hiddenAddBtnHandleRef,
         rowKey: props.rowKey,
+        filterConfigRef: filterConfigRef,
     }).newColumns;
     // 内部表格总结栏
     var getSummaryHandle = useSummary(summaryConfig, newColumns, {
@@ -210,9 +215,14 @@ var Table = function (props) {
     // 暴露给外部一些方法
     useImperativeHandle(tableRefHandle, function () {
         return {
-            /** 获取真实的索引，内部分页时使用 */
-            getRealyIndex: function (index) {
-                return getInnerIndex(currentPage, index);
+            /** 获取真实的索引，内部分页时使用 record的作用是过滤数据时，如果有修改数据。那么合格record就有 用处 */
+            getRealyIndex: function (index, record) {
+                return getInnerIndex(currentPage, index, {
+                    filterConfigRef: filterConfigRef,
+                    rowKey: resetProps.rowKey,
+                    record: record,
+                    dataSourceRef: dataSourceRef,
+                });
             },
             /** 获取当前表格的配置信息 */
             getDynamicList: function () {

package/dist/es/table/useColumns.js

@@ -1,7 +1,7 @@
 import { __assign, __spreadArray, __awaiter, __generator } from '../_virtual/_tslib.js';
 import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
 import { useRef } from 'react';
-import { getTableColumns, getFilterRecords, startColumnInsertTableData, parsePasteData } from './utils.js';
+import { getTableColumns, parsePasteData, getFilterRecords, startColumnInsertTableData } from './utils.js';
 import '../node_modules/classnames/index.js';
 import 'ahooks';
 import './components/EnhanceHeaderCell.js';
@@ -13,6 +13,7 @@ import PopoverIcon from './components/PopoverIcon.js';
 import FilterDropdown, { createFilterValue, filterHandle } from './components/FilterDropdown.js';
 import { PLACEHOLDER_NULL } from '../config/constant.js';
 import SearchOutlined from '../node_modules/@ant-design/icons/es/icons/SearchOutlined.js';
+import ModalComponent from '../modal/modal.js';
 
 // 处理columns
 // 根据传入的一些信息 重新生成新的columns配置
@@ -20,12 +21,12 @@ import SearchOutlined from '../node_modules/@ant-design/icons/es/icons/SearchOut
 function useColumns(columns, options) {
     var _this = this;
     var _a, _b;
-    var dynamicKey = options.dynamicKey, isRemeberFilter = options.isRemeberFilter, hiddenDynamicIcon = options.hiddenDynamicIcon, currentDynamicList = options.currentDynamicList, dataSource = options.dataSource, dataSourceRef = options.dataSourceRef, onEditableSave = options.onEditableSave, isEdit = options.isEdit, isAdd = options.isAdd, isTheadTitleAdd = options.isTheadTitleAdd, isDel = options.isDel, delPopTitle = options.delPopTitle, dynamicSettingRef = options.dynamicSettingRef, onCurrentListChange = options.onCurrentListChange, onAddAndDel = options.onAddAndDel, getRefreshScuCell = options.getRefreshScuCell, isDelAll = options.isDelAll, currentPage = options.currentPage, onTableChange = options.onTableChange, order = options.order, setOrder = options.setOrder, customSortHandle = options.customSortHandle, isResizableColumn = options.isResizableColumn, isResizableTitleEllipsis = options.isResizableTitleEllipsis, isRealTimeValidate = options.isRealTimeValidate, hiddenDelBtnHandleRef = options.hiddenDelBtnHandleRef, hiddenAddBtnHandleRef = options.hiddenAddBtnHandleRef, rowKey = options.rowKey;
+    var dynamicKey = options.dynamicKey, isRemeberFilter = options.isRemeberFilter, hiddenDynamicIcon = options.hiddenDynamicIcon, currentDynamicList = options.currentDynamicList, dataSource = options.dataSource, dataSourceRef = options.dataSourceRef, onEditableSave = options.onEditableSave, isEdit = options.isEdit, isAdd = options.isAdd, isTheadTitleAdd = options.isTheadTitleAdd, isDel = options.isDel, delPopTitle = options.delPopTitle, dynamicSettingRef = options.dynamicSettingRef, onCurrentListChange = options.onCurrentListChange, onAddAndDel = options.onAddAndDel, getRefreshScuCell = options.getRefreshScuCell, isDelAll = options.isDelAll, currentPage = options.currentPage, onTableChange = options.onTableChange, order = options.order, setOrder = options.setOrder, customSortHandle = options.customSortHandle, isResizableColumn = options.isResizableColumn, isResizableTitleEllipsis = options.isResizableTitleEllipsis, isRealTimeValidate = options.isRealTimeValidate, hiddenDelBtnHandleRef = options.hiddenDelBtnHandleRef, hiddenAddBtnHandleRef = options.hiddenAddBtnHandleRef, rowKey = options.rowKey, filterConfigRef = options.filterConfigRef;
     var newColumns = getTableColumns(columns, currentDynamicList).columns;
     // 表头过滤的一些配置（获取表头过滤的input的输入框的引用）
     var searchValueInputRef = useRef(null);
     // 记录表头过滤的一些配置（通过ref记录，key => filter） 复制整列时，需要先走过滤
-    var filterConfigRef = useRef({});
+    // const filterConfigRef = useRef<any>({});
     // 循环遍历 neColumns 根据一些内容进行处理
     var myNewColumns = [];
     var enhanceColumnHandle = function (_column, options) {
@@ -172,68 +173,96 @@ function useColumns(columns, options) {
          * @param index 开始的行索引
          */
         var insertTableFromClipboard = function (e, options) { return __awaiter(_this, void 0, void 0, function () {
-            var dataIndex, index, _a, isUpdate, verticalTextList, columns_1, column, filterDataSource, _b, pasteConfig, newDataSource, oldDataSource, err_1;
-            var _c, _d, _e;
-            return __generator(this, function (_f) {
-                switch (_f.label) {
+            var dataIndex, index, _a, isUpdate, _b, verticalTextList, text, isContinue_1, newDataSource_1, columns_1, column, filterDataSource, _c, pasteConfig, newDataSource, oldDataSource, err_1;
+            var _d, _e, _f, _g, _h, _j;
+            return __generator(this, function (_k) {
+                switch (_k.label) {
                     case 0:
                         dataIndex = _key;
                         index = options.index, _a = options.isUpdate, isUpdate = _a === void 0 ? true : _a;
-                        _f.label = 1;
+                        _k.label = 1;
                     case 1:
-                        _f.trys.push([1, 3, , 4]);
+                        _k.trys.push([1, 5, , 6]);
                         return [4 /*yield*/, parsePasteData(e, {
-                                maxRow: ((_c = currentPage === null || currentPage === void 0 ? void 0 : currentPage.current) === null || _c === void 0 ? void 0 : _c.pageSize)
-                                    ? ((_d = currentPage === null || currentPage === void 0 ? void 0 : currentPage.current) === null || _d === void 0 ? void 0 : _d.pageSize) - index
-                                    : ((_e = dataSourceRef.current) === null || _e === void 0 ? void 0 : _e.length) - index,
+                                maxRow: ((_d = currentPage === null || currentPage === void 0 ? void 0 : currentPage.current) === null || _d === void 0 ? void 0 : _d.pageSize)
+                                    ? ((_e = currentPage === null || currentPage === void 0 ? void 0 : currentPage.current) === null || _e === void 0 ? void 0 : _e.pageSize) - index
+                                    : ((_f = dataSourceRef.current) === null || _f === void 0 ? void 0 : _f.length) - index,
                             })];
                     case 2:
-                        verticalTextList = _f.sent();
-                        if (verticalTextList.length > 0) {
-                            // 阻止默认行为，接管粘贴操作
-                            e.preventDefault();
-                            columns_1 = newColumns;
-                            column = _column;
-                            filterDataSource = getFilterRecords(dataSourceRef.current, filterConfigRef.current);
-                            _b = startColumnInsertTableData({
-                                verticalTextList: verticalTextList,
-                                startColumn: column,
-                                columns: columns_1,
-                                startIndex: index,
-                                startDataIndex: dataIndex,
-                                rowKey: rowKey,
-                                realDataSource: dataSourceRef.current,
-                                currentDataSource: filterDataSource,
-                            }), pasteConfig = _b.pasteConfig, newDataSource = _b.newDataSource, oldDataSource = _b.oldDataSource;
-                            if (isUpdate) {
-                                onTableChange &&
-                                    onTableChange(newDataSource, oldDataSource, {
-                                        type: "paste",
-                                        pasteConfig: pasteConfig,
-                                        currentIndex: index,
-                                        field: dataIndex,
-                                    });
+                        _b = _k.sent(), verticalTextList = _b.verticalTextList, text = _b.text;
+                        if (!(verticalTextList.length > 0)) return [3 /*break*/, 4];
+                        isContinue_1 = true;
+                        return [4 /*yield*/, new Promise(function (resolve, reject) {
+                                ModalComponent.confirm({
+                                    title: "发现粘贴内容中有分隔符。请确认是否只将值填入当前输入框，还是执行扩展!",
+                                    okText: "确认扩展",
+                                    cancelText: "仅粘贴到当前输入框",
+                                    onOk: function () {
+                                        isContinue_1 = true;
+                                        resolve(1);
+                                    },
+                                    onCancel: function () {
+                                        isContinue_1 = false;
+                                        resolve(1);
+                                    },
+                                });
+                            })];
+                    case 3:
+                        _k.sent();
+                        if (!isContinue_1) {
+                            newDataSource_1 = (_j = (_h = (_g = dataSourceRef.current) === null || _g === void 0 ? void 0 : _g.slice) === null || _h === void 0 ? void 0 : _h.call(_g)) === null || _j === void 0 ? void 0 : _j.map(function (item) { return (__assign({}, item)); });
+                            if (newDataSource_1 && newDataSource_1[index]) {
+                                newDataSource_1[index][dataIndex] = text;
                             }
                             return [2 /*return*/, {
-                                    newDataSource: newDataSource,
-                                    oldDataSource: oldDataSource,
-                                    pasteConfig: pasteConfig,
+                                    newDataSource: newDataSource_1,
+                                    oldDataSource: dataSourceRef.current,
+                                    pasteConfig: {},
                                 }];
                         }
+                        // 阻止默认行为，接管粘贴操作
+                        e.preventDefault();
+                        columns_1 = newColumns;
+                        column = _column;
+                        filterDataSource = getFilterRecords(dataSourceRef.current, filterConfigRef.current);
+                        _c = startColumnInsertTableData({
+                            verticalTextList: verticalTextList,
+                            startColumn: column,
+                            columns: columns_1,
+                            startIndex: index,
+                            startDataIndex: dataIndex,
+                            rowKey: rowKey,
+                            realDataSource: dataSourceRef.current,
+                            currentDataSource: filterDataSource,
+                        }), pasteConfig = _c.pasteConfig, newDataSource = _c.newDataSource, oldDataSource = _c.oldDataSource;
+                        if (isUpdate) {
+                            onTableChange &&
+                                onTableChange(newDataSource, oldDataSource, {
+                                    type: "paste",
+                                    pasteConfig: pasteConfig,
+                                    currentIndex: index,
+                                    field: dataIndex,
+                                });
+                        }
                         return [2 /*return*/, {
-                                newDataSource: dataSourceRef.current,
-                                oldDataSource: dataSourceRef.current,
-                                pasteConfig: {},
+                                newDataSource: newDataSource,
+                                oldDataSource: oldDataSource,
+                                pasteConfig: pasteConfig,
                             }];
-                    case 3:
-                        err_1 = _f.sent();
+                    case 4: return [2 /*return*/, {
+                            newDataSource: dataSourceRef.current,
+                            oldDataSource: dataSourceRef.current,
+                            pasteConfig: {},
+                        }];
+                    case 5:
+                        err_1 = _k.sent();
                         console.log("粘贴事件内部错误", err_1);
                         return [2 /*return*/, {
                                 newDataSource: dataSourceRef.current,
                                 oldDataSource: dataSourceRef.current,
                                 pasteConfig: {},
                             }];
-                    case 4: return [2 /*return*/];
+                    case 6: return [2 /*return*/];
                 }
             });
         }); };
@@ -243,7 +272,7 @@ function useColumns(columns, options) {
             var _onCell_1 = _column.onCell;
             _column.onCell = function (record, index) {
                 var result = _onCell_1 ? _onCell_1(record, index) : {};
-                return __assign({ record: record, index: index, editable: editable, editableConfig: editableConfig, dataIndex: _key, title: title, onEditableSave: onEditableSave, currentPage: currentPage, isValidate: validate ? true : false, dataSourceRef: dataSourceRef, validate: validate, isRealTimeValidate: isRealTimeValidate, insertTableFromClipboard: insertTableFromClipboard }, result);
+                return __assign({ record: record, index: index, editable: editable, editableConfig: editableConfig, dataIndex: _key, title: title, onEditableSave: onEditableSave, currentPage: currentPage, isValidate: validate ? true : false, dataSourceRef: dataSourceRef, validate: validate, isRealTimeValidate: isRealTimeValidate, insertTableFromClipboard: insertTableFromClipboard, filterConfigRef: filterConfigRef, __rowKey: rowKey }, result);
             };
         }
         // 处理配置了scu的相关逻辑

package/dist/es/table/useInnerPagination.js

@@ -1,8 +1,45 @@
 import { __assign } from '../_virtual/_tslib.js';
 import { useRef, useState, useEffect, useMemo } from 'react';
 
+// 是否有过滤数据
+function isFilterData(filterConfigRef) {
+    try {
+        if (!(filterConfigRef === null || filterConfigRef === void 0 ? void 0 : filterConfigRef.current)) {
+            return false;
+        }
+        var filterConfig = filterConfigRef.current;
+        var keys = Object.keys(filterConfig);
+        if (keys.length === 0) {
+            return false;
+        }
+        for (var i = 0; i < keys.length; i++) {
+            var key = keys[i];
+            var value = filterConfig[key];
+            if (Array.isArray(value) && value.length > 0) {
+                return true;
+            }
+        }
+        return false;
+    }
+    catch (err) {
+        return false;
+    }
+}
 // 获取内部当前索引位置
-function getInnerIndex(currentPage, index) {
+function getInnerIndex(currentPage, index, options) {
+    var _a = options || {}, filterConfigRef = _a.filterConfigRef, rowKey = _a.rowKey, record = _a.record, dataSourceRef = _a.dataSourceRef;
+    if (isFilterData(filterConfigRef) && record && rowKey) {
+        try {
+            var parseRowKey_1 = typeof rowKey === "string" ? rowKey : rowKey(record);
+            var rowKeyValue_1 = record[parseRowKey_1];
+            return dataSourceRef.current.findIndex(function (item) {
+                return item[parseRowKey_1] === rowKeyValue_1;
+            });
+        }
+        catch (err) {
+            console.error(err);
+        }
+    }
     // 得到当前修改索引相对于 整体数据源 的索引
     var currentPageObj = currentPage === null || currentPage === void 0 ? void 0 : currentPage.current;
     if (!currentPageObj) {

package/dist/es/table/utils.js

@@ -261,10 +261,16 @@ function parsePasteData(e, options) {
                         // 如果只有一个数据，并且没有横向的分隔符。说明就是单纯的复制，不需要后续处理
                         if (verticalTextList.length === 1 &&
                             verticalTextList[0].indexOf("\t") === -1) {
-                            return [2 /*return*/, []];
+                            return [2 /*return*/, {
+                                    text: text,
+                                    verticalTextList: [],
+                                }];
                         }
                     }
-                    return [2 /*return*/, verticalTextList];
+                    return [2 /*return*/, {
+                            text: text,
+                            verticalTextList: verticalTextList,
+                        }];
             }
         });
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zmdms-webui",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "private": false,
   "main": "dist/index.es.js",
   "module": "dist/index.es.js",