npm - @steedos-labs/plugin-workflow - Versions diffs - 3.0.86 → 3.0.87 - Mend

@steedos-labs/plugin-workflow 3.0.86 → 3.0.87

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (15) hide show

package/README.md +19 -1
package/designer/dist/amis-renderer/amis-renderer.css +1 -1
package/designer/dist/amis-renderer/amis-renderer.js +1 -1
package/designer/dist/assets/index-ClEul34C.css +1 -0
package/designer/dist/assets/{index-CUTUedfe.js → index-DWcq4xcG.js} +187 -187
package/designer/dist/index.html +2 -2
package/main/default/client/flow2_render.client.js +1 -1
package/main/default/manager/uuflow_manager.js +2 -2
package/main/default/pages/page_instance_print.page.amis.json +2 -2
package/main/default/routes/api_workflow_next_step_users.router.js +4 -3
package/main/default/server/ejs/export_instances.ejs +87 -211
package/package.json +1 -1
package/public/amis-renderer/amis-renderer.css +1 -1
package/public/amis-renderer/amis-renderer.js +1 -1
package/designer/dist/assets/index-B56yvQDB.css +0 -1

package/designer/dist/index.html CHANGED Viewed

@@ -5,8 +5,8 @@
     <link rel="shortcut icon" type="image/svg+xml" href="/images/logo.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>designer</title>
-    <script type="module" crossorigin src="/api/workflow/designer-v2/assets/index-CUTUedfe.js"></script>
-    <link rel="stylesheet" crossorigin href="/api/workflow/designer-v2/assets/index-B56yvQDB.css">
+    <script type="module" crossorigin src="/api/workflow/designer-v2/assets/index-DWcq4xcG.js"></script>
+    <link rel="stylesheet" crossorigin href="/api/workflow/designer-v2/assets/index-ClEul34C.css">
   </head>
   <body>
     <div id="root"></div>

package/main/default/client/flow2_render.client.js CHANGED Viewed

@@ -1,5 +1,5 @@
 waitForThing(window, 'antd').then(function(){
-    var v = '3.0.86';
+    var v = '3.0.87';
     loadJs('/amis-renderer/amis-renderer.js?v=' + v);
     loadCss('/amis-renderer/amis-renderer.css?v=' + v)
 })

package/main/default/manager/uuflow_manager.js CHANGED Viewed

@@ -1834,14 +1834,14 @@ UUFlowManager.handleSkipProcessed = async function (instance_id, flow, maxDepth
     const consecutiveOnly = process.env.STEEDOS_WORKFLOW_SKIP_CONSECUTIVE_ONLY;
     let effectiveProcessedUserIds = processedUserIds;
     if (consecutiveOnly === 'true' || consecutiveOnly === '1') {
-        // 仅连续步骤模式：只检查紧邻的上一步骤的处理人
+        // 仅连续步骤模式：只检查紧邻的上一步骤的处理人；滑步产生的 skipped 记录也算连续链路
         const previousTraceIds = lastTrace.previous_trace_ids || [];
         const previousTraces = (instance.traces || []).filter(t => previousTraceIds.includes(t._id));
         effectiveProcessedUserIds = [];
         for (const prevTrace of previousTraces) {
             if (prevTrace.approves) {
                 for (const approve of prevTrace.approves) {
-                    if (isNormalApprove(approve) && approve.is_finished && approve.judge !== 'skipped') {
+                    if (isNormalApprove(approve) && approve.is_finished) {
                         if (!effectiveProcessedUserIds.includes(approve.user)) {
                             effectiveProcessedUserIds.push(approve.user);
                         }

package/main/default/pages/page_instance_print.page.amis.json CHANGED Viewed

@@ -19,7 +19,7 @@
                     "actions": [
                         {
                         "actionType": "custom",
-                        "script": "var el=document.querySelector('.instance-name');if(el){var name=(el.innerText||el.textContent||'').trim().replace(/\\s+/g,' ');if(name)document.title=name;}window.print();"
+                        "script": "var flowName='';try{var scoped=event&&event.data&&event.data._scoped;var instancePage=scoped&&scoped.getComponentById&&scoped.getComponentById('u:instancePage');var pageData=instancePage&&instancePage.getData&&instancePage.getData();flowName=pageData&&pageData.context&&pageData.context.flow&&pageData.context.flow.name;}catch(e){flowName='';}flowName=(flowName||'').trim().replace(/\\s+/g,' ');if(!flowName){var msg='打印页面数据异常，未找到流程名称';if(event&&event.context&&event.context.env&&event.context.env.notify){event.context.env.notify('warning',msg);}else{alert(msg);}return;}document.title=flowName;window.print();"
                         }
                     ]
                     }
@@ -576,4 +576,4 @@
             ]
         }
     }
-}
+}

package/main/default/routes/api_workflow_next_step_users.router.js CHANGED Viewed

@@ -291,9 +291,10 @@ router.post('/api/workflow/v2/nextStepUsersValue', requireAuthentication, async
             for (let i = traces.length - 1; i >= 0; i--) {
                 const trace = traces[i];
                 if (trace.step === nextStepId && trace.approves && trace.approves.length > 0) {
-                    // 排除 returned/terminated/retrieved 的 approve
+                    // 排除非实际处理人的 approve
+                    const excludedApproveJudges = ['returned', 'relocated', 'terminated', 'retrieved'];
                     newNextUsers = trace.approves
-                        .filter(approve => !['returned', 'terminated', 'retrieved'].includes(approve.judge))
+                        .filter(approve => !excludedApproveJudges.includes(approve.judge))
                         .map(approve => approve.handler);
                     break;
                 }
@@ -327,4 +328,4 @@ router.post('/api/workflow/v2/nextStepUsersValue', requireAuthentication, async
     }
 });
-exports.default = router;
+exports.default = router;

package/main/default/server/ejs/export_instances.ejs CHANGED Viewed

@@ -14,6 +14,89 @@
 					}
 					return field.label || field.title || field.name || field.code || '';
 				};
