@steedos-labs/plugin-workflow 3.0.16 → 3.0.19

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

@@ -137,6 +137,32 @@ var DesignerAPI = {
 							}
 						}, 100);
 						
+						var closeBtnInterval = setInterval(function(){
+							var iframeWin = $(self)[0].contentWindow;
+							var iframeDoc = iframeWin.document;
+							var closeBtn = $(iframeDoc).find(".htv3.designer.square.sc-view.sc-button-view.button.sc-huge-size");
+							if(closeBtn.length > 0){
+								clearInterval(closeBtnInterval);
+								var lastBtn = closeBtn.last()[0];
+								
+								var newBtn = iframeDoc.createElement("div");
+								newBtn.setAttribute("role", "button");
+								newBtn.className = lastBtn.className; 
+								newBtn.style.cssText = lastBtn.style.cssText;
+								newBtn.innerHTML = '<div class="left"></div><div class="middle"></div><div class="right"></div><label class="sc-button-label sc-huge-size ellipsis">关闭</label>';
+								
+								if(lastBtn.parentNode){
+									lastBtn.parentNode.replaceChild(newBtn, lastBtn);
+									
+									newBtn.onclick = function(e){
+										e.preventDefault();
+										e.stopPropagation();
+										window.close();
+									};
+								}
+							}
+						}, 100);
+
 					});
         			var designer = {
             				urlQuery:function(name){

package/main/default/utils/designerManager.js

@@ -4,82 +4,120 @@ const lodash = require('lodash');
 
 const { _makeNewID, getCollection } = require('./collection');
 
-async function getByAdminSpaceIds(spaceIds, companyId, isCompanyAdmin) {
+async function getByAdminSpaceIds(spaceIds, companyId, isCompanyAdmin, flowId) {
     let filters = _makeInFilters('space', spaceIds);
     let spaceFilters = filters;
     if (isCompanyAdmin && companyId) {
         filters = `(${filters}) and ((company_id eq '${companyId}') or (company_id eq null))`;
     }
-    let userIds = [];
-    let spaceUsers = [];
-
-    spaceUsers = await getObject('space_users').find({
+    
+    const spaceUsersPromise = getObject('space_users').find({
         filters: spaceFilters,
         fields: ['name', 'email', 'space', 'organization', 'organizations', 'user', 'user_accepted', 'company_id']
     })
-    userIds = _.pluck(spaceUsers, 'user');
-    
-    let usersCollection = await getCollection('users');
-    let users = await usersCollection.find({
-        _id: {
-            $in: userIds
-        }
-    }, {
-        fields: {
-            'photo': 1,
-            'google_id': 1,
-            'imo_uid': 1,
-            'company': 1,
-            'name': 1,
-            'locale': 1,
-            'steedos_id': 1,
-            'primary_email_verified': 1,
-            'is_paid_user': 1,
-            'mobile': 1,
-            'email': 1,
-            'created': 1,
-            'modified': 1,
-            'created_by': 1,
-            'modified_by': 1,
-            'email_notification': 1,
-            'qq_open_id': 1
-        }
-    }).toArray();
 
-    let forms = await getObject('forms').find({
-        filters: filters,
-        fields: ['name', 'state', 'is_deleted', 'is_valid', 'space', 'description', 'help_text', 'created', 'created_by', 'error_message', 'current', 'enable_workflow', 'enable_view_others', 'app', 'category', 'is_subform', 'instance_style', 'company_id']
-    })
-    let flows = await getObject('flows').find({
-        filters: filters,
+    const usersPromise = spaceUsersPromise.then(async (spaceUsers) => {
+        let userIds = _.pluck(spaceUsers, 'user');
+        let usersCollection = await getCollection('users');
+        return await usersCollection.find({
+            _id: {
+                $in: userIds
+            }
+        }, {
+            fields: {
+                'photo': 1,
+                'google_id': 1,
+                'imo_uid': 1,
+                'company': 1,
+                'name': 1,
+                'locale': 1,
+                'steedos_id': 1,
+                'primary_email_verified': 1,
+                'is_paid_user': 1,
+                'mobile': 1,
+                'email': 1,
+                'created': 1,
+                'modified': 1,
+                'created_by': 1,
+                'modified_by': 1,
+                'email_notification': 1,
+                'qq_open_id': 1
+            }
+        }).toArray();
+    });
+
+    let flowsFilters = filters;
+    if (flowId) {
+        flowsFilters = `(${flowsFilters}) and (_id eq '${flowId}')`;
+    }
+
+    const flowsPromise = getObject('flows').find({
+        filters: flowsFilters,
         fields: ['name', 'name_formula', 'code_formula', 'space', 'description', 'is_valid', 'form', 'flowtype', 'state', 'is_deleted', 'created', 'created_by', 'help_text', 'current_no', 'current', 'perms', 'error_message', 'app', 'distribute_optional_users', 'company_id']
     })
-    let roles = await getObject('flow_roles').find({
+    
+    let formsPromise;
+    if (flowId) {
+        formsPromise = flowsPromise.then(async (flows) => {
+            let formsFilters = filters;
+            if (flows.length > 0) {
+                const formIds = _.pluck(flows, 'form');
+                if (formIds && formIds.length > 0) {
+                    formsFilters = `(${formsFilters}) and (_id eq '${formIds[0]}')`
+                }
+            } else {
+                formsFilters = `(1 eq 0)`
+            }
+            return await getObject('forms').find({
+                filters: formsFilters,
+                fields: ['name', 'state', 'is_deleted', 'is_valid', 'space', 'description', 'help_text', 'created', 'created_by', 'error_message', 'current', 'enable_workflow', 'enable_view_others', 'app', 'category', 'is_subform', 'instance_style', 'company_id']
+            })
+        })
+    } else {
+        formsPromise = getObject('forms').find({
+            filters: filters,
+            fields: ['name', 'state', 'is_deleted', 'is_valid', 'space', 'description', 'help_text', 'created', 'created_by', 'error_message', 'current', 'enable_workflow', 'enable_view_others', 'app', 'category', 'is_subform', 'instance_style', 'company_id']
+        })
+    }
+
+    const rolesPromise = getObject('flow_roles').find({
         filters: filters
     });
-    let organizations = await getObject('organizations').find({
+    const organizationsPromise = getObject('organizations').find({
         filters: spaceFilters
     });
-    let positions = await getObject('flow_positions').find({
+    const positionsPromise = getObject('flow_positions').find({
         filters: filters
     });
-    let categories = await getObject('categories').find({
+    const categoriesPromise = getObject('categories').find({
         filters: _makeInFilters('space', spaceIds)
     });
 
-    let hrRoles = await getObject('roles').find({
+    const hrRolesPromise = getObject('roles').find({
         filters: filters
     })
 
+    let [spaceUsers, users, forms, flows, organizations, positions, roles, categories, hrRoles] = await Promise.all([
+        spaceUsersPromise,
+        usersPromise,
+        formsPromise,
+        flowsPromise,
+        organizationsPromise,
+        positionsPromise,
+        rolesPromise,
+        categoriesPromise,
+        hrRolesPromise
+    ]);
+
     if (_.isArray(roles)) {
-        for (let role of roles) {
+        await Promise.all(roles.map(async (role) => {
             if (role && role.company_id) {
                 let company = await getObject('company').findOne(role.company_id, { fields: ['name'] }) //, 'abbreviation'
                 if (company && (company.name || company.abbreviation)) {
                     role.name = `${role.name} (${company.abbreviation || company.name})`
                 }
             }
-        }
+        }))
     }
 
     return {

package/package.json

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