@steedos/service-pages 2.2.23 → 2.2.24

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
+                }
             }
         })
 
@@ -165,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;
     }
@@ -185,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
-            });
+            }));
         }
     }
 
@@ -197,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;
@@ -216,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;
@@ -241,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;
@@ -267,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, {
@@ -305,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, {
@@ -331,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/is_system.field.yml

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

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

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