@steedos-labs/plugin-workflow 3.0.12 → 3.0.13

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

@@ -6,8 +6,164 @@ icon_slds: approval
 is_creator: true
 mobile: true
 sort: 10
-tabs:
-  - object_instance_tasks
+# tabs:
+#   - object_instance_tasks
+
+showSidebar: true
+enable_nav_schema: true
+nav_schema: {
+  "type": "wrapper",
+  "size": "none",
+  "body": [
+    {
+      "type": "steedos-app-menu",
+      "stacked": true,
+      "appId": "approve_workflow",
+      "ignoreNavSchema": true
+    },
+    {
+      "type": "wrapper",
+      "size": "none",
+      "className": "instances-sidebar-wrapper mt-1",
+      "body": [
+        {
+          "type": "service",
+          "id": "u:instanceNav",
+          "className": "bg-none",
+          "onEvent": {
+            "@data.changed.instances": {
+              "actions": [
+                {
+                  "actionType": "reload"
+                }
+              ]
+            }
+          },
+          "body": [
+            {
+              "type": "button",
+              "label": "刷新",
+              "className": "instance-nav-reload hidden",
+              "onEvent": {
+                "click": {
+                  "actions": [
+                    {
+                      "actionType": "reload",
+                      "componentId": "u:instanceNav"
+                    }
+                  ]
+                }
+              }
+            },
+            {
+              "type": "input-tree",
+              "name": "tree",
+              "treeContainerClassName": "h-full",
+              "className": "instance-box-tree h-full w-full p-0",
+              "id": "u:9f3dd961ca12",
+              "stacked": true,
+              "multiple": false,
+              "enableNodePath": false,
+              "hideRoot": true,
+              "showIcon": true,
+              "initiallyOpen": false,
+              "virtualThreshold": 100000,
+              "value": "${value}",
+              "size": "md",
+              "onEvent": {
+                "change": {
+                  "actions": [
+                    {
+                      "actionType": "setValue",
+                      "componentId": "instances_list_service",
+                      "args": {
+                        "value": {
+                          "isFlowDataDone": false
+                        }
+                      }
+                    },
+                    {
+                      "actionType": "custom",
+                      "script": "//获取上一次的flowId和categoryId\nconst lastFlowId = event.data.flowId;\nconst lastCategoryId = event.data.categoryId;\n//从value中获取最新的flowId\nvar flowIdRegex = /&flowId=([^&]+)/;\nvar flowIdMatch = event.data.value.match(flowIdRegex);\nconst flowId = flowIdMatch && flowIdMatch.length > 0 ? flowIdMatch[1] : \"\";\n//从value中获取最新的categoryId\nvar categoryIdRegex = /&categoryId=([^&]+)/;\nvar categoryIdMatch = event.data.value.match(categoryIdRegex);\nconst categoryId = categoryIdMatch && categoryIdMatch.length > 0 ? categoryIdMatch[1] : \"\";\n//获取上一次的listname和最新的listname\nconst lastListName = event.data.listName;\nconst listName = event.data.value.split('?')[0].split('instances/grid/')[1];\n//切换流程时清除过滤条件\nif (lastListName == \"monitor\" && listName == \"monitor\" && (flowId != lastFlowId || categoryId != lastCategoryId)) {\n  listViewPropsStoreKey = window.location.pathname + \"/crud\";\n  sessionStorage.removeItem(listViewPropsStoreKey);\n  sessionStorage.removeItem(listViewPropsStoreKey + \"/query\");\n}"
+                    },
+                    {
+                      "actionType": "setValue",
+                      "componentId": "instances_list_service",
+                      "args": {
+                        "value": {
+                          "additionalFilters": [
+                            "${event.data.options.name}",
+                            "=",
+                            "${event.data.options.value}"
+                          ]
+                        }
+                      },
+                      "expression": "${event.data.options.level>=10}"
+                    },
+                    {
+                      "args": {
+                        "link": "${event.data.value}",
+                        "blank": false
+                      },
+                      "actionType": "link"
+                    }
+                  ]
+                }
+              },
+              "menuTpl": {
+                "type": "wrapper",
+                "className": "flex flex-row  p-0 m-0",
+                "body": [
+                  {
+                    "type": "tpl",
+                    "className": "flex-1 w-6/12",
+                    "tpl": "${label}",
+                    "id": "u:9dee51f00db4"
+                  },
+                  {
+                    "type": "tpl",
+                    "className": "-mx-11 ",
+                    "tpl": "",
+                    "badge": {
+                      "className": "h-0",
+                      "offset": [
+                        -20,
+                        12
+                      ],
+                      "mode": "text",
+                      "text": "${tag | toInt}",
+                      "overflowCount": 999
+                    },
+                    "id": "u:2329cd1fecc2"
+                  }
+                ],
+                "id": "u:545154bcc334"
+              },
+              "unfoldedLevel": 2,
+              "source": "${options}"
+            }
+          ],
+          "api": {
+            "method": "get",
+            "url": "${context.rootUrl}/api/${appId}/workflow/nav",
+            "headers": {
+              "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+            },
+            "messages": {},
+            "adaptor": "payload.data.value = window.location.pathname + decodeURIComponent(window.location.search); return payload;"
+          },
+          "messages": {},
+          "dsType": "api"
+        }
+      ],
+      "isFixedHeight": false,
+      "isFixedWidth": false
+    }
+  ],
+  "isFixedHeight": false,
+  "isFixedWidth": false
+}
+
 admin_menus:
   # 分部管理员可以创建和设置流程及相关参数。
   - _id: menu_workflow
@@ -86,4 +242,4 @@ admin_menus:
     permission_sets:
       - admin
     object_name: object_workflows
-    parent: menu_workflow
+    parent: menu_workflow

package/main/default/manager/handlers_manager.js

@@ -787,7 +787,7 @@ getHandlersManager.getHandlers = async function (instance_id, step_id, login_use
         users = applicantSuperiors;
     }
 
-    await excuteTriggers(login_user_id, flow_id, instance_id, current_step, users);
+    await excuteTriggers({ when: 'cacluateNextStepUsers', userId: login_user_id, flowId: flow_id, insId: instance_id, nextStep: current_step, nextUserIds: users });
     return users;
 };
 

