@steedos/service-pages 2.2.23 → 2.2.26

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

@@ -1,210 +1,181 @@
 /*
- * @Author: steedos
- * @Date: 2022-03-22 19:13:57
- * @Description: 提供自定义page渲染能力, 供内部使用, 内容会迭代调整, 不对用户开放. 
- */
-
-Steedos.Page = {
-    App: {},
-    Record: {},
-    Listview: {},
-    RelatedListview: {},
-    Form: {
-        StandardNew: {},
-        StandardEdit: {}
-    }
-};
-
-function upperFirst(str) {
-    return str.toLowerCase().replace(/( |^)[a-z]/g, (L) => L.toUpperCase());
-};
-
-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;
-}
+* @Author: steedos
+* @Date: 2022-03-22 19:13:57
+* @Description: 提供自定义page渲染能力, 供内部使用, 内容会迭代调整, 不对用户开放. 
+*/
+;(function(){
+    Steedos.Page = {
+        App: {},
+        Record: {},
+        Listview: {},
+        RelatedListview: {},
+        Form: {
+            StandardNew: {},
+            StandardEdit: {}
+        },
+        Data: {},
+        reload: function(){
+            FlowRouter.reload();
+        }
+    };
 
+    function upperFirst(str) {
+        return str.toLowerCase().replace(/( |^)[a-z]/g, (L) => L.toUpperCase());
+    };
 
-Steedos.Page.getPage = function (type, appId, objectApiName, recordId, pageId) {
-    if (type != 'list' && objectApiName) {
-        const objectInfo = Creator.getObject(objectApiName);
-        if (objectInfo && 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;
     }
-    if(!objectApiName){
-        objectApiName = ''
-    }
-    if(!recordId){
-        recordId = ''
-    }
-    if(!pageId){
-        pageId = ''
-    }
-    const formFactor = Steedos.isMobile() ? "SMALL" : "LARGE";
-    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) {
-
-    const loadingContentData = {
-        "inputs": [],
-        // "title": "loading",
-        "blocks": [
-            {
-                "@type": "@builder.io/sdk:Element",
-                "@version": 2,
-                "layerName": "Box",
-                "id": "builder-8070f86b1aed4e78a5878fa5c0d79e49",
-                "children": [
-                    {
-                        "@type": "@builder.io/sdk:Element",
-                        "@version": 2,
-                        "layerName": "Loading...\n...",
-                        "id": "builder-4b16375a68dc4e49b4844843091bf91d",
-                        "component": {
-                            "name": "Text",
-                            "options": {
-                                "text": "<p>Loading...</p>\n"
-                            }
-                        },
-                        "responsiveStyles": {
-                            "large": {
-                                "display": "flex",
-                                "flexDirection": "column",
-                                "position": "relative",
-                                "flexShrink": "0",
-                                "boxSizing": "border-box",
-                                "marginTop": "20px",
-                                "lineHeight": "normal",
-                                "height": "auto",
-                                "textAlign": "center"
-                            }
-                        }
-                    }
-                ],
-                "responsiveStyles": {
-                    "large": {
-                        "display": "flex",
-                        "flexDirection": "column",
-                        "position": "relative",
-                        "flexShrink": "0",
-                        "boxSizing": "border-box"
-                    }
-                }
-            }
-        ]
-    };
 
-    if (page.render_engine && page.render_engine != 'redash') {
 
-        let schema = typeof page.schema === 'string' ? JSON.parse(page.schema) : page.schema;
-        const defData = Object.assign({}, data, {
-            context: {
-                rootUrl: __meteor_runtime_config__.ROOT_URL,
-                tenantId: Creator.USER_CONTEXT.spaceId,
-                userId: Creator.USER_CONTEXT.userId,
-                authToken: Creator.USER_CONTEXT.user.authToken
+    Steedos.Page.getPage = function (type, appId, objectApiName, recordId, pageId) {
+        if (type != 'list' && objectApiName) {
+            const objectInfo = Creator.getObject(objectApiName);
+            if (objectInfo && objectInfo.version < 2) {
+                return;
             }
-        })
+        }
+        if(!objectApiName){
+            objectApiName = ''
+        }
+        if(!recordId){
+            recordId = ''
+        }
+        if(!pageId){
+            pageId = ''
+        }
+        const formFactor = Steedos.isMobile() ? "SMALL" : "LARGE";
+        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;
+        }
+    }
 
-        schema = lodash.defaultsDeep(defData , schema);
+    Steedos.Page.render = function (root, page, data) {
 
-        const pageContentData = {
+        const loadingContentData = {
+            "inputs": [],
+            // "title": "loading",
             "blocks": [
                 {
                     "@type": "@builder.io/sdk:Element",
                     "@version": 2,
-                    "id": `builder-${page._id}`,
-                    "component": {
-                        "name": upperFirst(page.render_engine),
-                        "options": {
-                            "schema": schema,
-                            "data": data,
-                            "name": page.name
+                    "layerName": "Box",
+                    "id": "builder-8070f86b1aed4e78a5878fa5c0d79e49",
+                    "children": [
+                        {
+                            "@type": "@builder.io/sdk:Element",
+                            "@version": 2,
+                            "layerName": "Loading...\n...",
+                            "id": "builder-4b16375a68dc4e49b4844843091bf91d",
+                            "component": {
+                                "name": "Text",
+                                "options": {
+                                    "text": "<p>Loading...</p>\n"
+                                }
+                            },
+                            "responsiveStyles": {
+                                "large": {
+                                    "display": "flex",
+                                    "flexDirection": "column",
+                                    "position": "relative",
+                                    "flexShrink": "0",
+                                    "boxSizing": "border-box",
+                                    "marginTop": "20px",
+                                    "lineHeight": "normal",
+                                    "height": "auto",
+                                    "textAlign": "center"
+                                }
+                            }
+                        }
+                    ],
+                    "responsiveStyles": {
+                        "large": {
+                            "display": "flex",
+                            "flexDirection": "column",
+                            "position": "relative",
+                            "flexShrink": "0",
+                            "boxSizing": "border-box"
                         }
-                    },
+                    }
                 }
-            ],
-            "inputs": [
             ]
-        }
+        };
 
-        const findComponent = (obj, componentName)=>{
-            return lodash.find(obj, {name : componentName})
-        }
+        if (page.render_engine && page.render_engine != 'redash') {
+
+            let schema = typeof page.schema === 'string' ? JSON.parse(page.schema) : page.schema;
+            const defData = Object.assign({}, data, {
+                data: {
+                    context: {
+                        rootUrl: __meteor_runtime_config__.ROOT_URL,
+                        tenantId: Creator.USER_CONTEXT.spaceId,
+                        userId: Creator.USER_CONTEXT.userId,
+                        authToken: Creator.USER_CONTEXT.user.authToken
+                    }
+                }
+            })
+
+            schema = lodash.defaultsDeep(defData , schema);
+
+            const pageContentData = {
+                "blocks": [
+                    {
+                        "@type": "@builder.io/sdk:Element",
+                        "@version": 2,
+                        "id": `builder-${page._id}`,
+                        "component": {
+                            "name": upperFirst(page.render_engine),
+                            "options": {
+                                "schema": schema,
+                                "data": data,
+                                "name": page.name
+                            }
+                        },
+                    }
+                ],
+                "inputs": [
+                ]
+            }
 
-        //渲染loading
-        SteedosUI.render(BuilderComponent, {
-            model: "page", content: {
-                "data": loadingContentData
+            const findComponent = (obj, componentName)=>{
+                return lodash.find(obj, {name : componentName})
             }
-        }, root)
 
-        Promise.all([
-            waitForThing(window, 'BuilderComponent'),
-            waitForThing(Builder.components, upperFirst(page.render_engine), findComponent)
-        ]).then(()=>{
-            //渲染page
+            //渲染loading
             SteedosUI.render(BuilderComponent, {
                 model: "page", content: {
-                    "data": pageContentData
+                    "data": loadingContentData
                 }
             }, root)
-        });
-    }
-
-    return root;
-};
-
-Steedos.Page.App.render = function (template, pageName, app_id) {
-    if (!pageName) {
-        return;
-    }
-    var rootId = "steedosPageRoot";
-    var modalRoot = document.getElementById(rootId);
-    // if(modalRoot){
-    //     modalRoot.remove();
-    // }
-    if (!modalRoot) {
-        modalRoot = document.createElement('div');
-        modalRoot.setAttribute('id', rootId);
-        $(".page-template-root")[0].appendChild(modalRoot);
-    }
-
-    const container = $("#" + rootId)[0];
 
-    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(container, page, {
-                appId: app_id
+            Promise.all([
+                waitForThing(window, 'BuilderComponent'),
+                waitForThing(Builder.components, upperFirst(page.render_engine), findComponent)
+            ]).then(()=>{
+                //渲染page
+                SteedosUI.render(BuilderComponent, {
+                    model: "page", content: {
+                        "data": pageContentData
+                    }
+                }, root)
             });
         }
-    }
 
-    SteedosUI.render(stores.ComponentRegistry.components.PublicPage, {
-        token: pageName
-    }, container);
-    return container
-};
+        return root;
+    };
 
-Steedos.Page.Listview.render = function (template, objectApiName) {
-    try {
-        if (!template.data.regions || !objectApiName) {
+    Steedos.Page.App.render = function (template, pageName, app_id, options) {
+        if (!pageName) {
             return;
         }
-        const { page, ...data } = template.data.regions();
-
-        var rootId = "steedosPageRecordRoot";
+        var rootId = "steedosPageRoot";
         var modalRoot = document.getElementById(rootId);
         // if(modalRoot){
         //     modalRoot.remove();
@@ -212,133 +183,220 @@ Steedos.Page.Listview.render = function (template, objectApiName) {
         if (!modalRoot) {
             modalRoot = document.createElement('div');
             modalRoot.setAttribute('id', rootId);
-            $(".page-list-view-root")[0].appendChild(modalRoot);
+            $(".page-template-root")[0].appendChild(modalRoot);
         }
 
-        if (page.render_engine && page.render_engine != 'redash') {
-            return Steedos.Page.render($("#" + rootId)[0], page, data);
+        const container = $("#" + rootId)[0];
+
+        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(container, page, Object.assign({}, options, {
+                    appId: app_id
+                }));
+            }
         }
-    } catch (error) {
 
-    }
-};
+        SteedosUI.render(stores.ComponentRegistry.components.PublicPage, {
+            token: pageName
+        }, container);
+        return container
+    };
 
-Steedos.Page.Record.render = function (template, objectApiName, recordId) {
-    try {
-        if (!template.data.regions || !objectApiName || !recordId) {
-            return;
-        }
-        const { page, ...data } = template.data.regions();
-        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);
-        }
+    Steedos.Page.Listview.getDefaultName = function (objectApiName, listViewName) {
+        return `listview_${objectApiName}_${listViewName}`;
+    };
+
+    Steedos.Page.Listview.render = function (template, objectApiName, options) {
+        try {
+            if (!template.data.regions || !objectApiName) {
+                return;
+            }
+            const { page, ...data } = template.data.regions();
+
+            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, Object.assign({}, options, data));
+            }
+        } catch (error) {
 
-        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, options) {
+        try {
+            if (!template.data.regions || !objectApiName || !recordId) {
+                return;
+            }
+            const { page, ...data } = template.data.regions();
+            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, Object.assign({}, options, data));
+            }
+        } catch (error) {
 
-Steedos.Page.RelatedListview.render = function (template, objectApiName) {
-    try {
-        if (!template.data.regions || !objectApiName) {
-            return;
         }
-        const { page, ...data } = template.data.regions();
+    };
+
+    Steedos.Page.RelatedListview.render = function (template, objectApiName, options) {
+        try {
+            if (!template.data.regions || !objectApiName) {
+                return;
+            }
+            const { page, ...data } = template.data.regions();
+
+            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, Object.assign({}, options, data));
+            }
+        } catch (error) {
 
-        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, data);
+    Steedos.Page.Form.StandardNew.render = function (appId, objectApiName, title, initialValues, options) {
+        const page = Steedos.Page.getPage('form', appId, objectApiName);
+        if (page && page.schema) {
+            const elementId = getModalElement(`${objectApiName}-standard_new`);
+            return Steedos.Page.render(elementId, page, Object.assign({}, options, {
+                appId: appId,
+                objectName: objectApiName,
+                title: title,
+                initialValues: initialValues,
+            }));
         }
-    } catch (error) {
 
-    }
-};
-
-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,
+        SteedosUI.showModal(stores.ComponentRegistry.components.ObjectForm, {
+            name: `${objectApiName}_standard_new_form`,
+            objectApiName: objectApiName,
             title: title,
-            initialValues: initialValues
-        });
-    }
+            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' });
+    };
 
-    SteedosUI.showModal(stores.ComponentRegistry.components.ObjectForm, {
-        name: `${objectApiName}_standard_new_form`,
-        objectApiName: objectApiName,
-        title: title,
-        initialValues: initialValues,
-        afterInsert: function (result) {
-            if (result.length > 0) {
-                var record = result[0];
+    Steedos.Page.Form.StandardEdit.render = function (appId, objectApiName, title, recordId, options) {
+        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, Object.assign({}, options, {
+                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: title,
+            afterUpdate: function () {
                 setTimeout(function () {
-                    var url = `/app/${appId}/${objectApiName}/view/${record._id}`
-                    FlowRouter.go(url)
-                }
-                    , 1);
+                    if (FlowRouter.current().route.path.endsWith("/:record_id")) {
+                        FlowRouter.reload()
+                        // ObjectForm有缓存，修改子表记录可能会有主表记录的汇总字段变更，需要刷新表单数据
+                        SteedosUI.reloadRecord(objectApiName, recordId)
+                    } else {
+                        window.refreshDxSchedulerInstance()
+                        window.refreshGrid(options.gridName);
+                    }
+                }, 1);
                 return true;
             }
+        }, null, { iconPath: '/assets/icons' })
+    };
+
+    // Steedos.Page.Form.StandardDelete.render = function(){
+
+    // };
+
+
+    // creator odata 转 graphql 防腐层
+
+    function getGraphqlFieldsQuery(objectApiName, selectFields, expandFields){
+        const objectConfig = Creator.getObject(objectApiName)
+        const objectFields = objectConfig.fields
+        if(_.isString(selectFields)){
+            selectFields = selectFields.split(',');
         }
-    }, null, { iconPath: '/assets/icons' });
-};
 
-Steedos.Page.Form.StandardEdit.render = function (appId, objectApiName, title, recordId) {
+        if(_.isString(expandFields)){
+            expandFields = expandFields.split(',');
+        }
 
-    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
+        const fieldsName = ['_id'];
+
+        if(objectConfig.database_name ==='default' || !objectConfig.database_name){
+            fieldsName.push('record_permissions')
+        }
+
+        _.each(selectFields, function(fieldName){
+            fieldsName.push(`${fieldName}`)
         });
-    }
 
-    return SteedosUI.showModal(stores.ComponentRegistry.components.ObjectForm, {
-        name: `${objectApiName}_standard_edit_form`,
-        objectApiName: objectApiName,
-        recordId: recordId,
-        title: title,
-        afterUpdate: function () {
-            setTimeout(function () {
-                if (FlowRouter.current().route.path.endsWith("/:record_id")) {
-                    FlowRouter.reload()
-                    // ObjectForm有缓存，修改子表记录可能会有主表记录的汇总字段变更，需要刷新表单数据
-                    SteedosUI.reloadRecord(objectApiName, recordId)
-                } else {
-                    window.refreshDxSchedulerInstance()
-                    window.refreshGrid();
+        _.each(expandFields, function(fieldName){
+            if(fieldName && _.isString(objectFields[fieldName].reference_to)){
+                let spaceUsersCompanyIdsExpand = '';
+                if(objectApiName === 'space_users' && fieldName === 'company_ids'){
+                    spaceUsersCompanyIdsExpand = ',name,admins'
                 }
-            }, 1);
-            return true;
-        }
-    }, null, { iconPath: '/assets/icons' })
-};
+                const refObject = Creator.getObject(objectFields[fieldName].reference_to)
+                if(_.includes(fieldsName, fieldName)){
+                    fieldsName[_.indexOf(fieldsName, fieldName)] = `${fieldName}:${fieldName}__expand{_id, _NAME_FIELD_VALUE:${refObject.NAME_FIELD_KEY}${spaceUsersCompanyIdsExpand}}`
+                }else{
+                    fieldsName.push(`${fieldName}:${fieldName}__expand{_id, _NAME_FIELD_VALUE:${refObject.NAME_FIELD_KEY}${spaceUsersCompanyIdsExpand}}`)
+                }
+            }
+        })
 
-// Steedos.Page.Form.StandardDelete.render = function(){
+        return fieldsName;
+    }
 
-// };
+    Steedos.Page.Data.getRecord = function(objectApiName, recordId, selectFields, expandFields){
+        return stores.API.client.sobject(objectApiName).record(recordId, null, {
+            graphqlFieldsQuery: getGraphqlFieldsQuery(objectApiName, selectFields, expandFields)
+        })
+    }
+})();

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

