zmdms-webui 2.4.5 → 2.4.7

package/dist/es/canvastable/hooks/useTableRender.js

@@ -789,6 +789,8 @@ var useTableRender = function (params) {
         if (onlyFixed === void 0) { onlyFixed = false; }
         ctx.strokeStyle = COLORS.border;
         ctx.lineWidth = 1;
+        // 计算实际数据行数（只绘制到有数据的地方）
+        var dataRowCount = processedDataSource.length;
         // 绘制表头底部边框（只在非fixed时绘制一次，使用2px更明显）
         if (!onlyFixed) {
             ctx.lineWidth = 1;
@@ -798,6 +800,8 @@ var useTableRender = function (params) {
             ctx.stroke();
             ctx.lineWidth = 1; // 恢复为1px
         }
+        // 计算实际数据区域的底部位置
+        var dataBottomY = Math.min(headerHeight + dataRowCount * rowHeight - scrollState.scrollTop, displayHeight);
         // 绘制垂直边框（只绘制body部分，从headerHeight开始，表头边框在drawHeaderCell中绘制）
         columnRenderInfos.forEach(function (info, colIndex) {
             var x = info.x, width = info.width, fixed = info.fixed, fixedLeft = info.fixedLeft;
@@ -814,7 +818,8 @@ var useTableRender = function (params) {
             if (drawX >= 0 && drawX <= displayWidth) {
                 ctx.beginPath();
                 ctx.moveTo(drawX, headerHeight);
-                ctx.lineTo(drawX, displayHeight);
+                // 只绘制到数据区域的底部，而不是整个容器高度
+                ctx.lineTo(drawX, dataBottomY);
                 ctx.stroke();
             }
         });
@@ -851,8 +856,8 @@ var useTableRender = function (params) {
                 });
             }
         };
