@steedos-widgets/sortable 3.6.2-beta.15 → 3.6.2-beta.16

package/dist/sortable.umd.js

@@ -22717,7 +22717,7 @@
       const formSchema = {
         "type": "service",
         "visibleOn": "this.filterFormSearchableFields && this.filterFormSearchableFields.length",
-        "className": ctx.formFactor === 'SMALL' ? "slds-filters__body p-0 mb-2 overflow-y-auto overflow-x-hidden" : "slds-filters__body p-0 sm:grid sm:gap-2 sm:grid-cols-4 mb-2",
+        "className": ctx.formFactor === 'SMALL' ? "slds-filters__body p-0 mb-2 overflow-y-auto overflow-x-hidden" : "slds-filters__body p-0 sm:grid sm:gap-4 sm:grid-cols-4 p-2",
         "style":{
           "max-height":ctx.formFactor === 'SMALL'?"30vh":"unset"
         },
@@ -23304,7 +23304,7 @@
             "className": "slds-filters"
           },
           "size": "xs",
-          "className": `border-gray-300 border-y slds-grid slds-grid_vertical slds-nowrap ${!ctx.isLookup && "mt-2"}`,
+          "className": `border-y slds-grid slds-grid_vertical slds-nowrap ${!ctx.isLookup && "mt-2"}`,
           "visibleOn": "this.showFieldsFilter",
         },
         "className": "bg-white"
@@ -24265,7 +24265,7 @@
             "icon": "fa fa-cog",
             //TODO: dropdown-button只支持在按钮上方配置提示，对于上方按钮的点击会有影响，为保持统一，暂时去除，等待amis优化，https://github.com/baidu/amis/issues/7330
             // "tooltip": i18next.t('frontend_button_listview_control_tooltip'),
-            "btnClassName": "antd-Button--iconOnly bg-white !p-2 rounded border-gray-300 text-gray-500",
+            "btnClassName": "antd-Button--iconOnly bg-white !p-2 rounded text-gray-500",
             "align": "right",
             "visibleOn": "${!isLookup}",
             "buttons": [
@@ -24310,7 +24310,7 @@
         "icon": "fa fa-table-columns",
         //TODO: dropdown-button只支持在按钮上方配置提示，对于上方按钮的点击会有影响，暂时去除，等待amis优化，https://github.com/baidu/amis/issues/7330
         // "tooltip": `${i18next.t('frontend_display_as')} ${displayAsLabel}`,
-        "btnClassName": "antd-Button--iconOnly bg-white !p-2 rounded border-gray-300 text-gray-500",
+        "btnClassName": "antd-Button--iconOnly bg-white !p-2 rounded text-gray-500",
         "align": "right",
         "visibleOn": "${window:innerWidth > 768 && !!!isLookup}",
         "buttons": [ 
@@ -24503,7 +24503,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         //   //TODO: dropdown-button只支持在按钮上方配置提示，对于上方按钮的点击会有影响，为保持统一，暂时去除，等待amis优化，https://github.com/baidu/amis/issues/7330
         //   // "tooltip": i18next.t('frontend_button_reload_tooltip'),
         //   "tooltipPlacement": "top",
-        //   "className": "bg-white p-2 rounded border-gray-300 text-gray-500",
+        //   "className": "bg-white p-2 rounded text-gray-500",
         //   "label": "",
         //   "icon": "fa fa-sync",
         //   "visibleOn": "${!showFieldsFilter}",
@@ -24527,7 +24527,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
           // "tooltip": i18next.t('frontend_button_reload_tooltip'),
           "tooltip":"",
           "tooltipPlacement": "top",
-          "className": "bg-white p-2 rounded border-gray-300 text-gray-500"
+          "className": "bg-white p-2 rounded text-gray-500"
         };
       }
       else {
@@ -24538,7 +24538,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
           // "tooltip": i18next.t('frontend_button_reload_tooltip'),
           "tooltip":"",
           "tooltipPlacement": "top",
-          "className": "bg-white p-2 rounded border-gray-300 text-gray-500"
+          "className": "bg-white p-2 rounded text-gray-500"
         };
       }
       let toolbarFilter;
