@steedos/service-pages 2.6.1-beta.6 → 2.6.2-beta.2

package/main/default/applications/app_charts.app.yml

@@ -12,7 +12,7 @@ admin_menus:
     permission_sets:
       - admin
   - _id: pages
-    name: Mini Pages
+    name: Micro Pages
     object_name: pages
     parent: user_interface
     sort: 300

package/main/default/client/builder.client.js

@@ -51,10 +51,11 @@
                 tenantId: Creator.USER_CONTEXT.spaceId,
                 userId: Creator.USER_CONTEXT.userId,
                 authToken: Creator.USER_CONTEXT.user.authToken
-            }
+            },
+            locale: Creator.USER_CONTEXT.user.locale
         })
     
-        window.postMessage({ type: "Builder.loaded" })
+        window.postMessage({ type: "Builder.loaded" }, "*")
     })
 })();
 

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

@@ -276,7 +276,7 @@
                     $scopeId : schema.name || schema.id
                 }
             });
-            console.log(`defData`, defData)
+            // console.log(`defData`, defData)
 
             schema = lodash.defaultsDeep(defData , schema);
 
@@ -331,6 +331,10 @@
 
         const page = Steedos.Page.getPage('app', app_id, null, null, pageName);
         if (page) {
+            Steedos.setDocumentTitle({
+                pageName: page.label,
+                tabName: null
+            })
             if (page.render_engine && page.render_engine != 'redash') {
                 return Steedos.Page.render(container, page, Object.assign({}, options, {
                     appId: app_id
@@ -354,93 +358,95 @@
         //   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(self.data.regions){
+            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 = ''
+    
+                    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 = {
-                  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(objectName)
+    
+                    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);
                 }
-                
-                updatePropsData.display = Steedos.Page.getDisplay(objectName)
-
-                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);
+              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);
               }
-              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);
           }
         });
     };
