npm - @steedos-labs/plugin-workflow - Versions diffs - 3.0.40 → 3.0.42 - Mend

@steedos-labs/plugin-workflow 3.0.40 → 3.0.42

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

package/designer/dist/index.html CHANGED Viewed

@@ -5,8 +5,8 @@
     <link rel="icon" type="image/svg+xml" href="/api/workflow/designer-v2/vite.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-DRUi3eGk.js"></script>
-    <link rel="stylesheet" crossorigin href="/api/workflow/designer-v2/assets/index-BIbXABqz.css">
+    <script type="module" crossorigin src="/api/workflow/designer-v2/assets/index-BsqTuhsm.js"></script>
+    <link rel="stylesheet" crossorigin href="/api/workflow/designer-v2/assets/index-B1eKIobX.css">
   </head>
   <body>
     <div id="root"></div>

package/main/default/applications/approve_workflow.app.yml CHANGED Viewed

@@ -23,166 +23,7 @@ nav_schema: {
       "ignoreNavSchema": true
     },
     {
-      "type": "wrapper",
-      "size": "none",
-      "className": "instances-sidebar-wrapper mt-1 bg-white",
-      "body": [
-        {
-          "type": "button",
-          "label": "刷新",
-          "className": "instance-nav-reload hidden",
-          "onEvent": {
-            "click": {
-              "actions": [
-                {
-                  "actionType": "reload",
-                  "componentId": "u:instanceNav"
-                }
-              ]
-            }
-          }
-        },
-        {
-          "type": "button",
-          "label": "刷新树",
-          "className": "instance-tree-reload hidden",
-          "onEvent": {
-            "click": {
-              "actions": [
-                {
-                  "actionType": "custom",
-                  "script": "try{ var opts = window.__latestNavOptions; var data = window.__latestNavData; if(!Array.isArray(opts)){ console.log('[tree-reload] no global options'); return; } opts = JSON.parse(JSON.stringify(opts)); var tree = window.__navTreeComponent; if(!tree || !tree.props || !tree.props.formItem){ console.log('[tree-reload] no saved tree ref, trying amisScoped'); var s = window.amisScoped || (document.querySelector('[data-amisScoped]') && document.querySelector('[data-amisScoped]').__amisScoped); if(s){ tree = s.getComponentById('u:instanceNavTree'); } } if(tree && tree.props && tree.props.formItem){ tree.props.formItem.setOptions(opts, undefined, data || {}); console.log('[tree-reload] setOptions done, count:', opts.length); if(tree.forceUpdate){ tree.forceUpdate(); console.log('[tree-reload] forceUpdate called'); } } else { console.log('[tree-reload] FAIL: cannot find tree component'); } }catch(e){ console.warn('[tree-reload error]', e); }"
-                }
-              ]
-            }
-          }
-        },
-        {
-          "type": "service",
-          "id": "u:instanceNav",
-          "className": "bg-white",
-          "onEvent": {
-            "@data.changed.instances": {
-              "actions": [
-                {
-                  "actionType": "reload"
-                }
-              ]
-            },
-            "fetchInited": {
-              "actions": [
-                {
-                  "actionType": "custom",
-                  "script": "try{ var s = event.context && event.context.scoped; if(!s){ var amisScoped = window.amisScoped || (document.querySelector('[data-amisScoped]') && document.querySelector('[data-amisScoped]').__amisScoped); if(amisScoped){ s = amisScoped; } } if(s){ var tree = s.getComponentById('u:instanceNavTree'); if(tree && tree.props && tree.props.formItem){ window.__navTreeComponent = tree; var opts = event.data && event.data.options; if(Array.isArray(opts)){ opts = JSON.parse(JSON.stringify(opts)); tree.props.formItem.setOptions(opts, undefined, event.data); if(tree.forceUpdate){ setTimeout(function(){ tree.forceUpdate(); }, 100); } } } } var _navComp = s && s.getComponentById('u:instanceNav'); if(_navComp && _navComp.props && _navComp.props.store){ window.__instanceNavStore = _navComp.props.store; } if(!window._instanceNavRouteListenerAdded){ window._instanceNavRouteListenerAdded = true; window._wasOnApproveWorkflow = true; window.addEventListener('message', function(evt){ if(!evt.data || !evt.data.type) return; if(evt.data.type === 'ROUTE_CHANGE'){ var isOnApprove = window.location.pathname.indexOf('/app/approve_workflow') === 0; var wasOn = window._wasOnApproveWorkflow; window._wasOnApproveWorkflow = isOnApprove; if(!isOnApprove) return; var isPop = evt.data.navigationType === 'POP'; if(wasOn && !isPop) return; clearTimeout(window._instanceNavReloadTimer); window._instanceNavReloadTimer = setTimeout(function(){ var _val = window.location.pathname + decodeURIComponent(window.location.search); _val = _val.replace(new RegExp('/view/(?!none)[^?#/]+'), '/view/none'); var opts = window.__latestNavOptions; if(opts){ var _fn = function(o,v){ for(var i=0;i<o.length;i++){ if(o[i].value===v) return v; if(o[i].children){ var f=_fn(o[i].children,v); if(f) return f; } } return null; }; var _fl = function(o,sid,sobj){ for(var i=0;i<o.length;i++){ var v=o[i].value; if(v){ var m1=v.match(/side_listview_id=([^&]*)/); var m2=v.match(/side_object=([^&]*)/); if(m1&&m2&&m1[1]===sid&&m2[1]===sobj) return v; } if(o[i].children){ var f=_fl(o[i].children,sid,sobj); if(f) return f; } } return null; }; if(!_fn(opts,_val)){ var lm=_val.match(/side_listview_id=([^&]*)/); var om=_val.match(/side_object=([^&]*)/); if(lm&&om){ var pm=_fl(opts,lm[1],om[1]); if(pm) _val=pm; } } } var store = window.__instanceNavStore; if(store && store.updateData){ store.updateData({ value: _val, _ts: Date.now() }, undefined, false); } var _tree = window.__navTreeComponent; if(_tree && _tree.props && _tree.props.setPrinstineValue){ _tree.props.setPrinstineValue(_val); } }, 300); } }); } }catch(e){ console.warn('[fetchInited error]', e); }"
-                }
-              ]
-            }
-          },
-          "body": [
-            {
-              "type": "input-tree",
-              "name": "instanceNavTree",
-              "treeContainerClassName": "h-full bg-white",
-              "className": "instance-box-tree h-full w-full p-0 bg-white",
-              "id": "u:instanceNavTree",
-              "stacked": true,
-              "multiple": false,
-              "enableNodePath": false,
-              "hideRoot": true,
-              "showIcon": true,
-              "initiallyOpen": false,
-              "virtualThreshold": 100000,
-              "value": "${value}",
-              "size": "md",
-              "onEvent": {
-                "change": {
-                  "actions": [
-                    {
-                      "actionType": "setValue",
-                      "componentId": "instances_list_service",
-                      "args": {
-                        "value": {
-                          "isFlowDataDone": false
-                        }
-                      }
-                    },
-                    {
-                      "actionType": "custom",
-                      "script": "//获取上一次的flowId和categoryId\nconst lastFlowId = event.data.flowId;\nconst lastCategoryId = event.data.categoryId;\n//从value中获取最新的flowId\nvar flowIdRegex = /&flowId=([^&]+)/;\nvar flowIdMatch = event.data.value.match(flowIdRegex);\nconst flowId = flowIdMatch && flowIdMatch.length > 0 ? flowIdMatch[1] : \"\";\n//从value中获取最新的categoryId\nvar categoryIdRegex = /&categoryId=([^&]+)/;\nvar categoryIdMatch = event.data.value.match(categoryIdRegex);\nconst categoryId = categoryIdMatch && categoryIdMatch.length > 0 ? categoryIdMatch[1] : \"\";\n//获取上一次的listname和最新的listname\nconst lastListName = event.data.listName;\nconst listName = event.data.value.split('?')[0].split('instances/grid/')[1];\n//切换流程时清除过滤条件\nif (lastListName == \"monitor\" && listName == \"monitor\" && (flowId != lastFlowId || categoryId != lastCategoryId)) {\n  listViewPropsStoreKey = window.location.pathname + \"/crud\";\n  sessionStorage.removeItem(listViewPropsStoreKey);\n  sessionStorage.removeItem(listViewPropsStoreKey + \"/query\");\n}"
-                    },
-                    {
-                      "actionType": "setValue",
-                      "componentId": "instances_list_service",
-                      "args": {
-                        "value": {
-                          "additionalFilters": [
-                            "${event.data.options.name}",
-                            "=",
-                            "${event.data.options.value}"
-                          ]
-                        }
-                      },
-                      "expression": "${event.data.options.level>=10}"
-                    },
-                    {
-                      "args": {
-                        "link": "${event.data.value}",
-                        "blank": false
-                      },
-                      "actionType": "link"
-                    }
-                  ]
-                }
-              },
-              "menuTpl": {
-                "type": "wrapper",
-                "className": "flex items-center py-1.5 px-3 m-0 rounded-md transition-colors duration-150",
-                "body": [
-                  {
-                    "type": "tpl",
-                    "className": "flex-1 leading-6 truncate instance-menu-label",
-                    "tpl": "${label}",
-                    "id": "u:9dee51f00db4"
-                  },
-                  {
-                    "type": "tpl",
-                    "className": "ml-auto",
-                    "tpl": "",
-                    "badge": {
-                      "className": "h-0",
-                      "offset": [
-                        -5,
-                        0
-                      ],
-                      "mode": "text",
-                      "text": "${tag | toInt}",
-                      "overflowCount": 999
-                    },
-                    "id": "u:2329cd1fecc2"
-                  }
-                ],
-                "id": "u:545154bcc334"
-              },
-              "unfoldedLevel": 2,
-              "source": "${options}"
-            }
-          ],
-          "api": {
-            "method": "get",
-            "url": "${context.rootUrl}/api/${appId}/workflow/nav",
-            "headers": {
-              "Authorization": "Bearer ${context.tenantId},${context.authToken}"
-            },
-            "trackExpression": "false",
-            "messages": {},
-            "adaptor": "var _val = window.location.pathname + decodeURIComponent(window.location.search); _val = _val.replace(new RegExp('/view/(?!none)[^?#/]+'), '/view/none'); console.log('[adaptor] computed value:', _val); function _findNode(opts, val){ for(var i=0;i<opts.length;i++){ if(opts[i].value===val) return opts[i].value; if(opts[i].children){ var f=_findNode(opts[i].children,val); if(f) return f; } } return null; } function _findByListview(opts, sid, sobj){ for(var i=0;i<opts.length;i++){ var v=opts[i].value; if(v){ var m1=v.match(/side_listview_id=([^&]*)/); var m2=v.match(/side_object=([^&]*)/); if(m1&&m2&&m1[1]===sid&&m2[1]===sobj){ return v; } } if(opts[i].children){ var f=_findByListview(opts[i].children,sid,sobj); if(f) return f; } } return null; } if(payload.data.options){ var exactMatch=_findNode(payload.data.options, _val); if(!exactMatch){ console.log('[adaptor] no exact match, trying partial match'); var lm=_val.match(/side_listview_id=([^&]*)/); var om=_val.match(/side_object=([^&]*)/); if(lm&&om){ var partialMatch=_findByListview(payload.data.options, lm[1], om[1]); if(partialMatch){ console.log('[adaptor] partial match found:', partialMatch); _val=partialMatch; } else { console.log('[adaptor] no partial match either, listview='+lm[1]+' object='+om[1]); } } } else { console.log('[adaptor] exact match found'); } } payload.data.value = _val; payload.data._ts = Date.now(); if(payload.data.options){ payload.data.options = JSON.parse(JSON.stringify(payload.data.options)); window.__latestNavOptions = payload.data.options; window.__latestNavData = payload.data; console.log('[adaptor] saved options to global, count:', payload.data.options.length); } return payload;"
-          },
-          "messages": {},
-          "dsType": "api"
-        }
-      ],
-      "isFixedHeight": false,
-      "isFixedWidth": false
+      "type": "approval-tree-menu"
     }
   ],
   "isFixedHeight": false,

