npm - @steedos-labs/plugin-workflow - Versions diffs - 3.0.65 → 3.0.66 - Mend

@steedos-labs/plugin-workflow 3.0.65 → 3.0.66

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 (22) hide show

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

@@ -89,16 +89,16 @@
                     "name": "radios",
                     "type": "radios",
                     "label": false,
-                    "value": "190",
+                    "value": "210",
                     "className": "mr-0",
                     "options": [
                        {
                             "label": "A4纵向",
-                            "value": "190"
+                            "value": "210"
                         },
                         {
                             "label": "A4横向",
-                            "value": "277"
+                            "value": "297"
                         }
                     ],
                     "mode": "inline",
@@ -107,7 +107,7 @@
                             "actions": [
                                 {
                                     "actionType": "custom",
-                                    "script": "doAction({actionType: 'setValue', componentId: 'u:print-width', args: {value: Number(event.data.value)}}); $('.steedos-instance-related-view-wrapper .instance-form').css('width', event.data.value + 'mm'); $('.steedos-instance-related-view-wrapper .instance-approve-history').css('width', event.data.value + 'mm'); var orientation = event.data.value === '277' ? 'landscape' : 'portrait'; var styleEl = document.getElementById('print-page-orientation'); if (!styleEl) { styleEl = document.createElement('style'); styleEl.id = 'print-page-orientation'; document.head.appendChild(styleEl); } styleEl.textContent = '@page { size: A4 ' + orientation + '; }';"
+                                    "script": "doAction({actionType: 'setValue', componentId: 'u:print-width', args: {value: Number(event.data.value)}}); $('.steedos-instance-related-view-wrapper').css('width', event.data.value + 'mm'); var orientation = event.data.value === '297' ? 'landscape' : 'portrait'; var styleEl = document.getElementById('print-page-orientation'); if (!styleEl) { styleEl = document.createElement('style'); styleEl.id = 'print-page-orientation'; document.head.appendChild(styleEl); } styleEl.textContent = '@page { size: A4 ' + orientation + '; }';"
                                 }
                             ]
                         }
@@ -117,7 +117,7 @@
                     "name": "width",
                     "type": "input-number",
                     "id": "u:print-width",
-                    "value": "190",
+                    "value": "210",
                     "mode": "inline",
                     "className": "w-20 mr-0",
                     "min": "100",
@@ -126,7 +126,7 @@
                             "actions": [
                                 {
                                     "actionType": "custom",
-                                    "script": "$('.steedos-instance-related-view-wrapper .instance-form').css('width', event.data.value + 'mm'); $('.steedos-instance-related-view-wrapper .instance-approve-history').css('width', event.data.value + 'mm');"
+                                    "script": "$('.steedos-instance-related-view-wrapper').css('width', event.data.value + 'mm');"
                                 }
                             ]
                         }
