@steedos-labs/plugin-workflow 3.0.33 → 3.0.35

package/main/default/routes/designer-v2.router.js

@@ -4,8 +4,10 @@ const router = express.Router();
 const { requireAuthentication } = require("@steedos/auth");
 const path = require('path');
 
+// Resolve package root via require.resolve, more reliable than __dirname in Docker/symlink scenarios
 const packageRoot = path.dirname(require.resolve('@steedos-labs/plugin-workflow/package.json'));
 const designerDistPath = path.join(packageRoot, 'designer', 'dist');
+const amisRendererDistPath = path.join(designerDistPath, 'amis-renderer');
 
 /**
  * New React-based workflow designer
@@ -19,8 +21,7 @@ router.get('/api/workflow/designer-v2', requireAuthentication, async (req, res)
     }
     
     // In production, serve built React app
-    const designerPath = path.join(designerDistPath, 'index.html');
-    res.sendFile(designerPath, { dotfiles: 'allow' });
+    res.sendFile(path.join(designerDistPath, 'index.html'), { dotfiles: 'allow' });
   } catch (e) {
     res.status(500).send({
       errors: [{ errorMessage: e.message }]
@@ -61,4 +62,39 @@ router.get('/api/designer-v2/startup', requireAuthentication, async (req, res) =
  */
 router.use('/api/workflow/designer-v2', express.static(designerDistPath));
 
+/**
+ * SPA fallback: serve index.html for any sub-path under /api/workflow/designer-v2/
+ * that didn't match a static file (e.g. /form-designer, /form-designer?flowId=xxx).
+ * Uses router.use to avoid path-to-regexp pattern syntax issues.
+ */
+router.use('/api/workflow/designer-v2', (req, res, next) => {
+  // Only handle GET requests for HTML pages (skip API calls, static assets, etc.)
+  if (req.method !== 'GET') return next();
+  // Skip requests for static files (have a file extension)
+  if (path.extname(req.path)) return next();
+  // Must be a sub-path (not the root which is already handled)
+  if (req.path === '/' || req.path === '') return next();
+
+  requireAuthentication(req, res, () => {
+    try {
+      if (process.env.NODE_ENV === 'development') {
+        return res.redirect('http://localhost:5173');
+      }
+      const designerIndex = path.join(designerDistPath, 'index.html');
+      res.sendFile(designerIndex, { dotfiles: 'allow' });
+    } catch (e) {
+      res.status(500).send({
+        errors: [{ errorMessage: e.message }]
+      });
+    }
+  });
+});
+
+/**
+ * Serve the amis renderer bundle (js + css).
+ * URL: /api/workflow/amis-form-v2/amis-renderer.js
+ *      /api/workflow/amis-form-v2/amis-renderer.css
+ */
+router.use('/api/workflow/amis-form-v2', express.static(amisRendererDistPath));
+
 exports.default = router;

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

@@ -541,6 +541,12 @@ module.exports = {
 
             // 先通过id得到forms对象存下来
             const form = await objectql.getObject('forms').findOne(this.id);
+
+            if(form.current.version === 'v2'){
+                return ;
+            }
+
+
             delete form.historys;
 
             // 数据库更新操作：将forms表current的fields字段更新为最终数组

package/main/default/utils/designerManager.js

@@ -263,6 +263,10 @@ async function updateForm(formId, form, forms, flows, currentUserId) {
     current.wizard_mode = form["current"]["wizard_mode"];
     current.amis_schema = form["current"]["amis_schema"]
 
+    current.version = form["current"]["version"];
+    current.viewMode = form["current"]["viewMode"]; 
+    current.tableColumns = form["current"]["tableColumns"];
+
     formUpdateObj.$set = {
         'current': current,
         'name': form["name"],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos-labs/plugin-workflow",
-  "version": "3.0.33",
+  "version": "3.0.35",
   "main": "package.service.js",
   "license": "MIT",
   "files": [
@@ -17,7 +17,8 @@
   ],
   "scripts": {
     "build:watch": "tsc --watch",
-    "release": "cd designer && npm run build && cd .. && npm publish --registry https://registry.npmjs.org && npx cnpm sync @steedos-labs/plugin-workflow",
+    "build:designer": "cd designer && npm run build:all",
+    "release": "npm run build:designer && npm publish --registry https://registry.npmjs.org && npx cnpm sync @steedos-labs/plugin-workflow",
     "export-templates": "node run.js export",
     "convert-templates": "node convert-templates.js",
     "test:formula-compat": "node main/default/test/test_formula_compat.js"