ztxkui 4.2.23-342-beta → 4.2.23-343-beta

package/dist/components/WorkflowPrintContainer/component/Header.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-interface IProps {
+export interface IProps {
     data: any;
     showStatus?: boolean;
     showProcessStatus?: boolean;

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

@@ -88,13 +88,12 @@ var Header = function (_a) {
                     React.createElement("div", { className: "title" }, ((data === null || data === void 0 ? void 0 : data.taskName) ? data === null || data === void 0 ? void 0 : data.taskName : '') + "\u8BE6\u60C5"),
                     showStatus ? (React.createElement("div", { className: getDealType(data.status)[0] }, getDealType(data.status)[1])) : null,
                     showProcessStatus ? (React.createElement("div", { className: getProcessType(data.processInstState)[0] }, getProcessType(data.processInstState)[1])) : null,
-                    priority ? (React.createElement("div", { className: getPriorityStatus(priority)[0] }, getPriorityStatus(priority)[1])) : null),
+                    priority ? (React.createElement("div", { className: getPriorityStatus(priority)[0] }, getPriorityStatus(priority)[1])) : null,
+                    (data === null || data === void 0 ? void 0 : data.processInstId) ? (React.createElement("div", { className: "process-inst-id" }, data === null || data === void 0 ? void 0 : data.processInstId)) : null),
                 React.createElement("div", null, (data === null || data === void 0 ? void 0 : data.processTypeName) ? data === null || data === void 0 ? void 0 : data.processTypeName : '')),
-            React.createElement("div", { className: "wf-task-process-status" },
-                React.createElement("div", { className: "lbpm-process-status", style: { backgroundImage: "url(" + lbpmProcessStatus + ")" } }),
-                7 === (data === null || data === void 0 ? void 0 : data.processInstState) ? (React.createElement("div", { className: "lbpm-flow-info" },
-                    React.createElement("div", { className: "lbpm-process-status", style: { backgroundImage: "url(" + lbpmProcessStatus + ")" } }))) : 8 === (data === null || data === void 0 ? void 0 : data.processInstState) ? (React.createElement("div", { className: "lbpm-flow-info" },
-                    React.createElement("div", { className: "lbpm-discard-status", style: { backgroundImage: "url(" + lbpmDiscardStatus + ")" } }))) : null),
+            React.createElement("div", { className: "wf-task-process-status" }, 7 === (data === null || data === void 0 ? void 0 : data.processInstState) ? (React.createElement("div", { className: "lbpm-flow-info" },
+                React.createElement("div", { className: "lbpm-process-status", style: { backgroundImage: "url(" + lbpmProcessStatus + ")" } }))) : 8 === (data === null || data === void 0 ? void 0 : data.processInstState) ? (React.createElement("div", { className: "lbpm-flow-info" },
+                React.createElement("div", { className: "lbpm-discard-status", style: { backgroundImage: "url(" + lbpmDiscardStatus + ")" } }))) : null),
             showPrintDate ? (React.createElement("div", { className: "print-date", style: { top: offsetHeight - 16 } },
                 "\u6253\u5370\u65E5\u671F:",
                 dayjs().format('YYYY-MM-DD'))) : null),

package/dist/components/WorkflowPrintContainer/workflow-print-container.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import { IProps as HeaderProps } from './component/Header';
 /**
  * 任务状态：待办
  */
@@ -95,6 +96,8 @@ export interface IProps {
     getComponet?: (any: any) => any;
     /** 获得流程的一些信息 */
     getProcessInfo?: (data: any) => any;
+    /** 标题入参 */
+    headerProp?: HeaderProps;
 }
 declare const WorkflowPrintContainer: React.FC<IProps>;
 export default WorkflowPrintContainer;

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

@@ -116,7 +116,7 @@ export var PROCESS_REJECTED = 9;
  */
 export var PROCESS_DRAWBACK = 10;
 var WorkflowPrintContainer = function (_a) {
-    var request = _a.request, taskId = _a.taskId, processInstId = _a.processInstId, _b = _a.isNotice, isNotice = _b === void 0 ? false : _b, _c = _a.titleCheckable, titleCheckable = _c === void 0 ? true : _c, _d = _a.showTitle, showTitle = _d === void 0 ? true : _d, _e = _a.detailCheckable, detailCheckable = _e === void 0 ? true : _e, _f = _a.showDetail, showDetail = _f === void 0 ? true : _f, _g = _a.approvalRecordsCheckable, approvalRecordsCheckable = _g === void 0 ? true : _g, _h = _a.showApprovalRecords, showApprovalRecords = _h === void 0 ? true : _h, _j = _a.attachCheckable, attachCheckable = _j === void 0 ? true : _j, _k = _a.showAttach, showAttach = _k === void 0 ? true : _k, _l = _a.relatedProcessesCheckable, relatedProcessesCheckable = _l === void 0 ? true : _l, _m = _a.showRelatedProcesses, showRelatedProcesses = _m === void 0 ? true : _m, _o = _a.circulationRecordsCheckable, circulationRecordsCheckable = _o === void 0 ? true : _o, _p = _a.showCirculationRecords, showCirculationRecords = _p === void 0 ? true : _p, getComponet = _a.getComponet, getProcessInfo = _a.getProcessInfo;
+    var request = _a.request, taskId = _a.taskId, processInstId = _a.processInstId, _b = _a.isNotice, isNotice = _b === void 0 ? false : _b, _c = _a.titleCheckable, titleCheckable = _c === void 0 ? true : _c, _d = _a.showTitle, showTitle = _d === void 0 ? true : _d, _e = _a.detailCheckable, detailCheckable = _e === void 0 ? true : _e, _f = _a.showDetail, showDetail = _f === void 0 ? true : _f, _g = _a.approvalRecordsCheckable, approvalRecordsCheckable = _g === void 0 ? true : _g, _h = _a.showApprovalRecords, showApprovalRecords = _h === void 0 ? true : _h, _j = _a.attachCheckable, attachCheckable = _j === void 0 ? true : _j, _k = _a.showAttach, showAttach = _k === void 0 ? true : _k, _l = _a.relatedProcessesCheckable, relatedProcessesCheckable = _l === void 0 ? true : _l, _m = _a.showRelatedProcesses, showRelatedProcesses = _m === void 0 ? true : _m, _o = _a.circulationRecordsCheckable, circulationRecordsCheckable = _o === void 0 ? true : _o, _p = _a.showCirculationRecords, showCirculationRecords = _p === void 0 ? true : _p, getComponet = _a.getComponet, getProcessInfo = _a.getProcessInfo, headerProp = _a.headerProp;
     var _q = useState(isNotice), noticeInfoShown = _q[0], setNoticeInfoShown = _q[1];
     // 标题
     var _r = useState(showTitle), titleShown = _r[0], setTitleShown = _r[1];
@@ -244,7 +244,7 @@ var WorkflowPrintContainer = function (_a) {
                 React.createElement(Paragraph, { style: needHighlight ? { color: 'red' } : undefined },
                     "\u5185\u5BB9\uFF1A", data === null || data === void 0 ? void 0 :
                     data.noticeContent))),
