@steedos-labs/plugin-workflow 3.0.0-beta.29 → 3.0.0-beta.31

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

@@ -39,7 +39,7 @@
                       "hideRoot": true,
                       "showIcon": true,
                       "initiallyOpen": false,
-                      "value": "${CONCATENATE('/app/', appId, '/', objectName, '/grid/', listViewId, '?additionalFilters=', additionalFilters,'&flowId=',flowId,'&categoryId=',categoryId)}",
+                      "value": "${value}",
                       "size": "md",
                       "onEvent": {
                         "change": {
@@ -122,7 +122,8 @@
                       "Authorization": "Bearer ${context.tenantId},${context.authToken}"
                     },
                     "messages": {},
-                    "trackExpression": "${_reloadKey}"
+                    "trackExpression": "${_reloadKey}",
+                    "adaptor": "payload.data.value = window.location.pathname + decodeURIComponent(window.location.search); return payload;"
                   },
                   "messages": {},
                   "dsType": "api",
@@ -164,7 +165,7 @@
                   "showHeader": true,
                   "id": "u:d29cef0d1007",
                   "showDisplayAs": true,
-                  "className": "h-full w-full bg-white instance-tasks-list",
+                  "className": "h-full w-full instance-tasks-list",
                   "hiddenColumnOperation": true,
                   "formFactor": "LARGE",
                   "headerToolbarItems": [
@@ -194,7 +195,7 @@
                 },
                 {
                   "type": "service",
-                  "visibleOn": "${!!flowId}",
+                  "visibleOn": "${!!flowId && listName == 'inbox'}",
                   "schemaApi": {
                     "url": "/graphql?flowId=${flowId}&categoryId=${categoryId}",
                     "method": "post",
@@ -244,101 +245,7 @@
     "objectName": "instance_tasks",
     "initialValues": {},
     "title": "",
-    "context": {
-      "rootUrl": "http://127.0.0.1:5600",
-      "tenantId": "68400b7542187738fb1bab2c",
-      "userId": "68400b7042187738fb1bab2a",
-      "authToken": "c317dc22e82ffecda1f13f09767a9242b3ee44363f2b4d19a436afea7994c8e2bdb72ff0426aae544ecc5c",
-      "user": {
-        "authToken": "c317dc22e82ffecda1f13f09767a9242b3ee44363f2b4d19a436afea7994c8e2bdb72ff0426aae544ecc5c",
-        "spaceId": "68400b7542187738fb1bab2c",
-        "userId": "68400b7042187738fb1bab2a",
-        "name": "YLH1",
-        "username": "yinlianghui",
-        "email": "yinlianghui@hotoa.com",
-        "utcOffset": null,
-        "steedos_id": "68400b7042187738fb1bab2a",
-        "locale": "en-us",
-        "language": "en",
-        "roles": [
-          "admin"
-        ],
-        "profile": "admin",
-        "user": "68400b7042187738fb1bab2a",
-        "user_accepted": true,
-        "organization": {
-          "_id": "68400b7542187738fb1bab2c",
-          "name": "TEW",
-          "fullname": "TEW",
-          "company_id": "68400b7542187738fb1bab2c"
-        },
-        "organizations": [
-          {
-            "_id": "68400b7542187738fb1bab2c",
-            "name": "TEW",
-            "fullname": "TEW",
-            "company_id": "68400b7542187738fb1bab2c"
-          },
-          {
-            "_id": "684784a17f4aeba0af86e0bb",
-            "name": "生产部",
-            "fullname": "生产部",
-            "company_id": "68400b7542187738fb1bab2c"
-          }
-        ],
-        "space": {
-          "_id": "68400b7542187738fb1bab2c",
-          "name": "TEW",
-          "admins": [
-            "68400b7042187738fb1bab2a",
-            "686ccd4a33466ba7d2a1fce6",
-            "686cc9f8b6409ed05d63c80d"
-          ]
-        },
-        "owner": "68400b7042187738fb1bab2a",
-        "created_by": "68400b7042187738fb1bab2a",
-        "created": "2025-06-04T09:01:41.340Z",
-        "modified_by": "68400b7042187738fb1bab2a",
-        "modified": "2025-08-31T09:38:56.388Z",
-        "email_verified": null,
-        "company_id": "68400b7542187738fb1bab2c",
-        "organizations_parents": [
-          "68400b7542187738fb1bab2c",
-          "684784a17f4aeba0af86e0bb"
-        ],
-        "company_ids": [
-          "68400b7542187738fb1bab2c"
-        ],
-        "spaces": [
-          {
-            "_id": "68400b7542187738fb1bab2c",
-            "name": "TEW",
-            "admins": [
-              "68400b7042187738fb1bab2a",
-              "686ccd4a33466ba7d2a1fce6",
-              "686cc9f8b6409ed05d63c80d"
-            ]
-          }
-        ],
-        "companies": [
-          {
-            "_id": "68400b7542187738fb1bab2c",
-            "name": "TEW",
-            "organization": "68400b7542187738fb1bab2c"
-          }
-        ],
-        "company": {
-          "_id": "68400b7542187738fb1bab2c",
-          "name": "TEW",
-          "organization": "68400b7542187738fb1bab2c"
-        },
-        "permission_shares": [],
-        "spaceUserId": "68400b7542187738fb1bab2d",
-        "is_space_admin": true,
-        "is_phone": false,
-        "is_tablet": false
-      }
-    }
+    "context": {}
   },
   "id": "u:b7167e2fcaf0",
   "name": "page_instances_list",

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

@@ -41,7 +41,7 @@
                       "hideRoot": true,
                       "showIcon": true,
                       "initiallyOpen": false,
-                      "value": "${CONCATENATE('/app/', appId, '/', objectName, '/grid/', listViewId, '?additionalFilters=', additionalFilters,'&flowId=',flowId,'&categoryId=',categoryId)}",
+                      "value": "${value}",
                       "size": "md",
                       "onEvent": {
                         "change": {
@@ -122,7 +122,8 @@
                     "headers": {
                       "Authorization": "Bearer ${context.tenantId},${context.authToken}"
                     },
-                    "messages": {}
+                    "messages": {},
+                    "adaptor": "payload.data.value = window.location.pathname + decodeURIComponent(window.location.search); return payload;"
                   },
                   "messages": {},
                   "dsType": "api"
@@ -163,7 +164,6 @@
                   "showHeader": true,
                   "id": "u:d29cef0d1007",
                   "showDisplayAs": true,
-                  "className": "bg-gray-100",
                   "hiddenColumnOperation": true,
                   "formFactor": "LARGE",
                   "headerToolbarItems": [
@@ -193,14 +193,14 @@
                 },
                 {
                   "type": "service",
-                  "visibleOn": "${!!flowId}",
+                  "visibleOn": "${!!flowId && listName == 'monitor'}",
                   "schemaApi": {
                     "url": "/graphql?flowId=${flowId}&categoryId=${categoryId}",
                     "method": "post",
                     "data": {
                       "query": "{flow: flows__findOne(id:\"${flowId}\"){form__expand{current}}}"
                     },
-                    "adaptor": "const schema = window.SteedosWorkflow.Instance.getListViewSchema(payload.data.flow); console.log('===schema==234==>', schema);return schema;"
+                    "adaptor": "const schema = window.SteedosWorkflow.Instance.getListViewSchema(payload.data.flow); return schema;"
                   },
                   "id": "u:30c21a4ee7cb",
                   "dsType": "api"
@@ -243,101 +243,7 @@
     "objectName": "instances",
     "initialValues": {},
     "title": "",
-    "context": {
-      "rootUrl": "http://127.0.0.1:5600",
-      "tenantId": "68400b7542187738fb1bab2c",
-      "userId": "68400b7042187738fb1bab2a",
-      "authToken": "cc31877680017ca5bc8b6de2a9f1cb38debce7c39bd2f79e21c43400783f8c4d852662a1e443e9c44584be",
-      "user": {
-        "authToken": "cc31877680017ca5bc8b6de2a9f1cb38debce7c39bd2f79e21c43400783f8c4d852662a1e443e9c44584be",
-        "spaceId": "68400b7542187738fb1bab2c",
-        "userId": "68400b7042187738fb1bab2a",
-        "name": "YLH1",
-        "username": "yinlianghui",
-        "email": "yinlianghui@hotoa.com",
-        "utcOffset": null,
-        "steedos_id": "68400b7042187738fb1bab2a",
-        "locale": "en-us",
-        "language": "en",
-        "roles": [
-          "admin"
-        ],
-        "profile": "admin",
-        "user": "68400b7042187738fb1bab2a",
-        "user_accepted": true,
-        "organization": {
-          "_id": "68400b7542187738fb1bab2c",
-          "name": "TEW",
-          "fullname": "TEW",
-          "company_id": "68400b7542187738fb1bab2c"
-        },
-        "organizations": [
-          {
-            "_id": "68400b7542187738fb1bab2c",
-            "name": "TEW",
-            "fullname": "TEW",
-            "company_id": "68400b7542187738fb1bab2c"
-          },
-          {
-            "_id": "684784a17f4aeba0af86e0bb",
-            "name": "生产部",
-            "fullname": "生产部",
-            "company_id": "68400b7542187738fb1bab2c"
-          }
-        ],
-        "space": {
-          "_id": "68400b7542187738fb1bab2c",
-          "name": "TEW",
-          "admins": [
-            "68400b7042187738fb1bab2a",
-            "686ccd4a33466ba7d2a1fce6",
-            "686cc9f8b6409ed05d63c80d"
-          ]
-        },
-        "owner": "68400b7042187738fb1bab2a",
-        "created_by": "68400b7042187738fb1bab2a",
-        "created": "2025-06-04T09:01:41.340Z",
-        "modified_by": "68400b7042187738fb1bab2a",
-        "modified": "2025-08-31T09:38:56.388Z",
-        "email_verified": null,
-        "company_id": "68400b7542187738fb1bab2c",
-        "organizations_parents": [
-          "68400b7542187738fb1bab2c",
-          "684784a17f4aeba0af86e0bb"
-        ],
-        "company_ids": [
-          "68400b7542187738fb1bab2c"
-        ],
-        "spaces": [
-          {
-            "_id": "68400b7542187738fb1bab2c",
-            "name": "TEW",
-            "admins": [
-              "68400b7042187738fb1bab2a",
-              "686ccd4a33466ba7d2a1fce6",
-              "686cc9f8b6409ed05d63c80d"
-            ]
-          }
-        ],
-        "companies": [
-          {
-            "_id": "68400b7542187738fb1bab2c",
-            "name": "TEW",
-            "organization": "68400b7542187738fb1bab2c"
-          }
-        ],
-        "company": {
-          "_id": "68400b7542187738fb1bab2c",
-          "name": "TEW",
-          "organization": "68400b7542187738fb1bab2c"
-        },
-        "permission_shares": [],
-        "spaceUserId": "68400b7542187738fb1bab2d",
-        "is_space_admin": true,
-        "is_phone": false,
-        "is_tablet": false
-      }
-    }
+    "context": {}
   },
   "id": "u:b7167e2fcaf0",
   "name": "page_instances_list",

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

@@ -1,15 +1,15 @@
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-09-15 13:09:51
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-02-07 18:12:15
+ * @LastEditors: 孙浩林 sunhaolin@steedos.com
+ * @LastEditTime: 2025-10-03 15:11:56
  * @Description: 
  */
 const express = require("express");
 const router = express.Router();
 const { requireAuthentication } = require("@steedos/auth");
 const objectql = require('@steedos/objectql')
-const _ = require('lodash');
+const { cc_do } = require('../methods/trace_approve_cc');
 
 router.post('/api/workflow/v2/cc_do', requireAuthentication, async function (req, res) {
     try {
@@ -17,15 +17,8 @@ router.post('/api/workflow/v2/cc_do', requireAuthentication, async function (req
         const { instanceId, traceId, approveId, usersId, description } = req.body;
         const approve = await objectql.getSteedosSchema().broker.call('instance.getApprove', {instanceId, traceId, approveId})
         try {
-            Meteor.call('cc_do', approve, usersId, description, {userId: userSession.userId}, (error, result)=>{
-                if(error){
-                    res.status(200).send({
-                        error: error.message
-                    });
-                }else{
-                    res.status(200).send(result); 
-                }
-            })
+            const result = await cc_do(approve, usersId, description, {userId: userSession.userId})
+            res.status(200).send(result);
         } catch (error) {
             console.error(error);
             res.status(200).send({

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

@@ -1,8 +1,8 @@
 /*
  * @Author: baozhoutao@steedos.com
  * @Date:  2023-03-18 15:05:39
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-03-18 15:25:49
+ * @LastEditors: 孙浩林 sunhaolin@steedos.com
+ * @LastEditTime: 2025-10-08 09:35:17
  * @Description: 
  */
 const express = require("express");
@@ -13,9 +13,14 @@ const _ = require('lodash');
 
 router.get('/api/workflow/v2/flow_permissions/:flow', requireAuthentication, async function (req, res) {
     let userSession = req.user;
+    const { is_space_admin } = userSession;
     const { flow } = req.params;
     try {
         const permissions = await PermissionManager.getFlowPermissions(flow, userSession.userId);
+        // 工作区管理员默认对流程有管理权限
+        if (is_space_admin && !_.includes(permissions, 'admin')) {
+            permissions.push('admin');
+        }
         res.status(200).send({
             permissions: permissions
         })