@steedos-labs/plugin-workflow 3.0.0-beta.22 → 3.0.0-beta.24

package/main/default/objectTranslations/flows.en/flows.en.objectTranslation.yml

@@ -288,6 +288,8 @@ actions:
     label: Flow Designer
   designForm:
     label: Form Designer
+  design_form_layout:
+    label: Form Designer(New)
   enableFlow:
     label: Enable Flow
   disableFlow:
@@ -310,8 +312,25 @@ actions:
     label: Delete
   addFormFields:
     label: Add Fields
+  del:
+    label: Delete
 CustomLabels:
   import_flows_error_title: Import Error
   import_flows_error_not_find_object: 'Not find object [ %s ]'
   import_flows_error_not_allow_enable_workflow: 'object [ %s ] not enable workflow'
   import_flows_error_not_find_fields: 'Missing field [ %s ]'
+  flows_action_del_dialog_title: Delete Flow
+  flows_action_del_dialog_field_flowName: For security reasons, please enter the name of the flow you want to delete (the relevant application form will also be deleted at the same time).
+  flows_action_del_dialog_error_not_same: Please confirm that the entered name is inconsistent with the flow name
+  flows_action_del_dialog_message_success: Operation successful
+  flows_action_del_dialog_message_failed: Operation failed
+  flows_action_distributeAdmin_dialog_error_not_find_step: Please first set the steps that allow distribution in the flow designer's steps
+  flows_action_distributeAdmin_dialog_field_distribute_optional_users_id: The selection range of distribution objects when the flow is distributed
+  flows_action_distributeAdmin_dialog_field_distribute_to_self: When distributing, you can give it to yourself
+  flows_action_distributeAdmin_dialog_field_distribute_end_notification: Remind the initiator after the distribution is completed
+  flows_action_distributeAdmin_dialog_field_upload_after_being_distributed: Is it allowed to upload attachments after being distributed
+  flows_page_record_field_form_name: Form Name
+  flows_page_record_field_form_description: Form Description
+  flows_page_record_field_form_name_forumla: Title Formula
+  flows_page_record_field_form_script: Form Script
+  flows_page_record_action_edit_dialog_title: Edit Form

package/main/default/objectTranslations/flows.zh-CN/flows.zh-CN.objectTranslation.yml

@@ -285,6 +285,8 @@ actions:
     label: 流程设计器
   designForm:
     label: 表单设计器
+  design_form_layout:
+    label: 表单设计器(New)
   enableFlow:
     label: 启用
   disableFlow:
@@ -307,8 +309,25 @@ actions:
     label: 删除
   addFormFields:
     label: 添加字段
+  del:
+    label: 删除
 CustomLabels:
   import_flows_error_title: 导入失败
   import_flows_error_not_find_object: '未找到对象[ %s ]'
   import_flows_error_not_allow_enable_workflow: '对象[ %s ]未启用配置对象流程'
   import_flows_error_not_find_fields: '缺少字段[ %s ]'
+  flows_action_del_dialog_title: 删除流程
+  flows_action_del_dialog_field_flowName: 为了确保安全，请输入您要删除的流程名(同时会删除相关的申请单)
+  flows_action_del_dialog_error_not_same: 请确认, 输入的名称与流程名称不一致
+  flows_action_del_dialog_message_success: 操作成功
+  flows_action_del_dialog_message_failed: 操作失败
+  flows_action_distributeAdmin_dialog_error_not_find_step: 请先在流程设计器的步骤中, 设置允许分发的步骤
+  flows_action_distributeAdmin_dialog_field_distribute_optional_users_id: 流程被分发时分发对象选择范围
+  flows_action_distributeAdmin_dialog_field_distribute_to_self: 分发时可分发给自己
+  flows_action_distributeAdmin_dialog_field_distribute_end_notification: 分发结束后提醒发起人
+  flows_action_distributeAdmin_dialog_field_upload_after_being_distributed: 被分发后是否允许上传附件
+  flows_page_record_field_form_name: 表单名称
+  flows_page_record_field_form_description: 表单描述
+  flows_page_record_field_form_name_forumla: 标题公式
+  flows_page_record_field_form_script: 表单脚本
+  flows_page_record_action_edit_dialog_title: 编辑表单

package/main/default/objects/flows/buttons/del.button.yml

