@steedos-labs/plugin-workflow 3.0.22 → 3.0.24

package/main/default/manager/uuflow_manager.js

@@ -165,9 +165,10 @@ UUFlowManager.getSpaceUser = async function (space_id, user_id, options = {}) {
  * @throws {Error} If flow not found
  */
 UUFlowManager.getFlow = async function (flow_id, options = {}) {
+    let now;
     UUFlowManager.stats.getFlow++;
     if (process.env.STEEDOS_DEBUG) {
-        const now = new Date().toISOString();
+        now = new Date().toISOString();
         console.time('UUFlowManager.getFlow' + now);
     }
     
@@ -897,7 +898,7 @@ UUFlowManager.getNextSteps = async function (instance, flow, step, judge, values
                 }
                 else {
                     step_line_condition = step_line.condition.replace(reg, (vowel) => {
-                        return prefix + vowel.replace(/\{\s*/, "[\"").replace(/\s*\}/, "\"]").replace(/\s*\.\s*/g, "\"][\"");
+                        return prefix + vowel.replace(/\{\s*/, "[\"").replace(/\s*\}/, "\"]").replace(/\s*\.\s*/g, "\"]?.[\"");
                     });
                     allow = UUFlowManager.calculateCondition(__values, step_line_condition);
                 }
@@ -1029,6 +1030,9 @@ UUFlowManager.getNextSteps = async function (instance, flow, step, judge, values
             }
         }
     }
+
+    // rev_nextSteps 不能包含当前步骤
+    rev_nextSteps = rev_nextSteps.filter(ns => ns !== step._id);
     
     return _.uniq(rev_nextSteps);
 };
@@ -4261,6 +4265,7 @@ UUFlowManager.draft_save_instance = async function (ins, userId) {
                 submitter: 1,
                 traces: 1,
                 form: 1,
+                form_version: 1,
                 flow_version: 1,
                 space: 1,
                 flow: 1
@@ -4339,6 +4344,65 @@ UUFlowManager.draft_save_instance = async function (ins, userId) {
         }
     }
 
+    // Convert date/datetime field values from ISO strings to Date objects
+    // Fetch form to check field types and get name formula
+    // For draft save, always use current form version (not historys which could be very large)
+    const form = await db.forms.findOne(
+        { _id: form_id },
+        { projection: { 'current._id': 1, 'current.fields': 1, 'current.name_forumla': 1 } }
+    );
+    
+    // Draft save always uses current form version
+    const formVersion = form?.current;
+    
+    // Convert date strings to Date objects for proper MongoDB storage
+    if (formVersion && formVersion.fields && values) {
+        const convertFieldValue = (field, value) => {
+            if (!value) return value;
+            
+            // Handle date and datetime fields - convert ISO strings to Date objects
+            if (field.type === 'date' || field.type === 'datetime') {
+                // Check if value is a string (ISO date format from frontend)
+                if (typeof value === 'string') {
+                    const dateObj = new Date(value);
+                    // Validate it's a valid date
+                    if (!isNaN(dateObj.getTime())) {
+                        return dateObj;
+                    }
+                }
+            }
+            // Handle table fields (subforms)
+            else if (field.type === 'table' && Array.isArray(value) && field.fields) {
+                return value.map(row => {
+                    const convertedRow = {...row};
+                    field.fields.forEach(subField => {
+                        if (row[subField.code] !== undefined) {
+                            convertedRow[subField.code] = convertFieldValue(subField, row[subField.code]);
+                        }
+                    });
+                    return convertedRow;
+                });
+            }
+            
+            return value;
+        };
+        
+        // Process all form fields
+        formVersion.fields.forEach(field => {
+            if (field.type === 'section' && field.fields) {
+                // Process section's child fields
+                field.fields.forEach(sectionField => {
+                    if (values[sectionField.code] !== undefined) {
+                        values[sectionField.code] = convertFieldValue(sectionField, values[sectionField.code]);
+                    }
+                });
+            } else if (values[field.code] !== undefined) {
+                // Process regular fields
+                values[field.code] = convertFieldValue(field, values[field.code]);
+            }
+        });
+    }
+
     setObj[key_str + 'values'] = values;
     setObj[key_str + 'description'] = description;
     setObj[key_str + 'judge'] = 'submitted';
