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

package/main/default/manager/push_manager.js

@@ -553,7 +553,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 +590,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]
@@ -631,7 +631,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 +651,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 +780,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)) {

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

@@ -37,6 +37,19 @@ fields:
     readonly: true
     name: style
     filterable: true
+  mode:
+    type: select
+    label: Mode
+    options:
+      - label: Normal
+        value: normal
+      - label: Horizontal
+        value: horizontal
+      - label: Inline
+        value: inline
+    readonly: true
+    name: style
+    filterable: true
   description:
     type: textarea
     label: Description

package/main/default/objects/instances/buttons/instance_delete_many.button.yml

@@ -20,11 +20,11 @@ amis_schema: |-
                               "actionType": "dialog",
                               "dialog": {
                                   "type": "dialog",
-                                  "title": "系统消息",
+                                  "title": "${'CustomLabels.alert_info' | t}",
                                   "body": [
                                       {
                                           "type": "tpl",
-                                          "tpl": "确认要删除吗?",
+                                          "tpl": "${'CustomLabels.confirm_delete' | t}",
                                           "wrapperComponent": "",
                                           "inline": false,
                                           "id": "u:0c42a6d112aa"
@@ -38,7 +38,7 @@ amis_schema: |-
                                   "actions": [
                                       {
                                           "type": "button",
-                                          "label": "取消",
+                                          "label": "${'Cancel' | t}",
                                           "onEvent": {
                                               "click": {
                                                   "actions": [
@@ -53,7 +53,7 @@ amis_schema: |-
                                       },
                                       {
                                           "type": "button",
-                                          "label": "确认",
+                                          "label": "${'OK' | t}",
                                           "onEvent": {
                                               "click": {
                                                   "actions": [

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

@@ -1,6 +1,7 @@
 CustomApplications:
   approve_workflow:
-    name: Approval Workflow
-    description: 
+    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

@@ -525,7 +525,9 @@ module.exports = {
             form.current.fields = getFinalFormFields(inputFields);
             form.current.amis_schema = amis_schema;
             form.current.style = formSchema.style;
+            form.current.mode = formSchema.mode;
             form.style = formSchema.style;
+            form.mode = formSchema.mode;
             form.description = formSchema.description;
 
             // 以下为将解析字段存储的功能,为将解析字段存储至数据库forms表的功能

package/main/default/utils/designerManager.js

@@ -222,6 +222,7 @@ async function updateForm(formId, form, forms, flows, currentUserId) {
     current.form_script = form["current"]["form_script"];
     current.name_forumla = form["current"]["name_forumla"];
     current.style = form["current"]["style"];
+    current.mode = form["current"]["mode"];
 
     formUpdateObj.$set = {
         'current': current,
@@ -230,6 +231,7 @@ async function updateForm(formId, form, forms, flows, currentUserId) {
         'modified_by': currentUserId,
         'is_valid': form["is_valid"],
         'style': form["style"],
+        'mode': form["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.20",
+  "version": "3.0.0-beta.22",
   "main": "package.service.js",
   "license": "MIT",
   "scripts": {