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

package/main/default/pages/workflow_rule_form.page.yml

@@ -0,0 +1,13 @@
+name: workflow_rule_form
+is_active: true
+label: 工作流规则表单
+locked: false
+object_name: workflow_rule
+pageAssignments:
+  - type: orgDefault
+    page: workflow_rule_form
+    desktop: true
+    mobile: true
+render_engine: amis
+type: form
+widgets: []

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

@@ -1,11 +1,12 @@
 /*
  * @Author: sunhaolin@hotoa.com
  * @Date: 2022-12-14 10:26:50
- * @LastEditors: sunhaolin@hotoa.com
- * @LastEditTime: 2022-12-14 17:15:10
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2025-05-13 12:14:22
  * @Description: 
  */
 const { getObjectProcessDefinition, recordSubmit } = require('@steedos/process')
+const objectql = require('@steedos/objectql');
 "use strict";
 /**
  * @typedef {import('moleculer').Context} Context Moleculer's Context
@@ -89,6 +90,73 @@ module.exports = {
             }
         },
 
+        /**
+         * @api {call} copy 复制
+         * @apiVersion 0.0.0
+         * @apiName copy
+         * @apiGroup approval_process.service.js
+         * @apiBody {String} recordId 记录ID
+         * @apiSuccess {String} state 返回复制结果
+         * @apiSuccessExample {json} Success-Response:
+         *     HTTP/1.1 200 OK
+         *     {
+         *       "state": "SUCCESS",
+         *       _id: newPDID
+         *     }
+         * @apiErrorExample {json} Error-Response:
+         *     HTTP/1.1 200 OK
+         *     {
+         *       "state": "FAILURE",
+         *       "error": ""
+         *     }
+         */
+        copy: {
+            // 访问地址： GET /service/api/approval_process/process_definition/:recordId/copy
+            rest: {
+                method: "GET",
+                path: '/process_definition/:recordId/copy'
+            },
+            params: {
+                recordId: { type: 'string' }
+            },
+            async handler(ctx) {
+                try {
+                    this.broker.logger.info('[service][approval_process]===>', 'process_definition/:recordId/copy', ctx.params.name, ctx.params.recordId)
+                    const userSession = ctx.meta.user;
+                    const params = ctx.params;
+                    const recordId = params.recordId;
+                    const pdObj = objectql.getObject('process_definition');
+                    const pnObj = objectql.getObject('process_node');
+                    const nowTime = new Date().getTime();
+                    let pd = await pdObj.findOne(recordId, undefined, userSession);
+                    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);
+                    for (let index = 0; index < pns.length; index++) {
+                        let pn = pns[index];
+                        delete pn._id;
+                        pn.process_definition = newPDID;
+                        pn.name = `pn_${nowTime}_${index}`;
+                        const now = new Date();
+                        pn.created = now;
+                        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 };
+                } catch (error) {
+                    return { state: 'FAILURE', error: error.message };
+                }
+            }
+        }
     },
 
     /**

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/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 t('process_approval_empty_node_title', {}, lng);
+  return steedosI18n.t('process_approval_empty_node_title', {}, lng);
 }
 
 module.exports = {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/standard-process-approval",
-    "version": "3.0.0-beta.8",
+    "version": "3.0.0-beta.80",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -10,11 +10,11 @@
         "steedos"
     ],
     "dependencies": {
-        "@steedos/process": "3.0.0-beta.8",
+        "@steedos/process": "3.0.0-beta.80",
         "nanoid": "^3.3.4"
     },
     "description": "steedos package",
     "repository": {},
     "license": "MIT",
-    "gitHead": "723d92765db5342a374c7aacb5b835e69f77ca4b"
+    "gitHead": "32e451dcb9225c8968200081644d507bb67ebe17"
 }

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;
-  }
-}

package/main/default/client/workflow_notifications.client.js

@@ -1,74 +0,0 @@
-Steedos.WorkflowNotificationsManager = {};
-
-Steedos.WorkflowNotificationsManager.changeSchema = function (doc, schema) {
-  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("workflow_notifications_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("workflow_notifications_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("workflow_notifications_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("workflow_notifications_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("workflow_notifications_field__error_workflow_rule_object_required"));
-    }
-  }
-}