@steedos/service-pages 2.4.0-beta.33 → 2.4.0-beta.35

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

@@ -4,28 +4,6 @@
 * @Description: 提供自定义page渲染能力, 供内部使用, 内容会迭代调整, 不对用户开放. 
 */
 ;(function(){
-
-
-    const withModalWrap = (component, provideProps) => {
-        return (props) => {
-          const ModalComponent = component;
-          return React.createElement(ModalComponent, props);
-        }
-      }
-      const render = (component, componentProps, container, provideProps = {} ) => {
-          try {
-            const wrapComponent = withModalWrap(component, provideProps);
-            const contentEle = React.createElement(wrapComponent,{
-                ...componentProps
-                });
-            setTimeout(()=>{
-                ReactDOM.render(contentEle, container);
-            }, 100)
-          } catch (error) {
-            console.log(`error`, error)
-          }
-      }
-
     Steedos.Page = {
         App: {},
         Record: {},
@@ -58,12 +36,6 @@
 
     Steedos.Page.getPage = function (type, appId, objectApiName, recordId, pageId) {
         let objectInfo = null;
-        if (type != 'list' && objectApiName) {
-            objectInfo = Creator.getObject(objectApiName);
-            if (objectInfo && objectInfo.version < 2) {
-                return;
-            }
-        }
         if(!objectApiName){
             objectApiName = ''
         }
@@ -254,7 +226,7 @@
     }
 
     Steedos.Page.render = function (root, page, data, options = {}) {
-        
+        console.log(`Steedos.Page.render`, root, page)
         if (page.render_engine && page.render_engine != 'redash') {
 
             let schema = typeof page.schema === 'string' ? JSON.parse(page.schema) : page.schema;
@@ -642,6 +614,7 @@
             logoSrc = Steedos.absoluteUrl('api/files/avatars/'+space.avatar_square) 
         }else{
             var settings = Session.get("tenant_settings");
+            var avatar_url = "";
             if(settings){
                 avatar_url = settings?.logo_square_url;
             }
@@ -658,6 +631,9 @@
 
     Steedos.Page.Header.render = function(appId, tabId){
         let app = _.find(Session.get('app_menus'), {id: appId}) || {}
+        if(_.isEmpty(app)){
+            return ;
+        }
         if (appId === 'admin' || (window.innerWidth < 768))
             app.showSidebar = true;
         if (app.showSidebar)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-pages",
-  "version": "2.4.0-beta.33",
+  "version": "2.4.0-beta.35",
   "main": "package.service.js",
   "scripts": {},
   "license": "MIT",
@@ -8,7 +8,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8420402aa553e2bb52572a7f5d891c297c4ff908",
+  "gitHead": "0d255db7ed202a8ccdc8b6b88b535b93ce93443d",
   "dependencies": {
     "ejs": "^3.1.8"
   }