npm - @steedos/service-pages - Versions diffs - 2.1.92 → 2.2.4 - Mend

@steedos/service-pages 2.1.92 → 2.2.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (45) hide show

package/main/default/routes/design.html ADDED Viewed

@@ -0,0 +1,63 @@
+<html>
+<head>
+    <script src="https://builder.steedos.com/js/axios/axios.min.js"></script>
+    <script src="https://builder.steedos.com/js/builder-fiddle/builder-fiddle.umd.js"></script>
+</head>
+<body style="margin: 0;padding: 0;">
+    <builder-fiddle host="https://builder.steedos.com/amis"></builder-fiddle>
+    <script>
+        let comp = document.querySelector('builder-fiddle')
+        var params = new URLSearchParams(location.search);
+        var pageId = params.get("pageId");
+        // /pageVersion/:pageId/latest
+        axios.get(`/service/api/page/pageVersion/${params.get("pageId")}/latest/`).then(function (response) {
+            let schema = response.data.schema;
+            if (typeof schema === "string") {
+                schema = JSON.parse(schema)
+            }
+            const data = {
+                AmisSchema: schema || {}
+            };
+            console.log("record data", data)
+            comp.data = data;
+        }).catch(function (error) {
+            // handle error
+            console.log(error);
+        }).then(function () {
+            // always executed
+        });
+        const onWindowMessage = function (event) {
+            const { data } = event;
+            if (data) {
+                if (data.type === 'builder.saveContent') {
+                    axios.put(`/service/api/page/pageVersion/${params.get("pageId")}`, {
+                        schema: JSON.stringify(data.data.AmisSchema) //直接存储json格式会导致react form异常。
+                    }).then(function (response) {
+                        window.postMessage(
+                        {
+                            type: 'builder.contentSaved',
+                        },
+                        '*'
+                        );
+                    }).catch(function (error) {
+                        // handle error
+                        console.log(error);
+                    }).then(function () {
+                        // always executed
+                    })
+                }
+            }
+        }
+        window.addEventListener('message', onWindowMessage);
+    </script>
+</body>
+</html>

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

@@ -0,0 +1,13 @@
+const express = require("express");
+const router = express.Router();
+router.get('/api/pageDesign', async function (req, res) {
+    try {
+        res.set('Content-Type', 'text/html');
+        res.sendFile(__dirname+'/design.html')
+    } catch (error) {
+        res.status(500).send({ message: error.message });
+    }
+});
+exports.default = router;

package/main/default/routes/page_schema.router.js ADDED Viewed

@@ -0,0 +1,32 @@
+const express = require("express");
+const router = express.Router();
+const objectql = require('@steedos/objectql');
+const core = require('@steedos/core');
+router.get('/api/pageSchema/:type', core.requireAuthentication, async function (req, res) {
+    try {
+        const userSession = req.user;
+        const { app, objectApiName, recordId, formFactor} = req.query;
+        const { type } = req.params;
+        const pageSchema = await objectql.getSteedosSchema().broker.call(`page.getMeSchema`, {
+            type,
+            app,
+            objectApiName,
+            recordId,
+            formFactor
+        }, {
+            meta: {
+                user: userSession
+            }
+        });
+        res.send(pageSchema || {});
+    } catch (error) {
+        res.status(500).send({ message: error.message });
+    }
+});
+exports.default = router;

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

