@steedos/service-pages 2.5.0-beta.1 → 2.5.0-beta.11

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

@@ -6,6 +6,9 @@
 ;(function(){
     Steedos.Page = {
         App: {},
+        Object: {
+            Template: {}
+        },
         Record: {},
         Listview: {},
         Header: {},
@@ -35,6 +38,23 @@
         return modalRoot;
     }
 
+    Steedos.Page.getDisplay = (objectName)=>{
+
+        let display = FlowRouter.current().queryParams.display;
+        // console.log('=====getDisplay====>', display)
+        // const key = `tab.${objectName}.display`;
+        const key = 'page_display'
+        if(display){
+            // console.log('=====getDisplay===setItem=>', key, display)
+            localStorage.setItem(key, display)
+        }else{
+            display = localStorage.getItem(key);
+        }
+
+        return display;
+        
+    }
+
     Steedos.Page.getPage = function (type, appId, objectApiName, recordId, pageId) {
         let objectInfo = null;
         let searchParams = FlowRouter.current().queryParams;
@@ -65,32 +85,42 @@
         if(type === 'list'){
             return {
                 render_engine: 'amis',
-                name: 'steedosListviewPage',
-                schema:{
-                    "name": `${objectApiName}-listview-${listViewId}`,
-                    "type": "steedos-page-listview",
-                    "showHeader": true,
-                    "objectApiName": objectApiName,
-                    "appId": appId,
-                    "display": display,
-                    "columnsTogglable": false,
-                    "listName": "all",
+                name: "steedosPageObjectControl",
+                schema: {
+                    "type": "steedos-page-object-control",
+                    "name": "steedosPageObjectControl"
                 }
+                // name: 'steedosListviewPage',
+                // schema:{
+                //     "name": `${objectApiName}-listview-${listViewId}`,
+                //     "type": "steedos-page-listview",
+                //     "showHeader": true,
+                //     "objectApiName": objectApiName,
+                //     "appId": appId,
+                //     "display": display,
+                //     "columnsTogglable": false,
+                //     // "listName": "all",
+                // }
             }
         }else if(type === 'record'){
             return {
                     render_engine: 'amis',
-                    name: 'steedosRecordPage',
+                    name: "steedosPageObjectControl",
                     schema: {
-                        "name": `${objectApiName}-recordDetail-${recordId}`,
-                        "type": "steedos-page-record-detail",
-                        "objectApiName": objectApiName,
-                        "sideObject": sideObject,
-                        "sideListviewId": sideListviewId,
-                        "recordId": recordId,
-                        "display": display,
-                        "appId": appId,
+                        "type": "steedos-page-object-control",
+                        "name": "steedosPageObjectControl"
                     }
+                    // name: 'steedosRecordPage',
+                    // schema: {
+                    //     "name": `${objectApiName}-recordDetail-${recordId}`,
+                    //     "type": "steedos-page-record-detail",
+                    //     "objectApiName": objectApiName,
+                    //     "sideObject": sideObject,
+                    //     "sideListviewId": sideListviewId,
+                    //     // "recordId": recordId,
+                    //     "display": display,
+                    //     "appId": appId,
+                    // }
                 }
             
         }else if(type === 'related_list'){
@@ -206,12 +236,12 @@
     }
 
     Steedos.Page.render = function (root, page, data, options = {}) {
-        // console.log(`Steedos.Page.render`, root, page)
+        // console.log(`Steedos.Page.render`, root, page, data)
         if (page.render_engine && page.render_engine != 'redash') {
 
             let schema = typeof page.schema === 'string' ? JSON.parse(page.schema) : page.schema;
             const rootUrl = __meteor_runtime_config__.ROOT_URL;
-            const defData = lodash.defaultsDeep({}, data , {data: data} , {
+            const defData = lodash.defaultsDeep({}, {data: data} , {
                 data: {
                     app_id: data.appId,
                     object_name: data.objectName,
@@ -237,6 +267,10 @@
 
             schema = lodash.defaultsDeep(defData , schema);
 
+            delete schema.data.recordId
+            delete schema.data.record_id
+
+
             const findComponent = (obj, componentName)=>{
                 return lodash.find(obj, {name : componentName})
             }
@@ -276,7 +310,7 @@
         if (!modalRoot) {
             modalRoot = document.createElement('div');
             modalRoot.setAttribute('id', rootId);
-            modalRoot.setAttribute('class', 'h-full');
+            modalRoot.setAttribute('class', 'h-full overflow-auto');
             $(".page-template-root")[0].appendChild(modalRoot);
         }
 
@@ -297,6 +331,177 @@
         return container
     };
 
+    Steedos.Page.Object.Template.onRendered = function(){
+        var objectName, recordId, self;
+        self = this;
+        objectName = Session.get("object_name");
+        this.containerList = [];
+        this.pageName = null;
+        return this.autorun(function(computation) {
+        //   console.log('autorun=====>computation:', computation)
+            // Session.get("record_id");
+          var container, e, lastData, ref, ref1, ref2, regions, schema, updateProps, updatePropsData;
+          regions = self.data.regions();
+        //   console.log('regions====>', regions, this.lastRegions);
+          updateProps = true;
+          if (regions.objectName !== ((ref = this.lastRegions) != null ? ref.objectName : void 0)) {
+            updateProps = false;
+          }
+          this.lastRegions = regions;
+          if (updateProps && self.pageName) {
+            try {
+              if (SteedosUI.refs[self.pageName]) {
+                let queryParams = FlowRouter.current().queryParams
+
+                if(_.isArray(queryParams.side_object)){
+                    if(queryParams.side_object.length >= 1){
+                        queryParams.side_object = queryParams.side_object[0]
+                    }else{
+                        queryParams.side_object = ''
+                    }
+                }
+
+                if(_.isArray(queryParams.side_listview_id)){
+                    if(queryParams.side_listview_id.length >= 1){
+                        queryParams.side_listview_id = queryParams.side_listview_id[0]
+                    }else{
+                        queryParams.side_listview_id = ''
+                    }
+                };
+
+                updatePropsData = {
+                  objectName: objectName,
+                  pageType: regions.pageType,
+                  listViewId: regions.listViewId,
+                  ...queryParams
+                };
+                if(queryParams.side_listview_id){
+                    updatePropsData.listName=queryParams.side_listview_id
+                }else if(regions.listViewId){
+                    updatePropsData.listName=regions.listViewId
+                }
+                
+                updatePropsData.display = Steedos.Page.getDisplay()
+
+                updatePropsData.recordId = Tracker.nonreactive(function() {
+                    return Session.get("record_id");
+                  });
+                lastData = ((ref1 = SteedosUI.refs[self.pageName]) != null ? (ref2 = ref1.__$schema) != null ? ref2.data : void 0 : void 0) || {};
+                // console.log("page_object Steedos.Page.Record.updateProps", {
+                //     data: window._.defaultsDeep(updatePropsData, lastData)
+                //   });
+                return SteedosUI.refs[self.pageName].updateProps({
+                  data: window._.defaultsDeep(updatePropsData, lastData)
+                });
+              }
+            } catch (error) {
+              e = error;
+              console.error(self.pageName + ": " + e);
+            }
+          }
+          if (!updateProps && self.pageName && SteedosUI.refs[self.pageName]) {
+            try {
+              SteedosUI.refs[self.pageName].unmount();
+            } catch (error) {
+              e = error;
+              console.error(self.pageName + ": " + e);
+            }
+          }
+          if (self.data.regions) {
+            regions = Tracker.nonreactive(self.data.regions);
+            this.lastRegions = regions;
+            if (regions && regions.page && regions.page.schema) {
+              schema = regions.page.schema;
+              if (_.isString(schema)) {
+                schema = JSON.parse(schema);
+              }
+              self.pageName = schema.name;
+            }
+          }
+          objectName = Tracker.nonreactive(function() {
+            return Session.get("object_name");
+          });
+          recordId = Tracker.nonreactive(function() {
+            return Session.get("record_id");
+          });
+          container = Steedos.Page.Object.render(self, objectName, recordId);
+        //   console.log("page_object Steedos.Page.Object.render");
+          if (container) {
+            return self.containerList.push(container);
+          }
+        });
+    };
+    Steedos.Page.Object.Template.onDestroyed = function(){
+        var e, self;
+        self = this;
+        try {
+        SteedosUI.refs[this.pageName].unmount();
+        } catch (error) {
+        e = error;
+        console.error(this.pageName + ": " + e);
+        }
+        return _.each(this.containerList, function(container) {
+        if (container) {
+            return ReactDOM.unmountComponentAtNode(container);
+        }
+        });
+    };
+    Steedos.Page.Object.render = function(template, objectApiName, recordId = null, options){
+        try {
+            if (!template.data.regions || !objectApiName) {
+                return;
+            }
+            const { page, ...data } = Tracker.nonreactive(template.data.regions);
+            var rootId = "steedosPageObjetRoot";
+            var modalRoot = document.getElementById(rootId);
+            // if(modalRoot){
+            //     modalRoot.remove();
+            // }
+            if (!modalRoot) {
+                modalRoot = document.createElement('div');
+                modalRoot.setAttribute('id', rootId);
+                modalRoot.setAttribute('class', 'h-full')
+                $(".page-object-root")[0].appendChild(modalRoot);
+            }
+
+            if (page.render_engine && page.render_engine != 'redash') {
+                if(_.isArray(data.side_object)){
+                    if(data.side_object.length >= 1){
+                        data.side_object = data.side_object[0]
+                    }else{
+                        data.side_object = ''
+                    }
+                }
+
+                if(_.isArray(data.side_listview_id)){
+                    if(data.side_listview_id.length >= 1){
+                        data.side_listview_id = data.side_listview_id[0]
+                    }else{
+                        data.side_listview_id = ''
+                    }
+                }
+
+                if(FlowRouter.current().queryParams.side_listview_id){
+                    data.listName = FlowRouter.current().queryParams.side_listview_id;
+                }else if(data.listViewId){
+                    data.listName = data.listViewId;
+                }
+
+                if(_.isArray(data.listName)){
+                    if(data.listName.length >= 1){
+                        data.listName = data.listName[0]
+                    }else{
+                        data.listName = ''
+                    }
+                }
+
+                return Steedos.Page.render($("#" + rootId)[0], page, Object.assign({}, options, data, {recordId}));
+            }
+        } catch (error) {
+
+        }
+    }
+
     Steedos.Page.Listview.getDefaultName = function (objectApiName, listViewName) {
         return `listview_${objectApiName}_${listViewName}`;
     };
@@ -348,7 +553,7 @@
             }
 
             if (page.render_engine && page.render_engine != 'redash') {
-                return Steedos.Page.render($("#" + rootId)[0], page, Object.assign({}, options, data));
+                return Steedos.Page.render($("#" + rootId)[0], page, Object.assign({}, options, data, {recordId}));
             }
         } catch (error) {
 

package/main/default/routes/page_design.ejs

@@ -2,7 +2,7 @@
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-06-02 17:45:15
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2022-08-31 12:01:11
+ * @LastEditTime: 2023-04-11 10:15:40
  * @Description: 
 -->
 <html>
@@ -120,7 +120,17 @@
           delete schema.data.context.userId;
           delete schema.data.context.tenantId;
           delete schema.data.context.authToken;
+          delete schema.data.context.user;
+          delete schema.data.context.rootUrl;
         }
+
+        try {
+          delete schema.data.recordId;
+          delete schema.data.objectName;
+        } catch (error) {
+          
+        }
+
         return await axios.put(
             `${rootUrl}/service/api/page/pageVersion/${pageId}`,
             {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-pages",
-  "version": "2.5.0-beta.1",
+  "version": "2.5.0-beta.11",
   "main": "package.service.js",
   "scripts": {},
   "license": "MIT",
@@ -8,7 +8,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "5da093d78baa6f2d7011348060c30671354cc7f0",
+  "gitHead": "72a894aab5a9d4e277d0464decda0ba39f2f50bb",
   "dependencies": {
     "ejs": "^3.1.8"
   }