@steedos-labs/plugin-workflow 3.0.43 → 3.0.45

package/public/workflow/index.css

@@ -306,11 +306,13 @@ tbody .color-priority-muted *{
 
 .steedos-instance-detail-wrapper{
     height: calc(100vh - 101px);
+    height: calc(100dvh - 101px);
 }
 
 @media (max-width: 768px){
     .steedos-instance-detail-wrapper{
         height: calc(100vh - 64px);
+        height: calc(100dvh - 64px);
     }
 }
 
@@ -553,7 +555,28 @@ tbody .color-priority-muted *{
     background: var(--button-primary-default-bg-color) !important
 }
 
-.ant-btn-color-primary:not[disabled] {
+.ant-btn-color-primary {
     background: var(--button-primary-default-bg-color) !important;
     border-color: var(--button-primary-default-bg-color) !important;
+}
+
+.ant-btn-color-primary:disabled{
+    border-color: #d9d9d9 !important;
+    color: rgba(0, 0, 0, 0.25) !important;
+    background: rgba(0, 0, 0, 0.04) !important;
+    box-shadow: none !important;
+}
+
+.select-popup-high-z {
+  z-index: 9999 !important;
+}
+
+.md\:grid-cols-2 {
+    @media (width >= 48rem) {
+        grid-template-columns: repeat(2, minmax(0, 1fr));
+    }
+}
+
+.ant-modal-root .multiselect-form-mode.ant-select-multiple .ant-select-selector .ant-select-selection-wrap{
+  min-height: 36px !important;
 }

package/src/rests/approvalCommentsConsole.js

@@ -273,6 +273,15 @@ module.exports = {
         </div>
         
         <div class="tab-content active" id="execute">
+            <div style="background:#fffbe6;border-left:4px solid #d97706;border-radius:6px;padding:20px 24px;margin-bottom:24px;">
+                <p style="font-weight:bold;font-size:16px;margin-bottom:12px;">⚠️ 注意事项</p>
+                <ol style="padding-left:20px;line-height:2;color:#2d3748;">
+                    <li>升级和还原脚本不但会修改表单<strong>当前版本</strong>（<code style="background:#edf2f7;padding:2px 6px;border-radius:3px;color:#e53e3e;">current</code> 中的字段），也会修改<strong>历史版本</strong>（<code style="background:#edf2f7;padding:2px 6px;border-radius:3px;color:#e53e3e;">historys</code> 中的字段）。</li>
+                    <li>升级和还原脚本会<strong>递归处理嵌套 section 分组字段</strong>，即 <code style="background:#edf2f7;padding:2px 6px;border-radius:3px;color:#e53e3e;">current.fields[*].fields[*]</code> 和 <code style="background:#edf2f7;padding:2px 6px;border-radius:3px;color:#e53e3e;">historys[*].fields[*].fields[*]</code> 中的字段均会被处理。</li>
+                    <li>升级后，如果在流程的<strong>表单设计器中保存过</strong>，该表单就<strong>无法还原到最初的状态</strong>了。因此，对于可能需要执行还原操作的表单，务必在升级后先测试确认一次，确认正常后再在表单设计器中执行保存操作。</li>
+                </ol>
+            </div>
+            
             <div class="operation-panel">
                 <h3>🧪 集成测试 (Integration Test)</h3>
                 <p style="color: #666; margin-bottom: 15px;">

package/src/rests/getPageSchema.js

@@ -0,0 +1,58 @@
+const objectql = require('@steedos/objectql');
+
+module.exports = {
+    rest: {
+        method: 'GET',
+        fullPath: '/api/workflow/pages/schema'
+    },
+    params: {
+        pageId: { type: 'string' }
+    },
+    async handler(ctx) {
+        const { pageId } = ctx.params;
+        const userSession = ctx.meta.user;
+
+        if (!pageId) {
+            return {};
+        }
+
+        // 直接 broker.call page.getMeSchema，完全绕过 vm2 沙箱
+        // 参考 steedos-platform/services/service-pages/main/default/routes/page_schema.router.js
+        // flow_selector 这个 page 的 type 固定为 'page'
+        const result = await objectql.getSteedosSchema().broker.call('page.getMeSchema', {
+            type: 'page',
+            pageId: pageId
+        }, {
+            meta: { user: userSession }
+        });
+
+        if (!result || !result.schema) {
+            return {};
+        }
+
+        // result.schema 可能是字符串（JSON）或对象，统一处理
+        let schema = result.schema;
+        if (typeof schema === 'string') {
+            try {
+                schema = JSON.parse(schema);
+            } catch (e) {
+                return {};
+            }
+        }
+
+        // 返回与旧接口一致的结构，包含 inject + assets（tailwind CSS）+ body
+        // 参考 steedos-platform/services/service-pages/main/default/functions/pages_schema.function.yml
+        return {
+            type: 'inject',
+            assets: [
+                {
+                    type: 'css',
+                    id: 'page-css',
+                    src: `/api/v6/pages/${pageId}/current/tailwind.css`,
+                    location: 'start'
+                }
+            ],
+            body: [schema]
+        };
+    }
+};

package/src/rests/index.js

@@ -16,4 +16,5 @@ module.exports = {
     rollbackApprovalCommentsField: require('./rollbackApprovalCommentsField'),
     integrationTestApprovalComments: require('./integrationTestApprovalComments'),
     approvalCommentsConsole: require('./approvalCommentsConsole'),
+    getPageSchema: require('./getPageSchema'),
 }

package/src/rests/migrateApprovalCommentsField.js

@@ -7,9 +7,8 @@
  * from old format to new steedos-field format with config object.
  */
 
-const { MongoClient } = require('mongodb');
-
-// MongoDB connection
+// MongoDB connection (lazy-loaded so pure helper functions are testable without the driver)
+let MongoClient = null;
 let client = null;
 let db = null;
 
@@ -18,6 +17,10 @@ async function connectToMongoDB() {
         return db;
     }
 
+    if (!MongoClient) {
+        MongoClient = require('mongodb').MongoClient;
+    }
+
     const mongoUrl = process.env.MONGO_URL || 'mongodb://127.0.0.1:27017/steedos';
     try {
         client = new MongoClient(mongoUrl);
@@ -313,7 +316,8 @@ function processAmisSchema(amisSchemaStr) {
 }
 
 /**
- * Process fields array and return bulk operations
+ * Process fields array and return bulk operations.
+ * Recursively handles nested fields inside section/panel/group containers.
  */
 function processFieldsArray(fields, pathPrefix) {
     const updates = [];
@@ -325,12 +329,13 @@ function processFieldsArray(fields, pathPrefix) {
     
     for (let i = 0; i < fields.length; i++) {
         const field = fields[i];
+        const fieldPath = `${pathPrefix}.${i}`;
         const transformation = transformField(field);
         
         if (transformation) {
             updates.push({
                 index: i,
-                path: `${pathPrefix}.${i}`,
+                path: fieldPath,
                 update: transformation,
                 fieldId: field._id || field.code || field.name,  // Track field for counting
                 hasAmisField: !!field._amisField  // Track if we need to unset _amisField
@@ -338,15 +343,22 @@ function processFieldsArray(fields, pathPrefix) {
             
             // Unset original properties that are being backed up
             if (field._amisField) {
-                unsets.push(`${pathPrefix}.${i}._amisField`);
+                unsets.push(`${fieldPath}._amisField`);
             }
             if (field.formula) {
-                unsets.push(`${pathPrefix}.${i}.formula`);
+                unsets.push(`${fieldPath}.formula`);
             }
             if (field.default_value) {
-                unsets.push(`${pathPrefix}.${i}.default_value`);
+                unsets.push(`${fieldPath}.default_value`);
             }
         }
+
+        // Recursively process nested fields inside container types (section/panel/group/etc.)
+        if (Array.isArray(field.fields)) {
+            const nested = processFieldsArray(field.fields, `${fieldPath}.fields`);
+            for (const u of nested.updates) updates.push(u);
+            for (const u of nested.unsets) unsets.push(u);
+        }
     }
     
     return { updates, unsets };
@@ -362,6 +374,13 @@ module.exports = {
         dryRun: { type: 'boolean', optional: true, convert: true },
         fid: { type: 'string', optional: true }  // Flow ID to process single flow
     },
+    // Exported for testing
+    _helpers: {
+        matchesApprovalPattern,
+        transformField,
+        processFieldsArray,
+        processAmisSchema
+    },
     async handler(ctx) {
         const { user } = ctx.meta;
 
@@ -422,10 +441,10 @@ module.exports = {
                         formUpdated = true;
                         formFieldCount += updates.length;  // Count fields, not operations
                         
-                        // Build $set updates for current.fields
+                        // Build $set updates for current.fields (including nested section/panel/group fields)
                         for (const update of updates) {
                             for (const key in update.update) {
-                                formUpdate[`current.fields.${update.index}.${key}`] = update.update[key];
+                                formUpdate[`${update.path}.${key}`] = update.update[key];
                             }
                         }
                         
@@ -450,10 +469,10 @@ module.exports = {
                                 formUpdated = true;
                                 formFieldCount += updates.length;  // Count fields, not operations
                                 
-                                // Build $set updates for historys.fields
+                                // Build $set updates for historys.fields (including nested section/panel/group fields)
                                 for (const update of updates) {
                                     for (const key in update.update) {
-                                        formUpdate[`historys.${h}.fields.${update.index}.${key}`] = update.update[key];
+                                        formUpdate[`${update.path}.${key}`] = update.update[key];
                                     }
                                 }
                                 

package/src/rests/rollbackApprovalCommentsField.js

@@ -7,9 +7,8 @@
  * back to their original input type format.
  */
 
-const { MongoClient } = require('mongodb');
-
-// MongoDB connection
+// MongoDB connection (lazy-loaded so pure helper functions are testable without the driver)
+let MongoClient = null;
 let client = null;
 let db = null;
 
@@ -18,6 +17,10 @@ async function connectToMongoDB() {
         return db;
     }
 
+    if (!MongoClient) {
+        MongoClient = require('mongodb').MongoClient;
+    }
+
     const mongoUrl = process.env.MONGO_URL || 'mongodb://127.0.0.1:27017/steedos';
     try {
         client = new MongoClient(mongoUrl);
@@ -53,6 +56,7 @@ function processFieldsArrayForRollback(fields, pathPrefix, formId, formName) {
     
     for (let i = 0; i < fields.length; i++) {
         const field = fields[i];
+        const fieldPath = `${pathPrefix}.${i}`;
         
         // Only rollback fields that were transformed (Idempotency principle)
         if (field.__approval_comments_transformed === true) {
@@ -63,7 +67,7 @@ function processFieldsArrayForRollback(fields, pathPrefix, formId, formName) {
                 const originalType = field.__approval_comments_original_type || 'input';
                 updates.push({
                     index: i,
-                    path: `${pathPrefix}.${i}.type`,
+                    path: `${fieldPath}.type`,
                     value: originalType
                 });
                 
@@ -71,7 +75,7 @@ function processFieldsArrayForRollback(fields, pathPrefix, formId, formName) {
                 if (field.__approval_comments_original_formula) {
                     updates.push({
                         index: i,
-                        path: `${pathPrefix}.${i}.formula`,
+                        path: `${fieldPath}.formula`,
                         value: field.__approval_comments_original_formula
                     });
                 }
@@ -80,7 +84,7 @@ function processFieldsArrayForRollback(fields, pathPrefix, formId, formName) {
                 if (field.__approval_comments_original_default_value) {
                     updates.push({
                         index: i,
-                        path: `${pathPrefix}.${i}.default_value`,
+                        path: `${fieldPath}.default_value`,
                         value: field.__approval_comments_original_default_value
                     });
                 }
@@ -89,29 +93,38 @@ function processFieldsArrayForRollback(fields, pathPrefix, formId, formName) {
                 if (field.__approval_comments_original__amisField) {
                     updates.push({
                         index: i,
-                        path: `${pathPrefix}.${i}._amisField`,
+                        path: `${fieldPath}._amisField`,
                         value: field.__approval_comments_original__amisField
                     });
                 }
                 
                 // Remove added properties
-                unsets.push(`${pathPrefix}.${i}.__approval_comments_transformed`);
-                unsets.push(`${pathPrefix}.${i}.config`);
-                unsets.push(`${pathPrefix}.${i}.__approval_comments_original__amisField`);
-                unsets.push(`${pathPrefix}.${i}.__approval_comments_original_type`);  // Remove backup
-                unsets.push(`${pathPrefix}.${i}.__approval_comments_original_formula`);  // Remove backup
-                unsets.push(`${pathPrefix}.${i}.__approval_comments_original_default_value`);  // Remove backup
+                unsets.push(`${fieldPath}.__approval_comments_transformed`);
+                unsets.push(`${fieldPath}.config`);
+                unsets.push(`${fieldPath}.__approval_comments_original__amisField`);
+                unsets.push(`${fieldPath}.__approval_comments_original_type`);  // Remove backup
+                unsets.push(`${fieldPath}.__approval_comments_original_formula`);  // Remove backup
+                unsets.push(`${fieldPath}.__approval_comments_original_default_value`);  // Remove backup
             } catch (error) {
                 // Silent Failure principle: Record error but continue processing
                 fieldErrors.push({
                     formId: formId,
                     formName: formName,
-                    fieldPath: `${pathPrefix}.${i}`,
+                    fieldPath: fieldPath,
                     fieldCode: field.code || field.name || 'unknown',
                     error: error.message
                 });
             }
         }
+
+        // Recursively process nested fields inside container types (section/panel/group/etc.)
+        if (Array.isArray(field.fields)) {
+            const nested = processFieldsArrayForRollback(field.fields, `${fieldPath}.fields`, formId, formName);
+            for (const u of nested.updates) updates.push(u);
+            for (const u of nested.unsets) unsets.push(u);
+            fieldCount += nested.fieldCount;
+            for (const e of nested.fieldErrors) fieldErrors.push(e);
+        }
     }
     
     return { updates, unsets, fieldCount, fieldErrors };
@@ -127,6 +140,10 @@ module.exports = {
         dryRun: { type: 'boolean', optional: true, convert: true },
         fid: { type: 'string', optional: true }  // Flow ID to rollback single flow
     },
+    // Exported for testing
+    _helpers: {
+        processFieldsArrayForRollback
+    },
     async handler(ctx) {
         const { user } = ctx.meta;
 
@@ -140,13 +157,7 @@ module.exports = {
         const formsCollection = await getCollection('forms');
         
         // Build query filter
-        const query = {
-            state: 'enabled',  // Only process enabled forms
-            $or: [
-                { 'current.fields.__approval_comments_transformed': true },
-                { 'historys.fields.__approval_comments_transformed': true }
-            ]
-        };
+        const query = { state: 'enabled' };  // Only process enabled forms
         
         // If fid is provided, query flows collection to get form ID
         if (fid) {