@steedos-labs/plugin-workflow 3.0.13 → 3.0.15

package/README.md

@@ -6,4 +6,27 @@
  * @Description: 
 -->
 ## 功能说明
-- 审批王服务，包含 流程触发器
+- 审批王服务，包含 流程触发器
+
+## 环境变量配置
+
+### STEEDOS_WORKFLOW_ENABLE_CATEGORY_FILTER
+- **说明**: 控制是否在"待处理"、"监控箱"视图以及左侧导航菜单中按流程分类进行筛选和显示
+- **默认行为**: 启用分类筛选（当环境变量未设置或设置为除 'false' 以外的任何值时）
+- **可选值**: 
+  - 不设置或设置为除 `'false'` 以外的任何值: 启用按分类筛选，根据应用(app)显示对应分类的流程
+  - `'false'` (字符串): 禁用按分类筛选，显示所有流程
+- **使用场景**: 国产化优化，简化流程展示逻辑
+- **影响范围**:
+  - 待处理(Pending)和监控箱(Monitor Box)视图的数据筛选
+  - 左侧导航菜单结构：禁用时仅显示box层级（待办箱、监控箱等），不显示分类和流程子菜单
+
+**示例配置**:
+```bash
+# 禁用分类筛选
+STEEDOS_WORKFLOW_ENABLE_CATEGORY_FILTER=false
+
+# 启用分类筛选（以下任一方式）
+# STEEDOS_WORKFLOW_ENABLE_CATEGORY_FILTER=true
+# 或者不设置该环境变量（默认启用）
+```

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

@@ -8,6 +8,7 @@ mobile: true
 sort: 10
 # tabs:
 #   - object_instance_tasks
+default_tab: object_instance_tasks
 
 showSidebar: true
 enable_nav_schema: true
