@steedos-labs/plugin-workflow 3.0.0-beta.14 → 3.0.0-beta.16

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

@@ -687,7 +687,10 @@ actions:
     'on': list
     todo: !<tag:yaml.org,2002:js/function> |-
       function (object_name, record_id, fields) {
-              const locale = 'ZH-CN';
+              let locale = 'ZH-CN';
+              if(Builder.settings.context.user.language != 'zh-CN'){
+                locale = 'en-us'
+              }
               const space = Builder.settings.context.user.spaceId;
               const flow = null;
               const companyId = Builder.settings.context.user.company_id;
@@ -721,7 +724,10 @@ actions:
     todo: !<tag:yaml.org,2002:js/function> |-
       function (object_name, record_id, record_permissions, data) {
               const flow = data && data.record;
-              const locale = 'ZH-CN';
+              let locale = 'ZH-CN';
+              if(Builder.settings.context.user.language != 'zh-CN'){
+                locale = 'en-us'
+              }
               const space = Builder.settings.context.user.spaceId;
               const companyId = Builder.settings.context.user.company_id;
               let url = `/applications/designer/current/${locale.toLocaleLowerCase()}/?spaceId=${space}` + `&flowId=${flow._id}`;
@@ -790,8 +796,8 @@ actions:
     todo: !<tag:yaml.org,2002:js/function> |-
       function (object_name, record_id, fields, data) {
         var record = data && data.record;
-        var userSession = Creator.USER_CONTEXT;
-        var authorization = "Bearer " + userSession.spaceId + "," + userSession.user.authToken;
+        var userSession = Builder.settings.context.user;
+        var authorization = "Bearer " + userSession.spaceId + "," + userSession.authToken;
         var formId = _.isObject(record.form) ? record.form._id : record.form;
         window.$.ajax({
           type: "POST",

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

@@ -22,6 +22,21 @@ fields:
     readonly: true
     name: state
     filterable: true
+  style:
+    type: select
+    label: Style
+    options:
+      - label: Table
+        value: table
+      - label: Groups
+        value: groups
+      - label: Tabs
+        value: tabs
+      - label: Wizard
+        value: wizard
+    readonly: true
+    name: style
+    filterable: true
   description:
     type: textarea
     label: Description

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

@@ -84,6 +84,7 @@ router.get('/am/designer/startup', async function (req, res) {
 router.post('/am/forms', async function (req, res) {
     try {
         let userId = req.user.userId;
+        let language = req.user.language;
         let data = req.body;
         let formCollection = await getCollection('forms');
         let flowCollection = await getCollection('flows');
@@ -156,12 +157,13 @@ router.post('/am/forms', async function (req, res) {
             if (objectName) {
                 current.fields = Object.values(formFields).concat(tables);
                 amis_schema = {
-                    type: "form",
+                    type: 'steedos-flow-form',
                     id: "instanceForm",
-                    name: "instanceForm",
-                    body: [],
-                    "actions": [],
-                    "wrapWithPanel": false
+                    name: newForm.name,
+                    label: newForm.name,
+                    description: newForm.description,
+                    className: "steedos-flow-form steedos-flow-layout-page",
+                    body: []
                 }
 
                 const getFieldEditTpl = async (field) => {
@@ -250,7 +252,7 @@ router.post('/am/forms', async function (req, res) {
             flow.perms = flowPerms;
             let flow_current = {
                 _id: _makeNewID(),
-                steps: await designerManager.makeSteps(userId, newForm.current.fields),
+                steps: await designerManager.makeSteps(userId, newForm.current.fields, language),
                 _rev: 1,
                 flow: flow._id,
                 form_version: form["current"]["id"],

package/main/default/routes/flow_form_design.ejs

@@ -115,6 +115,12 @@
             tenantId,
             authToken,
           },
+          global: {
+            userId: userId,
+            spaceId: tenantId,
+            user: <%- JSON.stringify(userSession) %>, 
+            now: new Date(),
+          }
         },
       };
 
@@ -144,14 +150,14 @@
 
           if (!schema) {
             //进if说明schema字段为空 说明为旧表单 对schema重新赋值
-            schema =
-            {
-              type: "form",
+            schema = {
+              type: 'steedos-flow-form',
               id: "instanceForm",
-              name: "instanceForm",
-              body: [],
-              "actions": [],
-              "wrapWithPanel": false
+              name: result.data.data.record.name,
+              label: result.data.data.record.name,
+              description: result.data.data.record.description,
+              className: "steedos-flow-form steedos-flow-layout-page",
+              body: []
             }
             if (result.data.data.record.current.fields) {
               for (let i = 0; i < result.data.data.record.current.fields.length; i++) {
@@ -190,6 +196,14 @@
           schema.data.context.tenantId = tenantId;
           schema.data.context.userId = userId;
           schema.data.context.authToken = authToken;
+
+          schema.data.global = {
+            userId: userId,
+            spaceId: tenantId,
+            user: <%- JSON.stringify(userSession) %>, 
+            now: new Date(),
+          }
+
           return schema || initialContent
         }
       } else {
@@ -462,6 +476,7 @@
       );
       if (schema.data && typeof schema.data.context === 'object') {
         delete schema.data.context
+        delete schema.data.global
       }
 
       return await axios.post(

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;
@@ -521,6 +524,9 @@ module.exports = {
             // 数据库更新操作：将forms表current的fields字段更新为最终数组
             form.current.fields = getFinalFormFields(inputFields);
             form.current.amis_schema = amis_schema;
+            form.current.style = formSchema.style;
+            form.style = formSchema.style;
+            form.description = formSchema.description;
 
             // 以下为将解析字段存储的功能,为将解析字段存储至数据库forms表的功能
             let updatedForms = [];

package/main/default/utils/designerManager.js

@@ -221,6 +221,7 @@ 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"];
 
     formUpdateObj.$set = {
         'current': current,
@@ -228,6 +229,7 @@ async function updateForm(formId, form, forms, flows, currentUserId) {
         'modified': now,
         'modified_by': currentUserId,
         'is_valid': form["is_valid"],
+        'style': form["style"],
         'description': form["description"],
         'help_text': form["help_text"],
         'error_message': form["error_message"],
@@ -293,7 +295,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 +305,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 +338,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,6 +1,6 @@
 {
   "name": "@steedos-labs/plugin-workflow",
-  "version": "3.0.0-beta.14",
+  "version": "3.0.0-beta.16",
   "main": "package.service.js",
   "license": "MIT",
   "scripts": {