@steedos-widgets/amis-object 1.2.36 → 1.2.38

package/dist/amis-object.cjs.js

@@ -3854,7 +3854,7 @@ async function getFieldsTemplate(fields, display){
     if(displayFields.length > 0){
         return `${fieldsName.join(',')},${expandFieldsQuery},_display:_ui{${displayFields.join(',')}}`;
     }
-    return `${fieldsName.join(' ')},${expandFieldsQuery}`
+    return ___default.trimEnd(`${fieldsName.join(' ')},${expandFieldsQuery}`, ",")
 }
 
 function getRecordPermissionsTemplate(){
@@ -6523,8 +6523,8 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
     }
     if(!event.data.isLookup){
       // 刷新浏览器后，filterFormValues值是空的，只能从本地存储中取出并重置为空值
-      const listViewId = event.data.listViewId;
-      const listViewPropsStoreKey = location.pathname + "/crud/" + (listViewId || "");
+      const listName = event.data.listName;
+      const listViewPropsStoreKey = location.pathname + "/crud/" + (listName || "");
       let localListViewProps = sessionStorage.getItem(listViewPropsStoreKey);
       if(localListViewProps){
         localListViewProps = JSON.parse(localListViewProps);
@@ -6550,13 +6550,13 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
   const dataProviderInited = `
     const objectName = data.objectName;
     const isLookup = data.isLookup;
-    const listViewId = data.listViewId;
+    const listName = data.listName;
     let searchableFieldsStoreKey = location.pathname + "/searchable_fields/";
     if(isLookup){
       searchableFieldsStoreKey += "lookup/" + objectName;
     }
     else{
-      searchableFieldsStoreKey += (listViewId || "");
+      searchableFieldsStoreKey += (listName || "");
     }
     let defaultSearchableFields = sessionStorage.getItem(searchableFieldsStoreKey);
     if(defaultSearchableFields){
@@ -6583,7 +6583,7 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
       setData({ showFieldsFilter: false });
     }
     else{
-      const listViewPropsStoreKey = location.pathname + "/crud/" + (data.listViewId || "");
+      const listViewPropsStoreKey = location.pathname + "/crud/" + (listName || "");
       let localListViewProps = sessionStorage.getItem(listViewPropsStoreKey);
       if(localListViewProps){
         localListViewProps = JSON.parse(localListViewProps);
@@ -6613,7 +6613,6 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
     const listName = data.listName;
     const objectName = data.objectName;
     const isLookup = data.isLookup;
-    const listViewId = data.listViewId;
     const value = data.fields;
     const scope = event.context.scoped;
     // 这里的filterForm不是name为"listview-filter-form"的内部form，而是crud自带的filter form
@@ -6629,7 +6628,7 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
       searchableFieldsStoreKey += "lookup/" + objectName;
     }
     else{
-      searchableFieldsStoreKey += (listViewId || "");
+      searchableFieldsStoreKey += (listName || "");
     }
     sessionStorage.setItem(searchableFieldsStoreKey, value);
 
@@ -6687,7 +6686,7 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
     }
     
     // 列表视图crud支持本地缓存，所以需要进一步清除浏览器本地缓存里面用户在可搜索项中移除的字段值
-    const listViewPropsStoreKey = location.pathname + "/crud/" + (listViewId || "");
+    const listViewPropsStoreKey = location.pathname + "/crud/" + (listName || "");
     let localListViewProps = sessionStorage.getItem(listViewPropsStoreKey);
     if(localListViewProps){
       localListViewProps = JSON.parse(localListViewProps);
@@ -8563,18 +8562,27 @@ function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false,
     
 }
 
-function getObjectFooterToolbar(mainObject, formFactor) {
+function getObjectFooterToolbar(mainObject, formFactor, options) {
   if (formFactor === 'SMALL') {
     return [
       "load-more",
     ]
   }
   else {
-    return [
-      "switch-per-page",
-      "statistics",
-      "pagination"
-    ]
+    if(options && options.isRelated){
+      return [
+        "statistics",
+        "pagination"
+      ]
+
+    }
+    else {
+      return [
+        "switch-per-page",
+        "statistics",
+        "pagination"
+      ]
+    }
   }
 }
 
@@ -11429,8 +11437,8 @@ async function getTableApi(mainObject, fields, options){
         const data = _.cloneDeep(api.data);
         try{
             // TODO: 不应该直接在这里取localStorage，应该从外面传入
-            const listViewId = api.data.listViewId;
-            const listViewPropsStoreKey = location.pathname + "/crud/" + (listViewId || "");
+            const listName = api.data.listName;
+            const listViewPropsStoreKey = location.pathname + "/crud/" + (listName || "");
             let localListViewProps = sessionStorage.getItem(listViewPropsStoreKey);
             if(localListViewProps){
                 localListViewProps = JSON.parse(localListViewProps);
@@ -11630,8 +11638,8 @@ async function getTableApi(mainObject, fields, options){
 
     try{
         // TODO: 不应该直接在这里取localStorage，应该从外面传入
-        const listViewId = api.body.listViewId;
-        const listViewPropsStoreKey = location.pathname + "/crud/" + (listViewId || "");
+        const listName = api.body.listName;
+        const listViewPropsStoreKey = location.pathname + "/crud/" + (listName || "");
         /**
          * localListViewProps规范来自crud请求api中api.data.$self参数值的。
          * 比如：{"perPage":20,"page":1,"__searchable__name":"7","__searchable__between__n1__c":[null,null],"filter":[["name","contains","a"]]}
@@ -12796,6 +12804,7 @@ async function getObjectCRUD(objectSchema, fields, options){
       // headerToolbar: getObjectHeaderToolbar(objectSchema, options.formFactor, {showDisplayAs}),
       headerToolbarClassName: "px-4 py-2 border-gray-300 bg-gray-100 border-solid border-b",
       footerToolbar: getObjectFooterToolbar(objectSchema, options.formFactor, {
+        ...options,
         disableStatistics: options.queryCount === false
       }), 
       filter: options.filterVisible !== false && await getObjectFilter(objectSchema, fields, options),
@@ -13600,7 +13609,7 @@ async function getRelatedListSchema(
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-05 15:55:39
  * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2023-08-01 14:50:23
+ * @LastEditTime: 2023-08-04 12:27:48
  * @Description:
  */
 
@@ -13865,7 +13874,7 @@ async function getListSchema(
      * 本次存储代码段
      */
     try {
-      const listViewPropsStoreKey = location.pathname + "/crud/" + (ctx.listViewId || "");
+      const listViewPropsStoreKey = location.pathname + "/crud/" + (listViewName || "");
       let localListViewProps = sessionStorage.getItem(listViewPropsStoreKey);
       /**
        * localListViewProps规范来自crud请求api中api.data.$self参数值的。