@steedos/standard-ui 2.5.13-beta.9 → 2.5.13

package/main/default/client/favicon.client.js

@@ -0,0 +1,11 @@
+
+Meteor.startup(function(){
+    Tracker.autorun(function(){
+        const space = db.spaces.findOne(Steedos.getSpaceId());
+        if(space && space.favicon){
+            const faviconLink = document.querySelector('link[rel="shortcut icon"]');
+            faviconLink.href = Steedos.absoluteUrl("/api/files/avatars/"+space.favicon);
+            console.log('update faviconLink.href', faviconLink.href)
+        }
+    })
+})

package/main/default/client/history_paths.client.js

@@ -2,7 +2,7 @@
  * @Author: 殷亮辉 yinlianghui@hotoa.com
  * @Date: 2023-05-16 17:00:38
  * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2023-09-07 13:23:57
+ * @LastEditTime: 2023-09-11 17:44:01
  */
 var buttonTriggerHistoryPathsChange;
 
@@ -19,7 +19,9 @@ function clearHistoryFilters(context, lastPath, paths) {
                 // 是从记录详细界面直接切换到其他对象列表或其他应用时，进一步往上找，找到对象列表的path作为lastPath来清除对应的本地存储
                 for(let i = paths.length - 1;i >= 0;i--){
                     let tempPath = paths[i];
-                    if(!tempPath.params.record_id && tempPath.params.list_view_id){
+                    // if(!tempPath.params.record_id && tempPath.params.list_view_id){
+                    // 不可以判断list_view_id表示对象列表，因为有可以从应用程序微页面进入记录详细页面，需要清除应用程序微页面中的对象表格或对象列表组件中本地存储中保存的过滤条件
+                    if(!tempPath.params.record_id){
                         // record_id不存在，list_view_id存在表示对象列表页面
                         lastPath = tempPath;
                         break;

package/main/default/routers/main_head.ejs

@@ -38,6 +38,8 @@
     const STEEDOS_PUBLIC_PAGE_ASSETURLS = "<%=STEEDOS_PUBLIC_PAGE_ASSETURLS%>";
     const STEEDOS_AMIS_VERSION= "<%=STEEDOS_AMIS_VERSION%>";
 
+    const platform = <%- JSON.stringify(platform) %>;
+
     if (`${STEEDOS_SENTRY_ENABLED}` != 'false') {
         loadJs(`${ROOT_URL}/sentry/sentry.min.js`, (script)=>{
             const nodeEnv = NODE_ENV || 'development';
@@ -53,7 +55,24 @@
     };
 
     loadJs(`${STEEDOS_UNPKG_URL}/lodash@4.17.21/lodash.min.js`, ()=>{
-        window._ = window.lodash;
+        // window._ = window.lodash;
+        try {
+            if(platform.hostname){
+                if (!_.includes(platform.hostname.split(','), window.location.hostname)) {
+                    setTimeout(function(){
+                        const banners = document.getElementsByClassName("steedos-banners")[0];
+                        if(banners){
+                            banners.style.display = 'flex';
+                            banners.style.justifyContent = 'center';
+                        }
+                        console.error(`环境变量ROOT_URL中的hostname(${window.location.hostname})与许可证中设置的不一致，请确认。`)
+                    }, 3000)
+                }
+            }
+        } catch (error) {
+            console.error(error)
+        }
+
     });
     loadJs(`${STEEDOS_UNPKG_URL}/marked@4.0.17/marked.min.js`);
     loadJs(`${STEEDOS_UNPKG_URL}/crypto-js@4.1.1/crypto-js.js`);
@@ -129,4 +148,8 @@
         })
     }
 
+    if(ROOT_URL){
+        loadJs(`${ROOT_URL}/cordova.i18n.js`)
+    }
+
 })();

package/main/default/routers/main_head.router.js

@@ -11,7 +11,6 @@ const fs = require('fs');
 const _ = require('lodash');
 const path = require('path');
 
-
 const getConfig = (key, platform)=>{
     if(platform === 'cordova'){
         let value = process.env[key];
@@ -47,7 +46,8 @@ router.get('/main_head.js', async function (req, res) {
             STEEDOS_VERSION: process.env.STEEDOS_VERSION,
             STEEDOS_LOCALE: "",
             STEEDOS_PUBLIC_PAGE_ASSETURLS: process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS,
-            STEEDOS_AMIS_VERSION: process.env.STEEDOS_AMIS_VERSION
+            STEEDOS_AMIS_VERSION: process.env.STEEDOS_AMIS_VERSION,
+            platform: __meteor_runtime_config__.PUBLIC_SETTINGS?.platform || {}
         }
         const options = {}
         ejs.renderFile(filename, data, options, function(err, str){

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/standard-ui",
-    "version": "2.5.13-beta.9",
+    "version": "2.5.13",
     "main": "package.service.js",
     "private": false,
     "publishConfig": {
@@ -12,5 +12,5 @@
     "description": "steedos package",
     "repository": {},
     "license": "MIT",
-    "gitHead": "3c7f9046326982d3fc836500382679e75e05ba18"
+    "gitHead": "70670f8b8ea0aad61e73a3258b5c8aaf6139c682"
 }

package/package.service.js

@@ -1,8 +1,8 @@
 /*
  * @Author: sunhaolin@hotoa.com
  * @Date: 2022-07-29 09:40:31
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-08-19 19:56:00
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2023-09-11 15:45:29
  * @Description: 
  */
 "use strict";
@@ -52,8 +52,9 @@ module.exports = {
 					{
 						objectName: 'space_users',
 						query: {
-							fields: ['_id', 'user', 'name'],
-							filters: [["user", "in", userIds]]
+							fields: ['_id', 'user', 'name', 'sort_no'],
+							filters: [["user", "in", userIds]],
+							sort: 'sort_no desc'
 						},
 					}
 				);