npm - @steedos/service-pages - Versions diffs - 3.0.0-beta.2 → 3.0.0-beta.8 - Mend

@steedos/service-pages 3.0.0-beta.2 → 3.0.0-beta.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (12) hide show

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

@@ -43,18 +43,8 @@
     };
     Promise.all([
-        waitForThing(Creator, 'USER_CONTEXT'),
+        waitForThing(window, 'Builder'),
     ]).then(()=>{
-        Builder.set({
-            context: {
-                rootUrl: Builder.settings.rootUrl,
-                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" }, "*")
     })
 })();

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

@@ -40,8 +40,9 @@
     }
     Steedos.Page.getDisplay = (objectName)=>{
-        const object = Creator.getObject(objectName)
-        let display = FlowRouter.current().queryParams.display;
+        const object = window.getUISchemaSync(objectName)
+        var searchParams = new URLSearchParams(window.location.search)
+        let display = searchParams.get('display');
         // console.log('=====getDisplay====>', display)
         const key = `tab_${objectName}_display`;
         // const key = 'page_display'
@@ -63,14 +64,6 @@
     }
     Steedos.Page.getPage = function (type, appId, objectApiName, recordId, pageId) {
-        let objectInfo = null;
-        let searchParams = FlowRouter.current().queryParams;
-        const display = searchParams['display']
-        const listViewId = searchParams['listview_id']
-        const sideObject = searchParams['side_object']
-        const sideListviewId = searchParams['side_listview_id']
         if(!objectApiName){
             objectApiName = ''
         }
@@ -97,17 +90,6 @@
                     "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 {
@@ -117,17 +99,6 @@
                         "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'){
@@ -235,19 +206,7 @@
                             relatedKey: relatedKey,
                             hiddenOn: "!!!this.$loaded",
                             "className": "mx-4",
-                            // top: 5
                         }
-                        ,
-                        // {
-                        //     type: 'steedos-object-related-listview',
-                        //     objectApiName: masterObject.name,
-                        //     recordId: FlowRouter.getParam("record_id"),
-                        //     relatedObjectApiName: objectApiName,
-                        //     foreign_key: relatedKey,
-                        //     relatedKey: relatedKey,
-                        //     hiddenOn: "!!!this.$loaded"
-                        //     // top: 5
-                        // }
                     ]
                 }
               }
@@ -259,7 +218,7 @@
         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 rootUrl = Builder.settings.ROOT_URL || "";
             const defData = lodash.defaultsDeep({}, {data: data} , {
                 data: {
                     app_id: data.appId,
@@ -267,16 +226,16 @@
                     record_id: data.recordId,
                     formFactor: Steedos.isMobile() ? "SMALL" : "LARGE",
                     context: {
-                        rootUrl: Meteor.isCordova ? (rootUrl.endsWith("/") ? rootUrl.substr(0, rootUrl.length-1) : rootUrl) : '',
-                        tenantId: Creator.USER_CONTEXT.spaceId,
-                        userId: Creator.USER_CONTEXT.userId,
-                        authToken: Creator.USER_CONTEXT.user.authToken,
-                        user: Creator.USER_CONTEXT.user
+                        rootUrl: rootUrl,
+                        tenantId: Builder.settings.context.user.spaceId,
+                        userId: Builder.settings.context.userId,
+                        authToken: Builder.settings.context.user.authToken,
+                        user: Builder.settings.context.user
                     },
                     global: {
-                        userId: Creator.USER_CONTEXT.userId,
-                        spaceId: Creator.USER_CONTEXT.spaceId,
-                        user: Creator.USER_CONTEXT.user,
+                        userId: Builder.settings.context.userId,
+                        spaceId: Builder.settings.context.user.spaceId,
+                        user: Builder.settings.context.user,
                         now: new Date(),
                         // mode: mode //由表单提供
                     },
@@ -731,22 +690,10 @@
                 $("button", scope).trigger("click")
             }, 300)
             return scope ;
-            // return Steedos.Page.render(SteedosUI.Modal, page, Object.assign({}, options, {
-            //     appId: appId,
-            //     objectName: objectApiName,
-            //     title: title,
-            //     recordId: recordId
-            // }));
         }
     };