@@ -5,4 +5,6 @@ reference_to: apps
 reference_to_field: code
 filters:
   - ['code','!=','admin']
-sort_no: 120
+sort_no: 120
+required: "{{(formData.type == 'appDefault' || formData.type == 'appRecordProfile') ? true : false}}"
+visible_on: "{{(formData.type == 'appDefault' || formData.type == 'appRecordProfile') ? true : false}}"

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

@@ -1,6 +1,7 @@
 name: is_system
 type: boolean
-label: System
-omit: true
+label: 系统
+visible_on: "{{global.mode ==='read' ? true : false}}"
 readonly: true
-disabled: true
+disabled: true
+sort_no: 999

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

@@ -2,4 +2,5 @@ name: page
 label: 页面
 type: master_detail
 reference_to: pages
-sort_no: 110
+sort_no: 110
+required: true

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

@@ -4,5 +4,6 @@ label: 简档
 reference_to: permission_set
 filters:
   - ["type","=","profile"]
-visible_on: "{{formData.app ? true: false}}"
-sort_no: 125
+sort_no: 125
+required: "{{formData.type == 'appRecordProfile' ? true : false}}"
+visible_on: "{{formData.type == 'appRecordProfile' ? true : false}}"

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

@@ -0,0 +1,12 @@
+name: type
+label: 授权类型
+type: select
+required: true
+defaultValue: orgDefault
+options: 
+  - label: 组织默认设置
+    value: orgDefault
+  - label: 应用程序默认设置
+    value: appDefault
+  - label: 应用程序和简档
+    value: appRecordProfile

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

