@steedos/service-pages 2.2.21 → 2.2.22

package/main/default/client/builder.client.js

@@ -3,6 +3,10 @@
  * @Date: 2022-03-28 09:44:02
  * @Description: 
  */
+
+//window.MonacoEnvironment 始终返回undefined
+; Object.defineProperty(window, 'MonacoEnvironment', {set: ()=>{}, get: ()=>undefined});
+
 ; (function () {
     function _innerWaitForThing(obj, path, func){
         const timeGap = 100;
@@ -50,47 +54,36 @@
 
     // Object.defineProperty(window, 'MonacoEnvironment', {set: ()=>{}, get: ()=>window.SteedosMonacoEnvironment})
 
+
+    if (window.define)
+        window.define.amd = undefined;
+
+    window.ReactDOM = ReactDom;
+
+    // const BuilderSDK = BuilderReact;
+
+    // window.BuilderReact = BuilderReact;
+    // window.BuilderSDK = BuilderSDK;
+
+    window.Builder = BuilderReact.Builder;
+
+    window.BuilderComponent = BuilderReact.BuilderComponent;
+    
+    // window.builder = BuilderReact.builder;
+
+    Builder.set({
+        rootUrl: __meteor_runtime_config__.ROOT_URL, 
+        unpkgUrl: '/unpkg.com'
+    })
+
+    if(Meteor.settings.public.page && Meteor.settings.public.page.assetUrls){
+        const defaultAssetsUrls = Meteor.settings.public.page.assetUrls.split(',')
+        Builder.registerRemoteAssets(defaultAssetsUrls)
+    }  
+
+    window.postMessage({ type: "Builder.loaded" })
+
 })();
 
-function injectScript(src) {
-    return new Promise((resolve, reject) => {
-        const script = document.createElement('script');
-        script.src = src;
-        script.addEventListener('load', resolve);
-        script.addEventListener('error', e => reject(e.error));
-        document.head.appendChild(script);
-    });
-}
-
-injectScript('/unpkg.com/@steedos-builder/react/dist/builder-react.unpkg.js')
-    .then(() => {
-        console.log('Builder React loaded!');
-        if (window.define)
-            window.define.amd = undefined;
-        window.ReactDOM = ReactDom;
-
-        const BuilderSDK = BuilderReact;
-
-        window.BuilderReact = BuilderReact;
-        window.BuilderSDK = BuilderSDK;
-
-        window.Builder = BuilderReact.Builder;
-        window.BuilderComponent = BuilderReact.BuilderComponent;
-        window.builder = BuilderReact.builder;
-
-        Builder.set({
-            rootUrl: __meteor_runtime_config__.ROOT_URL, 
-            unpkgUrl: '/unpkg.com'
-        })
-
-        if(Meteor.settings.public.page && Meteor.settings.public.page.assetUrls){
-            const defaultAssetsUrls = Meteor.settings.public.page.assetUrls.split(',')
-            Builder.registerRemoteAssets(defaultAssetsUrls)
-        }  
-        
-        window.postMessage({ type: "Builder.loaded" })
-
-    }).catch(error => {
-        console.error(error);
-    });
+
 

package/main/default/client/onWindowMessage.client.js

@@ -36,24 +36,4 @@ window.addEventListener('message', function (event) {
         }
             
     }
-});
-
-
-window.addEventListener('message', function (event) {
-    const { data } = event;
-    if (data.type === 'builder.assetsLoaded') {
-        waitForThing(window, 'Builder').then(()=>{
-            Builder.initMonaco({ 
-                waitSeconds: 60,
-                baseUrl: '',
-                paths: { 
-                  'vs': '/unpkg.com/monaco-editor/min/vs',
-                  "vs/language/css/cssMode":"/unpkg.com/monaco-editor/min/vs/language/css/cssMode",
-                  "vs/language/html/htmlMode":"/unpkg.com/monaco-editor/min/vs/language/html/htmlMode",
-                  "vs/language/typescript/tsMode":"/unpkg.com/monaco-editor/min/vs/language/typescript/tsMode",
-                  "vs/language/json/jsonMode":"/unpkg.com/monaco-editor/min/vs/language/json/jsonMode"
-                } 
-            })
-        })
-    }
-})
+});

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