-        // 绘制水平边框
-        for (var i = startRow; i <= endRow; i++) {
+        // 绘制水平边框（只绘制实际数据行的边框）
+        for (var i = startRow; i <= endRow && i <= dataRowCount; i++) {
             _loop_1(i);
         }
         // 为合并单元格绘制底部边框
@@ -1361,6 +1366,8 @@ var useTableRender = function (params) {
                 hoverRow: state.hoverRowIndex,
                 selection: state.cellSelection,
                 resizing: resizeState === null || resizeState === void 0 ? void 0 : resizeState.isResizing,
+                sortOrder: state.sortOrder,
+                sortField: state.sortField,
             });
             // 如果关键参数没有变化，跳过重绘
             if (lastRenderParamsRef.current === renderParamsHash) {

package/dist/es/electronsignatures/index.js

@@ -40,7 +40,7 @@ var ElectronSignatures = function (props) {
     // fmsIsElectronicSealPushLabel = '推送银行',
     _j = props.fmsIsElectronicSealPushLabel, 
     // fmsIsElectronicSealPushLabel = '推送银行',
-    fmsIsElectronicSealPushLabel = _j === void 0 ? "加盖银行签章" : _j, isSingleQj = props.isSingleQj, _k = props.isQjUseModal, isQjUseModal = _k === void 0 ? true : _k, defaultJustNeedQj = props.defaultJustNeedQj, isDeleteAllFileWhenJustUseQj = props.isDeleteAllFileWhenJustUseQj, _l = props.isShowQysWhenNeedNotQys, isShowQysWhenNeedNotQys = _l === void 0 ? true : _l, _m = props.isControlNeedQys, isControlNeedQys = _m === void 0 ? true : _m, isDeletePlaceholderFileData = props.isDeletePlaceholderFileData, caseId = props.caseId, resetProps = __rest(props, ["request", "isUnControlled", "contractNumFlowIds", "fileUploadProps", "isShowFileUpload", "otherOptions", "fileBaseUrl", "apiBaseUrl", "electronHandleRef", "onValueChange", "isValidateSuccess", "refreshCode", "onCheckedComparison", "onFileTypeChangeGetItem", "tableScroll", "getCreateTimeHand", "isShowElectronBatchBtn", "isShowDownloadBatchBtn", "isShowBatchDeleteBtn", "batchDownloadZipName", "isShowDoubleSignedBatchBtn", "isShowFileType", "isShowFileTypeMerge", "fmsIsElectronicSealLabel", "fmsIsElectronicSealPushLabel", "isSingleQj", "isQjUseModal", "defaultJustNeedQj", "isDeleteAllFileWhenJustUseQj", "isShowQysWhenNeedNotQys", "isControlNeedQys", "isDeletePlaceholderFileData", "caseId"]);
+    fmsIsElectronicSealPushLabel = _j === void 0 ? "加盖银行签章" : _j, isSingleQj = props.isSingleQj, _k = props.isQjUseModal, isQjUseModal = _k === void 0 ? true : _k, defaultJustNeedQj = props.defaultJustNeedQj, isDeleteAllFileWhenJustUseQj = props.isDeleteAllFileWhenJustUseQj, _l = props.isShowQysWhenNeedNotQys, isShowQysWhenNeedNotQys = _l === void 0 ? true : _l, _m = props.isControlNeedQys, isControlNeedQys = _m === void 0 ? true : _m, isDeletePlaceholderFileData = props.isDeletePlaceholderFileData, caseId = props.caseId, _o = props.needOrganizationId, needOrganizationId = _o === void 0 ? true : _o, resetProps = __rest(props, ["request", "isUnControlled", "contractNumFlowIds", "fileUploadProps", "isShowFileUpload", "otherOptions", "fileBaseUrl", "apiBaseUrl", "electronHandleRef", "onValueChange", "isValidateSuccess", "refreshCode", "onCheckedComparison", "onFileTypeChangeGetItem", "tableScroll", "getCreateTimeHand", "isShowElectronBatchBtn", "isShowDownloadBatchBtn", "isShowBatchDeleteBtn", "batchDownloadZipName", "isShowDoubleSignedBatchBtn", "isShowFileType", "isShowFileTypeMerge", "fmsIsElectronicSealLabel", "fmsIsElectronicSealPushLabel", "isSingleQj", "isQjUseModal", "defaultJustNeedQj", "isDeleteAllFileWhenJustUseQj", "isShowQysWhenNeedNotQys", "isControlNeedQys", "isDeletePlaceholderFileData", "caseId", "needOrganizationId"]);
     var selectRows = useRef(null);
     var onValueChange = useMemoizedFn(function (info) {
         _onValueChange && _onValueChange(info);
@@ -63,7 +63,7 @@ var ElectronSignatures = function (props) {
     // 获得部门信息
     var getDeptInfo = useCheckedSealInfoList$1(request).getDeptInfo;
     // 达观操作
-    var _o = useDg(request), compareHandle = _o.compareHandle, lookCompareHandle = _o.lookCompareHandle;
+    var _p = useDg(request), compareHandle = _p.compareHandle, lookCompareHandle = _p.lookCompareHandle;
     // 存储当前点击的选择比对模板的一些参数
     var dgInfoRef = useRef({});
     var myCompareHandle = useMemoizedFn(function (templateId) {
@@ -94,7 +94,7 @@ var ElectronSignatures = function (props) {
         });
     });
     // 基础地址
-    var _p = useBaseContext(), API_BASE_URL = _p.apiBaseUrl, FILE_BASE_URL = _p.fileBaseUrl;
+    var _q = useBaseContext(), API_BASE_URL = _q.apiBaseUrl, FILE_BASE_URL = _q.fileBaseUrl;
     var apiBaseUrl = _apiBaseUrl || API_BASE_URL;
     var fileBaseUrl = _fileBaseUrl || FILE_BASE_URL;
     // 将配置分级处理
@@ -122,16 +122,16 @@ var ElectronSignatures = function (props) {
         return ((resetProps === null || resetProps === void 0 ? void 0 : resetProps.canEdit) + "" === "1" || (resetProps === null || resetProps === void 0 ? void 0 : resetProps.canEdit) === true);
     }, [resetProps.canEdit]);
     // 表格是否处于loading中
-    var _q = useState(), loading = _q[0], setLoading = _q[1];
+    var _r = useState(), loading = _r[0], setLoading = _r[1];
     // 当前是否处于仅需要群杰印章的状态
-    var _r = useState(defaultJustNeedQj || false), justNeedQj = _r[0], setJustNeedQj = _r[1];
-    var _s = useState(""), organizationId = _s[0], setOrganizationId = _s[1];
+    var _s = useState(defaultJustNeedQj || false), justNeedQj = _s[0], setJustNeedQj = _s[1];
+    var _t = useState(""), organizationId = _t[0], setOrganizationId = _t[1];
     /**
      * 通过部门Id获得公司id
      */
     useEffect(function () {
         var _deptId = resetProps.deptId;
-        if (_deptId) {
+        if (_deptId && needOrganizationId) {
             // 调用接口
             getDeptInfo({
                 id: _deptId,
@@ -167,7 +167,7 @@ var ElectronSignatures = function (props) {
     var firstDataType = resetProps.dataType || dataTypeSort[0];
     // 记录下需要处理的所有数据
     // TODO: 定义allData 类型
-    var _t = useState({}), allData = _t[0], setAllData = _t[1];
+    var _u = useState({}), allData = _u[0], setAllData = _u[1];
     // 收集修改数据
     var onTrackChange = useMemoizedFn(function (dataType, data) {
         setAllData(function (preAllData) {
@@ -180,12 +180,12 @@ var ElectronSignatures = function (props) {
         });
     });
     // 合并数据（数据最终还是要在一个表格中显示）
-    var _u = useMergeRecords({
+    var _v = useMergeRecords({
         allData: allData,
         dataTypeSort: dataTypeSort,
         isDeleteAllFileWhenJustUseQj: isDeleteAllFileWhenJustUseQj,
         isDeletePlaceholderFileData: isDeletePlaceholderFileData,
-    }), mergeRecords = _u.mergeRecords, isHiddenColumns = _u.isHiddenColumns;
+    }), mergeRecords = _v.mergeRecords, isHiddenColumns = _v.isHiddenColumns;
     // 附件归属
     var fileTypeColumns = useFileTypeColumns({
         records: mergeRecords,
@@ -701,7 +701,7 @@ var ElectronSignatures = function (props) {
             });
         },
     }); }, []);
-    var _v = allData[firstDataType] || {}, sameTypeRecords = _v.records, setSameTypeRecords = _v.setRecords, parseCurrentUploadFile = _v.parseCurrentUploadFile;
+    var _w = allData[firstDataType] || {}, sameTypeRecords = _w.records, setSameTypeRecords = _w.setRecords, parseCurrentUploadFile = _w.parseCurrentUploadFile;
     function addFile(info, callback) {
         var _a;
         var file = info.file;

package/dist/es/electronsignatures/interface.d.ts

@@ -362,6 +362,10 @@ interface IElectronSignaturesProps extends IElectronSignaturesItem, IElectronSig
      * 表格的scroll配置
      */
     tableScroll?: any;
+    /**
+     * 是否需要获取公司id
+     */
+    needOrganizationId?: boolean;
 }
 /**
  * 群杰选中数据相关类型
@@ -412,18 +416,18 @@ interface IChangeValue {
     /** 经济责任人是否选中 */
     isCheckedEconomic?: boolean;
     /** 合同ID */
-    contractId?: IElectronSignaturesItem['contractId'];
+    contractId?: IElectronSignaturesItem["contractId"];
     /** 后台用于维护当前合同id下附件id(key)与文档id(value)的关系map 后台解绑文档时使用 */
-    docAttachMap?: IElectronSignaturesItem['docAttachMap'];
+    docAttachMap?: IElectronSignaturesItem["docAttachMap"];
     /** 文档id 列表 */
-    documentIdList?: IElectronSignaturesItem['documentIdList'];
+    documentIdList?: IElectronSignaturesItem["documentIdList"];
     /** 当前盖过章的附件列表 */
-    checkAttachIdList?: IElectronSignaturesItem['checkAttachIdList'];
+    checkAttachIdList?: IElectronSignaturesItem["checkAttachIdList"];
     fileList?: any;
     /** 当前群杰印章相关数据 */
-    qunjSeal?: IElectronSignaturesItem['qunjSeal'];
+    qunjSeal?: IElectronSignaturesItem["qunjSeal"];
     /** 当前群杰盖章地点发生改变 */
-    qunjAddress?: IElectronSignaturesItem['qunjAddress'];
+    qunjAddress?: IElectronSignaturesItem["qunjAddress"];
     /** 合同份数是否合理 */
     qunjCountIsValidate?: boolean;
 }
@@ -494,7 +498,7 @@ interface IFileUploadProps {
     onFileChange?: any;
     children?: React.ReactNode;
     multiple?: boolean;
-    type?: ButtonProps['type'];
+    type?: ButtonProps["type"];
 }
 
 export { IChangeValue, ICheckQunjItemProps, IElectronSignaturesItem, IElectronSignaturesItemPublic, IElectronSignaturesProps, IFileFieldsName, IFileItem, IFileUploadProps, IQunjProps };

package/dist/es/electronsignatures/interface.js

@@ -1,53 +1,53 @@
 var FILE_FIELDS_NAME = {
     /** 附件id */
-    attachId: 'attachId',
+    attachId: "attachId",
     /** 附件名 */
-    attachName: 'attachName',
+    attachName: "attachName",
     /** 上一版附件id */
-    oldVersionId: 'oldVersionId',
+    oldVersionId: "oldVersionId",
     /** 上一版附件名 */
-    oldVersionName: 'oldVersionName',
+    oldVersionName: "oldVersionName",
     /** 附件大小 bite */
-    attachSize: 'attachSize',
+    attachSize: "attachSize",
     /** 附件类型code */
-    attachType: 'attachType',
+    attachType: "attachType",
     /** 附件类型名 */
-    attachTypeName: 'attachTypeName',
+    attachTypeName: "attachTypeName",
     /** 是否存入样板 */
-    isCustomerReference: 'isCustomerReference',
+    isCustomerReference: "isCustomerReference",
     /** 模板附件id */
-    templateAttachId: 'templateAttachId',
+    templateAttachId: "templateAttachId",
     /** 模板附件名 */
-    templateAttachName: 'templateAttachName',
+    templateAttachName: "templateAttachName",
     /** 模板附件大小 */
-    templateAttachSize: 'templateAttachSize',
+    templateAttachSize: "templateAttachSize",
     /** 比对结果附件id */
-    compareAttachId: 'compareAttachId',
+    compareAttachId: "compareAttachId",
     /** 比对结果附件名 */
-    compareAttachName: 'compareAttachName',
+    compareAttachName: "compareAttachName",
     /** 比对结果附件大小 */
-    compareAttachSize: 'compareAttachSize',
+    compareAttachSize: "compareAttachSize",
     /** 是否添加水印 */
-    isWatermark: 'isWatermark',
+    isWatermark: "isWatermark",
     /** 是否加盖电子印章 */
-    isElectronicSeal: 'isElectronicSeal',
+    isElectronicSeal: "isElectronicSeal",
     /** 样板号 */
-    templateCrNo: 'templateCrNo',
+    templateCrNo: "templateCrNo",
     /** 外部客户产融平台电子印章 */
-    fmsIsElectronicSeal: 'fmsIsElectronicSeal',
+    fmsIsElectronicSeal: "fmsIsElectronicSeal",
     /** 是否展示外部客户产融平台电子印章勾选框 */
-    showFmsIsElectronicSeal: 'showFmsIsElectronicSeal',
-    showFmsIsPushBank: 'showFmsIsPushBank',
+    showFmsIsElectronicSeal: "showFmsIsElectronicSeal",
+    showFmsIsPushBank: "showFmsIsPushBank",
     /** 双签件 */
-    doubleSignedSealInfoDTOList: 'doubleSignedSealInfoDTOList',
+    doubleSignedSealInfoDTOList: "doubleSignedSealInfoDTOList",
     /** 是否推送银行 */
-    fmsIsPushBank: 'fmsIsPushBank',
+    fmsIsPushBank: "fmsIsPushBank",
     /** 是否添加群杰印章信息 */
-    isQunj: 'isQunj',
+    isQunj: "isQunj",
     /** 群杰印章盖章地点 */
-    qunjAddress: 'qunjAddress',
+    qunjAddress: "qunjAddress",
     /** 群杰印章信息 */
-    qunjSeal: 'qunjSeal',
+    qunjSeal: "qunjSeal",
 };
 
 export { FILE_FIELDS_NAME };

package/dist/es/table/utils.js

@@ -587,7 +587,7 @@ function sortRecords(_a) {
     }
     // 否则保持原样
     else {
-        result = __spreadArray([], records, true);
+        result = records;
     }
     return result;
 }
@@ -725,17 +725,6 @@ function sortByDimensions(records, dimensionKeys, order, columns) {
         // 如果有明确的排序配置，使用它
         sortConfig = { field: order.field, order: order.order };
     }
-    else {
-        // 如果没有明确排序，检查维度字段是否有自定义sorter，优先使用第一个有sorter的字段
-        for (var _i = 0, dimensionKeys_1 = dimensionKeys; _i < dimensionKeys_1.length; _i++) {
-            var dimensionKey = dimensionKeys_1[_i];
-            var column = findColumnByKey(dimensionKey);
-            if (column && typeof column.sorter === "function") {
-                sortConfig = { field: dimensionKey, order: "ascend" };
-                break; // 找到第一个有sorter的字段就使用，按维度顺序优先
-            }
-        }
-    }
     return groupByDimensionsHierarchical(records, dimensionKeys, 0, sortConfig);
 }
 /**

package/package.json

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