package/main/default/manager/instance_number_rules.js

@@ -0,0 +1,84 @@
+/*
+ * @Author: sunhaolin@hotoa.com
+ * @Date: 2022-12-22 15:02:53
+ * @LastEditors: sunhaolin@hotoa.com
+ * @LastEditTime: 2022-12-22 15:03:32
+ * @Description: 
+ */
+var _eval;
+
+_eval = require('eval');
+const { getCollection } = require('../utils/collection');
+const _ = require('lodash');
+module.exports = {
+    instanceNumberBuilder: async function (spaceId, name) {
+        var _NUMBER, _YYYY, context, date, e, numberRules, padding, res, rules, script;
+        const db = await getCollection("instance_number_rules");
+        numberRules = await db.findOne({
+            space: spaceId,
+            name: name
+        });
+        if (!numberRules) {
+            throw new Meteor.Error('error!', `${name}`);
+        }
+        date = new Date();
+        context = {};
+        context._ = _;
+        _YYYY = date.getFullYear();
+        _NUMBER = (numberRules.number || 0) + 1;
+        context.YYYY = _.clone(_YYYY);
+        context.MM = date.getMonth() + 1;
+        context.mm = date.getMonth() + 1;
+        if (context.MM < 10) {
+            context.MM = "0" + context.MM;
+        }
+        context.DD = date.getDate();
+        context.dd = date.getDate();
+        if (context.DD < 10) {
+            context.DD = "0" + context.DD;
+        }
+        if (context.YYYY !== numberRules.year) {
+            _NUMBER = numberRules.first_number || 1;
+        }
+        let pLenConst = process.env.STEEDOS_WORKFLOW_INSTANCE_NUMBER_RULES_PADDING_LEN
+        let paddingLen = 5
+        if (pLenConst) {
+            const _paddingLen = parseInt(pLenConst);
+            if (_paddingLen >= 0) { // 处理 _paddingLen 值为NaN的情况
+                paddingLen = _paddingLen
+            }
+        }
+        padding = function (num, length) {
+            if (length == 0) {
+                return num;
+            }
+            var diff, len;
+            len = (num + '').length;
+            diff = length - len;
+            if (diff > 0) {
+                return Array(diff + 1).join('0') + num;
+            }
+            return num;
+        };
+        context.NUMBER = padding(_.clone(_NUMBER), paddingLen);
+        rules = numberRules.rules.replace("{YYYY}", "' + YYYY + '").replace("{MM}", "' + MM + '").replace("{NUMBER}", "' + NUMBER + '");
+        script = `var newNo = '${rules}'; exports.newNo = newNo`;
+        try {
+            res = _eval(script, "newNo", context, false).newNo;
+            await db.update({
+                _id: numberRules._id
+            }, {
+                $set: {
+                    year: _YYYY,
+                    number: _NUMBER
+                }
+            });
+        } catch (error) {
+            e = error;
+            res = {
+                _error: e
+            };
+        }
+        return res;
+    }
+};

