@steedos/service-pages 2.4.0-beta.31 → 2.4.0-beta.32

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

@@ -42,56 +42,17 @@
         return _innerWaitForThing(obj, path, func);
     };
     
-    // window.SteedosMonacoEnvironment = window.MonacoEnvironment = {
-    //     getWorkerUrl: function(workerId, label) {
-    //         return `data:text/javascript;charset=utf-8,${encodeURIComponent(`
-    //         self.MonacoEnvironment = {
-    //             baseUrl: '/unpkg.com/monaco-editor/min/'
-    //         };
-    //         importScripts('/unpkg.com/monaco-editor/min/vs/base/worker/workerMain.js');`
-    //         )}`;
-    //     }
-    // };
-
-    // Object.defineProperty(window, 'MonacoEnvironment', {set: ()=>{}, get: ()=>window.SteedosMonacoEnvironment})
-
-
-    // if (window.define)
-    //     window.define.amd = undefined;
-
-    // window.ReactDOM = ReactDom;
-    // window.React17 = window.React;
-    // window.ReactDOM17 = window.ReactDOM;
-
-    // const BuilderSDK = BuilderReact;
-
-    // window.BuilderReact = BuilderReact;
-    // window.BuilderSDK = BuilderSDK;
-
-    window.Builder = BuilderReact.Builder;
-
-    window.BuilderComponent = BuilderReact.BuilderComponent;
-    
-    window.builder = BuilderReact.builder;
-    window.builder.init('steedos');
-
     Promise.all([
         waitForThing(Creator, 'USER_CONTEXT'),
     ]).then(()=>{
         Builder.set({
-            rootUrl: __steedos_runtime_config__.ROOT_URL, 
-            unpkgUrl: __steedos_runtime_config__.STEEDOS_UNPKG_URL,
             context: {
-                rootUrl: __steedos_runtime_config__.ROOT_URL,
+                rootUrl: Builder.settings.rootUrl,
                 tenantId: Creator.USER_CONTEXT.spaceId,
                 userId: Creator.USER_CONTEXT.userId,
                 authToken: Creator.USER_CONTEXT.user.authToken
             }
         })
-        // 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" })
     })

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

@@ -316,7 +316,6 @@
 
             Promise.all([
                 waitForThing(window, 'renderAmis'),
-                waitForThing(window, 'BuilderComponent'),
                 waitForThing(Builder.components, upperFirst(page.render_engine), findComponent)
             ]).then(()=>{
                 //渲染page
@@ -326,41 +325,6 @@
                         schema,
                         data,
                     )
-                }else{
-                    if(root === SteedosUI.Drawer){
-                        data.drawerName = data.drawerName || lodash.uniqueId(`drawer-${page.object_name}`);
-                        SteedosUI.Drawer(Object.assign({
-                            name: data.drawerName,
-                            title: data.title,
-                            destroyOnClose: true,
-                            maskClosable: false,
-                            footer: null,
-                            bodyStyle: {padding: "0px", paddingTop: "12px"},
-                            children: React17.createElement(BuilderComponent, {
-                                model: "page", content: {
-                                    "data": pageContentData
-                                }
-                            })
-                        }, options.props)).show();
-                    }else{
-                        data.modalName = data.modalName || lodash.uniqueId(`modal-${page.object_name}`);
-                        SteedosUI.Modal(Object.assign({
-                            name: data.modalName,
-                            title: data.title,
-                            destroyOnClose: true,
-                            maskClosable: false,
-                            keyboard: false, // 禁止 esc 关闭
-                            footer: null,
-                            bodyStyle: {padding: "0px", paddingTop: "12px"},
-                            children: React17.createElement(BuilderComponent, {
-                                model: "page", content: {
-                                    "data": pageContentData
-                                }
-                            })
-                        }, options.props)).show();
-                    }
-
-                    
                 }
             });
         }
