@steedos/standard-process-approval 3.0.0-beta.2 → 3.0.0-beta.8

package/main/default/applications/process_automation.app.yml

@@ -3,47 +3,10 @@ name: Process Automation
 icon_slds: approval
 is_creator: false
 admin_menus:
-  # 分部管理员可以创建和设置流程及相关参数。
-  # - _id: process_automation
-  #   name: Process Automation
-  #   permission_sets:
-  #     - admin
-  #   expanded: false
-  #   sort: 500
   - _id: process_definition
     name: Approval Processes
     sort: 400
     permission_sets:
       - admin
     object_name: process_definition
-    parent: process_automation
-  # - _id: process_actions
-  #   name: process_actions
-  #   permission_sets:
-  #     - admin
-  #   object_name: process_actions
-  #   parent: process_automation
-  # - _id: process_steps
-  #   name: process_steps
-  #   permission_sets:
-  #     - admin
-  #   object_name: process_approvals
-  #   parent: process_automation
-  # - _id: process_flows
-  #   name: process_flows
-  #   permission_sets:
-  #     - admin
-  #   object_name: process_flows
-  #   parent: process_automation
-  # - _id: process_flows_criteria
-  #   name: process_flows_criteria
-  #   permission_sets:
-  #     - admin
-  #   object_name: process_flows_criteria
-  #   parent: process_automation
-  # - _id: process_flows_criteria_action
-  #   name: process_flows_criteria_action
-  #   permission_sets:
-  #     - admin
-  #   object_name: process_flows_criteria_action
-  #   parent: process_automation
+    parent: process_automation

package/main/default/client/core.client.js

