ztxkui 4.2.23-346-beta → 4.2.23-348-beta

package/dist/components/Table/table.js

@@ -238,6 +238,21 @@ function Table(props) {
                 if (!isNaN(result)) {
                     return result;
                 }
+                if (typeof a[field_1] === 'string' && typeof b[field_1] === 'string') {
+                    // 先按文件名主体部分排序（不包括扩展名）
+                    var nameAWithoutExt = a[field_1].split('.')[0];
+                    var nameBWithoutExt = b[field_1].split('.')[0];
+                    var result_1 = nameAWithoutExt.localeCompare(nameBWithoutExt);
+                    if (result_1 === 0) {
+                        // 如果文件名主体相同，再按扩展名排序（如果有扩展名）
+                        var extA = a[field_1].split('.').length > 1 ? a[field_1].split('.')[1] : '';
+                        var extB = a[field_1].split('.').length > 1 ? b[field_1].split('.')[1] : '';
+                        if (extA || extB) {
+                            return extA.localeCompare(extB);
+                        }
+                    }
+                    return result_1;
+                }
                 if (a[field_1] < b[field_1]) {
                     return -1;
                 }

package/dist/components/WorkflowPrintContainer/component/ProcessDetail.js

@@ -1,9 +1,9 @@
-import React, { memo, useState, useEffect, useCallback, Suspense } from 'react';
+import React, { memo, useState, useEffect, Suspense } from 'react';
 import { Tabs } from 'antd';
 import AssociationList from './association';
 import TrailList from './trail';
 import SendAroundList from './send';
-import { fetchAttachList, fetchPreviewData } from '../service';
+import { fetchAttachList } from '../service';
 import Collapse from '../../Collapse';
 import ZtUpload from './Upload';
 import Gragh from './Gragh/Gragh';
@@ -31,21 +31,8 @@ var ProcessDetail = function (_a) {
     var originFileList = [];
     var _f = useState(originFileList), fileList = _f[0], setFileList = _f[1];
     var _g = useState(0), sendTotal = _g[0], setSendTotal = _g[1];
-    var _h = useState(1), attentionType = _h[0], setAttentionType = _h[1];
-    var _j = useState(1), attentionRefresh = _j[0], setAttentionRefresh = _j[1];
-    var _k = useState(1), associationRefresh = _k[0], setAssociationRefresh = _k[1];
-    var _l = useState(false), attentionLoading = _l[0], setAttentionLoading = _l[1];
-    var _m = useState(false), isAttentionModalVisible = _m[0], setIsAttentionModalVisible = _m[1];
-    var _o = useState(320), iframeHeight = _o[0], setIframeHeight = _o[1];
-    var _p = useState(''), queryId = _p[0], setQueryId = _p[1];
-    var _q = useState(''), queryCode = _q[0], setQueryCode = _q[1];
-    var _r = useState(0), refreshContacts = _r[0], setRefreshContacts = _r[1];
-    var _s = useState(false), isAssocitionModalVisible = _s[0], setIsAssocitionModalVisible = _s[1];
-    var onCloseAssocitionModalHandle = useCallback(function () { return setIsAssocitionModalVisible(false); }, []);
-    var onRefreshAssocitionModalHandle = useCallback(function () { return setAssociationRefresh(associationRefresh + 1); }, [associationRefresh]);
-    var callRefreshContacts = function () {
-        setRefreshContacts(function (value) { return value + 1; });
-    };
+    var attentionRefresh = 1;
+    var associationRefresh = 1;
     useEffect(function () {
         if (Array.isArray(attachData)) {
             var attachList_1 = [];
@@ -80,9 +67,6 @@ var ProcessDetail = function (_a) {
         }
         getAttachIds && getAttachIds(uids);
     }, [fileList, getAttachIds]);
-    function handleCancelAttention() {
-        setIsAttentionModalVisible(false);
-    }
     /**附件数据获取 */
     useEffect(function () {
         if (data === null || data === void 0 ? void 0 : data.processInstId) {
@@ -95,57 +79,6 @@ var ProcessDetail = function (_a) {
             });
         }
     }, [data === null || data === void 0 ? void 0 : data.processInstId, type, data === null || data === void 0 ? void 0 : data.id, request]);
-    /**
-     * 预览附件回调
-     */
-    var onPreviewCallback = useCallback(function (file) {
-        fetchPreviewData({
-            params: { id: file.fileId },
-        });
-        return true;
-    }, []);
-    function showAttentionModal() {
-        setRefreshContacts(function (value) { return value + 1; });
-        setQueryId(data === null || data === void 0 ? void 0 : data.processInstId);
-        setQueryCode('ATTENTION');
-        setIsAttentionModalVisible(true);
-    }
-    var _t = useState([]), targetKeys = _t[0], setTargetKeys = _t[1];
-    var _u = useState([]), empKeys = _u[0], setEmpKeys = _u[1];
-    var onTargetKeys = useCallback(function (empKeys, selectPerson) {
-        setEmpKeys(empKeys);
-        setTargetKeys(selectPerson);
-    }, [setEmpKeys, setTargetKeys]);
-    function swapColumns(parentName, columnIndexA, columnIndexB, header) {
-        var _a;
-        if (header === void 0) { header = false; }
-        var parent = document === null || document === void 0 ? void 0 : document.querySelector("." + parentName);
-        var table = parent === null || parent === void 0 ? void 0 : parent.querySelector('table');
-        if (table instanceof HTMLTableElement) {
-            if (header) {
-                for (var i = 0; i < 1; i++) {
-                    var row = table === null || table === void 0 ? void 0 : table.rows[i];
-                    if (row.cells.length > columnIndexA &&
-                        row.cells.length > columnIndexB) {
-                        var temp = row.cells[columnIndexA];
-                        row.insertBefore(row.cells[columnIndexB], row.cells[columnIndexA]);
-                        row.insertBefore(temp, row.cells[columnIndexB + 1]);
-                    }
-                }
-            }
-            else {
-                for (var i = 1; i < ((_a = table === null || table === void 0 ? void 0 : table.rows) === null || _a === void 0 ? void 0 : _a.length); i++) {
-                    var row = table === null || table === void 0 ? void 0 : table.rows[i];
-                    if (row.cells.length > columnIndexA &&
-                        row.cells.length > columnIndexB) {
-                        var temp = row.cells[columnIndexA];
-                        row.insertBefore(row.cells[columnIndexB], row.cells[columnIndexA]);
-                        row.insertBefore(temp, row.cells[columnIndexB + 1]);
-                    }
-                }
-            }
-        }
-    }
     // 不修改附件组件的情况下更改其文件名的默认宽度
     useEffect(function () {
         // 获取第一个class为'flow-attachment'的元素
@@ -227,12 +160,12 @@ var ProcessDetail = function (_a) {
                                 (data === null || data === void 0 ? void 0 : data.status) === 7 ||
                                 (data === null || data === void 0 ? void 0 : data.status) === 7 ? (React.createElement(TabPane, { tab: "\u5269\u4F59\u5BA1\u6279\u73AF\u8282", key: "2" },
                                 React.createElement("div", { style: { paddingTop: '10px', paddingBottom: '10px' } },
-                                    React.createElement(PreviewList, { request: request, processInstId: data === null || data === void 0 ? void 0 : data.processInstId, taskId: data === null || data === void 0 ? void 0 : data.id, refresh: attentionRefresh, callRefreshContacts: callRefreshContacts, disable: approve !== 'approve' || (data === null || data === void 0 ? void 0 : data.status) !== 0 })))) : (React.createElement(TabPane, { tab: "\u5168\u90E8\u5BA1\u6279\u73AF\u8282\u9884\u6F14", key: "2" },
+                                    React.createElement(PreviewList, { request: request, processInstId: data === null || data === void 0 ? void 0 : data.processInstId, taskId: data === null || data === void 0 ? void 0 : data.id, refresh: attentionRefresh, disable: approve !== 'approve' || (data === null || data === void 0 ? void 0 : data.status) !== 0 })))) : (React.createElement(TabPane, { tab: "\u5168\u90E8\u5BA1\u6279\u73AF\u8282\u9884\u6F14", key: "2" },
                                 React.createElement("div", { style: { paddingTop: '10px', paddingBottom: '10px' } },
-                                    React.createElement(PreviewList, { request: request, processInstId: data === null || data === void 0 ? void 0 : data.processInstId, taskId: data === null || data === void 0 ? void 0 : data.id, refresh: attentionRefresh, callRefreshContacts: callRefreshContacts, disable: approve !== 'approve' || (data === null || data === void 0 ? void 0 : data.status) !== 0 })))))),
+                                    React.createElement(PreviewList, { request: request, processInstId: data === null || data === void 0 ? void 0 : data.processInstId, taskId: data === null || data === void 0 ? void 0 : data.id, refresh: attentionRefresh, disable: approve !== 'approve' || (data === null || data === void 0 ? void 0 : data.status) !== 0 })))))),
                     React.createElement(Panel, { header: "\u81EA\u52A8\u6284\u9001", key: "3" },
                         React.createElement("div", { style: { paddingTop: '10px', paddingBottom: '10px' } },
-                            React.createElement(AttentionList, { request: request, processInstId: data === null || data === void 0 ? void 0 : data.processInstId, refresh: attentionRefresh, callRefreshContacts: callRefreshContacts, disable: approve !== 'approve' || (data === null || data === void 0 ? void 0 : data.status) !== 0 }))),
+                            React.createElement(AttentionList, { request: request, processInstId: data === null || data === void 0 ? void 0 : data.processInstId, refresh: attentionRefresh, disable: approve !== 'approve' || (data === null || data === void 0 ? void 0 : data.status) !== 0 }))),
                     React.createElement(Panel, { header: "\u6D41\u7A0B\u64CD\u4F5C", key: "4" },
                         React.createElement("div", { style: { paddingTop: '10px', paddingBottom: '10px' } },
                             React.createElement(AuditList, { request: request, processInstId: data === null || data === void 0 ? void 0 : data.processInstId })))))))));

