@steedos/service-plugin-amis 2.2.11 → 2.2.14

package/README.md

@@ -1,3 +1,9 @@
 ### Amis 插件
 - 支持 Amis 渲染 Page
-- 支持 Amis 编辑器
+- 支持 Amis 编辑器
+
+
+### monaco worker
+- 在require amis时, amis sdk会给window上添加 MonacoEnvironment 函数, 用于处理monaco worker. 
+- steedos 提供了默认的 monaco worker 处理器 window.SteedosMonacoEnvironment
+- 如果需要使用 steedos 提供的 monaco worker 请在 requie amis 之后,添加代码 `window.MonacoEnvironment = window.SteedosMonacoEnvironment;`

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

@@ -1,15 +1,3 @@
-window['React'] = require('react'); 
-window['ReactDOM'] = require('react-dom'); 
-window['lodash'] = require('lodash'); 
-
-Builder.registerImportMap({
-    "lodash": '/requirejs/lodash',
-    "react": '/requirejs/react',
-    "react-dom": '/requirejs/react-dom',
-    "@steedos-builder/sdk": '/requirejs/builder-sdk',
-    "@steedos-builder/react": '/requirejs/builder-react',
-})
-Builder.require(['lodash',"react", "react-dom"])
 
 ; (function () {
     try {
@@ -22,13 +10,14 @@ Builder.require(['lodash',"react", "react-dom"])
         console.error(error)
     }
     import('/amis/sdk/sdk.noreact.js').then(() => {
+
         //处理mobx多个实例问题
-        try {
-            let mobx = amisRequire('mobx');
-            mobx.configure({ isolateGlobalState: true })
-        } catch (error) {
+        // try {
+        //     let mobx = amisRequire('mobx');
+        //     mobx.configure({ isolateGlobalState: true })
+        // } catch (error) {
 
-        }
+        // }
 
         let React = window.React || amisRequire("react");
 
@@ -48,19 +37,6 @@ Builder.require(['lodash',"react", "react-dom"])
             );
         };
 
-        window['requirejs'].config(
-            { 
-              waitSeconds: 60,
-              baseUrl: Meteor.absoluteUrl('/requirejs'),
-              paths: { 
-                'vs': 'https://unpkg.com/monaco-editor/min/vs',
-              } 
-            }
-          );
-
-        React.Builder = Builder;
-        
-        
         Builder.registerComponent(Amis, {
             name: 'Amis',
             inputs: [

package/main/default/client/onWindowMessage.client.js

@@ -10,12 +10,12 @@ window.addEventListener('message', function (event) {
     const { data } = event;
     if (data.type === 'builder.register') {
         if (data.data?.type === 'meta-components' && data.data?.info?.componentName && data.data?.info?.amis?.render) {
-            console.log(`data.data.info ===> `, data.data.info);
             const Component = Builder.components.find(item => item.name === data.data.info?.componentName);
           if (Component && !SAmisReners.includes(data.data.info.amis?.render.type)){
             try {
                 SAmisReners.push(data.data.info.amis?.render.type);
                 let amisLib = amisRequire('amis');
+                window.MonacoEnvironment = window.SteedosMonacoEnvironment;
                 amisLib.Renderer(
                     {
                         type: data.data.info.amis?.render.type,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-plugin-amis",
-  "version": "2.2.11",
+  "version": "2.2.14",
   "main": "package.service.js",
   "scripts": {},
   "license": "MIT",
@@ -8,5 +8,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0eaf63bc2efddbc85f98eb5091c0545f3304ae9d"
+  "gitHead": "de074b6e2d790b7e63edd8cf2917664dd13bbade"
 }