@steedos-labs/plugin-workflow 3.0.8 → 3.0.10

package/main/default/client/instance.client.js

@@ -16,6 +16,7 @@ window.SteedosWorkflow.InstanceTask = {
             fields.forEach(function (field) {
                 if (field.is_list_display) {
                     crudDataFilter = crudDataFilter + `
+                        if (data.display !== 'split'){
                         crud.columns.push({
                             "name": "instance__expand.values.${field.code}",
                             "label": "${field.name || field.code}",
@@ -25,6 +26,7 @@ window.SteedosWorkflow.InstanceTask = {
                             "static": true,
                             "options": null
                         });\r\n
+                        }\r\n
                     `;
                 }
             })
@@ -85,6 +87,7 @@ window.SteedosWorkflow.Instance = {
             fields.forEach(function (field) {
                 if (field.is_list_display) {
                     crudDataFilter = crudDataFilter + `
+                        if (data.display !== 'split'){
                         crud.columns.push({
                             "name": "instance__expand.values.${field.code}",
                             "label": "${field.name || field.code}",
@@ -94,6 +97,7 @@ window.SteedosWorkflow.Instance = {
                             "static": true,
                             "options": null
                         });\r\n
+                        }\r\n
                     `;
                 }
             })

package/main/default/client/socket.client.js

@@ -36,17 +36,18 @@ window.waitForThing(window, 'socket').then(()=>{
             });
         })
     }
