@steedos-labs/plugin-workflow 3.0.0-beta.10 → 3.0.0-beta.12

package/main/default/manager/push_manager.js

@@ -437,7 +437,7 @@ pushManager.get_badge = async function (send_from, user_id) {
                             if (((ref4 = appKeyValue.value) != null ? ref4[appName] : void 0) !== categoryBadge) {
                                 _set = {};
                                 _set['value.' + appName] = categoryBadge;
-                                await getObject('steedos_keyvalues').update(appKeyValue._id, set)
+                                await getObject('steedos_keyvalues').update(appKeyValue._id, _set)
                                 continue;
                             }
                         } else {

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

@@ -4,6 +4,7 @@ label: Workflow Category
 hidden: true
 version: 2
 enable_dataloader: false
+enable_enhanced_lookup: true
 fields:
   name:
     type: text

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

@@ -573,6 +573,7 @@ actions:
                                                         "name": "category",
                                                         "deleted_lookup_record_behavior": "clear",
                                                         "reference_to": "categories",
+                                                        "required": true,
                                                         "multiple": false
                                                     },
                                                     "id": "u:36461e5ef6f92"

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

@@ -3,6 +3,7 @@ const objectql = require("@steedos/objectql");
 const _ = require('underscore');
 const bodyParser = require('body-parser');
 const steedosI18n = require("@steedos/i18n");
+const lodash = require('lodash');
 const { _makeNewID, getCollection } = require('../utils/collection');
 
 const designerManager = require('../utils/designerManager');
@@ -151,11 +152,52 @@ router.post('/am/forms', async function (req, res) {
                 modified_by: userId,
                 fields: form["current"]["fields"]
             };
+            let amis_schema = null;
             if (objectName) {
                 current.fields = Object.values(formFields).concat(tables);
+                amis_schema = {
+                    type: "form",
+                    id: "instanceForm",
+                    name: "instanceForm",
+                    body: [],
+                    "actions": [],
+                    "wrapWithPanel": false
+                }
+
+                const getFieldEditTpl = async (field) => {
+                    if(field.steedos_field){
+                        const config = field.steedos_field;
+                        if(config.type === 'formula' || config.type === 'summary'){
+                            if(config.data_type == 'boolean'){
+                                config.type = "checkbox"
+                            }else if(config.data_type == 'number' || config.data_type == 'currency' ){
+                                config.type = 'number'
+                            }else if(config.data_type == 'percent'){
+                                config.type = "number"
+                            }else {
+                                config.type = config.data_type
+                            }
+                        }
+                        return {
+                            type: `sfield-${lodash.toLower(lodash.camelCase(field.steedos_field.type))}`,
+                            config: config
+                        }
+                    }
+                }
+
+                if (current.fields) {
+                    for (let i = 0; i < current.fields.length; i++) {
+                        const temp = await getFieldEditTpl(current.fields[i]);
+                        if (temp) {
+                            amis_schema.body.push(temp);
+                        }
+                    }
+                }
             }
             newForm.current = current;
             newForm.historys = [];
+            newForm.amis_schema = amis_schema ? JSON.stringify(amis_schema) : amis_schema
+            newForm.current.amis_schema = newForm.amis_schema;
             await objectql.getObject('forms').insert(newForm);
             const insertedForm = await formCollection.findOne({_id: newForm._id})
             insertedForms.push(insertedForm);
@@ -181,7 +223,7 @@ router.post('/am/forms', async function (req, res) {
                 name: form["name"],
                 app: form["app"],
                 category: form["category"],
-                enable_amisform: true
+                enable_amisform: false
             }
             if (companyId) {
                 flow.company_id = companyId;

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

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

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;

package/package.json

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