@steedos/service-pages 2.2.3 → 2.2.4

package/docs/amis.md

@@ -0,0 +1,53 @@
+## 集成 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/applications/app_charts.app.yml

@@ -7,7 +7,7 @@ admin_menus:
   #   permission_sets:
   #     - admin
   - _id: user_interface
-    name: 用户页面
+    name: 用户界面
     sort: 350
     permission_sets:
       - admin

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

@@ -1,5 +1,10 @@
-;(function() {
-    import("/builder.io/react/dist/builder-react.browser.js").then(()=>{
-        BuilderReact.builder.init("builder-token");
-    });
-})();
+// ;(function() {
+//     Builder.registryChange.subscribe(function(registry){
+//         _.each(registry, function(value, key){
+//             _.each(value, function(item){
+//                 const {component, ...options} = item
+//                 Builder.registerComponent(component, options)
+//             })
+//         })
+//     })
+// })();

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

@@ -1,10 +1,64 @@
-Steedos.Pages = {};
+Steedos.Page = {
+    App: {},
+    Record: {},
+    Listview: {},
+    RelatedListview: {},
+    Form:{
+        StandardNew: {},
+        StandardEdit: {}
+    }
+};
 
 function upperFirst(str) {
 	return str.toLowerCase().replace(/( |^)[a-z]/g, (L) => L.toUpperCase());
 };
 
