npm - @steedos-labs/plugin-workflow - Versions diffs - 3.0.53 → 3.0.55 - Mend

@steedos-labs/plugin-workflow 3.0.53 → 3.0.55

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (15) hide show

package/designer/dist/index.html CHANGED Viewed

@@ -5,8 +5,8 @@
     <link rel="shortcut icon" type="image/svg+xml" href="/images/logo.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>designer</title>
-    <script type="module" crossorigin src="/api/workflow/designer-v2/assets/index-3PKde6SC.js"></script>
-    <link rel="stylesheet" crossorigin href="/api/workflow/designer-v2/assets/index-xR8ApdWL.css">
+    <script type="module" crossorigin src="/api/workflow/designer-v2/assets/index-CBj3S4BT.js"></script>
+    <link rel="stylesheet" crossorigin href="/api/workflow/designer-v2/assets/index-BNulYl_s.css">
   </head>
   <body>
     <div id="root"></div>

package/main/default/manager/import.js CHANGED Viewed

@@ -94,7 +94,7 @@ async function upgradeForm(formId, form, currentUserId, spaceId) {
         pass = recordsCount > 0;
     }
-    if (pass === true) {
+    if (pass === true || true) {
         formUpdateObj.$push = { 'historys': ff["current"] };
         current._id = _makeNewID();
         current._rev = ff["current"]["_rev"] + 1;
@@ -210,7 +210,7 @@ async function upgradeFlow(flowCome, userId, flowId) {
     });
     pass = insCount > 0;
-    if (pass === true && flow.current.start_date && stepsStr === flowComeStepsStr) {
+    if (pass === true && flow.current.start_date && stepsStr === flowComeStepsStr || true) {
         updateObj.$push = { 'historys': flow.current };
         current = {
             '_id': _makeNewID(),

package/main/default/manager/push_manager.js CHANGED Viewed

@@ -374,154 +374,134 @@ pushManager.getSmsBody = function (parameters, lang = "zh-CN") {
     return t('instance.sms.submit_pending_inbox', parameters, lang);
 };
+const BADGE_SEND_FROM_WHITELIST = new Set([
+    'first_submit_inbox', 'submit_pending_rejected_inbox',
+    'submit_pending_inbox', 'current_user', 'terminate_approval',
+    'reassign_new_inbox_users', 'trace_approve_cc', 'trace_approve_cc_submit',
+    'auto_submit_pending_inbox', 'return_pending_inbox'
+]);
 pushManager.get_badge = async function (send_from, user_id) {
-    if (!['first_submit_inbox', 'submit_pending_rejected_inbox',
-        'submit_pending_inbox', 'current_user', 'terminate_approval',
-        'reassign_new_inbox_users', 'trace_approve_cc', 'trace_approve_cc_submit',
-        'auto_submit_pending_inbox', 'return_pending_inbox'].includes(send_from)) {
-        return null;
-    }
-    if (!user_id) {
+    if (!BADGE_SEND_FROM_WHITELIST.has(send_from) || !user_id) {
         return null;
     }
     let badge = 0;
-    const db = {
-        space_users: await getCollection('space_users'),
-        categories: await getCollection('categories'),
-        steedos_keyvalues: await getCollection('steedos_keyvalues')
-    }
-    let user_spaces = await db.space_users.find({
-        user: user_id,
-        user_accepted: true
-    }, {
-        fields: {space: 1}
-    }).toArray();
+    const [spaceUsersCol, categoriesCol, keyvaluesCol] = await Promise.all([
+        getCollection('space_users'),
+        getCollection('categories'),
+        getCollection('steedos_keyvalues')
+    ]);
-    for (const user_space of user_spaces) {
-        var appCategories, c, categories, ref4, sk, sk_new, spaceId;
-        spaceId = user_space.space;
+    const badgeQuery = { user: user_id, key: 'badge' };
+    const badgeFields = { fields: { _id: 1, value: 1 } };
-        categories = await db.categories.find({
-            space: spaceId,
-            app: {
-                $ne: null
-            }
-        }, {
-            fields: { app: 1 }
-        }).toArray();
+    const userSpaces = await spaceUsersCol.find(
+        { user: user_id, user_accepted: true },
+        { fields: { space: 1 } }
+    ).toArray();
+    for (const userSpace of userSpaces) {
+        const spaceId = userSpace.space;
+        // 按 app 分组的 category badge 更新
+        const categories = await categoriesCol.find(
+            { space: spaceId, app: { $ne: null } },
+            { fields: { app: 1 } }
+        ).toArray();
         if (categories.length > 0) {
-            appCategories = _.groupBy(categories, 'app');
+            const appCategories = _.groupBy(categories, 'app');
             for (const appName in appCategories) {
-                const categorys = appCategories[appName]
-                var _set, appKeyValue, appKeyValueNew, categoryBadge, categorysIds, ref4;
-                categorysIds = _.pluck(categorys, '_id');
-                if (appName) {
-                    if (categorysIds.length > 0) {
-                        categoryBadge = await count_instance_tasks({
-                            filters: [
-                                ['handler', '=', user_id],
-                                ['is_finished', '=', false],
-                                ['space', '=', spaceId],
-                                ['category', 'in', categorysIds],
-                            ]
-                        })
-                        appKeyValue = await db.steedos_keyvalues.findOne({
-                            user: user_id,
-                            space: user_space.space,
-                            key: 'badge'
-                        }, {
-                            fields: {
-                                _id: 1,
-                                value: 1
-                            }
+                if (!appName) continue;
+                const categoryIds = _.pluck(appCategories[appName], '_id');
+                if (categoryIds.length === 0) continue;
+                const categoryBadge = await count_instance_tasks({
+                    filters: [
+                        ['handler', '=', user_id],
+                        ['is_finished', '=', false],
+                        ['space', '=', spaceId],
+                        ['category', 'in', categoryIds],
+                    ]
+                });
+                const appKeyValue = await keyvaluesCol.findOne(
+                    { ...badgeQuery, space: spaceId },
+                    badgeFields
+                );
+                if (appKeyValue) {
+                    if (appKeyValue.value?.[appName] !== categoryBadge) {
+                        await getObject('steedos_keyvalues').update(appKeyValue._id, {
+                            [`value.${appName}`]: categoryBadge
                         });
-                        if (appKeyValue) {
-                            if (((ref4 = appKeyValue.value) != null ? ref4[appName] : void 0) !== categoryBadge) {
-                                _set = {};
-                                _set['value.' + appName] = categoryBadge;
-                                await getObject('steedos_keyvalues').update(appKeyValue._id, _set)
-                                continue;
-                            }
-                        } else {
-                            appKeyValueNew = {};
-                            appKeyValueNew.user = user_id;
-                            appKeyValueNew.space = user_space.space;
-                            appKeyValueNew.key = 'badge';
-                            appKeyValueNew.value = {};
-                            appKeyValueNew.value[appName] = categoryBadge;
-                            await getObject('steedos_keyvalues').insert(appKeyValueNew)
-                            continue;
-                        }
                     }
+                } else {
+                    await getObject('steedos_keyvalues').insert({
+                        user: user_id,
+                        space: spaceId,
+                        key: 'badge',
+                        value: { [appName]: categoryBadge }
+                    });
                 }
             }
         }
         // workflow 记录所有待办数量
-        c = await count_instance_tasks({
+        const taskCount = await count_instance_tasks({
             filters: [
                 ['handler', '=', user_id],
                 ['is_finished', '=', false],
                 ['space', '=', spaceId],
             ]
-        })
-        badge += c;
-        sk = await db.steedos_keyvalues.findOne({
-            user: user_id,
-            space: user_space.space,
-            key: 'badge'
-        }, {
-            fields: {
-                _id: 1,
-                value: 1
-            }
         });
+        badge += taskCount;
+        const sk = await keyvaluesCol.findOne(
+            { ...badgeQuery, space: spaceId },
+            badgeFields
+        );
         if (sk) {
-            if (((ref4 = sk.value) != null ? ref4.workflow : void 0) !== c) {
+            if (sk.value?.workflow !== taskCount) {
                 await getObject('steedos_keyvalues').update(sk._id, {
-                    'value.workflow': c
-                })
+                    'value.workflow': taskCount
+                });
                 continue;
             }
         } else {
-            sk_new = {};
-            sk_new.user = user_id;
-            sk_new.space = user_space.space;
-            sk_new.key = 'badge';
-            sk_new.value = {
-                'workflow': c
-            };
-            await getObject('steedos_keyvalues').insert(sk_new);
+            await getObject('steedos_keyvalues').insert({
+                user: user_id,
+                space: spaceId,
+                key: 'badge',
+                value: { workflow: taskCount }
+            });
             continue;
         }
     }
-    sk_all = await db.steedos_keyvalues.findOne({
-        user: user_id,
-        space: null,
-        key: 'badge'
-    }, {
-        fields: {
-            _id: 1
-        }
-    });
-    if (sk_all) {
-        await getObject('steedos_keyvalues').update(sk_all._id, {
+    // 更新跨 space 的全局 badge
+    const skAll = await keyvaluesCol.findOne(
+        { ...badgeQuery, space: null },
+        { fields: { _id: 1 } }
+    );
+    if (skAll) {
+        await getObject('steedos_keyvalues').update(skAll._id, {
             'value.workflow': badge
         });
     } else {
-        sk_all_new = {};
-        sk_all_new.user = user_id;
-        sk_all_new.space = null;
-        sk_all_new.key = 'badge';
-        sk_all_new.value = {
-            'workflow': badge
-        };
-        await getObject('steedos_keyvalues').insert(sk_all_new)
+        await getObject('steedos_keyvalues').insert({
+            user: user_id,
+            space: null,
+            key: 'badge',
+            value: { workflow: badge }
+        });
     }
     return badge;
 };

package/main/default/manager/uuflow_manager.js CHANGED Viewed

@@ -864,7 +864,7 @@ UUFlowManager.initFormulaValues = async function (instance, values) {
  * @param {Object} values - Form values
  * @returns {Array} Array of next step IDs
  */
-UUFlowManager.getNextSteps = async function (instance, flow, step, judge, values) {
+UUFlowManager.getNextSteps = async function (instance, flow, step, judge, values, showSkipStep=false) {
     const step_type = step.step_type;
     let nextSteps = [];
@@ -1001,7 +1001,7 @@ UUFlowManager.getNextSteps = async function (instance, flow, step, judge, values
     for (const nextStepId of nextSteps) {
         const _step = await UUFlowManager.getStep(instance, flow, nextStepId);
-        if (isSkipStep(instance, _step)) {
+        if (!showSkipStep && isSkipStep(instance, _step)) {
             if (!judge && _step.step_type === 'sign') {
                 judge = 'approved';
             }

package/main/default/objects/instances/buttons/instance_export.button.js ADDED Viewed

@@ -0,0 +1,10 @@
+module.exports = {
+    instance_exportVisible: function (object_name, record_id, record_permissions, data) {
+        var box = data.listName;
+        var flowId = data.flowId;
+        if (box === "monitor" && flowId) {
+            return true;
+        }
+        return false;
+    }
+}

package/main/default/objects/instances/buttons/instance_export.button.yml ADDED Viewed

@@ -0,0 +1,83 @@
+name: instance_export
+amis_schema: |-
+  {
+    "type": "service",
+    "body": [
+      {
+        "type": "dropdown-button",
+        "label": "导出",
+        "id": "u:instance_export",
+        "level": "default",
+        "icon": "fa fa-download",
+        "buttons": [
+          {
+            "type": "button",
+            "label": "本月",
+            "onEvent": {
+              "click": {
+                "actions": [
+                  {
+                    "actionType": "custom",
+                    "script": "var spaceId = event.data.context.tenantId; var flowId = event.data.flowId; if(spaceId && flowId){ var timezoneoffset = new Date().getTimezoneOffset(); var url = Steedos.absoluteUrl('/api/workflow/export/instances?space_id=' + spaceId + '&flow_id=' + flowId + '&type=0&timezoneoffset=' + timezoneoffset); window.open(url, '_blank'); } else { window.toastr && window.toastr.warning('请先选择流程'); }"
+                  }
+                ]
+              }
+            }
+          },
+          {
+            "type": "button",
+            "label": "上月",
+            "onEvent": {
+              "click": {
+                "actions": [
+                  {
+                    "actionType": "custom",
+                    "script": "var spaceId = event.data.context.tenantId; var flowId = event.data.flowId; if(spaceId && flowId){ var timezoneoffset = new Date().getTimezoneOffset(); var url = Steedos.absoluteUrl('/api/workflow/export/instances?space_id=' + spaceId + '&flow_id=' + flowId + '&type=1&timezoneoffset=' + timezoneoffset); window.open(url, '_blank'); } else { window.toastr && window.toastr.warning('请先选择流程'); }"
+                  }
+                ]
+              }
+            }
+          },
+          {
+            "type": "button",
+            "label": "本年度",
+            "onEvent": {
+              "click": {
+                "actions": [
+                  {
+                    "actionType": "custom",
+                    "script": "var spaceId = event.data.context.tenantId; var flowId = event.data.flowId; if(spaceId && flowId){ var timezoneoffset = new Date().getTimezoneOffset(); var url = Steedos.absoluteUrl('/api/workflow/export/instances?space_id=' + spaceId + '&flow_id=' + flowId + '&type=2&timezoneoffset=' + timezoneoffset); window.open(url, '_blank'); } else { window.toastr && window.toastr.warning('请先选择流程'); }"
+                  }
+                ]
+              }
+            }
+          },
+          {
+            "type": "button",
+            "label": "所有",
+            "onEvent": {
+              "click": {
+                "actions": [
+                  {
+                    "actionType": "custom",
+                    "script": "var spaceId = event.data.context.tenantId; var flowId = event.data.flowId; if(spaceId && flowId){ var timezoneoffset = new Date().getTimezoneOffset(); var url = Steedos.absoluteUrl('/api/workflow/export/instances?space_id=' + spaceId + '&flow_id=' + flowId + '&type=3&timezoneoffset=' + timezoneoffset); window.open(url, '_blank'); } else { window.toastr && window.toastr.warning('请先选择流程'); }"
+                  }
+                ]
+              }
+            }
+          }
+        ]
+      }
+    ],
+    "regions": [
+      "body"
+    ],
+    "bodyClassName": "p-0",
+    "id": "u:instance_export_service"
+  }
+is_enable: true
+label: 导出
+'on': list
+type: amis_button
+visible: true
+sort: 900

package/main/default/routes/api_workflow_export.router.js CHANGED Viewed

@@ -11,8 +11,8 @@ const express = require('express');
 const router = express.Router();
 const { requireAuthentication } = require("@steedos/auth");
 const WorkflowManager = require('../manager/workflow_manager');
+const { getCollection } = require('../utils/collection');
 const _ = require('underscore');
-const Fiber = function(fun){console.log('TODO Fiber...')}
 const moment = require('moment')
 const fs = require('fs')
 const path = require('path')
@@ -35,160 +35,105 @@ const path = require('path')
  */
 router.get('/api/workflow/export/instances', requireAuthentication, async function (req, res) {
     try {
-        let userSession = req.user;
-        const spaceId = userSession.spaceId;
+        const userSession = req.user;
         const userId = userSession.userId;
-        const isSpaceAdmin = userSession.is_space_admin;
-        Fiber(async function () {
-            try {
-                var ejs, end_date, fields, fileName, flow, flow_id, flow_ids, form, form_name, formatDate, ins_to_xls, lang, last_month_date, now, query, ret, selector, space, space_id, start_date, str, table_fields, template, timezoneoffset, type, uid, utcOffset;
-                query = req.query;
-                space_id = query.space_id;
-                flow_id = query.flow_id;
-                type = parseInt(query.type);
-                timezoneoffset = parseInt(query.timezoneoffset);
-                flow = db.flows.findOne({
-                    _id: flow_id
-                }, {
-                    fields: {
-                        form: 1
-                    }
-                });
-                form = db.forms.findOne({
-                    _id: flow.form
-                }, {
-                    fields: {
-                        name: 1,
-                        'current.fields': 1
-                    }
-                });
-                form_name = form.name;
-                fields = form.current.fields;
-                table_fields = new Array;
-                _.each(form.current.fields, function (field) {
-                    if (field.type === "table") {
-                        return table_fields.push(field);
-                    }
-                });
-                ins_to_xls = new Array;
-                start_date = null;
-                end_date = null;
-                now = new Date;
-                selector = {
-                    space: space_id,
-                    flow: flow_id
-                };
-                selector.state = {
-                    $in: ["pending", "completed"]
-                };
-                uid = userId;
-                space = db.spaces.findOne({_id: space_id});
-                if (!space) {
-                    selector.state = "none";
-                }
-                if (!space.admins.includes(uid)) {
-                    flow_ids = WorkflowManager.getMyAdminOrMonitorFlows(space_id, uid);
-                    if (!flow_ids.includes(selector.flow)) {
-                        selector.$or = [
-                            {
-                                submitter: uid
-                            },
-                            {
-                                applicant: uid
-                            },
-                            {
-                                inbox_users: uid
-                            },
-                            {
-                                outbox_users: uid
-                            }
-                        ];
-                    }
-                }
-                // 0-本月
-                if (type === 0) {
-                    start_date = new Date(now.getFullYear(), now.getMonth(), 1);
-                    selector.submit_date = {
-                        $gte: start_date
-                    };
-                    ins_to_xls = db.instances.find(selector, {
-                        sort: {
-                            submit_date: 1
-                        }
-                    }).fetch();
-                    // 1-上月
-                } else if (type === 1) {
-                    last_month_date = new Date(new Date(now.getFullYear(), now.getMonth(), 1) - 1000 * 60 * 60 * 24);
-                    start_date = new Date(last_month_date.getFullYear(), last_month_date.getMonth(), 1);
-                    end_date = new Date(now.getFullYear(), now.getMonth(), 1);
-                    selector.submit_date = {
-                        $gte: start_date,
-                        $lte: end_date
-                    };
-                    ins_to_xls = db.instances.find(selector, {
-                        sort: {
-                            submit_date: 1
-                        }
-                    }).fetch();
-                    // 2-整个年度
-                } else if (type === 2) {
-                    start_date = new Date(now.getFullYear(), 0, 1);
-                    selector.submit_date = {
-                        $gte: start_date
-                    };
-                    ins_to_xls = db.instances.find(selector, {
-                        sort: {
-                            submit_date: 1
-                        }
-                    }).fetch();
-                    // 3-所有
-                } else if (type === 3) {
-                    ins_to_xls = db.instances.find(selector, {
-                        sort: {
-                            submit_date: 1
-                        }
-                    }).fetch();
-                }
-                ejs = require('ejs');
-                str = fs.readFileSync(path.resolve(__dirname, '../server/ejs/export_instances.ejs'), 'utf8');
-                // 检测是否有语法错误
-                // ejsLint = require('ejs-lint')
-                // if ejsLint.lint
-                // 	error_obj = ejsLint.lint(str, {})
-                // else
-                // 	error_obj = ejsLint(str, {})
-                // if error_obj
-                // 	console.error "===/api/workflow/export:"
-                // 	console.error error_obj
-                template = ejs.compile(str);
-                lang = 'en';
-                if (userSession.locale === 'zh-cn') {
-                    lang = 'zh-CN';
-                }
-                utcOffset = timezoneoffset / -60;
-                formatDate = function (date, formater) {
-                    return moment(date).utcOffset(utcOffset).format(formater);
-                };
-                ret = template({
-                    lang: lang,
-                    formatDate: formatDate,
-                    form_name: form_name,
-                    fields: fields,
-                    table_fields: table_fields,
-                    ins_to_xls: ins_to_xls
-                });
-                fileName = "SteedOSWorkflow_" + moment().format('YYYYMMDDHHmm') + ".xls";
-                res.setHeader("Content-type", "application/octet-stream");
-                res.setHeader("Content-Disposition", "attachment;filename=" + encodeURI(fileName));
-                return res.end(ret);
-            } catch (e) {
-                console.error(e);
-                res.status(200).send({
-                    errors: [{ errorMessage: e.message }]
-                });
+        const query = req.query;
+        const space_id = query.space_id;
+        const flow_id = query.flow_id;
+        const type = parseInt(query.type);
+        const timezoneoffset = parseInt(query.timezoneoffset);
+        const flowsCollection = await getCollection('flows');
+        const formsCollection = await getCollection('forms');
+        const spacesCollection = await getCollection('spaces');
+        const instancesCollection = await getCollection('instances');
+        const flow = await flowsCollection.findOne(
+            { _id: flow_id },
+            { projection: { form: 1 } }
+        );
+        const form = await formsCollection.findOne(
+            { _id: flow.form },
+            { projection: { name: 1, 'current.fields': 1 } }
+        );
+        const form_name = form.name;
+        const fields = form.current.fields;
+        const table_fields = [];
+        _.each(fields, function (field) {
+            if (field.type === "table") {
+                table_fields.push(field);
             }
-        }).run()
+        });
+        let ins_to_xls = [];
+        const now = new Date();
+        const selector = {
+            space: space_id,
+            flow: flow_id,
+            state: { $in: ["pending", "completed"] }
+        };
+        const uid = userId;
+        const space = await spacesCollection.findOne({ _id: space_id });
+        if (!space) {
+            selector.state = "none";
+        }
+        if (space && !space.admins.includes(uid)) {
+            const flow_ids = await WorkflowManager.getMyAdminOrMonitorFlows(space_id, uid);
+            if (!flow_ids.includes(flow_id)) {
+                selector.$or = [
+                    { submitter: uid },
+                    { applicant: uid },
+                    { inbox_users: uid },
+                    { outbox_users: uid }
+                ];
+            }
+        }
+        // 0-本月
+        if (type === 0) {
+            const start_date = new Date(now.getFullYear(), now.getMonth(), 1);
+            selector.submit_date = { $gte: start_date };
+        // 1-上月
+        } else if (type === 1) {
+            const last_month_date = new Date(new Date(now.getFullYear(), now.getMonth(), 1) - 1000 * 60 * 60 * 24);
+            const start_date = new Date(last_month_date.getFullYear(), last_month_date.getMonth(), 1);
+            const end_date = new Date(now.getFullYear(), now.getMonth(), 1);
+            selector.submit_date = { $gte: start_date, $lte: end_date };
+        // 2-整个年度
+        } else if (type === 2) {
+            const start_date = new Date(now.getFullYear(), 0, 1);
+            selector.submit_date = { $gte: start_date };
+        }
+        // 3-所有: 不加 submit_date 过滤
+        ins_to_xls = await instancesCollection.find(selector).sort({ submit_date: 1 }).toArray();
+        const ejs = require('ejs');
+        const str = fs.readFileSync(path.resolve(__dirname, '../server/ejs/export_instances.ejs'), 'utf8');
+        const template = ejs.compile(str);
+        let lang = 'en';
+        if (userSession.locale === 'zh-cn') {
+            lang = 'zh-CN';
+        }
+        const utcOffset = timezoneoffset / -60;
+        const formatDate = function (date, formater) {
+            return moment(date).utcOffset(utcOffset).format(formater);
+        };
+        const ret = template({
+            lang: lang,
+            formatDate: formatDate,
+            form_name: form_name,
+            fields: fields,
+            table_fields: table_fields,
+            ins_to_xls: ins_to_xls
+        });
+        const fileName = "SteedOSWorkflow_" + moment().format('YYYYMMDDHHmm') + ".xls";
+        res.setHeader("Content-type", "application/octet-stream");
+        res.setHeader("Content-Disposition", "attachment;filename=" + encodeURI(fileName));
+        return res.end(ret);
     } catch (e) {
+        console.error(e);
         res.status(200).send({
             errors: [{ errorMessage: e.message }]
         });