@steedos-labs/plugin-workflow 3.0.20 → 3.0.22

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

@@ -34,6 +34,15 @@ nav_schema: {
           "onEvent": {
             "click": {
               "actions": [
+                {
+                  "actionType": "setValue",
+                  "componentId": "u:instanceNav",
+                  "args": {
+                    "value": {
+                      "nav_reload_token": "${_|now|date:x}"
+                    }
+                  }
+                },
                 {
                   "actionType": "rebuild",
                   "componentId": "u:instanceNav"
@@ -59,12 +68,12 @@ nav_schema: {
           ],
           "schemaApi": {
             "method": "get",
-            "url": "${context.rootUrl}/api/${appId}/workflow/nav",
+            "url": "${context.rootUrl}/api/${appId}/workflow/nav?reload=${nav_reload_token}",
             "headers": {
               "Authorization": "Bearer ${context.tenantId},${context.authToken}"
             },
             "messages": {},
-            "adaptor": "payload.data.value = window.location.pathname + decodeURIComponent(window.location.search);\n// return payload;\n\n\nreturn {\n  \"type\": \"service\",\n  \"data\": payload.data,\n  \"body\": [{\n    \"type\": \"input-tree\",\n    \"name\": \"tree\",\n    \"treeContainerClassName\": \"h-full bg-white\",\n    \"className\": \"instance-box-tree h-full w-full p-0 bg-white\",\n    \"id\": \"u:9f3dd961ca12\",\n    \"stacked\": true,\n    \"multiple\": false,\n    \"enableNodePath\": false,\n    \"hideRoot\": true,\n    \"showIcon\": true,\n    \"initiallyOpen\": false,\n    \"virtualThreshold\": 100000,\n    \"value\": \"${value}\",\n    \"size\": \"md\",\n    \"onEvent\": {\n      \"change\": {\n        \"actions\": [\n          {\n            \"actionType\": \"setValue\",\n            \"componentId\": \"instances_list_service\",\n            \"args\": {\n              \"value\": {\n                \"isFlowDataDone\": false\n              }\n            }\n          },\n          {\n            \"actionType\": \"custom\",\n            \"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}\"\n          },\n          {\n            \"actionType\": \"setValue\",\n            \"componentId\": \"instances_list_service\",\n            \"args\": {\n              \"value\": {\n                \"additionalFilters\": [\n                  \"${event.data.options.name}\",\n                  \"=\",\n                  \"${event.data.options.value}\"\n                ]\n              }\n            },\n            \"expression\": \"${event.data.options.level>=10}\"\n          },\n          {\n            \"args\": {\n              \"link\": \"${event.data.value}\",\n              \"blank\": false\n            },\n            \"actionType\": \"link\"\n          }\n        ]\n      }\n    },\n    \"menuTpl\": {\n      \"type\": \"wrapper\",\n      \"className\": \"flex items-center py-1.5 px-3 m-0 rounded-md transition-colors duration-150\",\n      \"body\": [\n        {\n          \"type\": \"tpl\",\n          \"className\": \"flex-1 leading-6 truncate instance-menu-label\",\n          \"tpl\": \"${label}\",\n          \"id\": \"u:9dee51f00db4\"\n        },\n        {\n          \"type\": \"tpl\",\n          \"className\": \"ml-auto\",\n          \"tpl\": \"\",\n          \"badge\": {\n            \"className\": \"h-0\",\n            \"offset\": [\n              -5,\n              0\n            ],\n            \"mode\": \"text\",\n            \"text\": \"${tag | toInt}\",\n            \"overflowCount\": 999\n          },\n          \"id\": \"u:2329cd1fecc2\"\n        }\n      ],\n      \"id\": \"u:545154bcc334\"\n    },\n    \"unfoldedLevel\": 2,\n    \"source\": \"${options}\"\n  }]\n}"
+            "adaptor": "payload.data.value = window.location.pathname + decodeURIComponent(window.location.search);\n// return payload;\n\n\nreturn {\n  \"type\": \"service\",\n  \"data\": payload.data,\n  \"body\": [{\n    \"type\": \"input-tree\",\n    \"name\": \"tree_\" + new Date().getTime(),\n    \"treeContainerClassName\": \"h-full bg-white\",\n    \"className\": \"instance-box-tree h-full w-full p-0 bg-white\",\n    \"id\": \"u:9f3dd961ca12_\" + new Date().getTime(),\n    \"stacked\": true,\n    \"multiple\": false,\n    \"enableNodePath\": false,\n    \"hideRoot\": true,\n    \"showIcon\": true,\n    \"initiallyOpen\": false,\n    \"virtualThreshold\": 100000,\n    \"value\": \"${value}\",\n    \"size\": \"md\",\n    \"onEvent\": {\n      \"change\": {\n        \"actions\": [\n          {\n            \"actionType\": \"setValue\",\n            \"componentId\": \"instances_list_service\",\n            \"args\": {\n              \"value\": {\n                \"isFlowDataDone\": false\n              }\n            }\n          },\n          {\n            \"actionType\": \"custom\",\n            \"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}\"\n          },\n          {\n            \"actionType\": \"setValue\",\n            \"componentId\": \"instances_list_service\",\n            \"args\": {\n              \"value\": {\n                \"additionalFilters\": [\n                  \"${event.data.options.name}\",\n                  \"=\",\n                  \"${event.data.options.value}\"\n                ]\n              }\n            },\n            \"expression\": \"${event.data.options.level>=10}\"\n          },\n          {\n            \"args\": {\n              \"link\": \"${event.data.value}\",\n              \"blank\": false\n            },\n            \"actionType\": \"link\"\n          }\n        ]\n      }\n    },\n    \"menuTpl\": {\n      \"type\": \"wrapper\",\n      \"className\": \"flex items-center py-1.5 px-3 m-0 rounded-md transition-colors duration-150\",\n      \"body\": [\n        {\n          \"type\": \"tpl\",\n          \"className\": \"flex-1 leading-6 truncate instance-menu-label\",\n          \"tpl\": \"${label}\",\n          \"id\": \"u:9dee51f00db4\"\n        },\n        {\n          \"type\": \"tpl\",\n          \"className\": \"ml-auto\",\n          \"tpl\": \"\",\n          \"badge\": {\n            \"className\": \"h-0\",\n            \"offset\": [\n              -5,\n              0\n            ],\n            \"mode\": \"text\",\n            \"text\": \"${tag | toInt}\",\n            \"overflowCount\": 999\n          },\n          \"id\": \"u:2329cd1fecc2\"\n        }\n      ],\n      \"id\": \"u:545154bcc334\"\n    },\n    \"unfoldedLevel\": 2,\n    \"options\": payload.data.options\n  }]\n}"
             # "adaptor": "payload.data.value = window.location.pathname + decodeURIComponent(window.location.search); return payload;"
           },
           "messages": {},

package/main/default/manager/handlers_manager.js

@@ -1,9 +1,9 @@
-
 const _ = require('underscore');
 
 const { getCollection } = require('../utils/collection');
 const { excuteTriggers } = require('../utils/trigger')
 const WorkflowManager = require('./workflow_manager');
+// const UUFlowManager = require('./uuflow_manager'); // Moved inside function to avoid circular dependency
 
 const getHandlersManager = {};
 
@@ -20,7 +20,7 @@ getHandlersManager.getHandlersByUsersAndRoles = async function (user_ids, role_i
                 approve_users = approve_users.concat(users);
             }
         } else {
-            throw new Error('error! user_id不合法不合法');
+            throw new Error('error! user_id不合法');
         }
     }
     
@@ -147,6 +147,7 @@ getHandlersManager.getHandlersByOrgAndRole = async function (org_id, role_id, sp
 };
 
 getHandlersManager.getHandlers = async function (instance_id, step_id, login_user_id) {
+    const UUFlowManager = require('./uuflow_manager');
     const instancesCollection = await getCollection('instances');
     const flowsCollection = await getCollection('flows');
     const formsCollection = await getCollection('forms');
@@ -287,7 +288,7 @@ getHandlersManager.getHandlers = async function (instance_id, step_id, login_use
             }
         }
         
-        const newest_values = await uuflowManager.getUpdatedValues(instance);
+        const newest_values = await UUFlowManager.getUpdatedValues(instance);
         let org_ids = [];
         let org_ids_names = [];
         
@@ -363,7 +364,7 @@ getHandlersManager.getHandlers = async function (instance_id, step_id, login_use
             }
         }
         
-        const newest_values = await uuflowManager.getUpdatedValues(instance);
+        const newest_values = await UUFlowManager.getUpdatedValues(instance);
         let org_ids = [];
         let org_ids_names = [];
         
@@ -468,7 +469,7 @@ getHandlersManager.getHandlers = async function (instance_id, step_id, login_use
             }
         }
         
-        const newest_values = await uuflowManager.getUpdatedValues(instance);
+        const newest_values = await UUFlowManager.getUpdatedValues(instance);
         let user_ids_names = [];
         
         if (newest_values[field_code]) {
@@ -484,14 +485,14 @@ getHandlersManager.getHandlers = async function (instance_id, step_id, login_use
         for (const user of user_ids_names) {
             const check_user_count = await spaceUsersCollection.find({
                 space: space_id,
-                user: user["id"]
+                user: _.isString(user) ? user : user["id"]
             }).count();
             
             if (check_user_count === 0) {
                 throw new Error('error! 人员ID不合法');
             }
             
-            user_ids.push(user["id"]);
+            user_ids.push(_.isString(user) ? user : user["id"]);
         }
         
         user_ids = _.uniq(user_ids);
@@ -548,7 +549,7 @@ getHandlersManager.getHandlers = async function (instance_id, step_id, login_use
             }
         }
         
-        const newest_values = await uuflowManager.getUpdatedValues(instance);
+        const newest_values = await UUFlowManager.getUpdatedValues(instance);
         let user_ids_names = [];
         
         if (newest_values[field_code]) {
@@ -560,18 +561,16 @@ getHandlersManager.getHandlers = async function (instance_id, step_id, login_use
         }
         
         let user_ids = [];
-        
         for (const user of user_ids_names) {
             const check_user_count = await spaceUsersCollection.find({
                 space: space_id,
-                user: user["id"]
+                user: _.isString(user) ? user : user["id"]
             }).count();
-            
             if (check_user_count === 0) {
                 throw new Error('error! 人员ID不合法');
             }
             
-            user_ids.push(user["id"]);
+            user_ids.push(_.isString(user) ? user : user["id"]);
         }
         
         users = _.uniq(user_ids);

package/main/default/manager/workflow_manager.js

@@ -116,6 +116,18 @@ WorkflowManager.getRole = async function (spaceId, roleId) {
     });
 };
 
+WorkflowManager.getRoles = async function (spaceId, roleIds) {
+    if (!roleIds || !spaceId) {
+        return;
+    }
+
+    const flowRolesCollection = await getCollection('flow_roles');
+    return await flowRolesCollection.find({
+        _id: { $in: roleIds },
+        space: spaceId
+    }).toArray();
+};
+
 WorkflowManager.getSpacePositions = async function (spaceId) {
     const flowPositionsCollection = await getCollection('flow_positions');
     return await flowPositionsCollection.find({

package/main/default/objects/instances/buttons/instance_cc.button.yml

@@ -81,6 +81,10 @@ amis_schema: |-
                                                           "componentId": "",
                                                           "args": {},
                                                           "actionType": "closeDialog"
+                                                      },
+                                                      {
+                                                          "actionType": "custom",
+                                                          "script": "$('.steedos-workflow-reload-btn').trigger('click')"
                                                       }
                                                   ]
                                               }

package/main/default/objects/instances/buttons/instance_reassign.button.yml

@@ -88,6 +88,10 @@ amis_schema: |-
                               },
                               "actionType": "broadcast",
                               "data": {}
