@steedos-labs/plugin-workflow 3.0.0-beta.29 → 3.0.0-beta.31

package/main/default/routes/api_workflow_retrieve.router.js

@@ -1,8 +1,8 @@
 /*
  * @Author: sunhaolin@hotoa.com
  * @Date: 2022-12-24 14:52:54
- * @LastEditors: sunhaolin@hotoa.com
- * @LastEditTime: 2022-12-31 11:19:56
+ * @LastEditors: 孙浩林 sunhaolin@steedos.com
+ * @LastEditTime: 2025-10-05 16:12:03
  * @Description: 
  */
 'use strict';
@@ -11,7 +11,6 @@ const express = require('express');
 const router = express.Router();
 const { requireAuthentication } = require("@steedos/auth");
 const _ = require('underscore');
-const Fiber = function(fun){console.log('TODO Fiber...')}
 const {
     insert_instance_tasks,
     update_instance_tasks,
@@ -19,6 +18,7 @@ const {
 } = require('../manager/instance_tasks_manager')
 const UUFlowManager = require('../manager/uuflow_manager');
 const pushManager = require('../manager/push_manager');
+const { getCollection, _makeNewID } = require('../utils/collection');
 /**
 @api {post} /api/workflow/retrieve 取回
 @apiVersion 0.0.0
@@ -41,253 +41,262 @@ router.post('/api/workflow/retrieve', requireAuthentication, async function (req
         const spaceId = userSession.spaceId;
         const userId = userSession.userId;
         const isSpaceAdmin = userSession.is_space_admin;
-        Fiber(async function () {
-            try {
-                var current_user, current_user_info, e, hashData;
-                current_user_info = Object.assign({}, userSession, { _id: userSession.userId })
-                current_user = current_user_info._id;
-                hashData = req.body;
-                _.each(hashData['Instances'], function (instance_from_client) {
-                    var cc_users, flow, handler_info, i, ins, instance, instance_id, last_trace, last_trace_id, newApprove, newTrace, now, old_inbox_users, org_info, previous_step, previous_trace, previous_trace_approves, previous_trace_id, previous_trace_name, previous_trace_step_id, r, retrieve_approve, retrieve_comment, retrieve_type, setObj, space_id, space_user, the_trace, traces;
-                    instance = UUFlowManager.getInstance(instance_from_client["_id"]);
-                    retrieve_comment = instance_from_client['retrieve_comment'];
-                    // 验证instance为审核中状态
-                    // UUFlowManager.isInstancePending(instance)
-                    // 校验申请单是当前用户已审核过的单子或者当前用户是提交人或申请人
-                    if ((!instance.outbox_users.includes(current_user)) && (instance.submitter !== current_user && instance.applicant !== current_user)) {
-                        throw new Error('当前用户不符合取回条件');
-                    }
-                    retrieve_type = "";
-                    traces = instance.traces;
-                    //获取最新的trace， 即取回步骤
-                    last_trace = _.last(traces);
-                    last_trace_id = last_trace._id;
-                    previous_trace_id = last_trace.previous_trace_ids[0];
-                    previous_trace = _.find(traces, function (t) {
-                        return t._id === previous_trace_id;
-                    });
-                    previous_trace_step_id = previous_trace.step;
-                    previous_trace_name = previous_trace.name;
-                    flow = UUFlowManager.getFlow(instance.flow);
-                    previous_step = UUFlowManager.getStep(instance, flow, previous_trace_step_id);
-                    if (previous_step.step_type === "counterSign") {
-                        throw new Error('会签不能取回');
+
+        const instancesCollection = await getCollection('instances');
+        const usersCollection = await getCollection('users');
+        const spaceUsersCollection = await getCollection('space_users');
+        const organizationsCollection = await getCollection('organizations');
+
+        var current_user, current_user_info, e, hashData;
+        current_user_info = Object.assign({}, userSession, { _id: userSession.userId })
+        current_user = current_user_info._id;
+        hashData = req.body;
+        var cc_users, flow, handler_info, i, ins, instance, instance_id, last_trace, last_trace_id, newApprove, newTrace, now, old_inbox_users, org_info, previous_step, previous_trace, previous_trace_approves, previous_trace_id, previous_trace_name, previous_trace_step_id, r, retrieve_approve, retrieve_comment, retrieve_type, setObj, space_id, space_user, the_trace, traces;
+        instance = await UUFlowManager.getInstance(hashData["_id"]);
+        retrieve_comment = hashData['retrieve_comment'];
+        // 验证instance为审核中状态
+        // UUFlowManager.isInstancePending(instance)
+        // 校验申请单是当前用户已审核过的单子或者当前用户是提交人或申请人
+        if ((!instance.outbox_users.includes(current_user)) && (instance.submitter !== current_user && instance.applicant !== current_user)) {
+            throw new Error('当前用户不符合取回条件');
+        }
+        retrieve_type = "";
+        traces = instance.traces;
+        //获取最新的trace， 即取回步骤
+        last_trace = _.last(traces);
+        last_trace_id = last_trace._id;
+        previous_trace_id = last_trace.previous_trace_ids[0];
+        previous_trace = _.find(traces, function (t) {
+            return t._id === previous_trace_id;
+        });
+        previous_trace_step_id = previous_trace.step;
+        previous_trace_name = previous_trace.name;
+        flow = await UUFlowManager.getFlow(instance.flow);
+        previous_step = await UUFlowManager.getStep(instance, flow, previous_trace_step_id);
+        if (previous_step.step_type === "counterSign") {
+            throw new Error('会签不能取回');
+        }
+        // 取回步骤的前一个步骤处理人唯一（即排除掉传阅和转发的approve后，剩余的approve只有一个）并且是当前用户
+        previous_trace_approves = _.filter(previous_trace.approves, function (a) {
+            return a.type !== 'cc' && a.type !== 'distribute' && a.type !== 'forward' && ['approved', 'submitted', 'rejected'].includes(a.judge);
+        });
+        if (previous_trace_approves.length === 1 && (previous_trace_approves[0].user === current_user || previous_trace_approves[0].handler === current_user)) {
+            retrieve_type = 'normal'; // 申请单正常流转的取回，即非传阅取回
+        }
+        i = traces.length;
+        retrieve_approve = {};
+        while (i > 0) {
+            _.each(traces[i - 1].approves, function (a) {
+                if (a.type === 'cc' && a.is_finished === true && a.user === current_user) {
+                    retrieve_type = 'cc';
+                    return retrieve_approve = a;
+                }
+            });
+            if (retrieve_type === 'cc') {
+                break;
+            }
+            i--;
+        }
+        if (retrieve_type === 'normal') {
+            // 获取一个flow
+            flow = await UUFlowManager.getFlow(instance.flow);
+            previous_step = await UUFlowManager.getStep(instance, flow, previous_trace_step_id);
+            space_id = instance.space;
+            instance_id = instance._id;
+            old_inbox_users = instance.inbox_users;
+            setObj = new Object;
+            now = new Date;
+            const finishedApproveIds = []
+            let retrieve_appr_id = ''
+
+
+            for (const t of traces) {
+                var current_space_user, current_user_organization, retrieve_appr;
+                if (t._id === last_trace_id) {
+                    if (!t.approves) {
+                        t.approves = new Array;
                     }
-                    // 取回步骤的前一个步骤处理人唯一（即排除掉传阅和转发的approve后，剩余的approve只有一个）并且是当前用户
-                    previous_trace_approves = _.filter(previous_trace.approves, function (a) {
-                        return a.type !== 'cc' && a.type !== 'distribute' && a.type !== 'forward' && ['approved', 'submitted', 'rejected'].includes(a.judge);
+                    // 更新当前trace.approve记录
+                    _.each(t.approves, function (appr) {
+                        if (appr.is_finished === false && appr.type !== "cc") {
+                            appr.start_date = now;
+                            appr.finish_date = now;
+                            appr.read_date = now;
+                            appr.is_error = false;
+                            appr.is_read = true;
+                            appr.is_finished = true;
+                            appr.judge = "terminated";
+                            appr.cost_time = appr.finish_date - appr.start_date;
+
+                            finishedApproveIds.push(appr._id)
+                        }
                     });
-                    if (previous_trace_approves.length === 1 && (previous_trace_approves[0].user === current_user || previous_trace_approves[0].handler === current_user)) {
-                        retrieve_type = 'normal'; // 申请单正常流转的取回，即非传阅取回
-                    }
-                    i = traces.length;
-                    retrieve_approve = {};
-                    while (i > 0) {
-                        _.each(traces[i - 1].approves, function (a) {
-                            if (a.type === 'cc' && a.is_finished === true && a.user === current_user) {
-                                retrieve_type = 'cc';
-                                return retrieve_approve = a;
-                            }
-                        });
-                        if (retrieve_type === 'cc') {
-                            break;
+                    // 在同一trace下插入取回操作者的approve记录
+                    current_space_user = await UUFlowManager.getSpaceUser(space_id, current_user);
+
+                    current_user_organization = await organizationsCollection.findOne({ _id: current_space_user.organization }, {
+                        projection: {
+                            name: 1,
+                            fullname: 1
                         }
-                        i--;
-                    }
-                    if (retrieve_type === 'normal') {
-                        // 获取一个flow
-                        flow = UUFlowManager.getFlow(instance.flow);
-                        previous_step = UUFlowManager.getStep(instance, flow, previous_trace_step_id);
-                        space_id = instance.space;
-                        instance_id = instance._id;
-                        old_inbox_users = instance.inbox_users;
-                        setObj = new Object;
-                        now = new Date;
-                        const finishedApproveIds = []
-                        let retrieve_appr_id = ''
-                        _.each(traces, function (t) {
-                            var current_space_user, current_user_organization, retrieve_appr;
-                            if (t._id === last_trace_id) {
-                                if (!t.approves) {
-                                    t.approves = new Array;
-                                }
-                                // 更新当前trace.approve记录
-                                _.each(t.approves, function (appr) {
-                                    if (appr.is_finished === false && appr.type !== "cc") {
-                                        appr.start_date = now;
-                                        appr.finish_date = now;
-                                        appr.read_date = now;
-                                        appr.is_error = false;
-                                        appr.is_read = true;
-                                        appr.is_finished = true;
-                                        appr.judge = "terminated";
-                                        appr.cost_time = appr.finish_date - appr.start_date;
+                    })
 
-                                        finishedApproveIds.push(appr._id)
-                                    }
-                                });
-                                // 在同一trace下插入取回操作者的approve记录
-                                current_space_user = UUFlowManager.getSpaceUser(space_id, current_user);
-                                current_user_organization = db.organizations.findOne(current_space_user.organization, {
-                                    fields: {
-                                        name: 1,
-                                        fullname: 1
-                                    }
-                                });
-                                retrieve_appr = new Object;
-                                retrieve_appr._id = _makeNewID();
-                                retrieve_appr.instance = instance_id;
-                                retrieve_appr.trace = t._id;
-                                retrieve_appr.is_finished = true;
-                                retrieve_appr.user = current_user;
-                                retrieve_appr.user_name = current_user_info.name;
-                                retrieve_appr.handler = current_user;
-                                retrieve_appr.handler_name = current_user_info.name;
-                                retrieve_appr.handler_organization = current_space_user.organization;
-                                retrieve_appr.handler_organization_name = current_user_organization.name;
-                                retrieve_appr.handler_organization_fullname = current_user_organization.fullname;
-                                retrieve_appr.start_date = now;
-                                retrieve_appr.finish_date = now;
-                                retrieve_appr.due_date = t.due_date;
-                                retrieve_appr.read_date = now;
-                                retrieve_appr.judge = "retrieved";
-                                retrieve_appr.is_read = true;
-                                retrieve_appr.description = retrieve_comment;
-                                retrieve_appr.is_error = false;
-                                retrieve_appr.values = new Object;
-                                retrieve_appr.cost_time = retrieve_appr.finish_date - retrieve_appr.start_date;
-                                t.approves.push(retrieve_appr);
-                                // 更新当前trace记录
-                                t.is_finished = true;
-                                t.finish_date = now;
-                                return t.judge = "retrieved";
-                            }
-                        });
-                        // 插入下一步trace记录
-                        newTrace = new Object;
-                        newTrace._id = _makeNewID();
-                        newTrace.instance = instance_id;
-                        newTrace.previous_trace_ids = [last_trace_id];
-                        newTrace.is_finished = false;
-                        newTrace.step = previous_trace_step_id;
-                        newTrace.name = previous_trace_name;
-                        newTrace.start_date = now;
-                        newTrace.due_date = UUFlowManager.getDueDate(previous_step.timeout_hours, space_id);
-                        newTrace.approves = [];
-                        // 插入下一步trace.approve记录
-                        newApprove = new Object;
-                        newApprove._id = _makeNewID();
-                        newApprove.instance = instance_id;
-                        newApprove.trace = newTrace._id;
-                        newApprove.is_finished = false;
-                        newApprove.user = current_user;
-                        handler_info = db.users.findOne(current_user, {
-                            fields: {
-                                name: 1
-                            }
-                        });
-                        newApprove.user_name = handler_info.name;
-                        newApprove.handler = current_user;
-                        newApprove.handler_name = handler_info.name;
-                        space_user = UUFlowManager.getSpaceUser(space_id, current_user);
-                        // 获取next_step_user所在的部门信息
-                        org_info = UUFlowManager.getSpaceUserOrgInfo(space_user);
-                        newApprove.handler_organization = org_info["organization"];
-                        newApprove.handler_organization_name = org_info["organization_name"];
-                        newApprove.handler_organization_fullname = org_info["organization_fullname"];
-                        newApprove.start_date = now;
-                        newApprove.due_date = newTrace.due_date;
-                        newApprove.is_read = false;
-                        newApprove.is_error = false;
-                        newApprove.values = new Object;
-                        UUFlowManager.setRemindInfo(instance.values, newApprove);
-                        newTrace.approves.push(newApprove);
-                        setObj.inbox_users = [current_user];
-                        setObj.modified = now;
-                        setObj.modified_by = current_user;
-                        traces.push(newTrace);
-                        setObj.traces = traces;
-                        setObj.state = "pending";
-                        setObj.is_archived = false;
-                        setObj.current_step_name = previous_trace_name;
-                        setObj.current_step_auto_submit = UUFlowManager.getCurrentStepAutoSubmit(flow.timeout_auto_submit, previous_step.lines);
-                        r = db.instances.update({
-                            _id: instance_id
-                        }, {
-                            $set: setObj
-                        });
+                    retrieve_appr = new Object;
+                    retrieve_appr._id = _makeNewID();
+                    retrieve_appr.instance = instance_id;
+                    retrieve_appr.trace = t._id;
+                    retrieve_appr.is_finished = true;
+                    retrieve_appr.user = current_user;
+                    retrieve_appr.user_name = current_user_info.name;
+                    retrieve_appr.handler = current_user;
+                    retrieve_appr.handler_name = current_user_info.name;
+                    retrieve_appr.handler_organization = current_space_user.organization;
+                    retrieve_appr.handler_organization_name = current_user_organization.name;
+                    retrieve_appr.handler_organization_fullname = current_user_organization.fullname;
+                    retrieve_appr.start_date = now;
+                    retrieve_appr.finish_date = now;
+                    retrieve_appr.due_date = t.due_date;
+                    retrieve_appr.read_date = now;
+                    retrieve_appr.judge = "retrieved";
+                    retrieve_appr.is_read = true;
+                    retrieve_appr.description = retrieve_comment;
+                    retrieve_appr.is_error = false;
+                    retrieve_appr.values = new Object;
+                    retrieve_appr.cost_time = retrieve_appr.finish_date - retrieve_appr.start_date;
+                    t.approves.push(retrieve_appr);
+                    // 更新当前trace记录
+                    t.is_finished = true;
+                    t.finish_date = now;
+                    t.judge = "retrieved";
+                }
+            };
+            // 插入下一步trace记录
+            newTrace = new Object;
+            newTrace._id = _makeNewID();
+            newTrace.instance = instance_id;
+            newTrace.previous_trace_ids = [last_trace_id];
+            newTrace.is_finished = false;
+            newTrace.step = previous_trace_step_id;
+            newTrace.name = previous_trace_name;
+            newTrace.start_date = now;
+            newTrace.due_date = await UUFlowManager.getDueDate(previous_step.timeout_hours, space_id);
+            newTrace.approves = [];
+            // 插入下一步trace.approve记录
+            newApprove = new Object;
+            newApprove._id = _makeNewID();
+            newApprove.instance = instance_id;
+            newApprove.trace = newTrace._id;
+            newApprove.is_finished = false;
+            newApprove.user = current_user;
 
-                        // 更新被取回的approve
-                        update_many_instance_tasks(instance_id, last_trace_id, finishedApproveIds)
-                        // 插入取回操作的approve
-                        insert_instance_tasks(instance_id, last_trace_id, retrieve_appr_id)
-                        // 插入新步骤的approve
-                        insert_instance_tasks(instance_id, newTrace._id, newApprove._id)
+            handler_info = await usersCollection.findOne({ _id: current_user }, {
+                projection: {
+                    name: 1
+                }
+            })
 
-                        if (r) {
-                            // 给被删除的inbox_users 和 当前用户 发送push
-                            pushManager.send_message_current_user(current_user_info);
-                            _.each(old_inbox_users, function (user_id) {
-                                if (user_id !== current_user) {
-                                    return pushManager.send_message_to_specifyUser("current_user", user_id);
-                                }
-                            });
-                            ins = UUFlowManager.getInstance(instance_id);
-                            // 如果已经配置webhook并已激活则触发
-                            return pushManager.triggerWebhook(ins.flow, ins, {}, 'retrieve', current_user, ins.inbox_users);
-                        }
-                    } else if (retrieve_type === 'cc') {
-                        setObj = new Object;
-                        now = new Date;
-                        instance_id = instance._id;
-                        the_trace = _.find(traces, function (t) {
-                            return t._id === retrieve_approve.trace;
-                        });
-                        _.each(the_trace.approves, function (a) {
-                            if (a._id === retrieve_approve._id) {
-                                a.is_finished = false;
-                                a.finish_date = void 0;
-                                a.judge = void 0;
-                                return a.cost_time = void 0;
-                            }
-                        });
-                        cc_users = instance.cc_users;
-                        cc_users.push(current_user);
-                        setObj.modified = now;
-                        setObj.modified_by = current_user;
-                        setObj.state = "pending";
-                        setObj.is_archived = false;
-                        setObj.cc_users = cc_users;
-                        setObj['traces.$.approves'] = the_trace.approves;
-                        r = db.instances.update({
-                            _id: instance_id,
-                            'traces._id': retrieve_approve.trace
-                        }, {
-                            $set: setObj
-                        });
+            newApprove.user_name = handler_info.name;
+            newApprove.handler = current_user;
+            newApprove.handler_name = handler_info.name;
+            space_user = await UUFlowManager.getSpaceUser(space_id, current_user);
+            // 获取next_step_user所在的部门信息
+            org_info = await UUFlowManager.getSpaceUserOrgInfo(space_user);
+            newApprove.handler_organization = org_info["organization"];
+            newApprove.handler_organization_name = org_info["organization_name"];
+            newApprove.handler_organization_fullname = org_info["organization_fullname"];
+            newApprove.start_date = now;
+            newApprove.due_date = newTrace.due_date;
+            newApprove.is_read = false;
+            newApprove.is_error = false;
+            newApprove.values = new Object;
+            await UUFlowManager.setRemindInfo(instance.values, newApprove);
+            newTrace.approves.push(newApprove);
+            setObj.inbox_users = [current_user];
+            setObj.modified = now;
+            setObj.modified_by = current_user;
+            traces.push(newTrace);
+            setObj.traces = traces;
+            setObj.state = "pending";
+            setObj.is_archived = false;
+            setObj.current_step_name = previous_trace_name;
+            setObj.current_step_auto_submit = await UUFlowManager.getCurrentStepAutoSubmit(flow.timeout_auto_submit, previous_step.lines);
 
-                        update_instance_tasks(instance_id, retrieve_approve.trace, retrieve_approve._id)
+            r = await instancesCollection.updateOne({
+                _id: instance_id,
+            }, {
+                $set: setObj,
+            });
 
-                        if (r) {
-                            pushManager.send_message_current_user(current_user_info);
-                        }
-                        ins = UUFlowManager.getInstance(instance_id);
-                        // 如果已经配置webhook并已激活则触发
-                        return pushManager.triggerWebhook(ins.flow, ins, {}, 'retrieve', current_user, [current_user]);
+            // 更新被取回的approve
+            await update_many_instance_tasks(instance_id, last_trace_id, finishedApproveIds)
+            // 插入取回操作的approve
+            await insert_instance_tasks(instance_id, last_trace_id, retrieve_appr_id)
+            // 插入新步骤的approve
+            await insert_instance_tasks(instance_id, newTrace._id, newApprove._id)
+
+            if (r) {
+                // 给被删除的inbox_users 和 当前用户 发送push
+                await pushManager.send_message_current_user(current_user_info);
+                for (const user_id of old_inbox_users) {
+                    if (user_id !== current_user) {
+                        await pushManager.send_message_to_specifyUser("current_user", user_id);
                     }
-                });
+                };
+                ins = await UUFlowManager.getInstance(instance_id);
+                // 如果已经配置webhook并已激活则触发
+                await pushManager.triggerWebhook(ins.flow, ins, {}, 'retrieve', current_user, ins.inbox_users);
+            }
+        } else if (retrieve_type === 'cc') {
+            setObj = new Object;
+            now = new Date;
+            instance_id = instance._id;
+            the_trace = _.find(traces, function (t) {
+                return t._id === retrieve_approve.trace;
+            });
+            _.each(the_trace.approves, function (a) {
+                if (a._id === retrieve_approve._id) {
+                    a.is_finished = false;
+                    a.finish_date = void 0;
+                    a.judge = void 0;
+                    return a.cost_time = void 0;
+                }
+            });
+            cc_users = instance.cc_users;
+            cc_users.push(current_user);
+            setObj.modified = now;
+            setObj.modified_by = current_user;
+            setObj.state = "pending";
+            setObj.is_archived = false;
+            setObj.cc_users = cc_users;
+            setObj['traces.$.approves'] = the_trace.approves;
+            r = await instancesCollection.updateOne({
+                _id: instance_id,
+                'traces._id': retrieve_approve.trace
+            }, {
+                $set: setObj,
+            });
 
-                res.status(200).send({});
-            } catch (e) {
-                console.error(e);
-                res.status(200).send({
-                    errors: [{ errorMessage: e.message }]
-                });
+            await update_instance_tasks(instance_id, retrieve_approve.trace, retrieve_approve._id)
+
+            if (r) {
+                await pushManager.send_message_current_user(current_user_info);
             }
-        }).run()
+            ins = UUFlowManager.getInstance(instance_id);
+            // 如果已经配置webhook并已激活则触发
+            await pushManager.triggerWebhook(ins.flow, ins, {}, 'retrieve', current_user, [current_user]);
+        }
+
+        res.status(200).send({
+            status: 0,
+            data: {}
+        });
+
     } catch (e) {
+        console.log(e);
         res.status(200).send({
-            errors: [{ errorMessage: e.message }]
+            status: -1,
+            msg: e.message,
+            data: {}
         });
     }
 });

package/main/default/routes/export.router.js

@@ -18,8 +18,9 @@ const { getCollection } = require('../utils/collection');
 
 const exportByFlowIds = async function (flowIds, res) {
      const db = {
-        forms: getCollection('forms'),
-        spaces: getCollection('spaces')
+        forms: await getCollection('forms'),
+        flows: await getCollection('flows'),
+        spaces: await getCollection('spaces')
     }
     var fileNames, flows, zip;
     flows = await db.flows.find({
@@ -47,12 +48,12 @@ const exportByFlowIds = async function (flowIds, res) {
         } else {
             fileNames[fileName] = 1;
         }
-        return zip.file(`${fileName}.json`, new Buffer(JSON.stringify(data), 'utf-8'));
+        zip.file(`${fileName}.json`, new Buffer(JSON.stringify(data), 'utf-8'));
     }
     res.setHeader('Content-type', 'application/octet-stream');
     res.setHeader('Content-Disposition', 'attachment;filename=' + encodeURI('导出的流程文件') + '.zip');
     return zip.generateNodeStream().pipe(res).on('finish', function () {
-        return console.log("text file written.");
+        console.log("text file written.");
     });
 };
 

package/main/default/routes/flow_form_design.ejs

@@ -136,6 +136,8 @@
                   {
                     record:forms__findOne(id: "${id}"){
                       _id,
+                      name,
+                      description,
                       amis_schema,
                       current
                     }

package/main/default/routes/import.router.js

@@ -138,12 +138,12 @@ router.post('/api/workflow/import/form', requireAuthentication, async function (
                     } catch (e) {
                         console.log(e)
                         if (e.reason && e.details) {
-                            return fail[filename] = {
+                             fail[filename] = {
                                 reason: e.reason,
                                 details: e.details
                             };
                         } else {
-                            return fail[filename] = e.reason || e.message;
+                            fail[filename] = e.reason || e.message;
                         }
                     }
                 }
@@ -152,16 +152,15 @@ router.post('/api/workflow/import/form', requireAuthentication, async function (
                 } else {
                     res.statusCode = 500;
                 }
-                return res.end(JSON.stringify({
-                    multiple: multiple,
-                    fail: fail,
-                    success: success
+                res.end(JSON.stringify({
+                    status: res.statusCode ? 0 : 1,
+                    msg: fail
                 }));
             } catch (error) {
                 console.log(error)
                 msg = "无效的JSON文件";
                 res.statusCode = 500;
-                return res.end(msg);
+                res.end(msg);
             }
         });
     } catch (e) {

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

@@ -534,7 +534,7 @@ module.exports = {
 
             // 数据库更新操作：将forms表current的fields字段更新为最终数组
             form.current.fields = getFinalFormFields(inputFields);
-            form.current.amis_schema = amis_schema;
+            form.current.amis_schema = this.doc.amis_schema;
             form.current.style = formSchema.style;
             form.current.mode = formSchema.mode;
             form.current.wizard_mode = formSchema.wizard_mode;

package/main/default/utils/designerManager.js

@@ -224,6 +224,7 @@ async function updateForm(formId, form, forms, flows, currentUserId) {
     current.style = form["current"]["style"];
     current.mode = form["current"]["mode"];
     current.wizard_mode = form["current"]["wizard_mode"];
+    current.amis_schema = form["current"]["amis_schema"]
 
     formUpdateObj.$set = {
         'current': current,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos-labs/plugin-workflow",
-  "version": "3.0.0-beta.29",
+  "version": "3.0.0-beta.31",
   "main": "package.service.js",
   "license": "MIT",
   "scripts": {
@@ -12,7 +12,8 @@
     "he": "1.2.0",
     "lodash": "^4.17.21",
     "node-schedule": "^2.0.0",
-    "formidable": "2.0.1"
+    "formidable": "2.0.1",
+    "jszip": "3.10.1"
   },
   "private": false,
   "publishConfig": {