@steedos/service-plugin-amis 3.0.0-beta.13 → 3.0.0-beta.131

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

@@ -30,10 +30,7 @@ const draftsApiAdaptor = `
         }
     }
     var instance = payload.inserts[0];
-    var url = Steedos.absoluteUrl("/app/" + FlowRouter.current().params.app_id + "/instances/view/" + instance._id + "?display=" + (Steedos.Page.getDisplay('instances') || '') + "&side_object=instances&side_listview_id=draft");
-    // 这里不可以直接openWindow，因为手机浏览器上打不开新窗口，迁移到下面的afterDrafts脚本中，在custom动作单独执行openWindow才行
-    // Steedos.openWindow(url);
-    // if(!Steedos.isMobile()){ FlowRouter.reload();} 
+    var url = Steedos.absoluteUrl("/app/" + context.app_id + "/instances/view/" + instance._id + "?display=" + (Steedos.Page.getDisplay('instances') || '') + "&side_object=instances&side_listview_id=draft");
     payload.draftUrl = url;
     return payload;
 `;
@@ -41,7 +38,7 @@ const draftsApiAdaptor = `
 const afterDrafts = `
     var url = event.data.draftUrl;
     Steedos.openWindow(url);
-    if(!Steedos.isMobile()){ FlowRouter.reload();} 
+    window.navigate(0);
 `;
 
 amisLib.registerAction('steedos_actions_standard_approve', {
@@ -49,7 +46,7 @@ amisLib.registerAction('steedos_actions_standard_approve', {
         return amisLib.runActions([
             {
                 "actionType": "custom",
-                "script": "var objectName = event.data.objectName || event.data.object_name;const flows = lodash.filter(Creator.object_workflows, (item) => { return item.object_name == objectName && (!item.sync_direction || item.sync_direction == 'both' || item.sync_direction == 'obj_to_ins') })\n\nevent.setData({ ...event.data, ...{ flows: flows, flowCount: flows.length } })\n\n"
+                "script": "var objectName = event.data.objectName || event.data.object_name;const flows = lodash.filter(Steedos.object_workflows, (item) => { return item.object_name == objectName && (!item.sync_direction || item.sync_direction == 'both' || item.sync_direction == 'obj_to_ins') })\n\nevent.setData({ ...event.data, ...{ flows: flows, flowCount: flows.length } })\n\n"
             },
             {
                 "actionType": "ajax",
@@ -132,7 +129,7 @@ amisLib.registerAction('steedos_actions_standard_approve', {
                                                             "url": "${context.rootUrl}/api/object/workflow/drafts",
                                                             "method": "post",
                                                             "requestAdaptor":"api.data = {\n    \'Instances\': [{\n        \'flow\': api.body.flowId,\n        \'applicant\': api.body.context.userId,\n        \'space\': api.body.context.tenantId,\n        \'record_ids\': [{ o: api.body.objectName, ids: [api.body.recordId] }]\n    }]\n}\n\nreturn api;",
-                                                            "adaptor":"\nif (payload.error) { \n  return {\n    status: 2,\n    msg: payload.error\n  }\n}\nconst instance = payload.inserts[0];\nSteedos.openWindow(Steedos.absoluteUrl(\'/app/\' + FlowRouter.current().params.app_id + \'/instances/view/\' + instance._id + \'?display=\' + (Steedos.Page.getDisplay('instances') || '') + \'&side_object=instances&side_listview_id=draft\'))\nFlowRouter.reload();\nreturn payload;",
+                                                            "adaptor":"\nif (payload.error) { \n  return {\n    status: 2,\n    msg: payload.error\n  }\n}\nconst instance = payload.inserts[0];\nSteedos.openWindow(Steedos.absoluteUrl(\'/app/\' + context.app_id + \'/instances/view/\' + instance._id + \'?display=\' + (Steedos.Page.getDisplay('instances') || '') + \'&side_object=instances&side_listview_id=draft\'))\nwindow.navigate(0);\nreturn payload;",
                                                             "messages": {},
                                                             "headers": {
                                                                 "Authorization": "Bearer ${context.tenantId},${context.authToken}"

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

@@ -29,432 +29,8 @@
           
             return true;
           }
-
-        // 加载Amis SDK: 如果直接放到body中会导致 meteor 编译后的 cordova.js 加载报错
-        // let amisSDKScript = document.createElement("script");
-        // amisSDKScript.setAttribute("src", Steedos.absoluteUrl('/unpkg.com/amis/sdk/sdk.js'));
-        // document.getElementsByTagName("head")[0].appendChild(amisSDKScript);
     } catch (error) {
         console.error(error)
     };
 
-    const getAmisLng = ()=>{
-        var locale = Builder.settings.context.user ? Builder.settings.context.user.language : null;
-        if(locale){
-            locale = locale.replace('_', '-');
-            locale = locale === 'en' ? 'en-US' : locale;
-            locale = locale === 'zh' ? 'zh-CN' : locale;
-            locale = locale === 'cn' ? 'zh-CN' : locale;
-            return locale
-        }
-        return 'zh-CN'
-    }
-
-    // 此处不能使用import, client js 编译时会将import 转为require, 导致加载失败
-    // import('/unpkg.com/@steedos-ui/amis/dist/amis-sdk.umd.min.js').then(() => {
-        Promise.all([
-            waitForThing(window, 'assetsLoaded'),
-            waitForThing(window, 'amis'),
-        ]).then(()=>{
-            // window.React = window.__React;
-            // window.ReactDOM = window.__ReactDOM;
-            const AmisRenderers = [];
-            let amis = (window.amisRequire && window.amisRequire('amis')) || window.Amis;
-            let amisVersion = amis && amis.version;
-            if(amisVersion){
-              const amisVersionClassName = "amis-" + amisVersion.split(".")[0] + "-" + amisVersion.split(".")[1];
-              document.getElementsByTagName('body')[0].className += " " + amisVersionClassName;
-            }
-            let amisLib = amisRequire('amis');
-            amisLib.registerFilter('t', function (key,param) {
-              return typeof key === 'string' ? window.t(key,param) : key;
-            });
-            const registerMap = {
-              renderer: amisLib.Renderer,
-              formitem: amisLib.FormItem,
-              options: amisLib.OptionsControl,
-            };
-
-            const amisComps = lodash.filter(Builder.registry['meta-components'], function(item){ return item.componentName && item.amis && item.amis.render});
-            
-            lodash.each(amisComps,(comp)=>{
-                const Component = Builder.components.find(item => item.name === comp.componentName);
-                var type = null;
-                if(comp.amis){
-                  type = comp.amis.render.type
-                }
-                if (Component && !AmisRenderers.includes(type)){
-                    try {
-                        let AmisWrapper = Component.class
-                        AmisRenderers.push(type);
-                        if(comp.componentType === 'amisSchema'){
-                            let amisReact = amisRequire('react');
-                            AmisWrapper = function(props){
-                              // console.log(`AmisWrapper===>`, props)
-                              const { $schema, body, render } = props
-                              const [schema, setSchema] = amisReact.useState(null);
-                              amisReact.useEffect(()=>{
-                                // console.log("AmisWrapper===>==useEffect==", comp.amis.render.type, JSON.stringify(props.data?.recordId))
-                                const result = Component.class(props);
-                                if(result.then && typeof result.then === 'function'){
-                                  result.then((data)=>{
-                                    // console.log("AmisWrapper===>==useEffect==setSchema", data)
-                                    setSchema(data);
-                                  })
-                                }else{
-                                  // console.log("AmisWrapper===>==useEffect==result", result)
-                                  setSchema(result)
-                                }
-                              }, [JSON.stringify($schema)]) //, JSON.stringify(props.data)
-
-                              if (!schema)
-                                return;
-                                // return render('body', {
-                                //   "type": "wrapper",
-                                //   "className": "h-full flex items-center justify-center",
-                                //   "body": {
-                                //     "type": "spinner",
-                                //     "show": true
-                                //   }
-                                // })
-
-                              if (props.env.enableAMISDebug && schema) {
-                                console.groupCollapsed(`[steedos render ${type}]`);
-                                console.trace('Component: ', props, 'Generated Amis Schema: ', schema);
-                                console.groupEnd();
-                              }
-                              return amisReact.createElement(amisReact.Fragment, null, amisReact.createElement(amisReact.Fragment, null, schema && render ? render('body', schema) : ''));
-                            }
-                          }
-                        // 注册amis渲染器
-                        let asset = comp.amis.render;
-                        if (!registerMap[asset.usage]) {
-                          console.error(
-                            `自定义组件注册失败，不存在${asset.usage}自定义组件类型。`, comp
-                          );
-                        } else {
-                          registerMap[asset.usage]({
-                            test: new RegExp(`(^|\/)${asset.type}`),
-                            type: asset.type,
-                            weight: asset.weight,
-                            autoVar: true,
-                          })(AmisWrapper);
-                          // 记录当前创建的amis自定义组件
-                          console.debug('注册了一个自定义amis组件:', {
-                            type: asset.type,
-                            weight: asset.weight,
-                            component: AmisWrapper,
-                            framework: asset.framework,
-                            usage: asset.usage,
-                          });
-                        }
-                        // amisRequire("amis").Renderer(
-                        //     {
-                        //         type: comp.amis?.render.type,
-                        //         weight: comp.amis?.render.weight,
-                        //         autoVar: true,
-                        //     }
-                        // )(AmisWrapper);
-                    } catch(e){console.error(e)}
-                }
-            });
-
-            const normalizeLink = (to, location = window.location) => {
-                to = to || '';
-              
-                if (to && to[0] === '#') {
-                  to = location.pathname + location.search + to;
-                } else if (to && to[0] === '?') {
-                  to = location.pathname + to;
-                }
-              
-                const idx = to.indexOf('?');
-                const idx2 = to.indexOf('#');
-                let pathname = ~idx
-                  ? to.substring(0, idx)
-                  : ~idx2
-                  ? to.substring(0, idx2)
-                  : to;
-                let search = ~idx ? to.substring(idx, ~idx2 ? idx2 : undefined) : '';
-                let hash = ~idx2 ? to.substring(idx2) : location.hash;
-              
-                if (!pathname) {
-                  pathname = location.pathname;
-                } else if (pathname[0] != '/' && !/^https?\:\/\//.test(pathname)) {
-                  let relativeBase = location.pathname;
-                  const paths = relativeBase.split('/');
-                  paths.pop();
-                  let m;
-                  while ((m = /^\.\.?\//.exec(pathname))) {
-                    if (m[0] === '../') {
-                      paths.pop();
-                    }
-                    pathname = pathname.substring(m[0].length);
-                  }
-                  pathname = paths.concat(pathname).join('/');
-                }
-              
-                return pathname + search + hash;
-              };
-            const isCurrentUrl = (to, ctx)=>{
-              try {
-                if (!to) {
-                  return false;
-                }
-                const pathname = window.location.pathname;
-                const link = normalizeLink(to, {
-                  ...location,
-                  pathname,
-                  hash: ''
-                });
-              
-                if (!~link.indexOf('http') && ~link.indexOf(':')) {
-                  let strict = ctx && ctx.strict;
-                  return match(link, {
-                    decode: decodeURIComponent,
-                    strict: typeof strict !== 'undefined' ? strict : true
-                  })(pathname);
-                }
-                return decodeURI(pathname) === link || decodeURI(pathname).startsWith(`${link}/`);
-              } catch (error) {
-                console.error(`error`, error)
-              }
-            }
-            AmisEnv = {
-                // getModalContainer: (props)=>{
-                //     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)
-                //     }
-                //     return div;
-                // },
-                // 如果这里不配置env.notify，那么会走amis 默认的env.notify，它会造成随机把toast组件dom插入到不同的scope容器内（应该是插入到最后一个加载的scope），这在苹果手机上可能会造成弹出的通知z-index不生效的情况，出现通知被档住的问题
-                notify: (type, msg)=>{
-                  var tpl = msg.props && msg.props.schema.tpl;
-                  if(tpl){
-                    SteedosUI.message[type](tpl)
-                  }else if(typeof msg == 'string'){
-                    SteedosUI.message[type](msg)
-                  }else{
-                    console.warn('notify', type, msg)
-                  }
-                },
-                jumpTo: (to, action) => {
-                  if (to === 'goBack') {
-                      return window.history.back();
-                  }
-
-                  to = normalizeLink(to);
-
-                  if (action && action.actionType === 'url') {
-                      action.blank === false ? (window.location.href = to) : window.open(to);
-                      return;
-                  }
-
-                  // 主要是支持 nav 中的跳转
-                  if (action && to && action.target) {
-                      if(Meteor.isCordova && to.indexOf('http') != 0){
-                        window.open(Steedos.absoluteUrl(to), action.target);
-                        return;
-                      }else{
-                        window.open(to, action.target);
-                        return;
-                      }
-                  }
-
-                  if (/^https?:\/\//.test(to)) {
-                      window.location.replace(to);
-                  } else {
-                      FlowRouter.go(to);
-                  }
-                },
-                theme: 'antd',
-                isCurrentUrl: isCurrentUrl,
-                requestAdaptor: (config)=>{
-                    if(config.allowCredentials == false){
-                      config.withCredentials = false;
-                      delete config.allowCredentials
-                    }
-                    // url是相对路径
-                    if(config.url && (!/^http[s]?:\/\//i.test(config.url))){
-                      if(Meteor.isCordova){
-                        config.url = Meteor.absoluteUrl(config.url)
-                      }
-
-                      if(!config.headers){
-                        config.headers = {}
-                      }
-
-                      if(!config.headers.Authorization && Builder.settings.context && Builder.settings.context.tenantId && Builder.settings.context.authToken){
-                        config.headers.Authorization = `Bearer ${Builder.settings.context.tenantId},${Builder.settings.context.authToken}`;
-                      }
-                    }else if(config.url && Meteor.isCordova && Builder.settings.context && Builder.settings.context.rootUrl && config.url.startsWith(Builder.settings.context.rootUrl)){
-                      // 是绝对路径,且是cordova环境, 且以root url开头, 则自动处理认证
-                      if(Meteor.isCordova){
-                        if(!config.headers){
-                          config.headers = {}
-                        }
-              
-                        if(!config.headers.Authorization && Builder.settings.context && Builder.settings.context.tenantId && Builder.settings.context.authToken){
-                          config.headers.Authorization = `Bearer ${Builder.settings.context.tenantId},${Builder.settings.context.authToken}`;
-                        }
-                      }
-                    }
-                    return config;
-                },
-                responseAdaptor: function(api, payload, query, request, response){
-                  if(payload.statusCode === 500 && payload.message){
-                    payload = {
-                      "status": payload.statusCode,
-                      "msg": payload.message
-                    }
-                  }
-                  return payload;
-                }
-            };
-            // 已弃用
-            const AmisRender = function (props) {
-                let env = props.env;
-                const schema = props.schema;
-                const data = props.data;
-                const name = props.name;
-                const refName = schema.name || schema.id;
-                if(SteedosUI.refs[refName]){
-                  if(SteedosUI.refs[refName].unmount){
-                    try {
-                      SteedosUI.refs[refName].unmount()
-                    } catch (Exception) {
-                    }
-                  }else{
-                    console.log(`not find amis scope unmount`)
-                  }
-                }
-
-                if(props.pageType === 'form'){
-                    env = Object.assign({
-                        getModalContainer: ()=>{
-                            return document.querySelector('.amis-scope');
-                        }
-                    }, env);
-                }
-                schema.scopeRef = (ref) => {
-                    try {
-                      if(!window.amisScopes){
-                        window.amisScopes = {};
-                      }
-                      if(name){
-                        window.amisScopes[name] = ref; 
-                      }
-                    } catch (error) {
-                      console.error('error', error)
-                    }
-                    
-                    return scoped = ref
-                  }
-
-                
-                let amisReact = amisRequire('react');
-
-                amisReact.useEffect(()=>{
-                    const amisScope = amisRequire('amis/embed').embed(`.steedos-amis-render-scope-${name}`,schema, {data, name, locale: getAmisLng()}, Object.assign({}, AmisEnv, env))
-                    const refName = schema.name || schema.id;
-                    if(window.SteedosUI && refName){
-                      SteedosUI.refs[refName] = amisScope;
-                    }
-                  }, [])
-                return amisReact.createElement("div", {
-                    className: "amis-scope"
-                  }, amisReact.createElement("div", {
-                    className: `steedos-amis-render-scope-${name}`
-                  }));
-            };
-
-            window.renderAmis = function (root, schema, data, env) {
-              // console.log("===window.renderAmis===root, env===", root, env);
-              // console.log("===window.renderAmis===data===", data);
-              const refName = schema.name || schema.id;
-              if(SteedosUI.refs[refName]){
-                if(SteedosUI.refs[refName].unmount){
-                  try {
-                    SteedosUI.refs[refName].unmount()
-                  } catch (Exception) {
-                  }
-                }else{
-                  console.log(`not find amis scope unmount`)
-                }
-              }
-
-              // if(props.pageType === 'form'){
-              //     env = Object.assign({
-              //         getModalContainer: ()=>{
-              //             return document.querySelector('.amis-scope');
-              //         }
-              //     }, env);
-              // }
-              schema.scopeRef = (ref) => {
-                  try {
-                    if(!window.amisScopes){
-                      window.amisScopes = {};
-                    }
-                    if(name){
-                      window.amisScopes[name] = ref; 
-                    }
-                  } catch (error) {
-                    console.error('error', error)
-                  }
-                  
-                  return scoped = ref
-                }
-
-                const amisScope = amisRequire('amis/embed').embed(root, schema, {data, name, locale: getAmisLng()}, Object.assign({getModalContainer: ()=>{ return document.querySelector('body');}}, AmisEnv, env))
-                if(window.SteedosUI && refName){
-                  SteedosUI.refs[refName] = amisScope;
-                  SteedosUI.refs[refName].__$schema = schema;
-                }
-            };
-
-            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()
-                // }
-
-                return Promise.resolve(true)
-            }
-            //Amis SDK 中已清理了monaco, 所以这里需要提前注册,否则会导致amis code类型报错
-            initMonaco().catch((err)=>{
-                console.error(`Builder.initMonaco error: ${err}`);
-            }).finally(()=>{
-                const language = getAmisLng()
-                axios.get(`/translations/amis/${language}.json`).then((res)=>{
-                    amisRequire("amis").registerLocale(`${language}`, res.data)
-                    Builder.registerComponent(AmisRender, {
-                        name: 'Amis',
-                        inputs: [
-                            { name: 'schema', type: 'object' },
-                            { name: 'data', type: 'object' },
-                            { name: 'name', type: 'string' }
-                        ]
-                    });
-                })
-            });
-        });
-    // });
-
 })();

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

@@ -141,16 +141,19 @@
                     "multiple": false
                   },
                   {
-                    "name": "formula",
-                    "label": "${'action_field_updates.action_field_updates_form.formula' | t}",
-                    "required": false,
-                    "type": "textarea",
-                    "tpl": "<b><%=data.formula%></b>",
+                    "type": "service",
+                    "schemaApi": {
+                      "method": "get",
+                      "url": "${context.rootUrl}/service/api/amis-metadata-objects/objects/${target_object}/fields/options",
+                      "cache": 30000,
+                      "adaptor": "const field = {label: t('action_field_updates.action_field_updates_form.formula')}; const variables = SteedosUI.getFormulaVariables(payload.data.options);\n var fieldSchema={label: field.label, type:'input-formula', name: 'formula', 'evalMode': false, variableMode: 'tabs', variables: variables, labelRemark: field.inlineHelpText, description: field.description } \n return {...payload, data:fieldSchema};",
+                      "trackExpression": "${target_object}",
+                      "sendOn": "${target_object}"
+                    },
+                    "dsType": "api",
+                    "id": "u:508198dbfac7",
                     "className": "col-span-2 m-1",
                     "labelClassName": "text-left",
-                    "clearValueOnHidden": true,
-                    "fieldName": "formula",
-                    "id": "u:20766a86a9f4",
                     "hiddenOn": "this.operation != 'formula'"
                   },
                   {

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

@@ -76,7 +76,6 @@
     ],
     "data": {
         "context": {
-            "rootUrl": "http://127.0.0.1:5800"
         }
     },
     "id": "u:3b0de7e88def",

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

@@ -289,7 +289,7 @@
           }
         },
         "initApiAdaptor": "\nvar data;\nif (recordId) {\n  data = payload.data || { _filters_type_controller: 'conditions' };\n  //数据格式转换\n  if (data) {\n    data.sort = lodash.map(data.sort, (item) => {\n      return item.field_name + \":\" + item.order;\n    });\n    data.searchable_fields = lodash.map(data.searchable_fields, 'field');\n\n    if (data.filters && lodash.isString(data.filters)) {\n      try {\n        data.filters = JSON.parse(data.filters);\n      } catch (e) { }\n    }\n\n    if (data.filters && lodash.isString(data.filters)) {\n      data._filters_type_controller = 'function';\n    } else {\n      data._filters_type_controller = 'conditions'\n    }\n\n    if (data._filters_type_controller === 'conditions') {\n      data._filters_conditions = window.amisConvert.filtersToConditions(data.filters || []);\n    } else {\n      data._filters_function = data.filters;\n    }\n  }\n} else {\n const uiSchema = api.body.uiSchema;\n const contextDefaultData = context && context.data && context.data.defaultData; const defaultData = api.body.defaultData || contextDefaultData;\n  let defaultValues = {};\n _.each(uiSchema && uiSchema.fields, function (field) {\n    var value = SteedosUI.getFieldDefaultValue(field, api.body.global);\n    if (!_.isNil(value)) {\n      defaultValues[field.name] = value;\n    }\n  });\n if (defaultData && _.isObject(defaultData) && !_.isArray(defaultData)) {\n    data = Object.assign({}, defaultValues, defaultData); \n  }else{data = Object.assign({}, defaultValues) } \n}\nfor (key in data) {\n  if (data[key] === null) {\n    delete data[key];\n  }\n}\npayload.data = data;\ndelete payload.extensions; if (data.is_enable != false) { data.is_enable = true; };\nreturn payload;",
-        "apiRequestAdaptor": "delete formData.created;\ndelete formData.created_by;\ndelete formData.modified;\ndelete formData.modified_by;\ndelete formData._display;\n\n//数据格式转换\nformData.sort = lodash.map(formData.sort, (item) => {\n  const arr = item.split(':');\n  return { field_name: arr[0], order: arr[1] };\n});\n\nformData.searchable_fields = lodash.map(formData.searchable_fields, (item) => {\n  return { field: item };\n});\n\nif (!formData._filters_type_controller) {\n  formData._filters_type_controller = 'conditions';\n}\n\nif (formData._filters_type_controller === 'conditions' && formData._filters_conditions) {\n  formData.filters = window.amisConvert.conditionsToFilters(formData._filters_conditions);\n  // formData.filters = JSON.stringify(window.amisConvert.conditionsToFilters(formData._filters_conditions), null, 4);\n} else {\n  formData.filters = formData._filters_function || null;\n}\n\ndelete formData._filters_type_controller;\ndelete formData._filters_conditions;\ndelete formData._filters_function;\n\nquery = `mutation{record: object_listviews__insert(doc: {__saveData}){_id}}`;\nif (formData.recordId) {\n  query = `mutation{record: object_listviews__update(id: \"` + formData._id + `\", doc: {__saveData}){_id}}`;\n};\n__saveData = JSON.stringify(JSON.stringify(formData));\n\napi.data = { query: query.replace('{__saveData}', __saveData) };\nreturn api;",
+        "apiRequestAdaptor": "delete formData.created;\ndelete formData.created_by;\ndelete formData.modified;\ndelete formData.modified_by;\ndelete formData._display;\n\n//数据格式转换\nformData.sort = lodash.map(formData.sort, (item) => {\n  const arr = item.split(':');\n  return { field_name: arr[0], order: arr[1] };\n});\n\nformData.searchable_fields = lodash.map(formData.searchable_fields, (item) => {\n  return { field: item };\n});\n\nif (!formData._filters_type_controller) {\n  formData._filters_type_controller = 'conditions';\n}\n\nif (formData._filters_type_controller === 'conditions' && formData._filters_conditions) {\n  formData.filters = window.amisConvert.conditionsToFilters(formData._filters_conditions);\n  // formData.filters = JSON.stringify(window.amisConvert.conditionsToFilters(formData._filters_conditions), null, 4);\n} else {\n  formData.filters = formData._filters_function || null;\n}\n\ndelete formData._filters_type_controller;\ndelete formData._filters_conditions;\ndelete formData._filters_function;\n\nquery = `mutation{record: object_listviews__insert(doc: {__saveData}){_id}}`;\nif (formData.recordId) {\n  query = `mutation{record: object_listviews__update(id: \"` + api.body.recordId + `\", doc: {__saveData}){_id}}`;\n};\n__saveData = JSON.stringify(JSON.stringify(formData));\n\napi.data = { query: query.replace('{__saveData}', __saveData) };\nreturn api;",
         "id": "u:ce9e3fcc411a"
       }
     ],