@@ -673,9 +637,9 @@
         let logoSrc = '';
         const space = db.spaces.findOne(Steedos.getSpaceId())
         if(space?.avatar){
-            logoSrc = Steedos.absoluteUrl(space.avatar) 
+            logoSrc = Steedos.absoluteUrl('api/files/avatars/'+space.avatar) 
         }else if(space?.avatar_square){
-            logoSrc = Steedos.absoluteUrl(space.avatar_square) 
+            logoSrc = Steedos.absoluteUrl('api/files/avatars/'+space.avatar_square) 
         }else{
             var settings = Session.get("tenant_settings");
             if(settings){

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

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

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

@@ -15,19 +15,8 @@ router.get('/api/pageDesign', core.requireAuthentication, async function (req, r
     try {
         res.set('Content-Type', 'text/html');
         const userSession = req.user;
-        let assetUrl = "";
-        let assetUrls = null;
-        if(process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS && _.isString(process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS)){
-            assetUrls = process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS.split(',');
-            assetUrl = `assetUrl=${assetUrls.join("&assetUrl=")}&`;
-        }else{
-            var fullPath = path.resolve(path.dirname(require.resolve('@steedos-ui/builder-widgets' + '/package.json')));
-            var packageFile = path.join(fullPath,'package.json');
-            var pkg = require(packageFile);
-            moduleVersion = pkg.version;
-            assetUrls = [`https://unpkg.com/@steedos-ui/builder-widgets@${moduleVersion}/dist/assets.json`];
-            assetUrl = `assetUrl=${assetUrls.join("&assetUrl=")}&`;
-        }
+        let assetUrls = req.query.assetUrls;
+        const assetUrl = `assetUrl=${assetUrls.split(',').join("&assetUrl=")}&`;
 
         // const dataContext = {
         //     rootUrl: __meteor_runtime_config__.ROOT_URL,
@@ -38,7 +27,7 @@ router.get('/api/pageDesign', core.requireAuthentication, async function (req, r
         const page = await objectql.broker.call(`page.getLatestPageVersion`, {pageId: req.query.pageId});
         const retUrl = __meteor_runtime_config__.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}&pageType=${page.type}`;
+        const builderHost = `${steedosBuilderUrl}/amis?${assetUrl}retUrl=${retUrl}&pageType=${page.type}`;
 
         // let data = fs.readFileSync(__dirname+'/design.html', 'utf8');
         // res.send(data.replace('SteedosBuilderHost',steedosBuilderHost).replace('DataContext', JSON.stringify(dataContext)));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-pages",
-  "version": "2.4.0-beta.31",
+  "version": "2.4.0-beta.32",
   "main": "package.service.js",
   "scripts": {},
   "license": "MIT",
@@ -8,7 +8,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a774174cebbb39c961ad03e20e990781082c8c04",
+  "gitHead": "6ce63579f48afb751446023df8ff93a859e606ae",
   "dependencies": {
     "ejs": "^3.1.8"
   }

package/public/js/requirejs/@steedos/filters.js

@@ -1,8 +0,0 @@
-/*
- * @Author: steedos
- * @Date: 2022-03-25 16:15:21
- * @Description: 
- */
-define(function () {
-  return SteedosFilters
-});

package/public/js/requirejs/@steedos-builder/react.js

@@ -1,8 +0,0 @@
-/*
- * @Author: steedos
- * @Date: 2022-03-25 16:15:21
- * @Description: 
- */
-define(function () {
-  return BuilderReact
-});

package/public/js/requirejs/@steedos-builder/sdk.js

@@ -1,8 +0,0 @@
-/*
- * @Author: steedos
- * @Date: 2022-03-26 16:16:01
- * @Description: 
- */
-define(function () {
-  return BuilderSDK
-});

package/public/js/requirejs/builder-react.js

@@ -1,4 +0,0 @@
-define("@steedos-builder/react", [], function () {
-  //Do setup work here
-  return BuilderReact
-});

package/public/js/requirejs/builder-sdk.js

@@ -1,3 +0,0 @@
-define("@steedos-builder/sdk", [], function () {
-  return BuilderSDK
-});

package/public/js/requirejs/filters.js

@@ -1,4 +0,0 @@
-define("@steedos/filters", [], function () {
-  //Do setup work here
-  return SteedosFilters
-});

package/public/js/requirejs/lodash.js

@@ -1,3 +0,0 @@
-define("lodash", [], function () {
-  return lodash
-});

package/public/js/requirejs/react-dom.js

@@ -1,3 +0,0 @@
-define("react-dom", [], function () {
-  return ReactDOM
-});

package/public/js/requirejs/react.js

@@ -1,3 +0,0 @@
-define("react", [], function () {
-  return React
-});