package/dist/components/WorkflowPrintContainer/component/Upload/index.js

@@ -27,7 +27,7 @@ import { fetchAttachList } from '../../service';
 var ZtUpload = function (_a) {
     var request = _a.request, _b = _a.showTable, showTable = _b === void 0 ? true : _b, showUploadBtn = _a.showUploadBtn, showDownloadBtn = _a.showDownloadBtn, showAllDownloadBtn = _a.showAllDownloadBtn, showPreviewBtn = _a.showPreviewBtn, taskId = _a.taskId, showDeleteBtn = _a.showDeleteBtn, processInstId = _a.processInstId, isAutoDelete = _a.isAutoDelete, fileList = _a.fileList, callback = _a.callback, onDeleteCallback = _a.onDeleteCallback, restProps = __rest(_a, ["request", "showTable", "showUploadBtn", "showDownloadBtn", "showAllDownloadBtn", "showPreviewBtn", "taskId", "showDeleteBtn", "processInstId", "isAutoDelete", "fileList", "callback", "onDeleteCallback"]);
     var _c = useState({}), listRecord = _c[0], setListRecord = _c[1];
-    var records = listRecord.records, current = listRecord.current, size = listRecord.size, total = listRecord.total, extra = listRecord.extra;
+    var current = listRecord.current, size = listRecord.size;
     /**
      * @description 默认要带上用户公司、部门、最近时间
      *              UPDATE：这个是列表表单默认的查询条件

package/dist/components/WorkflowPrintContainer/component/attention/index.d.ts

@@ -4,7 +4,6 @@ interface IProps {
     processInstId: string;
     refresh: number;
     disable: boolean;
-    callRefreshContacts: () => void;
 }
 declare const _default: React.NamedExoticComponent<IProps>;
 export default _default;

package/dist/components/WorkflowPrintContainer/component/attention/index.js

@@ -16,7 +16,7 @@ import { fetchAttentionList } from '../../service';
 import Footer from '../../../business/Footer';
 import { message } from 'antd';
 var AttentionList = function (_a) {
-    var request = _a.request, processInstId = _a.processInstId, refresh = _a.refresh, disable = _a.disable, callRefreshContacts = _a.callRefreshContacts;
+    var request = _a.request, processInstId = _a.processInstId, refresh = _a.refresh, disable = _a.disable;
     var _b = useState({}), listRecord = _b[0], setListRecord = _b[1];
     var records = listRecord.records, current = listRecord.current, size = listRecord.size, total = listRecord.total, extra = listRecord.extra;
     var _c = useState(0), listCurrentPage = _c[0], setListCurrentPage = _c[1];
@@ -79,14 +79,7 @@ var AttentionList = function (_a) {
             message.error(((_b = (_a = error === null || error === void 0 ? void 0 : error.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.msg) || '请求失败！');
             setListRecord([]);
         });
-        callRefreshContacts();
-    }, [
-        currentParams,
-        listCurrentPage,
-        listPageSize,
-        callRefreshContacts,
-        request,
-    ]);
+    }, [currentParams, listCurrentPage, listPageSize, request]);
     return (React.createElement(React.Fragment, null,
         React.createElement(TableList, { records: records, onReload: onReload, extra: extra, disable: disable }),
         React.createElement(Footer, { footerDom: footerDom })));

package/dist/components/WorkflowPrintContainer/component/previewTable/index.d.ts

@@ -5,7 +5,6 @@ interface IProps {
     taskId: string;
     refresh: number;
     disable: boolean;
-    callRefreshContacts: () => void;
 }
 declare const _default: React.NamedExoticComponent<IProps>;
 export default _default;

package/dist/components/WorkflowPrintContainer/component/previewTable/index.js

@@ -4,7 +4,7 @@ import TableList from './component/TableList';
 import { fetchPreviewList } from '../../service';
 var PreviewList = function (_a) {
     // UPDATE：获取当前路由对应得按钮权限
-    var request = _a.request, processInstId = _a.processInstId, taskId = _a.taskId, refresh = _a.refresh, disable = _a.disable, callRefreshContacts = _a.callRefreshContacts;
+    var request = _a.request, processInstId = _a.processInstId, taskId = _a.taskId, refresh = _a.refresh, disable = _a.disable;
     var _b = useState(false), loading = _b[0], setLoading = _b[1];
     var _c = useState(null), records = _c[0], setRecords = _c[1];
     /**
@@ -23,7 +23,6 @@ var PreviewList = function (_a) {
             }
             setRecords(res.data.data);
             setLoading(false);
-            callRefreshContacts();
         })
             .catch(function (error) {
             var _a, _b;
@@ -31,7 +30,7 @@ var PreviewList = function (_a) {
             setRecords([]);
             setLoading(false);
         });
-    }, [processInstId, taskId, callRefreshContacts, request]);
+    }, [processInstId, taskId, request]);
     useEffect(function () {
         setLoading(true);
         var params = {

package/dist/components/WorkflowPrintContainer/component/trail/component/TableList.js

@@ -118,7 +118,7 @@ var TableList = function (_a) {
             result = temp.filter(function (item) {
                 return item.activityDefName !== record.activityDefName ||
                     (item.activityDefName === record.activityDefName &&
-                        (item.list || item.vieweState == 0));
+                        (item.list || item.vieweState === 0));
             });
         }
         setFilterRecords(result);

package/dist/components/WorkflowPrintContainer/component/trail/index.js

@@ -15,7 +15,7 @@ import { fetchTrailList } from '../../service';
 var TrailList = function (_a) {
     var request = _a.request, _b = _a.appCode, appCode = _b === void 0 ? '' : _b, processInstId = _a.processInstId, taskId = _a.taskId, refresh = _a.refresh, editOpinionAuth = _a.editOpinionAuth;
     var _c = useState({}), listRecord = _c[0], setListRecord = _c[1];
-    var records = listRecord.records, current = listRecord.current, size = listRecord.size, total = listRecord.total, extra = listRecord.extra;
+    var records = listRecord.records, current = listRecord.current, size = listRecord.size, extra = listRecord.extra;
     // /**
     //  * @description 默认要带上用户公司、部门、最近时间
     //  *              UPDATE：这个是列表表单默认的查询条件

package/dist/components/WorkflowPrintContainer/workflow-print-container.js

@@ -9,45 +9,9 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 import React from 'react';
 import { Checkbox } from 'antd';
-import { lazy, useEffect, useState } from 'react';
+import { useEffect, useState } from 'react';
 import { Typography } from 'antd';
 import Header from './component/Header';
 import ProcessDetail from './component/ProcessDetail';
@@ -194,41 +158,35 @@ var WorkflowPrintContainer = function (_a) {
      * @returns {React.LazyExoticComponent} - 懒加载组件
      */
     function createLazyComponent(data) {
-        var _this = this;
         if (getComponet) {
             var module_1 = getComponet(data);
             // 返回默认导出或整个模块
             return module_1;
         }
-        return lazy(function () { return __awaiter(_this, void 0, void 0, function () {
-            var module_2, error_1;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        _a.trys.push([0, 2, , 3]);
-                        return [4 /*yield*/, import("pages/module/" + (data === null || data === void 0 ? void 0 : data.printUrl)).catch(function (error) {
-                                console.error('Failed to load component:', error);
-                                // 返回一个对象，该对象有一个 `default` 属性指向备选组件
-                                return {
-                                    default: FallbackComponent,
-                                };
-                            })];
-                    case 1:
-                        module_2 = _a.sent();
-                        // 返回默认导出或整个模块
-                        return [2 /*return*/, module_2];
-                    case 2:
-                        error_1 = _a.sent();
-                        // 记录错误信息
-                        console.error('Failed to load component:', error_1);
-                        // 返回一个对象，其中包含默认导出的备选组件
-                        return [2 /*return*/, {
-                                default: function () { return React.createElement(FallbackComponent, null); },
-                            }];
-                    case 3: return [2 /*return*/];
-                }
-            });
-        }); });
+        return React.createElement(FallbackComponent, null);
+        // return lazy(async () => {
+        //   try {
+        //     // 动态导入模块
+        //     const module = await import(`pages/module/${data?.printUrl}`).catch(
+        //       (error) => {
+        //         console.error('Failed to load component:', error);
+        //         // 返回一个对象，该对象有一个 `default` 属性指向备选组件
+        //         return {
+        //           default: FallbackComponent,
+        //         };
+        //       }
+        //     );
+        //     // 返回默认导出或整个模块
+        //     return module;
+        //   } catch (error) {
+        //     // 记录错误信息
+        //     console.error('Failed to load component:', error);
+        //     // 返回一个对象，其中包含默认导出的备选组件
+        //     return {
+        //       default: () => <FallbackComponent />,
+        //     };
+        //   }
+        // });
     }
     var getContent = function (data) {
         var _a, _b;

package/dist/components/electron-signatures/fileComponents/file-operation.js

@@ -39,7 +39,7 @@ var FileOperation = function (props) {
                     onWatermarkChange && onWatermarkChange(e.target.checked);
                 } }, "\u6DFB\u52A0\u6C34\u5370"))),
         React.createElement("div", { className: "file-operation--list" },
-            isEdit && isReplaceFile && (React.createElement(FileUpload, { fileList: fileList, apiBaseUrl: apiBaseUrl, onFileChange: onFileChange, type: "link" }, "\u66FF\u6362")),
+            isReplaceFile && (React.createElement(FileUpload, { fileList: fileList, apiBaseUrl: apiBaseUrl, onFileChange: onFileChange, type: "link" }, "\u66FF\u6362")),
             isDownload && fileId ? (React.createElement(Button, { type: "link", onClick: function () {
                     downloadFileCallBack(apiBaseUrl, fileId, dangerouslySetXss(fileName) || '附件', {
                         addWaterMark: false,

package/dist/components/electron-signatures/index.js

@@ -798,7 +798,7 @@ var ElectronSignatures = function (props) {
             return (React.createElement(ElectronSignaturesFragment, __assign({ key: index, dataType: "" + index, onTrackChange: onTrackChange, request: request, isUnControlled: isUnControlled, setLoading: setLoading, apiBaseUrl: apiBaseUrl, fileBaseUrl: fileBaseUrl, isSingleQj: isSingleQj }, mergeOptions)));
         }),
         React.createElement(ElectronSealBatchDownload, { request: request, apiBaseUrl: apiBaseUrl, selectRows: selectRows, allData: allData, isShowElectronBatchBtn: isShowElectronBatchBtn, isShowDownloadBatchBtn: isShowDownloadBatchBtn, isShowDoubleSignedBatchBtn: isShowDoubleSignedBatchBtn, batchDownloadZipName: batchDownloadZipName, firstDataType: firstDataType }, isShowFileUpload && currentIsEditMemo ? (React.createElement(FileUpload, __assign({ fileList: sameTypeRecords, apiBaseUrl: apiBaseUrl, onFileChange: onFileChange, multiple: true }, fileUploadProps), "\u6DFB\u52A0\u9644\u4EF6")) : null),
-        React.createElement(Table, { dataSource: mergeRecords, columns: columns, rowKey: "attachId", className: "zt-table electron-table", bordered: true, pagination: false, loading: loading, rowSelection: myRowSelection, scroll: __assign({ x: 'max-content', y: 500 }, tableScroll) }),
+        React.createElement(Table, { dataSource: mergeRecords, columns: columns, rowKey: function (record) { return record.id || record.attachId; }, className: "zt-table electron-table", bordered: true, pagination: false, loading: loading, rowSelection: myRowSelection, scroll: __assign({ x: 'max-content', y: 500 }, tableScroll) }),
         React.createElement(LastQysModal, { modalHandleRef: modalHandleRef, appointSignLocation: function (info) {
                 // 未盖章的印章id列表
                 var needReSealList = info.needReSealList;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ztxkui",
-  "version": "4.2.23-346-beta",
+  "version": "4.2.23-348-beta",
   "private": false,
   "description": "React components library",
   "author": "zt-front-end",