+				var escapeXml = function(value) {
+					if (value === undefined || value === null) {
+						return '';
+					}
+					return String(value).replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;').replace(/'/g, '&apos;');
+				};
+				var isMultiValueField = function(field, value) {
+					return field && (field.is_multiselect == true || ['memberMulti', 'orgMulti'].includes(field.type) || Array.isArray(value));
+				};
+				var getObjectDisplayValue = function(value, fieldType) {
+					if (value === undefined || value === null) {
+						return '';
+					}
+					if (typeof(value) != 'object') {
+						return value;
+					}
+					if (['group', 'org', 'orgMulti'].includes(fieldType)) {
+						return value.fullname || value.name || value.label || value.title || value.id || value._id || '';
+					}
+					return value.name || value.fullname || value.username || value.label || value.title || value.id || value.user || value._id || '';
+				};
+				var formatPickerValue = function(field, value) {
+					if (isMultiValueField(field, value)) {
+						return _.map(Array.isArray(value) ? value : [value], function(item) {
+							return getObjectDisplayValue(item, field.type);
+						}).filter(function(item) {
+							return item !== undefined && item !== null && item !== '';
+						}).join(',');
+					}
+					return getObjectDisplayValue(value, field.type);
+				};
+				var renderDataCell = function(field, value) {
+					if (value === undefined || value === null || value === '') {
+						return '<Cell><Data ss:Type="String"></Data></Cell>';
+					}
+					if (['user', 'group', 'member', 'memberMulti', 'org', 'orgMulti'].includes(field.type)) {
+						return '<Cell><Data ss:Type="String">' + escapeXml(formatPickerValue(field, value)) + '</Data></Cell>';
+					}
+					if (field.type == 'checkbox') {
+						return '<Cell><Data ss:Type="String">' + escapeXml(value == 'true' ? t('instance.formatter.checkbox.checked',{},lang) : t('instance.formatter.checkbox.unchecked',{},lang)) + '</Data></Cell>';
+					}
+					if (field.type == 'password') {
+						return '<Cell><Data ss:Type="String">******</Data></Cell>';
+					}
+					if (field.type == 'number') {
+						return '<Cell><Data ss:Type="Number">' + (Number(value) ? Number(Number(value).toFixed(field.digits)) : 0) + '</Data></Cell>';
+					}
+					if (field.type == 'date') {
+						var v = value;
+						if (typeof(v) == 'string' && v) {
+							try {
+								v = formatDate(v, t('instance.formatter.date.export_date',{},lang));
+							} catch (e) {
+								console.error(e);
+							}
+						}
+						if (v instanceof Date) {
+							v = formatDate(v, t('instance.formatter.date.export_date',{},lang));
+						}
+						return '<Cell><Data ss:Type="String">' + escapeXml(v || '') + '</Data></Cell>';
+					}
+					if (['dateTime', 'datetime'].includes(field.type)) {
+						var v = value;
+						if (typeof(v) == 'string' && v) {
+							try {
+								v = formatDate(v, t('instance.formatter.date.export_datetime',{},lang));
+							} catch (e) {
+								console.error(e);
+							}
+						}
+						if (v instanceof Date) {
+							v = formatDate(v, t('instance.formatter.date.export_datetime',{},lang));
+						}
+						return '<Cell><Data ss:Type="String">' + escapeXml(v || '') + '</Data></Cell>';
+					}
+					if (field.type == 'odata') {
+						return '<Cell><Data ss:Type="String">' + escapeXml((value && value['@label']) ? value['@label'] : '') + '</Data></Cell>';
+					}
+					if (typeof(value) == 'object') {
+						value = getObjectDisplayValue(value, field.type);
+					}
+					return '<Cell><Data ss:Type="String">' + escapeXml(value) + '</Data></Cell>';
+				};
 			%>
 			<!-- 编号 -->
 			<Column ss:Width="35"/>
