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

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

@@ -34,8 +34,8 @@ router.get('/api/workflow/form_design', auth.requireAuthentication, async functi
         //     userId: userSession.userId,
         //     authToken: userSession.authToken
         // }
-        let locale = "zh-CN";
-        if (req.query.locale == "en-us") {
+        let locale = userSession.language || process.env.STEEDOS_DEFAULT_LANGUAGE || "zh-CN";
+        if (req.query.locale?.startsWith('en')) {
             locale = "en-US";
         } else if (req.query.locale == "zh-cn") {
             locale = "zh-CN";
@@ -56,7 +56,8 @@ router.get('/api/workflow/form_design', auth.requireAuthentication, async functi
             authToken: userSession.authToken,
             userSession: userSession,
             id: flow.form,
-            useOpenAPI: process.env.STEEDOS_PUBLIC_USE_OPEN_API
+            useOpenAPI: process.env.STEEDOS_PUBLIC_USE_OPEN_API,
+            locale
         }
         const options = {}
         ejs.renderFile(filename, data, options, function(err, str){

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/services/flows.service.js

@@ -6,7 +6,7 @@
  * @Description:
  */
 const objectql = require("@steedos/objectql");
-const { getStep } = require('../uuFlowManager');
+const { getStep } = require('../uuflowManager');
 const _ = require("lodash");
 module.exports = {
   name: "flows",

package/main/default/translations/en.translation.yml

@@ -1,2 +1,7 @@
+CustomApplications:
+  approve_workflow:
+    name: Approval
+    description: Provide a graphical form and process design interface to customize the enterprise business approval process.
 CustomLabels:
+  approval_workflow: Workflow
   flows_tabs_form: Form

package/main/default/translations/zh-CN.translation.yml

@@ -1,2 +1,3 @@
 CustomLabels:
-  flows_tabs_form: 表单
+  flows_tabs_form: 表单
+  approval_workflow: 审批

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

@@ -56,6 +56,9 @@ const AmisInputTypes = [
 
 // getInstanceFormSchema() 在用户创建的表单中获取到type为form name为instanceForm的表单，其他的表单不要
 function getInstanceFormSchema(amis_schema) {
+    if(!amis_schema){
+        return ;
+    }
 
     if (amis_schema.type === 'form' && amis_schema.name === 'instanceForm' || amis_schema.type === 'steedos-flow-form') {
         const proper_schema = amis_schema;
@@ -94,7 +97,7 @@ function getFormInputFields(formSchema) {
         let flag = true;
         // 对符合条件的formSchema做解析处理
         const field = getInputFiled(bodyItem);
-        console.log('getFormInputFields field', field);
+        // console.log('getFormInputFields field', field);
         if (field) {
             //进入if说明是表单项
             _.each(inputFields, (item) => {
@@ -108,7 +111,7 @@ function getFormInputFields(formSchema) {
                     flag = false;
                 }
             })
-            console.log('getFormInputFields flag', flag);
+            // console.log('getFormInputFields flag', flag);
             if (flag) {
                 inputFields.push(field);
             }
@@ -157,8 +160,8 @@ function transformFormFields(amisField) {
 
 
     if(amisField.type === 'steedos-field'){
-        return {
-            _id: new ObjectId().toHexString(),
+        const sfield = {
+            _id: amisField.config.name,
             code: amisField.config.name,
             name: amisField.config.label,
             is_wide: amisField.config.is_wide,
@@ -170,6 +173,17 @@ function transformFormFields(amisField) {
             type: 'steedos-field',
             config: amisField.config
         }
+
+        let tempConfig = amisField.config;
+
+        if (tempConfig.reference_to === "organizations") {
+            sfield.type = 'group'
+            sfield._type = 'steedos-field'
+        }else if(tempConfig.reference_to === "space_users" || tempConfig.reference_to === "users"){
+            sfield.type = 'user'
+            sfield._type = 'steedos-field'
+        }
+        return sfield;
     };
 
     let formFieldsItem = {
@@ -451,7 +465,7 @@ function transformFormFields(amisField) {
 
 				if (tempConfig.reference_to === "organizations") {
 					steedosField.type = 'group'
-				}else if(tempConfig.reference_to === "space_users"){
+				}else if(tempConfig.reference_to === "space_users" || tempConfig.reference_to === "user"){
 					//  && tempConfig.reference_to_field === 'user'
 					steedosField.type = 'user'
 				}else{
@@ -520,6 +534,14 @@ module.exports = {
 
             // 数据库更新操作：将forms表current的fields字段更新为最终数组
             form.current.fields = getFinalFormFields(inputFields);
+            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;
+            form.style = formSchema.style;
+            form.mode = formSchema.mode;
+            form.wizard_mode = formSchema.wizard_mode;
+            form.description = formSchema.description;
 
             // 以下为将解析字段存储的功能,为将解析字段存储至数据库forms表的功能
             let updatedForms = [];

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

@@ -22,13 +22,15 @@ module.exports = {
     },
 
     afterDelete: async function () {
-        const { doc } = this;
-        let recordIds = doc.record_ids;
-        if (recordIds && recordIds.length == 1) {
-            let recordObjName = recordIds[0].o;
-            let recordId = recordIds[0].ids[0];
-            if (recordObjName && recordId) {
-                await objectql.getObject(recordObjName).update(recordId, { "instances": null, "instance_state": null, "locked": false })
+        const { previousDoc } = this;
+        if(previousDoc){
+            let recordIds = previousDoc.record_ids;
+            if (recordIds && recordIds.length == 1) {
+                let recordObjName = recordIds[0].o;
+                let recordId = recordIds[0].ids[0];
+                if (recordObjName && recordId) {
+                    await objectql.getObject(recordObjName).update(recordId, { "instances": null, "instance_state": null, "locked": false })
+                }
             }
         }
     },

package/main/default/utils/designerManager.js

@@ -134,7 +134,7 @@ async function updateForm(formId, form, forms, flows, currentUserId) {
         let insCount = await instancesCollection.countDocuments({
             space: spaceId,
             form: formId,
-            'form_version': form['current']['id']
+            form_version: form['current']['id'] || form['current']['_id']
         });
         if (insCount > 0) {
             pass = true;
@@ -144,7 +144,7 @@ async function updateForm(formId, form, forms, flows, currentUserId) {
         let recordsCount = await recordsCollection.countDocuments({
             space: spaceId,
             form: formId,
-            'form_version': form['current']['id']
+            form_version: form['current']['id'] || form['current']['_id']
         });
         if (recordsCount > 0) {
             pass = true;
@@ -221,6 +221,10 @@ async function updateForm(formId, form, forms, flows, currentUserId) {
     current.fields = _formatFieldsID(form["current"]["fields"]);
     current.form_script = form["current"]["form_script"];
     current.name_forumla = form["current"]["name_forumla"];
+    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,
@@ -228,6 +232,9 @@ async function updateForm(formId, form, forms, flows, currentUserId) {
         'modified': now,
         'modified_by': currentUserId,
         'is_valid': form["is_valid"],
+        'style': form["style"],
+        'mode': form["mode"],
+        'wizard_mode': form["wizard_mode"],
         'description': form["description"],
         'help_text': form["help_text"],
         'error_message': form["error_message"],
@@ -293,7 +300,7 @@ async function isSpaceAdmin(spaceId, userId, roles) {
     }
 }
 
-async function makeSteps(userId, fields = []) {
+async function makeSteps(userId, fields = [], language) {
     let blank_ayy = [];
     let stepEnd = _makeNewID();
     let steps = [];
@@ -303,7 +310,7 @@ async function makeSteps(userId, fields = []) {
     start_step.approver_roles = blank_ayy;
     start_step.approver_users = blank_ayy;
     start_step.fields_modifiable = blank_ayy;
-    start_step.name = '开始';
+    start_step.name = language === 'zh-CN' ? '开始' : 'Start';
     start_step.step_type = "start";
     start_step.posx = -1;
     start_step.posy = -1;
@@ -336,7 +343,7 @@ async function makeSteps(userId, fields = []) {
     end_step.approver_users = blank_ayy;
     end_step.fields_modifiable = blank_ayy;
     end_step.lines = blank_ayy;
-    end_step.name = '结束';
+    end_step.name = language === 'zh-CN' ? '结束' : 'End';
     end_step.step_type = "end";
     end_step.posx = -1;
     end_step.posy = -1;

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@steedos-labs/plugin-workflow",
-  "version": "3.0.0-beta.9",
+  "version": "3.0.1-beta.1",
   "main": "package.service.js",
   "license": "MIT",
   "scripts": {
-    "build": "tsc && webpack --config webpack.config.js",
     "build:watch": "tsc --watch",
-    "release": "yarn build && npm publish --registry https://registry.npmjs.org && open https://npmmirror.com/sync/@steedos-labs/plugin-workflow && cnpm sync @steedos-labs/plugin-workflow"
+    "release": "npm publish --registry https://registry.npmjs.org && open https://npmmirror.com/sync/@steedos-labs/plugin-workflow && cnpm sync @steedos-labs/plugin-workflow"
   },
   "dependencies": {
     "graphql-parse-resolve-info": "^4.12.3",
     "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": {

package/package.service.js

@@ -5,6 +5,7 @@ const packageLoader = require('@steedos/service-package-loader');
 
 const rests = require('./src/rests');
 const InstanceRecordQueue = require('./src/instance_record_queue')
+const WebhookQueue = require('./src/webhook_queue')
 
 /**
  * @typedef {import('moleculer').Context} Context Moleculer's Context
@@ -20,7 +21,7 @@ module.exports = {
 		$package: {
 			name: serviceName,
 			path: __dirname,
-			isPackage: true
+			isPackage: false
 		}
 	},
 	/**
@@ -124,12 +125,25 @@ module.exports = {
 	 * Service started lifecycle event handler
 	 */
 	async started(ctx) {
-		if((process.env.STEEDOS_CRON_ENABLED === true || process.env.STEEDOS_CRON_ENABLED === 'true') && process.env.STEEDOS_CRON_INSTANCERECORDQUEUE_INTERVAL){
-			InstanceRecordQueue.Configure({
-				sendInterval: process.env.STEEDOS_CRON_INSTANCERECORDQUEUE_INTERVAL,
-				sendBatchSize: 10,
-				keepDocs: true
-			})
+		if((process.env.STEEDOS_CRON_ENABLED === true || process.env.STEEDOS_CRON_ENABLED === 'true')){
+
+			if (process.env.STEEDOS_CRON_INSTANCERECORDQUEUE_INTERVAL)  {
+				InstanceRecordQueue.Configure({
+					sendInterval: process.env.STEEDOS_CRON_INSTANCERECORDQUEUE_INTERVAL,
+					sendBatchSize: 10,
+					keepDocs: true
+				})
+			}
+			
+			// webhooks 流程触发器 队列
+			if (process.env.STEEDOS_CRON_WEBHOOKQUEUE_INTERVAL)  {
+				await WebhookQueue.Configure({
+					sendInterval: process.env.STEEDOS_CRON_WEBHOOKQUEUE_INTERVAL,
+					sendBatchSize: 10,
+					keepDocs: false
+				})
+			}
+
 		}
 	},
 

package/public/workflow/index.css

@@ -366,4 +366,8 @@ tbody .color-priority-muted *{
 .steedos-amis-instance-view-body .antd-Panel-title{
     font-size: 14px;
     font-weight: 500;
+}
+
+.steedos-amis-instance-view-body .approve-button{
+    z-index: 900;
 }

package/src/instance_record_queue.js

@@ -926,7 +926,7 @@ InstanceRecordQueue.syncRelatedObjectsValue = async function (mainRecordId, rela
             }
         }
         //清理申请单上被删除子表记录对应的相关表记录
-        for (const [tableCode, tableIds] of Object.entries(tableMap)) {
+        for (let [tableCode, tableIds] of Object.entries(tableMap)) {
             tableIds = _.compact(tableIds);
             var docsForRemove = await objectFind(relatedObject.object_name, { filters: [[relatedObject.foreign_key, '=', mainRecordId], ['_table._code', '=', tableCode]] });
             for (const doc of docsForRemove) {
@@ -1025,10 +1025,8 @@ InstanceRecordQueue.sendDoc = async function (doc) {
                 
                 // 同步新附件
                 await InstanceRecordQueue.syncAttach(sync_attachment, insId, record.space, record._id, objectName);
-                console.log(`1031 ===>`)
                 // 执行公式
                 await runQuoted(objectName, record._id);
-                console.log(`runQuoted===>`)
             } catch (error) {
                 console.error(error);
 

package/src/rests/api_workflow_instance_batch_remove.js

@@ -1,8 +1,8 @@
 /*
  * @Author: 孙浩林 sunhaolin@steedos.com
  * @Date: 2023-11-04 18:16:15
- * @LastEditors: 孙浩林 sunhaolin@steedos.com
- * @LastEditTime: 2023-11-07 09:31:28
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2025-09-01 16:23:40
  * @FilePath: /steedos-platform-2.3/services/service-workflow/src/rests/api_workflow_instance_batch_remove.js
  * @Description: 草稿箱列表删除按钮调用此接口批量删除草稿
  */
@@ -22,6 +22,7 @@ module.exports = {
 
         const insObj = this.getObject('instances')
         const insTaskObj = this.getObject('instance_tasks')
+        const lang = userSession.locale === 'zh-cn' ? 'zh-CN' : 'en';
 
         // 先检查是否符合删除条件：1、状态为草稿，2、提交人人为当前用户。
         const insDocs = await insObj.find({
@@ -62,7 +63,7 @@ module.exports = {
 
         return {
             'status': 0, // 返回 0，表示当前接口正确返回，否则按错误请求处理
-            'msg': '草稿已删除',
+            'msg': t('instance.draft_deleted_success', {}, lang),//'草稿已删除',
             'data': {
             }
         }

package/src/webhook_queue.js

@@ -0,0 +1,283 @@
+/*
+ * @Author: 孙浩林 sunhaolin@steedos.com
+ * @Date: 2025-10-09 15:07:29
+ * @LastEditors: 孙浩林 sunhaolin@steedos.com
+ * @LastEditTime: 2025-10-10 11:43:04
+ * @FilePath: /steedos-plugins/steedos-packages/plugin-workflow/src/webhook_queue.js
+ * @Description: 
+ */
+const _ = require("lodash");
+const axios = require('axios');
+
+const { getCollection } = require("../main/default/utils/collection");
+
+const WebhookQueue = {};
+
+WebhookQueue.send = async function (options) {
+	var currentUser = '<SERVER>'
+	var webhook = _.extend({
+		createdAt: new Date(),
+		createdBy: currentUser
+	});
+
+	webhook.webhook = _.pick(options, ['instance', 'current_approve', 'payload_url', 'content_type', 'action', 'from_user', 'to_users']);
+
+	webhook.sent = false;
+	webhook.sending = 0;
+
+	return await WebhookQueue.collection.insert(webhook);
+};
+
+var isConfigured = false;
+var sendWorker = async function (task, interval) {
+
+	if (WebhookQueue.debug) {
+		console.log('WebhookQueue: Send worker started, using interval: ' + interval);
+	}
+
+	return setInterval(async function () {
+		try {
+			await task();
+		} catch (error) {
+			if (WebhookQueue.debug) {
+				console.log('WebhookQueue: Error while sending: ' + error.message);
+			}
+		}
+	}, interval);
+};
+
+/*
+	options: {
+		// Controls the sending interval
+		sendInterval: Match.Optional(Number),
+		// Controls the sending batch size per interval
+		sendBatchSize: Match.Optional(Number),
+		// Allow optional keeping notifications in collection
+		keepWebhooks: Match.Optional(Boolean)
+	}
+*/
+WebhookQueue.Configure = async function (options) {
+	WebhookQueue.collection = await getCollection('_webhook_queue');
+
+	var self = this;
+	options = _.extend({
+		sendTimeout: 60000, // Timeout period for webhook send
+	}, options);
+
+	// Block multiple calls
+	if (isConfigured) {
+		throw new Error('WebhookQueue.Configure should not be called more than once!');
+	}
+
+	isConfigured = true;
+
+	// Add debug info
+	if (WebhookQueue.debug) {
+		console.log('WebhookQueue.Configure', options);
+	}
+
+	self.sendWebhook = async function (webhook) {
+		if (WebhookQueue.debug) {
+			console.log("sendWebhook");
+			console.log(webhook);
+		}
+
+		try {
+			const response = await axios({
+				method: 'post',
+				url: webhook.webhook.payload_url,
+				headers: {
+					"Content-Type": webhook.webhook.content_type
+				},
+				data: {
+					instance: webhook.webhook.instance,
+					current_approve: webhook.webhook.current_approve,
+					action: webhook.webhook.action,
+					from_user: webhook.webhook.from_user,
+					to_users: webhook.webhook.to_users
+				},
+			});
+
+			if (!options.keepWebhooks) {
+				// Pr. Default we will remove webhooks
+				await WebhookQueue.collection.remove({
+					_id: webhook._id,
+					errMsg: {
+						$exists: false
+					}
+				});
+			} else {
+				// Update the webhook
+				await WebhookQueue.collection.updateOne({
+					_id: webhook._id
+				}, {
+					$set: {
+						// Mark as sent
+						sent: true,
+						// Set the sent date
+						sentAt: new Date(),
+						// Not being sent anymore
+						sending: 0
+					}
+				});
+
+			}
+		} catch (error) {
+			console.error(error);
+			await WebhookQueue.collection.updateOne({
+				_id: webhook._id
+			}, {
+				$set: {
+					// error message
+					errMsg: error
+				}
+			});
+		}
+
+	}
+
+	// Universal send function
+	var _querySend = async function (options) {
+
+		if (self.sendWebhook) {
+			await self.sendWebhook(options);
+		}
+
+		return {
+			webhook: [options._id]
+		};
+	};
+
+	self.serverSend = async function (options) {
+		options = options || {};
+		return await _querySend(options);
+	};
+
+
+	// This interval will allow only one webhook to be sent at a time, it
+	// will check for new webhooks at every `options.sendInterval`
+	// (default interval is 15000 ms)
+	//
+	// It looks in webhooks collection to see if theres any pending
+	// webhooks, if so it will try to reserve the pending webhook.
+	// If successfully reserved the send is started.
+	//
+	// If webhook.query is type string, it's assumed to be a json string
+	// version of the query selector. Making it able to carry `$` properties in
+	// the mongo collection.
+	//
+	// Pr. default webhooks are removed from the collection after send have
+	// completed. Setting `options.keepWebhooks` will update and keep the
+	// webhook eg. if needed for historical reasons.
+	//
+	// After the send have completed a "send" event will be emitted with a
+	// status object containing webhook id and the send result object.
+	//
+	var isSendingWebhook = false;
+
+	if (options.sendInterval !== null) {
+
+		// This will require index since we sort webhooks by createdAt
+		WebhookQueue.collection.createIndex({
+			createdAt: 1
+		});
+		WebhookQueue.collection.createIndex({
+			sent: 1
+		});
+		WebhookQueue.collection.createIndex({
+			sending: 1
+		});
+
+
+		var sendWebhook = async function (webhook) {
+			// Reserve webhook
+			var now = +new Date();
+			var timeoutAt = now + options.sendTimeout;
+			var reserved = await WebhookQueue.collection.updateOne({
+				_id: webhook._id,
+				sent: false, // xxx: need to make sure this is set on create
+				sending: {
+					$lt: now
+				}
+			}, {
+				$set: {
+					sending: timeoutAt,
+				}
+			});
+
+			// Make sure we only handle webhooks reserved by this
+			// instance
+			if (reserved) {
+
+				// Send the webhook
+				await WebhookQueue.serverSend(webhook);
+
+			} // Else could not reserve
+		}; // EO sendWebhook
+
+		await sendWorker(async function () {
+
+			if (isSendingWebhook) {
+				return;
+			}
+			// Set send fence
+			isSendingWebhook = true;
+
+			var batchSize = options.sendBatchSize || 1;
+
+			var now = +new Date();
+
+			// Find webhooks that are not being or already sent
+			var pendingWebhooks = await WebhookQueue.collection.find({
+				$and: [
+					// Message is not sent
+					{
+						sent: false
+					},
+					// And not being sent by other instances
+					{
+						sending: {
+							$lt: now
+						}
+					},
+					// And no error
+					{
+						errMsg: {
+							$exists: false
+						}
+					}
+				]
+			}).sort({
+				createdAt: 1
+			}).limit(batchSize).toArray();
+
+			for (const webhook of pendingWebhooks) {
+				try {
+					await sendWebhook(webhook);
+				} catch (error) {
+					console.error(error.stack);
+					console.log('WebhookQueue: Could not send doc id: "' + webhook._id + '", Error: ' + error.message);
+					await WebhookQueue.collection.updateOne({
+						_id: webhook._id
+					}, {
+						$set: {
+							// error message
+							errMsg: error.message
+						}
+					});
+				}
+			}; // EO forEach
+
+			// Remove the send fence
+			isSendingWebhook = false;
+		}, options.sendInterval || 15000); // Default every 15th sec
+
+	} else {
+		if (WebhookQueue.debug) {
+			console.log('WebhookQueue: Send server is disabled');
+		}
+	}
+
+};
+
+module.exports = WebhookQueue;