@steedos/standard-process-approval 3.0.0-beta.68 → 3.0.0-beta.70

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

@@ -132,6 +132,8 @@ module.exports = {
                     delete pd._id;
                     pd.name = `pd_${nowTime}`; // 名称长度不能大于20个字符；名称只能包含小写字母、数字，必须以字母开头，不能以下划线字符结尾或包含两个连续的下划线字符
                     pd.active = false; // 批准过程已启用或者已提交过审批, 禁止添加、删除批准步骤
+                    pd.is_system = false;
+                    delete pd.record_permissions
                     let newPD = await pdObj.insert(pd);
                     let newPDID = newPD._id;
                     let pns = await pnObj.find({ filters: ['process_definition', '=', recordId] }, userSession);
@@ -145,6 +147,8 @@ module.exports = {
                         pn.created_by = userSession.userId
                         pn.modified = now;
                         pn.modified_by = userSession.userId
+                        pn.is_system = false;
+                        delete pn.record_permissions
                         await pnObj.directInsert(pn);
                     }
                     return { state: 'SUCCESS', _id: newPDID };

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

@@ -1,21 +1,78 @@
-/*
- * @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 { checkAPIName } = require('@steedos/objectql')
 const objectql = require('@steedos/objectql');
+const register = require('@steedos/metadata-registrar');
+const odataMongodb = require("@steedos/odata-v4-mongodb");
+
+function parserFilters(filters){
+    if(_.isString(filters)){
+        filters = odataMongodb.createFilter(filters)
+    }
+    let query = {};
+    if(_.isArray(filters) && filters.length > 0 && _.isArray(filters[0])){
+        _.each(filters,function(filter){
+            Object.assign(query, parserFilters(filter))
+        })
+    }else if(_.isArray(filters) && filters.length > 0){
+        if(filters[1] && filters[1] == '='){
+            let key = filters[0]
+            let value = filters[2]
+            Object.assign(query, {[key]: value})
+        }else if(filters[1] && (filters[1] == '!=' || filters[1] == '<>')){
+            let key = filters[0]
+            let value = filters[2]
+            Object.assign(query, {[key]: {$ne: value}})
+        }else if(filters[1] && filters[1] == 'in'){
+            let key = filters[0]
+            let value = filters[2]
+            Object.assign(query, {[key]: {$in: value}})
+        }else{
+            _.each(filters,function(filter){
+                let parsedFilters = parserFilters(filter);
+                if(query._id && query._id.$ne && parsedFilters._id && parsedFilters._id.$ne){
+                    parsedFilters._id.$ne = [parsedFilters._id.$ne]
+                    parsedFilters._id.$ne = parsedFilters._id.$ne.concat(query._id.$ne);
+                    delete query._id;
+                }
+                Object.assign(query, parsedFilters)
+            })
+        }
+    }else{
+        _.each(filters, function (v, k) {
+            if(_.isArray(v) && v.length > 0){
+                Object.assign(query, parserFilters(v))
+            }else{
+                if (k === '$and') {
+                    Object.assign(query, parserFilters(v))
+                } else {
+                    if(_.isArray(filters) && _.isObject(v)){
+                        Object.assign(query, v)
+                    }else{
+                        Object.assign(query, {[k]: v})
+                    }
+                }
+            }
+            
+        })
+    }
+    return query;
+}
 
 function setSpaceAndOwner(record, that){
     record['space'] = that.spaceId
     record['owner'] = that.userId
 }
 
-const getInternalApprovalProcesses = function(sourceApprovalProcesses, filters){
+const getInternalApprovalProcesses = async function(sourceApprovalProcesses, filters){
+
+
+    const datasource = objectql.getDataSource('default');
+    const adapter = datasource.adapter
+    await adapter.connect()
+    const collection = adapter.collection('process_definition');
+
     delete filters.active;
-    let dbApprovalProcesses = Creator.getCollection("process_definition").find(filters, {fields:{_id:1, name:1}}).fetch();
+    let dbApprovalProcesses = await collection.find(filters, {fields:{_id:1, name:1}}).toArray();
     let approvalProcesses = [];
 
     if(!filters.is_system){
@@ -32,7 +89,7 @@ const getInternalApprovalProcesses = function(sourceApprovalProcesses, filters){
 
 module.exports = {
     beforeInsert: async function () {
-        await objectql.checkAPIName(this.object_name, 'name', this.doc.name, undefined, [['is_system','!=', true]]);
+        await checkAPIName(this.object_name, 'name', this.doc.name, undefined, [['is_system','!=', true]]);
 
         objectql.checkFormula(this.doc.entry_criteria, this.doc.object_name)
 
@@ -42,5 +99,98 @@ 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 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 = 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 = await 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 = 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 = await getInternalApprovalProcesses(approvalProcesses, filters);
+
+        if(approvalProcesses){
+            this.data.values = this.data.values.concat(approvalProcesses)
+        }
+    },
+    afterCount: async function(){
+        let filters = 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 = await 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/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/standard-process-approval",
-    "version": "3.0.0-beta.68",
+    "version": "3.0.0-beta.70",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -10,11 +10,11 @@
         "steedos"
     ],
     "dependencies": {
-        "@steedos/process": "3.0.0-beta.68",
+        "@steedos/process": "3.0.0-beta.70",
         "nanoid": "^3.3.4"
     },
     "description": "steedos package",
     "repository": {},
     "license": "MIT",
-    "gitHead": "24d548e9275e379b7e00ae51a3f81d6b3790b52a"
+    "gitHead": "597f124ef73efa97a2da52b4de3c7d733ebd6887"
 }