@steedos-widgets/amis-object 1.2.6-beta.13 → 1.2.6-beta.14

package/dist/amis-object.umd.css

@@ -1232,11 +1232,13 @@ body {
   flex-direction: unset !important;
 }
 .steedos-global-footer-popup {
-  height: calc(100vh - 125px);
   width: 100%;
+  top: 54px !important;
+  bottom: 64px;
+  position: fixed;
 }
 .steedos-global-footer-popup .antd-Nav-Menu {
-  height: 101.1%;
+  height: 100%;
   overflow: auto;
   box-shadow: none;
 }
@@ -1261,18 +1263,30 @@ body {
   .steedos-object-listview .antd-Table-content {
     max-height: calc(100vh - 263px);
   }
+  .steedos-global-footer-root .antd-Nav-Menu-horizontal:after {
+    /*手机端底部导航左右间隔不平衡*/
+    content: unset;
+  }
 }
 .steedos-global-footer ul {
   order: unset !important;
 }
 
 .sidebar-wrapper {
-  transition: 0.5s ease translate;
-  translate: -100% 0;
+  transition: 0.5s ease transform;
   will-change: transform;
+  transform: translate(-100%, 0);
+  -webkit-transform: translate(-100%, 0);
+  -moz-transform: translate(-100%, 0);
+  -ms-transform: translate(-100%, 0);
+  -o-transform: translate(-100%, 0);
 }
 body.sidebar-open .sidebar-wrapper {
-  translate: 0 0;
+  transform: translate(0, 0);
+  -webkit-transform: translate(0, 0);
+  -moz-transform: translate(0, 0);
+  -ms-transform: translate(0, 0);
+  -o-transform: translate(0, 0);
 }
 body.sidebar #sidebar {
   margin-top: 50px;

package/dist/amis-object.umd.js

@@ -3290,8 +3290,8 @@
                       },
                       {
                         "type": "dropdown-button",
-                        "className": "",
-                        "label": "\${uiSchema.list_views[listName].label}",
+                        "className": "", 
+                        "label": "\${listName ? uiSchema.list_views[listName].label : uiSchema.list_views[defaultListName].label}",
                         "rightIcon": "fa fa-caret-down",
                         "size": "sm",
                         "hideCaret": true,
@@ -3699,7 +3699,7 @@
         "icon": "fa fa-table-columns",
         "btnClassName": "antd-Button--iconOnly bg-white p-2 rounded border-gray-300 text-gray-500",
         "align": "right",
-        "visibleOn": "${window:innerWidth > 768}",
+        "visibleOn": "${window:innerWidth > 768 && !!!isLookup}",
         "buttons": [ 
           {
             "label": "显示为",
@@ -5040,6 +5040,8 @@ setTimeout(()=>{
                 ...ctx
             });
 
+            pickerSchema.affixHeader = false;
+
             var headerToolbarItems = [];
             const isMobile = window.innerWidth < 768;
             if(referenceTo.objectName === "space_users" && field.reference_to_field === "user" && !isMobile){
@@ -5057,14 +5059,11 @@ setTimeout(()=>{
                 pickerSchema.headerToolbar.push(new_button);
             }
             pickerSchema.footerToolbar = refObjectConfig.enable_tree ? [] : getObjectFooterToolbar();
-            //TODO: 等待放大镜bug修复,if会去掉，始终显示放大镜
-            if(referenceTo.objectName != "space_users" || field.reference_to_field != "user"){
-                if (ctx.filterVisible !== false) {
-                    pickerSchema.filter = await getObjectFilter(refObjectConfig, fields, {
-                        isLookup: true,
-                        ...ctx
-                    });
-                }
+            if (ctx.filterVisible !== false) {
+                pickerSchema.filter = await getObjectFilter(refObjectConfig, fields, {
+                    isLookup: true,
+                    ...ctx
+                });
             }
             pickerSchema.data = Object.assign({}, pickerSchema.data, {
                 "&": "$$",
@@ -5310,8 +5309,10 @@ setTimeout(()=>{
 
         if(referenceTo.objectName === "space_users" && field.reference_to_field === "user"){
             if(ctx.idsDependOn || field.amis){
+                // ids人员点选模式
                 return await lookupToAmisIdsPicker(field, readonly, ctx);
             }
+            // 左侧树右侧人员列表的下拉框模式，不再支持，而是执行下面的lookupToAmisPicker函数弹出选人窗口
             // return await lookupToAmisSelectUser(field, readonly, ctx);
         }
 
@@ -5412,6 +5413,9 @@ setTimeout(()=>{
                 top:  top,
                 ...ctx
             });
+
+            pickerSchema.affixHeader = false;
+
         }
 
         const data = {
@@ -5441,7 +5445,6 @@ setTimeout(()=>{
         if(readonly){
             data.tpl = await getLookupTpl(field, ctx);
         }
-
         return data;
     }
 
@@ -7616,7 +7619,11 @@ setTimeout(()=>{
             filters = systemFilters;
         };
         if(api.data.$self.additionalFilters){
-            userFilters.push(api.data.$self.additionalFilters)
+            if(_.isString(api.data.$self.additionalFilters)){
+                userFilters.push(eval(api.data.$self.additionalFilters))
+            }else{
+                userFilters.push(api.data.$self.additionalFilters)
+            }
         }
 
         if(api.data.$self._isRelated){
@@ -12690,8 +12697,9 @@ setTimeout(()=>{
 
     var AmisObjectListView = function (props) { return __awaiter(void 0, void 0, void 0, function () {
         var $schema, top, perPage, _a, showHeader, data, defaultData, _b, className, crudClassName, _c, showDisplayAs, sideSchema, _e, filterVisible, headerToolbarItems, headerSchema, ctx, listName, defaults, objectApiName, displayAs, formFactor, isMobile, uiSchema, listView, schemaKeys, listSchema, setDataToComponentId, amisSchemaData, listViewId, listViewSchemaProps, serviceData;
-        return __generator(this, function (_f) {
-            switch (_f.label) {
+        var _f;
+        return __generator(this, function (_g) {
+            switch (_g.label) {
                 case 0:
                     // console.time('AmisObjectListView')
                     console.log("AmisObjectListView props", props);
@@ -12724,7 +12732,7 @@ setTimeout(()=>{
                     }
                     return [4 /*yield*/, getUISchema(objectApiName, false)];
                 case 1:
-                    uiSchema = _f.sent();
+                    uiSchema = _g.sent();
                     listView = ___default.find(uiSchema.list_views, function (listView, name) {
                         // 传入listViewName空值则取第一个
                         if (!listName) {
@@ -12788,6 +12796,7 @@ setTimeout(()=>{
                     if (!___default.has(data, 'uiSchema')) {
                         serviceData.uiSchema = uiSchema;
                     }
+                    serviceData.defaultListName = (_f = ___default.first(___default.values(uiSchema.list_views))) === null || _f === void 0 ? void 0 : _f.name;
                     // console.timeEnd('AmisObjectListView')
                     // console.log('serviceData===>', serviceData)
                     // console.log('headerSchema===>', headerSchema)