@steedos/service-pages 2.2.4 → 2.2.5

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

@@ -14,7 +14,7 @@ function upperFirst(str) {
 };
 
 Steedos.Page.getPage = function(type, appId, objectApiName, recordId){
-    if(objectApiName){
+    if(type != 'list' && objectApiName){
         const objectInfo = Creator.getObject(Session.get("object_name"));
         if(objectInfo.version < 2){
             return ;
@@ -44,7 +44,10 @@ Steedos.Page.render = function (root, page, data) {
                                     "schema": typeof page.schema === 'string' ? JSON.parse(page.schema) : page.schema,
                                     "data": Object.assign({}, data,{
                                             rootUrl: __meteor_runtime_config__.ROOT_URL,
-                                            userSession: Creator.USER_CONTEXT.user
+                                            tenantId: Creator.USER_CONTEXT.spaceId,
+                                            userId: Creator.USER_CONTEXT.userId,
+                                            authToken: Creator.USER_CONTEXT.user.authToken,
+                                            user: Creator.USER_CONTEXT.user
                                         })
                                 }
                             },
@@ -167,6 +170,23 @@ Steedos.Page.RelatedListview.render = function(template, objectApiName){
 };
 
 Steedos.Page.Form.StandardNew.render = function(appId, objectApiName, tilte, initialValues){
+
+    const page = Steedos.Page.getPage('form', appId, objectApiName);
+    if(page && page.schema){
+        const elementId = `list-action-custom-${objectApiName}-standard_new`;
+        if($(`#${elementId}`).length === 0){
+            const listActionsElements = $(".grid-info-actions");
+            listActionsElements.prepend(`<div id="${elementId}"></div>`)
+        }
+        return Steedos.Page.render($(`#${elementId}`)[0], page, {
+            appId: appId,
+            objectName: objectApiName,
+            tilte: tilte,
+            initialValues: initialValues,
+            page: page
+        });
+    }
+
     SteedosUI.showModal(stores.ComponentRegistry.components.ObjectForm, {
         name: `${objectApiName}_standard_new_form`,
         objectApiName: objectApiName,
@@ -187,6 +207,23 @@ Steedos.Page.Form.StandardNew.render = function(appId, objectApiName, tilte, ini
 };
 
 Steedos.Page.Form.StandardEdit.render = function(appId, objectApiName, tilte, recordId){
+
+    const page = Steedos.Page.getPage('form', appId, objectApiName, recordId);
+    if(page && page.schema){
+        const elementId = `list-action-custom-${objectApiName}-standard_edit`;
+        if($(`#${elementId}`).length === 0){
+            const listActionsElements = $(".grid-info-actions");
+            listActionsElements.prepend(`<div id="${elementId}"></div>`)
+        }
+        return Steedos.Page.render($(`#${elementId}`)[0], page, {
+            appId: appId,
+            objectName: objectApiName,
+            tilte: tilte,
+            recordId: recordId,
+            page: page
+        });
+    }
+
     return SteedosUI.showModal(stores.ComponentRegistry.components.ObjectForm, {
         name: `${objectApiName}_standard_edit_form`,
         objectApiName: objectApiName,

package/main/default/services/page.service.js

@@ -85,7 +85,7 @@ module.exports = {
      */
     methods: {
         getDefaultSchema: {
-            async handler(type, app, objectApiName, formFactor, recordId, userSession) {
+            async handler(type, app, objectApiName, recordId, formFactor, userSession) {
                 if (process.env.DEFAULT_PAGE_RENDER) {
                     return await this.broker.call(`${process.env.DEFAULT_PAGE_RENDER}.getDefaultSchema`, {type, app, objectApiName, recordId, formFactor}, {
                         meta: {
@@ -102,7 +102,7 @@ module.exports = {
                 if (type === 'list' || type === 'record' || type === 'form') {
                     filters.push(['object_name', '=', objectApiName]);
                 }
-                return await objectql.getObject('pages').find({ filters: filters });
+                return await objectql.getObject('pages').find({ filters: filters, sort: 'modified desc' });
             }
         },
         getAssignments: {
@@ -116,7 +116,7 @@ module.exports = {
                 }else{
                     filters.push(['desktop','=', true])
                 }
-                return await objectql.getObject("page_assignments").find({ filters: filters });
+                return await objectql.getObject("page_assignments").find({ filters: filters, sort: 'modified desc' });
             }
         },
         getAppProfileAssignment: {
@@ -161,8 +161,6 @@ module.exports = {
              * 2 如果已指定，则应用程序默认设置 页面分配会覆盖组织默认设置。
              * 3 应用程序、记录类型和简档, 分配会覆盖组织和应用程序默认设置。
              * 
-             * TODO form factors "LARGE","SMALL"
-             * TODO 页面分配有多条时的优先级处理（始终是最新的分配生效）。
              */
             async handler(type, app, objectApiName, recordId, formFactor, userSession) {
 
@@ -202,7 +200,7 @@ module.exports = {
                 }
                 const defaultSchema = await this.getDefaultSchema(type, app, objectApiName, recordId, formFactor, userSession);
                 if(defaultSchema){
-                    return {schema: defaultSchema}
+                    return { render_engine: process.env.DEFAULT_PAGE_RENDER , schema: defaultSchema}
                 }
             }
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-pages",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "main": "package.service.js",
   "scripts": {},
   "license": "MIT",
@@ -11,5 +11,5 @@
   "dependencies": {
     "@builder.io/react": "^1.1.50"
   },
-  "gitHead": "a0c0e8d900f7f4fd2045d976b36c9bef465a6ce3"
+  "gitHead": "260131162c3eb25ec8d51e915b773610c7b2653c"
 }