-    
+    let isFirstRun = true;
     socket.on(SocketEvents.badgeChange, (data)=>{
         window.postMessage({ type: "page.dataProvider.setData", data: { badges: data }}, "*")
         const shouldReloadView = () => {
             const pathname = window.location.pathname;
             return pathname.endsWith(`/instances`) || pathname.includes(`/instances/view`) || pathname.includes(`/instances/grid`) || pathname.endsWith(`/instance_tasks`) || pathname.includes(`/instance_tasks/view`) || pathname.includes(`/instance_tasks/grid`);
         };
-        if (shouldReloadView()) {
+        if (isFirstRun === false && shouldReloadView()) {
           window.$(".list-view-btn-reload").click()
           window.$(".instance-nav-reload").click()
         }
+        isFirstRun = false;
     });
 
     socket.on(SocketEvents.instanceRecordChange, (data)=>{

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

@@ -77,3 +77,17 @@ permission_set:
     unreadable_fields: []
     uneditable_fields: []
     unrelated_objects: []
+  organization_admin:
+    allowCreate: true
+    allowDelete: true
+    allowEdit: true
+    allowRead: true
+    modifyAllRecords: false
+    viewAllRecords: false
+    modifyCompanyRecords: true
+    viewCompanyRecords: true
+    disabled_list_views: []
+    disabled_actions: []
+    unreadable_fields: []
+    uneditable_fields: []
+    unrelated_objects: []

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

@@ -48,6 +48,20 @@ permission_set:
     modifyAllRecords: true
     viewAllRecords: true
   workflow_admin:
+    allowCreate: true
+    allowDelete: true
+    allowEdit: true
+    allowRead: true
+    modifyAllRecords: false
+    viewAllRecords: false
+    modifyCompanyRecords: true
+    viewCompanyRecords: true
+    disabled_list_views: []
+    disabled_actions: []
+    unreadable_fields: []
+    uneditable_fields: []
+    unrelated_objects: []
+  organization_admin:
     allowCreate: true
     allowDelete: true
     allowEdit: true

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

@@ -919,7 +919,21 @@ permission_set:
     viewAllRecords: true
   workflow_admin:
     allowCreate: true
-    allowDelete: false
+    allowDelete: true
+    allowEdit: true
+    allowRead: true
+    modifyAllRecords: false
+    viewAllRecords: false
+    modifyCompanyRecords: true
+    viewCompanyRecords: true
+    disabled_list_views: []
+    disabled_actions: []
+    unreadable_fields: []
+    uneditable_fields: []
+    unrelated_objects: []
+  organization_admin:
+    allowCreate: true
+    allowDelete: true
     allowEdit: true
     allowRead: true
     modifyAllRecords: false

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

@@ -336,7 +336,7 @@ permission_set:
     modifyAllRecords: true
     viewAllRecords: true
   workflow_admin:
-    allowCreate: false
+    allowCreate: true
     allowDelete: false
     allowEdit: true
     allowRead: true
@@ -349,3 +349,12 @@ permission_set:
     unreadable_fields: []
     uneditable_fields: []
     unrelated_objects: []
+  organization_admin:
+    allowCreate: true
+    allowDelete: false
+    allowEdit: true
+    allowRead: true
+    modifyAllRecords: false
+    viewAllRecords: false
+    modifyCompanyRecords: true
+    viewCompanyRecords: true

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

@@ -78,8 +78,12 @@ permission_set:
     viewAllRecords: false
     modifyCompanyRecords: true
     viewCompanyRecords: true
-    disabled_list_views: []
-    disabled_actions: []
-    unreadable_fields: []
-    uneditable_fields: []
-    unrelated_objects: []
+  organization_admin:
+    allowCreate: true
+    allowDelete: true
+    allowEdit: true
+    allowRead: true
+    modifyAllRecords: false
+    viewAllRecords: false
+    modifyCompanyRecords: true
+    viewCompanyRecords: true

package/main/default/objects/instances/buttons/instance_new.button.yml

@@ -65,8 +65,12 @@ amis_schema: |-
                                                         {
                                                             "actionType": "wait",
                                                             "args": {
-                                                                "time": 2000
+                                                                "time": 100
                                                             }
+                                                        },
+                                                        {
+                                                            "actionType": "custom",
+                                                            "script":"window.$('.list-view-btn-reload').click()"
                                                         }
                                                     ]
                                                 }

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

@@ -278,6 +278,23 @@ permission_set:
     unreadable_fields: []
     uneditable_fields: []
     unrelated_objects: []
+  organization_admin:
+    allowCreate: false
+    allowDelete: false
+    allowEdit: false
+    allowRead: true
+    modifyAllRecords: false
+    viewAllRecords: false
+    modifyCompanyRecords: false
+    viewCompanyRecords: true
+    allowCreateListViews: false
+    disabled_list_views:
+      - inbox
+      - outbox
+    disabled_actions: []
+    unreadable_fields: []
+    uneditable_fields: []
+    unrelated_objects: [] 
 actions:
   view_instance:
     label: View Instance

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

@@ -70,3 +70,21 @@ permission_set:
     allowRead: true
     modifyAllRecords: false
     viewAllRecords: false
+  workflow_admin:
+    allowCreate: true
+    allowDelete: true
+    allowEdit: true
+    allowRead: true
+    modifyAllRecords: false
+    viewAllRecords: false
+    modifyCompanyRecords: true
+    viewCompanyRecords: true
+  organization_admin:
+    allowCreate: true
+    allowDelete: true
+    allowEdit: true
+    allowRead: true
+    modifyAllRecords: false
+    viewAllRecords: false
+    modifyCompanyRecords: true
+    viewCompanyRecords: true

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

@@ -54,8 +54,12 @@ permission_set:
     viewAllRecords: false
     modifyCompanyRecords: true
     viewCompanyRecords: true
-    disabled_list_views: []
-    disabled_actions: []
-    unreadable_fields: []
-    uneditable_fields: []
-    unrelated_objects: []
+  organization_admin:
+    allowCreate: true
+    allowDelete: true
+    allowEdit: true
+    allowRead: true
+    modifyAllRecords: false
+    viewAllRecords: false
+    modifyCompanyRecords: true
+    viewCompanyRecords: true

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

@@ -202,7 +202,7 @@
                   "listName": "completed",
                   "rebuildOn": "${flowId || categoryId}",
                   "adaptor": "//在列表上加流程表单字段时，group和user需要特殊处理\nif (api.body.self.listName == \"monitor\") {\n  _.each(payload.data.rows, function (item, index) {\n    if (item.values) {\n      const form_fields = api.body.self.form_fields;\n      _.each(item.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.values[field_code] = field && field.length > 0 ? _.map(field, 'fullname').toString() : \"\";\n          } else {\n            item.values[field_code] = field ? field.fullname : \"\";\n          }\n        } else if (form_field && form_field.type == \"user\") {\n          if (form_field.is_multiselect) {\n            item.values[field_code] = field && field.length > 0 ? _.map(field, 'name').toString() : \"\";\n          } else {\n            item.values[field_code] = field ? field.name : \"\";\n          }\n        }\n      })\n    }\n  })\n}\n",
-                  "crudDataFilter": "if (data && data.flowId && (data.listName == 'inbox' || 'monitor') && window.innerWidth > 768) {\r\n  var api = {\r\n    url: \"${context.rootUrl}/graphql\",\r\n    method: \"post\",\r\n    dataType: \"json\",\r\n    data: {\r\n      \"query\": '{flow: flows__findOne(id:\"' + data.flowId + '\"){form__expand{current}}}'\r\n    },\r\n    headers: {\r\n      Authorization:\r\n        \"Bearer ${context.tenantId},${context.authToken}\",\r\n    },\r\n  };\r\n  return env.fetcher(api).then((result) => {\r\n    if (result.data && result.data.flow && result.data.flow.form__expand.current.fields && result.data.flow.form__expand.current.fields.length > 0) {\r\n      let fields = result.data.flow.form__expand.current.fields;\r\n      fields.forEach(function (field) {\r\n        if (field.is_list_display) {\r\n          crud.columns.push({\r\n            \"name\": \"values.\" + field.code,\r\n            \"label\": field.name || field.code,\r\n            \"width\": \"unset\",\r\n            \"type\": \"text\",\r\n            \"className\": \" whitespace-nowrap\",\r\n            \"static\": true,\r\n            \"options\": null\r\n          });\r\n        }\r\n      })\r\n      let schemaApiService = data._scoped.parent.getComponentById(\"instances_list_service\");\r\n      schemaApiService && schemaApiService.setData({ form_fields: fields, isFlowDataDone: true });\r\n      // crud.api.sendOn = \"this.isFlowDataDone\";\r\n    }\r\n    return crud;\r\n  });\r\n} else {\r\n  let schemaApiService = data._scoped.parent.getComponentById(\"instances_list_service\");\r\n  schemaApiService && schemaApiService.setData({ isFlowDataDone: true });\r\n  // crud.api.sendOn = \"this.isFlowDataDone\";\r\n return crud;\r\n}\r\n"
+                  "crudDataFilter": "if (data && data.flowId && (data.listName == 'inbox' || 'monitor') && window.innerWidth > 768) {\r\n  var api = {\r\n    url: \"${context.rootUrl}/graphql\",\r\n    method: \"post\",\r\n    dataType: \"json\",\r\n    data: {\r\n      \"query\": '{flow: flows__findOne(id:\"' + data.flowId + '\"){form__expand{current}}}'\r\n    },\r\n    headers: {\r\n      Authorization:\r\n        \"Bearer ${context.tenantId},${context.authToken}\",\r\n    },\r\n  };\r\n  return env.fetcher(api).then((result) => {\r\n    if (result.data && result.data.flow && result.data.flow.form__expand.current.fields && result.data.flow.form__expand.current.fields.length > 0) {\r\n      let fields = result.data.flow.form__expand.current.fields;\r\n      fields.forEach(function (field) {\r\n        if (field.is_list_display && data.display !== 'split') {\r\n          crud.columns.push({\r\n            \"name\": \"values.\" + field.code,\r\n            \"label\": field.name || field.code,\r\n            \"width\": \"unset\",\r\n            \"type\": \"text\",\r\n            \"className\": \" whitespace-nowrap\",\r\n            \"static\": true,\r\n            \"options\": null\r\n          });\r\n        }\r\n      })\r\n      let schemaApiService = data._scoped.parent.getComponentById(\"instances_list_service\");\r\n      schemaApiService && schemaApiService.setData({ form_fields: fields, isFlowDataDone: true });\r\n      // crud.api.sendOn = \"this.isFlowDataDone\";\r\n    }\r\n    return crud;\r\n  });\r\n} else {\r\n  let schemaApiService = data._scoped.parent.getComponentById(\"instances_list_service\");\r\n  schemaApiService && schemaApiService.setData({ isFlowDataDone: true });\r\n  // crud.api.sendOn = \"this.isFlowDataDone\";\r\n return crud;\r\n}\r\n"
                 },
                 {
                   "type": "service",

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

@@ -537,8 +537,12 @@ router.put('/am/flows', async function (req, res) {
                 }
             });
             updateObj.$set.category = form['category'];