@@ -5,7 +5,7 @@ amis_schema: |-
       "body": [
           {
               "type": "button",
-              "label": "删除",
+              "label": "${'CustomAction.flows.del' | t}",
               "id": "u:del",
               "editorState": "default",
               "level": "danger",
@@ -18,7 +18,7 @@ amis_schema: |-
                               "actionType": "dialog",
                               "dialog": {
                                   "type": "dialog",
-                                  "title": "删除流程",
+                                  "title": "${'flows_action_del_dialog_title' | t}",
                                   "body": [
                                       {
                                           "id": "u:f6977226303b",
@@ -30,7 +30,7 @@ amis_schema: |-
                                           "body": [
                                               {
                                                   "name": "flowName",
-                                                  "label": "为了确保安全，请输入您要删除的流程名(同时会删除相关的申请单)",
+                                                  "label": "${'flows_action_del_dialog_field_flowName' | t}",
                                                   "type": "input-text",
                                                   "id": "u:5c7f7b0c4f06",
                                                   "editorState": "default",
@@ -73,10 +73,7 @@ amis_schema: |-
                                               "url": "/am/forms?methodOverride=DELETE",
                                               "method": "post",
                                               "requestAdaptor": "api.data = { 'Forms': [{ 'id': context._master.record.form }] }; return api;",
-                                              "adaptor": "",
-                                              "messages": {
-                                                  "success": "操作成功"
-                                              },
+                                              "adaptor": "return payload.ChangeSet ? {data: {...payload}, status: 0, msg: t('flows_action_del_dialog_message_success')} : {...payload, status: 1, msg: t('flows_action_del_dialog_message_failed')};",
                                               "sendOn": "${name === _master.record.name}"
                                           }
                                       }
@@ -86,13 +83,13 @@ amis_schema: |-
                                       {
                                           "type": "button",
                                           "actionType": "cancel",
-                                          "label": "取消",
+                                          "label": "${'Cancel' | t}",
                                           "id": "u:cc2293523b91"
                                       },
                                       {
                                           "type": "button",
                                           "actionType": "confirm",
-                                          "label": "确定",
+                                          "label": "${'OK' | t}",
                                           "primary": true,
                                           "id": "u:753881d2d453",
                                           "editorState": "default",
@@ -103,7 +100,7 @@ amis_schema: |-
                                                       {
                                                           "ignoreError": false,
                                                           "actionType": "custom",
-                                                          "script": "if (event.data._master.record.name != event.data._scoped.getComponentById('u:f6977226303b').props.data.flowName) {\n  doAction({\n    \"actionType\": \"toast\",\n    \"args\": {\n      \"msgType\": \"error\",\n      \"msg\": \"请确认, 输入的名称与流程名称不一致\"\n    }\n  });\n event.stopPropagation();event.preventDefault();\n}\n\n",
+                                                          "script": "if (event.data._master.record.name != event.data._scoped.getComponentById('u:f6977226303b').props.data.flowName) {\n  doAction({\n    \"actionType\": \"toast\",\n    \"args\": {\n      \"msgType\": \"error\",\n      \"msg\": t('flows_action_del_dialog_error_not_same')\n    }\n  });\n event.stopPropagation();event.preventDefault();\n}\n\n",
                                                           "args": {}
                                                       }
                                                   ]

package/main/default/objects/flows/buttons/design_form_layout.button.js

@@ -15,8 +15,11 @@ module.exports = {
         if (!record) {
             return toastr.error("未找到记录");
         }
-
-        window.open(Steedos.getRelativeUrl("/api/workflow/form_design?fid=" + record_id+`&assetUrls=${Builder.settings.assetUrls}`));
+        var locale = Builder.settings.context?.user?.language || window.navigator.language;
+        if(locale === 'en' || locale.startsWith('en-')){
+            locale = 'en-US'
+        }
+        window.open(Steedos.getRelativeUrl("/api/workflow/form_design?fid=" + record_id+`&assetUrls=${Builder.settings.assetUrls}&locale=${locale}`));
     },
     design_form_layoutVisible: function(object_name, record_id, record_permissions, data) {
         var record = data && data.record;

package/main/default/objects/flows/buttons/distributeAdmin.button.yml

@@ -5,7 +5,7 @@ amis_schema: |-
       "body": [
           {
               "type": "button",
-              "label": "设置分发",
+              "label": "${'CustomAction.flows.distributeAdmin' | t}",
               "id": "u:distributeAdmin",
               "editorState": "default",
               "onEvent": {
@@ -17,7 +17,7 @@ amis_schema: |-
                               "actionType": "dialog",
                               "dialog": {
                                   "type": "dialog",
-                                  "title": "设置分发",
+                                  "title": "${'CustomAction.flows.distributeAdmin' | t}",
                                   "body": [
                                       {
                                           "id": "u:473feaee9de7",
@@ -27,7 +27,7 @@ amis_schema: |-
                                               "url": "/api/v1/flows/${recordId}?fields=[\"_id\",\"name\",\"current\",\"distribute_optional_users_id\",\"distribute_to_self\",\"distribute_end_notification\",\"upload_after_being_distributed\"]",
                                               "method": "get",
                                               "requestAdaptor": "",
-                                              "adaptor": "const data = payload.data;\n\n\n\nconst steps = _.filter(data.current.steps, { allowDistribute: true });\n\nconst stepsInputFields = [];\n\nif (steps.length == 0) {\n  return {\n    data: {\n      \"type\": \"alert\",\n      \"body\": \"请先在流程设计器的步骤中, 设置允许分发的步骤\",\n      \"level\": \"info\",\n      \"className\": \"mb-1\"\n    }\n  }\n} else { \n\n  _.each(steps, (step) => {\n    stepsInputFields.push({\n      type: 'steedos-field',\n      config: {\n   label: step.name,\n   name: `step_distribute_flows_${step._id}`,\n  multiple: true, amis: {value: step.distribute_optional_flows},\n \n     type: 'lookup',\n        reference_to: 'flows',\n        filters: ['state', '=', 'enabled']\n      }\n    })\n  })\n\n}\n\nreturn {\n  data: {\n    \"id\": \"u:90ea4939d3d12\",\n    \"type\": \"form\",\n    \"title\": \"表单\",\n \"wrapWithPanel\": false,\n  \"mode\": \"normal\",\n    \"dsType\": \"api\",\n    \"feat\": \"Insert\",\n    \"body\": [\n      {\n        \"type\": \"steedos-field\",\n        \"config\": {\n          \"type\": \"lookup\",\n          \"label\": \"流程被分发时分发对象选择范围\",\n          \"name\": \"distribute_optional_users_id\",\n          \"deleted_lookup_record_behavior\": \"clear\",\n          \"reference_to\": \"users\",\n          \"multiple\": true,\n          \"object\": \"\"\n        },\n        \"id\": \"u:36461e5ef6f9\"\n      },\n      {\n        \"type\": \"checkbox\",\n        \"option\": \"分发时可分发给自己\",\n        \"name\": \"distribute_to_self\",\n        \"id\": \"u:e8607f80e975\"\n      },\n      {\n        \"type\": \"checkbox\",\n        \"option\": \"分发结束后提醒发起人\",\n        \"name\": \"distribute_end_notification\",\n        \"id\": \"u:f63212af4190\"\n      },\n      {\n        \"type\": \"checkbox\",\n        \"option\": \"被分发后是否允许上传附件\",\n        \"name\": \"upload_after_being_distributed\",\n        \"id\": \"u:05e00a1f59b6\"\n      },\n      ...stepsInputFields\n    ],\n    \"actions\": [\n      {\n        \"type\": \"button\",\n        \"label\": \"提交\",\n        \"onEvent\": {\n          \"click\": {\n            \"actions\": [\n              {\n                \"actionType\": \"submit\",\n                \"componentId\": \"u:90ea4939d3d1\"\n              }\n            ]\n          }\n        },\n        \"level\": \"primary\"\n      }\n    ],\n    \"resetAfterSubmit\": true,\n    \"api\": {\n      \"url\": \"/api/workflow/flow/${recordId}/settings/update_distribute_settings\",\n      \"method\": \"post\",\n      \"requestAdaptor\": \"\",\n      \"adaptor\": \"\",\n      \"messages\": {\n      }\n    },\n    \"initApi\": {\n      \"url\": \"/api/v1/flows/${recordId}?fields=[\\\"_id\\\",\\\"name\\\",\\\"current\\\",\\\"distribute_optional_users_id\\\",\\\"distribute_to_self\\\",\\\"distribute_end_notification\\\",\\\"upload_after_being_distributed\\\"]\",\n      \"method\": \"get\",\n      \"requestAdaptor\": \"\",\n      \"adaptor\": \"\",\n      \"messages\": {\n      }\n    }\n  },\n}",
+                                              "adaptor": "const data = payload.data;\n\n\n\nconst steps = _.filter(data.current.steps, { allowDistribute: true });\n\nconst stepsInputFields = [];\n\nif (steps.length == 0) {\n  return {\n    data: {\n      \"type\": \"alert\",\n      \"body\": t('flows_action_distributeAdmin_dialog_error_not_find_step'),\n      \"level\": \"info\",\n      \"className\": \"mb-1\"\n    }\n  }\n} else { \n\n  _.each(steps, (step) => {\n    stepsInputFields.push({\n      type: 'steedos-field',\n      config: {\n   label: step.name,\n   name: `step_distribute_flows_${step._id}`,\n  multiple: true, amis: {value: step.distribute_optional_flows},\n \n     type: 'lookup',\n        reference_to: 'flows',\n        filters: ['state', '=', 'enabled']\n      }\n    })\n  })\n\n}\n\nreturn {\n  data: {\n    \"id\": \"u:90ea4939d3d12\",\n    \"type\": \"form\",\n    \"title\": \"表单\",\n \"wrapWithPanel\": false,\n  \"mode\": \"normal\",\n    \"dsType\": \"api\",\n    \"feat\": \"Insert\",\n    \"body\": [\n      {\n        \"type\": \"steedos-field\",\n        \"config\": {\n          \"type\": \"lookup\",\n          \"label\": t('flows_action_distributeAdmin_dialog_field_distribute_optional_users_id'),\n          \"name\": \"distribute_optional_users_id\",\n          \"deleted_lookup_record_behavior\": \"clear\",\n          \"reference_to\": \"users\",\n          \"multiple\": true,\n          \"object\": \"\"\n        },\n        \"id\": \"u:36461e5ef6f9\"\n      },\n      {\n        \"type\": \"checkbox\",\n        \"option\": t('flows_action_distributeAdmin_dialog_field_distribute_to_self'),\n        \"name\": \"distribute_to_self\",\n        \"id\": \"u:e8607f80e975\"\n      },\n      {\n        \"type\": \"checkbox\",\n        \"option\": t('flows_action_distributeAdmin_dialog_field_distribute_end_notification'),\n        \"name\": \"distribute_end_notification\",\n        \"id\": \"u:f63212af4190\"\n      },\n      {\n        \"type\": \"checkbox\",\n        \"option\": t('flows_action_distributeAdmin_dialog_field_upload_after_being_distributed'),\n        \"name\": \"upload_after_being_distributed\",\n        \"id\": \"u:05e00a1f59b6\"\n      },\n      ...stepsInputFields\n    ],\n    \"actions\": [\n      {\n        \"type\": \"button\",\n        \"label\": t('Submit'),\n        \"onEvent\": {\n          \"click\": {\n            \"actions\": [\n              {\n                \"actionType\": \"submit\",\n                \"componentId\": \"u:90ea4939d3d1\"\n              }\n            ]\n          }\n        },\n        \"level\": \"primary\"\n      }\n    ],\n    \"resetAfterSubmit\": true,\n    \"api\": {\n      \"url\": \"/api/workflow/flow/${recordId}/settings/update_distribute_settings\",\n      \"method\": \"post\",\n      \"requestAdaptor\": \"\",\n      \"adaptor\": \"\",\n      \"messages\": {\n      }\n    },\n    \"initApi\": {\n      \"url\": \"/api/v1/flows/${recordId}?fields=[\\\"_id\\\",\\\"name\\\",\\\"current\\\",\\\"distribute_optional_users_id\\\",\\\"distribute_to_self\\\",\\\"distribute_end_notification\\\",\\\"upload_after_being_distributed\\\"]\",\n      \"method\": \"get\",\n      \"requestAdaptor\": \"\",\n      \"adaptor\": \"\",\n      \"messages\": {\n      }\n    }\n  },\n}",
                                               "messages": {}
                                           }
                                       }
@@ -37,13 +37,13 @@ amis_schema: |-
                                       {
                                           "type": "button",
                                           "actionType": "cancel",
-                                          "label": "取消",
+                                          "label": "${'Cancel' | t}",
                                           "id": "u:7cfe0ffa8b8f"
                                       },
                                       {
                                           "type": "button",
                                           "actionType": "confirm",
-                                          "label": "确定",
+                                          "label": "${'OK' | t}",
                                           "primary": true,
                                           "id": "u:c271fb676733"
                                       }

package/main/default/objects/forms/forms.object.yml

@@ -39,7 +39,7 @@ fields:
     filterable: true
   mode:
     type: select
-    label: Mode
+    label: Form Mode
     options:
       - label: Normal
         value: normal
@@ -48,7 +48,18 @@ fields:
       - label: Inline
         value: inline
     readonly: true
-    name: style
+    name: mode
+    filterable: true
+  wizard_mode:
+    type: select
+    label: Wizard Mode
+    options:
+      - label: Vertical
+        value: vertical
+      - label: Horizontal
+        value: horizontal
+    readonly: true
+    name: wizard_mode
     filterable: true
   description:
     type: textarea

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

@@ -72,7 +72,7 @@
 															"actionType": "dialog",
 															"dialog": {
 																"type": "dialog",
-																"title": "编辑表单",
+																"title": "${'flows_page_record_action_edit_dialog_title' | t}",
 																"body": [
 																	{
 																		"type": "form",
@@ -80,13 +80,13 @@
 																		"body": [
 																			{
 																				"type": "input-text",
-																				"label": "表单名称",
+																				"label": "${'flows_page_record_field_form_name' | t}",
 																				"name": "name",
 																				"id": "u:84af37d53da42"
 																			},
 																			{
 																				"type": "textarea",
-																				"label": "表单描述",
+																				"label": "${'flows_page_record_field_form_description' | t}",
 																				"name": "description",
 																				"id": "u:84af37d53da4",
 																				"minRows": 3,
@@ -94,7 +94,7 @@
 																			},
 																			{
 																				"type": "textarea",
-																				"label": "标题公式",
+																				"label": "${'flows_page_record_field_form_name_forumla' | t}",
 																				"name": "name_forumla",
 																				"id": "u:69b6536e9fd8",
 																				"minRows": 3,
@@ -102,7 +102,7 @@
 																			},
 																			{
 																				"type": "editor",
-																				"label": "表单脚本",
+																				"label": "${'flows_page_record_field_form_script' | t}",
 																				"name": "form_script",
 																				"id": "u:025f8c4f09b6",
 																				"minRows": 3,
@@ -163,13 +163,13 @@
 									"body": [
 										{
 											"type": "input-text",
-											"label": "表单名称",
+											"label": "${'flows_page_record_field_form_name' | t}",
 											"name": "name",
 											"id": "u:84af37d53da42"
 										},
 										{
 											"type": "textarea",
-											"label": "表单描述",
+											"label": "${'flows_page_record_field_form_description' | t}",
 											"name": "description",
 											"id": "u:84af37d53da4",
 											"minRows": 3,
@@ -177,7 +177,7 @@
 										},
 										{
 											"type": "textarea",
-											"label": "标题公式",
+											"label": "${'flows_page_record_field_form_name_forumla' | t}",
 											"name": "name_forumla",
 											"id": "u:69b6536e9fd8",
 											"minRows": 3,
@@ -185,7 +185,7 @@
 										},
 										{
 											"type": "editor",
-											"label": "表单脚本",
+											"label": "${'flows_page_record_field_form_script' | t}",
 											"name": "form_script",
 											"id": "u:025f8c4f09b6",
 											"minRows": 3,

package/main/default/routes/flow_form_design.ejs

@@ -66,7 +66,10 @@
       useOpenAPI: useOpenAPI,
       id: "<%=id%>",
       pageId: "<%=id%>",
-      hiddenDeploy: true
+      hiddenDeploy: true,
+      title: "<%=locale%>" === 'zh-CN' ? '流程表单设计器': 'Flow Form Designer',
+      saveText: "<%=locale%>" === 'zh-CN' ? '保存': 'Save',
+      deployText: "<%=locale%>" === 'zh-CN' ? '发布': 'Deploy',
     };
 
     let comp = document.querySelector("builder-fiddle");

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

@@ -35,7 +35,7 @@ router.get('/api/workflow/form_design', auth.requireAuthentication, async functi
         //     authToken: userSession.authToken
         // }
         let locale = "zh-CN";
-        if (req.query.locale == "en-us") {
+        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/triggers/amis_form_design.trigger.js

@@ -526,8 +526,10 @@ module.exports = {
             form.current.amis_schema = 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表的功能

package/main/default/utils/designerManager.js

@@ -223,6 +223,7 @@ async function updateForm(formId, form, forms, flows, currentUserId) {
     current.name_forumla = form["current"]["name_forumla"];
     current.style = form["current"]["style"];
     current.mode = form["current"]["mode"];
+    current.wizard_mode = form["current"]["wizard_mode"];
 
     formUpdateObj.$set = {
         'current': current,
@@ -232,6 +233,7 @@ async function updateForm(formId, form, forms, flows, 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"],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos-labs/plugin-workflow",
-  "version": "3.0.0-beta.22",
+  "version": "3.0.0-beta.24",
   "main": "package.service.js",
   "license": "MIT",
   "scripts": {

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': {
             }
         }