-Steedos.Pages.Render = function (pageName) {
+Steedos.Page.getPage = function(type, appId, objectApiName, recordId){
+    if(objectApiName){
+        const objectInfo = Creator.getObject(Session.get("object_name"));
+        if(objectInfo.version < 2){
+            return ;
+        }
+    }
+    const formFactor = Steedos.isMobile() ? "SMALL" : "LARGE";
+    const page = Steedos.authRequest(`/api/pageSchema/${type}?app=${appId}&objectApiName=${objectApiName}&recordId=${recordId}&formFactor=${formFactor}`, {async:false});
+    if(page && page.schema){
+        return page;
+    }
+}
+
+Steedos.Page.render = function (root, page, data) {
+    console.log(`render======>data`, data)
+    if (page.render_engine && page.render_engine != 'redash') {
+        return SteedosUI.render(BuilderComponent, {
+            model: "page", content: {
+                "data": {
+                    "blocks": [
+                        {
+                            "@type": "@builder.io/sdk:Element",
+                            "@version": 2,
+                            "id": `builder-${page._id}`,
+                            "component": {
+                                "name": upperFirst(page.render_engine),
+                                "options": {
+                                    "schema": typeof page.schema === 'string' ? JSON.parse(page.schema) : page.schema,
+                                    "data": Object.assign({}, data,{
+                                            rootUrl: __meteor_runtime_config__.ROOT_URL,
+                                            userSession: Creator.USER_CONTEXT.user
+                                        })
+                                }
+                            },
+                        }
+                    ],
+                    "inputs": [
+                    ]
+                }
+            }
+        }, root);
+    }
+};
+
+Steedos.Page.App.render = function (template, pageName, app_id) {
     if(!pageName){
         return ;
     }
@@ -19,34 +73,141 @@ Steedos.Pages.Render = function (pageName) {
         $(".page-template-root")[0].appendChild(modalRoot);
     }
 
-    const pages = Creator.odata.query("pages", {$filter:`(name eq '${pageName}')`}, true);
-    if(pages.length > 0){
-        const page = pages[0];
+    const page = Steedos.Page.getPage('app', app_id);
+    if(page){
         if(page.render_engine && page.render_engine != 'redash'){
-            return SteedosUI.render(BuilderReact.BuilderComponent, {model:"page",content:{
-                "data":{
-                   "blocks":[
-                      {
-                         "@type":"@builder.io/sdk:Element",
-                         "@version":2,
-                         "id":"builder-2b290abc4e4042498645863f53ee6815",
-                         "component":{
-                            "name": upperFirst(page.render_engine), //_.upperFirst
-                            "options":{
-                               "schema": typeof page.schema === 'string' ? JSON.parse(page.schema) : page.schema
-                            }
-                         },
-                      }
-                   ],
-                   "inputs":[
-                      
-                   ]
-                }
-             }}, $("#" + rootId)[0]);
+            return Steedos.Page.render($("#" + rootId)[0], page, {
+                appId: app_id
+            });
         }
     }
 
     SteedosUI.render(stores.ComponentRegistry.components.PublicPage, {
         token: pageName
     }, $("#" + rootId)[0]);
-};
+};
+
+Steedos.Page.Listview.render = function(template, objectApiName){
+    try {
+        if(!template.data.regions || !objectApiName){
+            return ;
+        }
+        const page = template.data.regions().page;
+
+        var rootId = "steedosPageRecordRoot";
+        var modalRoot = document.getElementById(rootId);
+        // if(modalRoot){
+        //     modalRoot.remove();
+        // }
+        if (!modalRoot) {
+            modalRoot = document.createElement('div');
+            modalRoot.setAttribute('id', rootId);
+            $(".page-list-view-root")[0].appendChild(modalRoot);
+        }
+
+        if(page.render_engine && page.render_engine != 'redash'){
+            return Steedos.Page.render($("#" + rootId)[0], page, template.data.regions());
+        }
+    } catch (error) {
+        
+    }
+};
+
+Steedos.Page.Record.render = function(template, objectApiName, recordId){
+    try {
+        if(!template.data.regions || !objectApiName || !recordId){
+            return ;
+        }
+        console.log(`Steedos.Page.Record.render...`, template.data.regions(), objectApiName, recordId);
+        const page = template.data.regions().page;
+
+        var rootId = "steedosPageRecordRoot";
+        var modalRoot = document.getElementById(rootId);
+        // if(modalRoot){
+        //     modalRoot.remove();
+        // }
+        if (!modalRoot) {
+            modalRoot = document.createElement('div');
+            modalRoot.setAttribute('id', rootId);
+            $(".page-record-view-root")[0].appendChild(modalRoot);
+        }
+
+        if(page.render_engine && page.render_engine != 'redash'){
+            return Steedos.Page.render($("#" + rootId)[0], page, template.data.regions());
+        }
+    } catch (error) {
+        
+    }
+};
+
+Steedos.Page.RelatedListview.render = function(template, objectApiName){
+    try {
+        if(!template.data.regions || !objectApiName){
+            return ;
+        }
+        const page = template.data.regions().page;
+
+        var rootId = "steedosPageRecordRoot";
+        var modalRoot = document.getElementById(rootId);
+        // if(modalRoot){
+        //     modalRoot.remove();
+        // }
+        if (!modalRoot) {
+            modalRoot = document.createElement('div');
+            modalRoot.setAttribute('id', rootId);
+            $(".page-related-list-view-root")[0].appendChild(modalRoot);
+        }
+
+        if(page.render_engine && page.render_engine != 'redash'){
+            return Steedos.Page.render($("#" + rootId)[0], page, template.data.regions());
+        }
+    } catch (error) {
+        
+    }
+};
+
+Steedos.Page.Form.StandardNew.render = function(appId, objectApiName, tilte, initialValues){
+    SteedosUI.showModal(stores.ComponentRegistry.components.ObjectForm, {
+        name: `${objectApiName}_standard_new_form`,
+        objectApiName: objectApiName,
+        title: tilte,
+        initialValues: initialValues,
+        afterInsert: function(result){
+            if(result.length > 0){
+                var record = result[0];
+                setTimeout(function(){
+                    var url = `/app/${appId}/${objectApiName}/view/${record._id}`
+                    FlowRouter.go(url)
+                }
+                , 1);
+                return true;
+            }
+        }
+    }, null, {iconPath: '/assets/icons'});
+};
+
+Steedos.Page.Form.StandardEdit.render = function(appId, objectApiName, tilte, recordId){
+    return SteedosUI.showModal(stores.ComponentRegistry.components.ObjectForm, {
+        name: `${objectApiName}_standard_edit_form`,
+        objectApiName: objectApiName,
+        recordId: recordId,
+        title: tilte,
+        afterUpdate: function(){
+            setTimeout(function(){
+                if(FlowRouter.current().route.path.endsWith("/:record_id")){
+                    FlowRouter.reload()
+                    // ObjectForm有缓存，修改子表记录可能会有主表记录的汇总字段变更，需要刷新表单数据
+                    SteedosUI.reloadRecord(objectApiName, recordId)
+                }else{
+                    window.refreshDxSchedulerInstance()
+                    window.refreshGrid();
+                }
+                }, 1);
+            return true;
+        }
+    }, null, {iconPath: '/assets/icons'})
+};
+
+// Steedos.Page.Form.StandardDelete.render = function(){
+
+// };

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

@@ -0,0 +1,6 @@
+name: app
+label: 应用
+type: lookup
+reference_to: apps
+reference_to_field: code
+sort_no: 120

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

@@ -0,0 +1,5 @@
+name: desktop
+type: boolean
+label: 台式机
+sort_no: 130
+defaultValue: true

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

@@ -0,0 +1,6 @@
+name: is_system
+type: boolean
+label: System
+omit: true
+hidden: true
+disabled: true

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

@@ -0,0 +1,5 @@
+name: mobile
+type: boolean
+label: 手机
+sort_no: 140
+defaultValue: true

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

@@ -0,0 +1,5 @@
+name: page
+label: 页面
+type: master_detail
+reference_to: pages
+sort_no: 110

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

@@ -0,0 +1,8 @@
+name: profile
+type: lookup
+label: 简档
+reference_to: permission_set
+filters:
+  - ["type","=","profile"]
+visible_on: "{{formData.app ? true: false}}"
+sort_no: 125

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

@@ -0,0 +1,4 @@
+name: record_type
+type: text
+label: 记录类型
+hidden: true

package/main/default/objects/page_assignments/listviews/all.listview.yml

@@ -0,0 +1,15 @@
+name: all
+columns:
+  - field: app
+  - field: profile
+  - field: record_type
+  - field: mobile
+  - field: desktop
+  - field: is_system
+filter_scope: space
+filters: []
+label: 所有
+scrolling_mode: standard
+shared: true
+sort_no: 100
+type: grid

package/main/default/objects/page_assignments/listviews/recent.listview.yml

@@ -0,0 +1,15 @@
+name: recent
+columns:
+  - field: app
+  - field: profile
+  - field: record_type
+  - field: mobile
+  - field: desktop
+  - field: is_system
+filter_scope: space
+filters: []
+label: 最近查看
+scrolling_mode: standard
+shared: true
+sort_no: 100
+type: grid

package/main/default/objects/page_assignments/page_assignments.object.yml

@@ -0,0 +1,20 @@
+name: page_assignments
+label: 页面分配
+custom: true
+enable_api: true
+enable_audit: false
+enable_chatter: false
+enable_enhanced_lookup: false
+enable_events: false
+enable_files: false
+enable_inline_edit: true
+enable_instances: false
+enable_notes: false
+enable_search: false
+enable_share: false
+enable_tasks: false
+enable_workflow: false
+hidden: true
+icon: contract
+is_enable: true
+version: 2

package/main/default/objects/page_assignments/permissions/admin.permission.yml

@@ -0,0 +1,10 @@
+name: 管理员
+allowCreate: true
+allowDelete: true
+allowEdit: true
+allowRead: true
+modifyAllRecords: true
+modifyCompanyRecords: true
+permission_set_id: admin
+viewAllRecords: true
+viewCompanyRecords: true

package/main/default/objects/page_assignments/permissions/user.permission.yml

@@ -0,0 +1,10 @@
+name: 用户
+allowCreate: false
+allowDelete: false
+allowEdit: false
+allowRead: true
+modifyAllRecords: false
+modifyCompanyRecords: false
+permission_set_id: user
+viewAllRecords: true
+viewCompanyRecords: true

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

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

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

@@ -0,0 +1,4 @@
+name: page
+label: 页面
+type: master_detail
+reference_to: pages

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

@@ -0,0 +1,7 @@
+name: schema
+type: code
+language: json
+is_wide: true
+sort_no: 300
+omit: true
+hidden: true

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

@@ -0,0 +1,5 @@
+name: version
+type: number
+label: 版本号
+scale: 0
+omit: true

package/main/default/objects/page_versions/listviews/all.listview.yml

@@ -0,0 +1,18 @@
+name: all
+columns:
+  - field: page
+  - field: version
+  - field: is_archived
+  - field: created
+  - field: modified
+  - field: is_system
+filter_scope: space
+filters: []
+label: 所有
+scrolling_mode: standard
+shared: true
+sort_no: 100
+type: grid
+sort:
+  - field_name: 'version'
+    order: desc

package/main/default/objects/page_versions/listviews/recent.listview.yml

@@ -0,0 +1,15 @@
+name: recent
+columns:
+  - field: page
+  - field: version
+  - field: is_archived
+  - field: created
+  - field: modified
+  - field: is_system
+filter_scope: space
+filters: []
+label: 最近查看
+scrolling_mode: standard
+shared: true
+sort_no: 100
+type: grid

package/main/default/objects/page_versions/page_versions.object.yml

@@ -0,0 +1,20 @@
+name: page_versions
+label: 页面版本
+custom: true
+enable_api: true
+enable_audit: false
+enable_chatter: false
+enable_enhanced_lookup: false
+enable_events: false
+enable_files: false
+enable_inline_edit: true
+enable_instances: false
+enable_notes: false
+enable_search: false
+enable_share: false
+enable_tasks: false
+enable_workflow: false
+hidden: false
+icon: contract
+is_enable: true
+version: 2

package/main/default/objects/page_versions/permissions/admin.permission.yml

@@ -0,0 +1,10 @@
+name: 管理员
+allowCreate: true
+allowDelete: true
+allowEdit: true
+allowRead: true
+modifyAllRecords: true
+modifyCompanyRecords: true
+permission_set_id: admin
+viewAllRecords: true
+viewCompanyRecords: true

package/main/default/objects/page_versions/permissions/user.permission.yml

@@ -0,0 +1,10 @@
+name: 用户
+allowCreate: false
+allowDelete: false
+allowEdit: false
+allowRead: true
+modifyAllRecords: false
+modifyCompanyRecords: false
+permission_set_id: user
+viewAllRecords: true
+viewCompanyRecords: true

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

@@ -1,5 +1,5 @@
 name: is_archived
-label: is_archived
+label: 启用
 sort_no: 130
 type: toggle
-hidden: true
+visible_on: "{{'redash' != formData.render_engine ? true: false}}"

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

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

@@ -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/pages.object.yml

@@ -21,6 +21,7 @@ version: 2
 form:
  afterView: !!js/function |
       function(){
+        console.log(`afterView`, this.doc)
         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])
         }

package/main/default/routes/design.html

@@ -5,7 +5,7 @@
     <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>
 
@@ -13,7 +13,9 @@
         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(
@@ -55,8 +57,6 @@
 
         window.addEventListener('message', onWindowMessage);
 
-
-
     </script>
 </body>
 

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

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