@steedos/service-plugin-amis 2.2.17 → 2.2.20

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

@@ -5,6 +5,7 @@
  */
 
 ; (function () {
+        
     try {
         let amisStyle = document.createElement("link");
         amisStyle.setAttribute("rel", "stylesheet");
@@ -13,48 +14,62 @@
         document.getElementsByTagName("head")[0].appendChild(amisStyle);
     } catch (error) {
         console.error(error)
-    }
+    };
+    
     import('/amis/sdk/sdk.noreact.js').then(() => {
 
-        //处理mobx多个实例问题
-        // try {
-        //     let mobx = amisRequire('mobx');
-        //     mobx.configure({ isolateGlobalState: true })
-        // } catch (error) {
+        Promise.all([
+            waitForThing(window, 'assetsLoaded'),
+            waitForThing(window, 'React'),
+            waitForThing(window, 'Builder'),
+            waitForThing(window, 'amisRequire'),
+        ]).then(()=>{
 
-        // }
+            window.SAmisReners = [];
 
-        let React = window.React || amisRequire("react");
+            const amisComps = lodash.filter(Builder.registry['meta-components'], function(item){ return item.componentName && item.amis?.render});
+            
+            let amisLib = amisRequire('amis');
+            
+            lodash.each(amisComps,(comp)=>{
+                const Component = Builder.components.find(item => item.name === comp.componentName);
+                if (Component && !SAmisReners.includes(comp.amis?.render.type)){
+                    try {
+                        SAmisReners.push(comp.amis?.render.type);
+                        amisLib.Renderer(
+                            {
+                                type: comp.amis?.render.type,
+                                weight: comp.amis?.render.weight
+                            }
+                        )(Component.class);
+                    } catch(e){console.log(e)}
+                }
+            })
 
-        // Register amis render 
-        var Amis = function (props) {
-            var schema = props.schema, data = props.data;
-            return React.createElement(React.Fragment, null,
-                React.createElement("div", { id: "amis-root" }),
-                // amisRequire('amis').render(schema, data, {theme: 'cxd'}))
-                function () {
-                    setTimeout(function () {
-                        amisRequire('amis/embed').embed('#amis-root', schema, {
-                            data
-                        })
-                    }, 100)
-                }()
-            );
-        };
+            // Register amis render 
+            var Amis = function (props) {
+                var schema = props.schema, data = props.data;
+                return React.createElement(React.Fragment, null,
+                    React.createElement("div", { id: "amis-root" }),
+                    // amisRequire('amis').render(schema, data, {theme: 'cxd'}))
+                    function () {
+                        setTimeout(function () {
+                            amisRequire('amis/embed').embed('#amis-root', schema, {
+                                data
+                            })
+                        }, 100)
+                    }()
+                );
+            };
 
-        //等待Builder加载完成
-        waitForThing(window, 'Builder').then(()=>{
-            //等待amis组件加载完成
-            waitForThing(window, 'amisComponentsLoaded').then(()=>{
-                Builder.registerComponent(Amis, {
-                    name: 'Amis',
-                    inputs: [
-                      { name: 'schema', type: 'object' },
-                      { name: 'data', type: 'object' },
-                    ]
-                });
-            })
-        })
+            Builder.registerComponent(Amis, {
+                name: 'Amis',
+                inputs: [
+                    { name: 'schema', type: 'object' },
+                    { name: 'data', type: 'object' },
+                ]
+            });
+        });
     });
 
 })();

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

@@ -4,29 +4,10 @@
  * @Description: 基于steedos builder 实现 Amis组件的动态注册
  */
 
-window.SAmisReners = [];
 
 window.addEventListener('message', function (event) {
     const { data } = event;
-    if (data.type === 'builder.register') {
-        if(data.data?.type === 'remote-assets'){
-            const amisComps = lodash.filter(Builder.registry['meta-components'], function(item){ return item.componentName && item.amis?.render});
-            let amisLib = amisRequire('amis');
-            lodash.each(amisComps,(comp)=>{
-                const Component = Builder.components.find(item => item.name === comp.componentName);
-                if (Component && !SAmisReners.includes(comp.amis?.render.type)){
-                    try {
-                        SAmisReners.push(comp.amis?.render.type);
-                        amisLib.Renderer(
-                            {
-                                type: comp.amis?.render.type,
-                                weight: comp.amis?.render.weight
-                            }
-                        )(Component.class);
-                    } catch(e){console.log(e)}
-                }
-            })
-            window.amisComponentsLoaded = true;
-        }
-      }
-});
+    if (data.type === 'builder.assetsLoaded') {
+        window.assetsLoaded = true;
+    }
+})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-plugin-amis",
-  "version": "2.2.17",
+  "version": "2.2.20",
   "main": "package.service.js",
   "scripts": {},
   "license": "MIT",
@@ -8,5 +8,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d5f33748f18e5376484551234b3b323132a1e56c"
+  "gitHead": "a0462d803860690b47487ece88a0bbb380ba0f17"
 }