@@ -1,8 +1,9 @@
 name: all
 columns:
+  - field: type
   - field: app
   - field: profile
-  - field: record_type
+  # - field: record_type
   - field: mobile
   - field: desktop
   - field: is_system

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

@@ -1,8 +1,9 @@
 name: recent
 columns:
+  - field: type
   - field: app
   - field: profile
-  - field: record_type
+  # - field: record_type
   - field: mobile
   - field: desktop
   - field: is_system

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

@@ -7,7 +7,7 @@ enable_chatter: false
 enable_enhanced_lookup: false
 enable_events: false
 enable_files: false
-enable_inline_edit: true
+enable_inline_edit: false
 enable_instances: false
 enable_notes: false
 enable_search: false

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

@@ -2,5 +2,4 @@ name: is_active
 label: 已发布
 sort_no: 130
 readonly: true
-omit: true
 type: boolean

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

@@ -0,0 +1,7 @@
+name: is_system
+type: boolean
+label: 系统
+visible_on: "{{global.mode ==='read' ? true : false}}"
+readonly: true
+disabled: true
+sort_no: 999

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

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

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

@@ -1,6 +1,7 @@
 name: is_system
 type: boolean
 label: 系统
-omit: true
+visible_on: "{{global.mode ==='read' ? true : false}}"
 readonly: true