package/main/default/manager/instance_tasks_manager.js

@@ -40,6 +40,39 @@ async function _count(query) {
     return await getObject('instance_tasks').count(query);
 }
 
+/**
+ * 更新相关通知为已读
+ * @param {String} instance 申请单ID
+ * @param {String} handler 处理人ID
+ */
+async function _updateNotificationsAsRead(instance, handler) {
+    const notificationsObj = getObject('notifications')
+    await notificationsObj.directUpdateMany([
+        ['owner', '=', handler],
+        ['is_read', '!=', true],
+        ['related_to.o', '=', 'instances'],
+        ['related_to.ids', '=', instance]
+    ], {
+        is_read: true
+    })
+}
+
+/**
+ * 更新相关通知为已删除
+ * @param {String} instance 申请单ID
+ * @param {String} handler 处理人ID
+ */
+async function _updateNotificationsAsDeleted(instance, handler) {
+    const notificationsObj = getObject('notifications')
+    await notificationsObj.directUpdateMany([
+        ['owner', '=', handler],
+        ['related_to.o', '=', 'instances'],
+        ['related_to.ids', '=', instance]
+    ], {
+        is_deleted: true
+    })
+}
+
 /**
  * 新增instance_tasks记录
  * @param {String} insId 申请单ID
@@ -90,6 +123,16 @@ async function update_instance_tasks(insId, traceId, approveId, doc) {
         delete taskDoc._id
     }
     const result = await _update(approveId, taskDoc)
+    
+    // 如果任务已完成，更新相关通知为已读
+    if (taskDoc.is_finished) {
+        const instance = taskDoc.instance || insId
+        const handler = taskDoc.handler
+        if (instance && handler) {
+            await _updateNotificationsAsRead(instance, handler)
+        }
+    }
+    
     return result
 }
 
@@ -114,6 +157,15 @@ async function update_many_instance_tasks(insId, traceId, approveIds, keys) {
         }
         const result = await _update(aId, taskDoc)
         results.push(result)
+        
+        // 如果任务已完成，更新相关通知为已读
+        if (taskDoc.is_finished) {
+            const instance = taskDoc.instance || insId
+            const handler = taskDoc.handler
+            if (instance && handler) {
+                await _updateNotificationsAsRead(instance, handler)
+            }
+        }
     }
     return results
 }
@@ -124,7 +176,18 @@ async function update_many_instance_tasks(insId, traceId, approveIds, keys) {
  * @returns 1
  */
 async function remove_instance_tasks(approveId) {
+    // 删除前先获取任务信息用于更新通知
+    const taskDoc = await getObject('instance_tasks').findOne(approveId)
     const result = await _remove(approveId)
+    
+    // 删除任务后，更新相关通知为已删除
+    if (taskDoc) {
+        const { instance, handler } = taskDoc
+        if (instance && handler) {
+            await _updateNotificationsAsDeleted(instance, handler)
+        }
+    }
+    
     return result
 }
 
@@ -136,8 +199,18 @@ async function remove_instance_tasks(approveId) {
 async function remove_many_instance_tasks(approveIds) {
     const results = []
     for (const aId of approveIds) {
+        // 删除前先获取任务信息用于更新通知
+        const taskDoc = await getObject('instance_tasks').findOne(aId)
         const r = await _remove(aId)
         results.push(r)
+        
+        // 删除任务后，更新相关通知为已删除
+        if (taskDoc) {
+            const { instance, handler } = taskDoc
+            if (instance && handler) {
+                await _updateNotificationsAsDeleted(instance, handler)
+            }
+        }
     }
     return results
 }
@@ -153,11 +226,16 @@ async function remove_instance_tasks_by_instance_id(insId) {
         filters: [
             ['instance', '=', insId]
         ],
-        fields: ['_id']
+        fields: ['_id', 'instance', 'handler']
     })
     for (const t of taskDocs) {
         const r = await _remove(t._id)
         results.push(r)
+        
+        // 删除任务后，更新相关通知为已删除
+        if (t.instance && t.handler) {
+            await _updateNotificationsAsDeleted(t.instance, t.handler)
+        }
     }
     return results
 }