@@ -115,149 +198,11 @@
 					<Cell><Data ss:Type="String"><%= formatDate(current_trace["start_date"], t('instance.formatter.date.export_datetime',{},lang)) %></Data></Cell>
 					<% _.each(fields, function(field){ %>
 						<% if (field.type != "table" && field.type != "section") { %>
-							<% if (!ins["values"] || !ins["values"][field.code]) { %>
-								<Cell><Data ss:Type="String"><%= "" %></Data></Cell>
-							<% } else { %>
-								<% if (['user','group'].includes(field.type) && field.is_multiselect != true) { %>
-									<Cell><Data ss:Type="String"><%= field.type=="user" ? ins["values"][field.code]["name"] : ins["values"][field.code]["fullname"]%></Data></Cell>
-								<% } else if (['user','group'].includes(field.type) && field.is_multiselect == true) {
-									var tem_ary = new Array;
-									_.each(ins["values"][field.code], function(s){
-										tem_ary.push(field.type=="user" ? s["name"] : s["fullname"])
-									})
-								%>
-									<Cell><Data ss:Type="String"><%= tem_ary.join(",") %></Data></Cell>
-								<% } else if (field.type == "checkbox") { %>
-									<Cell><Data ss:Type="String"><%= ins["values"][field.code]=="true" ? t('instance.formatter.checkbox.checked',{},lang) : t('instance.formatter.checkbox.unchecked',{},lang) %></Data></Cell>
-								<% } else if (field.type == "password") { %>
-									<Cell><Data ss:Type="String">******</Data></Cell>
-								<% } else if (field.type == "number") { %>
-									<Cell><Data ss:Type="Number"><%= Number(ins["values"][field.code]) ? Number(Number(ins["values"][field.code]).toFixed(field.digits)) : 0 %></Data></Cell>
-								<% } else if (field.type == "date") { %>
-									<%
-										var v = ins["values"][field.code];
-										if (typeof(v) == "string" && v) {
-											try {
-												v = formatDate(v, t('instance.formatter.date.export_date',{},lang));
-											} catch (e) {
-												console.error(e);
-											}
-										}
-										if (v instanceof Date) {
-											v = formatDate(v, t('instance.formatter.date.export_date',{},lang));
-										}
-										if (!v) {
-											v = "";
-										}
-									%>
-									<Cell><Data ss:Type="String"><%= v %></Data></Cell>
-								<% } else if (field.type == "dateTime") { %>
-									<%
-										var v = ins["values"][field.code];
-										if (typeof(v) == "string" && v) {
-											try {
-												v = formatDate(v, t('instance.formatter.date.export_datetime',{},lang));
-											} catch (e) {
-												console.error(e);
-											}
-										}
-										if (v instanceof Date) {
-											v = formatDate(v, t('instance.formatter.date.export_datetime',{},lang));
-										}
-										if (!v) {
-											v = "";
-										}
-									%>
-									<Cell><Data ss:Type="String"><%= v %></Data></Cell>
-									<% } else if (field.type == "odata") { %>
-										<%
-											var odataValue = ins["values"][field.code];
-											var v = (odataValue && odataValue["@label"]) ? odataValue["@label"] : "";
-										%>
-										<Cell><Data ss:Type="String"><%= v %></Data></Cell>
-								<% } else { %>
-									<%
-										tem_v = ins["values"][field.code];
-										if (typeof(tem_v) == "string") {
-											tem_v = tem_v.replace(/</g, "&lt;").replace(/>/g, "&gt;");
-										}
-									%>
-									<Cell><Data ss:Type="String"><%= tem_v %></Data></Cell>
-								<% } %>
-							<% } %>
+							<%- renderDataCell(field, ins["values"] && ins["values"][field.code]) %>
 						<% } %>
 						<% if (field.type == "section" && field.fields) { %>
 							<% _.each(field.fields, function(sec){ %>
-								<% if (!ins["values"] || !ins["values"][sec.code]) { %>
-									<Cell><Data ss:Type="String"><%= "" %></Data></Cell>
-								<% } else { %>
-									<% if (['user','group'].includes(sec.type) && sec.is_multiselect != true) { %>
-										<Cell><Data ss:Type="String"><%= sec.type=="user" ? ins["values"][sec.code]["name"] : ins["values"][sec.code]["fullname"]%></Data></Cell>
-									<% } else if (['user','group'].includes(sec.type) && sec.is_multiselect == true) {
-										var tem_ary = new Array;
-										_.each(ins["values"][sec.code], function(s){
-											tem_ary.push(sec.type=="user" ? s["name"] : s["fullname"])
-										})
-									%>
-										<Cell><Data ss:Type="String"><%= tem_ary.join(",") %></Data></Cell>
-									<% } else if (sec.type == "checkbox") { %>
-										<Cell><Data ss:Type="String"><%= ins["values"][sec.code]=="true" ? t('instance.formatter.checkbox.checked',{},lang) : t('instance.formatter.checkbox.unchecked',{},lang) %></Data></Cell>
-									<% } else if (sec.type == "password") { %>
-										<Cell><Data ss:Type="String">******</Data></Cell>
-									<% } else if (sec.type == "number") { %>
-										<Cell><Data ss:Type="Number"><%= Number(ins["values"][sec.code]) ? Number(Number(ins["values"][sec.code]).toFixed(sec.digits)) : 0 %></Data></Cell>
-									<% } else if (sec.type == "date") { %>
-										<%
-											var v = ins["values"][sec.code];
-											if (typeof(v) == "string" && v) {
-												try {
-													v = new Date(v);
-												} catch (e) {
-													console.error(e);
-												}
-											}
-											if (v instanceof Date) {
-												v = moment(v).format(t('instance.formatter.date.export_date',{},lang));
-											}
-											if (!v) {
-												v = "";
-											}
-										%>
-										<Cell><Data ss:Type="String"><%= v %></Data></Cell>
-									<% } else if (sec.type == "dateTime") { %>
-										<%
-											var v = ins["values"][sec.code];
-											if (typeof(v) == "string" && v) {
-												try {
-													v = new Date(v);
-												} catch (e) {
-													console.error(e);
-												}
-											}
-											if (v instanceof Date) {
-												v = moment(v).format(t('instance.formatter.date.export_datetime',{},lang));
-											}
-											if (!v) {
-												v = "";
-											}
-										%>
-										<Cell><Data ss:Type="String"><%= v %></Data></Cell>
-										<% } else if (sec.type == "odata") { %>
-											<%
-												var odataValue = ins["values"][sec.code];
-												var v = (odataValue && odataValue["@label"]) ? odataValue["@label"] : "";
-											%>
-											<Cell><Data ss:Type="String"><%= v %></Data></Cell>
-									<% } else { %>
-										<%
-											tem_v = ins["values"][sec.code];
-											if (typeof(tem_v) == "string") {
-												tem_v = tem_v.replace(/</g, "&lt;").replace(/>/g, "&gt;");
-											}
-										%>
-										<Cell><Data ss:Type="String"><%= tem_v %></Data></Cell>
-									<% } %>
-								<% } %>
+								<%- renderDataCell(sec, ins["values"] && ins["values"][sec.code]) %>
 							<% }) %>
 						<% } %>
 					<% }) %>