+                            },
+                            {
+                              "actionType": "custom",
+                              "script": "$('.steedos-workflow-reload-btn').trigger('click')"
                             }
                           ]
                         }

package/main/default/pages/flow_selector.page.amis.json

@@ -1,5 +1,5 @@
 {
     "type": "liquid",
-    "template": "<style>\n    @keyframes fadeUpSpring {\n        0% { opacity: 0; transform: translateY(10px); }\n        100% { opacity: 1; transform: translateY(0); }\n    }\n    \n    /* Make scrollbars standardized and visible */\n    ::-webkit-scrollbar {\n        width: 8px;\n        height: 8px;\n    }\n    ::-webkit-scrollbar-track {\n        background: transparent;\n    }\n    ::-webkit-scrollbar-thumb {\n        background-color: rgba(0, 0, 0, 0.25); /* Darker for visibility on gray bg */\n        border-radius: 4px;\n        border: 2px solid transparent; /* Creates padding effect */\n        background-clip: content-box;\n    }\n    ::-webkit-scrollbar-thumb:hover {\n        background-color: rgba(0, 0, 0, 0.4);\n    }\n\n    /* \n       Fix outer modal scrollbar - SAFER VERSION \n       Only apply these aggressive overrides (no padding, hidden overflow)\n       to the specific modal that contains our component (identified by #steedosFlowSelectorSidebarList).\n       This prevents breaking other stacked modals like 'Confirm Dialogs'.\n    */\n    .antd-Modal-body:has(#steedosFlowSelectorSidebarList) {\n        overflow: hidden !important;\n        padding: 0 !important; /* Optional: maximize space */\n        display: flex;\n        flex-direction: column;\n    }\n\n    /* Ensure the AMIS container fills height if needed */\n    .antd-Service, .liquid-amis-container {\n        height: 100%;\n    }\n</style>\n\n<!-- Main Container: Fixed Height 70vh. -->\n<div class=\"flex h-[70vh] max-h-[800px] w-full overflow-hidden font-sans text-gray-900 bg-white\" style=\"min-height: 0;\">\n\n    <!-- Left Sidebar -->\n    <!-- flex-col, h-full, overflow-hidden -->\n    <div class=\"flex flex-col w-[260px] h-full border-r border-gray-200 bg-[#F2F2F7] shrink-0 overflow-hidden\">\n        <!-- Header -->\n        <div class=\"shrink-0 pt-4 pb-2 px-3\">\n            <div class=\"px-2 mb-3 text-2xl font-bold tracking-tight text-black\">流程</div>\n            <div class=\"relative group\">\n                <div class=\"pointer-events-none absolute inset-y-0 left-0 flex items-center pl-2.5 text-gray-500\">\n                    <svg class=\"h-4 w-4\" viewBox=\"0 0 24 24\" fill=\"none\" stroke=\"currentColor\" stroke-width=\"2\" stroke-linecap=\"round\" stroke-linejoin=\"round\">\n                        <circle cx=\"11\" cy=\"11\" r=\"8\"></circle>\n                        <line x1=\"21\" y1=\"21\" x2=\"16.65\" y2=\"16.65\"></line>\n                    </svg>\n                </div>\n                <input type=\"text\" id=\"searchInput\" placeholder=\"搜索\" class=\"w-full rounded-[10px] border-none bg-[#767680]/10 py-1.5 pl-9 pr-3 text-[14px] text-gray-900 placeholder:text-gray-500 outline-none transition-all duration-200 focus:bg-white focus:shadow-sm focus:ring-2 focus:ring-blue-500/20\">\n            </div>\n        </div>\n        \n        <!-- List Container -->\n        <!-- min-h-0 is CRITICAL for flex child scrolling -->\n        <div class=\"flex-1 min-h-0 overflow-y-auto px-2 pb-4 space-y-0.5 scroll-smooth\" id=\"steedosFlowSelectorSidebarList\">\n        </div>\n    </div>\n\n    <!-- Right Content -->\n    <!-- flex-1 fills remaining width -->\n    <div class=\"flex-1 h-full relative bg-white overflow-hidden\">\n        <!-- Absolute inset-0 locks the scroll container size -->\n        <div id=\"mainContentScroll\" class=\"absolute inset-0 overflow-y-auto scroll-smooth p-6\">\n            <div id=\"contentContainer\" class=\"w-full h-auto min-h-full\">\n                 <div class=\"flex h-full w-full flex-col items-center justify-center pt-20\">\n                    <div class=\"inline-flex items-center gap-2 text-gray-400 text-sm animate-pulse\">\n                        <svg class=\"animate-spin h-4 w-4\" xmlns=\"http://www.w3.org/2000/svg\" fill=\"none\" viewBox=\"0 0 24 24\">\n                            <circle class=\"opacity-25\" cx=\"12\" cy=\"12\" r=\"10\" stroke=\"currentColor\" stroke-width=\"4\"></circle>\n                            <path class=\"opacity-75\" fill=\"currentColor\" d=\"M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4z\"></path>\n                        </svg>\n                        <span>正在加载资源...</span>\n                    </div>\n                </div>\n            </div>\n        </div>\n    </div>\n</div>\n\n<script>\n    const WorkflowService = {\n        apiBase: \"\", \n        getHeaders: function() { return { 'Content-Type': 'application/json' }; },\n        getData: async function() {\n            try {\n                const appId = (typeof data !== 'undefined' && data.context && data.context.app_id) ? data.context.app_id : \"\";\n                const url = this.apiBase + \"/service/api/flows/getList?action=new&appId=\" + encodeURIComponent(appId);\n                const res = await fetch(url, { headers: this.getHeaders() });\n                const treeData = await res.json();\n                const categories = [];\n                const parsedFlows = [];\n                if (Array.isArray(treeData)) {\n                    treeData.forEach(cat => {\n                        categories.push({ _id: cat._id, name: cat.name });\n                        if (Array.isArray(cat.flows)) {\n                            cat.flows.forEach(f => {\n                                parsedFlows.push({\n                                    id: f._id, name: f.name, categoryId: cat._id, categoryName: cat.name || \"其他流程\" \n                                });\n                            });\n                        }\n                    });\n                }\n                return { categories: categories, flows: parsedFlows };\n            } catch (e) { \n                console.error(\"WorkflowService Error:\", e);\n                return { categories: [], flows: [] }; \n            }\n        },\n        getFavorites: function() {\n            const saved = localStorage.getItem('steedos_fav_ids');\n            return saved ? JSON.parse(saved) : [];\n        },\n        toggleFavorite: function(flowId, isFav) {\n            let favs = this.getFavorites();\n            if (isFav) { if (!favs.includes(flowId)) favs.push(flowId); } \n            else { favs = favs.filter(id => id !== flowId); }\n            localStorage.setItem('steedos_fav_ids', JSON.stringify(favs));\n            return favs;\n        }\n    };\n\n    const AppState = { allFlows: [], categories: [], favorites: [] };\n    const sidebarEl = document.getElementById('steedosFlowSelectorSidebarList');\n    const contentEl = document.getElementById('contentContainer');\n    const searchInput = document.getElementById('searchInput');\n\n    async function init() {\n        try {\n            const data = await WorkflowService.getData();\n            AppState.allFlows = data.flows;\n            AppState.categories = data.categories;\n            AppState.favorites = WorkflowService.getFavorites();\n            renderUI();\n        } catch (e) {\n            contentEl.innerHTML = `<div class=\"text-gray-400 text-sm\">加载失败，请检查网络</div>`;\n        }\n    }\n\n    function renderUI(filterText = \"\") {\n        sidebarEl.innerHTML = \"\";\n        contentEl.innerHTML = \"\";\n\n        const isSearching = filterText.length > 0;\n        let groups = [];\n\n        const favFlows = AppState.allFlows.filter(f => \n            AppState.favorites.includes(f.id) && \n            (isSearching ? f.name.includes(filterText) : true)\n        );\n        if (favFlows.length > 0) {\n            groups.push({ id: 'fav', name: \"我的收藏\", items: favFlows, isFav: true });\n        }\n\n        AppState.categories.forEach(cat => {\n            const items = AppState.allFlows.filter(f => \n                f.categoryId === cat._id &&\n                (isSearching ? f.name.includes(filterText) : true)\n            );\n            if (items.length > 0) {\n                groups.push({ id: cat._id, name: cat.name, items: items, isFav: false });\n            }\n        });\n\n        const otherItems = AppState.allFlows.filter(f => \n            !AppState.categories.find(c => c._id === f.categoryId) &&\n            (isSearching ? f.name.includes(filterText) : true)\n        );\n        if (otherItems.length > 0) {\n            groups.push({ id: 'other', name: \"其他流程\", items: otherItems, isFav: false });\n        }\n\n        if (groups.length === 0) {\n            contentEl.innerHTML = `<div class=\"animate-[fadeUpSpring_0.5s_ease-out] text-center pt-20\"><div class=\"text-gray-200 text-7xl mb-4\">∅</div><div class=\"text-gray-400 text-sm\">未找到匹配流程</div></div>`;\n            return;\n        }\n\n        groups.forEach((group, index) => {\n            const groupId = `group-\\${group.id}`;\n            const navItem = document.createElement('div');\n            let navBase = \"group flex cursor-pointer items-center justify-between rounded-md px-3 py-2 text-[14px] transition-all duration-200 ease-out select-none\";\n            let activeClass = \"bg-[#007AFF] text-white shadow-sm font-medium\";\n            let inactiveClass = \"text-gray-700 hover:bg-black/5 active:bg-black/10\";\n            \n            navItem.className = `\\${navBase} \\${index === 0 ? activeClass : inactiveClass}`;\n            const badgeClass = index === 0 ? \"text-white/80\" : \"text-gray-400 group-hover:text-gray-500\";\n            \n            navItem.innerHTML = `<span class=\"truncate\">\\${group.isFav ? '★ ' : ''}\\${group.name}</span><span class=\"\\${badgeClass} text-[12px] font-medium transition-colors\">\\${group.items.length}</span>`;\n            \n            navItem.onclick = () => {\n                Array.from(sidebarEl.children).forEach(el => {\n                    el.className = `\\${navBase} \\${inactiveClass}`;\n                    el.querySelector('span:last-child').className = \"text-gray-400 group-hover:text-gray-500 text-[12px] font-medium transition-colors\";\n                });\n                navItem.className = `\\${navBase} \\${activeClass}`;\n                navItem.querySelector('span:last-child').className = \"text-white/80 text-[12px] font-medium transition-colors\";\n                \n                const target = document.getElementById(groupId);\n                const container = document.getElementById('mainContentScroll');\n                if(target && container) {\n                    const targetTop = target.getBoundingClientRect().top; \n                    const containerTop = container.getBoundingClientRect().top; \n                    container.scrollTo({ top: container.scrollTop + targetTop - containerTop - 16, behavior: 'smooth' });\n                }\n            };\n            sidebarEl.appendChild(navItem);\n\n            const section = document.createElement('div');\n            section.id = groupId;\n            section.className = \"mb-10\";\n            const headerColor = group.isFav ? 'text-amber-500' : 'text-gray-900';\n            section.innerHTML = `<div class=\"sticky top-0 z-20 mb-4 bg-white/95 pb-2 text-xl font-bold tracking-tight backdrop-blur-xl text-left border-b border-gray-100 \\${headerColor}\">\\${group.name}</div>`;\n\n            const grid = document.createElement('div');\n            grid.className = 'grid grid-cols-[repeat(auto-fill,minmax(260px,1fr))] gap-4';\n\n            group.items.forEach((flow, i) => {\n                const isFav = AppState.favorites.includes(flow.id);\n                const colorMap = ['bg-blue-50 text-blue-600', 'bg-orange-50 text-orange-600', 'bg-emerald-50 text-emerald-600', 'bg-indigo-50 text-indigo-600'];\n                const colorClass = colorMap[(flow.name.length + i) % 4];\n                const firstChar = flow.name.replace(/【.*?】/g, '').charAt(0) || flow.name.charAt(0);\n                const card = document.createElement('div');\n                card.className = 'group relative flex h-auto min-h-[72px] cursor-pointer items-center rounded-2xl border border-gray-100 bg-white p-3 text-left shadow-[0_2px_8px_rgba(0,0,0,0.04)] ring-1 ring-black/[0.02] transition-all duration-300 ease-out animate-[fadeUpSpring_0.6s_cubic-bezier(0.16,1,0.3,1)_forwards] hover:-translate-y-1 hover:border-gray-200 hover:shadow-[0_12px_24px_rgba(0,0,0,0.08)] active:scale-[0.98] active:bg-gray-50';\n                card.style.animationDelay = `\\${Math.min(i * 0.04, 0.6)}s`;\n                card.style.opacity = '0';\n                const iconClass = isFav ? 'text-yellow-400 fill-current' : 'text-gray-300 group-hover/btn:text-gray-400 fill-none stroke-current stroke-[1.5]';\n                const btnBgClass = isFav ? 'opacity-100 hover:scale-110' : 'opacity-0 group-hover:opacity-100 hover:bg-gray-100 hover:scale-110';\n\n                card.innerHTML = `\n                    <div class=\"star-btn group/btn absolute right-2 top-1/2 -translate-y-1/2 z-20 flex h-8 w-8 items-center justify-center rounded-full transition-all duration-200 \\${btnBgClass}\" title=\"\\${isFav ? '取消收藏' : '加入收藏'}\">\n                        <svg class=\"h-5 w-5 transition-colors duration-300 \\${iconClass}\" viewBox=\"0 0 24 24\">\n                           <path stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M11.48 3.499a.562.562 0 011.04 0l2.125 5.111a.563.563 0 00.475.345l5.518.442c.499.04.701.663.321.988l-4.204 3.602a.563.563 0 00-.182.557l1.285 5.385a.562.562 0 01-.84.61l-4.725-2.885a.563.563 0 00-.586 0L6.982 20.54a.562.562 0 01-.84-.61l1.285-5.386a.562.562 0 00-.182-.557l-4.204-3.602a.563.563 0 01.321-.988l5.518-.442a.563.563 0 00.475-.345L11.48 3.5z\" />\n                        </svg>\n                    </div>\n                    <div class=\"mr-4 flex h-11 w-11 shrink-0 items-center justify-center rounded-xl text-[16px] font-bold \\${colorClass}\">\\${firstChar}</div>\n                    <div class=\"flex-1 pr-8 text-[15px] font-medium text-gray-900 line-clamp-2 leading-relaxed tracking-tight\" title=\"\\${flow.name}\">\\${flow.name}</div>\n                `;\n                card.onclick = () => {\n                   setTimeout(() => {\n                        data._scoped.doAction([\n                            { \"actionType\": \"broadcast\", \"args\": { \"eventName\": \"flows.selected\" }, \"data\": { \"value\": flow.id } }\n                        ])\n                   }, 50);\n                };\n                const starBtn = card.querySelector('.star-btn');\n                const starIcon = starBtn.querySelector('svg');\n                starBtn.onclick = (e) => {\n                    e.stopPropagation();\n                    const newFavState = !starBtn.classList.contains('active-fav');\n                    if (newFavState) {\n                        starBtn.classList.add('active-fav', 'opacity-100');\n                        starBtn.classList.add('animate-[starPop_0.4s_ease-out]');\n                        starIcon.setAttribute('class', 'h-5 w-5 transition-colors duration-300 text-yellow-400 fill-current');\n                    } else {\n                        starBtn.classList.remove('active-fav', 'opacity-100');\n                        starBtn.classList.remove('animate-[starPop_0.4s_ease-out]');\n                        starIcon.setAttribute('class', 'h-5 w-5 transition-colors duration-300 text-gray-300 group-hover/btn:text-gray-400 fill-none stroke-current stroke-[1.5]');\n                    }\n                    AppState.favorites = WorkflowService.toggleFavorite(flow.id, newFavState);\n                    setTimeout(() => renderUI(searchInput.value), 300);\n                };\n                if (isFav) starBtn.classList.add('active-fav');\n                grid.appendChild(card);\n            });\n            section.appendChild(grid);\n            contentEl.appendChild(section);\n        });\n    }\n\n    searchInput.addEventListener('input', (e) => renderUI(e.target.value.trim()));\n    init();\n</script>\n",
+    "template": "<style>\n    @keyframes fadeUpSpring {\n        0% { opacity: 0; transform: translateY(10px); }\n        100% { opacity: 1; transform: translateY(0); }\n    }\n    \n    /* Make scrollbars standardized and visible */\n    ::-webkit-scrollbar {\n        width: 8px;\n        height: 8px;\n    }\n    ::-webkit-scrollbar-track {\n        background: transparent;\n    }\n    ::-webkit-scrollbar-thumb {\n        background-color: rgba(0, 0, 0, 0.25); /* Darker for visibility on gray bg */\n        border-radius: 4px;\n        border: 2px solid transparent; /* Creates padding effect */\n        background-clip: content-box;\n    }\n    ::-webkit-scrollbar-thumb:hover {\n        background-color: rgba(0, 0, 0, 0.4);\n    }\n\n    /* \n       Fix outer modal scrollbar - SAFER VERSION \n       Only apply these aggressive overrides (no padding, hidden overflow)\n       to the specific modal that contains our component (identified by #steedosFlowSelectorSidebarList).\n       This prevents breaking other stacked modals like 'Confirm Dialogs'.\n    */\n    .antd-Modal-body:has(#steedosFlowSelectorSidebarList) {\n        overflow: hidden !important;\n        padding: 0 !important; /* Optional: maximize space */\n        display: flex;\n        flex-direction: column;\n    }\n\n    /* Ensure the AMIS container fills height if needed */\n    .antd-Service, .liquid-amis-container {\n        height: 100%;\n    }\n</style>\n\n<!-- Main Container: Fixed Height 70vh. -->\n<div class=\"flex h-[70vh] max-h-[800px] w-full overflow-hidden font-sans text-gray-900 bg-white\" style=\"min-height: 0;\">\n\n    <!-- Left Sidebar -->\n    <!-- flex-col, h-full, overflow-hidden -->\n    <div class=\"flex flex-col w-[260px] h-full border-r border-gray-200 bg-[#F2F2F7] shrink-0 overflow-hidden\">\n        <!-- Header -->\n        <div class=\"shrink-0 pt-4 pb-2 px-3\">\n            <div class=\"px-2 mb-3 text-2xl font-bold tracking-tight text-black\">流程</div>\n            <div class=\"relative group\">\n                <div class=\"pointer-events-none absolute inset-y-0 left-0 flex items-center pl-2.5 text-gray-500\">\n                    <svg class=\"h-4 w-4\" viewBox=\"0 0 24 24\" fill=\"none\" stroke=\"currentColor\" stroke-width=\"2\" stroke-linecap=\"round\" stroke-linejoin=\"round\">\n                        <circle cx=\"11\" cy=\"11\" r=\"8\"></circle>\n                        <line x1=\"21\" y1=\"21\" x2=\"16.65\" y2=\"16.65\"></line>\n                    </svg>\n                </div>\n                <input type=\"text\" id=\"searchInput\" placeholder=\"搜索\" class=\"w-full rounded-[10px] border-none bg-[#767680]/10 py-1.5 pl-9 pr-3 text-[14px] text-gray-900 placeholder:text-gray-500 outline-none transition-all duration-200 focus:bg-white focus:shadow-sm focus:ring-2 focus:ring-blue-500/20\">\n            </div>\n        </div>\n        \n        <!-- List Container -->\n        <!-- min-h-0 is CRITICAL for flex child scrolling -->\n        <div class=\"flex-1 min-h-0 overflow-y-auto px-2 pb-4 space-y-0.5 scroll-smooth\" id=\"steedosFlowSelectorSidebarList\">\n        </div>\n    </div>\n\n    <!-- Right Content -->\n    <!-- flex-1 fills remaining width -->\n    <div class=\"flex-1 h-full relative bg-white overflow-hidden\">\n        <!-- Absolute inset-0 locks the scroll container size -->\n        <div id=\"mainContentScroll\" class=\"absolute inset-0 overflow-y-auto scroll-smooth p-6\">\n            <div id=\"contentContainer\" class=\"w-full h-auto min-h-full\">\n                 <div class=\"flex h-full w-full flex-col items-center justify-center pt-20\">\n                    <div class=\"inline-flex items-center gap-2 text-gray-400 text-sm animate-pulse\">\n                        <svg class=\"animate-spin h-4 w-4\" xmlns=\"http://www.w3.org/2000/svg\" fill=\"none\" viewBox=\"0 0 24 24\">\n                            <circle class=\"opacity-25\" cx=\"12\" cy=\"12\" r=\"10\" stroke=\"currentColor\" stroke-width=\"4\"></circle>\n                            <path class=\"opacity-75\" fill=\"currentColor\" d=\"M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4z\"></path>\n                        </svg>\n                        <span>正在加载资源...</span>\n                    </div>\n                </div>\n            </div>\n        </div>\n    </div>\n</div>\n\n<script>\n    const WorkflowService = {\n        apiBase: \"\", \n        getHeaders: function() { return { 'Content-Type': 'application/json' }; },\n        getData: async function() {\n            try {\n                const appId = (typeof data !== 'undefined' && data.context && data.context.app_id) ? data.context.app_id : \"\";\n                const url = this.apiBase + \"/service/api/flows/getList?action=new&appId=\" + encodeURIComponent(appId);\n                const res = await fetch(url, { headers: this.getHeaders() });\n                const treeData = await res.json();\n                const categories = [];\n                const parsedFlows = [];\n                if (Array.isArray(treeData)) {\n                    treeData.forEach(cat => {\n                        categories.push({ _id: cat._id, name: cat.name });\n                        if (Array.isArray(cat.flows)) {\n                            cat.flows.forEach(f => {\n                                parsedFlows.push({\n                                    id: f._id, name: f.name, categoryId: cat._id, categoryName: cat.name || \"其他流程\" \n                                });\n                            });\n                        }\n                    });\n                }\n                return { categories: categories, flows: parsedFlows };\n            } catch (e) { \n                console.error(\"WorkflowService Error:\", e);\n                return { categories: [], flows: [] }; \n            }\n        },\n        getFavorites: function() {\n            const saved = localStorage.getItem('steedos_fav_ids');\n            return saved ? JSON.parse(saved) : [];\n        },\n        toggleFavorite: function(flowId, isFav) {\n            let favs = this.getFavorites();\n            if (isFav) { if (!favs.includes(flowId)) favs.push(flowId); } \n            else { favs = favs.filter(id => id !== flowId); }\n            localStorage.setItem('steedos_fav_ids', JSON.stringify(favs));\n            return favs;\n        }\n    };\n\n    const AppState = { allFlows: [], categories: [], favorites: [] };\n    const sidebarEl = document.getElementById('steedosFlowSelectorSidebarList');\n    const contentEl = document.getElementById('contentContainer');\n    const searchInput = document.getElementById('searchInput');\n\n    async function init() {\n        try {\n            const data = await WorkflowService.getData();\n            AppState.allFlows = data.flows;\n            AppState.categories = data.categories;\n            AppState.favorites = WorkflowService.getFavorites();\n            renderUI();\n        } catch (e) {\n            contentEl.innerHTML = `<div class=\"text-gray-400 text-sm\">加载失败，请检查网络</div>`;\n        }\n    }\n\n    function renderUI(filterText = \"\") {\n        sidebarEl.innerHTML = \"\";\n        contentEl.innerHTML = \"\";\n\n        const isSearching = filterText.length > 0;\n        let groups = [];\n\n        const favFlows = AppState.allFlows.filter(f => \n            AppState.favorites.includes(f.id) && \n            (isSearching ? f.name.includes(filterText) : true)\n        );\n        if (favFlows.length > 0) {\n            groups.push({ id: 'fav', name: \"我的收藏\", items: favFlows, isFav: true });\n        }\n\n        AppState.categories.forEach(cat => {\n            const items = AppState.allFlows.filter(f => \n                f.categoryId === cat._id &&\n                (isSearching ? f.name.includes(filterText) : true)\n            );\n            if (items.length > 0) {\n                groups.push({ id: cat._id, name: cat.name, items: items, isFav: false });\n            }\n        });\n\n        const otherItems = AppState.allFlows.filter(f => \n            !AppState.categories.find(c => c._id === f.categoryId) &&\n            (isSearching ? f.name.includes(filterText) : true)\n        );\n        if (otherItems.length > 0) {\n            groups.push({ id: 'other', name: \"其他流程\", items: otherItems, isFav: false });\n        }\n\n        if (groups.length === 0) {\n            contentEl.innerHTML = `<div class=\"animate-[fadeUpSpring_0.5s_ease-out] text-center pt-20\"><div class=\"text-gray-200 text-7xl mb-4\">∅</div><div class=\"text-gray-400 text-sm\">未找到匹配流程</div></div>`;\n            return;\n        }\n\n        groups.forEach((group, index) => {\n            const groupId = `group-\\${group.id}`;\n            const navItem = document.createElement('div');\n            let navBase = \"group flex cursor-pointer items-center justify-between rounded-md px-3 py-2 text-[14px] transition-all duration-200 ease-out select-none\";\n            let activeClass = \"bg-[#007AFF] text-white shadow-sm font-medium\";\n            let inactiveClass = \"text-gray-700 hover:bg-black/5 active:bg-black/10\";\n            \n            navItem.className = `\\${navBase} \\${index === 0 ? activeClass : inactiveClass}`;\n            const badgeClass = index === 0 ? \"text-white/80\" : \"text-gray-400 group-hover:text-gray-500\";\n            \n            navItem.innerHTML = `<span class=\"truncate\">\\${group.isFav ? '★ ' : ''}\\${group.name}</span><span class=\"\\${badgeClass} text-[12px] font-medium transition-colors\">\\${group.items.length}</span>`;\n            \n            navItem.onclick = () => {\n                Array.from(sidebarEl.children).forEach(el => {\n                    el.className = `\\${navBase} \\${inactiveClass}`;\n                    el.querySelector('span:last-child').className = \"text-gray-400 group-hover:text-gray-500 text-[12px] font-medium transition-colors\";\n                });\n                navItem.className = `\\${navBase} \\${activeClass}`;\n                navItem.querySelector('span:last-child').className = \"text-white/80 text-[12px] font-medium transition-colors\";\n                \n                const target = document.getElementById(groupId);\n                const container = document.getElementById('mainContentScroll');\n                if(target && container) {\n                    const targetTop = target.getBoundingClientRect().top; \n                    const containerTop = container.getBoundingClientRect().top; \n                    container.scrollTo({ top: container.scrollTop + targetTop - containerTop - 16, behavior: 'smooth' });\n                }\n            };\n            sidebarEl.appendChild(navItem);\n\n            const section = document.createElement('div');\n            section.id = groupId;\n            section.className = \"mb-10\";\n            const headerColor = group.isFav ? 'text-amber-500' : 'text-gray-900';\n            section.innerHTML = `<div class=\"sticky top-0 z-20 mb-4 bg-white/95 pb-2 text-xl font-bold tracking-tight backdrop-blur-xl text-left border-b border-gray-100 \\${headerColor}\">\\${group.name}</div>`;\n\n            const grid = document.createElement('div');\n            grid.className = 'grid grid-cols-[repeat(auto-fill,minmax(260px,1fr))] gap-4';\n\n            group.items.forEach((flow, i) => {\n                const isFav = AppState.favorites.includes(flow.id);\n                const colorMap = ['bg-blue-50 text-blue-600', 'bg-orange-50 text-orange-600', 'bg-emerald-50 text-emerald-600', 'bg-indigo-50 text-indigo-600'];\n                const colorClass = colorMap[(flow.name.length + i) % 4];\n                const firstChar = flow.name.replace(/【.*?】/g, '').charAt(0) || flow.name.charAt(0);\n                const card = document.createElement('div');\n                card.className = 'group relative flex h-auto min-h-[72px] cursor-pointer items-center rounded-2xl border border-gray-100 bg-white p-3 text-left shadow-[0_2px_8px_rgba(0,0,0,0.04)] ring-1 ring-black/[0.02] transition-all duration-300 ease-out animate-[fadeUpSpring_0.6s_cubic-bezier(0.16,1,0.3,1)_forwards] hover:-translate-y-1 hover:border-gray-200 hover:shadow-[0_12px_24px_rgba(0,0,0,0.08)] active:scale-[0.98] active:bg-gray-50';\n                card.style.animationDelay = `\\${Math.min(i * 0.04, 0.6)}s`;\n                card.style.opacity = '0';\n                const iconClass = isFav ? 'text-yellow-400 fill-current' : 'text-gray-300 group-hover/btn:text-gray-400 fill-none stroke-current stroke-[1.5]';\n                const btnBgClass = isFav ? 'opacity-100 hover:scale-110' : 'opacity-0 group-hover:opacity-100 hover:bg-gray-100 hover:scale-110';\n\n                card.innerHTML = `\n                    <div class=\"star-btn group/btn absolute right-2 top-1/2 -translate-y-1/2 z-20 flex h-8 w-8 items-center justify-center rounded-full transition-all duration-200 \\${btnBgClass}\" title=\"\\${isFav ? '取消收藏' : '加入收藏'}\">\n                        <svg class=\"h-5 w-5 transition-colors duration-300 \\${iconClass}\" viewBox=\"0 0 24 24\">\n                           <path stroke-linecap=\"round\" stroke-linejoin=\"round\" d=\"M11.48 3.499a.562.562 0 011.04 0l2.125 5.111a.563.563 0 00.475.345l5.518.442c.499.04.701.663.321.988l-4.204 3.602a.563.563 0 00-.182.557l1.285 5.385a.562.562 0 01-.84.61l-4.725-2.885a.563.563 0 00-.586 0L6.982 20.54a.562.562 0 01-.84-.61l1.285-5.386a.562.562 0 00-.182-.557l-4.204-3.602a.563.563 0 01.321-.988l5.518-.442a.563.563 0 00.475-.345L11.48 3.5z\" />\n                        </svg>\n                    </div>\n                    <div class=\"mr-4 flex h-11 w-11 shrink-0 items-center justify-center rounded-xl text-[16px] font-bold \\${colorClass}\">\\${firstChar}</div>\n                    <div class=\"flex-1 pr-8 text-[15px] font-medium text-gray-900 line-clamp-3 leading-relaxed tracking-tight\" title=\"\\${flow.name}\">\\${flow.name}</div>\n                `;\n                card.onclick = () => {\n                   setTimeout(() => {\n                        data._scoped.doAction([\n                            { \"actionType\": \"broadcast\", \"args\": { \"eventName\": \"flows.selected\" }, \"data\": { \"value\": flow.id } }\n                        ])\n                   }, 50);\n                };\n                const starBtn = card.querySelector('.star-btn');\n                const starIcon = starBtn.querySelector('svg');\n                starBtn.onclick = (e) => {\n                    e.stopPropagation();\n                    const newFavState = !starBtn.classList.contains('active-fav');\n                    if (newFavState) {\n                        starBtn.classList.add('active-fav', 'opacity-100');\n                        starBtn.classList.add('animate-[starPop_0.4s_ease-out]');\n                        starIcon.setAttribute('class', 'h-5 w-5 transition-colors duration-300 text-yellow-400 fill-current');\n                    } else {\n                        starBtn.classList.remove('active-fav', 'opacity-100');\n                        starBtn.classList.remove('animate-[starPop_0.4s_ease-out]');\n                        starIcon.setAttribute('class', 'h-5 w-5 transition-colors duration-300 text-gray-300 group-hover/btn:text-gray-400 fill-none stroke-current stroke-[1.5]');\n                    }\n                    AppState.favorites = WorkflowService.toggleFavorite(flow.id, newFavState);\n                    setTimeout(() => renderUI(searchInput.value), 300);\n                };\n                if (isFav) starBtn.classList.add('active-fav');\n                grid.appendChild(card);\n            });\n            section.appendChild(grid);\n            contentEl.appendChild(section);\n        });\n    }\n\n    searchInput.addEventListener('input', (e) => renderUI(e.target.value.trim()));\n    init();\n</script>\n",
     "className": "h-full"
 }

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