@@ -304,16 +304,5 @@
     "initApi": null,
     "initFetch": null,
     "id": "u:6ada123f9d4a",
-    "onEvent": {
-      "init": {
-        "weight": 0,
-        "actions": [
-          {
-            "actionType": "custom",
-            "script": "//初始化时给外层dialog加上类名，使过滤组件popover正常显示\n$('.steedos-object-listview-form-page').closest('.amis-dialog-widget.antd-Modal').addClass('steedos-overflow-visible-dialog');"
-          }
-        ]
-      }
-    },
     "className": "steedos-object-listview-form-page"
 }

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

@@ -302,8 +302,9 @@ module.exports = {
                         fields: 1
                     }
                 };
+                const forceUnHiddenObjectNames = ["cms_files", "tasks", "notes", "events", "instances", "approvals", "process_instance_history",  "audit_records"];
                 let objects = _.map(_.filter((allObjects), (obj)=>{
-                    return obj.hidden != true;
+                    return obj.hidden != true || forceUnHiddenObjectNames.includes(obj.name);
                 }), (obj)=>{
                     return {
                         name: obj.name,

package/main/default/services/metadata/listviews.service.js

@@ -146,7 +146,8 @@ const getDateTimeOperators = (lng)=>{
 }
 
 
-const getFieldOperators = (type, lng)=>{
+const getFieldOperators = (type, lng, ctx = {})=>{
+    let { multiple } = ctx;
     switch (type) {
         case 'text':
             return ['equal', 'not_equal', 'like', 'not_like', 'starts_with', 'ends_with']
@@ -162,6 +163,9 @@ const getFieldOperators = (type, lng)=>{
         case 'lookup':
         case 'master_detail':
         case 'select':
+            if (multiple){
+                return ['select_any_in', 'select_not_any_in']
+            }
             return [ 'select_equals', 'select_not_equals', 'select_any_in', 'select_not_any_in' ]
         default:
             return ;
@@ -169,7 +173,7 @@ const getFieldOperators = (type, lng)=>{
 
 }
 
-const getField = (objectName, fieldName, type, lng)=>{
+const getField = (objectName, fieldName, type, lng, ctx = {})=>{
     let field = null;
     switch (type) {
         case 'textarea':
@@ -195,7 +199,7 @@ const getField = (objectName, fieldName, type, lng)=>{
         case 'date':
             // 华炎魔方中日期字段存的是utc的0点
             field = {
-                type: "date",
+                type: "text",
                 format: "YYYY-MM-DDT00:00:00+00:00",
                 operators: getFieldOperators("date", lng)
             };
@@ -203,7 +207,7 @@ const getField = (objectName, fieldName, type, lng)=>{
         case 'datetime':
             // 即amis中日期时间控件的format默认值为"YYYY-MM-DDTHH:mm+08:00"正好满足需求
             field = {
-                type: "datetime",
+                type: "text",
                 operators: getFieldOperators("datetime", lng)
             };
             break;
@@ -217,6 +221,11 @@ const getField = (objectName, fieldName, type, lng)=>{
             break;
         case 'lookup':
         case 'master_detail':
+            field = {
+                type: 'text',
+                operators: getFieldOperators("select", lng, ctx)
+            };
+            break;
         case 'select':
             field = {
                 type: 'select',
@@ -230,7 +239,7 @@ const getField = (objectName, fieldName, type, lng)=>{
                   }
                 ,
                 searchable: true,
-                operators: getFieldOperators("select", lng)
+                operators: getFieldOperators("select", lng, ctx)
             };
             break;
         case 'boolean':
@@ -361,7 +370,7 @@ module.exports = {
                                 fields.push({
                                     label: field.label,
                                     name: field.name,
-                                    ...getField(objectName, field.name, field.type, lng)
+                                    ...getField(objectName, field.name, field.type, lng, { multiple: field.multiple})
                                 })
                                 break;
                         }

package/main/default/services/utils/page-schema.js

@@ -41,7 +41,7 @@ const getListPageInitSchema = function (objectApiName) {
     return {
         type: 'page',
         name: getScopeId(objectApiName, "list"),
-        bodyClassName: '',
+        bodyClassName: 'p-0',
         regions: [
             "body"
         ],
@@ -88,7 +88,7 @@ const getRecordPageInitSchema = async function (objectApiName, userSession) {
     }
     const content = {
         "type": "tabs",
-        "className": "steedos-record-tabs bg-white p-4 sm:m-2 sm:border sm:rounded",
+        "className": "steedos-record-tabs bg-white p-4 sm:m-4 sm:shadow sm:rounded",
         "tabs": [
             detailed
         ]
@@ -112,7 +112,7 @@ const getRecordPageInitSchema = async function (objectApiName, userSession) {
         name: getScopeId(objectApiName, "record_detail"),
         objectApiName: "${objectName}",
         bodyClassName: '',
-        className: "object-detail-page steedos-record-content overflow-y-auto p-0 m-0 flex-1 h-full bg-gray-100",
+        className: "object-detail-page steedos-record-content overflow-y-auto p-0 m-0 flex-1 h-full",
         regions: [
             "body"
         ],