npm - @steedos/service-pages - Versions diffs - 2.2.3 → 2.2.6 - Mend

@steedos/service-pages 2.2.3 → 2.2.6

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 (58) hide show

package/main/default/objects/pages/fields/is_archived.field.yml CHANGED Viewed

@@ -1,5 +1,5 @@
 name: is_archived
-label: is_archived
+label: 已归档
 sort_no: 130
 type: toggle
 hidden: true

package/main/default/objects/pages/fields/object_name.field.yml CHANGED Viewed

@@ -9,5 +9,5 @@ optionsFunction: !!js/function |
     return Steedos.getObjectsOptions()
   }
 filterable: true
-required: "{{'record' == formData.type && 'list' == formData.type && 'form' == formData.type ? true: false}}"
-visible_on: "{{'record' == formData.type && 'list' == formData.type && 'form' == formData.type ? true: false}}"
+required: "{{'record' == formData.type || 'list' == formData.type || 'form' == formData.type ? true: false}}"
+visible_on: "{{'record' == formData.type || 'list' == formData.type || 'form' == formData.type ? true: false}}"

package/main/default/objects/pages/fields/type.field.yml CHANGED Viewed

@@ -4,13 +4,13 @@ type: select
 defaultValue: app
 required: true
 options:
-  - label: 自定义页面
+  - label: 应用程序页面
     value: app
-  - label: 记录详细
+  - label: 记录页面
     value: record
-  - label: 自定义列表
+  - label: 列表页面
     value: list
-  - label: 新建、编辑页面
+  - label: 表单
     value: form
 sort_no: 130
 visible_on: "{{'redash' != formData.render_engine ? true: false}}"

package/main/default/objects/pages/listviews/all.listview.yml CHANGED Viewed

@@ -2,6 +2,7 @@ name: all
 columns:
   - field: name
   - field: label
+  - field: render_engine
   - field: type
   - field: is_system
     wrap: false

package/main/default/objects/pages/listviews/recent.listview.yml CHANGED Viewed

@@ -3,6 +3,7 @@ columns:
   - field: name
   - field: label
   - field: type
+  - field: render_engine
   - field: is_system
     wrap: false
 filter_scope: space

package/main/default/objects/pages/pages.object.yml CHANGED Viewed

@@ -22,6 +22,10 @@ form:
  afterView: !!js/function |
       function(){
         if(this.doc.name && (this.doc.render_engine === 'redash' || !this.doc.render_engine)){
-          SteedosUI.render(stores.ComponentRegistry.components.Page, { pageId: this.doc.name }, $(".slds-template__container")[0])
+          return SteedosUI.render(stores.ComponentRegistry.components.Page, { pageId: this.doc.name }, $(".slds-template__container")[0])
         }
+        if(this.doc.type === 'app'){
+          $('[data-object-name="page_assignments"]').hide()
+        }
+        $('[data-object-name="page_versions"]').hide()
       }

package/main/default/objects/pages/permissions/user.permission.yml CHANGED Viewed

@@ -6,5 +6,5 @@ allowRead: true
 modifyAllRecords: false
 modifyCompanyRecords: false
 permission_set_id: user
-viewAllRecords: true
-viewCompanyRecords: true
+viewAllRecords: false
+viewCompanyRecords: false

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

@@ -5,15 +5,17 @@
     <script src="https://builder.steedos.com/js/builder-fiddle/builder-fiddle.umd.js"></script>
 </head>
-<body>
+<body style="margin: 0;padding: 0;">
-    <builder-fiddle host="https://builder.steedos.com/amis"></builder-fiddle>
+    <builder-fiddle host="SteedosBuilderHost"></builder-fiddle>
     <script>
         let comp = document.querySelector('builder-fiddle')
         var params = new URLSearchParams(location.search);
         var pageId = params.get("pageId");