@@ -0,0 +1,264 @@
+const objectql = require('@steedos/objectql');
+const _ = require('lodash');
+module.exports = {
+    name: "page",
+    mixins: [],
+    /**
+     * Settings
+     */
+    settings: {
+    },
+    /**
+     * Dependencies
+     */
+    dependencies: [],
+    /**
+     * Actions
+     */
+    actions: {
+        getMeSchema: {
+            async handler(ctx) {
+                const userSession = ctx.meta.user;
+                const { type, app, objectApiName, recordId, formFactor } = ctx.params;
+                return await this.getMeSchema(type, app, objectApiName, recordId, formFactor, userSession);
+            }
+        },
+        // enablePageVersion:{
+        //     rest: {
+        //         method: "GET",
+        //         path: "/pageSchema/enable/:pageVersionId"
+        //     },
+        //     params: {
+        //         pageVersionId: { type: "any" }
+        //     },
+        //     async handler(ctx) {
+        //         const userSession = ctx.meta.user;
+        //         const { pageVersionId } = ctx.params;
+        //         return await this.enablePageVersion(pageVersionId, userSession);
+        //     }
+        // },
+        getLatestPageVersion:{
+            rest: {
+                method: "GET",
+                path: "/pageVersion/:pageId/latest"
+            },
+            params: {
+                pageId: { type: "any" }
+            },
+            async handler(ctx){
+                const userSession = ctx.meta.user;
+                const { pageId } = ctx.params;
+                return await this.getLatestPageVersion(pageId, userSession);
+            }
+        },
+        changePageVersion:{
+            rest: {
+                method: "PUT",
+                path: "/pageVersion/:pageId"
+            },
+            params: {
+                pageId: { type: "any" },
+                schema: { type: "any" }
+            },
+            async handler(ctx){
+                const userSession = ctx.meta.user;
+                const { pageId, schema } = ctx.params;
+                return await this.changePageVersion(pageId, schema, userSession);
+            }
+        }
+    },
+    /**
+     * Events
+     */
+    events: {
+    },
+    /**
+     * Methods
+     */
+    methods: {
+        getDefaultSchema: {
+            async handler(type, app, objectApiName, formFactor, recordId, userSession) {
+                if (process.env.DEFAULT_PAGE_RENDER) {
+                    return await this.broker.call(`${process.env.DEFAULT_PAGE_RENDER}.getDefaultSchema`, {type, app, objectApiName, recordId, formFactor}, {
+                        meta: {
+                          user: userSession
+                        }
+                      })
+                }
+                return;
+            }
+        },
+        getTypePages: {
+            async handler(type, objectApiName, userSession) {
+                const filters = [['type', '=', type], ['is_archived', '=', true]];
+                if (type === 'list' || type === 'record' || type === 'form') {
+                    filters.push(['object_name', '=', objectApiName]);
+                }
+                return await objectql.getObject('pages').find({ filters: filters });
+            }
+        },
+        getAssignments: {
+            async handler(formFactor, typePages) {
+                if(!typePages || typePages.length < 1){
+                    return ;
+                }
+                const filters = [['page', 'in', _.map(typePages, '_id')]];
+                if(formFactor === 'SMALL'){
+                    filters.push(['mobile','=', true])
+                }else{
+                    filters.push(['desktop','=', true])
+                }
+                return await objectql.getObject("page_assignments").find({ filters: filters });
+            }
+        },
+        getAppProfileAssignment: {
+            async handler(app, assignments, userSession) {
+                return _.filter(assignments, (assignment) => {
+                    //TODO Record Type
+                    return assignment.app === app && arguments.profile === userSession.profile;
+                });
+            }
+        },
+        getAppDefaultAssignment: {
+            async handler(app, assignments) {
+                return _.filter(assignments, (assignment) => {
+                    return assignment.app === app;
+                });
+            }
+        },
+        getOrgDefaultAssignment: {
+            async handler(assignments) {
+                return _.filter(assignments, (assignment) => {
+                    return !assignment.app && !assignment.profile
+                })
+            }
+        },
+        getAssignmentPage: {
+            async handler(assignment, typePages) {
+                const page = _.find(typePages, (typePage) => {
+                    return typePage.name == assignment.page || typePage._id == assignment.page
+                })
+                if (page) {
+                    return page;
+                }
+                // else {
+                //     throw new Error(`not find assignment page ${assignment.desktop}`)
+                // }
+            }
+        },
+        getUserPage: {
+            /**
+             * 自定义记录页面可在不同层面上分配：
+             * 1 组织默认设置 记录页面会为对象显示，除非已进行更多特定分配。
+             * 2 如果已指定，则应用程序默认设置 页面分配会覆盖组织默认设置。
+             * 3 应用程序、记录类型和简档, 分配会覆盖组织和应用程序默认设置。
+             *
+             * TODO form factors "LARGE","SMALL"
+             * TODO 页面分配有多条时的优先级处理（始终是最新的分配生效）。
+             */
+            async handler(type, app, objectApiName, recordId, formFactor, userSession) {
+                try {
+                    const typePages = await this.getTypePages(type, objectApiName, userSession);
+                    const assignments = await this.getAssignments(formFactor, typePages);
+                    const appProfileassignment = await this.getAppProfileAssignment(app, assignments, userSession);
+                    if (appProfileassignment && appProfileassignment.length > 0) {
+                        return await this.getAssignmentPage(appProfileassignment[0], typePages)
+                    }
+                    const appDefaultAssignment = await this.getAppDefaultAssignment(app, assignments);
+                    if (appDefaultAssignment && appDefaultAssignment.length > 0) {
+                        return await this.getAssignmentPage(appDefaultAssignment[0], typePages)
+                    }
+                    const orgDefaultAssignment = await this.getOrgDefaultAssignment(assignments);
+                    if (orgDefaultAssignment && orgDefaultAssignment.length > 0) {
+                        return await this.getAssignmentPage(orgDefaultAssignment[0], typePages)
+                    }
+                } catch (error) {
+                    console.error(`error`, error);
+                    return ;
+                }
+            }
+        },
+        getMeSchema: {
+            async handler(type, app, objectApiName, recordId, formFactor, userSession) {
+                // 计算 userSchema
+                const userPage = await this.getUserPage(type, app, objectApiName, recordId, formFactor, userSession);
+                if (userPage) {
+                    const pageVersion = await this.getLatestPageVersion(userPage._id, true);
+                    if(pageVersion && pageVersion.schema){
+                        return Object.assign({}, userPage, {schema: pageVersion.schema});
+                    }
+                }
+                const defaultSchema = await this.getDefaultSchema(type, app, objectApiName, recordId, formFactor, userSession);
+                if(defaultSchema){
+                    return {schema: defaultSchema}
+                }
+            }
+        },
+        getLatestPageVersion:{
+            async handler(pageId, isArchived) {
+                const filters = [['page', '=', pageId]];
+                if(isArchived){
+                    filters.push(['is_archived','=',true])
+                }
+                // 根据pageId 获取 page version
+                const pageVersions = await objectql.getObject('page_versions').find({filters: filters, sort: 'version desc', top: 1});
+                if(pageVersions.length === 1){
+                    return pageVersions[0]
+                }
+            }
+        },
+        changePageVersion: {
+            async handler(pageId, schema, userSession) {
+                // 根据pageId 获取 pageversions
+                const pageVersion = await this.getLatestPageVersion(pageId);
+                let version = pageVersion ? pageVersion.version :0;
+                if(pageVersion && !pageVersion.is_archived){
+                    return await objectql.getObject('page_versions').update(pageVersion._id, {
+                        schema: schema
+                    }, userSession);
+                }else{
+                    return await objectql.getObject('page_versions').insert({
+                        page: pageId,
+                        is_archived: false,
+                        schema: schema,
+                        version: ++version,
+                        space: userSession.spaceId
+                    }, userSession)
+                }
+            }
+        },
+    },
+    /**
+     * Service created lifecycle event handler
+     */
+    async created() {
+    },
+    /**
+     * Service started lifecycle event handler
+     */
+    async started() {
+    },
+    /**
+     * Service stopped lifecycle event handler
+     */
+    async stopped() {
+    }
+};