-
-            await objectql.getObject('flows').update(flowId, {...updateObj.$set, $push: updateObj.$push || {}})
+            const updateData = { ...updateObj.$set };
+            if (updateObj.$push) {
+                updateData.$push = updateObj.$push;
+            }
+            await objectql.getObject('flows').update(flowId, updateData);
+            console.log('update', flowId, 'end');
             updatedFlows.push(await flowCollection.findOne({_id: flowId}));
         }
 

package/main/default/tabs/admin_categories.tab.yml

@@ -13,9 +13,9 @@ permissions:
     permission_set: customer
   - permission: 'off'
     permission_set: supplier
-  - permission: 'off'
+  - permission: 'on'
     permission_set: organization_admin
-  - permission: 'off'
+  - permission: 'on'
     permission_set: workflow_admin
 type: object
 object: categories

package/main/default/tabs/admin_flow_roles.tab.yml

@@ -13,9 +13,9 @@ permissions:
     permission_set: customer
   - permission: 'off'
     permission_set: supplier
-  - permission: 'off'
+  - permission: 'on'
     permission_set: organization_admin
-  - permission: 'off'
+  - permission: 'on'
     permission_set: workflow_admin
 type: object
 object: flow_roles

package/main/default/tabs/admin_flows.tab.yml

@@ -13,9 +13,9 @@ permissions:
     permission_set: customer
   - permission: 'off'
     permission_set: supplier