package/main/default/applications/desktop.app.yml ADDED Viewed

@@ -0,0 +1,21 @@
+code: desktop
+enable_nav_schema: true
+nav_schema: {
+  "type": "wrapper",
+  "size": "none",
+  "body": [
+    {
+      "type": "steedos-app-menu",
+      "stacked": true,
+      "appId": "approve_workflow",
+      "ignoreNavSchema": true
+    },
+    {
+      "type": "approval-tree-menu",
+      "apiUrl": "/api/approve_workflow/workflow/nav",
+      "navigateMode": "router"
+    }
+  ],
+  "isFixedHeight": false,
+  "isFixedWidth": false
+}

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

@@ -45,11 +45,7 @@ window.waitForThing(window, 'socket').then(()=>{
         };
         if (isFirstRun === false && shouldReloadView()) {
           window.$(".list-view-btn-reload").click()
-          clearTimeout(window.__navReloadTimer)
-          clearTimeout(window.__navRetryTimer)
-          window.__navReloadTimer = setTimeout(function(){ window.$(".instance-nav-reload").click() }, 500)
-          // Retry: reload tree only (no API request) to pick up data already in Service store
-          window.__navRetryTimer = setTimeout(function(){ window.$(".instance-tree-reload").click() }, 2000)
+          window.postMessage({ type: "approval-tree-menu:reload" }, "*")
         }
         isFirstRun = false;
     });