package/main/default/triggers/page_versions.enable.trigger.js ADDED Viewed

@@ -0,0 +1,15 @@
+const objectql = require('@steedos/objectql');
+const _ = require('underscore');
+module.exports = {
+    listenTo: 'page_versions',
+    afterUpdate: async function(){
+        const {id, doc, previousDoc} = this;
+        if(_.has(doc, 'is_archived') && doc.is_archived && previousDoc.is_archived != doc.is_archived ){
+            const record = await objectql.getObject('page_versions').findOne(id)
+            await objectql.getObject('pages').directUpdate(record.page, {
+                is_archived: true
+            })
+        }
+    }
+}

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

@@ -24,52 +24,17 @@ module.exports = {
     listenTo: 'pages',
     afterFind: async function(){
-        let filters = objectql.parserFilters(this.query.filters)
-        let dataList = []
-        if(filters._id && !filters._id.$ne){
-            let id = filters._id
-            id = id.replace(/\\/g, '');
-            let data = await get(id);
-            if(data){
-                dataList = [data]
-            }
-        }else{
-            dataList = await getAll();
-            if(filters.name){
-                dataList = _.filter(dataList, (item)=>{
-                    return item.name == filters.name
-                })
-            }
-        }
+        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);
-        if(dataList){
-            const dbRecrodsName = _.pluck(this.data.values, 'name');
-            this.data.values = this.data.values.concat(_.filter(dataList, function(data){return data._id == data.name && !_.include(dbRecrodsName, data.name) }))
-        }
     },
     afterAggregate: async function(){
-        let filters = objectql.parserFilters(this.query.filters)
-        let dataList = []
-        if(filters._id && !filters._id.$ne){
-            let id = filters._id
-            id = id.replace(/\\/g, '');
-            let data = await get(id);
-            if(data){
-                dataList = [data]
-            }
-        }else{
-            dataList = await getAll();
-            if(filters.name){
-                dataList = _.filter(dataList, (item)=>{
-                    return item.name == filters.name
-                })
-            }
-        }
+        let spaceId = this.spaceId;
+        this.data.values = this.data.values.concat(await getAll());
-        if(dataList){
-            const dbRecrodsName = _.pluck(this.data.values, 'name');
-            this.data.values = this.data.values.concat(_.filter(dataList, function(data){return data._id == data.name && !_.include(dbRecrodsName, data.name) }))
-        }
+        this.data.values = objectql.getSteedosSchema().metadataDriver.find(this.data.values, this.query, spaceId);
     },
     afterCount: async function(){
         let result = await objectql.getObject(this.object_name).find(this.query, await auth.getSessionByUserId(this.userId, this.spaceId))
@@ -77,11 +42,11 @@ module.exports = {
     },
     afterFindOne: async function(){
         if(_.isEmpty(this.data.values)){
-            let id = this.id
-            let data = await get(id);
-            if(data){
-                this.data.values = data;
-            }
+            const all = await getAll();
+            const id = this.id;
+            this.data.values = _.find(all, function(item){
+                return item._id === id
+            });
         }
     }
 }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-pages",
