@steedos-labs/plugin-workflow 3.0.85 → 3.0.87

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

@@ -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/routes/buildFormDesignSystemPrompt.js

@@ -208,13 +208,14 @@ function buildFormDesignSystemPrompt({ chineseFieldNames = false, isUpgrade = fa
 
 - autoNumber 类型（自动编号）：
   - 自动编号字段始终为只读（readonly: true），运行时由系统自动生成唯一编号
+  - auto_number_name: 字符串，可选，编号规则名称；留空时系统按表单和字段自动生成
   - autoNumberPrefix: 字符串，编号前缀，如 "SN-"、"HT-"，默认 ""
   - autoNumberSuffix: 字符串，编号后缀，默认 ""
   - autoNumberPadding: 数字，序号位数（补零），默认 4，如 4 → 0001
   - autoNumberDateFormat: 字符串，日期片段格式，可选值："none"(无日期) | "YYYY"(年) | "YYYYMM"(年月，默认) | "YYYYMMDD"(年月日)
   - autoNumberResetCycle: 字符串，序号重置周期，可选值："none"(不重置) | "yearly"(每年) | "monthly"(每月，默认) | "daily"(每天)
   - 生成的编号格式示例：前缀 + 日期 + 序号 + 后缀，如 "SN-202603-0001"
-  - 示例：{ "type": "autoNumber", "label": "合同编号", "name": "contract_no", "readonly": true, "autoNumberPrefix": "HT-", "autoNumberDateFormat": "YYYYMM", "autoNumberPadding": 4, "autoNumberResetCycle": "monthly" }
+  - 示例：{ "type": "autoNumber", "label": "合同编号", "name": "contract_no", "readonly": true, "auto_number_name": "合同编号", "autoNumberPrefix": "HT-", "autoNumberDateFormat": "YYYYMM", "autoNumberPadding": 4, "autoNumberResetCycle": "monthly" }
 
 - 动态显隐条件（任何字段都可设置）：${chineseFieldNames ? `
   - visibilityExpression: 字符串，条件表达式，控制字段显示/隐藏。当表达式结果为 true 时字段可见，否则隐藏。
@@ -438,11 +439,11 @@ ${formulaRule}
 - 迁移规则：
   - 遇到字段的 default_value 包含 \`auto_number(...)\` 时，将该字段的 type 改为 "autoNumber"，设置 readonly: true
   - 删除原有的 default_value 属性
-  - 如果旧版编号规则名称中能推断出前缀、日期格式等信息，相应设置 autoNumberPrefix、autoNumberDateFormat 等属性；否则使用默认值
+  - 如果旧版编号规则名称中能推断出前缀、日期格式等信息，相应设置 auto_number_name、autoNumberPrefix、autoNumberDateFormat 等属性；否则使用默认值
   - 默认配置：autoNumberPrefix: ""、autoNumberPadding: 4、autoNumberDateFormat: "YYYYMM"、autoNumberResetCycle: "monthly"
 - 迁移示例：
   旧版字段：{ "name": "合同编号", "type": "text", "default_value": "auto_number('contract_no')" }
-  新版字段：{ "name": "contract_no", "label": "合同编号", "type": "autoNumber", "readonly": true, "autoNumberPrefix": "", "autoNumberPadding": 4, "autoNumberDateFormat": "YYYYMM", "autoNumberResetCycle": "monthly" }
+  新版字段：{ "name": "contract_no", "label": "合同编号", "type": "autoNumber", "readonly": true, "auto_number_name": "contract_no", "autoNumberPrefix": "", "autoNumberPadding": 4, "autoNumberDateFormat": "YYYYMM", "autoNumberResetCycle": "monthly" }
 - migrationLog 记录格式："字段 <name>: default_value auto_number(...) 转换为 autoNumber 类型"
 
 ### 旧版 HTML 字段类型迁移

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

@@ -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

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