@steedos-labs/plugin-workflow 3.0.13 → 3.0.14

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/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/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.14",
   "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;
@@ -79,10 +99,20 @@
     margin-right: 4px;
 } */
 .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;
 }
 .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;
@@ -115,12 +145,134 @@
     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;
+}
+
+/* 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-item .is-checked .antd-Tree-itemLabel-item{
-    background-color: unset;
+.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;
+    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: 8px;
+}
+
+/* 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 +512,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 +524,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 +552,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 +583,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;
+    } */