@@ -790,19 +796,19 @@
     const getSpaceLogo = function(){
         let logoSrc = '';
         const space = db.spaces.findOne(Steedos.getSpaceId())
-        if(space?.avatar){
+        if(space && space.avatar){
             logoSrc = Steedos.absoluteUrl('api/files/avatars/'+space.avatar) 
-        }else if(space?.avatar_square){
+        }else if(space && space.avatar_square){
             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;
+                avatar_url = settings.logo_square_url;
             }
             if(!avatar_url || !settings){
                 avatar_url = "/images/logo_platform.png"
-                if(Meteor.user()?.locale != 'zh-cn'){
+                if(Meteor.user() && Meteor.user().locale != 'zh-cn'){
                     avatar_url = "/images/logo_platform.en-us.png"
                 }
             }
@@ -839,7 +845,8 @@
         try {
             const data = {
                 app,
-                isMobile: window.innerWidth <= 768
+                isMobile: window.innerWidth <= 768,
+                tabId
             };
             const page = Steedos.Page.Header.getPage(appId, tabId);
             var rootId = "steedosGlobalHeaderRoot";
@@ -897,7 +904,8 @@
         try {
             const data = {
                 app,
-                isMobile: window.innerWidth <= 768
+                isMobile: window.innerWidth <= 768,
+                tabId
             };
             const page = Steedos.Page.Footer.getPage(appId, tabId);
             var rootId = "steedosGlobalFooterRoot";

package/main/default/objectTranslations/page_assignments.en/page_assignments.en.objectTranslation.yml

@@ -1,48 +1,48 @@
 name: page_assignments
-label: 页面分配
+label: Page Assignments
 description: 
 fields:
   app:
-    label: 应用
+    label: App
     help: 
     description: 
   desktop:
-    label: 桌面端
+    label: Desktop
     help: 
     description: 
   is_system:
-    label: 系统
+    label: System
     help: 
     description: 
   mobile:
-    label: 移动端
+    label: Mobile
     help: 
     description: 
   page:
-    label: 页面
+    label: Page
     help: 
     description: 
   profile:
-    label: 简档
+    label: Profile
     help: 
     description: 
   record_type:
-    label: 记录类型
+    label: Record Type
     help: 
     description: 
   type:
-    label: 授权类型
+    label: Authorization Type
     help: 
     options:
-      - label: 组织默认设置
+      - label: Organization Default Settings
         value: orgDefault
-      - label: 应用程序默认设置
+      - label: Application Default Settings
         value: appDefault
-      - label: 应用程序和简档
+      - label: Applications and Profiles
         value: appRecordProfile
     description: 
 listviews:
   all:
-    label: 所有
+    label: All
   recent:
-    label: 最近查看
+    label: Recently Viewed

package/main/default/objectTranslations/pages.en/pages.en.objectTranslation.yml

@@ -1,5 +1,5 @@
 name: pages
-label: Mini Page
+label: Micro Pages
 description: 
 fields:
   dashboard_filters_enabled:
@@ -80,11 +80,17 @@ fields:
     label: Version Number
     help: 
     description: 
+  allow_anonymous:
+    label: Allow anonymous access
 listviews:
   all:
     label: All Pages
   recent:
     label: Recently Viewed
+  customize:
+    label: Customize
+  system:
+    label: System
 actions:
   customPage:
     label: Custom Page
@@ -98,3 +104,5 @@ actions:
     label: Reset Schema
   showDesign:
     label: Show Design
+  viewPage:
+    label: View

package/main/default/objectTranslations/pages.zh-CN/pages.zh-CN.objectTranslation.yml

@@ -80,11 +80,17 @@ fields:
     label: 版本号
     help: 
     description: 
+  allow_anonymous:
+    label: 允许匿名访问
 listviews:
   all:
     label: 所有
   recent:
     label: 最近查看
+  customize:
+    label: 自定义
+  system:
+    label: 系统
 actions:
   customPage:
     label: 自定义
@@ -98,3 +104,5 @@ actions:
     label: 重置
   showDesign:
     label: 设计器
+  viewPage:
+    label: 查看

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

@@ -14,7 +14,7 @@ enable_search: false
 enable_share: false
 enable_tasks: false
 enable_workflow: false
-hidden: false
+hidden: true
 icon: contract
 is_enable: true
 version: 2

package/main/default/objects/pages/buttons/showDesign.button.js

@@ -1,7 +1,7 @@
 module.exports = {
     showDesign: function (object_name, record_id) {
         // Steedos.openWindow();
-        document.location = Steedos.absoluteUrl(`/api/pageDesign?pageId=${record_id}&assetUrls=${Builder.settings.assetUrls}`);
+        document.location = Steedos.absoluteUrl(`/api/pageDesign?pageId=${record_id}&assetUrls=${Builder.settings.assetUrls}&locale=${Builder.settings.locale}`);
     },
     showDesignVisible: function (object_name, record_id, record_permissions) {
         var perms, record;

package/main/default/objects/pages/buttons/viewPage.button.js

@@ -0,0 +1,22 @@
+/*
+ * @Author: baozhoutaon@hotoa.com
+ * @Date: 2022-03-29 20:33:44
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2023-08-02 16:29:54
+ * @Description: 
+ */
+module.exports = {
+    viewPage: function (object_name, record_id) {
+        console.log(`viewPaga`, this)
+        const { record } = this.record;
+        if(record.allow_anonymous){
+            window.open(`/api/page/public/${record_id}`)
+        }else{
+            window.open(`/api/page/view/${record_id}`)
+        }
+    },
+    viewPageVisible: function (object_name, record_id, permission, data) {
+        var record = data && data.record;
+        return record && record.type === 'app';
+    }
+}

package/main/default/objects/pages/buttons/viewPage.button.yml

@@ -0,0 +1,6 @@
+name: viewPage
+is_enable: true
+label: 查看
+'on': record_only
+visible: true
+sort: 9999

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

@@ -0,0 +1,5 @@
+name: allow_anonymous
+label: Allow anonymous access
+type: toggle
+sort_no: 470
+visible_on: "{{'app' == formData.type ? true: false}}"

package/main/default/objects/pages/listviews/customize.listview.yml

@@ -0,0 +1,18 @@
+name: customize
+columns:
+  - field: label
+  - field: name
+  - field: render_engine
+  - field: type
+  - field: object_name
+  - field: is_active
+  - field: version
+  - field: is_system
+    wrap: false
+filter_scope: space
+filters: ["is_system","<>",true]
+label: 自定义
+scrolling_mode: standard
+shared: true
+sort_no: 110
+type: grid

package/main/default/objects/pages/listviews/system.listview.yml

@@ -0,0 +1,18 @@
+name: system
+columns:
+  - field: label
+  - field: name
+  - field: render_engine
+  - field: type
+  - field: object_name
+  - field: is_active
+  - field: version
+  - field: is_system
+    wrap: false
+filter_scope: space
+filters: ["is_system","=",true]
+label: 系统
+scrolling_mode: standard
+shared: true
+sort_no: 110
+type: grid

package/main/default/routes/page_design.router.js

@@ -11,11 +11,23 @@ const fs = require('fs');
 const _ = require('lodash');
 const path = require('path');
 const objectql = require('@steedos/objectql');
+
+const getPublicAssetUrls = function(assetUrls){
+    const values = _.map(_.split(assetUrls), (item)=>{
+        if(_.startsWith(item, '/')){
+            return Meteor.absoluteUrl(item) ;
+        }else{
+            return item;
+        }
+    })
+    return _.join(values, ',')
+}
+
 router.get('/api/pageDesign', core.requireAuthentication, async function (req, res) {
     try {
         res.set('Content-Type', 'text/html');
         const userSession = req.user;
-        let assetUrls = req.query.assetUrls;
+        let assetUrls = getPublicAssetUrls(req.query.assetUrls);
         const assetUrl = `assetUrl=${assetUrls.split(',').join("&assetUrl=")}&`;
 
         // const dataContext = {
@@ -24,13 +36,16 @@ router.get('/api/pageDesign', core.requireAuthentication, async function (req, r
         //     userId: userSession.userId,
         //     authToken: userSession.authToken
         // }
+        let locale = "zh-CN";
+        if (req.query.locale == "en-us") {
+            locale = "en-US";
+        } else if (req.query.locale == "zh-cn") {
+            locale = "zh-CN";
+        }
         const page = await objectql.broker.call(`page.getLatestPageVersion`, {pageId: req.query.pageId});
         const retUrl = __meteor_runtime_config__.ROOT_URL + '/app/admin/pages/view/' + req.query.pageId
         const steedosBuilderUrl = process.env.STEEDOS_BUILDER_URL || 'https://builder.steedos.cn';
-        const builderHost = `${steedosBuilderUrl}/amis?${assetUrl}retUrl=${retUrl}&pageType=${page.type}`;
-
-        // let data = fs.readFileSync(__dirname+'/design.html', 'utf8');
-        // res.send(data.replace('SteedosBuilderHost',steedosBuilderHost).replace('DataContext', JSON.stringify(dataContext)));
+        const builderHost = `${steedosBuilderUrl}/amis?${assetUrl}retUrl=${retUrl}&locale=${locale}&pageType=${page.type}`;
 
         const filename = __dirname+'/page_design.ejs'
         const data = {

package/main/default/routes/page_view.ejs

@@ -0,0 +1,198 @@
+<!--
+ * @Author: baozhoutao@steedos.com
+ * @Date: 2023-08-01 17:47:18
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2023-09-07 16:22:47
+ * @Description: 
+-->
+<!DOCTYPE html>
+<html>
+<head>
+    <style>
+        body { background-color: #fff; }
+        html { 
+            background-color: #fff;
+            background: #fff !important;
+        }
+      </style>
+      <meta charset="utf-8">
+      <title><%=Title%></title>
+      
+      <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+      <meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width">
+      <meta name="mobile-web-app-capable" content="yes">
+      <meta name="theme-color" content="#000">
+      <meta name="application-name">
+      <meta name="apple-mobile-web-app-capable" content="yes">
+      <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
+      <meta name="apple-mobile-web-app-title">
+    
+      <link rel="stylesheet" href="/tailwind/tailwind-base.css" />
+    
+      <script>
+        window.Creator = {};
+        window.Steedos = {
+            isMobile: ()=>{
+                return window.innerWidth <= 768;
+            }
+        };
+        window.__meteor_runtime_config__ = <%- JSON.stringify(__meteor_runtime_config__) %>
+        window.Meteor = {
+            isCordova: false
+        }
+      </script>
+
+
+      <script src="/lib/jquery/jquery-1.11.2.min.js"></script>
+
+      <!-- lodash，低代码编辑器的依赖 -->
+      <script src="<%=STEEDOS_UNPKG_URL%>/lodash@4.17.21/lodash.min.js"></script>
+      <script src="<%=STEEDOS_UNPKG_URL%>/marked@4.0.17/marked.min.js"></script>
+    
+      <script src="<%=STEEDOS_UNPKG_URL%>/crypto-js@4.1.1/crypto-js.js"></script>
+    
+      <!-- Steedos Builder -->
+      <script src="<%=STEEDOS_UNPKG_URL%>/@steedos-builder/sdk@0.2.38/dist/index.umd.js"></script>
+    
+      <script src="<%=STEEDOS_AMIS_URL%>/sdk/sdk.js"></script>
+    
+      
+      
+      <link rel="stylesheet" type="text/css" href="<%=STEEDOS_UNPKG_URL%>/@salesforce-ux/design-system@2.19.0/assets/styles/salesforce-lightning-design-system.min.css">
+      <link rel="stylesheet" href="<%=STEEDOS_AMIS_URL%>/lib/themes/antd.css" />
+      <link rel="stylesheet" href="<%=STEEDOS_AMIS_URL%>/lib/helper.css" />
+      <link rel="stylesheet" href="<%=STEEDOS_AMIS_URL%>/sdk/iconfont.css" />
+      <link rel="stylesheet" href="<%=STEEDOS_UNPKG_URL%>/@fortawesome/fontawesome-free@6.2.0/css/all.min.css" />
+    
+      <link rel="stylesheet" href="<%=ROOT_URL%>/tailwind/tailwind-steedos.css" />
+      <link rel="stylesheet" href="<%=ROOT_URL%>/amis/amis.css" />
+</head>
+
+<body>
+
+  <div class="page-template-root"></div>
+
+  <script>
+    window.lodash = _;
+    window.MonacoEnvironment = {};
+    window.t = (k)=>{
+        console.log(`not support window.t`);
+        return k;
+    }
+
+    window.FlowRouter = {
+        current: ()=>{
+            return {
+                path: location.pathname,
+                queryParams: {}
+            }
+        }
+    }
+
+  </script>
+
+  <script src="/pages/js/builder.client.js"></script>
+  <script src="/pages/js/page.render.client.js"></script>
+  <script src="/pages/js/builder.client.js"></script>
+
+  <script src="/amis-pages/js/amis.render.client.js"></script>
+  <script src="/amis-pages/js/amis.util.client.js"></script>
+  <script src="/amis-pages/js/creator.function.client.js"></script>
+  <script src="/amis-pages/js/onWindowMessage.client.js"></script>
+  
+
+  <script >
+    window.Creator.USER_CONTEXT = <%- JSON.stringify(USER_CONTEXT) %>
+    window.Builder = BuilderSDK.Builder;
+    window.builder = BuilderSDK.builder;
+    window.builder.init('steedos');
+
+    let searchParams = new URLSearchParams(location.search);
+    if (searchParams.get('assetUrls')) {
+      sessionStorage.setItem('assetUrls', searchParams.get('assetUrls'))
+    }
+
+    let assetUrls = "<%=STEEDOS_PUBLIC_PAGE_ASSETURLS%>"
+    if(_.isString(assetUrls)){
+      assetUrls = assetUrls.split(',');
+    }
+
+    const getBrowserLocale = function() {
+      var l, locale;
+      l = window.navigator.userLanguage || window.navigator.language || 'en';
+      if (l.indexOf("zh") >= 0) {
+        locale = "zh-cn";
+      } else {
+        locale = "en-us";
+      }
+      return locale;
+    };
+
+    
+    Builder.set({
+      nodeEnv: "<%=NODE_ENV%>", 
+      rootUrl: "<%=ROOT_URL%>", 
+      unpkgUrl: "<%=STEEDOS_UNPKG_URL%>",
+      steedosVersion: "<%=STEEDOS_VERSION%>",
+      assetUrls: assetUrls,
+      steedosAmisVersion: "<%=STEEDOS_AMIS_VERSION%>",
+      locale: "<%=STEEDOS_LOCALE%>" || getBrowserLocale()
+    });
+
+    window.axios = amisRequire('axios');
+    window.moment = amisRequire('moment');
+    window.React = amisRequire('react');
+    window.ReactDOM = amisRequire('react-dom');  	
+
+    window.addEventListener('message', function (event) {
+    const { data } = event;
+    if (data.type === 'Builder.loaded') {
+            Builder.registerRemoteAssets(Builder.settings.assetUrls);
+        }
+    })
+
+    if ("<%=STEEDOS_PUBLIC_SCRIPT_VCONSOLE%>") {
+      let scriptTag = document.createElement("script");
+      scriptTag.setAttribute("src", "<%=STEEDOS_PUBLIC_SCRIPT_VCONSOLE%>");
+      document.getElementsByTagName("head")[0].appendChild(scriptTag);
+      scriptTag.onload = function(script){
+        window.vConsole = new window.VConsole();
+      }
+    }
+
+    if ("<%=STEEDOS_PUBLIC_SCRIPT_PLUGINS%>") {
+      "<%=STEEDOS_PUBLIC_SCRIPT_PLUGINS%>".split(',').forEach(function (src) {
+        let scriptTag = document.createElement("script");
+        scriptTag.setAttribute("src", src);
+        document.getElementsByTagName("head")[0].appendChild(scriptTag);
+      })
+    }
+
+    if ("<%=STEEDOS_PUBLIC_STYLE_PLUGINS%>") {
+      "<%=STEEDOS_PUBLIC_STYLE_PLUGINS%>".split(',').forEach(function (src) {
+        let styleTag = document.createElement("link");
+        styleTag.setAttribute("rel", "stylesheet");
+        styleTag.setAttribute("type", "text/css");
+        styleTag.setAttribute("href", src);
+        document.getElementsByTagName("head")[0].appendChild(styleTag);
+      })
+    }
+
+
+    const appId = 'admin';
+
+    const page = {
+        render_engine: 'amis',
+        name: "<%=pageApiName%>",
+        schema:  <%- JSON.stringify(pageSchema) %>
+    }
+
+    const container = $(".page-template-root")[0];
+
+    Steedos.Page.render(container, page, Object.assign({}, {
+                    appId: appId
+    }));
+
+  </script>
+</body>
+</html>

package/main/default/routes/page_view.router.js

@@ -0,0 +1,140 @@
+/*
+ * @Author: baozhoutao@steedos.com
+ * @Date: 2022-04-04 16:34:28
+ * @Description: 
+ */
+const express = require('express');
+const router = express.Router();
+const auth = require('@steedos/auth');
+const ejs = require('ejs');
+const fs = require('fs');
+const _ = require('lodash');
+const path = require('path');
+const objectql = require('@steedos/objectql');
+
+router.get('/api/page/view/:pageId', auth.authentication, async function (req, res) {
+    try {
+        res.set('Content-Type', 'text/html');
+        const userSession = req.user;
+        const { pageId } = req.params;
+        const page = await objectql.getObject('pages').findOne(pageId)
+        const pageVersion = await objectql.broker.call(`page.getLatestPageVersion`, {pageId: pageId});
+        if(!pageVersion){
+            return res.status(404).send({ message: 'Page not found' });
+        }else if(page.type != 'app'){
+            // 如果不是app类型的page,则返回错误信息
+            return res.status(404).send({ message: 'Must be App page.' });
+        }
+
+        // 如果当前用户未登录,且页面不允许匿名访问,则跳转到登录页面
+        if(!userSession && !page.allow_anonymous){
+            return res.redirect(`/accounts/a/#/login?redirect_uri=${encodeURIComponent(`/api/page/view/${pageId}`)}`);
+        }
+        
+        let assetUrls = req.query.assetUrls;
+
+        let locale = "zh-CN";
+        if (req.query.locale == "en-us") {
+            locale = "en-US";
+        } else if (req.query.locale == "zh-cn") {
+            locale = "zh-CN";
+        }
+
+        const filename = __dirname+'/page_view.ejs';
+        const data = {
+            Title: page.label,
+            pageApiName: page.name,
+            STEEDOS_UNPKG_URL: process.env.STEEDOS_UNPKG_URL,
+            STEEDOS_AMIS_URL: process.env.STEEDOS_AMIS_URL,
+            STEEDOS_PUBLIC_PAGE_ASSETURLS: assetUrls || process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS,
+            NODE_ENV: process.env.NODE_ENV,
+            ROOT_URL: __meteor_runtime_config__.ROOT_URL,
+            STEEDOS_VERSION: process.env.STEEDOS_VERSION,
+            STEEDOS_AMIS_VERSION: process.env.STEEDOS_AMIS_VERSION,
+            STEEDOS_PUBLIC_SCRIPT_VCONSOLE: process.env.STEEDOS_PUBLIC_SCRIPT_VCONSOLE,
+            STEEDOS_PUBLIC_SCRIPT_PLUGINS: process.env.STEEDOS_PUBLIC_SCRIPT_PLUGINS,
+            STEEDOS_PUBLIC_STYLE_PLUGINS: process.env.STEEDOS_PUBLIC_STYLE_PLUGINS,
+            STEEDOS_LOCALE: locale,
+            USER_CONTEXT: {
+                user: userSession,
+                userId: userSession.userId,
+                spaceId: userSession.spaceId
+            },
+            pageSchema: _.isString(pageVersion.schema) ? JSON.parse(pageVersion.schema) : pageVersion.schema,
+            __meteor_runtime_config__: __meteor_runtime_config__
+        }
+        const options = {}
+        ejs.renderFile(filename, data, options, function(err, str){
+            // str => Rendered HTML string
+            if(err){
+                console.log(`err`, err)
+            }
+            res.send(str);
+        });
+
+    } catch (error) {
+        res.status(500).send({ message: error.message });
+    }
+
+});
+
+router.get('/api/page/public/:pageId', async function (req, res) {
+    try {
+        res.set('Content-Type', 'text/html');
+        const { pageId } = req.params;
+        const page = await objectql.getObject('pages').findOne(pageId)
+        const pageVersion = await objectql.broker.call(`page.getLatestPageVersion`, {pageId: pageId});
+        if(!pageVersion){
+            return res.status(404).send({ message: 'Page not found' });
+        }else if(page.type != 'app'){
+            // 如果不是app类型的page,则返回错误信息
+            return res.status(404).send({ message: 'Must be App page.' });
+        }
+        
+        let assetUrls = req.query.assetUrls;
+
+        let locale = "zh-CN";
+        if (req.query.locale == "en-us") {
+            locale = "en-US";
+        } else if (req.query.locale == "zh-cn") {
+            locale = "zh-CN";
+        }
+
+        const filename = __dirname+'/page_view.ejs';
+        const data = {
+            Title: page.label,
+            pageApiName: page.name,
+            STEEDOS_UNPKG_URL: process.env.STEEDOS_UNPKG_URL,
+            STEEDOS_AMIS_URL: process.env.STEEDOS_AMIS_URL,
+            STEEDOS_PUBLIC_PAGE_ASSETURLS: assetUrls || process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS,
+            NODE_ENV: process.env.NODE_ENV,
+            ROOT_URL: __meteor_runtime_config__.ROOT_URL,
+            STEEDOS_VERSION: process.env.STEEDOS_VERSION,
+            STEEDOS_AMIS_VERSION: process.env.STEEDOS_AMIS_VERSION,
+            STEEDOS_PUBLIC_SCRIPT_VCONSOLE: process.env.STEEDOS_PUBLIC_SCRIPT_VCONSOLE,
+            STEEDOS_PUBLIC_SCRIPT_PLUGINS: process.env.STEEDOS_PUBLIC_SCRIPT_PLUGINS,
+            STEEDOS_PUBLIC_STYLE_PLUGINS: process.env.STEEDOS_PUBLIC_STYLE_PLUGINS,
+            STEEDOS_LOCALE: locale,
+            USER_CONTEXT: {
+                user: {},
+                userId: "",
+                spaceId: ""
+            },
+            pageSchema: _.isString(pageVersion.schema) ? JSON.parse(pageVersion.schema) : pageVersion.schema,
+            __meteor_runtime_config__: __meteor_runtime_config__
+        }
+        const options = {}
+        ejs.renderFile(filename, data, options, function(err, str){
+            // str => Rendered HTML string
+            if(err){
+                console.log(`err`, err)
+            }
+            res.send(str);
+        });
+
+    } catch (error) {
+        res.status(500).send({ message: error.message });
+    }
+
+});
+exports.default = router;

package/main/default/services/page.service.js

@@ -1,7 +1,9 @@
 const objectql = require('@steedos/objectql');
 const metadataAPI = require('@steedos/metadata-api');
 const _ = require('lodash');
-
+// 使用变量,存储所有资产
+const ASSETS = {};
+const ENV_ASSETS = process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS.split(',')
 module.exports = {
     name: "page",
     mixins: [],
@@ -205,14 +207,40 @@ module.exports = {
                 }
                 return result;
             }
-        } 
+        },
+        addAssetUrl: {
+            handler: async function (ctx) {
+                const { name, url } = ctx.params;
+                // console.log(`addAssetUrl`, name, url)
+                return broker.broadcast("page.addAssetUrl", {
+                    name, url
+                });
+            }
+        },
+        removeAssetUrl: {
+            handler: async function (ctx) {
+                const { name } = ctx.params;
+                return broker.broadcast("page.removeAssetUrl", {
+                    name
+                });
+            }
+        }
     },
 
     /**
      * Events
      */
     events: {
-
+        'page.addAssetUrl': function (ctx) {
+            const { name, url } = ctx.params;
+            ASSETS[name] = url;
+            process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS = _.compact(_.uniq(_.concat(ENV_ASSETS, _.values(ASSETS)))).join(',');
+        },
+        'page.removeAssetUrl': function (ctx) {
+            const { name } = ctx.params;
+            delete ASSETS[name]
+            process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS = _.compact(_.uniq(_.concat(ENV_ASSETS, _.values(ASSETS)))).join(',');
+        },
     },
 
     /**

package/main/default/translations/en.translation.yml

@@ -4,4 +4,14 @@ CustomApplications:
     description: null
 CustomLabels:
   menu_user_interface: User Interface
-  menu_pages: Mini Page
+  menu_pages: Micro Pages
+  page_assignments_error_not_allowed_to_application_pages: Prohibit assigning permissions to application pages
+  page_assignments_error_organization_default_already_exists: Authorization for 'Organization Default Settings' already exists
+  page_assignments_error_application_default_already_exists: Authorization for 'Application Default Settings' already exists
+  page_assignments_error_application_and_profile_already_exists: Application and Profile authorization already exists
+  page_check_error_prohibit_modifying_page_types: Prohibit modifying page types
+  page_check_error_prohibit_modifying_page_renderer: Prohibit modifying the page renderer
+  page_check_error_prohibit_disabling_application_pages: Prohibit disabling application pages
+  page_pai_name_error_not_repeat: Api Name cannot be duplicate
+  page_versions_error_prohibit_modifying_non_latest_version: Prohibit modifying non latest version
+

package/main/default/translations/zh-CN.translation.yml

@@ -5,3 +5,12 @@ CustomApplications:
 CustomLabels:
   menu_user_interface: 用户界面
   menu_pages: 微页面
+  page_assignments_error_not_allowed_to_application_pages: 禁止给应用程序页面分配权限
+  page_assignments_error_organization_default_settings_already_exists: 已存在「组织默认设置」授权
+  page_assignments_error_application_default_already_exists: 已存在「应用程序默认设置」授权
+  page_assignments_error_application_and_profile_already_exists: 已存在「应用程序和简档」授权
+  page_check_error_prohibit_modifying_page_types: 禁止修改页面类型
+  page_check_error_prohibit_modifying_page_renderer: 禁止修改页面渲染器
+  page_check_error_prohibit_disabling_application_pages: 禁止停用应用程序页面
+  page_pai_name_error_not_repeat: Api Name 不能重复
+  page_versions_error_prohibit_modifying_non_latest_version: 禁止修改非最新版

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

@@ -7,7 +7,7 @@ module.exports = {
         if(doc.page){
             const record = await objectql.getObject('pages').findOne(doc.page);
             if(record.type === 'app'){
-                throw new Error('禁止给应用程序页面分配权限');
+                throw new Error('page_assignments_error_not_allowed_to_application_pages');
             }
         }
 
@@ -23,21 +23,21 @@ module.exports = {
         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("已存在「组织默认设置」授权")
+                throw new Error("page_assignments_error_organization_default_already_exists")
             }
         }
 
         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("已存在「应用程序默认设置」授权")
+                throw new Error("page_assignments_error_application_default_already_exists")
             }
         }
 
         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("已存在「应用程序和简档」授权")
+                throw new Error("page_assignments_error_application_and_profile_already_exists")
             }
         }
 
@@ -47,7 +47,7 @@ module.exports = {
         if(doc.page){
             const record = await objectql.getObject('pages').findOne(doc.page);
             if(record.type === 'app'){
-                throw new Error('禁止给应用程序页面分配权限');
+                throw new Error('page_assignments_error_not_allowed_to_application_pages');
             }
         }
 
@@ -63,21 +63,21 @@ module.exports = {
         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("已存在「组织默认设置」授权")
+                throw new Error("page_assignments_error_organization_default_already_exists")
             }
         }
 
         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("已存在「应用程序默认设置」授权")
+                throw new Error("page_assignments_error_application_default_already_exists")
             }
         }
 
         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("已存在「应用程序和简档」授权")
+                throw new Error("page_assignments_error_application_and_profile_already_exists")
             }
         }
     }

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

@@ -7,7 +7,7 @@ module.exports = {
         const {object_name, doc, spaceId} = this;
         const isUnique = await apiName.isSpaceUnique(spaceId, object_name, doc, doc.name)
         if(!isUnique){
-            throw new Error('Api Name 不能重复');
+            throw new Error('page_pai_name_error_not_repeat');
         }
     },
 
@@ -16,7 +16,7 @@ module.exports = {
         if(_.has(doc, 'name')){
             const isUnique = await apiName.isSpaceUnique(spaceId, object_name, doc, doc.name, id)
             if(!isUnique){
-                throw new Error('Api Name 不能重复');
+                throw new Error('page_pai_name_error_not_repeat');
             }
         }
     }

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

@@ -7,10 +7,10 @@ module.exports = {
         if(_.has(doc, 'type') || _.has(doc, 'render_engine')){
             const record = await objectql.getObject('pages').findOne(id);
             if(_.has(doc, 'type') && doc.type != record.type){
-                throw new Error('禁止修改页面类型');
+                throw new Error('page_check_error_prohibit_modifying_page_types');
             }
             if(_.has(doc, 'render_engine') && doc.render_engine != record.render_engine){
-                throw new Error('禁止修改页面渲染器');
+                throw new Error('page_check_error_prohibit_modifying_page_renderer');
             }
         }
         
@@ -23,7 +23,7 @@ module.exports = {
                 type = record.type;
             }
             if(type === 'app'){
-                throw new Error('禁止停用应用程序页面');
+                throw new Error('page_check_error_prohibit_disabling_application_pages');
             }
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-pages",
-  "version": "2.6.1-beta.6",
+  "version": "2.6.2-beta.2",
   "main": "package.service.js",
   "scripts": {},
   "license": "MIT",
@@ -8,7 +8,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d77961251196c5352622d977e554660796ed6208",
+  "gitHead": "ddef9fbc34afc7b57c59a31e9ed4f56818dc4c31",
   "dependencies": {
     "ejs": "^3.1.8"
   }

package/package.service.js

@@ -4,7 +4,8 @@ const packageName = project.name;
 const packageLoader = require('@steedos/service-package-loader');
 const objectql = require('@steedos/objectql');
 const _ = require(`lodash`);
-
+const path = require('path');
+const fs = require("fs");
 const getCharts = async(apiName)=>{
 	const charts = await objectql.getObject('charts').find({ filters: [['name', '=', apiName]] });
 	if(charts.length > 0){
@@ -35,7 +36,8 @@ module.exports = {
 			path: __dirname,
 			name: this.name,
 			isPackage: false
-		}
+		},
+		loadedPublicClientJS: false,
 	},
 
 	/**
@@ -144,14 +146,59 @@ module.exports = {
 	 * Events
 	 */
 	events: {
-		
+		"steedos-server.started": {
+            async handler() {
+                await this.publicClientJS();
+            }
+        },
+        "space.initialized": {
+            async handler() {
+                await this.publicClientJS();
+            }
+        }
 	},
 
 	/**
 	 * Methods
 	 */
 	methods: {
-		
+		publicClientJS: {
+            handler() {
+				let packageInfo = this.settings.packageInfo;
+				if (!packageInfo) {
+					return;
+				}
+				const { path : packagePath } = packageInfo;
+                let publicPath = path.join(packagePath, 'main', 'default', 'client');
+                try {
+                    if (!fs.existsSync(publicPath) || this.settings.loadedPublicClientJS || typeof WebApp == 'undefined') {
+                        return;
+                    }
+                } catch (error) {
+                    return
+                }
+
+                try {
+                    const express = require('express');
+                    this.settings.loadedPublicClientJS = true;
+                    try {
+                        const router = require('@steedos/router').staticRouter();
+                        let routerPath = "";
+                        if (__meteor_runtime_config__.ROOT_URL_PATH_PREFIX) {
+                            routerPath = __meteor_runtime_config__.ROOT_URL_PATH_PREFIX;
+                        }
+                        const cacheTime = 86400000 * 1; // one day
+                        router.use(`${routerPath}/pages/js`, express.static(publicPath, { maxAge: cacheTime }));
+                        // WebApp.connectHandlers.use(router);
+                    } catch (error) {
+                        console.error(error)
+                        this.settings.loadedPublicClientJS = false;
+                    }
+                } catch (error) {
+                        
+                }
+            }
+        },
 	},
 
 	/**
@@ -165,7 +212,9 @@ module.exports = {
 	 * Service started lifecycle event handler
 	 */
 	async started() {
-		
+		this.broker.waitForServices("steedos-server").then(async () => {
+			await this.publicClientJS()
+		});
 	},
 
 	/**

package/main/default/routes/design.html

@@ -1,117 +0,0 @@
-<html>
-
-<head>
-    <script src="https://builder.steedos.cn/js/axios/axios.min.js"></script>
-    <script src="https://builder.steedos.cn/js/builder-fiddle/builder-fiddle.umd.js"></script>
-</head>
-
-<body style="margin: 0;padding: 0;">
-
-    <builder-fiddle host="SteedosBuilderHost"></builder-fiddle>
-
-    <script>
-        let comp = document.querySelector('builder-fiddle')
-        var params = new URLSearchParams(location.search);
-        var pageId = params.get("pageId");
-        // /pageVersion/:pageId/latest
-        const dataContext = DataContext;
-        axios.get(`/service/api/page/pageVersion/${params.get("pageId")}/latest`).then(function (response) {
-            let result = response.data;
-            
-            let schema = result?.schema;
-            let objectName = result?.object_name;
-            let pageType = result?.type;
-            if (typeof schema === "string") {
-                schema = JSON.parse(schema)
-            }
-            if(!schema){
-                schema = {
-                    "type": "page",
-                    "body": [],
-                    "regions": [
-                        "body"
-                    ]
-                };
-            }
-
-            if(!schema.data){
-                schema.data = {}
-            }
-
-            if(!schema.data.context){
-                schema.data.context = {}
-            }
-
-            schema.data.objectName = objectName;
-            
-            schema.data.context.rootUrl = dataContext.rootUrl;
-            schema.data.context.tenantId = dataContext.tenantId;
-            schema.data.context.userId = dataContext.userId;
-            schema.data.context.authToken = dataContext.authToken;
-
-            if(objectName && pageType === 'record'){
-                axios.get(`/api/v4/${objectName}?$orderby=created desc&$top=1`).then(function (response) {
-                    const value = response.data?.value;
-                    if(value.length > 0){
-                        schema.data.recordId = value[0]._id;
-                    }
-                    const data = {
-                        AmisSchema: schema
-                    };
-                    console.log("record data", data)
-                    comp.data = data;
-                });
-            }else{
-                const data = {
-                    AmisSchema: schema
-                };
-                console.log("record data", data)
-                comp.data = data;
-            }
-
-            
-        }).catch(function (error) {
-            // handle error
-            console.log(error);
-        }).then(function () {
-            // always executed
-        });
-
-        const onWindowMessage = function (event) {
-            const { data } = event;
-            if (data) {
-                if (data.type === 'builder.saveContent') {
-                    axios.put(`/service/api/page/pageVersion/${params.get("pageId")}`, {
-                        schema: JSON.stringify(data.data.AmisSchema, null, 4) //直接存储json格式会导致react form异常。
-                    }).then(function (response) {
-                        window.postMessage(
-                        {
-                            type: 'builder.contentSaved',
-                        },
-                        '*'
-                        );
-
-                        try {
-                            //保存时, 刷新父页面
-                            if(window.opener){
-                                window.opener.postMessage(Object.assign({type: "record.edited"}, {objectName: 'pages'}, {record: {}}), "*")
-                            }
-                        } catch (error) {
-                            console.error(error)
-                        }
-                    }).catch(function (error) {
-                        // handle error
-                        console.log(error);
-                    }).then(function () {
-                        // always executed
-                    })
-                }
-            }
-        }
-
-        window.addEventListener('message', onWindowMessage);
-
-    </script>
-</body>
-
-</html>