@steedos/service-pages 2.2.4 → 2.2.7

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

@@ -8,7 +8,7 @@ router.get('/api/pageSchema/:type', core.requireAuthentication, async function (
 
         const userSession = req.user;
 
-        const { app, objectApiName, recordId, formFactor} = req.query;
+        const { app, objectApiName, recordId, pageId, formFactor} = req.query;
         const { type } = req.params;
 
         const pageSchema = await objectql.getSteedosSchema().broker.call(`page.getMeSchema`, {
@@ -16,6 +16,7 @@ router.get('/api/pageSchema/:type', core.requireAuthentication, async function (
             app,
             objectApiName,
             recordId,
+            pageId,
             formFactor
         }, {
             meta: {

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

@@ -24,8 +24,8 @@ module.exports = {
         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);
+                const { type, app, objectApiName, recordId, pageId, formFactor } = ctx.params;
+                return await this.getMeSchema(type, app, objectApiName, recordId, pageId, formFactor, userSession);
             }
         },
         // enablePageVersion:{
@@ -51,9 +51,9 @@ module.exports = {
                 pageId: { type: "any" }
             },
             async handler(ctx){
-                const userSession = ctx.meta.user;
+                // const userSession = ctx.meta.user;
                 const { pageId } = ctx.params;
-                return await this.getLatestPageVersion(pageId, userSession);
+                return await this.getLatestPageVersion(pageId);
             }
         },
         changePageVersion:{
@@ -85,7 +85,7 @@ module.exports = {
      */
     methods: {
         getDefaultSchema: {
-            async handler(type, app, objectApiName, formFactor, recordId, userSession) {
+            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: {
@@ -98,11 +98,11 @@ module.exports = {
         },
         getTypePages: {
             async handler(type, objectApiName, userSession) {
-                const filters = [['type', '=', type], ['is_archived', '=', true]];
+                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 });
+                return await objectql.getObject('pages').find({ filters: filters, sort: 'modified desc' });
             }
         },
         getAssignments: {
@@ -116,7 +116,7 @@ module.exports = {
                 }else{
                     filters.push(['desktop','=', true])
                 }
-                return await objectql.getObject("page_assignments").find({ filters: filters });
+                return await objectql.getObject("page_assignments").find({ filters: filters, sort: 'modified desc' });
             }
         },
         getAppProfileAssignment: {
@@ -161,13 +161,17 @@ module.exports = {
              * 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);
+                    
+                    //如果是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);
@@ -191,7 +195,20 @@ module.exports = {
             }
         },
         getMeSchema: {
-            async handler(type, app, objectApiName, recordId, formFactor, userSession) {
+            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) {
@@ -202,7 +219,7 @@ module.exports = {
                 }
                 const defaultSchema = await this.getDefaultSchema(type, app, objectApiName, recordId, formFactor, userSession);
                 if(defaultSchema){
-                    return {schema: defaultSchema}
+                    return { render_engine: process.env.DEFAULT_PAGE_RENDER , schema: defaultSchema}
                 }
             }
         },
@@ -210,7 +227,7 @@ module.exports = {
             async handler(pageId, isArchived) {
                 const filters = [['page', '=', pageId]];
                 if(isArchived){
-                    filters.push(['is_archived','=',true])
+                    filters.push(['is_active','=',true])
                 }
                 // 根据pageId 获取 page version
                 const pageVersions = await objectql.getObject('page_versions').find({filters: filters, sort: 'version desc', top: 1});
@@ -224,14 +241,14 @@ module.exports = {
                 // 根据pageId 获取 pageversions
                 const pageVersion = await this.getLatestPageVersion(pageId);
                 let version = pageVersion ? pageVersion.version :0;
-                if(pageVersion && !pageVersion.is_archived){
+                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_archived: false,
+                        is_active: false,
                         schema: schema,
                         version: ++version,
                         space: userSession.spaceId

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

@@ -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_check.trigger.js

@@ -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

@@ -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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-pages",
-  "version": "2.2.4",
+  "version": "2.2.7",
   "main": "package.service.js",
   "scripts": {},
   "license": "MIT",
@@ -11,5 +11,5 @@
   "dependencies": {
     "@builder.io/react": "^1.1.50"
   },
-  "gitHead": "a0c0e8d900f7f4fd2045d976b36c9bef465a6ce3"
+  "gitHead": "72067dc4759d5062f1e0c6b78e807802b53d3b08"
 }

package/docs/amis.md

@@ -1,53 +0,0 @@
-## 集成 Amis
-- 集成Amis 设计器
-- 集成Amis 渲染器
-
-## 新增对象
-- 新增对象Pages，用于保存 amis schema
-  - 详细页面添加按钮：设计器，点击后打开Amis设计器
-- 新增对象Page assignments, 用于记录page分配。 
-
-
-## 调整页面渲染引擎
-
-- 自定义应用
-
-- 列表页面
-
-- 详细页面
-
-- 表单页面
-
-## 将 Steedos React 组件 整合到 Amis
-- 列表组件：
-    - 没有react组件：切换列表视图
-    - 没有react组件：列表按钮
-    - 没有react组件：下载列表数据
-    - 没有react组件：自定义列表
-    - 没有react组件：过滤器
-    - 数据展示:
-        - Table
-        - Tree Table
-- 记录详细
-    - 各种字段类型
-- 相关表
-    - 是否显示总数
-    - 按钮
-    - 快速编辑
-- 相关表快速链接
-    - 相关表名称
-    - 相关表记录总数
-
-## 页面布局设计器（无法使用Amis 实现）
-- 分组
-- 选对象字段
-    - 根据对象的定义，将对象的字段转化为Amis的自定义组件，供用户使用。
-- 选对象按钮
-- 选子表
-
-## 服务端
-- amis service
-    - actions
-        - getDefaultSchema(type, app, objectApiName, recordId): 获取默认Schema
-        - API：getMeSchema(type, app, objectApiName, recordId): 获取分配的Schema
-        - amis的配套接口

package/main/default/objects/page_versions/fields/is_archived.field.yml

@@ -1,4 +0,0 @@
-name: is_archived
-label: 启用
-sort_no: 130
-type: toggle