@steedos/service-pages 2.2.4 → 2.2.7

package/docs//350/207/252/345/256/232/344/271/211form/347/273/204/344/273/266.md

@@ -0,0 +1,39 @@
+## 自定义Form组件(新增、编辑)
+
+- Form 组件需要自带弹出层
+- Form 组件内部处理数据接口问题
+
+### 渲染Form组件时, 传入的data为
+```
+data: {
+    appId: appId,
+    objectName: objectName,
+    recordId: record._id // 新增时为null 
+    title: title,
+    initialValues: initialValues,
+
+    context: {
+        rootUrl: ROOT URL,
+        tenantId: 魔方Id,
+        userId: 用户Id,
+        authToken: 用户认证authToken
+    }
+}
+```
+
+### Form组件数据处理完后,需要发出消息:
+
+- 新增记录事件
+```
+window.postMessage(Object.assign({type: "record.created"}, data, {record: record}), "*")
+```
+
+- 编辑记录事件
+```
+window.postMessage(Object.assign({type: "record.edited"}, data, {record: record}), "*")
+```
+### Platform 消费record.created、record.edited 消息
+
+- record.created: 新建的对象名称等于当前对象名称, 则进入详细页面, 否则更新当前route
+
+- record.edited: 更新当前页面

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

@@ -1,10 +1,11 @@
-// ;(function() {
-//     Builder.registryChange.subscribe(function(registry){
-//         _.each(registry, function(value, key){
-//             _.each(value, function(item){
-//                 const {component, ...options} = item
-//                 Builder.registerComponent(component, options)
-//             })
-//         })
-//     })
-// })();
+;(function() {
+    try {
+        var hm = document.createElement("script");
+        hm.src = "/requirejs/require.js";
+        var s = document.getElementsByTagName("script")[0]; 
+        s.parentNode.insertBefore(hm, s);
+      } catch (error) {
+        console.log(error);
+      }
+})();
+Builder.set({rootUrl: __meteor_runtime_config__.ROOT_URL})

package/main/default/client/onWindowMessage.client.js

@@ -0,0 +1,39 @@
+/*
+ * @Author: steedos
+ * @Date: 2022-03-24 14:39:44
+ * @Description: 监听window message , 主要处理新增、编辑记录后的路由处理.
+ */
+
+const listenerMessageType = ['record.created', 'record.edited'];
+
+window.addEventListener('message', function (event) {
+    const { data } = event;
+    if (data && listenerMessageType.includes(data.type)) {
+        const {objectName, record} = data;
+        const {app_id: appId, object_name: routeObjectName} = FlowRouter.current().params;
+
+        switch (data.type) {
+            case 'record.created':
+                if(objectName === routeObjectName){
+                    var url = `/app/${appId}/${objectName}/view/${record._id}`
+                    FlowRouter.go(url)
+                }else{
+                    FlowRouter.current()
+                }
+                break;
+            case 'record.edited':
+                if (FlowRouter.current().route.path.endsWith("/:record_id")) {
+                    FlowRouter.reload()
+                    // ObjectForm有缓存，修改子表记录可能会有主表记录的汇总字段变更，需要刷新表单数据
+                    SteedosUI.reloadRecord(objectName, record._id)
+                } else {
+                    window.refreshDxSchedulerInstance()
+                    window.refreshGrid();
+                }
+                break;
+            default:
+                break;
+        }
+            
+    }
+});

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

