@steedos-widgets/amis-lib 1.2.7 → 1.2.8

package/dist/index.esm.js

@@ -2596,7 +2596,7 @@ async function getObjectFieldsFilterFormSchema(ctx) {
           return Promise.all(filterFormSearchableFields.map(function (item) {
             const field = _.clone(fields[item]);
             if (
-              !_.includes(
+              field && !_.includes(
                 [
                   "grid",
                   "avatar",
@@ -2643,7 +2643,7 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
     var filterForm = scope.parent.parent.getComponents().find(function(n){
       return n.props.type === "form";
     });
-    filterForm.handleFormSubmit(event)
+    filterForm.handleFormSubmit(event);
     // var filterFormValues = filterForm.getValues();
     // var listView = scope.parent.parent.parent.getComponents().find(function(n){
     //   return n.props.type === "crud";
@@ -2657,6 +2657,28 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
     //   }
     // }
     // listView.handleFilterSubmit(Object.assign({}, removedValues, filterFormValues));
+
+    let isMobile = Steedos.isMobile();
+    if(isMobile){
+      // 手机端点击搜索的时候自动收起搜索栏
+      let resizeWindow = function(){
+        //触发amis crud 高度重算
+        setTimeout(()=>{
+          window.dispatchEvent(new Event("resize"))
+        }, 500);
+      }
+      const filterService = filterForm.context.getComponents().find(function(n){
+        return n.props.type === "service";
+      });
+      filterService.setData({showFieldsFilter: false});
+      resizeWindow();
+      // 使用filterForm.getValues()的话，并不能拿到本地存储中的过滤条件，所以需要从event.data中取。
+      let filterFormValues = event.data;
+      let isFieldsFilterEmpty = SteedosUI.isFilterFormValuesEmpty(filterFormValues);
+      let crud = SteedosUI.getClosestAmisComponentByType(scope, "crud");
+      let crudService = crud && SteedosUI.getClosestAmisComponentByType(crud.context, "service");
+      crudService && crudService.setData({isFieldsFilterEmpty, showFieldsFilter: false});
+    }
   `;
   const onCancelScript = `
     const scope = event.context.scoped;
@@ -2694,7 +2716,13 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
     setTimeout(()=>{
       window.dispatchEvent(new Event("resize"))
     }, 100);
-  `;
+    let isMobile = Steedos.isMobile();
+    if(isMobile){
+      // 手机端移除搜索按钮上的红点
+      let crudService = scope.getComponentById("service_listview_" + event.data.objectName);
+      crudService && crudService.setData({isFieldsFilterEmpty: true, showFieldsFilter: false});
+    }
+    `;
   const dataProviderInited = `
     const objectName = data.objectName;
     const isLookup = data.isLookup;
@@ -2748,7 +2776,15 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
           });
           // 有过滤条件时自动展开搜索栏
           if(!_.isEmpty(omitedEmptyFormValue)){
-            setData({ showFieldsFilter: true });
+            let isMobile = Steedos.isMobile();
+            if(isMobile){
+              // 手机端不展开，只显示搜索按钮上的红点
+              let crudService = SteedosUI.getRef(data.$scopeId).getComponentById("service_listview_" + data.objectName)
+              crudService && crudService.setData({isFieldsFilterEmpty: false});
+            }
+            else{
+              setData({ showFieldsFilter: true });
+            }
           }
         }
       }
@@ -3509,7 +3545,12 @@ let resizeWindow = function(){
     window.dispatchEvent(new Event("resize"))
   }, 500);
 }
+let isMobile = Steedos.isMobile();
 if(filterService.props.data.showFieldsFilter){
+  if(isMobile){
+    // 手机上只能通过取消按钮来关闭搜索栏
+    return;
+  }
   let buttonCancel = SteedosUI.getClosestAmisComponentByType(filterForm.context, "button", { 
     direction: "down", 
     name: "btn_filter_form_cancel" 
@@ -3521,6 +3562,11 @@ if(filterService.props.data.showFieldsFilter){
 else{
   filterService.setData({showFieldsFilter: true});
   resizeWindow();
+  if(isMobile){
+    // 手机端在显示搜索栏时隐藏刷新按钮
+    let crudService = scope.getComponentById("service_listview_" + event.data.objectName);
+    crudService && crudService.setData({showFieldsFilter: true});
+  }
 }
 `;
 
@@ -3606,6 +3652,7 @@ function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false,
         "className": "bg-white p-2 rounded border-gray-300 text-gray-500",
         "label": "",
         "icon": "fa fa-sync",
+        "visibleOn": "${!showFieldsFilter}",
         "onEvent": {
           "click": {
             "actions": [
@@ -3621,6 +3668,15 @@ function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false,
         "label": "",
         "icon": "fa fa-search",
         "type": "button",
+        "badge": {
+          "offsetx": [
+            -2,
+            2
+          ],
+          "size":8,
+          "animation": true,
+          "visibleOn": "${isFieldsFilterEmpty == false}"
+        },
         "align": "right",
         "className": "bg-white p-2 rounded border-gray-300 text-gray-500",
         "onEvent": {
@@ -6721,7 +6777,8 @@ async function getObjectCRUD(objectSchema, fields, options){
         api: await getTableApi(objectSchema, fields, options),
         hiddenOn: options.tableHiddenOn,
         autoFillHeight: options.isRelated ? false : true,
-        className: `flex-auto bg-white ${crudClassName || ""}`,
+        className: `flex-auto ${crudClassName || ""}`,
+        bodyClassName: "bg-white",
         crudClassName: crudClassName,
       }, 
         bodyProps,