-    // Steedos.Page.Form.StandardDelete.render = function(){
-    // };
     // creator odata 转 graphql 防腐层
     function getGraphqlFieldsQuery(objectApiName, selectFields, expandFields){
         const objectConfig = Creator.getObject(objectApiName)
         const objectFields = objectConfig.fields

package/main/default/objects/pages/buttons/customPage.button.js CHANGED Viewed

@@ -31,7 +31,7 @@ module.exports = {
         Steedos.authRequest(url, options);
     },
     customPageVisible: function (object_name, record_id, permission, data) {
-        if(Meteor.settings.public.enable_saas){
+        if(Steedos.settings.public.enable_saas){
             return false;
         }
         var record = data && data.record;

package/main/default/objects/pages/buttons/disable.button.js CHANGED Viewed

@@ -12,13 +12,18 @@ module.exports = {
             async: true,
             data: JSON.stringify({ pageId: record_id }),
             success: function (data) {
-                toastr.success('页面已禁用。');
+                SteedosUI.notification.success({
+                    message: '页面已禁用。'
+                });
                 SteedosUI.reloadRecord(object_name, record_id);
                 FlowRouter.reload();
                 $(document.body).removeClass('loading');
             },
             error: function (XMLHttpRequest, textStatus, errorThrown) {
-                toastr.error(t(XMLHttpRequest.responseJSON.error))
+                SteedosUI.notification.error({
+                    message: '操作失败',
+                    description: t(XMLHttpRequest.responseJSON.error),
+                });
                 $(document.body).removeClass('loading');
             }
         };

package/main/default/objects/pages/buttons/standard_new.button.js CHANGED Viewed

@@ -9,9 +9,9 @@
  */
 module.exports = {
     standard_newVisible: function (object_name, record_id, record_permissions, data) {
-        if(Meteor.settings.public.enable_saas){
+        if(Steedos.settings.public.enable_saas){
             return false;
         }
-        return Creator.baseObject.actions.standard_new.visible.apply(this, arguments);
+        return Steedos.Object.base.actions.standard_new.visible.apply(this, arguments);
     },
 }

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

@@ -5,7 +5,7 @@
  */
 const express = require('express');
 const router = express.Router();
-const core = require('@steedos/core');
+const auth = require('@steedos/auth');
 const ejs = require('ejs');
 const fs = require('fs');
 const _ = require('lodash');
@@ -23,7 +23,7 @@ const getPublicAssetUrls = function(assetUrls){
     return _.join(values, ',')
 }
-router.get('/api/pageDesign', core.requireAuthentication, async function (req, res) {
+router.get('/api/pageDesign', auth.requireAuthentication, async function (req, res) {
     try {
         res.set('Content-Type', 'text/html');
         const userSession = req.user;
@@ -31,7 +31,7 @@ router.get('/api/pageDesign', core.requireAuthentication, async function (req, r
         const assetUrl = `assetUrl=${assetUrls.split(',').join("&assetUrl=")}&`;
         // const dataContext = {
-        //     rootUrl: __meteor_runtime_config__.ROOT_URL,
+        //     rootUrl: process.env.ROOT_URL,
         //     tenantId: userSession.spaceId,
         //     userId: userSession.userId,
         //     authToken: userSession.authToken
@@ -43,7 +43,7 @@ router.get('/api/pageDesign', core.requireAuthentication, async function (req, r
             locale = "zh-CN";
         }
         const page = await objectql.broker.call(`page.getLatestPageVersion`, {pageId: req.query.pageId});
-        const retUrl = req.query.retUrl || __meteor_runtime_config__.ROOT_URL + '/app/admin/pages/view/' + req.query.pageId
+        const retUrl = req.query.retUrl || process.env.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}&locale=${locale}&pageType=${page.type}`;
@@ -51,7 +51,7 @@ router.get('/api/pageDesign', core.requireAuthentication, async function (req, r
         const data = {
             builderHost,
             assetUrls,
-            rootUrl: __meteor_runtime_config__.ROOT_URL,
+            rootUrl: process.env.ROOT_URL,
             tenantId: userSession.spaceId,
             userId: userSession.userId,
             authToken: userSession.authToken,

package/main/default/routes/page_render.router.js CHANGED Viewed

@@ -2,8 +2,8 @@
  * @Author: 孙浩林 6194896+sunhaolin@users.noreply.github.com
  * @Date: 2023-12-10 11:09:40
  * @LastEditors: 孙浩林 sunhaolin@steedos.com
- * @LastEditTime: 2024-04-18 16:09:10
- * @FilePath: /steedos-platform-2.3/services/service-pages/main/default/routes/page_render.router.js
+ * @LastEditTime: 2025-03-05 10:04:42
+ * @FilePath: /steedos-platform-3.0/services/service-pages/main/default/routes/page_render.router.js
  * @Description: 支持使用schemaApi动态渲染页面，支持匿名访问。
  */
 const express = require('express');
@@ -40,7 +40,7 @@ router.get('/api/page/render', async function (req, res) {
             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,
+            ROOT_URL: process.env.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,
@@ -53,7 +53,7 @@ router.get('/api/page/render', async function (req, res) {
                 spaceId: ""
             },
             pageSchema: pageSchema,
-            __meteor_runtime_config__: __meteor_runtime_config__,
+            // __meteor_runtime_config__: __meteor_runtime_config__,
             queryData,
             STEEDOS_PUBLIC_USE_OPEN_API: process.env.STEEDOS_PUBLIC_USE_OPEN_API
         }

package/main/default/routes/page_schema.router.js CHANGED Viewed

@@ -2,15 +2,15 @@
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-11-17 16:29:17
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2022-11-28 18:01:27
+ * @LastEditTime: 2025-01-21 17:28:38
  * @Description:
  */
 const express = require('express');
 const router = express.Router();
 const objectql = require('@steedos/objectql');
-const core = require('@steedos/core');
+const auth = require('@steedos/auth');
-router.get('/api/pageSchema/:type', core.requireAuthentication, async function (req, res) {
+router.get('/api/pageSchema/:type', auth.requireAuthentication, async function (req, res) {
     try {
         const userSession = req.user;

package/main/default/routes/page_view.ejs CHANGED Viewed

@@ -2,7 +2,7 @@
  * @Author: baozhoutao@steedos.com
  * @Date: 2023-08-01 17:47:18
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2024-09-04 13:55:15
+ * @LastEditTime: 2025-03-10 11:52:39
  * @Description:
 -->
 <!DOCTYPE html>
@@ -30,16 +30,11 @@
       <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>
@@ -97,12 +92,11 @@
   <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/steedos.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');
@@ -138,7 +132,8 @@
       assetUrls: assetUrls,
       steedosAmisVersion: "<%=STEEDOS_AMIS_VERSION%>",
       locale: "<%=STEEDOS_LOCALE%>" || getBrowserLocale(),
-      useOpenAPI: STEEDOS_PUBLIC_USE_OPEN_API
+      useOpenAPI: STEEDOS_PUBLIC_USE_OPEN_API,
+      context: <%- JSON.stringify(USER_CONTEXT) %>
     });
     window.axios = amisRequire('axios');
@@ -189,7 +184,7 @@
     const page = {
         render_engine: 'amis',
         name: "<%=pageApiName%>",
-        schema:  <%- JSON.stringify(pageSchema) %>
+        schema:  <%- JSON.stringify(pageSchema) %> || {}
     }
     const container = $(".page-template-root")[0];

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

@@ -28,7 +28,7 @@ router.get('/api/page/view/:pageId', auth.authentication, async function (req, r
         // 如果当前用户未登录,且页面不允许匿名访问,则跳转到登录页面
         if(!userSession && !page.allow_anonymous){
-            return res.redirect(`/accounts/a/#/login?redirect_uri=${encodeURIComponent(`/api/page/view/${pageId}`)}`);
+            return res.redirect(`/login?redirect_uri=${encodeURIComponent(`/api/page/view/${pageId}`)}`);
         }
         let assetUrls = req.query.assetUrls;
@@ -48,7 +48,7 @@ router.get('/api/page/view/:pageId', auth.authentication, async function (req, r
             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,
+            ROOT_URL: process.env.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,
@@ -60,8 +60,8 @@ router.get('/api/page/view/:pageId', auth.authentication, async function (req, r
                 userId: userSession.userId,
                 spaceId: userSession.spaceId
             },
-            pageSchema: _.isString(pageVersion.schema) ? JSON.parse(pageVersion.schema) : pageVersion.schema,
-            __meteor_runtime_config__: __meteor_runtime_config__,
+            pageSchema: _.isString(pageVersion.schema) ? JSON.parse(pageVersion.schema) : (pageVersion.schema || {}),
+            // __meteor_runtime_config__: __meteor_runtime_config__,
             STEEDOS_PUBLIC_USE_OPEN_API: process.env.STEEDOS_PUBLIC_USE_OPEN_API
         }
         const options = {}
@@ -109,7 +109,7 @@ router.get('/api/page/public/:pageId', async function (req, res) {
             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,
+            ROOT_URL: process.env.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,
@@ -122,7 +122,7 @@ router.get('/api/page/public/:pageId', async function (req, res) {
                 spaceId: ""
             },
             pageSchema: _.isString(pageVersion.schema) ? JSON.parse(pageVersion.schema) : pageVersion.schema,
-            __meteor_runtime_config__: __meteor_runtime_config__,
+            // __meteor_runtime_config__: __meteor_runtime_config__,
             STEEDOS_PUBLIC_USE_OPEN_API: process.env.STEEDOS_PUBLIC_USE_OPEN_API
         }
         const options = {}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-pages",
-  "version": "3.0.0-beta.2",
+  "version": "3.0.0-beta.8",
   "main": "package.service.js",
   "scripts": {},
   "license": "MIT",
@@ -8,7 +8,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "72fa51bda8ff714d5fdb933bf0a45ea4cb82df74",
+  "gitHead": "723d92765db5342a374c7aacb5b835e69f77ca4b",
   "dependencies": {
     "clone": "^2.1.2",
     "ejs": "^3.1.8"

package/package.service.js CHANGED Viewed

@@ -146,16 +146,7 @@ module.exports = {
 	 * Events
 	 */
 	events: {
-		"steedos-server.started": {
-            async handler() {
-                await this.publicClientJS();
-            }
-        },
-        "space.initialized": {
-            async handler() {
-                await this.publicClientJS();
-            }
-        }
 	},
 	/**
@@ -171,10 +162,11 @@ module.exports = {
 				const { path : packagePath } = packageInfo;
                 let publicPath = path.join(packagePath, 'main', 'default', 'client');
                 try {
-                    if (!fs.existsSync(publicPath) || this.settings.loadedPublicClientJS || typeof WebApp == 'undefined') {
+                    if (!fs.existsSync(publicPath) || this.settings.loadedPublicClientJS) {
                         return;
                     }
                 } catch (error) {
+					console.log('error', error)
                     return
                 }
@@ -184,12 +176,11 @@ module.exports = {
                     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;
+                        if (process.env.ROOT_URL_PATH_PREFIX) {
+                            routerPath = process.env.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;
@@ -212,9 +203,7 @@ module.exports = {
 	 * Service started lifecycle event handler
 	 */
 	async started() {
-		this.broker.waitForServices("steedos-server").then(async () => {
-			await this.publicClientJS()
-		});
+		await this.publicClientJS()
 	},
 	/**