@@ -233,28 +233,45 @@
     },
     "editorState": "default",
     "css": {
+        "body": {
+            "background-color": "#C0C0C0"
+        },
+        "body > .bg-slate-50": {
+            "background-color": "transparent !important"
+        },
+        ".steedos-instance-related-view-wrapper": {
+            "width": "210mm",
+            "margin": "0 auto",
+            "background-color": "#fff"
+        },
         ".steedos-instance-related-view-wrapper > .antd-Page-content": {
-            "display": "inline-block",
-            "transition": "width 0.5s ease-in-out",
-            "width": "unset"
+            "transition": "width 0.5s ease-in-out"
         },
         ".steedos-instance-related-view-wrapper .instance-form": {
-            "width": "190mm",
+            "width": "100%",
+            "margin": "0 auto",
+            "padding": "0 15px",
             "transition": "width 0.5s ease-in-out"
         },
         ".steedos-instance-related-view-wrapper .instance-approve-history": {
-            "width": "190mm",
+            "width": "100%",
+            "margin": "0 auto",
+            "padding": "0 15px",
             "transition": "width 0.5s ease-in-out"
         },
-        ".steedos-instance-related-view-wrapper .steedos-amis-instance-view-content": {
-            "display": "inline-block"
+        ".steedos-instance-related-view-wrapper .instance-name": {
+            "margin": "10px 0 5px 0"
+        },
+        ".steedos-instance-related-view-wrapper .table-page-title": {
+            "display": "none !important"
+        },
+        ".steedos-instance-related-view-wrapper .table-page-body.form-table > tbody > tr:first-child": {
+            "visibility": "collapse"
         },
         ".steedos-amis-instance-view-body": {
-            "padding": "unset",
-            "margin": "1rem",
-            "display": "flex",
-            "flex-direction": "column",
-            "align-items": "center"
+            "padding": "0",
+            "margin": "0",
+            "align-items": "stretch"
         },
         ".steedos-global-header-root": {
             "display": "none"
@@ -353,23 +370,39 @@
                 "height": "auto !important",
                 "overflow": "visible !important",
                 "display": "block !important",
-                "position": "static !important"
+                "position": "static !important",
+                "background-color": "#fff !important"
             },
             ".resize-sensor, .no-print, .antd-Page-toolbar, .steedos-global-header-root": {
                 "display": "none !important"
             },
-            ".steedos-instance-related-view-wrapper, .steedos-instance-related-view-wrapper .antd-Page-content, .steedos-instance-related-view-wrapper .antd-Page-main, .steedos-instance-related-view-wrapper .antd-Page-body, .steedos-instance-related-view-wrapper .steedos-instance-detail-wrapper, .steedos-instance-related-view-wrapper .antd-Service, .steedos-instance-related-view-wrapper .antd-Wrapper, .steedos-instance-related-view-wrapper .steedos-amis-instance-view, .steedos-instance-related-view-wrapper .steedos-amis-instance-view-body, .steedos-instance-related-view-wrapper .steedos-amis-instance-view-content, .steedos-instance-related-view-wrapper .liquid-amis-container": {
+            ".steedos-instance-related-view-wrapper": {
                 "display": "block !important",
                 "height": "auto !important",
-                "width": "100% !important",
+                "margin": "0 auto !important",
                 "overflow": "visible !important",
                 "flex": "none !important",
                 "position": "static !important"
             },
+            ".steedos-instance-related-view-wrapper .antd-Page-content, .steedos-instance-related-view-wrapper .antd-Page-main, .steedos-instance-related-view-wrapper .antd-Page-body, .steedos-instance-related-view-wrapper .steedos-instance-detail-wrapper, .steedos-instance-related-view-wrapper .antd-Service, .steedos-instance-related-view-wrapper .antd-Wrapper, .steedos-instance-related-view-wrapper .steedos-amis-instance-view, .steedos-instance-related-view-wrapper .steedos-amis-instance-view-body, .steedos-instance-related-view-wrapper .steedos-amis-instance-view-content, .steedos-instance-related-view-wrapper .liquid-amis-container": {
+                "display": "block !important",
+                "height": "auto !important",
+                "width": "100% !important",
+                "overflow": "visible !important",
+                "flex": "none !important",
+                "position": "static !important",
+                "padding": "0 !important",
+                "margin": "0 !important"
+            },
             ".steedos-instance-related-view-wrapper .instance-form": {
                  "margin": "0 auto",
-                 "width": "100% !important",
-                 "max-width": "100% !important"
+                 "padding": "0 15px !important",
+                 "width": "100% !important"
+            },
+            ".steedos-instance-related-view-wrapper .instance-approve-history": {
+                 "margin": "0 auto",
+                 "padding": "0 15px !important",
+                 "width": "100% !important"
             },
             ".steedos-instance-related-view-wrapper .instance-form-view": {
                 "table-layout": "fixed !important",
@@ -380,39 +413,75 @@
                 "display": "block !important"
             },
             ".steedos-instance-related-view-wrapper .antd-Table-contentWrap": {
-                "overflow-y": "visible !important",
                 "overflow-x": "auto !important",
                 "display": "block !important",
                 "width": "100% !important",
                 "height": "auto !important"
             },
+            ".steedos-instance-related-view-wrapper .instance-form .td-childfield": {
+                "overflow-x": "auto !important",
+                "overflow-y": "visible !important"
+            },
             ".steedos-instance-related-view-wrapper .instance-form-view td": {
                 "border-width": "1px !important"
             },
             ".steedos-instance-related-view-wrapper .steedos-input-table .antd-Table-table": {
                 "-webkit-print-color-adjust": "exact !important",
                 "print-color-adjust": "exact !important",
-                "table-layout": "auto !important"
+                "table-layout": "auto !important",
+                "width": "100% !important",
+                "border-collapse": "collapse !important"
+            },
+            ".steedos-instance-related-view-wrapper .steedos-input-table .antd-Table-table thead": {
+                "display": "table-row-group !important"
             },
             ".steedos-instance-related-view-wrapper .steedos-input-table .antd-Table-table th": {
                 "border-left": "1px solid #000 !important",
+                "border-right": "1px solid #000 !important",
                 "border-bottom": "1px solid #000 !important",
+                "border-top": "none !important",
                 "white-space": "normal !important"
             },
+            ".steedos-instance-related-view-wrapper .steedos-input-table .antd-Table-table th:first-child, .steedos-instance-related-view-wrapper .steedos-input-table .antd-Table-table td:first-child": {
+                "border-left": "none !important"
+            },
+            ".steedos-instance-related-view-wrapper .steedos-input-table .antd-Table-table th:last-child, .steedos-instance-related-view-wrapper .steedos-input-table .antd-Table-table td:last-child": {
+                "border-right": "none !important"
+            },
             ".steedos-instance-related-view-wrapper .steedos-input-table .antd-Table-table td": {
-                "border-left": "1px solid #000 !important",
-                "border-bottom": "1px solid #000 !important"
+                "border": "1px solid #000 !important"
+            },
+            ".steedos-instance-related-view-wrapper .steedos-input-table .antd-Table-table th.antd-Table-operationCell, .steedos-instance-related-view-wrapper .steedos-input-table .antd-Table-table td.antd-Table-operationCell, .steedos-instance-related-view-wrapper .steedos-input-table .antd-Table-table td.steedos-input-table-column-operation": {
+                "display": "none !important"
             },
-            ".steedos-instance-related-view-wrapper .steedos-input-table .antd-Table-table th.antd-Table-operationCell, .steedos-instance-related-view-wrapper .steedos-input-table .antd-Table-table td.antd-Table-operationCell": {
-                "visibility": "collapse !important",
-                "border": "none !important",
-                "padding": "0 !important"
+            ".steedos-instance-related-view-wrapper .steedos-input-table .antd-Table-table tbody td .antd-Form-static": {
+                "word-break": "normal !important",
+                "white-space": "normal !important",
+                "overflow": "visible !important",
+                "text-overflow": "clip !important",
+                "max-width": "none !important"
             },
-            ".steedos-instance-related-view-wrapper .steedos-input-table .antd-Form-static": {
-                "word-break": "normal !important"
+            ".steedos-instance-related-view-wrapper .steedos-input-table .antd-Table-table tbody td .antd-PlainField, .steedos-instance-related-view-wrapper .steedos-input-table .antd-Table-table tbody td .antd-TplField, .steedos-instance-related-view-wrapper .steedos-input-table .antd-Table-table tbody td .antd-Words-field": {
+                "white-space": "normal !important",
+                "overflow": "visible !important",
+                "text-overflow": "clip !important",
+                "max-width": "none !important",
+                "display": "inline !important"
             },
             ".steedos-instance-related-view-wrapper .instance-approve-history .antd-Table-table tr td": {
                 "border-bottom": "1px solid #e8e8e8 !important"
+            },
+            ".antd-Table-content.scroll-end": {
+                "direction": "rtl !important"
+            },
+            ".antd-Table-content.scroll-end table": {
+                "direction": "ltr !important"
+            },
+            ".steedos-instance-related-view-wrapper .table-page-body.form-table > tbody > tr:first-child": {
+                "display": "none !important"
+            },
+            ".steedos-instance-related-view-wrapper .table-page-body.form-table > tbody > tr:nth-child(2) td": {
+                "border-top": "none !important"
             }
         }
     },
@@ -422,7 +491,7 @@
             "actions": [
                 {
                     "actionType": "custom",
-                    "script": "document.querySelectorAll('link[rel=\"stylesheet\"]').forEach(link => { if (link.href.includes('salesforce-lightning-design-system.min.css')) { link.remove(); } }); var styleEl = document.createElement('style'); styleEl.id = 'print-page-orientation'; styleEl.textContent = '@page { size: A4 portrait; }'; document.head.appendChild(styleEl);"
+                    "script": "document.querySelectorAll('link[rel=\"stylesheet\"]').forEach(link => { if (link.href.includes('salesforce-lightning-design-system.min.css')) { link.remove(); } }); for(var si=0;si<document.styleSheets.length;si++){try{var sh=document.styleSheets[si];if(!sh.href||!sh.href.match(/index-[A-Za-z0-9]+\\.css/))continue;for(var ri=sh.cssRules.length-1;ri>=0;ri--){var sel=sh.cssRules[ri].selectorText||'';if(sel.match(/^::?-webkit-scrollbar/))sh.deleteRule(ri);}}catch(e){}} var styleEl=document.createElement('style'); styleEl.id='print-page-orientation'; styleEl.textContent='@page { size: A4 portrait; }'; document.head.appendChild(styleEl); document.addEventListener('scroll',function(e){var t=e.target;if(t&&t.classList&&t.classList.contains('antd-Table-content')){if(window._isPrinting)return;var sl=t.scrollLeft;var max=t.scrollWidth-t.clientWidth;if(sl>0&&sl>=max-1){t.classList.add('scroll-end');}else{t.classList.remove('scroll-end');}}},true); window.addEventListener('beforeprint',function(){window._isPrinting=true;}); window.addEventListener('afterprint',function(){window._isPrinting=false;});"
                 },
                 {
                     "actionType": "custom",

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

@@ -52,6 +52,13 @@ router.post('/api/workflow/v2/approve/save', requireAuthentication, afterHook, a
         });
         const lang = current_user.locale == 'zh-cn' ? 'zh-CN' : 'en';
+        // 传阅(cc)类型：已结束的流程直接返回成功，不做任何操作
+        if (current_approve.type === 'cc' && instance.state !== 'pending') {
+            return res.status(200).send({
+                'instance': instance
+            });
+        }
         try {
             await UUFlowManager.isInstancePending(instance, lang);
             await UUFlowManager.isTraceNotFinished(current_trace);

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

@@ -185,7 +185,7 @@ router.post('/api/workflow/forward', requireAuthentication, async function (req,
                 })
                 select_to_input_fields.forEach(function (field) {
-                    if (old_values[field.code]) {
+                    if (old_values[field.code] != null) {
                         new_values[field.code] = old_values[field.code];
                     }
                 })
@@ -200,7 +200,7 @@ router.post('/api/workflow/forward', requireAuthentication, async function (req,
                                 }
                                 var key = f.code;
                                 var old_v = old_values[key];
-                                if (old_v) {
+                                if (old_v != null) {
                                     var fieldOptions = f.options && f.options.split && f.options.split("\n").map(function (n) {
                                         var itemSplits = n.split(":");
                                         return {
@@ -242,7 +242,7 @@ router.post('/api/workflow/forward', requireAuthentication, async function (req,
                                         }
                                         var key = f.code;
                                         var old_v = old_table_row_values[key];
-                                        if (old_v) {
+                                        if (old_v != null) {
                                             var fieldOptions = f.options && f.options.split && f.options.split("\n").map(function (n) {
                                                 var itemSplits = n.split(":");
                                                 return {
@@ -287,7 +287,7 @@ router.post('/api/workflow/forward', requireAuthentication, async function (req,
                         }
                         var key = field.code;
                         var old_v = old_values[key];
-                        if (old_v) {
+                        if (old_v != null) {
                             // 校验 单选，多选，下拉框 字段值是否在新表单对应字段的可选值范围内
                             var fieldOptions = field.options && field.options.split && field.options.split("\n").map(function (n) {
                                 var itemSplits = n.split(":");

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

@@ -89,7 +89,7 @@ router.post('/api/workflow/forward_refill', requireAuthentication, async functio
                         table_data = (approve != null ? approve.values[subTable] : void 0) || [];
                         row_data = {};
                         columns.forEach(function (column) {
-                            return row_data[column] = forward_ins_values[column] || "";
+                            return row_data[column] = forward_ins_values[column] ?? "";
                         });
                         if (row_data && row_data !== {}) {
                             table_data.push(row_data);

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

@@ -203,7 +203,7 @@ router.post("/api/workflow/v2/instance/forward", requireAuthentication, async fu
         // Process select to input fields
         for (const field of select_to_input_fields) {
-            if (old_values[field.code]) {
+            if (old_values[field.code] != null) {
                 new_values[field.code] = old_values[field.code];
             }
         }
@@ -218,7 +218,7 @@ router.post("/api/workflow/v2/instance/forward", requireAuthentication, async fu
                         }
                         const key = f.code;
                         let old_v = old_values[key];
-                        if (old_v) {
+                        if (old_v != null) {
                             const fieldOptions = _.isArray(f.options) ? f.options : f.options?.split("\n").map(n => {
                                 const itemSplits = n.split(":");
                                 return {
@@ -258,7 +258,7 @@ router.post("/api/workflow/v2/instance/forward", requireAuthentication, async fu
                                 }
                                 const key = f.code;
                                 let old_v = old_table_row_values[key];
-                                if (old_v) {
+                                if (old_v != null) {
                                     const fieldOptions = f.options?.split("\n").map(n => {
                                         const itemSplits = n.split(":");
                                         return {
@@ -301,7 +301,7 @@ router.post("/api/workflow/v2/instance/forward", requireAuthentication, async fu
                 }
                 const key = field.code;
                 let old_v = old_values[key];
-                if (old_v) {
+                if (old_v != null) {
                     const fieldOptions = _.isArray(field.options) ? field.options : field.options?.split("\n").map(n => {
                         const itemSplits = n.split(":");
                         return {

package/main/default/services/instance.service.js CHANGED Viewed

@@ -145,6 +145,7 @@ module.exports = {
                     filter.push(['handler', '=', userId]);
                     filter.push(['is_finished', '=', true]);
                     filter.push(['is_latest_approve', '=', true]);
+                    filter.push(['type', '!=', 'draft']);
                     break;
                 case 'draft':
                     filter.push(['submitter', '=', userId]);

package/main/default/test/test_socket_reconnect.js ADDED Viewed

@@ -0,0 +1,105 @@
+/**
+ * Socket 重连相关 Bug 测试脚本
+ *
+ * 测试两个问题：
+ *   Bug 1: Socket 重连后，badge 数据没变化时仍触发左侧菜单重载（显示 loading）
+ *   Bug 2: 初始加载时若 socket 已连接，connection-init listener 未注册，
+ *           导致重连后不会重新 subscribe，badge 推送完全收不到
+ *
+ * 使用方式：
+ *   1. 在审批中心页面（如 /app/approve_workflow/instance_tasks/...）打开浏览器控制台
+ *   2. 粘贴本脚本执行，或通过 MCP Chrome evaluate_script 注入
+ *   3. 返回 { bug1, bug2 } 测试结果
+ *
+ * 预期（修复前）：bug1.passed = false, bug2.passed = false
+ * 预期（修复后）：bug1.passed = true,  bug2.passed = true
+ */
+async function testSocketReconnectBugs() {
+  const results = {
+    bug1: { name: 'Badge 未变化时不应触发菜单重载', passed: false, detail: '' },
+    bug2: { name: '重连后应能收到 badge 推送', passed: false, detail: '' },
+  };
+  const socket = window.socket;
+  if (!socket) {
+    results.bug1.detail = results.bug2.detail = 'window.socket 不存在';
+    return results;
+  }
+  // ======== Bug 1 测试 ========
+  // 断开 → 重连 → 等待 badge 事件 → 检查是否触发了 approval-tree-menu:reload
+  {
+    let menuReloadFired = false;
+    let badgeReceived = false;
+    const onMessage = (event) => {
+      const msg = event.data;
+      if (msg && msg.type === 'approval-tree-menu:reload') {
+        menuReloadFired = true;
+      }
+    };
+    window.addEventListener('message', onMessage);
+    const onBadge = () => { badgeReceived = true; };
+    socket.on('s:workflow:badge:change', onBadge);
+    // 断开并重连
+    socket.disconnect();
+    await sleep(500);
+    socket.connect();
+    // 等待重连 + 服务端3秒延迟推送 badge + 1秒余量
+    await sleep(5000);
+    socket.off('s:workflow:badge:change', onBadge);
+    window.removeEventListener('message', onMessage);
+    if (!badgeReceived) {
+      // 如果连 badge 事件都没收到，说明 Bug 2 存在，Bug 1 无法独立判断
+      results.bug1.detail = '未收到 badge 事件（可能因 Bug 2），无法独立判断 Bug 1';
+      results.bug1.passed = null; // 未知
+    } else if (menuReloadFired) {
+      results.bug1.detail = '重连后 badge 数据未变化，但 approval-tree-menu:reload 被触发了（Bug 存在）';
+      results.bug1.passed = false;
+    } else {
+      results.bug1.detail = '重连后 badge 数据未变化，approval-tree-menu:reload 未触发（正常）';
+      results.bug1.passed = true;
+    }
+  }
+  // ======== Bug 2 测试 ========
+  // 再次断开 → 重连 → 检查是否重新 subscribe 并收到 badge 事件
+  {
+    let badgeReceived = false;
+    const onBadge = () => { badgeReceived = true; };
+    socket.on('s:workflow:badge:change', onBadge);
+    socket.disconnect();
+    await sleep(500);
+    socket.connect();
+    // 等待重连 + 服务端3秒延迟推送 + 1秒余量
+    await sleep(5000);
+    socket.off('s:workflow:badge:change', onBadge);
+    if (badgeReceived) {
+      results.bug2.detail = '重连后成功收到 badge 推送（正常）';
+      results.bug2.passed = true;
+    } else {
+      results.bug2.detail = '重连后未收到 badge 推送，subscribe 可能丢失（Bug 存在）';
+      results.bug2.passed = false;
+    }
+  }
+  return results;
+}
+function sleep(ms) {
+  return new Promise(resolve => setTimeout(resolve, ms));
+}
+// 导出给 MCP 调用
+window._testSocketReconnectBugs = testSocketReconnectBugs;

package/main/default/utils/designerManager.js CHANGED Viewed

@@ -247,6 +247,18 @@ async function updateForm(formId, form, forms, flows, currentUserId) {
         }
     } else {
         current = ff.current;
+        // 即使表单不升级，也要更新关联流程的修改时间和修改人
+        let flowCursor = await flowCollection.find({form: formId});
+        let flowList = await flowCursor.toArray();
+        for (let flow of flowList) {
+            await flowCollection.updateOne({_id: flow._id}, {
+                $set: {
+                    'modified': now,
+                    'modified_by': currentUserId
+                }
+            });
+            flows.push(await flowCollection.findOne({_id: flow._id}));
+        }
     }
     current.modified = now;

package/package.json CHANGED Viewed

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