@steedos/service-pages 3.0.13-beta.5 → 3.0.13-beta.51

package/main/default/functions/pages_schema.function.yml

@@ -1,7 +1,7 @@
 name: pages_schema
 objectApiName: pages
 isEnabled: true
-script: |-
+script: |- 
   const pageId = ctx.input.pageId;
 
   if (!pageId) {
@@ -54,5 +54,4 @@ script: |-
           }
       ],
       "body": [schema]
-  };
-locked: false
+  };

package/main/default/routes/page_design.ejs

@@ -44,6 +44,7 @@
       const useOpenAPI= <%=(useOpenAPI === "true" || useOpenAPI === true)%>;
       const settings = {
         assetUrls: "<%=assetUrls%>",
+        unpkgUrl: "<%=unpkgUrl%>",
         rootUrl: "<%=rootUrl%>",
         userId: "<%=userId%>",
         tenantId: "<%=tenantId%>",

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

@@ -34,7 +34,7 @@ router.get('/api/pageDesign', auth.requireAuthentication, async function (req, r
         const page = await objectql.broker.call(`page.getLatestPageVersion`, {pageId: req.query.pageId});
         const retUrl = req.query.retUrl || process.env.ROOT_URL + '/app/admin/pages/view/' + req.query.pageId
         const steedosBuilderUrl = process.env.STEEDOS_BUILDER_URL || 'https://builder.steedos.cn';
-        const builderHost = `${steedosBuilderUrl}/amis?${assetUrl}retUrl=${retUrl}&locale=${locale}&pageType=${page.type}`;
+        const builderHost = `${steedosBuilderUrl}/amis?${assetUrl}retUrl=${retUrl}&locale=${locale}&pageType=${page.type}&unpkgUrl=${process.env.STEEDOS_UNPKG_URL || 'https://unpkg.steedos.cn'}`;
 
         const filename = __dirname+'/page_design.ejs'
         const data = {
@@ -47,7 +47,8 @@ router.get('/api/pageDesign', auth.requireAuthentication, async function (req, r
             pageId: req.query.pageId,
             userSession: userSession,
             useOpenAPI: process.env.STEEDOS_PUBLIC_USE_OPEN_API,
-            locale: locale
+            locale: locale,
+            unpkgUrl: process.env.STEEDOS_UNPKG_URL || 'https://unpkg.steedos.cn',
         }
         const options = {}
         ejs.renderFile(filename, data, options, function(err, str){

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

@@ -29,7 +29,8 @@ module.exports = {
             async handler(ctx) {
                 const userSession = ctx.meta.user;
                 const { type, app, objectApiName, recordId, pageId, formFactor } = ctx.params;
-                return await this.getMeSchema(type, app, objectApiName, recordId, pageId, formFactor, userSession);
+                const _result = await this.getMeSchema(type, app, objectApiName, recordId, pageId, formFactor, userSession);
+                return _result;
             }
         },
         //发布最新版
@@ -256,11 +257,12 @@ module.exports = {
             async handler(type, app, objectApiName, recordId, formFactor, userSession) {
                 const pageRender = this.settings.pageRender;
                 if (pageRender) {
-                    return await this.broker.call(`${pageRender}.getDefaultSchema`, {type, app, objectApiName, recordId, formFactor}, {
+                    const _result = await this.broker.call(`${pageRender}.getDefaultSchema`, {type, app, objectApiName, recordId, formFactor}, {
                         meta: {
                           user: userSession
                         }
-                      })
+                      });
+                    return _result;
                 }
                 return;
             }

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@steedos/service-pages",
-  "version": "3.0.13-beta.5",
+  "version": "3.0.13-beta.51",
   "main": "package.service.js",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "6cd0e81ae9986fc6fc7bc1b40519b63695d03879",
+  "gitHead": "9b19bd2edf8d73de46261adc2679d7eba1dcd69a",
   "dependencies": {
     "clone": "^2.1.2",
     "ejs": "^3.1.8"