@steedos/service-plugin-amis 2.5.15 → 2.5.16-beta.2

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

@@ -228,8 +228,9 @@
                 // },
                 // 如果这里不配置env.notify，那么会走amis 默认的env.notify，它会造成随机把toast组件dom插入到不同的scope容器内（应该是插入到最后一个加载的scope），这在苹果手机上可能会造成弹出的通知z-index不生效的情况，出现通知被档住的问题
                 notify: (type, msg)=>{
-                  if(msg.props && msg.props.schema.tpl){
-                    SteedosUI.message[type](msg.props?.schema.tpl)
+                  var tpl = msg.props && msg.props.schema.tpl;
+                  if(tpl){
+                    SteedosUI.message[type](tpl)
                   }else if(typeof msg == 'string'){
                     SteedosUI.message[type](msg)
                   }else{
@@ -267,6 +268,34 @@
                 },
                 theme: 'antd',
                 isCurrentUrl: isCurrentUrl,
+                requestAdaptor: (config)=>{
+                    // url是相对路径
+                    if(config.url && (!/^http[s]?:\/\//i.test(config.url))){
+                      if(Meteor.isCordova){
+                        config.url = Meteor.absoluteUrl(config.url)
+                      }
+
+                      if(!config.headers){
+                        config.headers = {}
+                      }
+
+                      if(!config.headers.Authorization && Builder.settings.context && Builder.settings.context.tenantId && Builder.settings.context.authToken){
+                        config.headers.Authorization = `Bearer ${Builder.settings.context.tenantId},${Builder.settings.context.authToken}`;
+                      }
+                    }else if(config.url && Meteor.isCordova && Builder.settings.context && Builder.settings.context.rootUrl && config.url.startsWith(Builder.settings.context.rootUrl)){
+                      // 是绝对路径,且是cordova环境, 且以root url开头, 则自动处理认证
+                      if(Meteor.isCordova){
+                        if(!config.headers){
+                          config.headers = {}
+                        }
+              
+                        if(!config.headers.Authorization && Builder.settings.context && Builder.settings.context.tenantId && Builder.settings.context.authToken){
+                          config.headers.Authorization = `Bearer ${Builder.settings.context.tenantId},${Builder.settings.context.authToken}`;
+                        }
+                      }
+                    }
+                    return config;
+                }
             };
             // 已弃用
             const AmisRender = function (props) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-plugin-amis",
-  "version": "2.5.15",
+  "version": "2.5.16-beta.2",
   "main": "package.service.js",
   "scripts": {
     "build": "yarn build:tailwind-base && yarn build:tailwind",
@@ -13,7 +13,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "dd588460d9a446d76c1d065c342594e9bec1f14d",
+  "gitHead": "f8b3f647c00f580f9a10547a4a8afec0398bcbe2",
   "devDependencies": {
     "tailwindcss": "3.2.4"
   }