@steedos-labs/plugin-workflow 3.0.1-beta.5 → 3.0.1-beta.6

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

@@ -10,9 +10,10 @@ fields:
     label: Client
     reference_to: users
     index: true
-    readonly: true
-    defaultValue: "{{ global.userId }}"
-    visible_on: "{{global.mode ==='read' ? true : false}}"
+    readonly: false
+    defaultValue: "${global.userId}"
+    amis:
+       "staticOn": "${!(global.user.is_space_admin|| ARRAYINCLUDES(global.user.roles,'organization_admin'))}"
     name: from
     is_name: true
     filterable: true
@@ -39,7 +40,7 @@ fields:
   enabled:
     type: boolean
     label: Enabled
-    defaultValue: false
+    defaultValue: true
     name: enabled
 list_views:
   all:

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

@@ -0,0 +1,67 @@
+{
+    "type": "page",
+    "title": "Welcome to Steedos",
+    "body": [
+        {
+            "type": "wrapper",
+            "className": "steedos-instance-detail-wrapper m-0 p-0 flex-1 focus:outline-none lg:order-last sm:m-4 shadow sm:rounded",
+            "body": [
+                {
+                    "type": "service",
+                    "className": "h-full",
+                    "body": [],
+                    "id": "u:d6db0c84f150",
+                    "dsType": "api",
+                    "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;"
+                    },
+                    "visibleOn": "${permission === true}"
+                },
+                {
+                    "id": "u:259e5e73a3e2",
+                    "type": "tpl",
+                    "tpl": "无权限",
+                    "visibleOn": "${permission === false}"
+                }
+            ],
+            "id": "u:f101829e8710"
+        }
+    ],
+    "regions": [
+        "body"
+    ],
+    "data": {},
+    "id": "u:d37465183f56",
+    "className": "steedos-instance-related-view-wrapper flex justify-center",
+    "bodyClassName": "p-0 flex flex-1 overflow-hidden h-full",
+    "name": "amis-root-workflow",
+    "initApi": {
+        "url": "http://127.0.0.1:8443/api/workflow/v2/instance/${recordId}/permission",
+        "method": "get",
+        "data": {},
+        "requestAdaptor": "",
+        "adaptor": "",
+        "messages": {},
+        "sendOn": "${recordId}"
+    },
+    "initFetch": null,
+    "asideResizor": false,
+    "pullRefresh": {
+        "disabled": true
+    },
+    "editorState": "default",
+    "css": {
+        ".steedos-instance-related-view-wrapper > .antd-Page-content": {
+            "max-width": "1024px"
+        },
+        ".steedos-global-header-root": {
+            "display": "none"
+        },
+        ".creator-content-wrapper": {
+            "margin-top": "0px"
+        }
+    },
+    "wrapperCustomStyle": {}
+}

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

@@ -0,0 +1,9 @@
+name: page_instance_view
+allow_anonymous: false
+is_active: true
+label: 审批单查看页面
+locked: false
+pageAssignments: []
+render_engine: amis
+type: app
+widgets: []

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

@@ -13,16 +13,6 @@ const fs = require('fs');
 const _ = require('lodash');
 const path = require('path');
 
-const getPublicAssetUrls = function(assetUrls){
-    const values = _.map(_.split(assetUrls), (item)=>{
-        if(_.startsWith(item, '/')){
-            return Meteor.absoluteUrl(item) ;
-        }else{
-            return item;
-        }
-    })
-    return _.join(values, ',')
-}
 
 router.get('/api/amisFormDesign', requireAuthentication, async function (req, res) {
     try {
@@ -32,7 +22,7 @@ router.get('/api/amisFormDesign', requireAuthentication, async function (req, re
         let assetUrl = "";
         let assetUrls = null;
         if(process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS && _.isString(process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS)){
-            assetUrls = getPublicAssetUrls(process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS).split(',');
+            assetUrls = process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS.split(',');
             assetUrl = `assetUrl=${assetUrls.join("&assetUrl=")}&`;
         }else{
             var fullPath = path.resolve(path.dirname(require.resolve('@steedos-ui/builder-widgets' + '/package.json')));

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

@@ -0,0 +1,40 @@
+'use strict';
+// @ts-check
+const objectql = require('@steedos/objectql');
+const express = require('express');
+const router = express.Router();
+const { requireAuthentication } = require("@steedos/auth");
+const WorkflowManager = require('../manager/workflow_manager');
+const _ = require('underscore');
+const { getCollection } = require('../utils/collection');
+
+router.get('/api/workflow/v2/instance/:instanceId/permission', requireAuthentication, async function (req, res) {
+    try {
+        const { instanceId } = req.params;
+        const userSession = req.user;
+        const current_user_info = userSession;
+        const current_user_id = current_user_info.userId;
+        const db = {
+            users: await getCollection('users'),
+            instances: await getCollection('instances')
+        }
+        const user = await db.users.findOne({_id: current_user_id});
+        const instance = await db.instances.findOne({_id: instanceId})
+        console.log(`user`, user)
+        console.log(`instance`, instance)
+        const permission = await WorkflowManager.hasInstancePermissions(user, instance)
+        res.status(200).send({
+            data: {
+                permission: permission
+            },
+            msg: "",
+            status: 0
+        });
+    } catch (e) {
+        console.log(`e`, e)
+        res.status(200).send({
+            errors: [{ errorMessage: e.message }]
+        });
+    }
+});
+exports.default = router;

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

@@ -10,22 +10,11 @@ const ejs = require('ejs');
 const _ = require('lodash');
 const objectql = require('@steedos/objectql');
 
-const getPublicAssetUrls = function(assetUrls){
-    const values = _.map(_.split(assetUrls), (item)=>{
-        if(_.startsWith(item, '/')){
-            return Meteor.absoluteUrl(item) ;
-        }else{
-            return item;
-        }
-    })
-    return _.join(values, ',')
-}
-
 router.get('/api/workflow/form_design', auth.requireAuthentication, async function (req, res) {
     try {
         res.set('Content-Type', 'text/html');
         const userSession = req.user;
-        let assetUrls = getPublicAssetUrls(req.query.assetUrls);
+        let assetUrls = req.query.assetUrls;
         const assetUrl = `assetUrl=${assetUrls.split(',').join("&assetUrl=")}&`;
 
         // const dataContext = {

package/package.json

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

package/public/workflow/index.css

@@ -375,4 +375,11 @@ tbody .color-priority-muted *{
 .instances-sidebar-wrapper{
     overflow-y: auto;
     height: calc(100vh - 82px);
+}
+
+
+.steedos-instance-related-view-wrapper{
+    .antd-Page-header{
+        display: none;
+    }
 }