-  "version": "2.1.92",
+  "version": "2.2.4",
   "main": "package.service.js",
   "scripts": {},
   "license": "MIT",
@@ -8,5 +8,8 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b4f200efd338673eabbcccc0cc23f0f9c662eee2"
+  "dependencies": {
+    "@builder.io/react": "^1.1.50"
+  },
+  "gitHead": "a0c0e8d900f7f4fd2045d976b36c9bef465a6ce3"
 }

package/package.service.js CHANGED Viewed

@@ -4,6 +4,8 @@ const packageName = project.name;
 const packageLoader = require('@steedos/service-package-loader');
 const objectql = require('@steedos/objectql');
 const _ = require(`lodash`);
+const express = require('express');
+const path = require('path');
 const getCharts = async(apiName)=>{
 	const charts = await objectql.getObject('charts').find({ filters: [['name', '=', apiName]] });
@@ -35,7 +37,8 @@ module.exports = {
 			path: __dirname,
 			name: this.name,
 			isPackage: false
-		}
+		},
+		initBuilderRouter: false
 	},
 	/**
@@ -144,14 +147,37 @@ 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;
+				// }
+			}
+		},
 	},
 	/**
@@ -165,7 +191,7 @@ module.exports = {
 	 * Service started lifecycle event handler
 	 */
 	async started() {
+		this.initBuilderRouter();
 	},
 	/**