@@ -24560,7 +24560,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             "visibleOn": "${isFieldsFilterEmpty == false && isLookup != true}"
           },
           "align": "right",
-          "className": "bg-white p-2 rounded border-gray-300 text-gray-500",
+          "className": "bg-white p-2 rounded text-gray-500",
           "onEvent": {
             "click": {
               "actions": [
@@ -25598,6 +25598,9 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             }
         });
 
+        let listviewFilter = getListViewFilter(listView);
+        let listviewFiltersFunction = listView && listView._filters;
+
         let sort = "";
         if(listView){
             sort = getListViewSort(listView);
@@ -25644,7 +25647,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             Object.assign(api.data.$self, __changedSearchBoxValues, __changedFilterFormValues);
         }
         const selfData = JSON.parse(JSON.stringify(api.data.$self));
-        var filters = [];
+        ${listviewFilter && !ctx.inFilterForm ? `var filters = ${JSON.stringify(listviewFilter)};` : 'var filters = [];'}
         var pageSize = api.data.pageSize || 10;
         var pageNo = api.data.pageNo || 1;
         var skip = (pageNo - 1) * pageSize;
@@ -25706,6 +25709,16 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         }
         
         const inFilterForm = ${ctx.inFilterForm};
+
+        const listviewFiltersFunction = ${listviewFiltersFunction};
+
+        if(listviewFiltersFunction && !inFilterForm){
+            const _filters0 = listviewFiltersFunction(filters, api.data.$self.__super);
+            if(_filters0 && _filters0.length){
+                filters.push(_filters0);
+            }
+        }
+        
         const filtersFunction = ${field.filtersFunction || field._filtersFunction};
 
         if(filtersFunction && !inFilterForm){
@@ -26018,6 +26031,9 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         const refObjectConfig = referenceTo && await getUISchema(referenceTo.objectName);
         let listView = getLookupListView(refObjectConfig);
 
+        let listviewFilter = getListViewFilter(listView);
+        let listviewFiltersFunction = listView && listView._filters;
+
         let sort = "";
         if(listView){
             sort = getListViewSort(listView);
@@ -26047,7 +26063,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         apiInfo.data['rfield'] = `\${object_name}`;
         // [["_id", "=", "$${field.name}._id"],"or",["name", "contains", "$term"]]
         apiInfo.requestAdaptor = `
-        var filters = [];
+        ${listviewFilter && !ctx.inFilterForm ? `var filters = ${JSON.stringify(listviewFilter)};` : 'var filters = [];'}
         var top = 200;
         if(api.data.$term){
             filters = [["${referenceTo?.NAME_FIELD_KEY || 'name'}", "contains", api.data.$term]];
@@ -26070,6 +26086,16 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         }
 
         const inFilterForm = ${ctx.inFilterForm};
+
+        const listviewFiltersFunction = ${listviewFiltersFunction};
+
+        if(listviewFiltersFunction && !inFilterForm){
+            const _filters0 = listviewFiltersFunction(filters, api.data.$);
+            if(_filters0 && _filters0.length){
+                filters.push(_filters0);
+            }
+        }
+        
         const filtersFunction = ${field.filtersFunction || field._filtersFunction};
 
         if(filtersFunction && !inFilterForm){

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos-widgets/sortable",
-  "version": "3.6.2-beta.15",
+  "version": "3.6.2-beta.16",
   "main": "dist/sortable.cjs.js",
   "module": "dist/sortable.esm.js",
   "unpkg": "dist/sortable.umd.js",
@@ -45,7 +45,7 @@
   "dependencies": {
     "@dnd-kit/core": "^6.0.5",
     "@dnd-kit/sortable": "^7.0.1",
-    "@steedos-widgets/amis-lib": "3.6.2-beta.15"
+    "@steedos-widgets/amis-lib": "3.6.2-beta.16"
   },
-  "gitHead": "023e91a473def4edd48e0c5635055118d97f66a1"
+  "gitHead": "c4ae2650334c2ed92c0b2226bd9846c45b39951a"
 }