@steedos/service-pages 2.2.22 → 2.2.25

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

@@ -12,6 +12,9 @@ Steedos.Page = {
     Form: {
         StandardNew: {},
         StandardEdit: {}
+    },
+    reload: function(){
+        FlowRouter.reload();
     }
 };
 
@@ -108,11 +111,13 @@ Steedos.Page.render = function (root, page, data) {
 
         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
+            data: {
+                context: {
+                    rootUrl: __meteor_runtime_config__.ROOT_URL,
+                    tenantId: Creator.USER_CONTEXT.spaceId,
+                    userId: Creator.USER_CONTEXT.userId,
+                    authToken: Creator.USER_CONTEXT.user.authToken
+                }
             }
         })
 
@@ -128,7 +133,8 @@ Steedos.Page.render = function (root, page, data) {
                         "name": upperFirst(page.render_engine),
                         "options": {
                             "schema": schema,
-                            "data": data
+                            "data": data,
+                            "name": page.name
                         }
                     },
                 }
@@ -164,7 +170,7 @@ Steedos.Page.render = function (root, page, data) {
     return root;
 };
 
-Steedos.Page.App.render = function (template, pageName, app_id) {
+Steedos.Page.App.render = function (template, pageName, app_id, options) {
     if (!pageName) {
         return;
     }
@@ -184,9 +190,9 @@ Steedos.Page.App.render = function (template, pageName, app_id) {
     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, {
+            return Steedos.Page.render(container, page, Object.assign({}, options, {
                 appId: app_id
-            });
+            }));
         }
     }
 
@@ -196,7 +202,11 @@ Steedos.Page.App.render = function (template, pageName, app_id) {
     return container
 };
 
-Steedos.Page.Listview.render = function (template, objectApiName) {
+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;
@@ -215,14 +225,14 @@ Steedos.Page.Listview.render = function (template, objectApiName) {
         }
 
         if (page.render_engine && page.render_engine != 'redash') {
-            return Steedos.Page.render($("#" + rootId)[0], page, data);
+            return Steedos.Page.render($("#" + rootId)[0], page, Object.assign({}, options, data));
         }
     } catch (error) {
 
     }
 };
 
-Steedos.Page.Record.render = function (template, objectApiName, recordId) {
+Steedos.Page.Record.render = function (template, objectApiName, recordId, options) {
     try {
         if (!template.data.regions || !objectApiName || !recordId) {
             return;
@@ -240,14 +250,14 @@ Steedos.Page.Record.render = function (template, objectApiName, recordId) {
         }
 
         if (page.render_engine && page.render_engine != 'redash') {
-            return Steedos.Page.render($("#" + rootId)[0], page, data);
+            return Steedos.Page.render($("#" + rootId)[0], page, Object.assign({}, options, data));
         }
     } catch (error) {
 
     }
 };
 
-Steedos.Page.RelatedListview.render = function (template, objectApiName) {
+Steedos.Page.RelatedListview.render = function (template, objectApiName, options) {
     try {
         if (!template.data.regions || !objectApiName) {
             return;
@@ -266,23 +276,23 @@ Steedos.Page.RelatedListview.render = function (template, objectApiName) {
         }
 
         if (page.render_engine && page.render_engine != 'redash') {
-            return Steedos.Page.render($("#" + rootId)[0], page, data);
+            return Steedos.Page.render($("#" + rootId)[0], page, Object.assign({}, options, data));
         }
     } catch (error) {
 
     }
 };
 
-Steedos.Page.Form.StandardNew.render = function (appId, objectApiName, title, initialValues) {
+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, {
+        return Steedos.Page.render(elementId, page, Object.assign({}, options, {
             appId: appId,
             objectName: objectApiName,
             title: title,
-            initialValues: initialValues
-        });
+            initialValues: initialValues,
+        }));
     }
 
     SteedosUI.showModal(stores.ComponentRegistry.components.ObjectForm, {
@@ -304,17 +314,16 @@ Steedos.Page.Form.StandardNew.render = function (appId, objectApiName, title, in
     }, null, { iconPath: '/assets/icons' });
 };
 
-Steedos.Page.Form.StandardEdit.render = function (appId, objectApiName, title, recordId) {
-
+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, {
+        return Steedos.Page.render(elementId, page, Object.assign({}, options, {
             appId: appId,
             objectName: objectApiName,
             title: title,
             recordId: recordId
-        });
+        }));
     }
 
     return SteedosUI.showModal(stores.ComponentRegistry.components.ObjectForm, {
@@ -330,7 +339,7 @@ Steedos.Page.Form.StandardEdit.render = function (appId, objectApiName, title, r
                     SteedosUI.reloadRecord(objectApiName, recordId)
                 } else {
                     window.refreshDxSchedulerInstance()
-                    window.refreshGrid();
+                    window.refreshGrid(options.gridName);
                 }
             }, 1);
             return true;

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,5 +1,6 @@
 name: all
 columns:
+  - field: type
   - field: app
   - field: profile
   - field: record_type

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

@@ -1,5 +1,6 @@
 name: recent
 columns:
+  - field: type
   - field: app
   - field: profile
   - field: record_type

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/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.22",
+  "version": "2.2.25",
   "main": "package.service.js",
   "scripts": {},
   "license": "MIT",
@@ -11,5 +11,5 @@
   "dependencies": {
     "@builder.io/react": "^1.1.50"
   },
-  "gitHead": "af4ea8ed034854c8de1ff8b9d5db241183524417"
+  "gitHead": "e81092f007bce951b627a5c28e286032afbba1fb"
 }