@steedos/service-plugin-amis 2.2.19 → 2.2.22

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

@@ -15,54 +15,99 @@
     } catch (error) {
         console.error(error)
     };
-    
-    import('/amis/sdk/sdk.noreact.js').then(() => {
+
+    import('/unpkg.com/@steedos-ui/amis/dist/amis-sdk.umd.min.js').then(() => {
 
         Promise.all([
             waitForThing(window, 'assetsLoaded'),
-            waitForThing(window, 'React'),
-            waitForThing(window, 'Builder'),
-            waitForThing(window, 'amisRequire'),
+            waitForThing(window, 'AmisSDK'),
         ]).then(()=>{
 
-            window.SAmisReners = [];
+            const AmisRenderers = [];
 
             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)){
+                if (Component && !AmisRenderers.includes(comp.amis?.render.type)){
                     try {
-                        SAmisReners.push(comp.amis?.render.type);
-                        amisLib.Renderer(
+                        AmisRenderers.push(comp.amis?.render.type);
+                        AmisSDK.amis.Renderer(
                             {
                                 type: comp.amis?.render.type,
-                                weight: comp.amis?.render.weight
+                                weight: comp.amis?.render.weight,
+                                autoVar: true,
                             }
                         )(Component.class);
-                    } catch(e){console.log(e)}
+                    } catch(e){console.error(e)}
                 }
-            })
+            });
+
+            const AmisEnv = {
+                fetcher: ({url, method, data, config}) => {
+                    console.log('fetcher. url', url);
+                    if(url.startsWith("http") && url.indexOf("://") == -1){
+                        url = decodeURIComponent(url)
+                    }
+                    config = config || {};
+                    config.headers = config.headers || {};
+                    config.withCredentials = true;
+    
+                    if (method !== 'post' && method !== 'put' && method !== 'patch') {
+                        if (data) {
+                            config.params = data;
+                        }
+                        return (axios)[method](url, config);
+                    } else if (data && data instanceof FormData) {
+                        // config.headers = config.headers || {};
+                        // config.headers['Content-Type'] = 'multipart/form-data';
+                    } else if (
+                        data &&
+                        typeof data !== 'string' &&
+                        !(data instanceof Blob) &&
+                        !(data instanceof ArrayBuffer)
+                    ) {
+                        data = JSON.stringify(data);
+                        config.headers['Content-Type'] = 'application/json';
+                    }
+    
+                    return (axios)[method](url, data, config);
+                },
+                isCancel: (e) => axios.isCancel(e),
+                updateLocation: ((location, replace) => {
+                    console.debug('updateLocation==>', location, replace);
+                    // const history = this.props.history;
+                    // if (location === 'goBack') {
+                    //     return history.goBack();
+                    // } else if (/^https?\:\/\//.test(location)) {
+                    //     return (window.location.href = location);
+                    // }
+                    // history[replace ? 'replace' : 'push'](normalizeLink(location, replace));
+                }),
+                notify: (type, msg) => {
+                    AmisSDK.amis.toast[type]
+                        ? AmisSDK.amis.toast[type](msg, type === 'error' ? '系统错误' : '系统消息')
+                        : console.warn('[Notify]', type, msg);
+                    console.log('[notify]', type, msg);
+                },
+                alert: AmisSDK.amis.alert,
+                confirm: AmisSDK.amis.confirm,
+                // copy: (contents, options = {}) => {
+                //     const ret = copy(contents, options);
+                //     ret && (!options || options.shutup !== true) && toast.info('内容已拷贝到剪切板');
+                //     return ret;
+                // },
+                theme: 'cxd',
+            };
 
-            // 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)
-                    }()
-                );
+            const AmisRender = function (props) {
+                const env = props.env;
+                const schema = props.schema;
+                const data = props.data;
+                return (React.createElement("div", { className: "amis-scope" }, AmisSDK.amis.render(schema, data, Object.assign({}, AmisEnv, env))));
             };
 
-            Builder.registerComponent(Amis, {
+            Builder.registerComponent(AmisRender, {
                 name: 'Amis',
                 inputs: [
                     { name: 'schema', type: 'object' },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-plugin-amis",
-  "version": "2.2.19",
+  "version": "2.2.22",
   "main": "package.service.js",
   "scripts": {},
   "license": "MIT",
@@ -8,5 +8,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "952067d4517fd07335b75c63fec4700f18db73ec"
+  "gitHead": "af4ea8ed034854c8de1ff8b9d5db241183524417"
 }

package/package.service.js

@@ -18,6 +18,7 @@ module.exports = {
 		packageInfo: {
 			path: __dirname,
 			name: this.name,
+			isPackage: false
 		}
 	},