@steedos/service-plugin-amis 2.2.22 → 2.2.23

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

@@ -44,67 +44,26 @@
             });
 
             const AmisEnv = {
-                fetcher: ({url, method, data, config}) => {
-                    console.log('fetcher. url', url);
-                    if(url.startsWith("http") && url.indexOf("://") == -1){
-                        url = decodeURIComponent(url)
+                getModalContainer: ()=>{
+                    let div = document.querySelector("#amisModalContainer");
+                    if(!div){
+                        div = document.createElement('div');
+                        div.className="amis-scope";
+                        div.style.height='0px';
+                        div.id="amisModalContainer";
+                        document.body.appendChild(div)
                     }
-                    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);
+                    return div;
                 },
-                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',
+                theme: 'antd',
             };
 
             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))));
+                const name = props.name;
+                return (React.createElement("div", { className: "amis-scope" }, AmisSDK.AmisRender(schema, {data, name}, Object.assign({}, AmisEnv, env))));
             };
 
             Builder.registerComponent(AmisRender, {
@@ -112,6 +71,7 @@
                 inputs: [
                     { name: 'schema', type: 'object' },
                     { name: 'data', type: 'object' },
+                    { name: 'name', type: 'string' }
                 ]
             });
         });

package/main/default/services/amis-design.service.js

@@ -0,0 +1,128 @@
+/*
+ * @Date: 2022-04-19 11:36:12
+ * @Description: 提供设计器需要的数据接口
+ */
+
+const objectql = require("@steedos/objectql");
+const steedosI18n = require("@steedos/i18n");
+const _ = require("underscore");
+const clone = require("clone");
+
+const ExcludeObjectNames = [
+    'cfs_instances_filerecord',
+    'cfs_files_filerecord',
+    'cms_files', 
+    'chat_messages', 
+    'api_keys', 
+    'object_webhooks_queue', 
+    'users', 
+    'cms_posts',
+];
+
+
+module.exports = {
+    name: "amis-design",
+    mixins: [],
+    /**
+     * Settings
+     */
+    settings: {
+
+    },
+
+    /**
+     * Dependencies
+     */
+    dependencies: [],
+
+    /**
+     * Actions
+     */
+    actions: {
+        getObjects: {
+            rest: {
+                method: "GET",
+                path: "/objects"
+            },
+            async handler(ctx) {
+                return await this.getObjects(ctx);
+            }
+        }
+    },
+
+    /**
+     * Events
+     */
+    events: {
+
+    },
+
+    /**
+     * Methods
+     */
+    methods: {
+        getObjects: {
+            async handler(ctx) {
+                const userSession = ctx.meta.user;
+                const lng = userSession.language || 'zh-CN';
+                const spaceId = userSession.spaceId;
+                const allMetadataObjects = await objectql.getSteedosSchema().getAllObject();
+                const allObjects = _.pluck(clone(allMetadataObjects), 'metadata');
+
+                const query = {
+                    filters: [ ['hidden', '!=', true] , ['name', '<>', ExcludeObjectNames]],
+                    projection: {
+                        name: 1, 
+                        label: 1, 
+                        list_views: 1
+                    }
+                };
+
+                const objects = objectql.getSteedosSchema().metadataDriver.find(allObjects, query, spaceId);
+
+                const dbListViews = await objectql.getObject('object_listviews').directFind({filters: [['shared', '!=', false]]})
+
+                _.each(objects, (object)=>{
+                    if(object && object.name){
+
+                        steedosI18n.translationObject(lng, object.name, object)
+
+                        if(object.list_views && !_.isEmpty(object.list_views)){
+                            _.each(object.list_views, (list_view, name)=>{
+                                list_view.name = name;
+                                list_view._id = list_view._id || list_view.name;
+                                list_view.label = list_view.label || list_view.name;
+                            })
+                            
+                            object.list_views = objectql.getSteedosSchema().metadataDriver.find(_.values(object.list_views), {
+                                projection: {
+                                    _id: 1, 
+                                    name: 1, 
+                                    label: 1
+                                }
+                            }, spaceId);
+                            
+                        }
+
+                        if(_.isEmpty(object.list_views)){
+                            object.list_views = [];
+                        }
+
+                        const objectListViews = objectql.getSteedosSchema().metadataDriver.find(dbListViews, {
+                            filters: [['object_name', '=', object.name],  ['shared', '=', true] ],
+                            fields: "_id, name, label"
+                        }, spaceId);
+
+                        _.each(object.list_views, (listView)=>{
+                            if(!_.find(objectListViews, (dbListView)=>{ return dbListView.name === listView.name})){
+                                objectListViews.push(listView);
+                            }
+                        })
+                        object.list_views = objectListViews;
+                    }
+                })
+                return objects;
+            }
+        }
+    }
+};

package/package.json

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

package/public/amis/amis.css

@@ -1,4 +1,8 @@
-@import '/amis/sdk/sdk.css';
+/* @import '/amis/sdk/sdk.css'; */
+
+@import '/unpkg.com/amis@1.8.0/lib/themes/default.css';
+
+@import '/unpkg.com/amis@1.8.0/lib/themes/antd.css';
 
 
 /* .amis-routes-wrapper{
@@ -6,7 +10,7 @@
 } */
 
 .amis-scope{
-    background: none;
+    background: #ffffff;
 }
 
 .amis-scope svg {