@steedos/migrate 2.5.0-beta.9 → 2.5.1

package/migrations/1673342303163-add-instance-tasks.js

@@ -2,18 +2,20 @@
  * @Author: sunhaolin@hotoa.com
  * @Date: 2023-01-10 17:18:23
  * @LastEditors: sunhaolin@hotoa.com
- * @LastEditTime: 2023-02-11 10:49:47
+ * @LastEditTime: 2023-05-17 10:42:47
  * @Description: 
  */
 'use strict'
 
 const client = require("../client");
+const _ = require('lodash')
 
 module.exports.up = async function (next) {
     await client.connect()
     const db = client.db()
     const instanceColl = db.collection('instances')
     const tasksColl = db.collection('instance_tasks')
+    const formColl = db.collection('forms')
     // 若已有instance_tasks则不执行
     const tasksCount = await tasksColl.find({}).count()
     if (tasksCount > 0) {
@@ -24,6 +26,8 @@ module.exports.up = async function (next) {
     await instanceColl.find({}).forEach(async function (insDoc) {
         var docs = [];
         var latestApproveIndexMap = {}
+        const formDoc = await formColl.findOne({ _id: insDoc.form })
+        const extras = caculateExtras(insDoc.values, formDoc, insDoc.form_version)
         insDoc.traces.forEach(function (tDoc, tIdx) {
             if (tIdx == 0 && (!insDoc.distribute_from_instance && !insDoc.forward_from_instance)) {
                 // 只有分发或转发的申请单，开始节点生成instance_tasks
@@ -54,6 +58,7 @@ module.exports.up = async function (next) {
                     aDoc['keywords'] = insDoc.keywords;
                     aDoc['is_archived'] = insDoc.is_archived;
                     aDoc['category'] = insDoc.category;
+                    aDoc['extras'] = extras;
                     docs.push(aDoc)
                     if (aDoc.is_finished) { //记录下需要设置is_latest_approve的游标，如有重复审批则更新为最新的
                         latestApproveIndexMap[aDoc.handler] = docs.length - 1
@@ -71,9 +76,11 @@ module.exports.up = async function (next) {
         if (docs.length > 0) {
             try {
                 await tasksColl.insertMany(docs);
+                if (extras) {
+                    await instanceColl.updateOne({ _id: insDoc._id }, { $set: { extras: extras } })
+                }
             } catch (e) {
-                print(e);
-                printjson(docs.length)
+                console.error(e);
             }
         }
     })
@@ -86,3 +93,65 @@ module.exports.down = async function (next) {
     const tasksColl = db.collection('instance_tasks')
     await tasksColl.remove({})
 }
+
+// 计算出在表单字段中选择了列表显示的字段
+function caculateExtras(values, formDoc, formVersionId) {
+    if (_.isEmpty(values) || _.isEmpty(formDoc) || _.isEmpty(formVersionId)) {
+        return
+    }
+
+    const extras = {}
+    const formVersion = getFormVersion(formDoc, formVersionId)
+    if (formVersion) {
+        _.each(formVersion.fields, function (field) {
+            if (field.is_list_display) {
+                extras[field.code] = values[field.code]
+            } else if (field.type === 'table') {
+                // 表格
+                if (values[field.code]) {
+                    const tableExtras = []
+                    _.each(values[field.code], function (s_value) {
+                        const rowValues = {}
+                        _.each(field.fields, function (s_field) {
+                            if (s_field.is_list_display) {
+                                rowValues[s_field.code] = s_value[s_field.code]
+                            }
+                        });
+                        if (!_.isEmpty(rowValues)) {
+                            tableExtras.push(rowValues)
+                        }
+                    });
+                    if (!_.isEmpty(tableExtras)) {
+                        extras[field.code] = tableExtras
+                    }
+                }
+            } else if (field.type === 'section') {
+                // 分组
+                _.each(field.fields, function (s_field) {
+                    if (s_field.is_list_display) {
+                        extras[s_field.code] = values[s_field.code]
+                    }
+                });
+            }
+        });
+    }
+
+
+    if (_.isEmpty(extras)) {
+        return
+    }
+
+    return extras
+}
+
+function getFormVersion(form, form_version) {
+    var form_v = null;
+    if (form_version === form.current._id) {
+        form_v = form.current;
+    } else {
+        form_v = _.find(form.historys, function (form_h) {
+            return form_version === form_h._id;
+        });
+    }
+    return form_v;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/migrate",
-  "version": "2.5.0-beta.9",
+  "version": "2.5.1",
   "description": "Migration scripts for steedos",
   "main": "index.js",
   "license": "MIT",
@@ -12,5 +12,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a2623b433dd42632dc54d23c51b718bd4d1a2fdc"
+  "gitHead": "793bcd4718210c693aa52d0280e9b1b2a8d3230e"
 }