@@ -351,76 +296,7 @@
 								<Cell><Data ss:Type="String"><%= current_trace.name %></Data></Cell>
 								<Cell><Data ss:Type="String"><%= formatDate(current_trace["start_date"], t('instance.formatter.date.export_datetime',{},lang)) %></Data></Cell>
 								<% _.each(table_field.fields, function(field) { %>
-									<% if (!f_obj[field.code]) { %>
-										<Cell><Data ss:Type="String"><%= "" %></Data></Cell>
-									<% } else { %>
-										<% if (['user','group'].includes(field.type) && field.is_multiselect != true) { %>
-											<Cell><Data ss:Type="String"><%= field.type=="user" ? f_obj[field.code]["name"] : f_obj[field.code]["fullname"]%></Data></Cell>
-										<% } else if (['user','group'].includes(field.type) && field.is_multiselect == true) {
-											var tem_ary = new Array;
-											_.each(f_obj[field.code], function(s){
-												tem_ary.push(field.type=="user" ? s["name"] : s["fullname"])
-											})
-										%>
-											<Cell><Data ss:Type="String"><%= tem_ary.join(",") %></Data></Cell>
-										<% } else if (field.type == "checkbox") { %>
-											<Cell><Data ss:Type="String"><%= f_obj[field.code]=="true" ? t('instance.formatter.checkbox.checked',{},lang) : t('instance.formatter.checkbox.unchecked',{},lang) %></Data></Cell>
-										<% } else if (field.type == "password") { %>
-											<Cell><Data ss:Type="String">******</Data></Cell>
-										<% } else if (field.type == "number") { %>
-											<Cell><Data ss:Type="Number"><%= Number(f_obj[field.code]) ? Number(Number(f_obj[field.code]).toFixed(field.digits)) : 0 %></Data></Cell>
-										<% } else if (field.type == "date") { %>
-											<%
-												var v = f_obj[field.code];
-												if (typeof(v) == "string" && v) {
-													try {
-														v = formatDate(v, t('instance.formatter.date.export_date',{},lang));
-													} catch (e) {
-														console.error(e);
-													}
-												}
-												if (v instanceof Date) {
-													v = formatDate(v, t('instance.formatter.date.export_date',{},lang));
-												}
-												if (!v) {
-													v = "";
-												}
-											%>
-											<Cell><Data ss:Type="String"><%= v %></Data></Cell>
-										<% } else if (field.type == "dateTime") { %>
-											<%
-												var v = f_obj[field.code];
-												if (typeof(v) == "string" && v) {
-													try {
-														v = formatDate(v, t('instance.formatter.date.export_datetime',{},lang));
-													} catch (e) {
-														console.error(e);
-													}
-												}
-												if (v instanceof Date) {
-													v = formatDate(v, t('instance.formatter.date.export_datetime',{},lang));
-												}
-												if (!v) {
-													v = "";
-												}
-											%>
-											<Cell><Data ss:Type="String"><%= v %></Data></Cell>
-											<% } else if (field.type == "odata") { %>
-												<%
-													var odataValue = f_obj[field.code];
-													var v = (odataValue && odataValue["@label"]) ? odataValue["@label"] : "";
-												%>
-												<Cell><Data ss:Type="String"><%= v %></Data></Cell>
-										<% } else { %>
-											<%
-												tem_v = f_obj[field.code];
-												if (typeof(tem_v) == "string") {
-													tem_v = tem_v.replace(/</g, "&lt;").replace(/>/g, "&gt;");
-												}
-											%>
-											<Cell><Data ss:Type="String"><%= tem_v %></Data></Cell>
-										<% } %>
-									<% } %>
+									<%- renderDataCell(field, f_obj[field.code]) %>
 								<% }) %>
 							</Row>
 						<% }) %>
@@ -429,4 +305,4 @@
 			</Table>
 		</Worksheet>
 	<% }) %>
-</Workbook>
+</Workbook>

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@steedos-labs/plugin-workflow",
-  "version": "3.0.86",
+  "version": "3.0.87",
   "main": "package.service.js",
   "license": "MIT",
   "files": [