@@ -24,12 +25,12 @@ nav_schema: {
     {
       "type": "wrapper",
       "size": "none",
-      "className": "instances-sidebar-wrapper mt-1",
+      "className": "instances-sidebar-wrapper mt-1 bg-white",
       "body": [
         {
           "type": "service",
           "id": "u:instanceNav",
-          "className": "bg-none",
+          "className": "bg-white",
           "onEvent": {
             "@data.changed.instances": {
               "actions": [
@@ -58,8 +59,8 @@ nav_schema: {
             {
               "type": "input-tree",
               "name": "tree",
-              "treeContainerClassName": "h-full",
-              "className": "instance-box-tree h-full w-full p-0",
+              "treeContainerClassName": "h-full bg-white",
+              "className": "instance-box-tree h-full w-full p-0 bg-white",
               "id": "u:9f3dd961ca12",
               "stacked": true,
               "multiple": false,
@@ -112,23 +113,23 @@ nav_schema: {
               },
               "menuTpl": {
                 "type": "wrapper",
-                "className": "flex flex-row  p-0 m-0",
+                "className": "flex items-center py-1.5 px-3 m-0 rounded-md transition-colors duration-150",
                 "body": [
                   {
                     "type": "tpl",
-                    "className": "flex-1 w-6/12",
+                    "className": "flex-1 leading-6 truncate instance-menu-label",
                     "tpl": "${label}",
                     "id": "u:9dee51f00db4"
                   },
                   {
                     "type": "tpl",
-                    "className": "-mx-11 ",
+                    "className": "ml-auto",
                     "tpl": "",
                     "badge": {
                       "className": "h-0",
                       "offset": [
-                        -20,
-                        12
+                        -5,
+                        0
                       ],
                       "mode": "text",
                       "text": "${tag | toInt}",

package/main/default/manager/uuflow_manager.js

@@ -605,6 +605,7 @@ UUFlowManager.calculateConditionWithAmis = function (values, condition_str) {
  * @returns {Boolean} Condition result
  */
 UUFlowManager.calculateCondition = function (values, condition_str) {
+    // console.log('calculateCondition', values, condition_str);
     try {
         const __values = values;
 
@@ -817,10 +818,7 @@ UUFlowManager.initFormulaValues = async function (instance, values) {
     __values["applicant"] = {
         roles: await UUFlowManager.getUserRoles(instance.applicant, instance.space),
         name: instance.applicant_name,
-        organization: {
-            fullname: instance.applicant_organization_fullname,
-            name: instance.applicant_organization_name
-        },
+        organization: await UUFlowManager.getOrganization(instance.applicant_organization),
         id: instance.applicant
     };
     

package/main/default/objects/flows/buttons/design_form_layout.button.js

@@ -23,9 +23,7 @@ module.exports = {
     },
     design_form_layoutVisible: function(object_name, record_id, record_permissions, data) {
         var record = data && data.record;
-        if (!Steedos.isSpaceAdmin()) {
-            return false
-        }
+
         if (!record) {
             return false;
         }

package/main/default/objects/flows/flows.object.yml

@@ -60,6 +60,9 @@ fields:
     readonly: true
     visible_on: "{{global.mode !='read' ? false : true}}"
     name: current_no
+  company_id:
+    label: Main Division
+    visible_on: "{{true}}"
   description:
     label: Description
     type: textarea
@@ -77,8 +80,6 @@ fields:
     type: textarea
     is_wide: true
     name: help_text
-  company_id:
-    label: Main Division
   created_by:
     label: Created by
     sort_no: 9999
@@ -906,7 +907,7 @@ permission_set:
     allowEdit: false
     allowRead: true
     modifyAllRecords: false
-    viewAllRecords: true
+    viewAllRecords: false
   admin:
     allowCreate: true
     allowDelete: false

package/main/default/objects/instance_tasks/buttons/instance_new.button.yml

@@ -19,15 +19,15 @@ amis_schema: |-
                                   "title": "${'CustomLabels.instance_action_new_dialog_title' | t}",
                                   "body": [
                                       {
-                                          "type": "steedos-select-flow",
-                                          "id": "instanceNewFlowSelect",
-                                          "showIcon": true,
-                                          "showRadio": false,
-                                          "onlyLeaf": true,
-                                          "name": "flow",
-                                          "action": "new",
+                                        "type": "service",
+                                        "dsType": "api",
+                                        "schemaApi": {
+                                            "url": "/api/v6/functions/pages/schema?pageId=flow_selector",
+                                            "method": "get"
+                                        },
+                                        "initFetchSchema": true,
                                           "onEvent": {
-                                                "change": {
+                                                "flows.selected": {
                                                     "weight": 0,
                                                     "actions": [
                                                         {
@@ -71,7 +71,7 @@ amis_schema: |-
                                   "closeOnEsc": true,
                                   "closeOnOutside": false,
                                   "showCloseButton": true,
-                                  "size": "lg",
+                                  "size": "xl",
                                   "actions": false
                               }
                           }

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

@@ -100,7 +100,7 @@ amis_schema: |-
                       ]
                   }
               },
-              "hiddenOn": "${${listName}!==\"draft\"}"
+              "hiddenOn": "${listName!==\"draft\" || display===\"split\"}"
           }
       ],
       "regions": [

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

@@ -1,5 +1,5 @@
 {
     "type": "liquid",
-    "template": "<style>\n    /* 动效 */\n    @keyframes fadeUpSpring {\n        0% {\n            opacity: 0;\n            transform: translateY(10px);\n        }\n\n        100% {\n            opacity: 1;\n            transform: translateY(0);\n        }\n    }\n\n    @keyframes starPop {\n        0% {\n            transform: scale(1);\n        }\n\n        40% {\n            transform: scale(1.35) rotate(15deg);\n        }\n\n        100% {\n            transform: scale(1) rotate(0);\n        }\n    }\n\n    .no-scrollbar::-webkit-scrollbar {\n        display: none;\n    }\n\n    .no-scrollbar {\n        -ms-overflow-style: none;\n        scrollbar-width: none;\n    }\n\n    .line-clamp-2 {\n        display: -webkit-box;\n        -webkit-line-clamp: 2;\n        -webkit-box-orient: vertical;\n        overflow: hidden;\n    }\n</style>\n\n<div class=\"flex h-full w-full flex-row items-stretch overflow-hidden bg-white font-sans text-gray-900 antialiased\">\n\n    <div class=\"flex h-full w-[260px] shrink-0 flex-col border-r border-gray-200/80 bg-[#F2F2F7] z-20\">\n\n        <div class=\"shrink-0 px-3 pt-4 pb-2\">\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\"\n                        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=\"搜索\"\n                       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        <div class=\"flex-1 overflow-y-auto px-2 pb-4 no-scrollbar space-y-0.5\" id=\"sidebarList\">\n        </div>\n    </div>\n\n    <div class=\"relative flex-1 h-full overflow-y-auto scroll-smooth bg-white z-10\" id=\"mainContent\">\n        <div id=\"contentContainer\" class=\"flex h-full w-full flex-col items-center justify-center\">\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\n<script>\n    // --- Service Layer ---\n    const WorkflowService = {\n        apiBase: \"\", \n        \n        getHeaders: function() { return { 'Content-Type': 'application/json' }; },\n        \n        getCategories: async function() {\n            try {\n                const url = `\\${this.apiBase}/api/v6/data/categories?skip=0&top=100&sort=sort_no&fields=name`;\n                const res = await fetch(url, { headers: this.getHeaders() });\n                const json = await res.json();\n                return json.data || [];\n            } catch (e) { return []; }\n        },\n        \n        getFlows: async function() {\n            try {\n                const filters = JSON.stringify([[\"perms.users_can_add\",\"=\",data.context.userId], \"or\", [\"perms.orgs_can_add\",\"in\",data.context.user.organizations_parents]]);\n                const url = `\\${this.apiBase}/api/v6/data/flows?skip=0&top=5000&sort=sort_no&fields=name%2Ccategory&filters=\\${encodeURIComponent(filters)}`;\n                const res = await fetch(url, { headers: this.getHeaders() });\n                const json = await res.json();\n                return json.data || [];\n            } catch (e) { return []; }\n        },\n        \n        getData: async function() {\n            const [categories, flows] = await Promise.all([this.getCategories(), this.getFlows()]);\n            const categoryMap = {};\n            categories.forEach(c => categoryMap[c._id] = c.name);\n            const mappedFlows = flows.map(f => ({\n                id: f._id, name: f.name, categoryId: f.category,\n                categoryName: categoryMap[f.category] || \"其他流程\" \n            }));\n            return { categories: categories, flows: mappedFlows };\n        },\n        \n        getFavorites: function() {\n            const saved = localStorage.getItem('steedos_fav_ids');\n            return saved ? JSON.parse(saved) : [];\n        },\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    // --- UI Controller ---\n    const AppState = { allFlows: [], categories: [], favorites: [] };\n    const sidebarEl = document.getElementById('sidebarList');\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        contentEl.className = \"block w-full h-full pt-4 px-8 pb-10\";\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.className = \"flex h-full w-full flex-col items-center justify-center\";\n            contentEl.innerHTML = `<div class=\"animate-[fadeUpSpring_0.5s_ease-out] text-center\"><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            \n            // Sidebar Item\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 = `\n                <span class=\"truncate\">\\${group.isFav ? '★ ' : ''}\\${group.name}</span>\n                <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                document.getElementById(groupId)?.scrollIntoView({ behavior: 'smooth', block: 'start' });\n            };\n            sidebarEl.appendChild(navItem);\n\n            // Content Header\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 py-3 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 = [\n                    'bg-blue-50 text-blue-600',\n                    'bg-orange-50 text-orange-600',\n                    'bg-emerald-50 text-emerald-600',\n                    'bg-indigo-50 text-indigo-600'\n                ];\n                const colorClass = colorMap[(flow.name.length + i) % 4];\n                const firstChar = flow.name.replace(/【.*?】/g, '').charAt(0) || flow.name.charAt(0);\n\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                \n                const iconClass = isFav \n                    ? 'text-yellow-400 fill-current' \n                    : 'text-gray-300 group-hover/btn:text-gray-400 fill-none stroke-current stroke-[1.5]';\n                const btnBgClass = isFav\n                    ? 'opacity-100 hover:scale-110'\n                    : 'opacity-0 group-hover:opacity-100 hover:bg-gray-100 hover:scale-110';\n\n                // 修改点: 添加 top-1/2 -translate-y-1/2 实现绝对垂直居中\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                    \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\n                card.onclick = () => {\n                   setTimeout(() => {\n                        console.log(\"选中的流程ID:\", flow.id);\n                        //alert(`准备发起: \\${data.context.user.name}`);\n                        data._scoped.doAction([\n                            {\n                                \"actionType\": \"broadcast\",\n                                \"args\": {\n                                    \"eventName\": \"flows.selected\"\n                                },\n                                \"data\": {\n                                    \"value\": flow.id\n                                }\n                            }\n                        ])\n                   }, 50);\n                };\n\n                const starBtn = card.querySelector('.star-btn');\n                const starIcon = starBtn.querySelector('svg');\n                \n                starBtn.onclick = (e) => {\n                    e.stopPropagation();\n                    const newFavState = !starBtn.classList.contains('active-fav');\n                    \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\n                    AppState.favorites = WorkflowService.toggleFavorite(flow.id, newFavState);\n                    setTimeout(() => renderUI(searchInput.value), 300);\n                };\n                \n                if (isFav) starBtn.classList.add('active-fav');\n\n                grid.appendChild(card);\n            });\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>",
+    "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",
     "className": "h-full"
 }

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

@@ -26,7 +26,7 @@
         "schemaApi": {
             "method": "get",
             "url": "/api/health_check?trace=${recordId}",
-            "adaptor": "const result = {data: {'type':'wrapper','className':'p-0 h-full','body':[{'type':'steedos-instance-detail','id':'u:40052b3812c1','label':'Instance Detail','instanceId':context.recordId,'boxName':context.side_listview_id}],'id':'u:829a40757f0a'}};console.log('result===>', result); return result;"
+            "adaptor": "const urlParams = new URLSearchParams(location.search); const sideListViewId = urlParams.get('side_listview_id'); const result = {data: {'type':'wrapper','className':'p-0 h-full','body':[{'type':'steedos-instance-detail','id':'u:40052b3812c1','label':'Instance Detail','instanceId':context.recordId,'boxName':sideListViewId}],'id':'u:829a40757f0a'}};return result;"
         },
         "body": {},
         "className": "h-full",

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

@@ -19,6 +19,11 @@ router.post('/api/workflow/v2/instance/upgrade', requireAuthentication, async fu
             'flow','form','applicant_name','applicant_organization','applicant_organization_fullname','applicant_organization_name',
             'code', 'flow_version', 'form_version', 'submit_date', 'flow_name', 'code', 'traces', 'state'
         ]});
+        if(!record){
+            return res.status(200).send({
+                instance: false
+            });
+        }
         if(record.state !== 'draft'){
             return res.status(200).send({
                 instance: true

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

@@ -56,54 +56,67 @@ const getCategoriesInbox = async (userSession, req, currentUrl) => {
     fields: ['_id', 'flow', 'category','flow_name','category_name']
   }, userSession)
 
+  // Check environment variable to control category filtering
+  // Default is enabled (when not set or set to any value except 'false')
+  // Only the string 'false' will disable the filtering
+  const enableCategoryFilter = process.env.STEEDOS_WORKFLOW_ENABLE_CATEGORY_FILTER !== 'false';
+
   const output = [];
-  const categoryGroups = lodash.groupBy(data, 'category_name');
-  lodash.each(categoryGroups, (v, k)=>{
-    let categoryBadge = 0;
-    const flowGroups = lodash.groupBy(v, 'flow_name');
-    const flows = [];
-    const categoryValue = `/app/${appId}/instance_tasks/view/none?side_object=instance_tasks&side_listview_id=inbox&additionalFilters=['category','=',${v[0].category?"'" + v[0].category + "'":v[0].category}]&flowId=&categoryId=${v[0].category}`;
-    let categoryIsUnfolded = false;
-    lodash.each(flowGroups, (v2, k2)=>{
-      const flowValue = `/app/${appId}/instance_tasks/view/none?side_object=instance_tasks&side_listview_id=inbox&additionalFilters=['flow','=','${v2[0].flow}']&flowId=${v2[0].flow}&categoryId=${v[0].category}`;
-      let flowIsUnfolded = false;
-      if(currentUrl == flowValue){
-        flowIsUnfolded = true;
+  
+  if (!enableCategoryFilter) {
+    // When category filtering is disabled, return empty array (no sub-navigation)
+    // Only box-level items will be shown
+  } else {
+    // Original logic with category grouping
+    const categoryGroups = lodash.groupBy(data, 'category_name');
+    lodash.each(categoryGroups, (v, k)=>{
+      let categoryBadge = 0;
+      const flowGroups = lodash.groupBy(v, 'flow_name');
+      const flows = [];
+      const categoryValue = `/app/${appId}/instance_tasks/view/none?side_object=instance_tasks&side_listview_id=inbox&additionalFilters=['category','=',${v[0].category?"'" + v[0].category + "'":v[0].category}]&flowId=&categoryId=${v[0].category}`;
+      let categoryIsUnfolded = false;
+      lodash.each(flowGroups, (v2, k2)=>{
+        const flowValue = `/app/${appId}/instance_tasks/view/none?side_object=instance_tasks&side_listview_id=inbox&additionalFilters=['flow','=','${v2[0].flow}']&flowId=${v2[0].flow}&categoryId=${v[0].category}`;
+        let flowIsUnfolded = false;
+        if(currentUrl == flowValue){
+          flowIsUnfolded = true;
+          categoryIsUnfolded = true;
+        }
+        categoryBadge += v2.length
+        flows.push({
+          label: k2,
+          flow_name: k2,
+          tag:v2.length,
+          options:{
+            level:3,
+            value: v2[0].flow,
+            name: 'flow',
+            to: flowValue,
+          },
+          value: flowValue,
+          unfolded: flowIsUnfolded
+        })
+      })
+      if(currentUrl == categoryValue){
         categoryIsUnfolded = true;
       }
-      categoryBadge += v2.length
-      flows.push({
-        label: k2,
-        flow_name: k2,
-        tag:v2.length,
-        options:{
-          level:3,
-          value: v2[0].flow,
-          name: 'flow',
-          to: flowValue,
+      output.push({
+        label: k == 'null' || k == 'undefined' || !k ? "未分类" : k,
+        children: flows,
+        category_name: k == 'null' || k == 'undefined' || !k ? "未分类" : k,
+        tag: v.length,
+        options: {
+          level: 2,
+          value: v[0].category,
+          name: 'category',
+          to: categoryValue,
         },
-        value: flowValue,
-        unfolded: flowIsUnfolded
+        value: categoryValue,
+        unfolded: categoryIsUnfolded
       })
     })
-    if(currentUrl == categoryValue){
-      categoryIsUnfolded = true;
-    }
-    output.push({
-      label: k == 'null' || k == 'undefined' || !k ? "未分类" : k,
-      children: flows,
-      category_name: k == 'null' || k == 'undefined' || !k ? "未分类" : k,
-      tag: v.length,
-      options: {
-        level: 2,
-        value: v[0].category,
-        name: 'category',
-        to: categoryValue,
-      },
-      value: categoryValue,
-      unfolded: categoryIsUnfolded
-    })
-  })
+  }
+  
   return {
     schema: output,
     count: data.length,
@@ -121,119 +134,130 @@ const getCategoriesMonitor = async (userSession, req, currentUrl) => {
   let output = [];
   let monitorIsUnfolded = false;
 
+  // Check environment variable to control category filtering
+  // Default is enabled (when not set or set to any value except 'false')
+  // Only the string 'false' will disable the filtering
+  const enableCategoryFilter = process.env.STEEDOS_WORKFLOW_ENABLE_CATEGORY_FILTER !== 'false';
+
   try {
-    // const sa = new Date().getTime();
-    const apps = await objectql.getObject('apps').find({filters: ['space', '=', userSession.spaceId], fields: ['_id', 'code']});
-    // console.log(`find apps`, new Date().getTime() - sa)
-    const appsMap = new Map(Object.entries(lodash.keyBy(apps, '_id')));
-    // const sc = new Date().getTime();
-    const categories = await objectql.getObject('categories').find({filters: ["space", "=", `${userSession.spaceId}`], sort: "sort_no desc"})
-    // console.log(`find categories`, new Date().getTime() - sc)
-    for (const item of categories) {
-      if(item.app){
-        item.app__expand = appsMap.get(item.app)
-      }else{
-        item.app__expand = {}
+    let flows = [];
+    
+    if (!enableCategoryFilter) {
+      // When category filtering is disabled, return empty array (no sub-navigation)
+      // Only box-level items will be shown
+      // Still need to check permissions for hasFlowsPer (used to control monitor box visibility)
+      if (!hasFlowsPer) {
+        const flowIds = await WorkflowManager.getMyAdminOrMonitorFlows(userSession.spaceId, userSession.userId);
+        hasFlowsPer = flowIds && flowIds.length > 0;
+      }
+    } else {
+      // Original logic with category grouping
+      const apps = await objectql.getObject('apps').find({filters: ['space', '=', userSession.spaceId], fields: ['_id', 'code']});
+      const appsMap = new Map(Object.entries(lodash.keyBy(apps, '_id')));
+      const categories = await objectql.getObject('categories').find({filters: ["space", "=", `${userSession.spaceId}`], sort: "sort_no desc"})
+      for (const item of categories) {
+        if (item.app) {
+          item.app__expand = appsMap.get(item.app)
+        } else {
+          item.app__expand = {}
+        }
       }
-    }
 
-    let currentAppCategories = [];
-    if(appId == "approve_workflow"){
-      currentAppCategories = categories;
-    }else{
-      currentAppCategories = lodash.filter(categories, (category) => {
-        if(category.app__expand?.code == appId) return true;
-        else return false;
-      })
-      if(currentAppCategories.length == 0) {
-        //如果没有任何分类绑定该app，则该app显示所有分类（该规则为审批王规则）
+      let currentAppCategories = [];
+      if (appId == "approve_workflow") {
         currentAppCategories = categories;
+      } else {
+        currentAppCategories = lodash.filter(categories, (category) => {
+          if (category.app__expand?.code == appId) return true;
+          else return false;
+        })
+        if (currentAppCategories.length == 0) {
+          //如果没有任何分类绑定该app，则该app显示所有分类（该规则为审批王规则）
+          currentAppCategories = categories;
+        }
       }
-    }
-    let categoriesIds = lodash.map(currentAppCategories, '_id');
-    // console.log(`getCategoriesMonitor categoriesIds`, categoriesIds)
-    // console.log(`getCategoriesMonitor hasFlowsPer`, hasFlowsPer)
-    let flows = [];
-    if (!hasFlowsPer) {
-      const flowIds = await WorkflowManager.getMyAdminOrMonitorFlows(userSession.spaceId, userSession.userId);
-      hasFlowsPer = flowIds && flowIds.length > 0;
-      if (hasFlowsPer) {
+      let categoriesIds = lodash.map(currentAppCategories, '_id');
+      
+      if (!hasFlowsPer) {
+        const flowIds = await WorkflowManager.getMyAdminOrMonitorFlows(userSession.spaceId, userSession.userId);
+        hasFlowsPer = flowIds && flowIds.length > 0;
+        if (hasFlowsPer) {
+          flows = await objectql.getObject('flows').find({
+            filters: [["_id","in", flowIds],"and",["category","in", categoriesIds], "and", ["state", "=", "enabled"]],
+            fields: ['_id', 'name', 'category', 'sort_no'],
+            sort:"sort_no desc"
+          });
+        }
+      } else {
         flows = await objectql.getObject('flows').find({
-          filters: [["_id","in", flowIds],"and",["category","in", categoriesIds], "and", ["state", "=", "enabled"]],
+          filters:[["space", "=", userSession.spaceId],["category","in", categoriesIds],["state", "=", "enabled"]],
           fields: ['_id', 'name', 'category', 'sort_no'],
           sort:"sort_no desc"
-        });
+        })
       }
-    } else {
-      // const s1 = new Date().getTime();
-      flows = await objectql.getObject('flows').find({
-        filters:[["space", "=", userSession.spaceId],["category","in", categoriesIds],["state", "=", "enabled"]],
-        fields: ['_id', 'name', 'category', 'sort_no'],
-        sort:"sort_no desc"
-      })
-      // console.log(`find flows`, new Date().getTime() - s1)
-    }
-    if (flows.length > 0) {
-      const categoriesMap = new Map(Object.entries(lodash.keyBy(categories, '_id')));
+      
+      if (flows.length > 0) {
+        const categoriesMap = new Map(Object.entries(lodash.keyBy(categories, '_id')));
 
-      for (const item of flows) {
-        if(item.category){
-          item.category__expand = categoriesMap.get(item.category)
-        }else{
-          item.category__expand = {}
+        for (const item of flows) {
+          if (item.category) {
+            item.category__expand = categoriesMap.get(item.category)
+          } else {
+            item.category__expand = {}
+          }
         }
-      }
 
-      const categoryGroups = lodash.groupBy(flows, 'category__expand.name');
-      lodash.each(categoryGroups, (v, k) => {
-        const flowGroups = lodash.groupBy(v, 'name');
-        const flows = [];
-        const categoryValue = `/app/${appId}/instances/view/none?side_object=instances&side_listview_id=monitor&additionalFilters=['category','=',${v[0].category__expand?"'" + v[0].category__expand._id + "'":null}]&flowId=&categoryId=${v[0].category__expand && v[0].category__expand._id}`;
-        let categoryIsUnfolded = false;
-        lodash.each(flowGroups, (v2, k2) => {
-          const flowValue = `/app/${appId}/instances/view/none?side_object=instances&side_listview_id=monitor&additionalFilters=['flow','=','${v2[0]._id}']&flowId=${v2[0]._id}&categoryId=${v[0].category__expand && v[0].category__expand._id}`;
-          let flowIsUnfolded = false;
-          if(currentUrl == flowValue){
-            flowIsUnfolded = true;
+        const categoryGroups = lodash.groupBy(flows, 'category__expand.name');
+        lodash.each(categoryGroups, (v, k) => {
+          const flowGroups = lodash.groupBy(v, 'name');
+          const flows = [];
+          const categoryValue = `/app/${appId}/instances/view/none?side_object=instances&side_listview_id=monitor&additionalFilters=['category','=',${v[0].category__expand?"'" + v[0].category__expand._id + "'":null}]&flowId=&categoryId=${v[0].category__expand && v[0].category__expand._id}`;
+          let categoryIsUnfolded = false;
+          lodash.each(flowGroups, (v2, k2) => {
+            const flowValue = `/app/${appId}/instances/view/none?side_object=instances&side_listview_id=monitor&additionalFilters=['flow','=','${v2[0]._id}']&flowId=${v2[0]._id}&categoryId=${v[0].category__expand && v[0].category__expand._id}`;
+            let flowIsUnfolded = false;
+            if (currentUrl == flowValue) {
+              flowIsUnfolded = true;
+              categoryIsUnfolded = true;
+              monitorIsUnfolded = true;
+            }
+            flows.push({
+              label: k2,
+              flow_name: k2,
+              options: {
+                level: 3,
+                value: v2[0]._id,
+                name: 'flow',
+                to: flowValue,
+              },
+              value: flowValue,
+              unfolded: flowIsUnfolded
+            })
+          })
+          if (currentUrl == categoryValue) {
             categoryIsUnfolded = true;
             monitorIsUnfolded = true;
           }
-          flows.push({
-            label: k2,
-            flow_name: k2,
+          output.push({
+            label: k == 'null' || k == 'undefined' || !k? "未分类" : k,
+            children: flows,
+            category_name: k == 'null' || k == 'undefined' || !k ? "未分类" : k,
             options: {
-              level: 3,
-              value: v2[0]._id,
-              name: 'flow',
-              to: flowValue,
+              level: 2,
+              value: v[0].category__expand && v[0].category__expand._id,
+              name: 'category',
+              to: categoryValue,
             },
-            value: flowValue,
-            unfolded: flowIsUnfolded
+            value: categoryValue,
+            unfolded: categoryIsUnfolded
           })
         })
-        if(currentUrl == categoryValue){
-          categoryIsUnfolded = true;
-          monitorIsUnfolded = true;
-        }
-        output.push({
-          label: k == 'null' || k == 'undefined' || !k? "未分类" : k,
-          children: flows,
-          category_name: k == 'null' || k == 'undefined' || !k ? "未分类" : k,
-          options: {
-            level: 2,
-            value: v[0].category__expand && v[0].category__expand._id,
-            name: 'category',
-            to: categoryValue,
-          },
-          value: categoryValue,
-          unfolded: categoryIsUnfolded
-        })
-      })
-      output = lodash.sortBy(output, [function (o) {
-        return lodash.findIndex(categories, (e) => {
-          return e._id == o.options.value;
-        });
-      }]);
+        output = lodash.sortBy(output, [function (o) {
+          return lodash.findIndex(categories, (e) => {
+            return e._id == o.options.value;
+          });
+        }]);
+      }
     }
   } catch (error) {
     console.log(error)

package/main/default/routes/flow_form_design.ejs

@@ -302,7 +302,22 @@
             tpl.type = "input-text";
           }
           if(field.formula){
-            tpl.value = `$${field.formula}`;
+            if(field.formula.startsWith('{') && (field.formula.endsWith('}') || field.formula.indexOf("}") > 0)){
+              // {申请人姓名}.organization.fullname 转换为 ${申请人姓名.organization.fullname}
+              // {申请人姓名.organization.fullname} 转换为 ${申请人姓名.organization.fullname}  
+              if(field.formula.indexOf("}.") > 0){
+                // {申请人姓名}.organization.fullname
+                let formula = field.formula;
+                formula = formula.substring(1, formula.indexOf("}"));
+                tpl.value = `\${${formula}${field.formula.substring( field.formula.indexOf("}") + 1 )}}`;
+              } else {
+                // {申请人姓名.organization.fullname}
+                tpl.value = `$${field.formula}`;
+              }
+            }else{
+              // 替换掉所有双引号"
+              tpl.value = field.formula.replace(/"/g, '');
+            }
           }
           break;
         case "number":

package/main/default/services/flows.service.js

@@ -1,8 +1,8 @@
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2023-01-14 11:31:56
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-10-18 09:50:42
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2026-01-15 13:28:24
  * @Description:
  */
 const objectql = require("@steedos/objectql");
@@ -31,6 +31,7 @@ module.exports = {
   },
   actions: {
     flows__getList: {
+      rest: "GET /getList",
       graphql: {
         query: `
           #按权限获取flows数据

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

@@ -283,7 +283,16 @@ module.exports = {
     },
     getAppCategoriesIds: {
         async handler(appId) {
-          if(appId == "approve_workflow"){
+          // Check environment variable to control category filtering
+          // Default is enabled (when not set or set to any value except 'false')
+          // Only the string 'false' will disable the filtering
+          const enableCategoryFilter = process.env.STEEDOS_WORKFLOW_ENABLE_CATEGORY_FILTER !== 'false';
+          
+          if (!enableCategoryFilter) {
+            return [];
+          }
+          
+          if (appId == "approve_workflow") {
             return [];
           }
           const categories = await objectql.getObject('categories').directFind({ filters: [['app', '=', appId]] });

package/package.json

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

package/public/workflow/index.css

@@ -52,7 +52,27 @@
 
 .instance-box-tree .antd-TreeControl{
     padding: 0;
+    background: #ffffff;
+}
+
+/* Remove default tree styling to allow custom styling */
+.instance-box-tree .antd-Tree-itemLabel-item{
+    padding: 0 !important;
+    margin: 0 !important;
+    display: flex !important;
+    align-items: center !important;
+    width: 100%; /* Ensure it spans the width */
 }
+
+/* Ensure the label container is also flex centered and full width */
+.instance-box-tree .antd-Tree-itemLabel {
+    display: flex !important;
+    align-items: center !important;
+    width: 100%;
+    padding-right: 4px;
+}
+
+/* Tree item wrapper - removed margin to allow full-row background */
 /* .instance-box-tree .antd-TreeControl{
     padding: 0;
     border-bottom: 0px;
@@ -78,17 +98,42 @@
 .instance-box-tree .antd-Tree-itemIcon{
     margin-right: 4px;
 } */
+/* Fix Badge layout: force it to flow naturally in flex layout to display full content for large numbers like 9999 */
+/* Also ensures it stays aligned to the right of the text label without overlapping */
+.instance-box-tree .antd-Badge {
+    height: auto !important;
+    width: auto !important;
+    position: static !important;
+    transform: none !important;
+    flex-shrink: 0;
+    margin-left: 4px;
+    display: flex;
+    align-items: center;
+}
+
 .instance-box-tree  .antd-Badge-text{
-    background: #D3D6DD;
+    background: #e5e7eb;
+    color: #4b5563;
+    font-size: 11px;
+    padding: 0px 6px;
+    border-radius: 10px;
+    font-weight: 500;
+    line-height: 18px;
+    min-width: 18px;
+    display: inline-block;
+    text-align: center;
+    position: static !important;
+    transform: none !important;
 }
 .instance-box-tree .antd-Tree-item:nth-child(1) .antd-Badge-text{
-    background: #DF4D46;
+    background: #ef4444;
+    color: #ffffff;
 }
 /* .instance-box-tree .antd-Tree-itemLabel-item{
     height: 1.6rem;
 } */
 .instance-box-tree .antd-TplField span{
-    width: 85%;
+    /* width: 85%; */
     display: block;
     overflow: hidden;
     white-space: nowrap;
@@ -115,12 +160,157 @@
     border: none !important;
 }
 
-.instance-box-tree .antd-Tree-item .is-checked{
-    background-color: rgba(21,137,238,.1);
+/* Base styling for all menu labels - must be specific enough */
+.instance-box-tree .antd-Tree .instance-menu-label {
+    font-weight: 400;
+    color: #6b7280;
+}
+
+/* Tree item spacing for proper layout */
+.instance-box-tree .antd-Tree-item {
+    margin: 2px 8px;
+}
+
+/* Selected state styling - Using robust pseudo-element strategy for cross-browser support */
+
+/* 1. Reset positions to ensure clean background layering */
+.instance-box-tree .antd-Tree-item {
+    margin: 2px 8px; /* Maintain standard margin */
+    position: relative !important; /* Context for absolute positioning */
+    z-index: 0; /* Create stacking context so -1 doesn't go behind the white container */
+}
+
+/* 2. Remove ANY positioning from the label so it doesn't trap the pseudo-element */
+.instance-box-tree .antd-Tree-itemLabel.is-checked {
+    background-color: transparent !important;
+    position: static !important;
 }
 
-.instance-box-tree .antd-Tree-item .is-checked .antd-Tree-itemLabel-item{
-    background-color: unset;
+/* 3. Helper to make label static if checked is on item */
+.instance-box-tree .antd-Tree-item.is-checked > .antd-Tree-itemLabel {
+    background-color: transparent !important;
+    position: static !important;
+}
+
+/* 4. The background pseudo-element */
+.instance-box-tree .antd-Tree-itemLabel.is-checked::before,
+.instance-box-tree .antd-Tree-item.is-checked > .antd-Tree-itemLabel::before {
+    content: "";
+    position: absolute;
+    left: 0;
+    right: 0;
+    top: 0; /* Cover full height (margin handles the spacing) */
+    bottom: 0;
+    background-color: var(--color-brand-50, #dbeafe);
+    border-radius: 6px;
+    z-index: -1; /* Behind text */
+}
+
+.instance-box-tree .antd-Tree-itemLabel.is-checked .instance-menu-label,
+.instance-box-tree .antd-Tree-item.is-checked .instance-menu-label {
+    color: var(--Menu-light-fontColor-onHover, #1e40af) !important;
+}
+
+.instance-box-tree .antd-Tree-itemLabel.is-checked .antd-Tree-itemIcon,
+.instance-box-tree .antd-Tree-item.is-checked .antd-Tree-itemIcon {
+    color: var(--Menu-light-fontColor-onHover, #1e40af) !important;
+}
+
+/* Hover state - entire row with light gray background */
+.instance-box-tree .antd-Tree-item:hover {
+    background-color: #f3f4f6;
+    border-radius: 6px;
+    margin: 2px 8px;
+}
+
+.instance-box-tree .antd-Tree-item.is-checked:hover {
+    background-color: var(--color-brand-50, #dbeafe) !important;
+}
+
+/* Group title styling - larger and bolder */
+.instance-box-tree .antd-Tree .antd-Tree-item[aria-level="1"] .instance-menu-label {
+    font-size: 13px !important;
+    font-weight: 600;
+    color: #374151;
+}
+--isL
+/* Child item (non-leaf) styling - normal size and weight */
+.instance-box-tree .antd-Tree .antd-Tree-item[aria-level="2"]:not(.is-leaf) .instance-menu-label {
+    font-size: 13px !important;
+    font-weight: 400;
+    color: #6b7280;
+}
+
+/* Leaf node styling - darker and larger for prominence */
+.instance-box-tree .antd-Tree .antd-Tree-item--isLeaf .instance-menu-label {
+    font-size: 14px !important;
+    font-weight: 600 !important;
+    color: rgb(71 85 105 / var(--tw-text-opacity, 1)) !important;
+}
+
+/* Override leaf node color when selected */
+.instance-box-tree .antd-Tree .antd-Tree-item--isLeaf .antd-Tree-itemLabel.is-checked .instance-menu-label {
+    color: var(--Menu-light-fontColor-onHover, #1e40af) !important;
+    font-weight: 600 !important;
+}
+
+/* Fix alignment and spacing for the custom menu template wrapper */
+.instance-box-tree .antd-Tree-itemText > div {
+    padding-top: 0px !important; /* Reduced from 4px to fix "text too low" */
+    padding-bottom: 0px !important;
+    padding-right: 0px !important; /* Reduced to move content closer to right edge */
+    line-height: 24px; /* Explicit line height to ensure centering */
+    display: flex;
+    align-items: center;
+}
+
+/* Ensure the text container takes available width */
+.instance-box-tree .antd-Tree-itemText {
+    flex: 1;
+    display: flex;
+    align-items: center;
+    position: relative; /* Ensure z-index works if needed */
+    z-index: 1;
+    min-width: 0; /* Enable truncation */
+}
+
+/* Icon styling */
+.instance-box-tree .antd-Tree-itemIcon{
+    color: #6b7280;
+    margin-right: 0px;
+}
+
+/* Hide icons for leaf nodes at level >= 3 (final menu items within category groups) */
+.instance-box-tree .antd-Tree .antd-Tree-item--isLeaf[style*="calc(2 *"] .antd-Tree-itemIcon,
+.instance-box-tree .antd-Tree .antd-Tree-item--isLeaf[style*="calc(3 *"] .antd-Tree-itemIcon,
+.instance-box-tree .antd-Tree .antd-Tree-item--isLeaf[style*="calc(4 *"] .antd-Tree-itemIcon,
+.instance-box-tree .antd-Tree .antd-Tree-item--isLeaf[style*="calc(5 *"] .antd-Tree-itemIcon {
+    display: none;
+    margin-right: 0px;
+}
+
+/* Reduce left padding for leaf nodes to compensate for hidden icon */
+.instance-box-tree .antd-Tree .antd-Tree-item--isLeaf .antd-Tree-itemLabel{
+    padding-left: 0;
+}
+
+/* Hide arrow placeholder for leaf nodes at level >= 3 to align text left without shifting container */
+.instance-box-tree .antd-Tree .antd-Tree-item--isLeaf[style*="calc(2 *"] .antd-Tree-itemArrowPlaceholder,
+.instance-box-tree .antd-Tree .antd-Tree-item--isLeaf[style*="calc(3 *"] .antd-Tree-itemArrowPlaceholder,
+.instance-box-tree .antd-Tree .antd-Tree-item--isLeaf[style*="calc(4 *"] .antd-Tree-itemArrowPlaceholder,
+.instance-box-tree .antd-Tree .antd-Tree-item--isLeaf[style*="calc(5 *"] .antd-Tree-itemArrowPlaceholder {
+    width: 22px;
+}
+
+/* Arrow styling */
+.instance-box-tree .antd-Tree-itemArrow{
+    color: #9ca3af;
+    transition: transform 0.2s ease;
+    margin-right: 4px;
+}
+
+.instance-box-tree .antd-Tree-item.is-expanded > .antd-Tree-itemArrow{
+    transform: rotate(90deg);
 }
 
 
@@ -360,7 +550,7 @@ tbody .color-priority-muted *{
 }
 
 .steedos-instance-detail-wrapper{
-    height: calc(100vh - 84px);
+    height: calc(100vh - 101px);
 }
 
 .steedos-amis-instance-view-body .antd-Panel-title{
@@ -372,10 +562,27 @@ tbody .color-priority-muted *{
     z-index: 900;
 }
 
-/* .instances-sidebar-wrapper{
-    overflow-y: auto;
-    height: calc(100vh - 50px);
-} */
+/* Sidebar wrapper - no scrolling as parent handles it */
+.instances-sidebar-wrapper{
+    /* Removed overflow and height - parent layer handles scrolling */
+}
+
+.instances-sidebar-wrapper::-webkit-scrollbar {
+    width: 6px;
+}
+
+.instances-sidebar-wrapper::-webkit-scrollbar-track {
+    background: transparent;
+}
+
+.instances-sidebar-wrapper::-webkit-scrollbar-thumb {
+    background: #d1d5db;
+    border-radius: 3px;
+}
+
+.instances-sidebar-wrapper::-webkit-scrollbar-thumb:hover {
+    background: #9ca3af;
+}
 
 .steedos-instance-related-view-wrapper{
     .antd-Page-header{
@@ -383,6 +590,12 @@ tbody .color-priority-muted *{
     }
 }
 
+.instance-form pre{
+  white-space: pre-wrap;      /* 保留空白符，允许换行 */
+  word-wrap: break-word;      /* 长单词或URL换行 */
+  overflow-wrap: break-word;  /* 更现代的属性 */
+}
+
 
 /* 公共打印隐藏样式 */
 @media print {
@@ -408,4 +621,19 @@ tbody .color-priority-muted *{
   .font-normal{
     border: none !important;
   }
-}
+}
+
+  /* .steedos-instance-detail-wrapper{
+        height: auto !important;
+    }
+
+    .steedos-amis-instance-view-body{
+        height: auto !important;
+    }
+    .creator-content-wrapper{
+        overflow: unset !important;
+    }
+
+    body{
+        overflow: auto !important;
+    } */