-  - permission: 'off'
+  - permission: 'on'
     permission_set: organization_admin
-  - permission: 'off'
+  - permission: 'on'
     permission_set: workflow_admin
 type: object
 object: flows

package/main/default/tabs/admin_instance_number_rules.tab.yml

@@ -13,9 +13,9 @@ permissions:
     permission_set: customer
   - permission: 'off'
     permission_set: supplier
-  - permission: 'off'
+  - permission: 'on'
     permission_set: organization_admin
-  - permission: 'off'
+  - permission: 'on'
     permission_set: workflow_admin
 type: object
 object: instance_number_rules

package/main/default/tabs/admin_process_delegation_rules.tab.yml

@@ -13,9 +13,9 @@ permissions:
     permission_set: customer
   - permission: 'off'
     permission_set: supplier
-  - permission: 'off'
+  - permission: 'on'
     permission_set: organization_admin
-  - permission: 'off'
+  - permission: 'on'
     permission_set: workflow_admin
 type: object
 object: process_delegation_rules

package/main/default/tabs/admin_space_user_signs.tab.yml

@@ -13,9 +13,9 @@ permissions:
     permission_set: customer
   - permission: 'off'
     permission_set: supplier
-  - permission: 'off'
+  - permission: 'on'
     permission_set: organization_admin
-  - permission: 'off'
+  - permission: 'on'
     permission_set: workflow_admin
 type: object
 object: space_user_signs

package/main/default/triggers/amis_form_design.trigger.js

@@ -199,7 +199,8 @@ function transformFormFields(amisField) {
         is_searchable: _.includes(amisField.className, "is_searchable"),
         visibleOn: amisField.visibleOn,
         requiredOn: amisField.requiredOn,
-        description: amisField.description
+        description: amisField.description,
+        _amisField: amisField
     }
 
     // console.log('formFieldsItem', formFieldsItem)
@@ -563,6 +564,19 @@ module.exports = {
             await desingerManager.checkSpaceUserBeforeUpdate(spaceId, userId, roles);
             // 更新表单
             await desingerManager.updateForm(this.id, form, updatedForms, updatedFlows, userId);
+
+            const flows = await objectql.getObject('flows').directFind({
+                filters: ['form', '=', this.id],
+                fields: ['_id']
+            });
+
+            for (const flow of flows) {
+                await objectql.getObject('flows').directUpdate(flow._id, {
+                    modified: new Date(),
+                    modified_by: userId
+                })
+            }
+
         }
 
     },

package/package.json

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