@@ -182,7 +182,7 @@
     "body": [
         {
             "type": "wrapper",
-            "className": "steedos-instance-detail-wrapper m-0 p-0 flex-1 focus:outline-none lg:order-last sm:m-4 shadow sm:rounded",
+            "className": "steedos-instance-print-wrapper steedos-instance-detail-wrapper m-0 p-0 flex-1 focus:outline-none lg:order-last sm:m-4 shadow sm:rounded",
             "body": [
                 {
                     "type": "service",

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

@@ -39,7 +39,7 @@ const FlowversionAPI = {
         return str.replace(/\"/g, "&quot;").replace(/\n/g, "<br/>");
     },
 
-    getStepHandlerName: async function (step, insId) {
+    getStepHandlerName: async function (step, insId, instance) {
         const db = {
             users: await getCollection('users'),
             // flow_roles: await getCollection('flow_roles')
@@ -53,9 +53,22 @@ const FlowversionAPI = {
                 return stepHandlerName;
             }
             let userIds = await getHandlersManager.getHandlers(insId, stepId, loginUserId);
+            
+            // 如果没有找到处理人，从instance的step_approve中查找
+            if ((!userIds || userIds.length === 0) && instance?.step_approve && stepId) {
+                let stepApproveUserId = instance.step_approve[stepId];
+                if (stepApproveUserId) {
+                    if (typeof stepApproveUserId === 'string') {
+                        userIds = [stepApproveUserId];
+                    } else if (Array.isArray(stepApproveUserId)) {
+                        userIds = stepApproveUserId;
+                    }
+                }
+            }
+            
             let usersCol = db.users;
             let approverNames = [];
-            for (let userId of userIds) {
+            for (let userId of userIds || []) {
                 let user = await usersCol.findOne({ _id: userId }, { projection: { name: 1 } });
                 if (user) {
                     approverNames.push(user.name);
@@ -111,21 +124,22 @@ const FlowversionAPI = {
         return nodeStr;
     },
 
-    getStepName: async function (step, cachedStepNames, instance_id) {
+    getStepName: async function (step, cachedStepNames, instance_id, instance) {
         // 返回step节点名称，优先从缓存cachedStepNames中取，否则调用getStepLabel生成
         let cachedStepName = cachedStepNames[step._id];
         if (cachedStepName) {
             return cachedStepName;
         }
-        let stepHandlerName = await FlowversionAPI.getStepHandlerName(step, instance_id);
+        let stepHandlerName = await FlowversionAPI.getStepHandlerName(step, instance_id, instance);
         let stepName = FlowversionAPI.getStepLabel(step.name, stepHandlerName);
         cachedStepNames[step._id] = stepName;
         return stepName;
     },
 
-    generateStepsGraphSyntax: async function (steps, currentStepId, isConvertToString, direction, instance_id) {
+    generateStepsGraphSyntax: async function (steps, currentStepId, isConvertToString, direction, instance_id, instance) {
         let nodes = [`graph ${direction}`];
         let cachedStepNames = {};
+        let skipSteps = new Set(instance?.skip_steps || []);
         for (let step of steps) {
             let lines = step.lines;
             if (lines?.length) {
@@ -136,13 +150,17 @@ const FlowversionAPI = {
                         if (step.step_type === "condition") {
                             nodes.push(`	class ${step._id} condition;`);
                         }
-                        stepName = await FlowversionAPI.getStepName(step, cachedStepNames, instance_id);
+                        stepName = await FlowversionAPI.getStepName(step, cachedStepNames, instance_id, instance);
                     } else {
                         stepName = "";
                     }
+                    // Mark skipped steps
+                    if (skipSteps.has(step._id)) {
+                        nodes.push(`	class ${step._id} skip-step;`);
+                    }
                     // 原findPropertyByPK("_id",line.to_step)，转为find
                     let toStep = steps.find(s => s._id === line.to_step);
-                    let toStepName = await FlowversionAPI.getStepName(toStep, cachedStepNames, instance_id);
+                    let toStepName = await FlowversionAPI.getStepName(toStep, cachedStepNames, instance_id, instance);
                     nodes.push(`	${step._id}("${stepName}")-->${line.to_step}("${toStepName}")`);
                 }
             }
@@ -487,13 +505,13 @@ const FlowversionAPI = {
                 break;
             }
             default: {
-                let instance = await db.instances.findOne({ _id: instance_id }, { projection: { flow_version: 1, flow: 1, traces: { $slice: -1 } } });
+                let instance = await db.instances.findOne({ _id: instance_id }, { projection: { flow_version: 1, flow: 1, step_approve: 1, skip_steps: 1, traces: { $slice: -1 } } });
                 if (instance) {
                     let currentStepId = instance.traces?.[0]?.step;
                     let flowversion = await WorkflowManager.getInstanceFlowVersion(instance);
                     let steps = flowversion?.steps;
                     if (steps?.length) {
-                        graphSyntax = await FlowversionAPI.generateStepsGraphSyntax(steps, currentStepId, false, direction, instance_id);
+                        graphSyntax = await FlowversionAPI.generateStepsGraphSyntax(steps, currentStepId, false, direction, instance_id, instance);
                     } else {
                         error_msg = "没有找到当前申请单的流程步骤数据";
                     }
@@ -557,6 +575,20 @@ const FlowversionAPI = {
 							stroke: rgb(204, 204, 255);
 							stroke-width: 1px;
 						}
+						#flow-steps-svg .node.skip-step rect{
+							fill: #e8e8e8;
+							stroke: #999999;
+							stroke-width: 2px;
+							stroke-dasharray: 5, 5;
+							opacity: 0.7;
+						}
+						#flow-steps-svg .node.skip-step .step-name{
+							color: #666666;
+							text-decoration: line-through;
+						}
+						#flow-steps-svg .node.skip-step .step-handler-name{
+							color: #999999;
+						}
 						#flow-steps-svg .node .trace-handler-name{
 							color: #777;
 						}

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

@@ -401,7 +401,7 @@ router.post('/api/workflow/v2/set_instance_steps', requireAuthentication, async
                 skip_steps: stepId
             }
         }
-        await objectql.getObject('instances').update(instanceId, doc);
+        await objectql.getObject('instances').directUpdate(instanceId, doc);
 
         return res.status(200).send({ status: 0 });
     } catch (error) {

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

@@ -14,6 +14,7 @@ const { excuteTriggers } = require('../utils/trigger');
 const objectql = require('@steedos/objectql');
 const WorkflowManager = require('../manager/workflow_manager');
 const UUFlowManager = require('../manager/uuflow_manager');
+const { t } = require('@steedos/i18n');
 
 const getFieldName = (fields, fieldId)=>{
     const field = _.find(fields, (item)=>{
@@ -167,7 +168,8 @@ router.post('/api/workflow/v2/nextStepUsers', requireAuthentication, async funct
                             }
 
                             if (!nextStepUsers || nextStepUsers.length < 1) {
-                                error = "ROLE_NO_MEMBERS";
+                                const roles = await WorkflowManager.getRoles(instance.space, approverRoleIds);
+                                error = t('next_step_users_not_found.applicant_role', {role_name: _.join(_.map(roles, 'name'), ', ')}, userSession.language)
                             }
                         } else {
                             error = "请先填写表单值";
@@ -189,7 +191,10 @@ router.post('/api/workflow/v2/nextStepUsers', requireAuthentication, async funct
                             }
 
                             if (!nextStepUsers || nextStepUsers.length < 1) {
-                                error = "ROLE_NO_MEMBERS";
+                               
+                                const roles = await WorkflowManager.getRoles(instance.space, approverRoleIds);
+                                 console.log(`approverRoleIds`, approverRoleIds, roles)
+                                error = t('next_step_users_not_found.applicant_role', {role_name: _.join(_.map(roles, 'name'), ', ')}, userSession.language)
                             }
                         } else {
                             error = "请先填写表单值";

package/main/default/routes/flow_form_design.ejs

@@ -276,11 +276,13 @@
       if(field.steedos_field){
         return {
           type: `sfield-${_.toLower(_.camelCase(field.steedos_field.type))}`,
-          config: field.steedos_field
+          config: field.steedos_field,
+          _id: field._id
         }
       }
 
       const tpl = {
+        _id: field._id,
         label: field.name || field.code,
         name: field.code,
         required: field.is_required,

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

@@ -0,0 +1,73 @@
+const jwt = require('jsonwebtoken');
+const express = require('express');
+const router = express.Router();
+const path = require('path');
+
+
+// 根据后缀名判断文档类型
+function getDocumentType(ext) {
+    if (['doc', 'docx', 'rtf', 'txt'].includes(ext)) return 'word';
+    if (['xls', 'xlsx', 'csv'].includes(ext)) return 'cell';
+    if (['ppt', 'pptx'].includes(ext)) return 'slide';
+    return 'word';
+}
+
+// startup
+router.get('/api/workflow/office/preview', async function (req, res) {
+    const fileUrl = req.query.src; // 外部传入的文件下载直链
+    if (!fileUrl) return res.status(400).send("Missing src parameter");
+
+    const fileName = decodeURIComponent(path.basename(new URL(fileUrl).pathname));
+    const fileType = fileName.split('.').pop();
+
+    // 构建 ONLYOFFICE 配置对象
+    const config = {
+        document: {
+            fileType: fileType,
+            key: Buffer.from(fileUrl).toString('base64').substring(0, 20), // 生成唯一key
+            title: fileName,
+            url: fileUrl,
+            permissions: {
+                edit: false,        // 禁止编辑
+                download: true,     // 是否允许下载
+                print: true,        // 是否允许打印
+                fillForms: false    // 禁止表单填写
+            }
+        },
+        documentType: getDocumentType(fileType),
+        editorConfig: {
+            mode: 'view',           // 强制只读模式
+            lang: 'zh-CN',
+            canAutosave: false,
+            canShare: false,
+            customization: {
+                about: false,         // 隐藏右键菜单中的“关于”
+                comments: false,      // 隐藏评论
+                feedback: {
+                    visible: false    // 隐藏反馈按钮
+                },
+                forcesave: false,
+                help: false,          // 隐藏帮助按钮
+                hideRightMenu: true,  // 隐藏右侧菜单栏
+                logo: {
+                    image: "",        // 清空 Logo 图片地址
+                    imageEmbedded: "", // 清空嵌入式 Logo 地址
+                    url: ""           // 点击 Logo 跳转的链接清空
+                },
+                toolbarNoTabs: true   // 让工具栏更紧凑
+            }
+        }
+    };
+
+    // 使用环境变量中的 Secret 生成 Token
+    const token = jwt.sign(config, process.env.B6_ONLYOFFICE_JWT_SECRET);
+    config.token = token;
+
+    // 返回配置和 API 地址
+    res.json({
+        config: config,
+        apiUrl: `${process.env.B6_ONLYOFFICE_SERVER_URL}web-apps/apps/api/documents/api.js`
+    });
+})
+
+exports.default = router;

package/main/default/triggers/amis_form_design.trigger.js

@@ -139,7 +139,6 @@ function getFinalFormFields(inputFields) {
         const temp = transformFormFields(amisField);
         finalFormFields.push(temp)
     })
-
     return finalFormFields
 }
 
@@ -160,7 +159,7 @@ function transformFormFields(amisField) {
 
     if(amisField.type === 'steedos-field'){
         const sfield = {
-            _id: amisField.config.name,
+            _id: amisField._id || amisField.config.name,
             code: amisField.config.name,
             name: amisField.config.label,
             is_wide: amisField.config.is_wide,
@@ -188,7 +187,7 @@ function transformFormFields(amisField) {
     };
 
     let formFieldsItem = {
-        _id: new ObjectId().toHexString(),
+        _id: amisField._id || new ObjectId().toHexString(),
         code: amisField.name || amisField.title,
         name: amisField.label || amisField.title,
         is_wide: _.includes(amisField.className, "is_wide"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos-labs/plugin-workflow",
-  "version": "3.0.20",
+  "version": "3.0.22",
   "main": "package.service.js",
   "license": "MIT",
   "scripts": {

package/public/office/preview.html

@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title>文档预览</title>
+    <style>
+        body, html { margin: 0; padding: 0; height: 100%; overflow: hidden; }
+        #placeholder { height: 100%; }
+    </style>
+</head>
+<body>
+    <div id="placeholder"></div>
+    <script>
+        async function loadEditor() {
+            // 获取当前 URL 里的 src 参数
+            const src = new URLSearchParams(window.location.search).get('src');
+            
+            // 请求后端获取签名配置
+            const response = await fetch(`/api/workflow/office/preview?src=${encodeURIComponent(src)}`);
+            const data = await response.json();
+
+            // 动态加载 API 脚本
+            const script = document.createElement("script");
+            script.src = data.apiUrl;
+            script.onload = () => {
+                new DocsAPI.DocEditor("placeholder", data.config);
+            };
+            document.head.appendChild(script);
+        }
+        loadEditor();
+    </script>
+</body>
+</html>

package/public/workflow/index.css

@@ -505,6 +505,9 @@ tbody .color-priority-muted *{
     color: #40a9ff
 }
 
+.steedos-instance-print-wrapper .liquid-amis-container{
+    width: 190mm;
+}
 
 @media (max-width: 768px){
     /* 审批单详细页手机端附件预览按钮样式 */
@@ -717,6 +720,11 @@ tbody .color-priority-muted *{
     border: none !important;
 }
 
+
+.page-page_instance_print .instance-approve-history{
+    width: 190mm;
+}
+
 /* 公共打印隐藏样式 */
 @media print {
   .no-print {

package/src/util/templateConverter.js

@@ -290,15 +290,21 @@ function convertTemplate(content, fields, isPrint) {
     newContent = newContent.replace(/\{\{afFieldLabelText\s+name=["'](.+?)["']\}\}/g, '$1');
 
     // --- Sub-phase 2d: Convert instanceSignText ---
-    newContent = newContent.replace(/\{\{>\s*instanceSignText\s+([^}]+)\}\}/g, (match, args) => {
+    newContent = newContent.replace(/\{\{>\s*instanceSignText\s+([\s\S]+?)\}\}/g, (match, args) => {
         const argMap = parseArgs(args);
         const fieldName = argMap.name;
         if (!fieldName) return match;
 
         const fieldDef = findFieldDef(fields, fieldName);
         let stepName = "";
+        
+        let formula = argMap.field_formula;
         if (fieldDef && fieldDef.formula) {
-            const formulaMatch = fieldDef.formula.match(/signature\.traces\.([^}]+)/);
+            formula = fieldDef.formula;
+        }
+
+        if (formula) {
+            const formulaMatch = formula.match(/signature\.traces\.([^}]+)/);
             if (formulaMatch) {
                 stepName = formulaMatch[1].replace('}', '');
             }