@steedos/service-pages 2.2.17 → 2.2.18

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

@@ -64,7 +64,10 @@ function injectScript(src) {
 
 injectScript('/unpkg.com/@steedos-builder/react/dist/builder-react.unpkg.js')
     .then(() => {
-        console.log('Builder loaded!');
+        console.log('Builder React loaded!');
+        window.define.amd = undefined;
+        window.ReactDOM = ReactDom;
+
         const BuilderSDK = BuilderReact;
 
         window.BuilderReact = BuilderReact;
@@ -74,44 +77,19 @@ injectScript('/unpkg.com/@steedos-builder/react/dist/builder-react.unpkg.js')
         window.BuilderComponent = BuilderReact.BuilderComponent;
         window.builder = BuilderReact.builder;
 
-        Builder.set({rootUrl: __meteor_runtime_config__.ROOT_URL, unpkgUrl: Meteor.settings.public.unpkgUrl || 'https://npm.elemecdn.com'})
-        window['React'] = require('react'); 
-        window['ReactDOM'] = require('react-dom'); 
-        // window['lodash'] = require('lodash'); 
-
-        Builder.registerImportMap({
-            "lodash": '/js/requirejs/lodash',
-            "react": '/js/requirejs/react',
-            "react-dom": '/js/requirejs/react-dom',
-            "@steedos-builder/sdk": '/js/requirejs/builder-sdk',
-            "@steedos-builder/react": '/js/requirejs/builder-react',
+        Builder.set({
+            rootUrl: __meteor_runtime_config__.ROOT_URL, 
+            unpkgUrl: Meteor.settings.public.unpkgUrl || 'https://unpkg.com'
         })
-        Builder.require(['lodash',"react", "react-dom"])
-
-        Builder.requirejs.config(
-            { 
-              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"
-              } 
-            }
-          );
-        Builder.requirejs(['vs/editor/editor.main'], () => {
-           return monaco = window['monaco'];
-        });
 
         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/routes/page_design.router.js

@@ -1,13 +1,23 @@
+/*
+ * @Author: baozhoutao@steedos.com
+ * @Date: 2022-04-04 16:34:28
+ * @Description: 
+ */
 const express = require("express");
 const router = express.Router();
 const core = require('@steedos/core');
 const fs = require('fs');
-
+const _ = require('lodash');
 router.get('/api/pageDesign', core.requireAuthentication, async function (req, res) {
     try {
         res.set('Content-Type', 'text/html');
         const userSession = req.user;
-        const steedosBuilderHost = `https://builder.steedos.com/amis?assetUrl=https://unpkg.com/@steedos-ui/builder-widgets/dist/assets.js&rootUrl=${__meteor_runtime_config__.ROOT_URL}&authToken=${userSession.authToken}&userId=${userSession.userId}&tenantId=${userSession.spaceId}&__q=`;
+        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(',');
+            assetUrl = `assetUrl=${assetUrls.join("&assetUrl=")}&`;
+        }
+        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));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-pages",
-  "version": "2.2.17",
+  "version": "2.2.18",
   "main": "package.service.js",
   "scripts": {},
   "license": "MIT",
@@ -11,5 +11,5 @@
   "dependencies": {
     "@builder.io/react": "^1.1.50"
   },
-  "gitHead": "d5f33748f18e5376484551234b3b323132a1e56c"
+  "gitHead": "4b9d49b8610ad4b0e18f71d0db33cf4f2f1b58e9"
 }