@@ -1,34 +1,3 @@
-/*
- * @Author: baozhoutao@steedos.com
- * @Date: 2022-12-13 10:41:08
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-02-26 16:30:11
- * @Description: 
- */
-
-Steedos.getObjectsOptions = function (filterFunction) {
-    var options = [];
-    _.each(Steedos.getDisplayObjects(filterFunction), function (v, k) {
-        options.push({ label: v.label, value: v.name, icon: v.icon })
-    })
-    return options;
-}
-
-Steedos.getDisplayObjects = function(filterFunction){
-    var objects = [];
-    _.each(Creator.objectsByName, function (object, k) {
-        var filterReturn = true;
-        if (filterFunction && _.isFunction(filterFunction)) {
-            filterReturn = filterFunction(object);
-        }
-        if (filterReturn && !object.hidden && !_.includes(['cfs_instances_filerecord'], object.name)) {
-            objects.push(object)
-        }
-    })
-    objects.sort(Creator.sortingMethod.bind({key:"label"}))
-    return objects;
-}
-
 Steedos.getFieldDataTypes = function (field) {
     if(field.type === "select"){
         return [

package/main/default/client/process.client.js

@@ -4,7 +4,7 @@ Steedos.ProcessManager.showProcessApprovalForm = function(action, fields, formId
 
     var approveSchema = Creator.getObjectSchema({fields: fields})
 
-    Modal.show("quickFormModal", {formId: formId, title: title || TAPi18n.__(`process_approval_title_${action}`), confirmBtnText: `process_approval_confirmBtnText_${action}`, schema: approveSchema, doc: doc, onConfirm: onConfirm}, {
+    Modal.show("quickFormModal", {formId: formId, title: title || t(`process_approval_title_${action}`), confirmBtnText: `process_approval_confirmBtnText_${action}`, schema: approveSchema, doc: doc, onConfirm: onConfirm}, {
         backdrop: 'static',
         keyboard: true
     });
@@ -56,7 +56,7 @@ Steedos.ProcessManager.submit = function(object_name, record_id, options){
 
     var schema = {
         comment: {
-            label: TAPi18n.__('process_approval_comment'),
+            label: t('process_approval_comment'),
             type: 'textarea',
             rows: 3,
             is_wide: true
@@ -65,7 +65,7 @@ Steedos.ProcessManager.submit = function(object_name, record_id, options){
 
     if(options && options.showApprover){
         schema.approver = {
-            label: TAPi18n.__('process_approval_approver_label'),
+            label: t('process_approval_approver_label'),
             type: 'lookup',
             reference_to: 'users',
             required: true,
@@ -87,7 +87,7 @@ Steedos.ProcessManager.submit = function(object_name, record_id, options){
                     Steedos.ProcessManager.submit(object_name, record_id, {showApprover: true, value: {comment: formValues.insertDoc.comment}});
                 }, 800)
             }else{
-                toastr.error(TAPi18n.__(result.error));
+                toastr.error(t(result.error));
                 Modal.hide(t);
                 FlowRouter.reload();
             }
@@ -103,7 +103,7 @@ Steedos.ProcessManager.recall = function(object_name, record_id){
     var formId = 'processApprovalForm';
     Steedos.ProcessManager.showProcessApprovalForm('recall', {
         comment: {
-            label: TAPi18n.__('process_approval_comment'),
+            label: t('process_approval_comment'),
             type: 'textarea',
             rows: 3,
             is_wide: true
@@ -111,7 +111,7 @@ Steedos.ProcessManager.recall = function(object_name, record_id){
     }, formId, {}, function(formValues, e, t){
         var result = Steedos.authRequest(`/api/v4/process/recall/${object_name}/${record_id}`, {type: 'post', async: false, data: JSON.stringify(formValues.insertDoc)});
         if(result.state === 'FAILURE'){
-            toastr.error(TAPi18n.__(result.error));
+            toastr.error(t(result.error));
         }
         FlowRouter.reload();
         Modal.hide(t);
@@ -120,10 +120,10 @@ Steedos.ProcessManager.recall = function(object_name, record_id){
 
 Steedos.ProcessManager.approve = function(object_name, record_id, options){
     var formId = 'processApprovalForm';
-    var title = `${TAPi18n.__('process_instance_history_action_approve')}` //TODO approval record name
+    var title = `${t('process_instance_history_action_approve')}` //TODO approval record name
     var schema = {
         comment: {
-            label: TAPi18n.__('process_approval_comment'),
+            label: t('process_approval_comment'),
             type: 'textarea',
             rows: 3,
             is_wide: true
@@ -132,7 +132,7 @@ Steedos.ProcessManager.approve = function(object_name, record_id, options){
 
     if(options && options.showApprover){
         schema.approver = {
-            label: TAPi18n.__('process_approval_approver_label'),
+            label: t('process_approval_approver_label'),
             type: 'lookup',
             reference_to: 'users',
             required: true,
@@ -154,7 +154,7 @@ Steedos.ProcessManager.approve = function(object_name, record_id, options){
                     Steedos.ProcessManager.approve(object_name, record_id, {showApprover: true, value: {comment: formValues.insertDoc.comment}});
                 }, 800)
             }else{
-                toastr.error(TAPi18n.__(result.error));
+                toastr.error(t(result.error));
                 Modal.hide(t);
                 FlowRouter.reload();
             }
@@ -168,10 +168,10 @@ Steedos.ProcessManager.approve = function(object_name, record_id, options){
 
 Steedos.ProcessManager.reject = function(object_name, record_id){
     var formId = 'processApprovalForm';
-    var title = `${TAPi18n.__('process_instance_history_action_reject')}` //TODO approval record name
+    var title = `${t('process_instance_history_action_reject')}` //TODO approval record name
     Steedos.ProcessManager.showProcessApprovalForm('reject', {
         comment: {
-            label: TAPi18n.__('process_approval_comment'),
+            label: t('process_approval_comment'),
             type: 'textarea',
             rows: 3,
             is_wide: true
@@ -179,7 +179,7 @@ Steedos.ProcessManager.reject = function(object_name, record_id){
     }, formId, {}, function(formValues, e, t){
         var result = Steedos.authRequest(`/api/v4/process/reject/${object_name}/${record_id}`, {type: 'post', async: false, data: JSON.stringify(formValues.insertDoc)});
         if(result.state === 'FAILURE'){
-            toastr.error(TAPi18n.__(result.error));
+            toastr.error(t(result.error));
         }
         FlowRouter.reload();
         Modal.hide(t);
@@ -190,14 +190,14 @@ Steedos.ProcessManager.reassign = function(object_name, record_id){
     var formId = 'processApprovalForm';
     Steedos.ProcessManager.showProcessApprovalForm('reassign', {
         approver: {
-            label: TAPi18n.__('process_approval_approver_label_reassign'),
+            label: t('process_approval_approver_label_reassign'),
             type: 'lookup',
             reference_to: 'users',
             required: true,
             is_wide: true
         },
         comment: {
-            label: TAPi18n.__('process_approval_comment'),
+            label: t('process_approval_comment'),
             type: 'textarea',
             rows: 3,
             is_wide: true
@@ -205,7 +205,7 @@ Steedos.ProcessManager.reassign = function(object_name, record_id){
     }, formId, {}, function(formValues, e, t){
         var result = Steedos.authRequest(`/api/v4/process/reassign/${object_name}/${record_id}`, {type: 'post', async: false, data: JSON.stringify(formValues.insertDoc)});
         if(result.state === 'FAILURE'){
-            toastr.error(TAPi18n.__(result.error));
+            toastr.error(t(result.error));
         }
         FlowRouter.reload();
         Modal.hide(t);

package/main/default/objects/process/approval/process_definition.action.js

@@ -61,6 +61,6 @@ module.exports = {
     if (!record) {
       record = {}
     }
-    return Creator.baseObject.actions.standard_new.visible() && record.is_system;
+    return Steedos.Object.base.actions.standard_new.visible() && record.is_system;
   }
 }

package/main/default/objects/workflow-actions/action_field_updates.action.js

@@ -29,6 +29,6 @@ module.exports = {
         if(!record){
             record = {}
         }
-        return Creator.baseObject.actions.standard_new.visible() && record.is_system;
+        return Steedos.Object.base.actions.standard_new.visible() && record.is_system;
     }
 }

package/main/default/objects/workflow-actions/workflow_notifications.action.js

@@ -29,6 +29,6 @@ module.exports = {
         if(!record){
             record = {}
         }
-        return Creator.baseObject.actions.standard_new.visible() && record.is_system;
+        return Steedos.Object.base.actions.standard_new.visible() && record.is_system;
     }
 }

package/main/default/objects/workflow-actions/workflow_rule.action.js

@@ -29,6 +29,6 @@ module.exports = {
         if(!record){
             record = {}
         }
-        return Creator.baseObject.actions.standard_new.visible() && record.is_system;
+        return Steedos.Object.base.actions.standard_new.visible() && record.is_system;
     }
 }

package/main/default/services/action_field_updates.service.js

@@ -177,16 +177,16 @@ module.exports = {
                     const field = objectConfig.fields[fieldName];
                     if (field && field.type != 'boolean') {
                         options.push({
-                            label: TAPi18n.__("action_field_updates_field_operation_options_null",{},lng),
+                            label: steedosI18n.t("action_field_updates_field_operation_options_null",{},lng),
                             value: 'null',
                         })
                     }
                     options.push({
-                        label: TAPi18n.__("action_field_updates_field_operation_options_formula",{},lng),
+                        label: steedosI18n.t("action_field_updates_field_operation_options_formula",{},lng),
                         value: 'formula',
                     });
                     options.push({
-                        label: TAPi18n.__("action_field_updates_field_operation_options_literal",{},lng),
+                        label: steedosI18n.t("action_field_updates_field_operation_options_literal",{},lng),
                         value: 'literal',
                     })
                 }

package/main/default/triggers/action_field_updates.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 checkReevaluateParent = (doc)=>{
     if(doc.reevaluate_on_change && doc.target_object && doc.object_name && doc.target_object != doc.object_name){
@@ -26,129 +24,13 @@ const getInternalActionFieldUpdates = function(sourceActionFieldUpdates, filters
 
 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]]);
         checkReevaluateParent(this.doc);
     },
     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]]);
         }
         checkReevaluateParent(this.doc);
-    },
-    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 dbActionFieldUpdates = Creator.getCollection("action_field_updates").find(filters, {fields:{_id:1, name:1}}).fetch();
-
-
-        let actionFieldUpdates = [];
-        
-        if(filters.name && filters.name.$in){
-            for(let name of filters.name.$in){
-                let actionFieldUpdate = await objectql.getActionFieldUpdate(name);
-                if(actionFieldUpdate){
-                    actionFieldUpdates.push(actionFieldUpdate);
-                }
-            }
-        }else if(filters._id && !filters._id.$ne){
-            let action = await objectql.getActionFieldUpdate(filters._id);
-            if(action){
-                actionFieldUpdates.push(action);
-            }
-        }else if(fObjectName){
-            actionFieldUpdates = await objectql.getObjectActionFieldUpdates(fObjectName);
-        }else{
-            actionFieldUpdates = await objectql.getAllActionFieldUpdates();
-        }
-
-        if(filters._id && filters._id.$ne){
-            for(let neid of filters._id.$ne){
-                actionFieldUpdates = _.filter(actionFieldUpdates, function(item){
-                    return item._id !== neid
-                })
-            }
-        }
-
-        actionFieldUpdates = getInternalActionFieldUpdates(actionFieldUpdates, filters, dbActionFieldUpdates);
-
-        if(actionFieldUpdates && actionFieldUpdates.length>0){
-            this.data.values = this.data.values.concat(actionFieldUpdates)
-        }
-    },
-    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 dbActionFieldUpdates = Creator.getCollection("action_field_updates").find(filters, {fields:{_id:1, name:1}}).fetch();
-
-        let actionFieldUpdates = [];
-        
-        if(filters.name && filters.name.$in){
-            for(let name of filters.name.$in){
-                let actionFieldUpdate = await objectql.getActionFieldUpdate(name);
-                if(actionFieldUpdate){
-                    actionFieldUpdates.push(actionFieldUpdate);
-                }
-            }
-        }else if(filters._id && !filters._id.$ne){
-            let action = await objectql.getActionFieldUpdate(filters._id);
-            if(action){
-                actionFieldUpdates.push(action);
-            }
-        }else if(fObjectName){
-            actionFieldUpdates = await objectql.getObjectActionFieldUpdates(fObjectName);
-        }else{
-            actionFieldUpdates = await  objectql.getAllActionFieldUpdates();
-        }
-
-        if(filters._id && filters._id.$ne){
-            for(let neid of filters._id.$ne){
-                actionFieldUpdates = _.filter(actionFieldUpdates, function(item){
-                    return item._id !== neid
-                })
-            }
-        }
-        
-        actionFieldUpdates = getInternalActionFieldUpdates(actionFieldUpdates, filters, dbActionFieldUpdates);
-
-        if(actionFieldUpdates && actionFieldUpdates.length>0){
-            this.data.values = this.data.values + actionFieldUpdates.length
-        }
-    },
-    afterFindOne: async function(){
-        if(_.isEmpty(this.data.values)){
-            let id = this.id
-
-            let dbFieldUpdate = Creator.getCollection("action_field_updates").find({name: id}).fetch();
-            if(dbFieldUpdate && dbFieldUpdate.length > 0){
-                this.data.values = dbFieldUpdate[0];
-                return;
-            }
-
-            let actionFieldUpdate = await objectql.getActionFieldUpdate(id);
-            if(actionFieldUpdate){
-                this.data.values = actionFieldUpdate;
-            }
-        }
-    },
+    }
 }

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

@@ -1,8 +1,12 @@
+/*
+ * @Author: baozhoutao@steedos.com
+ * @Date: 2025-01-13 11:05:56
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2025-03-05 16:40:58
+ * @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;
 
 function setSpaceAndOwner(record, that){
     record['space'] = that.spaceId
@@ -28,7 +32,7 @@ const getInternalApprovalProcesses = function(sourceApprovalProcesses, filters){
 
 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]]);
 
         objectql.checkFormula(this.doc.entry_criteria, this.doc.object_name)
 
@@ -38,98 +42,5 @@ module.exports = {
         if(!this.doc.recall_record_lock){
             this.doc.recall_record_lock = 'unlock';
         }
-    },
-    beforeUpdate: async function () {
-        if(_.has(this.doc, 'object_name')){
-            var process = await objectql.getObject("process_definition").findOne(this.id);
-            if(process.object_name != this.doc.object_name){
-                throw new Error('禁止修改对象名称');
-            }
-        };
-        if (_.has(this.doc, 'name')) {
-            await util.checkAPIName(this.object_name, 'name', this.doc.name, this.id, [['is_system','!=', true]]);
-        }
-
-        objectql.checkFormula(this.doc.entry_criteria, this.doc.object_name)
-    },
-    afterFind: async function(){
-        let spaceId = this.spaceId;
-        let filters = InternalData.parserFilters(this.query.filters)
-        let approvalProcesses = [];
-        if(filters.name){
-            approvalProcess = register.getSourceApprovalProcess(filters.name);
-            if(approvalProcess){
-                approvalProcesses.push(approvalProcess);
-            }
-        }else{
-            approvalProcesses = register.getSourceApprovalProcesses();
-        }
-
-        if (filters.object_name){
-            approvalProcesses = _.where(approvalProcesses, {object_name: filters.object_name});
-        }
-
-        approvalProcesses = getInternalApprovalProcesses(approvalProcesses, filters);
-
-        if(approvalProcesses){
-            this.data.values = this.data.values.concat(approvalProcesses)
-            this.data.values = objectql.getSteedosSchema().metadataDriver.find(this.data.values, this.query, spaceId);
-        }
-    },
-    afterAggregate: async function(){
-        let filters = InternalData.parserFilters(this.query.filters)
-        let approvalProcesses = [];
-        if(filters.name){
-            approvalProcess = register.getSourceApprovalProcess(filters.name);
-            if(approvalProcess){
-                approvalProcesses.push(approvalProcess);
-            }
-        }else{
-            approvalProcesses = register.getSourceApprovalProcesses();
-        }
-
-        if (filters.object_name){
-            approvalProcesses = _.where(approvalProcesses, {object_name: filters.object_name});
-        }
-
-        approvalProcesses = getInternalApprovalProcesses(approvalProcesses, filters);
-
-        if(approvalProcesses){
-            this.data.values = this.data.values.concat(approvalProcesses)
-        }
-    },
-    afterCount: async function(){
-        let filters = InternalData.parserFilters(this.query.filters)
-        let approvalProcesses = [];
-        if(filters.name){
-            approvalProcess = register.getSourceApprovalProcess(filters.name);
-            if(approvalProcess){
-                approvalProcesses.push(approvalProcess);
-            }
-        }else{
-            approvalProcesses = register.getSourceApprovalProcesses();
-        }
-
-        if (filters.object_name){
-            approvalProcesses = _.where(approvalProcesses, {object_name: filters.object_name});
-        }
-
-        approvalProcesses = getInternalApprovalProcesses(approvalProcesses, filters);
-
-        if(approvalProcesses){
-            this.data.values = this.data.values + approvalProcesses.length
-        }
-    },
-    afterFindOne: async function(){
-        if(_.isEmpty(this.data.values)){
-            let id = this.id
-            if(id){
-                let approvalProcess = objectql.getSourceApprovalProcess(id);
-                if(approvalProcess){
-                    setSpaceAndOwner(approvalProcess, this);
-                    this.data.values = approvalProcess;
-                }
-            }
-        }
     }
 }

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

@@ -8,7 +8,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 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": "3.0.0-beta.2",
+    "version": "3.0.0-beta.8",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -10,11 +10,11 @@
         "steedos"
     ],
     "dependencies": {
-        "@steedos/process": "3.0.0-beta.2",
+        "@steedos/process": "3.0.0-beta.8",
         "nanoid": "^3.3.4"
     },
     "description": "steedos package",
     "repository": {},
     "license": "MIT",
-    "gitHead": "72fa51bda8ff714d5fdb933bf0a45ea4cb82df74"
+    "gitHead": "723d92765db5342a374c7aacb5b835e69f77ca4b"
 }

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/public/.md

@@ -1,3 +0,0 @@
-### 静态公开资源文件
-
-- 此文件夹中的文件自动添加到根路由

package/src/.md

@@ -1,3 +0,0 @@
-### src
-
-- 软件包不会加载此文件夹下的文件, 可用于存放ts文件等

package/webapp/.md

@@ -1 +0,0 @@
-- 存放web项目