@steedos-labs/plugin-workflow 3.0.24 → 3.0.26

package/main/default/manager/uuflow_manager.js

@@ -4265,7 +4265,6 @@ UUFlowManager.draft_save_instance = async function (ins, userId) {
                 submitter: 1,
                 traces: 1,
                 form: 1,
-                form_version: 1,
                 flow_version: 1,
                 space: 1,
                 flow: 1
@@ -4344,65 +4343,6 @@ UUFlowManager.draft_save_instance = async function (ins, userId) {
         }
     }
 
-    // Convert date/datetime field values from ISO strings to Date objects
-    // Fetch form to check field types and get name formula
-    // For draft save, always use current form version (not historys which could be very large)
-    const form = await db.forms.findOne(
-        { _id: form_id },
-        { projection: { 'current._id': 1, 'current.fields': 1, 'current.name_forumla': 1 } }
-    );
-    
-    // Draft save always uses current form version
-    const formVersion = form?.current;
-    
-    // Convert date strings to Date objects for proper MongoDB storage
-    if (formVersion && formVersion.fields && values) {
-        const convertFieldValue = (field, value) => {
-            if (!value) return value;
-            
-            // Handle date and datetime fields - convert ISO strings to Date objects
-            if (field.type === 'date' || field.type === 'datetime') {
-                // Check if value is a string (ISO date format from frontend)
-                if (typeof value === 'string') {
-                    const dateObj = new Date(value);
-                    // Validate it's a valid date
-                    if (!isNaN(dateObj.getTime())) {
-                        return dateObj;
-                    }
-                }
-            }
-            // Handle table fields (subforms)
-            else if (field.type === 'table' && Array.isArray(value) && field.fields) {
-                return value.map(row => {
-                    const convertedRow = {...row};
-                    field.fields.forEach(subField => {
-                        if (row[subField.code] !== undefined) {
-                            convertedRow[subField.code] = convertFieldValue(subField, row[subField.code]);
-                        }
-                    });
-                    return convertedRow;
-                });
-            }
-            
-            return value;
-        };
-        
-        // Process all form fields
-        formVersion.fields.forEach(field => {
-            if (field.type === 'section' && field.fields) {
-                // Process section's child fields
-                field.fields.forEach(sectionField => {
-                    if (values[sectionField.code] !== undefined) {
-                        values[sectionField.code] = convertFieldValue(sectionField, values[sectionField.code]);
-                    }
-                });
-            } else if (values[field.code] !== undefined) {
-                // Process regular fields
-                values[field.code] = convertFieldValue(field, values[field.code]);
-            }
-        });
-    }
-
     setObj[key_str + 'values'] = values;
     setObj[key_str + 'description'] = description;
     setObj[key_str + 'judge'] = 'submitted';
@@ -4413,6 +4353,11 @@ UUFlowManager.draft_save_instance = async function (ins, userId) {
     }
 
     // Calculate instance name
