@steedos/service-pages 2.3.2-beta.8 → 2.3.2

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/objectTranslations/pages.en/pages.en.objectTranslation.yml

@@ -1,5 +1,5 @@
 name: pages
-label: 微页面
+label: Mini Page
 description: 
 fields:
   dashboard_filters_enabled:
@@ -7,15 +7,15 @@ fields:
     help: 
     description: 
   description:
-    label: 描述
+    label: Description
     help: 
     description: 
   is_active:
-    label: 状态
+    label: Actived
     help: 
     description: 
   is_archived:
-    label: 已归档
+    label: Archived
     help: 
     description: 
   is_draft:
@@ -27,11 +27,11 @@ fields:
     help: 
     description: 
   is_system:
-    label: 系统
+    label: System
     help: 
     description: 
   label:
-    label: 名称
+    label: Label
     help: 
     description: 
   name:
@@ -39,15 +39,15 @@ fields:
     help: 
     description: 
   object_name:
-    label: 对象
+    label: Object
     help: 
     description: 
   owner:
-    label: 所有者
+    label: Owner
     help: 
     description: 
   render_engine:
-    label: 渲染器
+    label: Render engine
     help: 
     options:
       - label: Amis
@@ -64,37 +64,37 @@ fields:
     help: 
     description: 
   type:
-    label: 类型
+    label: Type
     help: 
     options:
-      - label: 应用程序页面
+      - label: App page
         value: app
-      - label: 记录页面
+      - label: Record page
         value: record
-      - label: 列表页面
+      - label: List page
         value: list
-      - label: 表单
+      - label: Form
         value: form
     description: 
   version:
-    label: 版本号
+    label: Version Number
     help: 
     description: 
 listviews:
   all:
-    label: 所有
+    label: All
   recent:
-    label: 最近查看
+    label: Recent
 actions:
   customPage:
-    label: 自定义
+    label: Custom Page
   deploy:
-    label: 发布
+    label: Deploy
   disable:
-    label: 禁用
+    label: Disable
   enable:
-    label: 启用
+    label: Enable
   resetSchema:
-    label: 重置
+    label: Reset Schema
   showDesign:
-    label: 设计器
+    label: Show Design

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/main/default/services/page.service.js

@@ -129,7 +129,11 @@ module.exports = {
                 if(_.find(actions, (action)=>{
                     return action.name === `${page.render_engine}.getInitSchema`
                 })){
-                    const schema = await broker.call(`${page.render_engine}.getInitSchema`, {type: page.type, objectApiName: page.object_name})
+                    const schema = await broker.call(`${page.render_engine}.getInitSchema`, {type: page.type, objectApiName: page.object_name}, {
+                        meta:{
+                            user: userSession
+                        }
+                    })
                     if(schema){
                         const now = new Date();
                         await objectql.getObject('page_versions').directInsert({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-pages",
-  "version": "2.3.2-beta.8",
+  "version": "2.3.2",
   "main": "package.service.js",
   "scripts": {},
   "license": "MIT",
@@ -8,7 +8,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "3842d837373ece532af6b8399db8998be29018a0",
+  "gitHead": "3aefe890a87dcdf231a132d180744ee37653dd7c",
   "dependencies": {
     "ejs": "^3.1.8"
   }