@@ -106,6 +106,18 @@ Steedos.Page.render = function (root, page, data) {
 
     if (page.render_engine && page.render_engine != 'redash') {
 
+        let schema = typeof page.schema === 'string' ? JSON.parse(page.schema) : page.schema;
+        const defData = Object.assign({}, data, {
+            context: {
+                rootUrl: __meteor_runtime_config__.ROOT_URL,
+                tenantId: Creator.USER_CONTEXT.spaceId,
+                userId: Creator.USER_CONTEXT.userId,
+                authToken: Creator.USER_CONTEXT.user.authToken
+            }
+        })
+
+        schema = lodash.defaultsDeep(defData , schema);
+
         const pageContentData = {
             "blocks": [
                 {
@@ -115,15 +127,8 @@ Steedos.Page.render = function (root, page, data) {
                     "component": {
                         "name": upperFirst(page.render_engine),
                         "options": {
-                            "schema": typeof page.schema === 'string' ? JSON.parse(page.schema) : page.schema,
-                            "data": Object.assign({}, data, {
-                                context: {
-                                    rootUrl: __meteor_runtime_config__.ROOT_URL,
-                                    tenantId: Creator.USER_CONTEXT.spaceId,
-                                    userId: Creator.USER_CONTEXT.userId,
-                                    authToken: Creator.USER_CONTEXT.user.authToken
-                                }
-                            })
+                            "schema": schema,
+                            "data": data
                         }
                     },
                 }
@@ -143,7 +148,7 @@ Steedos.Page.render = function (root, page, data) {
             }
         }, root)
 
-        return Promise.all([
+        Promise.all([
             waitForThing(window, 'BuilderComponent'),
             waitForThing(Builder.components, upperFirst(page.render_engine), findComponent)
         ]).then(()=>{
@@ -155,6 +160,8 @@ Steedos.Page.render = function (root, page, data) {
             }, root)
         });
     }
+
+    return root;
 };
 
 Steedos.Page.App.render = function (template, pageName, app_id) {
@@ -172,10 +179,12 @@ Steedos.Page.App.render = function (template, pageName, app_id) {
         $(".page-template-root")[0].appendChild(modalRoot);
     }
 
+    const container = $("#" + rootId)[0];
+
     const page = Steedos.Page.getPage('app', app_id, null, null, pageName);
     if (page) {
         if (page.render_engine && page.render_engine != 'redash') {
-            return Steedos.Page.render($("#" + rootId)[0], page, {
+            return Steedos.Page.render(container, page, {
                 appId: app_id
             });
         }
@@ -183,7 +192,8 @@ Steedos.Page.App.render = function (template, pageName, app_id) {
 
     SteedosUI.render(stores.ComponentRegistry.components.PublicPage, {
         token: pageName
-    }, $("#" + rootId)[0]);
+    }, container);
+    return container
 };
 
 Steedos.Page.Listview.render = function (template, objectApiName) {

package/main/default/objects/pages/buttons/showDesign.button.js

@@ -1,6 +1,7 @@
 module.exports = {
     showDesign: function (object_name, record_id) {
-        Steedos.openWindow(Steedos.absoluteUrl(`/api/pageDesign?pageId=${record_id}`));
+        // Steedos.openWindow();
+        document.location = Steedos.absoluteUrl(`/api/pageDesign?pageId=${record_id}`);
     },
     showDesignVisible: function (object_name, record_id, record_permissions) {
         var perms, record;

package/main/default/routes/design.html

@@ -50,17 +50,17 @@
             schema.data.context.authToken = dataContext.authToken;
 
             if(objectName && pageType === 'record'){
-                axios.get(`/api/v4/${objectName}?$orderby=modified&$top=1`).then(function (response) {
+                axios.get(`/api/v4/${objectName}?$orderby=created desc&$top=1`).then(function (response) {
                     const value = response.data?.value;
                     if(value.length > 0){
                         schema.data.recordId = value[0]._id;
                     }
+                    const data = {
+                        AmisSchema: schema
+                    };
+                    console.log("record data", data)
+                    comp.data = data;
                 });
-                const data = {
-                    AmisSchema: schema
-                };
-                console.log("record data", data)
-                comp.data = data;
             }else{
                 const data = {
                     AmisSchema: schema

package/main/default/routes/page_design.ejs

@@ -0,0 +1,44 @@
+<html>
+  <head>
+    <script src="https://npm.elemecdn.com/@steedos-builder/fiddle@0.0.5/dist/builder-fiddle.umd.js"></script>
+  </head>
+
+  <body>
+
+    <builder-fiddle host="<%=builderHost%>"></builder-fiddle>
+
+    <script>
+      let comp = document.querySelector( 'builder-fiddle' )
+      const data = {
+        AmisSchema: {
+        "type": "page",
+        "title": "Steedos Form Page",
+        "body": [
+          {
+            "type": "form",
+            "body": [
+              {
+                "type": "input-text",
+                "name": "a",
+                "label": "Name"
+              }
+            ]
+          }
+        ]
+      }
+    };
+    // comp.data = data;
+
+    const settings = {
+      assetUrls: '<%=assetUrls%>',
+      rootUrl: '<%=rootUrl%>',
+      userId: '<%=userId%>',
+      tenantId: '<%=tenantId%>',
+      authToken: '<%=authToken%>',
+      pageId: '<%=pageId%>',
+    }
+    console.log(settings)
+    comp.settings = settings
+    </script>
+  </body>
+</html>

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

@@ -6,6 +6,7 @@
 const express = require("express");
 const router = express.Router();
 const core = require('@steedos/core');
+const ejs = require('ejs');
 const fs = require('fs');
 const _ = require('lodash');
 router.get('/api/pageDesign', core.requireAuthentication, async function (req, res) {
@@ -14,21 +15,39 @@ router.get('/api/pageDesign', core.requireAuthentication, async function (req, r
         const userSession = req.user;
         let assetUrl = "";
         if(process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS && _.isString(process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS)){
-            const assetUrls = process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS.split(',');
+            assetUrls = process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS.split(',');
             assetUrl = `assetUrl=${assetUrls.join("&assetUrl=")}&`;
         }
 
-        const dataContext = {
+        // const dataContext = {
+        //     rootUrl: __meteor_runtime_config__.ROOT_URL,
+        //     tenantId: userSession.spaceId,
+        //     userId: userSession.userId,
+        //     authToken: userSession.authToken
+        // }
+
+        const retUrl = __meteor_runtime_config__.ROOT_URL + '/app/admin/pages/view/' + req.query.pageId
+        const builderHost = `https://builder.steedos.com/amis?${assetUrl}&retUrl=${retUrl}`;
+
+        // let data = fs.readFileSync(__dirname+'/design.html', 'utf8');
+        // res.send(data.replace('SteedosBuilderHost',steedosBuilderHost).replace('DataContext', JSON.stringify(dataContext)));
+
+        const filename = __dirname+'/page_design.ejs'
+        const data = {
+            builderHost,
+            assetUrls,
             rootUrl: __meteor_runtime_config__.ROOT_URL,
             tenantId: userSession.spaceId,
             userId: userSession.userId,
-            authToken: userSession.authToken
+            authToken: userSession.authToken,
+            pageId: req.query.pageId,
         }
+        const options = {}
+        ejs.renderFile(filename, data, options, function(err, str){
+            // str => Rendered HTML string
+            res.send(str);
+        });
 
-        const steedosBuilderHost = `https://builder.steedos.com/amis?${assetUrl}rootUrl=${__meteor_runtime_config__.ROOT_URL}&authToken=${userSession.authToken}&userId=${userSession.userId}&tenantId=${userSession.spaceId}&__q=`;
-
-        let data = fs.readFileSync(__dirname+'/design.html', 'utf8');
-        res.send(data.replace('SteedosBuilderHost',steedosBuilderHost).replace('DataContext', JSON.stringify(dataContext)));
     } catch (error) {
         res.status(500).send({ message: error.message });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-pages",
-  "version": "2.2.21",
+  "version": "2.2.22",
   "main": "package.service.js",
   "scripts": {},
   "license": "MIT",
@@ -11,5 +11,5 @@
   "dependencies": {
     "@builder.io/react": "^1.1.50"
   },
-  "gitHead": "39204e6e65ded584d76363cebfdcbcb061238d38"
+  "gitHead": "af4ea8ed034854c8de1ff8b9d5db241183524417"
 }