-disabled: true
+disabled: true
+sort_no: 999

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

@@ -10,6 +10,37 @@ module.exports = {
                 throw new Error('禁止给应用程序页面分配权限');
             }
         }
+
+        if(doc.type === 'orgDefault'){
+            delete doc.app;
+            delete doc.profile;
+        }
+
+        if(doc.type === 'appDefault'){
+            delete doc.profile;
+        }
+
+        if(doc.type === 'orgDefault'){
+            const count = await objectql.getObject('page_assignments').count({filters: [['page', '=', doc.page], ['type', '=', doc.type]]})
+            if(count > 0){
+                throw new Error("已存在「组织默认设置」授权")
+            }
+        }
+
+        if(doc.type === 'appDefault'){
+            const count = await objectql.getObject('page_assignments').count({filters: [['page', '=', doc.page], ['type', '=', doc.type], ['app', '=', doc.app]]})
+            if(count > 0){
+                throw new Error("已存在「应用程序默认设置」授权")
+            }
+        }
+
+        if(doc.type === 'appRecordProfile'){
+            const count = await objectql.getObject('page_assignments').count({filters: [['page', '=', doc.page], ['type', '=', doc.type], ['app', '=', doc.app], ['profile', '=', doc.profile]]})
+            if(count > 0){
+                throw new Error("已存在「应用程序和简档」授权")
+            }
+        }
+
     },
     beforeUpdate: async function(){
         const {object_name, doc, spaceId, id} = this;
@@ -19,5 +50,35 @@ module.exports = {
                 throw new Error('禁止给应用程序页面分配权限');
             }
         }
