@steedos/service-pages 2.2.17 → 2.2.20

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

@@ -37,18 +37,18 @@
         return _innerWaitForThing(obj, path, func);
     };
     
-    window.SteedosMonacoEnvironment = window.MonacoEnvironment = {
-        getWorkerUrl: function(workerId, label) {
-            return `data:text/javascript;charset=utf-8,${encodeURIComponent(`
-            self.MonacoEnvironment = {
-                baseUrl: '${window.location.origin}/unpkg.com/monaco-editor/min/'
-            };
-            importScripts('${window.location.origin}/unpkg.com/monaco-editor/min/vs/base/worker/workerMain.js');`
-            )}`;
-        }
-    };
+    // 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})
+    // Object.defineProperty(window, 'MonacoEnvironment', {set: ()=>{}, get: ()=>window.SteedosMonacoEnvironment})
 
 })();
 
@@ -64,7 +64,11 @@ function injectScript(src) {
 
 injectScript('/unpkg.com/@steedos-builder/react/dist/builder-react.unpkg.js')
     .then(() => {
-        console.log('Builder loaded!');
+        console.log('Builder React loaded!');
+        if (window.define)
+            window.define.amd = undefined;
+        window.ReactDOM = ReactDom;
+
         const BuilderSDK = BuilderReact;
 
         window.BuilderReact = BuilderReact;
@@ -74,44 +78,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: '/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/client/onWindowMessage.client.js

@@ -36,4 +36,24 @@ 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

@@ -57,7 +57,7 @@ Steedos.Page.render = function (root, page, data) {
 
     const loadingContentData = {
         "inputs": [],
-        "title": "loading",
+        // "title": "loading",
         "blocks": [
             {
                 "@type": "@builder.io/sdk:Element",

package/main/default/objects/page_assignments/fields/is_system.field.yml

@@ -2,5 +2,5 @@ name: is_system
 type: boolean
 label: System
 omit: true
-hidden: true
+readonly: true
 disabled: true

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

@@ -1,3 +1,10 @@
+/*
+ * @Author: baozhoutaon@hotoa.com
+ * @Date: 2022-03-29 20:33:44
+ * @LastEditors: sunhaolin@hotoa.com
+ * @LastEditTime: 2022-04-10 14:20:32
+ * @Description: 
+ */
 module.exports = {
     deploy: function (object_name, record_id) {
         $(document.body).addClass('loading');
@@ -19,7 +26,7 @@ module.exports = {
         };
         Steedos.authRequest(url, options);
     },
-    deployVisible: function () {
-        return true
+    deployVisible: function (object_name, record_id, permission, record) {
+        return record && !record.is_system;
     }
 }

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

@@ -25,6 +25,6 @@ module.exports = {
         Steedos.authRequest(url, options);
     },
     disableVisible: function (object_name, record_id, permission, record) {
-        return record && record.is_active
+        return record && record.is_active && !record.is_system
     }
 }

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

@@ -25,6 +25,6 @@ module.exports = {
         Steedos.authRequest(url, options);
     },
     enableVisible: function (object_name, record_id, permission, record) {
-        return record && !record.is_active
+        return record && !record.is_active && !record.is_system
     }
 }

package/main/default/objects/pages/fields/is_system.field.yml

@@ -2,5 +2,5 @@ name: is_system
 type: boolean
 label: 系统
 omit: true
-hidden: true
+readonly: true
 disabled: true

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

@@ -1,19 +1,26 @@
+/*
+ * @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));
-
-
-        res.sendFile(__dirname+'/design.html') 
     } catch (error) {
         res.status(500).send({ message: error.message });
     }

package/main/default/triggers/page_assignments_metadata.trigger.js

@@ -0,0 +1,102 @@
+/*
+ * @Author: sunhaolin@hotoa.com
+ * @Date: 2022-04-10 14:34:08
+ * @LastEditors: sunhaolin@hotoa.com
+ * @LastEditTime: 2022-04-10 15:24:17
+ * @Description: 
+ */
+const objectql = require('@steedos/objectql');
+const auth = require('@steedos/auth');
+const _ = require('underscore');
+async function getAll() {
+    const schema = objectql.getSteedosSchema();
+    const configs = await objectql.registerPage.getAll(schema.broker)
+    const dataList = _.pluck(configs, 'metadata');
+    let assignments = [];
+    _.each(dataList, function (item) {
+        if (!item._id) {
+            item._id = `${item.name}`
+        }
+        if (item.pageAssignments) {
+            for (const assignment of item.pageAssignments) {
+                assignments.push({
+                    _id: assignment._id,
+                    app: assignment.app,
+                    desktop: assignment.desktop,
+                    is_system: assignment.is_system || false,
+                    mobile: assignment.mobile,
+                    page: item._id,
+                    profile: assignment.profile,
+                    record_type: assignment.record_type,
+                });
+            }
+        }
+    })
+    return assignments;
+}
+
+module.exports = {
+    listenTo: 'page_assignments',
+
+    beforeFind: async function () {
+        delete this.query.fields;
+    },
+
+    beforeAggregate: async function () {
+        delete this.query.fields;
+    },
+
+    afterFind: async function () {
+        const { spaceId } = this;
+        let dataList = await getAll();
+        if (dataList) {
+            dataList.forEach((doc) => {
+                if (!_.find(this.data.values, (value) => {
+                    return value._id === doc._id
+                })) {
+                    this.data.values.push(doc);
+                }
+            })
+            const records = objectql.getSteedosSchema().metadataDriver.find(this.data.values, this.query, spaceId);
+            if (records.length > 0) {
+                this.data.values = records;
+            } else {
+                this.data.values.length = 0;
+            }
+        }
+
+    },
+    afterAggregate: async function () {
+        const { spaceId } = this;
+        let dataList = await getAll();
+        if (dataList) {
+            dataList.forEach((doc) => {
+                if (!_.find(this.data.values, (value) => {
+                    return value._id === doc._id
+                })) {
+                    this.data.values.push(doc);
+                }
+            })
+            const records = objectql.getSteedosSchema().metadataDriver.find(this.data.values, this.query, spaceId);
+            if (records.length > 0) {
+                this.data.values = records;
+            } else {
+                this.data.values.length = 0;
+            }
+        }
+    },
+    afterCount: async function () {
+        delete this.query.fields;
+        let result = await objectql.getObject(this.object_name).find(this.query, await auth.getSessionByUserId(this.userId, this.spaceId))
+        this.data.values = result.length;
+    },
+    afterFindOne: async function () {
+        if (_.isEmpty(this.data.values)) {
+            const all = await getAll();
+            const id = this.id;
+            this.data.values = _.find(all, function (item) {
+                return item._id === id
+            });
+        }
+    }
+}

package/main/default/triggers/page_versions_metadata.trigger.js

@@ -0,0 +1,96 @@
+/*
+ * @Author: sunhaolin@hotoa.com
+ * @Date: 2022-04-10 14:27:24
+ * @LastEditors: sunhaolin@hotoa.com
+ * @LastEditTime: 2022-04-10 14:33:55
+ * @Description: 
+ */
+const objectql = require('@steedos/objectql');
+const auth = require('@steedos/auth');
+const _ = require('underscore');
+async function getAll(){
+    const schema = objectql.getSteedosSchema();
+    const configs = await objectql.registerPage.getAll(schema.broker)
+    const dataList = _.pluck(configs, 'metadata');
+    let versions = [];
+    _.each(dataList, function(item){
+        if(!item._id){
+            item._id = `${item.name}`
+        }
+        versions.push({
+            _id: item._id,
+            description: item.description,
+            is_active: false,
+            page: item._id,
+            schema: item.schema,
+            version: 1,
+        });
+    })
+    return versions;
+}
+
+module.exports = {
+    listenTo: 'page_versions',
+
+    beforeFind: async function () {
+        delete this.query.fields;
+    },
+
+    beforeAggregate: async function () {
+        delete this.query.fields;
+    },
+
+    afterFind: async function(){
+        const { spaceId } = this;
+        let dataList = await getAll();
+        if (dataList) {
+            dataList.forEach((doc) => {
+                if (!_.find(this.data.values, (value) => {
+                    return value._id === doc._id
+                })) {
+                    this.data.values.push(doc);
+                }
+            })
+            const records = objectql.getSteedosSchema().metadataDriver.find(this.data.values, this.query, spaceId);
+            if (records.length > 0) {
+                this.data.values = records;
+            } else {
+                this.data.values.length = 0;
+            }
+        }
+
+    },
+    afterAggregate: async function(){
+        const { spaceId } = this;
+        let dataList = await getAll();
+        if (dataList) {
+            dataList.forEach((doc) => {
+                if (!_.find(this.data.values, (value) => {
+                    return value._id === doc._id
+                })) {
+                    this.data.values.push(doc);
+                }
+            })
+            const records = objectql.getSteedosSchema().metadataDriver.find(this.data.values, this.query, spaceId);
+            if (records.length > 0) {
+                this.data.values = records;
+            } else {
+                this.data.values.length = 0;
+            }
+        }
+    },
+    afterCount: async function(){
+        delete this.query.fields;
+        let result = await objectql.getObject(this.object_name).find(this.query, await auth.getSessionByUserId(this.userId, this.spaceId))
+        this.data.values = result.length;
+    },
+    afterFindOne: async function(){
+        if(_.isEmpty(this.data.values)){
+            const all = await getAll();
+            const id = this.id;
+            this.data.values = _.find(all, function(item){
+                return item._id === id
+            });
+        }
+    }
+}

package/main/default/triggers/pages_metadata.trigger.js

@@ -1,3 +1,10 @@
+/*
+ * @Author: baozhoutao@hotoa.com
+ * @Date: 2022-03-28 17:09:20
+ * @LastEditors: sunhaolin@hotoa.com
+ * @LastEditTime: 2022-04-11 15:23:26
+ * @Description: 
+ */
 const objectql = require('@steedos/objectql');
 const auth = require('@steedos/auth');
 const _ = require('underscore');
@@ -14,29 +21,58 @@ async function getAll(){
     return dataList;
 }
 
-async function get(apiName){
-    const schema =objectql.getSteedosSchema();
-    const config = await objectql.registerPage.get(schema.broker, apiName)
-    return config ? config.metadata : null;
-}
-
 module.exports = {
     listenTo: 'pages',
 
-    afterFind: async function(){
-        let spaceId = this.spaceId;
-        this.data.values = this.data.values.concat(await getAll());
+    beforeFind: async function () {
+        delete this.query.fields;
+    },
+
+    beforeAggregate: async function () {
+        delete this.query.fields;
+    },
 
-        this.data.values = objectql.getSteedosSchema().metadataDriver.find(this.data.values, this.query, spaceId);
+    afterFind: async function(){
+        const { spaceId } = this;
+        let dataList = await getAll();
+        if (!_.isEmpty(dataList)) {
+            dataList.forEach((doc) => {
+                if (!_.find(this.data.values, (value) => {
+                    return value.name === doc.name
+                })) {
+                    this.data.values.push(doc);
+                }
+            })
+            const records = objectql.getSteedosSchema().metadataDriver.find(this.data.values, this.query, spaceId);
+            if (records.length > 0) {
+                this.data.values = records;
+            } else {
+                this.data.values.length = 0;
+            }
+        }
 
     },
     afterAggregate: async function(){
-        let spaceId = this.spaceId;
-        this.data.values = this.data.values.concat(await getAll());
-
-        this.data.values = objectql.getSteedosSchema().metadataDriver.find(this.data.values, this.query, spaceId);
+        const { spaceId } = this;
+        let dataList = await getAll();
+        if (!_.isEmpty(dataList)) {
+            dataList.forEach((doc) => {
+                if (!_.find(this.data.values, (value) => {
+                    return value.name === doc.name
+                })) {
+                    this.data.values.push(doc);
+                }
+            })
+            const records = objectql.getSteedosSchema().metadataDriver.find(this.data.values, this.query, spaceId);
+            if (records.length > 0) {
+                this.data.values = records;
+            } else {
+                this.data.values.length = 0;
+            }
+        }
     },
     afterCount: async function(){
+        delete this.query.fields;
         let result = await objectql.getObject(this.object_name).find(this.query, await auth.getSessionByUserId(this.userId, this.spaceId))
         this.data.values = result.length;
     },

package/package.json

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

package/package.service.js

@@ -37,8 +37,7 @@ module.exports = {
 			path: __dirname,
 			name: this.name,
 			isPackage: false
-		},
-		initBuilderRouter: false
+		}
 	},
 
 	/**
@@ -147,37 +146,14 @@ module.exports = {
 	 * Events
 	 */
 	events: {
-		'steedos-server.started': async function (ctx) {
-			this.initBuilderRouter();
-		}
+		
 	},
 
 	/**
 	 * Methods
 	 */
 	methods: {
-		initBuilderRouter: {
-			handler() {
-				// if (this.settings.initBuilderRouter) {
-				// 	return;
-				// }
-				// this.settings.initBuilderRouter = true;
-				// try {
-				// 	const router = express.Router();
-				// 	let publicPath = path.join(__dirname, 'public');
-				// 	let routerPath = "";
-				// 	if (__meteor_runtime_config__.ROOT_URL_PATH_PREFIX) {
-				// 		routerPath = __meteor_runtime_config__.ROOT_URL_PATH_PREFIX;
-				// 	}
-				// 	const cacheTime = 86400000 * 1; // one day
-				// 	router.use(routerPath, express.static(publicPath, { maxAge: cacheTime }));
-				// 	WebApp.rawConnectHandlers.use(router);
-				// } catch (error) {
-				// 	console.error(error)
-				// 	this.settings.initBuilderRouter = false;
-				// }
-			}
-		},
+		
 	},
 
 	/**
@@ -191,7 +167,7 @@ module.exports = {
 	 * Service started lifecycle event handler
 	 */
 	async started() {
-		this.initBuilderRouter();
+		
 	},
 
 	/**