-        axios.get("/api/v4/pages/" + params.get("pageId")).then(function (response) {
+        // /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)
@@ -34,7 +36,7 @@
             const { data } = event;
             if (data) {
                 if (data.type === 'builder.saveContent') {
-                    axios.put("/api/v4/pages/" + params.get("pageId"), {
+                    axios.put(`/service/api/page/pageVersion/${params.get("pageId")}`, {
                         schema: JSON.stringify(data.data.AmisSchema) //直接存储json格式会导致react form异常。
                     }).then(function (response) {
                         window.postMessage(
@@ -43,6 +45,15 @@
                         },
                         '*'
                         );
+                        try {
+                            //保存时, 刷新父页面
+                            if(window.opener){
+                                window.opener.postMessage(Object.assign({type: "record.edited"}, {objectName: 'pages'}, {record: {}}), "*")
+                            }
+                        } catch (error) {
+                            console.error(error)
+                        }
                     }).catch(function (error) {
                         // handle error
                         console.log(error);
@@ -55,8 +66,6 @@
         window.addEventListener('message', onWindowMessage);
     </script>
 </body>

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

@@ -1,9 +1,18 @@
 const express = require("express");
 const router = express.Router();
+const core = require('@steedos/core');
+const fs = require('fs');
-router.get('/api/pageDesign', async function (req, res) {
+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 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/routes/page_schema.router.js ADDED Viewed

@@ -0,0 +1,33 @@
+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, pageId, formFactor} = req.query;
+        const { type } = req.params;
+        const pageSchema = await objectql.getSteedosSchema().broker.call(`page.getMeSchema`, {
+            type,
+            app,
+            objectApiName,
+            recordId,
+            pageId,
+            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,281 @@
+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, pageId, formFactor } = ctx.params;
+                return await this.getMeSchema(type, app, objectApiName, recordId, pageId, 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);
+            }
+        },
+        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, recordId, formFactor, 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_active', '=', true]];
+                if (type === 'list' || type === 'record' || type === 'form') {
+                    filters.push(['object_name', '=', objectApiName]);
+                }
+                return await objectql.getObject('pages').find({ filters: filters, sort: 'modified desc' });
+            }
+        },
+        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, sort: 'modified desc' });
+            }
+        },
+        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 应用程序、记录类型和简档, 分配会覆盖组织和应用程序默认设置。
+             *
+             */
+            async handler(type, app, objectApiName, recordId, formFactor, userSession) {
+                try {
+                    const typePages = await this.getTypePages(type, objectApiName, userSession);
+                    //如果是app 类型,则直接返回最新的.
+                    if(type === 'app'){
+                        return typePages.length > 0 ? typePages[0] : null;
+                    }
+                    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, pageId, formFactor, userSession) {
+                if(pageId){
+                    const records = await objectql.getObject('pages').find({filters: [['name', '=', pageId]]});
+                    let pageInfo = {};
+                    if(records.length > 0){
+                        pageInfo = records[0];
+                        const pageVersion = await this.getLatestPageVersion(pageInfo._id, true);
+                        if(pageVersion && pageVersion.schema){
+                            return Object.assign({}, pageInfo, {schema: pageVersion.schema});
+                        }
+                    }
+                    return ;
+                }
+                // 计算 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 { render_engine: process.env.DEFAULT_PAGE_RENDER , schema: defaultSchema}
+                }
+            }
+        },
+        getLatestPageVersion:{
+            async handler(pageId, isArchived) {
+                const filters = [['page', '=', pageId]];
+                if(isArchived){
+                    filters.push(['is_active','=',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_active){
+                    return await objectql.getObject('page_versions').update(pageVersion._id, {
+                        schema: schema
+                    }, userSession);
+                }else{
+                    return await objectql.getObject('page_versions').insert({
+                        page: pageId,
+                        is_active: 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_assignments_check.trigger.js ADDED Viewed

@@ -0,0 +1,23 @@
+const objectql = require('@steedos/objectql');
+module.exports = {
+    listenTo: 'page_assignments',
+    beforeInsert: async function(){
+        const {doc, spaceId} = this;
+        if(doc.page){
+            const record = await objectql.getObject('pages').findOne(doc.page);
+            if(record.type === 'app'){
+                throw new Error('禁止给应用程序页面分配权限');
+            }
+        }
+    },
+    beforeUpdate: async function(){
+        const {object_name, doc, spaceId, id} = this;
+        if(doc.page){
+            const record = await objectql.getObject('pages').findOne(doc.page);
+            if(record.type === 'app'){
+                throw new Error('禁止给应用程序页面分配权限');
+            }
+        }
+    }
+}

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/page_versions_check.trigger.js ADDED Viewed

@@ -0,0 +1,21 @@
+const objectql = require('@steedos/objectql');
+const _ = require('underscore');
+module.exports = {
+    listenTo: 'page_versions',
+    beforeUpdate: async function(){
+        const {id, doc} = this;
+        const record = await objectql.getObject('page_versions').findOne(id);
+        if(record){
+            const getLatestPageVersion = await objectql.getSteedosSchema().broker.call('page.getLatestPageVersion', {
+                pageId: record.page
+            })
+            if(getLatestPageVersion._id != id){
+                throw new Error('禁止修改非最新版');
+            }
+        }
+        // if(_.has(doc, 'is_archived') && !doc.is_archived){
+        // }
+    }
+}

package/main/default/triggers/pages_check.trigger.js ADDED Viewed

@@ -0,0 +1,30 @@
+const objectql = require('@steedos/objectql');
+const _ = require('lodash');
+module.exports = {
+    listenTo: 'pages',
+    beforeUpdate: async function(){
+        const {object_name, doc, spaceId, id} = this;
+        if(_.has(doc, 'type') || _.has(doc, 'render_engine')){
+            const record = await objectql.getObject('pages').findOne(id);
+            if(_.has(doc, 'type') && doc.type != record.type){
+                throw new Error('禁止修改页面类型');
+            }
+            if(_.has(doc, 'render_engine') && doc.render_engine != record.render_engine){
+                throw new Error('禁止修改页面渲染器');
+            }
+        }
+        if(_.has(doc, 'is_archived') && !doc.is_archived){
+            let type = null;
+            if(_.has(doc, 'type')){
+                type = doc.type
+            }else{
+                const record = await objectql.getObject('pages').findOne(id);
+                type = record.type;
+            }
+            if(type === 'app'){
+                throw new Error('禁止停用应用程序页面');
+            }
+        }
+    }
+}

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.2.3",
+  "version": "2.2.6",
   "main": "package.service.js",
   "scripts": {},
   "license": "MIT",
@@ -11,5 +11,5 @@
   "dependencies": {
     "@builder.io/react": "^1.1.50"
   },
-  "gitHead": "57dfca5cd66528b2fbe6878f73f2e84b915d5e32"
+  "gitHead": "1742aab217ef9d96dc3514cac617db9863956f93"
 }