Merge branch '2.5' of https://github.com/steedos/steedos-platform int…

…o 2.5
steedos · Oct 8, 2023 · d1e8792 · d1e8792
2 parents 2643fed + d9ff994
commit d1e8792
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/packages/cli/default.steedos.config.js b/packages/cli/default.steedos.config.js
@@ -20,7 +20,7 @@ process.env.STEEDOS_UNPKG_URL =  process.env.STEEDOS_UNPKG_URL.replace(/\/+$/, "
 
 
 if(_.isEmpty(process.env.STEEDOS_AMIS_VERSION)) {
-	process.env.STEEDOS_AMIS_VERSION = '3.2.0';
+	process.env.STEEDOS_AMIS_VERSION = '2.9.0';
 }
 
 if(_.isEmpty(process.env.STEEDOS_AMIS_URL)) {
@@ -29,7 +29,7 @@ if(_.isEmpty(process.env.STEEDOS_AMIS_URL)) {
 process.env.STEEDOS_AMIS_URL =  process.env.STEEDOS_AMIS_URL.replace(/\/+$/, "");
 
 if(_.isEmpty(process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS)) {
-	process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS = process.env.STEEDOS_UNPKG_URL + "/@steedos-widgets/[email protected].9/dist/assets.json";
+	process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS = process.env.STEEDOS_UNPKG_URL + "/@steedos-widgets/[email protected].10/dist/assets.json";
 }
 
 if(_.isEmpty(process.env.SERIALIZER)){

diff --git a/services/service-plugin-amis/main/default/client/amis.render.client.js b/services/service-plugin-amis/main/default/client/amis.render.client.js
@@ -226,6 +226,7 @@
                 //     }
                 //     return div;
                 // },
+                // 如果这里不配置env.notify，那么会走amis 默认的env.notify，它会造成随机把toast组件dom插入到不同的scope容器内（应该是插入到最后一个加载的scope），这在苹果手机上可能会造成弹出的通知z-index不生效的情况，出现通知被档住的问题
                 notify: (type, msg)=>{
                   if(msg.props?.schema.tpl){
                     SteedosUI.message[type](msg.props?.schema.tpl)