package/main/default/manager/uuflow_manager.js

@@ -557,7 +557,7 @@ UUFlowManager.isFlowSpaceMatched = function (flow, space_id) {
     }
 };
 
-const isAmisFormula = (formula) => {
+UUFlowManager.isAmisFormula = (formula) => {
   // 有${}包裹的表达式就识别为amis公式
   return /\$\{.+\}/.test(formula);
 };
@@ -796,6 +796,57 @@ function isSkipStep(instance, step) {
     return instance.skip_steps?.includes(step._id);
 }
 
+UUFlowManager.initFormulaValues = async function (instance, values) {
+    // Get values for condition calculation
+    let __values = values !== undefined ? values : UUFlowManager.getUpdatedValues(instance);
+    
+    // Get current and start approve
+    let current_approve = null;
+    let start_approve = null;
+    
+    for (const trace of instance.traces) {
+        if (trace.is_finished === false) {
+            current_approve = trace.approves[0];
+        }
+        if (!trace.previous_trace_ids || trace.previous_trace_ids.length === 0) {
+            start_approve = trace.approves[0];
+        }
+    }
+    
+    // Set variables for condition evaluation
+    __values["applicant"] = {
+        roles: await UUFlowManager.getUserRoles(instance.applicant, instance.space),
+        name: instance.applicant_name,
+        organization: {
+            fullname: instance.applicant_organization_fullname,
+            name: instance.applicant_organization_name
+        },
+        id: instance.applicant
+    };
+    
+    __values["submitter"] = {
+        roles: await UUFlowManager.getUserRoles(start_approve.handler, instance.space),
+        name: start_approve.handler_name,
+        organization: {
+            fullname: start_approve.handler_organization_fullname,
+            name: start_approve.handler_organization_name
+        },
+        id: start_approve.handler
+    };
+    
+    __values["approver"] = {
+        roles: await UUFlowManager.getUserRoles(current_approve.handler, instance.space),
+        name: current_approve.handler_name,
+        organization: {
+            fullname: current_approve.handler_organization_fullname,
+            name: current_approve.handler_organization_name
+        },
+        id: current_approve.handler
+    };
+
+    return __values;
+}
+
 /**
  * Get next steps for instance
  * @param {Object} instance - Instance object
@@ -810,49 +861,8 @@ UUFlowManager.getNextSteps = async function (instance, flow, step, judge, values
     let nextSteps = [];
     
     if (step_type === "condition") {
-        // Get values for condition calculation
-        let __values = values !== undefined ? values : UUFlowManager.getUpdatedValues(instance);
-        
-        // Get current and start approve
-        let current_approve = null;
-        let start_approve = null;
-        
-        for (const trace of instance.traces) {
-            if (trace.is_finished === false) {
-                current_approve = trace.approves[0];
-            }
-            if (!trace.previous_trace_ids || trace.previous_trace_ids.length === 0) {
-                start_approve = trace.approves[0];
-            }
-        }
-        
-        // Set variables for condition evaluation
-        __values["applicant"] = {
-            roles: await UUFlowManager.getUserRoles(instance.applicant, instance.space),
-            name: instance.applicant_name,
-            organization: {
-                fullname: instance.applicant_organization_fullname,
-                name: instance.applicant_organization_name
-            }
-        };
-        
-        __values["submitter"] = {
-            roles: await UUFlowManager.getUserRoles(start_approve.handler, instance.space),
-            name: start_approve.handler_name,
-            organization: {
-                fullname: start_approve.handler_organization_fullname,
-                name: start_approve.handler_organization_name
-            }
-        };
-        
-        __values["approver"] = {
-            roles: await UUFlowManager.getUserRoles(current_approve.handler, instance.space),
-            name: current_approve.handler_name,
-            organization: {
-                fullname: current_approve.handler_organization_fullname,
-                name: current_approve.handler_organization_name
-            }
-        };
+
+        const __values = await UUFlowManager.initFormulaValues(instance, values);
         
         // Get form and form version
         const form = await UUFlowManager.getForm(instance.form);
@@ -875,7 +885,7 @@ UUFlowManager.getNextSteps = async function (instance, flow, step, judge, values
             if (step_line.state === "submitted") {
                 let step_line_condition = step_line.condition;
                 let allow = false;
-                if (isAmisFormula(step_line_condition)) {
+                if (UUFlowManager.isAmisFormula(step_line_condition)) {
                     allow = UUFlowManager.calculateConditionWithAmis(__values, step_line_condition);
                 }
                 else {

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

@@ -37,9 +37,9 @@ amis_schema: |-
                         {
                           "type": "tpl",
                           "tpl": "当前步骤: <p class='font-medium inline'>${record.currentStep.name}</p>",
-                          "inline": true,
-                          "wrapperComponent": "",
-                          "id": "u:1f7dd93080d3"
+                          "inline": false,
+                          "id": "u:1f7dd93080d3",
+                          "className": "m-b-sm"
                         },
                         {
                           "type": "steedos-select-user",
@@ -57,7 +57,8 @@ amis_schema: |-
                           "id": "u:bffe87a42168",
                           "minRows": 3,
                           "maxRows": 20,
-                          "placeholder": "请填写重定位的理由"
+                          "placeholder": "请填写重定位的理由",
+                          "className": "m-t-sm"
                         }
                       ],
                       "id": "u:1779a48caedb",

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

@@ -1,104 +1,6 @@
 {
   "type": "page",
-  "body": [{
-      "type": "wrapper",
-      "visibleOn": "${AND(display != 'split', ${window:innerWidth > 768},!!!_inDrawer)}",
-      "className": "bg-white p-0 flex-shrink-0 min-w-[240px] lg:order-first lg:flex lg:flex-col rounded shadow my-4 ml-4 mr-1 my-4 sm:rounded",
-      "body": [{
-        "type": "service",
-        "className": "w-full h-full",
-        "onEvent": {
-          "@data.changed.steedos_keyvalues": {
-            "actions": [{
-              "actionType": "reload"
-            }]
-          }
-        },
-        "body": [
-        {
-          "type": "button",
-          "label": "刷新",
-          "className": "instance-nav-reload hidden",
-          "onEvent": {
-              "click": {
-                "actions": [{
-                "actionType": "reload",
-                "componentId": "u:instanceNav"
-              }]
-            }
-          }
-        },
-        {
-          "type": "input-tree",
-          "treeContainerClassName": "h-full",
-          "name": "tree",
-          "className": "instance-box-tree w-full",
-          "id": "u:9f3dd961ca12",
-          "stacked": true,
-          "multiple": false,
-          "enableNodePath": false,
-          "hideRoot": true,
-          "showIcon": true,
-          "initiallyOpen": false,
-          "virtualThreshold": 100000,
-          "value": "/app/${appId}/${objectName}/grid/${listName}",
-          "size": "md",
-          "onEvent": {
-            "change": {
-              "actions": [{
-                "args": {
-                  "link": "${event.data.value}",
-                  "blank": false
-                },
-                "actionType": "link"
-              }]
-            }
-          },
-          "menuTpl": {
-            "type": "wrapper",
-            "className": "flex flex-row  p-0 m-0",
-            "body": [{
-                "type": "tpl",
-                "className": "flex-1 w-6/12",
-                "tpl": "${label}",
-                "id": "u:8147616a7b50"
-              },
-              {
-                "type": "tpl",
-                "className": "-mx-11 ",
-                "tpl": "",
-                "badge": {
-                  "className": "h-0",
-                  "offset": [
-                    -20,
-                    12
-                  ],
-                  "mode": "text",
-                  "text": "${tag | toInt}",
-                  "overflowCount": 999
-                },
-                "id": "u:94f078e62361"
-              }
-            ],
-            "id": "u:decad07ad26b"
-          },
-          "unfoldedLevel": 2,
-          "source": "${options}"
-        }],
-        "id": "u:instanceNav",
-        "api": {
-          "method": "get",
-          "url": "${context.rootUrl}/api/${appId}/workflow/nav",
-          "headers": {
-            "Authorization": "Bearer ${context.tenantId},${context.authToken}"
-          }
-        },
-        "dsType": "api"
-      }],
-      "mobile": {
-        "visibleOn": "false"
-      }
-    },
+  "body": [
     {
       "type": "button",
       "label": "刷新",