@@ -4349,11 +4413,6 @@ UUFlowManager.draft_save_instance = async function (ins, userId) {
     }
 
     // Calculate instance name
-    const form = await db.forms.findOne(
-        { _id: form_id },
-        { projection: { 'current.name_forumla': 1 } }
-    );
-
     if (form?.current?.name_forumla) {
         setObj.name = await UUFlowManager.getInstanceName(ins, values);
         if(result !== 'upgraded'){

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

@@ -1,6 +1,22 @@
 {
   "type": "page",
   "body": [
+    {
+      "type": "button",
+      "label": "刷新",
+      "className": "steedos-workflow-reload-btn hidden",
+      "onEvent": {
+        "click": {
+          "actions": [
+            {
+              "componentId": "u:d6db0c84f150",
+              "groupType": "component",
+              "actionType": "rebuild"
+            }
+          ]
+        }
+      }
+    },
     {
       "type": "wrapper",
       "className": "steedos-instance-detail-wrapper m-0 p-0 flex-1 focus:outline-none lg:order-last sm:m-4 shadow sm:rounded",

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

@@ -7,7 +7,21 @@ const _ = require('lodash');
 router.delete('/api/workflow/v2/attachment/:instanceId/:id', requireAuthentication, async function (req, res) {
     try {
         const { instanceId, id} = req.params;
-        await getObject('cfs_instances_filerecord').delete(id);
+        const fileObject = getObject('cfs_instances_filerecord');
+        await fileObject.delete(id);
+
+        const files = await fileObject.find({
+            filters: [['metadata.parent', '=', instanceId]],
+            sort: 'uploadedAt desc', 
+            top: 1
+        });
+
+        if (files && files.length > 0) {
+            const current = files[0];
+            const metadata = Object.assign({}, current.metadata || {}, { current: true });
+            await fileObject.update(current._id, { metadata });
+        }
+
         res.status(200).send({
             status: 0
         })

package/main/default/routes/flow_form_design.ejs

@@ -281,6 +281,24 @@
         }
       }
 
+      // Handle new approval_comments field format from migration
+      if(field.type === 'steedos-field' && field.config?.type === 'approval_comments'){
+        return {
+          type: 'sfield-approvalcomments',
+          _id: field._id || field.id,
+          label: field.config.label,
+          name: field.config.name,
+          required: field.is_required || field.required,
+          className: (field.is_wide ? 'is_wide' : '') +
+            (field.is_list_display ? ' is_list_display' : '') +
+            (field.is_searchable ? ' is_searchable' : ''),
+          id: field.id,
+          config: field.config,
+          visibleOn: field.visibleOn,
+          requiredOn: field.requiredOn
+        };
+      }
+
       const tpl = {
         _id: field._id,
         label: field.name || field.code,

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

@@ -1,6 +1,7 @@
 const _ = require('lodash');
 const desingerManager = require('../utils/designerManager');
 const objectql = require("@steedos/objectql");
+const auth = require("@steedos/auth");
 const { ObjectId } = require("mongodb");
 const AmisInputTypes = [
     //44个表单项
@@ -558,7 +559,9 @@ module.exports = {
             let updatedFlows = [];
             let userId = this.userId || this.doc?.modified_by;
             let spaceId = this.spaceId || this.doc?.space;
-            let roles = this.roles;
+
+            let userSession = await auth.getSessionByUserId(userId, spaceId)
+            let roles = userSession.roles;
             // 执行者的身份校验
             await desingerManager.checkSpaceUserBeforeUpdate(spaceId, userId, roles);
             // 更新表单

package/main/default/utils/designerManager.js

@@ -146,12 +146,11 @@ async function checkSpaceUserBeforeUpdate(spaceId, userId, roles) {
     let spaceUser = (await getObject('space_users').find({
         filters: `(space eq '${spaceId}') and (user eq '${userId}')`
     }))[0];
-
     if (!spaceUser) {
         throw new Error('该用户不存在于该工作区中');
     }
 
-    if (!roles.includes('workflow_admin')) { // 校验是否是单位管理员
+    if (!_.includes(roles, 'workflow_admin')) { // 校验是否是单位管理员
         throw new Error('该用户无操作权限');
     }
 };

package/package.json

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