+
+        if(doc.type === 'orgDefault'){
+            doc.app = null;
+            doc.profile = null;
+        }
+
+        if(doc.type === 'appDefault'){
+            doc.profile = null;
+        }
+
+        if(doc.type === 'orgDefault'){
+            const count = await objectql.getObject('page_assignments').count({filters: [['_id', '!=', id], ['page', '=', doc.page], ['type', '=', doc.type]]})
+            if(count > 0){
+                throw new Error("已存在「组织默认设置」授权")
+            }
+        }
+
+        if(doc.type === 'appDefault'){
+            const count = await objectql.getObject('page_assignments').count({filters: [['_id', '!=', id], ['page', '=', doc.page], ['type', '=', doc.type], ['app', '=', doc.app]]})
+            if(count > 0){
+                throw new Error("已存在「应用程序默认设置」授权")
+            }
+        }
+
+        if(doc.type === 'appRecordProfile'){
+            const count = await objectql.getObject('page_assignments').count({filters: [['_id', '!=', id], ['page', '=', doc.page], ['type', '=', doc.type], ['app', '=', doc.app], ['profile', '=', doc.profile]]})
+            if(count > 0){
+                throw new Error("已存在「应用程序和简档」授权")
+            }
+        }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-pages",
-  "version": "2.2.23",
+  "version": "2.2.26",
   "main": "package.service.js",
   "scripts": {},
   "license": "MIT",
@@ -11,5 +11,5 @@
   "dependencies": {
     "@builder.io/react": "^1.1.50"
   },
-  "gitHead": "830698bdc5c848858d24ba536d9eff0fa51c22f0"
+  "gitHead": "77fa3c2b6bdfebaccb4b7f0886f32eb347cbdd35"
 }