@steedos-labs/plugin-workflow 3.0.12 → 3.0.14

package/public/workflow/index.css

@@ -51,8 +51,28 @@
 }
 
 .instance-box-tree .antd-TreeControl{
-    padding: 15px 0;
+    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-item .is-checked .antd-Tree-itemLabel-item{
-    background-color: unset;
+.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;
+    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,9 +524,26 @@ tbody .color-priority-muted *{
     z-index: 900;
 }
 
+/* Sidebar wrapper - no scrolling as parent handles it */
 .instances-sidebar-wrapper{
-    overflow-y: auto;
-    height: calc(100vh - 50px);
+    /* 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{
@@ -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 {
@@ -400,4 +575,27 @@ tbody .color-priority-muted *{
   .steedos-amis-instance-view-body{
     margin: 20px 0 0 0 !important;
   }
+
+  a[href]:after {
+    content: none !important;
+  }
+
+  .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;
+    } */

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

@@ -1,330 +0,0 @@
-{
-  "type": "page",
-  "body": [
-    {
-      "type": "service",
-      "className": "h-full",
-      "body": [
-        {
-          "type": "wrapper",
-          "size": "none",
-          "className": "flex flex-1 overflow-hidden h-full",
-          "body": [
-            {
-              "type": "wrapper",
-              "size": "none",
-              "className": "instances-sidebar-wrapper flex-shrink-0 min-w-[240px] overflow-y-auto m-0 lg:order-first lg:flex lg:flex-col bg-white border-r",
-              "body": [
-                {
-                  "type": "service",
-                  "className": "bg-none",
-                  "onEvent": {
-                    "@data.changed.instance_tasks": {
-                      "actions": [
-                        {
-                          "actionType": "reload"
-                        }
-                      ]
-                    }
-                  },
-                  "body": [
-                    {
-                      "type": "button",
-                      "label": "刷新",
-                      "className": "instance-nav-reload hidden",
-                      "onEvent": {
-                          "click": {
-                            "actions": [{
-                            "actionType": "reload",
-                            "componentId": "u:instanceNav"
-                          }]
-                        }
-                      }
-                    }, 
-                    {
-                      "type": "input-tree",
-                      "name": "tree",
-                      "treeContainerClassName": "h-full",
-                      "className": "instance-box-tree h-full w-full p-0",
-                      "stacked": true,
-                      "multiple": false,
-                      "enableNodePath": false,
-                      "virtualThreshold": 100000,
-                      "hideRoot": true,
-                      "showIcon": true,
-                      "initiallyOpen": false,
-                      "value": "${value}",
-                      "size": "md",
-                      "onEvent": {
-                        "change": {
-                          "actions": [
-                            {
-                              "actionType": "setValue",
-                              "componentId": "instance_tasks_list_service",
-                              "args": {
-                                "value": {
-                                  "isFlowDataDone": false
-                                }
-                              }
-                            },
-                            {
-                              "actionType": "custom",
-                              "script": "if (window.innerWidth < 768) { document.querySelector('.instances-customPage').classList.remove('instances-sidebar-open'); }\n//获取上一次的flowId和categoryId\nconst lastFlowId = event.data.flowId;\nconst lastCategoryId = event.data.categoryId;\n//从value中获取最新的flowId\nvar flowIdRegex = /&flowId=([^&]+)/;\nvar flowIdMatch = event.data.value.match(flowIdRegex);\nconst flowId = flowIdMatch && flowIdMatch.length > 0 ? flowIdMatch[1] : \"\";\n//从value中获取最新的categoryId\nvar categoryIdRegex = /&categoryId=([^&]+)/;\nvar categoryIdMatch = event.data.value.match(categoryIdRegex);\nconst categoryId = categoryIdMatch && categoryIdMatch.length > 0 ? categoryIdMatch[1] : \"\";\n//获取上一次的listname和最新的listname\nconst lastListName = event.data.listName;\nconst listName = event.data.value.split('?')[0].split('instance_tasks/grid/')[1];\n//切换流程时清除过滤条件\nif (lastListName == \"inbox\" && listName == \"inbox\" && (flowId != lastFlowId || categoryId != lastCategoryId)) {\n  listViewPropsStoreKey = window.location.pathname + \"/crud\";\n  sessionStorage.removeItem(listViewPropsStoreKey);\n  sessionStorage.removeItem(listViewPropsStoreKey + \"/query\");\n}\n\n"
-                            },
-                            {
-                              "actionType": "setValue",
-                              "args": {
-                                "value": {
-                                  "additionalFilters": [
-                                    "${event.data.options.name}",
-                                    "=",
-                                    "${event.data.options.value}"
-                                  ]
-                                }
-                              },
-                              "componentId": "instance_tasks_list_service",
-                              "expression": "${event.data.options.level>=10}"
-                            },
-                            {
-                              "args": {
-                                "link": "${event.data.value}",
-                                "blank": false
-                              },
-                              "actionType": "link"
-                            }
-                          ]
-                        }
-                      },
-                      "menuTpl": {
-                        "type": "wrapper",
-                        "className": "flex flex-row  p-0 m-0",
-                        "body": [
-                          {
-                            "type": "tpl",
-                            "className": "flex-1 w-6/12",
-                            "tpl": "${label}",
-                            "id": "u:adf0cfafa63c"
-                          },
-                          {
-                            "type": "tpl",
-                            "className": "-mx-11 ",
-                            "tpl": "",
-                            "badge": {
-                              "className": "h-0",
-                              "offset": [
-                                -20,
-                                12
-                              ],
-                              "mode": "text",
-                              "text": "${tag | toInt}",
-                              "overflowCount": 999
-                            },
-                            "id": "u:ac230c095386"
-                          }
-                        ],
-                        "id": "u:74a18fd2df0b"
-                      },
-                      "unfoldedLevel": 2,
-                      "source": "${options}",
-                      "id": "u:09e092ab054a"
-                    }
-                  ],
-                  "api": {
-                    "method": "get",
-                    "url": "${context.rootUrl}/api/${appId}/workflow/nav",
-                    "headers": {
-                      "Authorization": "Bearer ${context.tenantId},${context.authToken}"
-                    },
-                    "messages": {},
-                    "adaptor": "payload.data.value = window.location.pathname + decodeURIComponent(window.location.search); return payload;"
-                  },
-                  "messages": {},
-                  "dsType": "api",
-                  "id": "u:instanceNav"
-                }
-              ],
-              "id": "u:fd659f5c3657",
-              "isFixedHeight": false,
-              "isFixedWidth": false
-            },
-            {
-              "type": "button",
-              "className": "instances-sidebar-overlay",
-              "id": "u:773b1d00aab2",
-              "visibleOn": "${isMobile}",
-              "body": [],
-              "onEvent": {
-                "click": {
-                  "actions": [
-                    {
-                      "actionType": "custom",
-                      "script": "document.querySelector('.instances-customPage').classList.toggle('instances-sidebar-open');"
-                    }
-                  ]
-                }
-              }
-            },
-            {
-              "type": "wrapper",
-              "size": "none",
-              "className": "flex-1 focus:outline-none lg:order-last",
-              "body": [
-                {
-                  "type": "steedos-object-listview",
-                  "objectApiName": "instance_tasks",
-                  "columnsTogglable": false,
-                  "filterVisible": true,
-                  "visibleOn": "${!!!flowId}",
-                  "showHeader": true,
-                  "id": "u:d29cef0d1007",
-                  "showDisplayAs": true,
-                  "className": "h-full w-full instance-tasks-list",
-                  "hiddenColumnOperation": true,
-                  "formFactor": "LARGE",
-                  "headerToolbarItems": [
-                    {
-                      "type": "button",
-                      "label": "",
-                      "align": "left",
-                      "icon": "fa fa-bars",
-                      "className": "bg-white p-2 rounded border-gray-300 text-gray-500",
-                      "onEvent": {
-                        "click": {
-                          "actions": [
-                            {
-                              "actionType": "custom",
-                              "script": "document.querySelector('.instances-customPage').classList.toggle('instances-sidebar-open');"
-                            }
-                          ]
-                        }
-                      },
-                      "id": "u:5f2ce9ca2de6"
-                    }
-                  ],
-                  "listName": "inbox",
-                  "rowClassNameExpr": "<%=(data.is_read === false && (!data.clientIds || data.clientIds.length == 0 || !data.clientIds.includes(data._id))) ? 'unread-instance steedos-record-tr steedos-record-tr-'+data._id : 'steedos-record-tr steedos-record-tr-'+data._id %>",
-                  "rebuildOn": "\\${flowId || categoryId}",
-                  "adaptor": "const isSearch = _.some(_.keys(api.body.self), key => key.includes('__keywords') || key.includes('__searchable__'));\nif(payload.data.count==0 && !isSearch){\n    const searchParams = new URLSearchParams(window.location.search);\n    const flowId = searchParams.get(\"flowId\");\n    const categoryId = searchParams.get(\"categoryId\");\n    const pathname = window.location.pathname;\n    if(flowId || categoryId){\n      window.FlowRouter.go(pathname + \"?additionalFilters=&flowId=&categoryId=\");\n    }\n    // if(flowId) {\n    //     window.FlowRouter.go(pathname + \"?additionalFilters=['category','=','\" + categoryId +\"']&flowId=&categoryId=\" + categoryId);\n    // }else if(categoryId) {\n    //     window.FlowRouter.go(pathname + \"?additionalFilters=&flowId=&categoryId=\");\n    // }\n};\nif (api.body.self.listName == \"inbox\") {\n  _.each(payload.data.rows, function (item, index) {\n    if (item.type == 'cc') {\n      item.instance_name += '（传阅）';\n    }\n    if (item.instance__expand.values) {\n      const form_fields = api.body.self.form_fields;\n      _.each(item.instance__expand.values, function (field, field_code) {\n        const form_field = _.find(form_fields, { code: field_code });\n        if (form_field && form_field.type == \"group\") {\n          if (form_field.is_multiselect) {\n            item.instance__expand.values[field_code] = field && field.length > 0 ? _.map(field, 'fullname').toString() : \"\";\n          } else {\n            item.instance__expand.values[field_code] = field ? field.fullname : \"\";\n          }\n        } else if (form_field && form_field.type == \"user\") {\n          if (form_field.is_multiselect) {\n            item.instance__expand.values[field_code] = field && field.length > 0 ? _.map(field, 'name').toString() : \"\";\n          } else {\n            item.instance__expand.values[field_code] = field ? field.name : \"\";\n          }\n        }\n      })\n    }\n  })\n}\n"
-                },
-                {
-                  "type": "service",
-                  "visibleOn": "${!!flowId && listName == 'inbox'}",
-                  "schemaApi": {
-                    "url": "/graphql?flowId=${flowId}&categoryId=${categoryId}",
-                    "method": "post",
-                    "data": {
-                      "query": "{flow: flows__findOne(id:\"${flowId}\"){form__expand{current}}}"
-                    },
-                    "adaptor": "const schema = window.SteedosWorkflow.InstanceTask.getListViewSchema(payload.data.flow); return schema;"
-                  },
-                  "id": "u:dbe8ed1cab9d",
-                  "dsType": "api"
-                }
-              ],
-              "id": "u:a3a1e6aa0e2f"
-            }
-          ],
-          "id": "u:e0bc37818327"
-        }
-      ],
-      "id": "instance_tasks_list_service",
-      "onEvent": {
-        "@data.changed.steedos_keyvalues": {
-          "actions": [
-            {
-              "actionType": "broadcast",
-              "args": {
-                "eventName": "@data.changed.instance_tasks"
-              },
-              "data": {
-                "objectName": "instance_tasks",
-                "recordId": "reload"
-              }
-            }
-          ]
-        }
-      },
-      "data": {
-        "isMobile": "${window:innerWidth <= 768}",
-        "isFlowDataDone": false
-      },
-      "dsType": "api"
-    }
-  ],
-  "regions": [
-    "body"
-  ],
-  "data": {
-    "objectName": "instance_tasks",
-    "initialValues": {},
-    "title": "",
-    "context": {}
-  },
-  "id": "u:b7167e2fcaf0",
-  "name": "page_instances_list",
-  "bodyClassName": "p-0",
-  "asideResizor": false,
-  "pullRefresh": {
-    "disabled": true
-  },
-  "className": {
-    "instances-customPage h-full": true,
-    "instances-list-mobile": "${window:innerWidth < 768}",
-    "instances-list-pc instances-sidebar-open": "${window:innerWidth > 768}"
-  },
-  "style": {},
-  "dsType": "api",
-  "css": {
-    ".instances-customPage.instances-list-mobile .instances-sidebar-wrapper": {
-      "z-index": "601",
-      "top": "50px",
-      "left": "0px",
-      "bottom": "0px",
-      "position": "fixed",
-      "margin": "0px"
-    },
-    ".instances-customPage.instances-list-mobile .instances-sidebar-overlay": {
-      "z-index": "600",
-      "position": "fixed",
-      "bottom": "0px",
-      "right": "0px",
-      "left": "0px",
-      "top": "50px",
-      "display": "none"
-    },
-    ".instances-customPage.instances-list-mobile.instances-sidebar-open .instances-sidebar-overlay": {
-      "display": "block"
-    },
-    ".instances-customPage .instances-sidebar-wrapper": {
-      "transition": "0.5s ease transform",
-      "will-change": "transform",
-      "transform": "translate(-100%,0)",
-      "-webkit-transform": "translate(-100%,0)",
-      "-moz-transform": "translate(-100%,0)",
-      "-ms-transform": "translate(-100%,0)",
-      "-o-transform": "translate(-100%,0)"
-    },
-    ".instances-customPage.instances-sidebar-open .instances-sidebar-wrapper": {
-      "transform": "translate(0,0)",
-      "-webkit-transform": "translate(0,0)",
-      "-moz-transform": "translate(0,0)",
-      "-ms-transform": "translate(0,0)",
-      "-o-transform": "translate(0,0)"
-    },
-    ".instances-customPage.instances-list-pc .instances-sidebar-wrapper": {
-      "min-width": "0px",
-      "width": "0px"
-    },
-    ".instances-customPage.instances-list-pc.instances-sidebar-open .instances-sidebar-wrapper": {
-      "min-width": "240px"
-    }
-  },
-  "themeCss": {
-    "baseControlClassName": {
-      "padding-and-margin:default": {
-        "padding": "${displayAs == 'grid'?'':'0px'}"
-      }
-    }
-  },
-  "title": "Welcome to Steedos"
-}

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

@@ -1,12 +0,0 @@
-name: instance_tasks_list
-is_active: true
-label: 审批任务列表
-object_name: instance_tasks
-pageAssignments:
-  - type: orgDefault
-    page: instance_tasks_list
-    desktop: true
-    mobile: true
-render_engine: amis
-type: list
-widgets: []