@@ -1,36 +1,52 @@
+/*
+ * @Author: steedos
+ * @Date: 2022-03-22 19:13:57
+ * @Description: 提供自定义page渲染能力, 供内部使用, 内容会迭代调整, 不对用户开放. 
+ */
+
 Steedos.Page = {
     App: {},
     Record: {},
     Listview: {},
     RelatedListview: {},
-    Form:{
+    Form: {
         StandardNew: {},
         StandardEdit: {}
     }
 };
 
 function upperFirst(str) {
-	return str.toLowerCase().replace(/( |^)[a-z]/g, (L) => L.toUpperCase());
+    return str.toLowerCase().replace(/( |^)[a-z]/g, (L) => L.toUpperCase());
 };
 
-Steedos.Page.getPage = function(type, appId, objectApiName, recordId){
-    if(objectApiName){
-        const objectInfo = Creator.getObject(Session.get("object_name"));
-        if(objectInfo.version < 2){
-            return ;
+function getModalElement(name){
+    let modalRoot = document.getElementById(`steedos-page-modal-root-${name}`);
+    if (!modalRoot) {
+      modalRoot = document.createElement('div');
+      modalRoot.setAttribute('id', `steedos-page-modal-root-${name}`);
+      document.body.appendChild(modalRoot)
+    }
+    return modalRoot;
+}
+
+
+Steedos.Page.getPage = function (type, appId, objectApiName, recordId, pageId) {
+    if (type != 'list' && objectApiName) {
+        const objectInfo = Creator.getObject(objectApiName);
+        if (objectInfo && 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){
+    const page = Steedos.authRequest(`/api/pageSchema/${type}?app=${appId}&objectApiName=${objectApiName}&recordId=${recordId}&pageId=${pageId}&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, {
+        const options = {
             model: "page", content: {
                 "data": {
                     "blocks": [
@@ -42,10 +58,14 @@ Steedos.Page.render = function (root, page, data) {
                                 "name": upperFirst(page.render_engine),
                                 "options": {
                                     "schema": typeof page.schema === 'string' ? JSON.parse(page.schema) : page.schema,
-                                    "data": Object.assign({}, data,{
+                                    "data": Object.assign({}, data, {
+                                        context: {
                                             rootUrl: __meteor_runtime_config__.ROOT_URL,
-                                            userSession: Creator.USER_CONTEXT.user
-                                        })
+                                            tenantId: Creator.USER_CONTEXT.spaceId,
+                                            userId: Creator.USER_CONTEXT.userId,
+                                            authToken: Creator.USER_CONTEXT.user.authToken
+                                        }
+                                    })
                                 }
                             },
                         }
@@ -54,13 +74,15 @@ Steedos.Page.render = function (root, page, data) {
                     ]
                 }
             }
-        }, root);
+        };
+        console.debug('render data', options)
+        return SteedosUI.render(BuilderComponent, options, root);
     }
 };
 
 Steedos.Page.App.render = function (template, pageName, app_id) {
-    if(!pageName){
-        return ;
+    if (!pageName) {
+        return;
     }
     var rootId = "steedosPageRoot";
     var modalRoot = document.getElementById(rootId);
@@ -73,9 +95,9 @@ Steedos.Page.App.render = function (template, pageName, app_id) {
         $(".page-template-root")[0].appendChild(modalRoot);
     }
 
-    const page = Steedos.Page.getPage('app', app_id);
-    if(page){
-        if(page.render_engine && page.render_engine != 'redash'){
+    const page = Steedos.Page.getPage('app', app_id, null, null, pageName);
+    if (page) {
+        if (page.render_engine && page.render_engine != 'redash') {
             return Steedos.Page.render($("#" + rootId)[0], page, {
                 appId: app_id
             });
@@ -87,12 +109,12 @@ Steedos.Page.App.render = function (template, pageName, app_id) {
     }, $("#" + rootId)[0]);
 };
 
-Steedos.Page.Listview.render = function(template, objectApiName){
+Steedos.Page.Listview.render = function (template, objectApiName) {
     try {
-        if(!template.data.regions || !objectApiName){
-            return ;
+        if (!template.data.regions || !objectApiName) {
+            return;
         }
-        const page = template.data.regions().page;
+        const { page, ...data } = template.data.regions();
 
         var rootId = "steedosPageRecordRoot";
         var modalRoot = document.getElementById(rootId);
@@ -105,22 +127,20 @@ Steedos.Page.Listview.render = function(template, objectApiName){
             $(".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());
+        if (page.render_engine && page.render_engine != 'redash') {
+            return Steedos.Page.render($("#" + rootId)[0], page, data);
         }
     } catch (error) {
-        
+
     }
 };
 
-Steedos.Page.Record.render = function(template, objectApiName, recordId){
+Steedos.Page.Record.render = function (template, objectApiName, recordId) {
     try {
-        if(!template.data.regions || !objectApiName || !recordId){
-            return ;
+        if (!template.data.regions || !objectApiName || !recordId) {
+            return;
         }
-        console.log(`Steedos.Page.Record.render...`, template.data.regions(), objectApiName, recordId);
-        const page = template.data.regions().page;
-
+        const { page, ...data } = template.data.regions();
         var rootId = "steedosPageRecordRoot";
         var modalRoot = document.getElementById(rootId);
         // if(modalRoot){
@@ -132,20 +152,20 @@ Steedos.Page.Record.render = function(template, objectApiName, recordId){
             $(".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());
+        if (page.render_engine && page.render_engine != 'redash') {
+            return Steedos.Page.render($("#" + rootId)[0], page, data);
         }
     } catch (error) {
-        
+
     }
 };
 
-Steedos.Page.RelatedListview.render = function(template, objectApiName){
+Steedos.Page.RelatedListview.render = function (template, objectApiName) {
     try {
-        if(!template.data.regions || !objectApiName){
-            return ;
+        if (!template.data.regions || !objectApiName) {
+            return;
         }
-        const page = template.data.regions().page;
+        const { page, ...data } = template.data.regions();
 
         var rootId = "steedosPageRecordRoot";
         var modalRoot = document.getElementById(rootId);
@@ -158,54 +178,77 @@ Steedos.Page.RelatedListview.render = function(template, objectApiName){
             $(".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());
+        if (page.render_engine && page.render_engine != 'redash') {
+            return Steedos.Page.render($("#" + rootId)[0], page, data);
         }
     } catch (error) {
-        
+
     }
 };
 
-Steedos.Page.Form.StandardNew.render = function(appId, objectApiName, tilte, initialValues){
+Steedos.Page.Form.StandardNew.render = function (appId, objectApiName, title, initialValues) {
+    const page = Steedos.Page.getPage('form', appId, objectApiName);
+    if (page && page.schema) {
+        const elementId = getModalElement(`${objectApiName}-standard_new`);
+        return Steedos.Page.render(elementId, page, {
+            appId: appId,
+            objectName: objectApiName,
+            title: title,
+            initialValues: initialValues
+        });
+    }
+
     SteedosUI.showModal(stores.ComponentRegistry.components.ObjectForm, {
         name: `${objectApiName}_standard_new_form`,
         objectApiName: objectApiName,
-        title: tilte,
+        title: title,
         initialValues: initialValues,
-        afterInsert: function(result){
-            if(result.length > 0){
+        afterInsert: function (result) {
+            if (result.length > 0) {
                 var record = result[0];
-                setTimeout(function(){
+                setTimeout(function () {
                     var url = `/app/${appId}/${objectApiName}/view/${record._id}`
                     FlowRouter.go(url)
                 }
-                , 1);
+                    , 1);
                 return true;
             }
         }
-    }, null, {iconPath: '/assets/icons'});
+    }, null, { iconPath: '/assets/icons' });
 };
 
-Steedos.Page.Form.StandardEdit.render = function(appId, objectApiName, tilte, recordId){
+Steedos.Page.Form.StandardEdit.render = function (appId, objectApiName, title, recordId) {
+
+    const page = Steedos.Page.getPage('form', appId, objectApiName, recordId);
+    if (page && page.schema) {
+        const elementId = getModalElement(`${objectApiName}-standard_edit`);
+        return Steedos.Page.render(elementId, page, {
+            appId: appId,
+            objectName: objectApiName,
+            title: title,
+            recordId: 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")){
+        title: title,
+        afterUpdate: function () {
+            setTimeout(function () {
+                if (FlowRouter.current().route.path.endsWith("/:record_id")) {
                     FlowRouter.reload()
                     // ObjectForm有缓存，修改子表记录可能会有主表记录的汇总字段变更，需要刷新表单数据
                     SteedosUI.reloadRecord(objectApiName, recordId)
-                }else{
+                } else {
                     window.refreshDxSchedulerInstance()
                     window.refreshGrid();
                 }
-                }, 1);
+            }, 1);
             return true;
         }
-    }, null, {iconPath: '/assets/icons'})
+    }, null, { iconPath: '/assets/icons' })
 };
 
 // Steedos.Page.Form.StandardDelete.render = function(){

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

@@ -3,4 +3,6 @@ label: 应用
 type: lookup
 reference_to: apps
 reference_to_field: code
+filters:
+  - ['code','!=','admin']
 sort_no: 120

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

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

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

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

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

@@ -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/objects/page_versions/buttons/standard_delete.button.js

@@ -0,0 +1,5 @@
+module.exports = {
+    standard_deleteVisible: function () {
+        return false
+    }
+}

package/main/default/objects/page_versions/buttons/standard_delete.button.yml

@@ -0,0 +1,4 @@
+name: standard_delete
+is_enable: true
+label: standard_delete
+visible: false

package/main/default/objects/page_versions/buttons/standard_delete_many.button.js

@@ -0,0 +1,5 @@
+module.exports = {
+    standard_delete_manyVisible: function () {
+        return false
+    }
+}

package/main/default/objects/page_versions/buttons/standard_delete_many.button.yml

@@ -0,0 +1,4 @@
+name: standard_delete_many
+is_enable: true
+label: standard_delete_many
+visible: false

package/main/default/objects/page_versions/buttons/standard_new.button.js

@@ -0,0 +1,5 @@
+module.exports = {
+    standard_newVisible: function () {
+        return false
+    }
+}

package/main/default/objects/page_versions/buttons/standard_new.button.yml

@@ -0,0 +1,5 @@
+name: standard_new
+is_enable: true
+label: standard_new
+'on': record_only
+visible: false

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

@@ -0,0 +1,4 @@
+name: is_active
+label: 已发布
+sort_no: 130
+type: toggle

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

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

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

@@ -3,5 +3,5 @@ type: code
 language: json
 is_wide: true
 sort_no: 300
-omit: true
-hidden: true
+omit: false
+hidden: false

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

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

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

@@ -2,7 +2,7 @@ name: all
 columns:
   - field: page
   - field: version
-  - field: is_archived
+  - field: is_active
   - field: created
   - field: modified
   - field: is_system

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

@@ -2,7 +2,7 @@ name: recent
 columns:
   - field: page
   - field: version
-  - field: is_archived
+  - field: is_active
   - field: created
   - field: modified
   - field: is_system

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

@@ -1,6 +1,6 @@
 name: 管理员
 allowCreate: true
-allowDelete: true
+allowDelete: false
 allowEdit: true
 allowRead: true
 modifyAllRecords: true

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

@@ -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/objects/pages/fields/is_active.field.yml

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

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

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

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

@@ -4,9 +4,9 @@ type: select
 defaultValue: app
 required: true
 options:
-  - label: 自定义应用 
+  - label: 应用程序页面
     value: app
-  - label: 详细页面
+  - label: 记录页面
     value: record
   - label: 列表页面
     value: list

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

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

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

@@ -21,8 +21,11 @@ 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])
+          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

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

@@ -7,7 +7,7 @@
 
 <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')
@@ -45,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);

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

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