@steedos/service-plugin-amis 2.2.42 → 2.2.45

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

@@ -16,7 +16,7 @@
         console.error(error)
     };
 
-    import('/unpkg.com/@steedos-ui/amis/dist/amis-sdk.umd.min.js').then(() => {
+    // import('/unpkg.com/@steedos-ui/amis/dist/amis-sdk.umd.min.js').then(() => {
 
         Promise.all([
             waitForThing(window, 'assetsLoaded'),
@@ -135,8 +135,29 @@
                 return (React.createElement("div", { className: "amis-scope" }, AmisSDK.AmisRender(schema, {data, name}, Object.assign({}, AmisEnv, env))));
             };
 
+            const initMonaco = ()=>{
+
+                const { detect } = require('detect-browser');
+
+                const browser = detect();
+
+                // 低于86版的chrome 不支持code类型字段及功能
+                if (browser && browser.name === 'chrome' && Number(browser.version.split(".")[0]) < 86) {
+                    return Promise.resolve(true)
+                }
+
+                // 手机版暂不支持code类型字段.
+                if(Meteor.isCordova){
+                    return Promise.resolve(true)
+                }else{
+                    return Builder.initMonaco()
+                }
+            }
+
             //Amis SDK 中已清理了monaco, 所以这里需要提前注册,否则会导致amis code类型报错
-            Builder.initMonaco().then(()=>{
+            initMonaco().catch((err)=>{
+                console.error(`Builder.initMonaco error: ${err}`);
+            }).finally(()=>{
                 Builder.registerComponent(AmisRender, {
                     name: 'Amis',
                     inputs: [
@@ -147,6 +168,6 @@
                 });
             });
         });
-    });
+    // });
 
 })();

package/main/default/pages/listview_form.page.amis.json

@@ -100,7 +100,7 @@
                                     "$value": "$filter_scope._id",
                                     "rfield": "${object_name}"
                                 },
-                                "requestAdaptor": "\n        var filters = '[]';\n        var top = 10;\n        if(api.data.$term){\n            filters = '[\"name\", \"contains\", \"'+ api.data.$term +'\"]';\n        }else if(api.data.$value){\n            filters = '[\"_id\", \"=\", \"'+ api.data.$value +'\"]';\n        }\n        api.data.query = api.data.query.replaceAll('{__filters}', filters).replace('{__top}', top);\n        return api;\n    ",
+                                "requestAdaptor": "\n        var filters = '[]';\n        var top = 10;\n        if(api.data.$term){\n            filters = '[\"name\", \"contains\", \"'+ api.data.$term +'\"]';\n        }else if(api.data.$value){\n            filters = '[\"_id\", \"=\", \"'+ api.data.$value +'\"]';\n        }\n        api.data.query = api.data.query.replace(/{__filters}/g, filters).replace('{__top}', top);\n        return api;\n    ",
                                 "adaptor": "\n        payload.data.options = eval(function anonymous(\n) {\n\n        var _options;\n\n        _options = [{\n          label: \"我的\",\n          value: \"mine\",\n          icon: \"user\"\n        }, {\n          label: \"工作区\",\n          value: \"space\",\n          icon: \"groups\"\n        }];\n        return _options;\n      \n})(api.data);\n        return payload;\n        "
                             },
                             "value": "space",

package/main/default/services/utils/fields/lookup.js

@@ -101,7 +101,7 @@ function lookupToAmisPicker(field, readonly){
                 }
             })
         }
-        api.data.query = api.data.query.replaceAll('{__filters}', JSON.stringify(filters)).replace('{__top}', pageSize).replace('{__skip}', skip).replace('{__sort}', sort.trim());
+        api.data.query = api.data.query.replace(/{__filters}/g, JSON.stringify(filters)).replace('{__top}', pageSize).replace('{__skip}', skip).replace('{__sort}', sort.trim());
         return api;
     `
 
@@ -172,7 +172,7 @@ function lookupToAmisSelect(field, readonly){
         }else if(api.data.$value){
             filters = '["_id", "=", "'+ api.data.$value +'"]';
         }
-        api.data.query = api.data.query.replaceAll('{__filters}', filters).replace('{__top}', top);
+        api.data.query = api.data.query.replace(/{__filters}/g, filters).replace('{__top}', top);
         return api;
     `
     let labelField = referenceTo ? referenceTo.labelField.name : '';

package/main/default/services/utils/fields/table.js

@@ -118,7 +118,7 @@ exports.getTableApi = function(mainObject, fields){
                 }
             })
         }
-        api.data.query = api.data.query.replaceAll('{__filters}', JSON.stringify(filters)).replace('{__top}', pageSize).replace('{__skip}', skip).replace('{__sort}', sort.trim());
+        api.data.query = api.data.query.replace(/{__filters}/g, JSON.stringify(filters)).replace('{__top}', pageSize).replace('{__skip}', skip).replace('{__sort}', sort.trim());
         return api;
     `
     api.adaptor = `

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-plugin-amis",
-  "version": "2.2.42",
+  "version": "2.2.45",
   "main": "package.service.js",
   "scripts": {},
   "license": "MIT",
@@ -8,5 +8,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "16d059e7969e3e79d2f7f1f0347b88eb60a93e03"
+  "gitHead": "0fb1ad43aedc498490d26ae5d8391df4ce34d6ea"
 }