@steedos-labs/plugin-workflow 3.0.0-beta.9 → 3.0.1-beta.1

package/main/default/client/instance.client.js

@@ -45,7 +45,7 @@ window.SteedosWorkflow.InstanceTask = {
             "showHeader": true,
             "id": "u:d29cef0d1007",
             "showDisplayAs": true,
-            "className": "h-full w-full bg-white instance-tasks-list",
+            "className": "h-full w-full instance-tasks-list",
             "hiddenColumnOperation": true,
             "formFactor": "LARGE",
             "headerToolbarItems": [
@@ -54,13 +54,13 @@ window.SteedosWorkflow.InstanceTask = {
                 "label": "",
                 "icon": "fa fa-bars",
                 "className": "bg-white p-2 rounded border-gray-300 text-gray-500",
-                "align": "right",
+                "align": "left",
                 "onEvent": {
                 "click": {
                     "actions": [
                     {
                         "actionType": "custom",
-                        "script": "document.querySelector('.instances-customPage').classList.toggle('instances-sidebar-open');if(window.innerWidth < 768){document.querySelector('.isInset').classList.toggle('inset-0')}"
+                        "script": "document.querySelector('.instances-customPage').classList.toggle('instances-sidebar-open');"
                     }
                     ]
                 }
@@ -113,7 +113,7 @@ window.SteedosWorkflow.Instance = {
           "showHeader": true,
           "id": "u:d29cef0d1007",
           "showDisplayAs": true,
-          "className": "h-full w-full bg-white",
+          "className": "h-full w-full",
           "hiddenColumnOperation": true,
           "formFactor": "LARGE",
           "headerToolbarItems": [
@@ -122,13 +122,13 @@ window.SteedosWorkflow.Instance = {
               "label": "",
               "icon": "fa fa-bars",
               "className": "bg-white p-2 rounded border-gray-300 text-gray-500",
-              "align": "right",
+              "align": "left",
               "onEvent": {
                 "click": {
                   "actions": [
                     {
                       "actionType": "custom",
-                      "script": "document.querySelector('.instances-customPage').classList.toggle('instances-sidebar-open');if(window.innerWidth < 768){document.querySelector('.isInset').classList.toggle('inset-0')}"
+                      "script": "document.querySelector('.instances-customPage').classList.toggle('instances-sidebar-open');"
                     }
                   ]
                 }

package/main/default/client/object_workflows.client.js

@@ -1,7 +1,8 @@
-Steedos.authRequest("/api/workflow/v2/get_object_workflows", { 
-    type: 'get', 
-    success: (data)=>{
-        window.Creator.object_workflows = data;
-        Creator.dataInit.set(true);
-    }
-});
+waitForThing(Builder, 'settings.context.user.authToken').then(function(){
+    Steedos.authRequest("/api/workflow/v2/get_object_workflows", { 
+        type: 'get', 
+        success: (data)=>{
+            window.Steedos.object_workflows = data;
+        }
+    });
+})

package/main/default/client/socket.client.js

@@ -6,11 +6,13 @@ window.waitForThing(window, 'socket').then(()=>{
     }
 
     const SocketEvents = {
-        badgeChange: 's:workflow:badge:change'
+        badgeChange: 's:workflow:badge:change',
+        instanceRecordChange: 's:record:instances:change'
     }
 
     const SocketRoomParts = {
-        badgeChange: 'workflow:badge:change'
+        badgeChange: 'workflow:badge:change',
+        instanceRecordChange: 'record:instances:change'
     }
 
     if(socket.connected){
@@ -18,12 +20,20 @@ window.waitForThing(window, 'socket').then(()=>{
             roomParts: SocketRoomParts.badgeChange,
             individual: true
         });
+
+        socket.emit(SocketCommands.subscribe, {
+            roomParts: SocketRoomParts.instanceRecordChange,
+            individual: true
+        });
     }else{
         socket.on("connection-init", ()=>{
             socket.emit(SocketCommands.subscribe, {
                 roomParts: SocketRoomParts.badgeChange,
                 individual: true
             });
+            socket.emit(SocketCommands.subscribe, {
+                roomParts: SocketRoomParts.instanceRecordChange
+            });
         })
     }
     
@@ -36,5 +46,38 @@ window.waitForThing(window, 'socket').then(()=>{
         if (shouldReloadView()) {
           window.$(".list-view-btn-reload").click()
         }
-    })
+    });
+
+    socket.on(SocketEvents.instanceRecordChange, (data)=>{
+        console.log(`socket 「${SocketEvents.instanceRecordChange}」`, data)
+        const shouldReloadView = () => {
+            const pathname = window.location.pathname;
+            return pathname.endsWith(`/instances`) || pathname.includes(`/instances/view`) || pathname.includes(`/instances/grid`) || pathname.endsWith(`/instance_tasks`) || pathname.includes(`/instance_tasks/view`) || pathname.includes(`/instance_tasks/grid`);
+        };
+        if (shouldReloadView()) {
+          window.$(".list-view-btn-reload").click()
+        }
+    });
+
+
+    window.addEventListener('message', (event)=>{
+        const data = event.data;
+        // 判断是不是我们发的路由变化消息
+        if (data && data.type === 'ROUTE_CHANGE') {
+            console.log('📬 收到路由变化消息:', data);
+            if(data.path.startsWith('/app/approve_workflow/instances/view/')){
+                const recordId = _.last(_.split(data.path, '/'));
+                socket.emit(SocketCommands.subscribe, {
+                    roomParts: `${SocketRoomParts.instanceRecordChange}-${recordId}`
+                });
+                socket.on(`${SocketEvents.instanceRecordChange}-${recordId}`, (eventData)=>{
+                    if(window.location.pathname.startsWith('/app/approve_workflow/instances/view/'+eventData._id)){
+                        if(window.location.search.indexOf("side_listview_id=monitor") > 0){
+                            $(".steedos-workflow-reload-btn").trigger('click')
+                        }
+                    }
+                })
+            }
+        }
+    });
 })

package/main/default/manager/import.js

@@ -290,10 +290,24 @@ async function objectWorkflow(spaceId, flowId, objectName, doc) {
     if (oldDoc) {
         return objectWorkflowsCollection.updateOne({ _id: oldDoc._id }, { $set: docData });
     } else {
+        docData._id = _makeNewID();
         return objectWorkflowsCollection.insertOne(docData);
     }
 }
 
+// 如果没有name字段，则给name赋值code
+function addFieldName(fields) {
+    return _.map(fields, function (f) {
+        if (!f.name && f.code) {
+            f.name = f.code;
+        }
+        if (f.type === 'section' || f.type === 'table') {
+            f.fields = addFieldName(f.fields);
+        }
+        return f;
+    });
+}
+
 async function workflow(uid, spaceId, form, enabled, company_id, options = {}) {
     const { upgrade = false, formId: upgradeFormId, flowId: upgradeFlowId } = options;
     const new_form_ids = [];
@@ -394,6 +408,8 @@ async function workflow(uid, spaceId, form, enabled, company_id, options = {}) {
         form.modified = form.created;
         form.modified_by = uid;
         form.historys = [];
+
+        const fields = addFieldName(form.current?.fields || []);
         
         form.current = {
             _id: _makeNewID(),
@@ -403,7 +419,7 @@ async function workflow(uid, spaceId, form, enabled, company_id, options = {}) {
             created_by: uid,
             modified: new Date(),
             modified_by: uid,
-            fields: form.current?.fields || [],
+            fields: fields,
             form_script: form.current?.form_script || '',
             name_forumla: form.current?.name_forumla || ''
         };

package/main/default/manager/instance_manager.js

@@ -2,9 +2,11 @@ var _eval, logger;
 
 _eval = require('eval');
 
+const _ = require('lodash');
+
 global.InstanceManager = {};
 
-logger = new Logger('Workflow -> InstanceManager');
+// logger = new Logger('Workflow -> InstanceManager');
 
 InstanceManager.handlerInstanceByFieldMap = function (ins, field_map) {
     var context, e, flow, res, script;
@@ -33,24 +35,33 @@ InstanceManager.handlerInstanceByFieldMap = function (ins, field_map) {
                 res = {
                     _error: e
                 };
-                logger.error(e);
+                // logger.error(e);
+                console.error(e);
             }
         }
     }
     return res;
 };
 
-InstanceManager.getCurrentApprove = function (instance, handler) {
+InstanceManager.getCurrentApprove = function (instance, handler, type) {
     var currentApprove, currentApproves, currentTraces;
     if (!instance || !instance.traces || instance.traces.length < 1) {
         return;
     }
-    currentTraces = instance.traces.filterProperty('is_finished', false);
+
+    currentTraces = _.filter(instance.traces, { is_finished: false });
+
     if (currentTraces.length) {
-        currentApproves = currentTraces[0].approves.filterProperty('is_finished', false).filterProperty('handler', handler);
+        if (type){
+            currentApproves = _.filter(currentTraces[0].approves, { is_finished: false, handler: handler, type: type});
+        }
+        else {
+            currentApproves = _.filter(currentTraces[0].approves, { is_finished: false, handler: handler });
+        }
         currentApprove = currentApproves.length > 0 ? currentApproves[0] : null;
     }
-    if (!currentApprove || currentApprove.type === 'cc') {
+
+    if (!currentApprove) {
         // 当前是传阅
         _.each(instance.traces, function (t) {
             _.each(t.approves, function (a) {
@@ -180,3 +191,6 @@ InstanceManager.getBatchInstances = function (space, categoryId, flowIds, inbox_
     //			console.log("批量审批-异常数据", ins._id)
     return _batch_instances;
 };
+
+
+module.exports = InstanceManager;

package/main/default/manager/push_manager.js

@@ -5,6 +5,8 @@ const { getObject } = objectql;
 const { t } = require('@steedos/i18n');
 const { map } = require('lodash');
 
+const WebhookQueue = require('../../../src/webhook_queue')
+
 const uuflowManager = {
     getFlow: async function (flow_id, options = {}) {
         if (process.env.STEEDOS_DEBUG) {
@@ -437,7 +439,7 @@ pushManager.get_badge = async function (send_from, user_id) {
                             if (((ref4 = appKeyValue.value) != null ? ref4[appName] : void 0) !== categoryBadge) {
                                 _set = {};
                                 _set['value.' + appName] = categoryBadge;
-                                await getObject('steedos_keyvalues').update(appKeyValue._id, set)
+                                await getObject('steedos_keyvalues').update(appKeyValue._id, _set)
                                 continue;
                             }
                         } else {
@@ -553,7 +555,7 @@ pushManager.checkMailFromNameLength = function (name) {
 };
 
 // TODO 手机推送
-pushManager.send_message_by_raix_push = async function (data) {
+pushManager.send_message_by_raix_push = async function (data, lang) {
     if (process.env.STEEDOS_DEBUG_DISABLE_PUSHMANAGER || !data["data"]) {
         return;
     }
@@ -590,7 +592,7 @@ pushManager.send_message_by_raix_push = async function (data) {
         }
         let notificationDoc = {
             name: notification.text,
-            body: '审批',
+            body: t('CustomLabels.approval_workflow', {}, lang),
             related_to: {
                 o: "instances",
                 ids: [notification.payload?.instance]
@@ -613,6 +615,12 @@ pushManager.send_message_by_raix_push = async function (data) {
             from: from,
             to: toUsers
         })
+
+        await objectql.getSteedosSchema().broker.emit('push.send', {
+            message: notificationDoc,
+            from: from,
+            to: toUsers
+        })
         
 
         // data["toUsers"].forEach(userId => {
@@ -631,7 +639,7 @@ pushManager.send_message_by_raix_push = async function (data) {
 };
 
 //steedos_ids 必须为数组 ； body 如果有，则必须为Hash
-pushManager.send_message = function (steedos_ids, body) {
+pushManager.send_message = function (steedos_ids, body, current_user_info, lang) {
     if (process.env.STEEDOS_DEBUG_DISABLE_PUSHMANAGER) {
         return;
     }
@@ -651,7 +659,7 @@ pushManager.send_message = function (steedos_ids, body) {
         data.data = body;
     }
 
-    pushManager.send_message_by_raix_push(data);
+    pushManager.send_message_by_raix_push(data, lang);
 };
 
 // TODO处理发送手机短信
@@ -780,7 +788,7 @@ pushManager.send_instance_notification = async function (send_from, instance, de
             await pushManager.send_email_to_SMTP(title.email, content, to_user, from_user);
 
             // Send Push Notification
-            await pushManager.send_message([to_user.steedos_id], push_body, current_user_info);
+            await pushManager.send_message([to_user.steedos_id], push_body, current_user_info, lang);
 
             // Send SMS
             if (['reassign_new_inbox_users', 'submit_pending_rejected_applicant_inbox', 'submit_pending_rejected_inbox', 'submit_pending_inbox', 'first_submit_inbox', 'return_pending_inbox'].includes(send_from)) {
@@ -854,7 +862,7 @@ pushManager.triggerWebhook = async function (flowId, instance, currentApprove, a
         cfsInstances: await getCollection('cfs.instances.filerecord')
     };
   
-    instance.attachments = (await cfsInstances.find({ 'metadata.instance': instance._id }).toArray()) || [];
+    instance.attachments = (await db.cfsInstances.find({ 'metadata.instance': instance._id }).toArray()) || [];
 
     const fromUser = await db.users.findOne({ "_id": fromUserId }, { fields: { _id: 1, username: 1 } }) || {};
     const fromSpaceUser = await db.space_users.findOne({ "user": fromUserId }, { fields: { mobile: 1, email: 1 } }) || {};
@@ -880,12 +888,12 @@ pushManager.triggerWebhook = async function (flowId, instance, currentApprove, a
     for (const w of webhooks) {
         WebhookQueue.send({
             instance,
-            currentApprove,
-            payloadUrl: w.payload_url,
-            contentType: w.content_type,
+            current_approve: currentApprove,
+            payload_url: w.payload_url,
+            content_type: w.content_type,
             action,
-            fromUser,
-            toUsers: toUsers || []
+            from_user: fromUser,
+            to_users: toUsers || []
         });
     }
 };