@steedos/standard-ui 2.5.13-beta.5 → 2.5.13-beta.7

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

@@ -2,19 +2,30 @@
  * @Author: 殷亮辉 yinlianghui@hotoa.com
  * @Date: 2023-05-16 17:00:38
  * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2023-08-24 16:25:28
+ * @LastEditTime: 2023-09-07 13:23:57
  */
 var buttonTriggerHistoryPathsChange;
 
 let historyPathsStoreKey = "history_paths";
 
 // 切换应用、对象、列表视图时清除本地存储中的过滤条件
-function clearHistoryFilters(context, lastPath) {
+function clearHistoryFilters(context, lastPath, paths) {
     const path = context.path;
     const params = context.params || {};
     if (!lastPath || lastPath.params.app_id != params.app_id || lastPath.params.object_name != params.object_name || lastPath.params.list_view_id != params.list_view_id) {
         let listViewPropsStoreKey;
         if (lastPath) {
+            if(lastPath.params.record_id){
+                // 是从记录详细界面直接切换到其他对象列表或其他应用时，进一步往上找，找到对象列表的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){
+                        // record_id不存在，list_view_id存在表示对象列表页面
+                        lastPath = tempPath;
+                        break;
+                    }
+                }
+            }
             listViewPropsStoreKey = lastPath.path + "/crud";
         }
         else {
@@ -229,7 +240,7 @@ FlowRouter.triggers.enter(debounce(function (context, redirect, stop) {
         } 
     }
     else {
-        clearHistoryFilters(context, lastPath);
+        clearHistoryFilters(context, lastPath, paths);
         // 触发广播事件前重置amis变量historyPaths值为空数组，并把当前path和params存入amis变量historyPaths中
         resetHistoryPath(path, params);
     }

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

@@ -11,6 +11,20 @@ const fs = require('fs');
 const _ = require('lodash');
 const path = require('path');
 
+
+const getConfig = (key, platform)=>{
+    if(platform === 'cordova'){
+        let value = process.env[key];
+        //如果不是以http开头的，就是相对路径, 则加上ROOT_URL
+        if(_.startsWith(value, '/')){
+            return Meteor.absoluteUrl(value) ;
+        }
+        return value;
+    }else{
+        return process.env[key]
+    }
+}
+
 /**
  * 虽然script 标签的 async = false; 可以解决js之间的依赖顺序问题, 但是它无法做到比 HTML 中其他非动态加载的 script 脚本更早执行
  * 所以调整了meteor 内核加载 bundledJs、staticJs的方式 (creator/packages/boilerplate-generator)
@@ -25,11 +39,11 @@ router.get('/main_head.js', async function (req, res) {
             STEEDOS_SENTRY_ENABLED: process.env.STEEDOS_SENTRY_ENABLED,
             NODE_ENV: process.env.NODE_ENV,
             STEEDOS_SENTRY_DSN: process.env.STEEDOS_SENTRY_DSN,
-            STEEDOS_UNPKG_URL: process.env.STEEDOS_UNPKG_URL,
-            STEEDOS_AMIS_URL: process.env.STEEDOS_AMIS_URL,
-            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_UNPKG_URL: getConfig('STEEDOS_UNPKG_URL', platform),
+            STEEDOS_AMIS_URL: getConfig('STEEDOS_AMIS_URL', platform),
+            STEEDOS_PUBLIC_SCRIPT_VCONSOLE: getConfig('STEEDOS_PUBLIC_SCRIPT_VCONSOLE', platform),
+            STEEDOS_PUBLIC_SCRIPT_PLUGINS: getConfig('STEEDOS_PUBLIC_SCRIPT_PLUGINS', platform),
+            STEEDOS_PUBLIC_STYLE_PLUGINS: getConfig('STEEDOS_PUBLIC_STYLE_PLUGINS', platform),
             STEEDOS_VERSION: process.env.STEEDOS_VERSION,
             STEEDOS_LOCALE: "",
             STEEDOS_PUBLIC_PAGE_ASSETURLS: process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS,
@@ -50,4 +64,27 @@ router.get('/main_head.js', async function (req, res) {
     }
 
 });
+
+
+
+router.get('/main_head.css', async function(req, res){
+    const { platform } = req.query;
+
+    res.set('Content-Type', 'text/css; charset=UTF-8');
+    
+    const STEEDOS_UNPKG_URL = getConfig('STEEDOS_UNPKG_URL', platform);
+    const STEEDOS_AMIS_URL = getConfig('STEEDOS_AMIS_URL', platform);
+    const ROOT_URL = platform === 'cordova' ? __meteor_runtime_config__.ROOT_URL : '';
+
+    res.send(`
+        @import url("${STEEDOS_UNPKG_URL}/@salesforce-ux/design-system@2.19.0/assets/styles/salesforce-lightning-design-system.min.css");
+        @import url("${STEEDOS_AMIS_URL}/lib/themes/antd.css");
+        @import url("${STEEDOS_AMIS_URL}/lib/helper.css");
+        @import url("${STEEDOS_AMIS_URL}/sdk/iconfont.css");
+        @import url("${STEEDOS_UNPKG_URL}/@fortawesome/fontawesome-free@6.2.0/css/all.min.css");
+        @import url("${ROOT_URL}/tailwind/tailwind-steedos.css");
+        @import url("${ROOT_URL}/amis/amis.css");
+    `); 
+})
+
 exports.default = router;

package/package.json

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