@steedos/standard-process-approval 2.7.27-beta.6 → 3.0.0-beta.100

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

@@ -1,5 +1,12 @@
+/*
+ * @Author: 殷亮辉 yinlianghui@hotoa.com
+ * @Date: 2025-04-14 09:47:57
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2025-04-29 11:24:43
+ */
 const _ = require("underscore");
 const auth = require("@steedos/auth");
+const steedosI18n = require("@steedos/i18n");
 
 const getLng = async function(userId){
   const userSession = await auth.getSessionByUserId(userId);
@@ -8,7 +15,7 @@ const getLng = async function(userId){
 
 const getEmptyNodeTitle = async function(userId){
   let lng = await getLng(userId);
-  return TAPi18n.__('process_approval_empty_node_title', {}, lng);
+  return steedosI18n.t('process_approval_empty_node_title', {}, lng);
 }
 
 module.exports = {

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

@@ -1,7 +1,5 @@
 const _ = require("underscore");
 const objectql = require('@steedos/objectql');
-const util = require('@steedos/standard-objects').util;
-const InternalData = require('@steedos/standard-objects').internalData;
 
 function setSpaceAndOwner(record, that){
     record['space'] = that.spaceId
@@ -131,7 +129,7 @@ module.exports = {
         if (this.doc.order === 1) {
             this.doc.reject_behavior = 'reject_request';
         }
-        await util.checkAPIName(this.object_name, 'name', this.doc.name, null, [['process_definition', '=', this.doc.process_definition]]);
+        await objectql.checkAPIName(this.object_name, 'name', this.doc.name, null, [['process_definition', '=', this.doc.process_definition]]);
         if(!this.doc.filtrad){
             const objectName = await getProcessNodeObjectName(this.doc.process_definition);
             if(objectName){
@@ -157,7 +155,7 @@ module.exports = {
             }
         }
         if (_.has(this.doc, 'name')) {
-            await util.checkAPIName(this.object_name, 'name', this.doc.name, this.id, [['process_definition', '=', this.doc.process_definition]]);
+            await objectql.checkAPIName(this.object_name, 'name', this.doc.name, this.id, [['process_definition', '=', this.doc.process_definition]]);
         }
 
         if(!this.doc.filtrad && this.doc.process_definition){

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

@@ -1,7 +1,5 @@
 const _ = require("underscore");
-const util = require('@steedos/standard-objects').util;
 const objectql = require("@steedos/objectql");
-const InternalData = require('@steedos/standard-objects').internalData;
 
 const getInternalWorkflowNotifications = function(sourceWorkflowNotifications, filters, dbWorkflowNotifications){
     let workflowNotifications = [];
@@ -20,121 +18,11 @@ const getInternalWorkflowNotifications = function(sourceWorkflowNotifications, f
 
 module.exports = {
     beforeInsert: async function () {
-        await util.checkAPIName(this.object_name, 'name', this.doc.name, undefined, [['is_system','!=', true]]);
+        await objectql.checkAPIName(this.object_name, 'name', this.doc.name, undefined, [['is_system','!=', true]]);
     },
     beforeUpdate: async function () {
         if (_.has(this.doc, 'name')) {
-            await util.checkAPIName(this.object_name, 'name', this.doc.name, this.id, [['is_system','!=', true]]);
+            await objectql.checkAPIName(this.object_name, 'name', this.doc.name, this.id, [['is_system','!=', true]]);
         }
-    },
-    afterFind: async function(){
-        let filters = InternalData.parserFilters(this.query.filters)
-        let fObjectName = filters.object_name;
-        if(fObjectName){
-            delete filters.object_name;
-        }
-
-        if(filters._id && filters._id.$ne){
-            if(!_.isArray(filters._id.$ne)){
-                filters._id.$ne = [filters._id.$ne]
-            }
-        }
-        let dbWorkflowNotifications = Creator.getCollection("workflow_notifications").find(filters, {fields:{_id:1, name:1}}).fetch();
-
-        let workflowNotifications = [];
-        if(filters.name && filters.name.$in){
-            for(let _name of filters.name.$in){
-                let workflowNotification = await objectql.getWorkflowNotification(_name);
-                if(workflowNotification){
-                    workflowNotifications.push(workflowNotification);
-                }
-            }
-        }else if(filters._id && !filters._id.$ne){
-            let notification = await objectql.getWorkflowNotification(filters._id);
-            if(notification){
-                workflowNotifications.push(notification);
-            }
-        }else if(fObjectName){
-            workflowNotifications = await objectql.getObjectWorkflowNotifications(fObjectName);
-        }else{
-            workflowNotifications = await objectql.getAllWorkflowNotifications();
-        }
-        
-        if(filters._id && filters._id.$ne){
-            for(let neid of filters._id.$ne){
-                workflowNotifications = _.filter(workflowNotifications, function(item){
-                    return item._id !== neid
-                })
-            }
-        }
-
-        workflowNotifications = getInternalWorkflowNotifications(workflowNotifications, filters, dbWorkflowNotifications);
-
-        if(workflowNotifications && workflowNotifications.length>0){
-            this.data.values = this.data.values.concat(workflowNotifications)
-        }
-    },
-    afterCount: async function(){
-        let filters = InternalData.parserFilters(this.query.filters)
-        let fObjectName = filters.object_name;
-        if(fObjectName){
-            delete filters.object_name;
-        }
-
-        if(filters._id && filters._id.$ne){
-            if(!_.isArray(filters._id.$ne)){
-                filters._id.$ne = [filters._id.$ne]
-            }
-        }
-        let dbWorkflowNotifications = Creator.getCollection("workflow_notifications").find(filters, {fields:{_id:1, name:1}}).fetch();
-
-        let workflowNotifications = [];
-        if(filters._id && filters._id.$in){
-            for(let id of filters._id.$in){
-                let workflowNotification = await objectql.getWorkflowNotification(id);
-                if(workflowNotification){
-                    workflowNotifications.push(workflowNotification);
-                }
-            }
-        }else if(filters._id && !filters._id.$ne){
-            let notification = await objectql.getWorkflowNotification(filters._id);
-            if(notification){
-                workflowNotifications.push(notification);
-            }
-        }else if(fObjectName){
-            workflowNotifications = await objectql.getObjectWorkflowNotifications(fObjectName);
-        }else{
-            workflowNotifications = await objectql.getAllWorkflowNotifications();
-        }
-        
-        if(filters._id && filters._id.$ne){
-            for(let neid of filters._id.$ne){
-                workflowNotifications = _.filter(workflowNotifications, function(item){
-                    return item._id !== neid
-                })
-            }
-        }
-        
-        workflowNotifications = getInternalWorkflowNotifications(workflowNotifications, filters, dbWorkflowNotifications);
-
-        if(workflowNotifications && workflowNotifications.length>0){
-            this.data.values = this.data.values + workflowNotifications.length
-        }
-    },
-    afterFindOne: async function(){
-        if(_.isEmpty(this.data.values)){
-            let id = this.id
-
-            let dbNotification = Creator.getCollection("workflow_notifications").find({name: id}).fetch();
-            if(dbNotification && dbNotification.length > 0){
-                this.data.values = dbNotification[0];
-                return;
-            }
-
-            let workflowNotification = await objectql.getWorkflowNotification(id);
-            if(workflowNotification){
-                this.data.values = workflowNotification;
-            }
-        }
-    },
+    }
 }

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

@@ -1,143 +1,13 @@
 const _ = require("underscore");
-const util = require('@steedos/standard-objects').util;
 const objectql = require("@steedos/objectql");
-const InternalData = require('@steedos/standard-objects').internalData;
-
-const getInternalOutboundMessages = function(sourceOutboundMessages, filters, dbOutboundMessages){
-    let messages = [];
-
-    if(!filters.is_system){
-        _.forEach(sourceOutboundMessages, function(doc){
-            if(!_.find(dbOutboundMessages, function(p){
-                return p.name === doc.name
-            })){
-                messages.push(doc);
-            }
-        })
-    }
-    return messages;
-}
 
 module.exports = {
     beforeInsert: async function () {
-        await util.checkAPIName(this.object_name, 'name', this.doc.name, undefined, [['is_system','!=', true]]);
+        await objectql.checkAPIName(this.object_name, 'name', this.doc.name, undefined, [['is_system','!=', true]]);
     },
     beforeUpdate: async function () {
         if (_.has(this.doc, 'name')) {
-            await util.checkAPIName(this.object_name, 'name', this.doc.name, this.id, [['is_system','!=', true]]);
-        }
-    },
-    afterFind: async function(){
-        let filters = InternalData.parserFilters(this.query.filters)
-        let fObjectName = filters.object_name;
-
-        if(fObjectName){
-            delete filters.object_name;
-        }
-
-        if(filters._id && filters._id.$ne){
-            if(!_.isArray(filters._id.$ne)){
-                filters._id.$ne = [filters._id.$ne]
-            }
+            await objectql.checkAPIName(this.object_name, 'name', this.doc.name, this.id, [['is_system','!=', true]]);
         }
-
-        let dbOutboundMessages = Creator.getCollection("workflow_outbound_messages").find(filters, {fields:{_id:1, name:1}}).fetch();
-
-        let messages = [];
-        if(filters.name && filters.name.$in){
-            for(let _name of filters.name.$in){
-                let message = await objectql.getWorkflowOutboundMessage(_name);
-                if(message){
-                    messages.push(message);
-                }
-            }
-        }else if(filters._id && !filters._id.$ne){
-            let message = await objectql.getWorkflowOutboundMessage(filters._id);
-            if(message){
-                messages.push(message);
-            }
-        }else if(fObjectName){
-            messages = await objectql.getObjectWorkflowOutboundMessages(fObjectName);
-        }else{
-            messages = await objectql.getAllWorkflowOutboundMessages();
-        }
-        
-        if(filters._id && filters._id.$ne){
-            for(let neid of filters._id.$ne){
-                messages = _.filter(messages, function(item){
-                    return item._id !== neid
-                })
-            }
-        }
-
-        messages = getInternalOutboundMessages(messages, filters, dbOutboundMessages);
-
-        if(messages && messages.length>0){
-            this.data.values = this.data.values.concat(messages)
-        }
-    },
-    afterCount: async function(){
-        let filters = InternalData.parserFilters(this.query.filters)
-        let fObjectName = filters.object_name;
-
-        if(fObjectName){
-            delete filters.object_name;
-        }
-
-        if(filters._id && filters._id.$ne){
-            if(!_.isArray(filters._id.$ne)){
-                filters._id.$ne = [filters._id.$ne]
-            }
-        }
-
-        let dbOutboundMessages = Creator.getCollection("workflow_outbound_messages").find(filters, {fields:{_id:1, name:1}}).fetch();
-        let messages = [];
-        if(filters._id && filters._id.$in){
-            for(let id of filters._id.$in){
-                let message = await objectql.getWorkflowOutboundMessage(id);
-                if(message){
-                    messages.push(message);
-                }
-            }
-        }else if(filters._id && !filters._id.$ne){
-            let message = await objectql.getWorkflowOutboundMessage(filters._id);
-            if(message){
-                messages.push(message);
-            }
-        }else if(fObjectName){
-            messages = await objectql.getObjectWorkflowOutboundMessages(fObjectName);
-        }else{
-            messages = await objectql.getAllWorkflowOutboundMessages();
-        }
-        
-        if(filters._id && filters._id.$ne){
-            for(let neid of filters._id.$ne){
-                messages = _.filter(messages, function(item){
-                    return item._id !== neid
-                })
-            }
-        }
-        
-        messages = getInternalOutboundMessages(messages, filters, dbOutboundMessages);
-
-        if(messages && messages.length>0){
-            this.data.values = this.data.values + messages.length
-        }
-    },
-    afterFindOne: async function(){
-        if(_.isEmpty(this.data.values)){
-            let id = this.id
-
-            let dbNotification = Creator.getCollection("workflow_outbound_messages").find({name: id}).fetch();
-            if(dbNotification && dbNotification.length > 0){
-                this.data.values = dbNotification[0];
-                return;
-            }
-
-            let message = await objectql.getWorkflowOutboundMessage(id);
-            if(message){
-                this.data.values = message;
-            }
-        }
-    },
+    }
 }

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

@@ -2,93 +2,20 @@
  * @Author: sunhaolin@hotoa.com
  * @Date: 2021-08-30 12:06:41
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2024-03-13 14:57:01
+ * @LastEditTime: 2025-03-05 16:42:15
  * @Description: 
  */
 const _ = require("underscore");
-const util = require('@steedos/standard-objects').util;
 const objectql = require("@steedos/objectql");
-const register = require("@steedos/metadata-registrar")
-const InternalData = require('@steedos/standard-objects').internalData;
-
-const getInternalWorkflowRules = function(sourceWorkflowRules, filters, dbWorkflowRules){
-    let workflowRules = [];
-
-    if(!filters.is_system){
-        _.forEach(sourceWorkflowRules, function(doc){
-            if(!_.find(dbWorkflowRules, function(p){
-                return p.name === doc.name
-            })){
-                workflowRules.push(doc);
-            }
-        })
-    }
-    return workflowRules;
-}
 
 module.exports = {
     beforeInsert: async function () {
-        await util.checkAPIName(this.object_name, 'name', this.doc.name, undefined, [['is_system','!=', true]]);
+        await objectql.checkAPIName(this.object_name, 'name', this.doc.name, undefined, [['is_system','!=', true]]);
 
     },
     beforeUpdate: async function () {
         if (_.has(this.doc, 'name')) {
-            await util.checkAPIName(this.object_name, 'name', this.doc.name, this.id, [['is_system','!=', true]]);
-        }
-    },
-    afterFind: async function(){
-        let filters = InternalData.parserFilters(this.query.filters)
-        let workflowRules = [];
-
-        let fObjectName = filters.object_name;
-
-        if(fObjectName){
-            delete filters.object_name;
-        }
-
-        let dbWorkflowRules = Creator.getCollection("workflow_rule").find(filters, {fields:{_id:1, name:1}}).fetch()
-
-        if(fObjectName){
-            workflowRules = await register.getObjectWorkflowRules(fObjectName);
-        }else{
-            workflowRules = await register.getAllWorkflowRules();
-        }
-
-        workflowRules = getInternalWorkflowRules(workflowRules, filters, dbWorkflowRules);
-
-        if(workflowRules && workflowRules.length>0){
-            this.data.values = this.data.values.concat(workflowRules)
-        }
-    },
-    afterCount: async function(){
-        let filters = InternalData.parserFilters(this.query.filters)
-        let workflowRules = [];
-        let fObjectName = filters.object_name;
-
-        if(fObjectName){
-            delete filters.object_name;
-        }
-        let dbWorkflowRules = Creator.getCollection("workflow_rule").find(filters, {fields:{_id:1, name:1}}).fetch()
-
-        if(fObjectName){
-            workflowRules = await register.getObjectWorkflowRules(fObjectName);
-        }else{
-            workflowRules = await register.getAllWorkflowRules();
+            await objectql.checkAPIName(this.object_name, 'name', this.doc.name, this.id, [['is_system','!=', true]]);
         }
-        
-        workflowRules = getInternalWorkflowRules(workflowRules, filters, dbWorkflowRules);
-
-        if(workflowRules && workflowRules.length>0){
-            this.data.values = this.data.values + workflowRules.length
-        }
-    },
-    afterFindOne: async function(){
-        if(_.isEmpty(this.data.values)){
-            let id = this.id
-            let workflowRule = await register.getWorkflowRule(id);
-            if(workflowRule){
-                this.data.values = workflowRule;
-            }
-        }
-    },
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/standard-process-approval",
-    "version": "2.7.27-beta.6",
+    "version": "3.0.0-beta.100",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -10,11 +10,11 @@
         "steedos"
     ],
     "dependencies": {
-        "@steedos/process": "2.7.27-beta.6",
+        "@steedos/process": "3.0.0-beta.100",
         "nanoid": "^3.3.4"
     },
     "description": "steedos package",
     "repository": {},
     "license": "MIT",
-    "gitHead": "4cc6978a51be2b5b8efcad8ec8adba467df6e02a"
+    "gitHead": "89c69deb3ceb9d9e97c70ee23694ccecf1b4ce2b"
 }

package/package.service.js

@@ -8,7 +8,7 @@
 "use strict";
 const project = require('./package.json');
 const packageName = project.name;
-const packageLoader = require('@steedos/service-meteor-package-loader');
+const packageLoader = require('@steedos/service-package-loader');
 /**
  * @typedef {import('moleculer').Context} Context Moleculer's Context
  */

package/main/default/client/action_field_updates.client.js

@@ -1,155 +0,0 @@
-Steedos.ProcessFieldUpdatesManager = {};
-
-Steedos.ProcessFieldUpdatesManager.changeSchema = function (doc, schema) {
-  var objectSchema = Creator.getObjectSchema(Creator.getObject("action_field_updates"));
-  var operation = doc.operation;
-
-  var hiddenField = function (fieldName) {
-    schema._schema[fieldName].autoform.omit = true;
-    schema._schema[fieldName].autoform.type = 'hidden';
-  }
-  // var recordId = Session.get("record_id");
-  var objectName = Session.get("object_name");
-  var actionObjectName = Session.get("action_object_name");
-  var actionOperation = Session.get("cmOperation");
-  if (objectName == 'process_node') {
-    var processDefinitionId = AutoForm.getFormValues("creatorEditForm").insertDoc.process_definition; //Creator.odata.get("process_node", recordId, "process_definition").process_definition;
-    if(processDefinitionId){
-      var object_name = Creator.odata.get("process_definition", processDefinitionId, "object_name").object_name;
-      schema._schema.object_name.autoform.readonly = true;
-      doc.object_name = object_name;
-    }else{
-      toastr.error(t("action_field_updates_field__error_process_node_process_definition_required"));
-    }
-  }
-
-  if (objectName == 'process_definition') {
-    var object_name = null;
-    if(actionObjectName == "process_definition"){
-        // 当前正在新建或编辑批准过程
-      if (actionOperation == 'update') {
-        object_name = AutoForm.getFormValues("creatorEditForm").insertDoc.object_name;
-      } else {
-        object_name = AutoForm.getFormValues("creatorAddForm").insertDoc.object_name;
-      }
-      if(!object_name){
-        toastr.error(t("action_field_updates_field__error_process_definition_object_required"));
-      }
-    }else{
-        // 当前正在新建或编辑批准过程以外其他对象，目前只有批准过程详细界面新建或编辑批准步骤
-        if (actionOperation == 'update') {
-          var processDefinitionId = AutoForm.getFormValues("creatorEditForm").insertDoc.process_definition;
-          if(processDefinitionId){
-            object_name = Creator.odata.get("process_definition", processDefinitionId, "object_name").object_name;
-          }
-          else{
-            toastr.error(t("action_field_updates_field__error_process_node_process_definition_required"));
-          }
-        } else {
-          var formValues = AutoForm.getFormValues("creatorAddRelatedForm");
-          if(!formValues){
-            // 有可能是在批准过程详细界面点击了批准步骤列表顶部的链接进入了“相关批准步骤列表界面”然后点击的右上角的新建按钮触发的
-            formValues = AutoForm.getFormValues("creatorAddForm");
-          }
-          var processDefinitionId = formValues.insertDoc.process_definition;
-          if(processDefinitionId){
-            object_name = Creator.odata.get("process_definition", processDefinitionId, "object_name").object_name;
-          }
-          else{
-            toastr.error(t("action_field_updates_field__error_process_node_process_definition_required"));
-          }
-        }
-    }
-    schema._schema.object_name.autoform.readonly = true;
-    doc.object_name = object_name;
-  }
-
-  if (objectName == 'workflow_rule') {
-    var object_name = null;
-    if (actionOperation == 'update') {
-      object_name = AutoForm.getFormValues("creatorEditForm").insertDoc.object_name //Creator.odata.get("workflow_rule", Session.get("record_id"), "object_name").object_name;
-    } else {
-      object_name = AutoForm.getFormValues("creatorAddForm").insertDoc.object_name
-    }
-    schema._schema.object_name.autoform.readonly = true;
-    if(object_name){
-      doc.object_name = object_name;
-    }
-    else{
-      toastr.error(t("action_field_updates_field__error_workflow_rule_object_required"));
-    }
-  }
-
-  // if(doc.process_definition){
-  //   hiddenField('process_node');
-  //   schema._schema.when.autoform.options = _.filter(objectSchema.when.autoform.options, function(option){return _.include(['final_approval','final_rejection','recall','initial_submission'], option.value)});
-  //   var pid = doc.process_definition;
-  //   if(_.isObject(pid)){
-  //     if(_.has(pid, 'ids') && pid.ids.length > 0){
-  //       pid = pid.ids[0];
-  //     }else{
-  //       pid = pid._id;
-  //     }
-  //   }
-  //   var object_name = Creator.odata.get("process_definition", pid, "object_name").object_name;
-  //   schema._schema.object_name.optionsFunction = function(){var _obj = Creator.getObject(object_name); return [{label: _obj.label, value: _obj.name, icon: _obj.icon}]}
-  //   doc.object_name = object_name;
-  // }else{
-  //   schema._schema.process_node = objectSchema.process_node;
-  //   schema._schema.when.autoform.options = _.filter(objectSchema.when.autoform.options, function(option){return _.include(['approval','rejection'], option.value)})
-  // }
-
-  // if(doc.process_node){
-  //   hiddenField('process_definition');
-  //   var pnid = doc.process_node;
-  //   if(_.isObject(pnid)){
-  //     if(_.has(pnid, 'ids') && pnid.ids.length > 0){
-  //       pnid = pnid.ids[0];
-  //     }else{
-  //       pnid = pnid._id;
-  //     }
-  //   }
-  //   var processDefinitionId = Creator.odata.get("process_node", pnid, "process_definition").process_definition;
-  //   var object_name = Creator.odata.get("process_definition", processDefinitionId, "object_name").object_name;
-  //   schema._schema.object_name.optionsFunction = function(){var _obj = Creator.getObject(object_name); return [{label: _obj.label, value: _obj.name, icon: _obj.icon}]}
-  //   doc.object_name = object_name;
-  //   schema._schema.when.autoform.options = _.filter(objectSchema.when.autoform.options, function(option){return _.include(['approval','rejection'], option.value)})
-  // }else{
-  //   schema._schema.process_definition = objectSchema.process_definition;
-  //   schema._schema.when.autoform.options = _.filter(objectSchema.when.autoform.options, function(option){return _.include(['final_approval','final_rejection','recall','initial_submission'], option.value)})
-  // }
-
-  if (operation === 'null') {
-    hiddenField('formula');
-    hiddenField('literal_value');
-  }
-
-  if (operation === 'formula') {
-    schema._schema.formula = objectSchema.formula;
-    hiddenField('literal_value');
-  }
-
-  if (operation === 'literal') {
-    schema._schema.formula.autoform.type = 'hidden';
-    var doc = doc;
-    var mainObjectName = null;
-    if (doc.target_object && doc.target_object != doc.object_name) {
-      var mainObjectName = Creator.objectsByName[doc.object_name].fields[doc.target_object].reference_to;
-    } else {
-      mainObjectName = doc.object_name;
-    }
-    var object = Creator.objectsByName[mainObjectName];
-    if (object && doc.field_name) {
-      schema._schema.literal_value = Object.assign({}, Creator.getObjectSchema(Creator.getObject(mainObjectName))[doc.field_name], { label: schema._schema.literal_value.label });
-      schema._schema.literal_value.autoform.disabled = false;
-      schema._schema.literal_value.autoform.omit = false;
-      schema._schema.literal_value.autoform.readonly = false;
-      schema._schema.literal_value.autoform.is_wide = true;
-    } else {
-      schema._schema.literal_value.autoform.type = 'text';
-    }
-
-  }else{
-    schema._schema.literal_value.optional = true;
-  }
-}