@@ -62,6 +58,7 @@ window.waitForThing(window, 'socket').then(()=>{
         };
         if (shouldReloadView()) {
           window.$(".list-view-btn-reload").click()
+          window.postMessage({ type: "approval-tree-menu:reload" }, "*")
         }
     });

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

@@ -159,7 +159,11 @@ getHandlersManager.getHandlers = async function (instance_id, step_id, login_use
     // 拟稿时, 可以设定后续每个步骤的处理人 #1926
     if (instance.step_approve && !_.isEmpty(instance.step_approve[`${step_id}_options`])) {
-        return instance.step_approve[`${step_id}_options`];
+        const res = instance.step_approve[`${step_id}_options`];
+        if(res != null && res.length > 0 && res[0] != null){
+            return res;
+        }
     }
     let approve_users = [];
@@ -195,7 +199,6 @@ getHandlersManager.getHandlers = async function (instance_id, step_id, login_use
     current_step = _.find(current_steps, function (step) {
         return step._id === step_id;
     });
     if (current_step.step_type === "condition") {
         const unfinished_trace = _.find(instance.traces, function (trace) {
             return trace.is_finished === false;

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

@@ -1603,6 +1603,12 @@ function isNormalApprove(approve) {
  *   This prevents infinite loops caused by circular flow definitions.
  */
 UUFlowManager.handleSkipProcessed = async function (instance_id, flow, maxDepth = 20) {
+    // 环境变量控制是否启用滑步功能，默认启用
+    const skipProcessedEnabled = process.env.WORKFLOW_SKIP_PROCESSED_ENABLED;
+    if (skipProcessedEnabled === 'false' || skipProcessedEnabled === '0') {
+        return;
+    }
     if (maxDepth <= 0) {
         console.warn('[workflow/engine] [handleSkipProcessed] Max recursion depth reached');
         return;

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

@@ -415,7 +415,11 @@ WorkflowManager.getFormulaUserObject = async function (spaceId, userId) {
         return WorkflowManager.getFormulaUsers(spaceId, userId);
     } else {
         const users = await WorkflowManager.getFormulaUsers(spaceId, [userId]);
-        return users[0];
+        // console.log(`getFormulaUserObject users`, users)
+        return users && users.length > 0 ? users[0] : {
+            organization: {},
+            hr: {}
+        };
     }
 };

package/main/default/objects/instances/buttons/instance_delete.button.yml CHANGED Viewed

@@ -29,13 +29,19 @@ amis_schema: |-
                                 "actionType": "custom",
                                 "script": "SteedosWorkflow.Instance.changed=false; navigate('/app/approve_workflow/instances/view/none?side_object=instances&side_listview_id=draft&additionalFilters=&flowId=&categoryId=')"
                             },
+                            {
+                                "actionType": "wait",
+                                "args": {
+                                    "time": 500
+                                }
+                            },
                             {
                                 "actionType": "custom",
                                 "script":"window.$('.list-view-btn-reload').click()"
                             },
                             {
                                 "actionType": "custom",
-                                "script":"window.$('.instance-nav-reload').click()"
+                                "script":"window.postMessage({ type: 'approval-tree-menu:reload' }, '*')"
                             }
                       ],
                       "weight": 0

package/main/default/objects/instances/buttons/instance_new.button.yml CHANGED Viewed

@@ -68,7 +68,7 @@ amis_schema: |-
                                                         {
                                                             "actionType": "wait",
                                                             "args": {
-                                                                "time": 100
+                                                                "time": 500
                                                             }
                                                         },
                                                         {
@@ -77,7 +77,7 @@ amis_schema: |-
                                                         },
                                                         {
                                                             "actionType": "custom",
-                                                            "script":"window.$('.instance-nav-reload').click()"
+                                                            "script":"window.postMessage({ type: 'approval-tree-menu:reload' }, '*')"
                                                         }
                                                     ]
                                                 }

package/main/default/objects/instances/listviews/monitor.listview.yml CHANGED Viewed

@@ -34,4 +34,6 @@ searchable_fields:
 extra_columns:
   - extras
   - values
-disableSwitch: true
+disableSwitch: true
+searchable_default:
+  submit_date: "${[STARTOF(DATEMODIFY(NOW(), -180, 'day'), 'day'),ENDOF(NOW(), 'day')]}"

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

@@ -330,11 +330,17 @@ router.post('/api/workflow/v2/auto_number', requireAuthentication, async functio
         // 为每个自动编号字段生成编号
         const result = {};
         const updateObj = {};
+        let currentValues = {}
+        if(_.isEmpty(currentApprove.values)){
+            currentValues = instance.values || {};
+        }else{
+            currentValues = currentApprove.values;
+        }
         for (const field of autoNumberFields) {
             // 检查字段是否已有值
-            if (currentApprove.values && currentApprove.values[field.code]) {
-                result[field.code] = currentApprove.values[field.code];
+            if (currentValues && currentValues[field.code]) {
+                result[field.code] = currentValues[field.code];
                 continue;
             }

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

@@ -291,6 +291,7 @@ router.get('/api/:appId/workflow/nav', requireAuthentication, async function (re
         "label": t('inbox', {}, userSession.language),
         "icon": "fa fa-download",
         "tag":inboxResult.count,
+        "unfolded": true,
         "options":{
           "level":1,
           "to": `/app/${appId}/instance_tasks/view/none?side_object=instance_tasks&side_listview_id=inbox&additionalFilters=`

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

@@ -262,8 +262,24 @@ router.post('/api/workflow/v2/nextStepUsersValue', requireAuthentication, async
         const { instanceId, nextStepId } = req.body;
         let instance = await UUFlowManager.getInstance(instanceId);
-        const step_approve = instance.step_approve || {};
-        const newNextUsers = step_approve[nextStepId] || []
+        // 优先从最近一次 traces 中查找 nextStepId 对应的处理人
+        let newNextUsers = [];
+        const traces = instance.traces || [];
+        for (let i = traces.length - 1; i >= 0; i--) {
+            const trace = traces[i];
+            if (trace.step === nextStepId && trace.approves && trace.approves.length > 0) {
+                newNextUsers = trace.approves.map(approve => approve.handler);
+                break;
+            }
+        }
+        // 如果 traces 中没有找到，回退到 step_approve
+        if (newNextUsers.length === 0) {
+            const step_approve = instance.step_approve || {};
+            newNextUsers = step_approve[nextStepId] || [];
+        }
         res.status(200).send({
             'value': newNextUsers,
             'error': error

package/main/default/test/test_badge_draft.js CHANGED Viewed

@@ -12,11 +12,9 @@
   const origLog = console.log;
   // ---- 前置检查 ----
-  const navBtn = document.querySelector('.instance-nav-reload');
-  const treeBtn = document.querySelector('.instance-tree-reload');
-  const treeEl = document.querySelector('.instance-box-tree');
-  if (!navBtn || !treeBtn || !treeEl) {
-    console.error('缺少必要 DOM 元素'); return;
+  const menuEl = document.querySelector('.approval-tree-menu');
+  if (!menuEl) {
+    console.error('❌ 未找到 .approval-tree-menu 组件'); return;
   }
   let baseDraft = null;
@@ -92,26 +90,16 @@
   function sleep(ms) { return new Promise(r => setTimeout(r, ms)); }
   function getAllBadges() {
-    var sels = ['[class*="Badge-text"]', '.antd-Badge-text', '.cxd-Badge-text'];
-    for (var s of sels) { var e = treeEl.querySelectorAll(s); if (e.length) return e; }
-    return [];
+    return menuEl.querySelectorAll('.ant-badge-count');
   }
   function findBadgeByLabel(label) {
-    var items = treeEl.querySelectorAll('.cxd-Tree-itemLabel, .antd-Tree-itemLabel');
-    for (var item of items) {
-      if (item.textContent.includes(label)) {
-        var badge = item.querySelector('[class*="Badge-text"]');
-        if (badge) return parseInt(badge.textContent.trim(), 10);
-      }
-    }
-    // fallback: 搜索所有tree item
-    var allItems = treeEl.querySelectorAll('.cxd-Tree-item, .antd-Tree-item');
-    for (var ai of allItems) {
-      var labelEl = ai.querySelector('.instance-menu-label');
+    const nodes = menuEl.querySelectorAll('.ant-tree-treenode');
+    for (const node of nodes) {
+      const labelEl = node.querySelector('.approval-tree-menu__label');
       if (labelEl && labelEl.textContent.includes(label)) {
-        var b = ai.querySelector('[class*="Badge-text"]');
-        if (b) return parseInt(b.textContent.trim(), 10);
+        const badge = node.querySelector('.ant-badge-count');
+        if (badge) return parseInt(badge.textContent.trim(), 10);
       }
     }
     return null;
@@ -120,7 +108,7 @@
   // ---- 初始化 ----
   origLog.call(console, '%c=== Draft 角标测试 ===', 'color:blue;font-size:14px;font-weight:bold');
   round = 0;
-  navBtn.click();
+  window.postMessage({ type: "approval-tree-menu:reload" }, "*");
   await sleep(4000);
   if (baseDraft === null) {
@@ -137,10 +125,8 @@
     var expDraft = baseDraft + i;
     origLog.call(console, '--- 第' + i + '轮: 期望 inbox=' + expInbox + ', draft=' + expDraft);
-    navBtn.click();
-    await sleep(1500);
-    treeBtn.click();
-    await sleep(1500);
+    window.postMessage({ type: "approval-tree-menu:reload" }, "*");
+    await sleep(3000);
     var domInbox = getAllBadges()[0] ? parseInt(getAllBadges()[0].textContent.trim(), 10) : null;
     var domDraft = findBadgeByLabel('草稿') || findBadgeByLabel('Draft') || findBadgeByLabel('draft');

package/main/default/test/test_badge_update.js CHANGED Viewed

@@ -25,14 +25,10 @@
   console.log('');
   // 检查前置条件
-  const navReloadBtn = document.querySelector('.instance-nav-reload');
-  const treeReloadBtn = document.querySelector('.instance-tree-reload');
-  const treeEl = document.querySelector('.instance-box-tree');
+  const menuEl = document.querySelector('.approval-tree-menu');
-  if (!navReloadBtn) { console.error('❌ 未找到 .instance-nav-reload 按钮'); return; }
-  if (!treeReloadBtn) { console.error('❌ 未找到 .instance-tree-reload 按钮'); return; }
-  if (!treeEl) { console.error('❌ 未找到 .instance-box-tree 树组件'); return; }
-  console.log('✅ 前置条件检查通过: nav-reload, tree-reload, tree DOM 均存在');
+  if (!menuEl) { console.error('❌ 未找到 .approval-tree-menu 组件'); return; }
+  console.log('✅ 前置条件检查通过: .approval-tree-menu 组件存在');
   // 状态
   let roundCounter = 0;
@@ -42,16 +38,9 @@
   let apiCallCount = 0;
   let fetchInitedCount = 0;
-  // ======== 监听 fetchInited 日志 ========
+  // ---- 监听日志 ----
   const origConsoleLog = console.log;
   const fetchInitedLogs = [];
-  console.log = function() {
-    if (arguments[0] && typeof arguments[0] === 'string' && arguments[0].includes('[fetchInited]')) {
-      fetchInitedCount++;
-      fetchInitedLogs.push(Array.from(arguments).join(' '));
-    }
-    return origConsoleLog.apply(console, arguments);
-  };
   // ======== 篡改 options 的通用函数 ========
   function tamperOptions(json, source) {
@@ -170,12 +159,7 @@
   // ======== DOM 读取 ========
   function findBadgeElements() {
-    const selectors = ['[class*="Badge-text"]', '.antd-Badge-text', '.cxd-Badge-text'];
-    for (const sel of selectors) {
-      const els = treeEl.querySelectorAll(sel);
-      if (els.length > 0) return els;
-    }
-    return [];
+    return menuEl.querySelectorAll('.ant-badge-count');
   }
   function getInboxBadgeFromDOM() {
@@ -196,10 +180,8 @@
   // 初始化：获取基准值（模拟完整 socket 流程：nav reload + tree reload）
   origConsoleLog.call(console, '%c[初始化] 获取基准角标值...', 'color: orange;');
   roundCounter = 0;
-  navReloadBtn.click();
-  await sleep(2000);
-  treeReloadBtn.click();
-  await sleep(2000);
+  window.postMessage({ type: "approval-tree-menu:reload" }, "*");
+  await sleep(4000);
   const initDom = getInboxBadgeFromDOM();
   origConsoleLog.call(console, `%c[初始化] 基准值: API=${baseInboxTag}, DOM=${initDom}, fetchInited=${fetchInitedCount}次`, 'color: orange;');
@@ -208,7 +190,6 @@
     window.fetch = originalFetch;
     XHR.open = origXHROpen;
     XHR.send = origXHRSend;
-    console.log = origConsoleLog;
     return;
   }
   origConsoleLog.call(console, '');
@@ -224,14 +205,9 @@
     origConsoleLog.call(console, `%c[第 ${round}/${TOTAL_ROUNDS} 轮]`, 'color: #888; font-weight: bold;',
       `期望角标: ${baseInboxTag} + ${round} = ${expectedInboxTag}`);
-    // 模拟完整 socket 流程：
-    // 1. Service reload（获取 API 数据）
-    navReloadBtn.click();
-    await sleep(1500);  // 等待 API 返回 + fetchInited 事件处理
-    // 2. Tree reload（从 Service 数据域读取 options）
-    treeReloadBtn.click();
-    await sleep(1500);  // 等待 Tree reloadOptions 完成
+    // 触发刷新
+    window.postMessage({ type: "approval-tree-menu:reload" }, "*");
+    await sleep(3000);  // 等待 API 返回 + React 重新渲染
     // 3. 读取结果
     const apiCalls = apiCallCount - apiCountBefore;
@@ -270,25 +246,6 @@
       origConsoleLog.call(console, '  API篡改后值:', actualApiInboxTag);
       origConsoleLog.call(console, '  DOM当前值:', domValue);
       origConsoleLog.call(console, '  DOM全部角标:', Array.from(findBadgeElements()).map(el => el.textContent.trim()));
-      // 检查 tree-reload 增强是否生效
-      origConsoleLog.call(console, '  检查 tree-reload 增强...');
-      try {
-        var s = window.amisScoped || (document.querySelector('[data-amisScoped]') && document.querySelector('[data-amisScoped]').__amisScoped);
-        if (s) {
-          var svc = s.getComponentById('u:instanceNav');
-          var tr = s.getComponentById('u:instanceNavTree');
-          origConsoleLog.call(console, '  Service组件:', svc ? '存在' : '不存在');
-          origConsoleLog.call(console, '  Tree组件:', tr ? '存在' : '不存在');
-          if (svc && svc.props && svc.props.data) {
-            var svcOpts = svc.props.data.options;
-            origConsoleLog.call(console, '  Service.data.options[0].tag:', svcOpts && svcOpts[0] ? svcOpts[0].tag : 'N/A');
-          }
-          if (tr && tr.props && tr.props.formItem) {
-            var treeOpts = tr.props.formItem.getOptions ? tr.props.formItem.getOptions() : (tr.props.options || []);
-            origConsoleLog.call(console, '  Tree.options[0].tag:', treeOpts && treeOpts[0] ? treeOpts[0].tag : 'N/A');
-          }
-        }
-      } catch(e) { origConsoleLog.call(console, '  诊断出错:', e); }
       stopped = true;
       break;
     }
@@ -302,7 +259,6 @@
   window.fetch = originalFetch;
   XHR.open = origXHROpen;
   XHR.send = origXHRSend;
-  console.log = origConsoleLog;
   // 报告
   const passed = results.filter(r => r.pass).length;

package/package.json CHANGED Viewed

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