-            titleShown && (React.createElement(Header, { data: __assign(__assign({}, data), { taskName: data === null || data === void 0 ? void 0 : data.processInstName }) })),
+            titleShown && (React.createElement(Header, __assign({ data: __assign(__assign({}, data), { taskName: data === null || data === void 0 ? void 0 : data.processInstName }) }, headerProp))),
             React.createElement(ProcessDetail, { request: request, type: 'notice', data: data, showBizForm: true, toEdit: false, OuterComponent: createLazyComponent(data), showCfg: {
                     detailShown: detailShown,
                     approvalRecordsShown: approvalRecordsShown,

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" },
-            isReplaceFile && (React.createElement(FileUpload, { fileList: fileList, apiBaseUrl: apiBaseUrl, onFileChange: onFileChange, type: "link" }, "\u66FF\u6362")),
+            isEdit && 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/hooks/useMergeRecords.d.ts

@@ -3,6 +3,7 @@ interface IOptions {
     allData: ITrackAllData;
     dataTypeSort: string[];
     isDeleteAllFileWhenJustUseQj?: boolean;
+    isDeletePlaceholderFileData?: boolean;
 }
 /**
  * 将各级获取到的附件数据拉平成一个整体

package/dist/components/electron-signatures/hooks/useMergeRecords.js

@@ -4,16 +4,19 @@ import { currentRecordIsOnlyQunj } from '../utils';
  * 将各级获取到的附件数据拉平成一个整体
  */
 export default function useMergeRecords(options) {
-    var allData = options.allData, dataTypeSort = options.dataTypeSort, isDeleteAllFileWhenJustUseQj = options.isDeleteAllFileWhenJustUseQj;
+    var allData = options.allData, dataTypeSort = options.dataTypeSort, isDeleteAllFileWhenJustUseQj = options.isDeleteAllFileWhenJustUseQj, isDeletePlaceholderFileData = options.isDeletePlaceholderFileData;
     var mergeRecords = useMemo(function () {
         var allRecords = [];
         dataTypeSort.forEach(function (dataType) {
             var _a;
             var records = ((_a = allData === null || allData === void 0 ? void 0 : allData[dataType]) === null || _a === void 0 ? void 0 : _a.records) || [];
+            if (isDeletePlaceholderFileData) {
+                records = records.filter(function (record) { return !currentRecordIsOnlyQunj(record); });
+            }
             allRecords = allRecords.concat(records);
         });
         return allRecords;
-    }, [allData, dataTypeSort]);
+    }, [allData, dataTypeSort, isDeletePlaceholderFileData]);
     // 是否仅选中群杰印章
     var isQunjOnlyChecked = useMemo(function () {
         return mergeRecords.some(function (record) { return currentRecordIsOnlyQunj(record); });

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

@@ -86,6 +86,7 @@ import { countIsValidate } from './hooks/useParseQunjListData';
 import FileUpload from './fileComponents/file-upload';
 import { DATA_TYPE_KEY } from './hooks/useParseRecords';
 import useGetDeptInfo from './electronComponents/useGetDeptInfo';
+import dayjs from 'dayjs';
 /**
  * 一开始这个组件想设计成 可以传入多中类型的数据 但是发现这种做法会有很多问题
  * 不同的数据类型 共享一个表头 那么其实这样就做不到隐藏某些表头的效果
@@ -244,6 +245,7 @@ var ElectronSignatures = function (props) {
         allData: allData,
         dataTypeSort: dataTypeSort,
         isDeleteAllFileWhenJustUseQj: isDeleteAllFileWhenJustUseQj,
+        isDeletePlaceholderFileData: isDeletePlaceholderFileData,
     }), mergeRecords = _u.mergeRecords, isHiddenColumns = _u.isHiddenColumns;
     // 附件归属
     var fileTypeColumns = useFileTypeColumns({
@@ -750,6 +752,7 @@ var ElectronSignatures = function (props) {
                 copyRecords = copyRecords.filter(function (record) { return !currentRecordIsOnlyQunj(record); });
                 // 插入一个给开发操作附件的机会
                 var newFile = callback(file);
+                newFile.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss');
                 // 每个附件都可以添加群杰时控制
                 if (isSingleQj) {
                     newFile[isQunjKey_1] = 1;

package/package.json

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