+    const form = await db.forms.findOne(
+        { _id: form_id },
+        { projection: { 'current.name_forumla': 1 } }
+    );
+
     if (form?.current?.name_forumla) {
         setObj.name = await UUFlowManager.getInstanceName(ins, values);
         if(result !== 'upgraded'){

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

@@ -21,8 +21,11 @@ amis_schema: |-
                                       {
                                         "type": "service",
                                         "dsType": "api",
+                                        "data": {
+                                            "isMobile": "${window:innerWidth <= 768}"
+                                        },
                                         "schemaApi": {
-                                            "url": "/api/v6/functions/pages/schema?pageId=flow_selector",
+                                            "url": "${isMobile ? '/api/v6/functions/pages/schema?pageId=flow_selector_mobile' : '/api/v6/functions/pages/schema?pageId=flow_selector'}",
                                             "method": "get"
                                         },
                                         "initFetchSchema": true,

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

@@ -21,8 +21,11 @@ amis_schema: |-
                                 {
                                         "type": "service",
                                         "dsType": "api",
+                                        "data": {
+                                            "isMobile": "${window:innerWidth <= 768}"
+                                        },
                                         "schemaApi": {
-                                            "url": "/api/v6/functions/pages/schema?pageId=flow_selector",
+                                            "url": "${isMobile ? '/api/v6/functions/pages/schema?pageId=flow_selector_mobile' : '/api/v6/functions/pages/schema?pageId=flow_selector'}",
                                             "method": "get"
                                         },
                                         "initFetchSchema": true,

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

@@ -83,6 +83,17 @@ amis_schema: |-
                                                           },
                                                           "actionType": "ajax"
                                                       },
+                                                      {
+                                                          "actionType": "broadcast",
+                                                          "args": {
+                                                              "eventName": "@data.@instanceDetail.changed"
+                                                          },
+                                                          "data": {}
+                                                      },
+                                                      {
+                                                        "actionType": "custom",
+                                                        "script": "$('.steedos-workflow-reload-btn').trigger('click')"
+                                                      },
                                                       {
                                                           "componentId": "",
                                                           "args": {},

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

@@ -0,0 +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    /* Mobile-optimized scrollbars */\n    ::-webkit-scrollbar {\n        width: 4px;\n        height: 4px;\n    }\n    ::-webkit-scrollbar-track {\n        background: transparent;\n    }\n    ::-webkit-scrollbar-thumb {\n        background-color: rgba(0, 0, 0, 0.2);\n        border-radius: 4px;\n    }\n\n    /* Force full screen modal for mobile */\n    .antd-Modal:has(#steedosFlowSelectorMobile) {\n        top: 0 !important;\n        margin: 0 !important;\n        padding: 0 !important;\n        max-width: 100vw !important;\n        width: 100vw !important;\n        height: 100vh !important;\n        height: 100dvh !important;\n    }\n\n    .antd-Modal-content:has(#steedosFlowSelectorMobile) {\n        height: 100vh !important;\n        height: 100dvh !important;\n        padding-bottom: 0 !important;\n        display: flex !important;\n        flex-direction: column !important;\n        border-radius: 0 !important;\n        overflow: hidden !important;\n    }\n\n    .antd-Modal-body:has(#steedosFlowSelectorMobile) {\n        margin: 0 !important;\n        flex: 1 !important;\n        height: auto !important;\n        overflow: hidden !important;\n        padding: 0 !important;\n        display: flex !important;\n        flex-direction: column !important;\n    }\n    \n    .antd-Service, .liquid-amis-container {\n        display: flex; /* Ensure flex propagation */\n        flex-direction: column;\n        height: 100%;\n        overflow: hidden; /* Prevent double scrollbars */\n    }\n\n    /* Mobile category selector styles */\n    .mobile-category-pill {\n        -webkit-tap-highlight-color: transparent;\n        touch-action: manipulation;\n    }\n\n    /* Flow card animations */\n    @keyframes flowCardSlideIn {\n        0% {\n            opacity: 0;\n            transform: translateY(20px);\n        }\n        100% {\n            opacity: 1;\n            transform: translateY(0);\n        }\n    }\n</style>\n\n<!-- Main Mobile Container -->\n<div id=\"steedosFlowSelectorMobile\" class=\"flex flex-col h-full w-full bg-[#F5F5F7] font-sans text-gray-900 overflow-hidden\">\n    \n    <!-- Top Header Section -->\n    <div class=\"shrink-0 bg-white border-b border-gray-200 shadow-sm pt-4\">\n        \n        <!-- Search Bar -->\n        <div class=\"px-4 pb-3\">\n            <div class=\"relative\">\n                <div class=\"pointer-events-none absolute inset-y-0 left-0 flex items-center pl-3 text-gray-400\">\n                    <svg class=\"h-5 w-5\" 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 \n                    type=\"text\" \n                    id=\"mobileSearchInput\" \n                    placeholder=\"搜索流程...\" \n                    class=\"w-full rounded-xl border border-gray-200 bg-gray-50 py-2.5 pl-10 pr-3 text-base text-gray-900 placeholder:text-gray-400 outline-none transition-all duration-200 focus:bg-white focus:border-blue-500 focus:ring-2 focus:ring-blue-500/20\"\n                >\n            </div>\n        </div>\n        \n        <!-- Category Tabs - Horizontal Scroll -->\n        <div class=\"overflow-x-auto scrollbar-hide pb-2\">\n            <div id=\"mobileCategoryTabs\" class=\"flex gap-2 px-4 min-w-full\">\n                <!-- Categories will be inserted here -->\n            </div>\n        </div>\n    </div>\n    \n    <!-- Main Content Area -->\n    <!-- Added min-h-0 and webkit-overflow-scrolling for better mobile scrolling -->\n    <div class=\"flex-1 overflow-y-auto scroll-smooth px-4 py-4 min-h-0\" style=\"-webkit-overflow-scrolling: touch;\">\n        <div id=\"mobileContentContainer\" class=\"space-y-3 pb-safe\">\n            <div class=\"flex flex-col items-center justify-center pt-20 text-center\">\n                <div class=\"inline-flex items-center gap-2 text-gray-400 text-sm animate-pulse\">\n                    <svg class=\"animate-spin h-5 w-5\" 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\n<script>\n    const MobileWorkflowService = {\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                // Use relative path directly to avoid cross-origin issues if apiBase is mixed up\n                const url = \"/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, \n                                    name: f.name, \n                                    categoryId: cat._id, \n                                    categoryName: cat.name || \"其他流程\" \n                                });\n                            });\n                        }\n                    });\n                }\n                return { categories: categories, flows: parsedFlows };\n            } catch (e) { \n                console.error(\"MobileWorkflowService 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) { \n                if (!favs.includes(flowId)) favs.push(flowId); \n            } else { \n                favs = favs.filter(id => id !== flowId); \n            }\n            localStorage.setItem('steedos_fav_ids', JSON.stringify(favs));\n            return favs;\n        }\n    };\n\n    const MobileAppState = { \n        allFlows: [], \n        categories: [], \n        favorites: [],\n        currentCategory: 'all',\n        /* Virtualization State */\n        filteredFlows: [],\n        renderedCount: 0,\n        batchSize: 50\n    };\n    \n    const tabsEl = document.getElementById('mobileCategoryTabs');\n    // Important: ContentEl is the scroll host\n    // listEl is the container for items\n    let contentEl, listEl, searchInput;\n\n    function initElements() {\n        // Find elements scoped to our container to avoid collisions if multiple instances\n        const wrapper = document.getElementById('steedosFlowSelectorMobile');\n        if (!wrapper) return false;\n        \n        searchInput = document.getElementById('mobileSearchInput');\n        // The scroll container is the div with class 'overflow-y-auto'\n        contentEl = wrapper.querySelector('.overflow-y-auto');\n        listEl = document.getElementById('mobileContentContainer');\n        return true;\n    }\n\n    async function initMobile() {\n        // Wait for DOM to be ready\n        if (!initElements()) {\n            setTimeout(initMobile, 100);\n            return;\n        }\n\n        try {\n            const data = await MobileWorkflowService.getData();\n            MobileAppState.allFlows = data.flows;\n            MobileAppState.categories = data.categories;\n            MobileAppState.favorites = MobileWorkflowService.getFavorites();\n            \n            initObserver();\n            renderMobileTabs();\n            renderMobileContent();\n            \n            // Search init\n            searchInput.addEventListener('input', (e) => {\n                renderMobileContent(e.target.value.trim());\n            });\n\n        } catch (e) {\n            console.error('Init error:', e);\n            if (listEl) listEl.innerHTML = `<div class=\"text-center pt-20 text-gray-400 text-sm\">加载失败，请检查网络连接</div>`;\n        }\n    }\n\n    let observer;\n    function initObserver() {\n        if (!contentEl) return;\n        \n        const options = {\n            root: contentEl, // Observe intersection with scroll container\n            rootMargin: '200px',\n            threshold: 0.1\n        };\n        \n        observer = new IntersectionObserver((entries) => {\n            entries.forEach(entry => {\n                if (entry.isIntersecting) {\n                    renderNextBatch();\n                }\n            });\n        }, options);\n    }\n\n    function renderMobileTabs(filterText = \"\") {\n        if (!tabsEl) return;\n        \n        // Save scroll position\n        const currentScroll = tabsEl.scrollLeft;\n        tabsEl.innerHTML = \"\";\n        \n        // Filter flows by search text to determine counts\n        let searchedFlows = MobileAppState.allFlows;\n        if (filterText && filterText.length > 0) {\n            searchedFlows = searchedFlows.filter(f => f.name.includes(filterText));\n        }\n        \n        // All category\n        const allCount = searchedFlows.length;\n        const isAllActive = MobileAppState.currentCategory === 'all';\n        // Only show count on 'all' if we are filtering, same as PC? PC usually shows (Total). Let's show (count).\n        const allTab = createTab('all', `全部 (${allCount})`, isAllActive);\n        tabsEl.appendChild(allTab);\n        \n        // Favorites\n        // For favorites, we filter the ALREADY SEARCHED flows to see if they are in favorites\n        const favCount = searchedFlows.filter(f => MobileAppState.favorites.includes(f.id)).length;\n        if (favCount > 0) {\n            const isFavActive = MobileAppState.currentCategory === 'fav';\n            const favTab = createTab('fav', `★ 收藏 (${favCount})`, isFavActive);\n            tabsEl.appendChild(favTab);\n        }\n        \n        // Category tabs\n        MobileAppState.categories.forEach(cat => {\n            const count = searchedFlows.filter(f => f.categoryId === cat._id).length;\n            if (count > 0) {\n                const isActive = MobileAppState.currentCategory === cat._id;\n                const tab = createTab(cat._id, `${cat.name} (${count})`, isActive);\n                tabsEl.appendChild(tab);\n            }\n        });\n        \n        // Restore scroll position\n        tabsEl.scrollLeft = currentScroll;\n    }\n\n    function createTab(catId, label, isActive) {\n        const tab = document.createElement('button');\n        const baseClass = \"mobile-category-pill shrink-0 whitespace-nowrap rounded-full px-4 py-2 text-sm font-medium transition-all duration-200\";\n        const activeClass = \"bg-blue-500 text-white shadow-md\";\n        const inactiveClass = \"bg-white text-gray-700 border border-gray-200 active:bg-gray-50\";\n        \n        tab.className = `${baseClass} ${isActive ? activeClass : inactiveClass}`;\n        tab.textContent = label;\n        tab.dataset.categoryId = catId;\n        \n        tab.onclick = () => {\n            MobileAppState.currentCategory = catId;\n            // Pass current search text to preserve filter\n            renderMobileContent(document.getElementById('mobileSearchInput').value.trim());\n        };\n        \n        return tab;\n    }\n\n    function renderMobileContent(filterText = \"\") {\n        if (!contentEl || !listEl) return;\n        \n        const isSearching = filterText.length > 0;\n        let flows = MobileAppState.allFlows;\n        \n        // 1. First filter by search text\n        if (isSearching) {\n            flows = flows.filter(f => f.name.includes(filterText));\n        }\n\n        // 2. Then filter by category\n        if (MobileAppState.currentCategory === 'fav') {\n            flows = flows.filter(f => MobileAppState.favorites.includes(f.id));\n        } else if (MobileAppState.currentCategory !== 'all') {\n            flows = flows.filter(f => f.categoryId === MobileAppState.currentCategory);\n        }\n        \n        const flowsToShow = flows;\n        \n        // Update tabs to reflect these search results\n        renderMobileTabs(filterText);\n        \n        listEl.innerHTML = \"\";\n        contentEl.scrollTop = 0;\n        \n        if (flowsToShow.length === 0) {\n            listEl.innerHTML = `\n                <div class=\"flex flex-col items-center justify-center pt-20 text-center\">\n                    <div class=\"text-gray-300 text-7xl mb-4\">∅</div>\n                    <div class=\"text-gray-400 text-sm\">${isSearching ? '未找到匹配的流程' : '此分类暂无流程'}</div>\\n                </div>\n            `;\n            return;\n        }\n        \n        MobileAppState.filteredFlows = flowsToShow;\n        MobileAppState.renderedCount = 0;\n        \n        renderNextBatch();\n        updateSentinel();\n    }\n\n    function renderNextBatch() {\n        const { filteredFlows, renderedCount, batchSize } = MobileAppState;\n        const total = filteredFlows.length;\n        if (renderedCount >= total) return;\n        \n        const nextBatch = filteredFlows.slice(renderedCount, renderedCount + batchSize);\n        const fragment = document.createDocumentFragment();\n        \n        nextBatch.forEach((flow, i) => {\n            const index = renderedCount + i;\n            const card = createMobileFlowCard(flow, index);\n            \n            // Remove animation for later batches to avoid scroll lag appearance\n            if (renderedCount > 0) {\n                card.style.animationDelay = '0s';\n            }\n            \n            fragment.appendChild(card);\n        });\n        \n        // Remove sentinel if exists\n        const sentinel = document.getElementById('scroll-sentinel');\n        if (sentinel) sentinel.remove();\n        \n        listEl.appendChild(fragment);\n        MobileAppState.renderedCount += nextBatch.length;\n        \n        updateSentinel();\n    }\n\n    function updateSentinel() {\n        if (MobileAppState.renderedCount < MobileAppState.filteredFlows.length) {\n            const sentinel = document.createElement('div');\n            sentinel.id = 'scroll-sentinel';\n            sentinel.className = 'flex justify-center p-4';\n            sentinel.innerHTML = '<span class=\"text-gray-400 text-xs\">加载更多...</span>';\n            listEl.appendChild(sentinel);\n            if (observer) observer.observe(sentinel);\n        }\n    }\n\n    function createMobileFlowCard(flow, index) {\n        const isFav = MobileAppState.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            'bg-purple-50 text-purple-600',\n            'bg-pink-50 text-pink-600'\n        ];\n        const colorClass = colorMap[(flow.name.length + index) % colorMap.length];\n        const firstChar = flow.name.replace(/【.*?】/g, '').charAt(0) || flow.name.charAt(0);\n        \n        const card = document.createElement('div');\n        card.className = 'relative flex items-center gap-3 rounded-2xl border border-gray-200 bg-white p-4 shadow-sm transition-all duration-200 active:scale-[0.97] active:bg-gray-50';\n        card.style.animation = 'flowCardSlideIn 0.4s ease-out forwards';\n        card.style.animationDelay = `${Math.min(index * 0.05, 0.5)}s`;\n        card.style.opacity = '0';\n        \n        const iconClass = isFav ? 'text-yellow-400 fill-current' : 'text-gray-300 fill-none stroke-current stroke-[1.5]';\n        \n        card.innerHTML = `\n            <div class=\"flex h-14 w-14 shrink-0 items-center justify-center rounded-xl text-lg font-bold ${colorClass}\">\n                ${firstChar}\n            </div>\n            <div class=\"flex-1 min-w-0\">\n                <div class=\"text-base font-medium text-gray-900 leading-snug line-clamp-3\" title=\"${flow.name}\">\n                    ${flow.name}\n                </div>\n            </div>\n            <button class=\"star-btn shrink-0 flex h-10 w-10 items-center justify-center rounded-full transition-all duration-200 active:scale-90 ${isFav ? 'bg-yellow-50' : 'active:bg-gray-100'}\" title=\"${isFav ? '取消收藏' : '收藏'}\">\n                <svg class=\"h-6 w-6 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            </button>\\n        `;\n        \n        // Click card to select flow\n        card.onclick = (e) => {\n            if (!e.target.closest('.star-btn')) {\n                setTimeout(() => {\n                    data._scoped.doAction([\n                        { \n                            \"actionType\": \"broadcast\", \n                            \"args\": { \"eventName\": \"flows.selected\" }, \n                            \"data\": { \"value\": flow.id } \n                        }\n                    ]);\n                }, 50);\n            }\n        };\n        \n        // Star button to toggle favorite\n        const starBtn = card.querySelector('.star-btn');\n        const starIcon = starBtn.querySelector('svg');\n        starBtn.onclick = (e) => {\n            e.stopPropagation();\n            const newFavState = !isFav;\n            MobileAppState.favorites = MobileWorkflowService.toggleFavorite(flow.id, newFavState);\n            \n            // Update UI\n            if (newFavState) {\n                starBtn.classList.add('bg-yellow-50');\n                starBtn.classList.remove('active:bg-gray-100');\n                starIcon.setAttribute('class', 'h-6 w-6 transition-colors duration-300 text-yellow-400 fill-current');\n            } else {\n                starBtn.classList.remove('bg-yellow-50');\n                starBtn.classList.add('active:bg-gray-100');\n                starIcon.setAttribute('class', 'h-6 w-6 transition-colors duration-300 text-gray-300 fill-none stroke-current stroke-[1.5]');\n            }\n            \n            // Refresh tabs and content after short delay\n            setTimeout(() => {\n                renderMobileTabs();\n                renderMobileContent(searchInput.value.trim());\n            }, 300);\n        };\n        \n        return card;\n    }\n\n    // Initialize\n    initMobile();\n</script>",
+    "className": "h-full"
+}

package/main/default/pages/flow_selector_mobile.page.yml

@@ -0,0 +1,7 @@
+name: flow_selector_mobile
+is_active: true
+label: 流程选择(移动端)
+pageAssignments: []
+render_engine: amis
+type: app
+widgets: []

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

@@ -214,7 +214,7 @@
     "data": {},
     "id": "u:d37465183f56",
     "className": "steedos-instance-related-view-wrapper flex justify-center",
-    "bodyClassName": "p-0 flex flex-1 overflow-hidden h-full",
+    "bodyClassName": "p-0 flex flex-1 h-full",
     "name": "amis-root-workflow",
     "initApi": {
         "url": "/api/workflow/v2/instance/${recordId}/permission",
@@ -302,6 +302,12 @@
         ".steedos-amis-instance-view-content": {
             "max-width": "none !important"
         },
+        ".steedos-instance-print-wrapper .liquid-amis-container": {
+            "overflow": "visible !important"
+        },
+        ".steedos-instance-print-wrapper .instance-template .table-page-body": {
+            "width": "100%"
+        },
         ".simplify-traces .step-type-start":{
             "display": "none !important"
         },

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

@@ -87,6 +87,10 @@ router.post('/api/workflow/v2/nextStepUsers', requireAuthentication, async funct
 
                         if (applicant)
                             nextStepUsers = await WorkflowManager.getRoleUsersByOrgsAndRoles(spaceId, applicant.organizations, approveRoleIds);
+                        if(!nextStepUsers || nextStepUsers.length < 1){
+                            const roles = await WorkflowManager.getRoles(instance.space, approveRoleIds);
+                            error = t('next_step_users_not_found.applicant_role', {role_name: _.join(_.map(roles, 'name'), ', ')}, userSession.language)
+                        }
                         break;
                     case 'hrRole':
                         var approveHrRoleIds = nextStep.approver_hr_roles;

package/package.json

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

package/public/workflow/index.css

@@ -529,6 +529,13 @@ tbody .color-priority-muted *{
     box-shadow: none;
 }
 
+.steedos-instance-style-table .antd-RadiosControl{
+    margin-left: 0.5rem !important;
+}
+
+.steedos-instance-style-table .antd-CheckboxesControl{
+    margin-left: 0.5rem !important;
+}
 
 .instances-sidebar .steedos-listview-change-button > button > .fa-caret-down{
     display: none;
@@ -556,6 +563,12 @@ tbody .color-priority-muted *{
     height: calc(100vh - 101px);
 }
 
+@media (max-width: 768px){
+    .steedos-instance-detail-wrapper{
+        height: calc(100vh - 64px);
+    }
+}
+
 .steedos-amis-instance-view-body .antd-Panel-title{
     font-size: 14px;
     font-weight: 500;
@@ -627,6 +640,25 @@ tbody .color-priority-muted *{
     border: none !important;
 }
 
+.steedos-instance-style-table .instance-form .td-childfield {
+    padding: 0 !important;
+    border: 1px solid black !important;
+}
+.steedos-instance-style-table .instance-form .td-childfield .antd-Table{
+    margin-bottom: 0px !important;
+}
+
+.steedos-instance-style-table .instance-form .td-childfield .antd-Table .antd-Table-operationCell {
+    border: none !important;
+}
+
+.steedos-instance-style-table .instance-form .td-childfield .antd-Table td:first-child {
+    border-right: none !important;
+}
+.steedos-instance-style-table .antd-Select-value{
+    white-space: unset !important;
+}
+
 
 /* 1. 基础设置：合并边框并去掉表格容器的外边框 */
 .instance-form .antd-Table-table {
@@ -751,6 +783,14 @@ tbody .color-priority-muted *{
   }
 }
 
+.antd-Combo-form .antd-Form-row .antd-Form-col{
+    margin-bottom: 0.75rem !important;
+}
+.antd-Combo-form .antd-Form-row .antd-Form-col .antd-Form-rowInner > div{
+    flex: 1;
+}
+
+
   /* .steedos-instance-detail-wrapper{
         height: auto !important;
     }

package/src/util/templateConverter.js

@@ -28,6 +28,22 @@ function getFieldLabel(fieldDef, fieldName) {
     return fieldName;
 }
 
+const getArgumentsList = (func)=>{
+    let funcString;
+    if (typeof func === 'function') {
+      funcString = func.toString();
+    } else {
+      funcString = func;
+    }
+    const regExp = /function\s*\w*\(([\s\S]*?)\)/;
+    if (regExp.test(funcString)) {
+      const argList = RegExp.$1.split(',');
+      return argList.map(arg => arg.replace(/\s/g, ''));
+    } else {
+      return [];
+    }
+}
+
 function fieldToAmis(fieldName, fieldDef, schema, isColumn = false, isPrint = false) {
     // Handle section type special case
     if (fieldDef && fieldDef.type === 'section') {
@@ -85,6 +101,126 @@ function fieldToAmis(fieldName, fieldDef, schema, isColumn = false, isPrint = fa
             case 'checkbox': type = 'checkboxes'; break;
             case 'select': type = 'select'; break;
             case 'lookup': type = 'select'; break; // Simplified for now
+            case 'odata':
+                type = 'select';
+                const field = fieldDef;
+                const inTable = isColumn;
+                const argsName = getArgumentsList(field.filters);
+                let labelField = field.formula ? field.formula.substr(1, field.formula.length - 2) : 'name';
+                if(labelField.indexOf(".") > -1){
+                    labelField = labelField.substr(labelField.indexOf(".") + 1);
+                }
+                config.multiple = field.is_multiselect;
+
+                // Compress script to single line to avoid JSON parsing issues with control characters
+                const adaptorScript = `
+                    return (async () => {
+                        let options = _.map(payload.value, (item)=>{
+                            const value = item;
+                            item["@label"] = item["${labelField}"];
+                            delete item['@odata.editLink'];
+                            delete item['@odata.etag'];
+                            delete item['@odata.id'];
+                            return {
+                                label: item["@label"],
+                                value: value
+                            }
+                        });
+                        
+                        if(api.selectedIds && api.selectedIds.length > 0){
+                            const loadedIds = options.map(function(opt){ return opt.value._id; });
+                            const missingIds = api.selectedIds.filter(function(id){ return !loadedIds.includes(id); });
+                            if(missingIds.length > 0){
+                                const baseUrl = api.baseUrl;
+                                const idFilter = missingIds.map(function(id){ return "_id eq '" + id + "'"; }).join(" or ");
+                                const fetchUrl = baseUrl + (baseUrl.indexOf('?') > -1 ? '&' : '?') + "$filter=" + idFilter;
+                                try {
+                                    const response = await fetch(fetchUrl, {});
+                                    const data = await response.json();
+                                    if (data && data.value) {
+                                        const missingOptions = _.map(data.value, (item) => {
+                                            const value = item;
+                                            item["@label"] = item["${labelField}"];
+                                            delete item['@odata.editLink'];
+                                            delete item['@odata.etag'];
+                                            delete item['@odata.id'];
+                                            return { label: item["@label"], value: value };
+                                        });
+                                        options.unshift(...missingOptions);
+                                    }
+                                } catch (e) {
+                                    console.error("Failed to fetch missing values", e);
+                                }
+                            }
+                        }
+                        payload.data = { options: options };
+                        return payload;
+                    })();
+                `.replace(/\s+/g, ' ');
+
+                const filtersStr = field.filters ? _.replace(field.filters, /_.pluck/g, '_.map') : '';
+                const requestAdaptorScript = `
+                    const filters = \`${filtersStr}\`;
+                    let url = \`${field.url}\`;
+                    api.baseUrl = url;
+                    if(filters){
+                        let joinKey = url.indexOf('?') > 0 ? '&' : '?';
+                        let _filter = [];
+                        if(filters.startsWith('function(') || filters.startsWith('function (')){
+                            const argsName = ${JSON.stringify(argsName)};
+                            const fun = eval('_fun='+filters);
+                            const funArgs = [];
+                            for(const item of argsName){
+                                funArgs.push(context[item]);
+                            }
+                            _filter = fun.apply({}, funArgs);
+                        }else{
+                            _filter = filters;
+                        }
+
+                        const val = context.value || _.get(context, '${field.code}');
+                        let ids = [];
+                        if(val){
+                            const values = Array.isArray(val) ? val : [val];
+                            ids = values.map((v) => v && (v._id || v)).filter((v) => typeof v === 'string');
+                        }
+
+                        ids = _.uniq(ids);
+                        api.selectedIds = ids;
+                        
+                        if(context.term){
+                            _filter = \`(\${_filter}) and contains(name, '\${context.term}')\`;
+                        }
+                        joinKey = url.indexOf('?') > 0 ? '&' : '?';
+                        api.url = url + joinKey + "$filter=" + _filter;
+                    }else{
+                        api.url = url;
+                    }
+                    api.query = {};
+                    return api;
+                `.replace(/\s+/g, ' ');
+
+                config.autoComplete = {
+                    url: field.url.indexOf('?') < 0 ? `${field.url}?term=\${term}` : `${field.url}&term=\${term}`, 
+                    method: "get",
+                    dataType: "json",
+                    adaptor: adaptorScript,
+                    requestAdaptor: requestAdaptorScript
+                };
+                
+                // Only add trackExpression if there are dependent fields (argsName)
+                if (argsName && argsName.length > 0) {
+                    // Use simpler tracking without |json to avoid potential newline issues in stringified objects
+                    config.autoComplete.trackExpression = _.join(_.map(argsName, (item) => `\${${item}}`), '-');
+                }
+
+                config.source = _.cloneDeep(config.autoComplete);
+                // trackExpression is needed in source to react to dependency changes
+                
+                if(!inTable){
+                    config.searchable = true;
+                }
+                break;
             case 'table':
                 type = 'steedos-input-table';
                 config.columnsTogglable = false;
@@ -287,7 +423,13 @@ function convertTemplate(content, fields, isPrint) {
     });
 
     // --- Sub-phase 2c: Convert afFieldLabelText ---
-    newContent = newContent.replace(/\{\{afFieldLabelText\s+name=["'](.+?)["']\}\}/g, '$1');
+    newContent = newContent.replace(/\{\{afFieldLabelText\s+name=["'](.+?)["']\}\}/g, (match, name) => {
+        const fieldDef = findFieldDef(fields, name);
+        if (fieldDef && fieldDef.is_required) {
+            return `${name}<span class="antd-Form-star" style="display: \${record.step.permissions['${name}'] == 'editable' ? 'inline' : 'none'}">*</span>`;
+        }
+        return name;
+    });
 
     // --- Sub-phase 2d: Convert instanceSignText ---
     newContent = newContent.replace(/\{\{>\s*instanceSignText\s+([\s\S]+?)\}\}/g, (match, args) => {
@@ -334,6 +476,14 @@ function convertTemplate(content, fields, isPrint) {
         return `{% amis %}\n${JSON.stringify(amisSchema, null, 2)}\n{% endamis %}`;
     });
 
+    // --- Sub-phase 2e: Add header for tr-child-table ---
+    // Extract dynamic title from td-childfield-xxx class if present
+    newContent = newContent.replace(/(<tr[^>]*class\s*=\s*["'][^"']*tr-child-table[^"']*["'][^>]*>[\s\S]*?class\s*=\s*["'][^"']*?td-childfield-)([^\s"']+)/gi, 
+        (match, beforeName, name) => {
+            return `<tr><td colspan="10" style="background:#f1f1f1" class="font-bold">${name}</td></tr>${beforeName}${name}`;
+        }
+    );
+
     return newContent;
 }