@steedos/service-pages 2.3.2-beta.12 → 2.3.2-beta.13

package/main/default/client/page.render.client.js

@@ -57,7 +57,7 @@
         }
     }
 
-    Steedos.Page.render = function (root, page, data, options) {
+    Steedos.Page.render = function (root, page, data, options = {}) {
         const loadingContentData = {
             "inputs": [],
             // "title": "loading",
@@ -117,7 +117,15 @@
                         rootUrl: __meteor_runtime_config__.ROOT_URL,
                         tenantId: Creator.USER_CONTEXT.spaceId,
                         userId: Creator.USER_CONTEXT.userId,
-                        authToken: Creator.USER_CONTEXT.user.authToken
+                        authToken: Creator.USER_CONTEXT.user.authToken,
+                        user: Creator.USER_CONTEXT.user
+                    },
+                    global: {
+                        userId: Creator.USER_CONTEXT.userId,
+                        spaceId: Creator.USER_CONTEXT.spaceId,
+                        user: Creator.USER_CONTEXT.user, 
+                        now: new Date(),
+                        // mode: mode //由表单提供
                     }
                 }
             });
@@ -184,7 +192,7 @@
                                     "data": pageContentData
                                 }
                             })
-                        }, options?.props)).show();
+                        }, options.props)).show();
                     }else{
                         data.modalName = data.modalName || lodash.uniqueId(`modal-${page.object_name}`);
                         SteedosUI.Modal(Object.assign({
@@ -200,7 +208,7 @@
                                     "data": pageContentData
                                 }
                             })
-                        }, options?.props)).show();
+                        }, options.props)).show();
                     }
 
                     

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

@@ -3,7 +3,8 @@
  * @Date: 2022-04-04 16:34:28
  * @Description: 
  */
-const router = require('@steedos/router').staticRouter();
+const express = require('express');
+const router = express.Router();
 const core = require('@steedos/core');
 const ejs = require('ejs');
 const fs = require('fs');

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

@@ -1,4 +1,12 @@
-const router = require('@steedos/router').staticRouter();
+/*
+ * @Author: baozhoutao@steedos.com
+ * @Date: 2022-11-17 16:29:17
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2022-11-28 18:01:27
+ * @Description: 
+ */
+const express = require('express');
+const router = express.Router();
 const objectql = require('@steedos/objectql');
 const core = require('@steedos/core');
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-pages",
-  "version": "2.3.2-beta.12",
+  "version": "2.3.2-beta.13",
   "main": "package.service.js",
   "scripts": {},
   "license": "MIT",
@@ -8,7 +8,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f738241842b61c66eae2b1fe7bf5c0bfb66348d6",
+  "gitHead": "0ffb7e237da2ef2aeb0f44f051267483598c2033",
   "dependencies": {
     "ejs": "^3.1.8"
   }