@steedos-widgets/amis-object 1.3.0-beta.7 → 1.3.0-beta.8

package/dist/amis-object.cjs.css

@@ -45,6 +45,8 @@
     --Nav-Item-maxWidth--tabs: 200px;
     --Crud-toolbar-gap: 2px;
     --DropDown-caret-marginLeft: 0;
+    --Tabs--vertical-width: 180px;
+    --Tabs-link-maxWidth: 180px;
 }
 
 .steedos-header-container .antd-Nav-Menu {
@@ -1192,6 +1194,35 @@ fieldset.antd-Collapse > legend{
     flex-basis: 0;
     flex-grow: 1;
   }
+  .steedos-object-table .antd-Table-footToolbar {
+    border-top: 1px solid #e5e7eb;
+  }
+  .steedos-object-table .antd-Table-footToolbar .antd-Crud-toolbar-item {
+    justify-content: center;
+    width: 100%;
+  }
+  .steedos-object-table .antd-Table-footToolbar .antd-Crud-toolbar-item .antd-Pagination-inputGroup-left {
+    display: none;
+  }
+  .steedos-object-table .antd-Table-footToolbar .antd-Crud-toolbar-item .antd-Pagination-inputGroup-input {
+    min-width: 0;
+    width: 30px;
+  }
+  .steedos-object-table .antd-Table-footToolbar .antd-Crud-toolbar-item .antd-Pagination-inputGroup-right {
+    width: 25px;
+  }
+  body.zoom-large .steedos-object-table .antd-Table-footToolbar {
+    zoom: 90%;
+  }
+  body.zoom-extra-large .steedos-object-table .antd-Table-footToolbar {
+    zoom: 80%;
+  }
+}
+/* 手机屏幕宽度小于380px时隐藏分页器快速跳转*/
+@media (max-width: 380px) {
+  .steedos-object-table .antd-Table-footToolbar .antd-Pagination-inputGroup {
+    display: none;
+  }
 }
 .steedos-object-table .two-lines-truncate {
   white-space: pre-wrap;
@@ -1567,12 +1598,6 @@ fieldset.antd-Collapse > legend{
   height: 100%;
 }
 @media (max-width: 767px) {
-  .steedos-object-table .antd-Table-content {
-    max-height: calc(100vh - 195px);
-  }
-  .steedos-object-listview .antd-Table-content {
-    max-height: calc(100vh - 295px);
-  }
   .steedos-global-footer-root .antd-Nav-Menu-horizontal:after {
     /*手机端底部导航左右间隔不平衡*/
     content: unset;

package/dist/amis-object.cjs.js

@@ -4183,6 +4183,7 @@ var frontend_listview_control_rename_title$1 = "Rename List View";
 var frontend_listview_control_share$1 = "Sharing Settings";
 var frontend_listview_control_sort$1 = "Default sorting rule";
 var frontend_export_excel$1 = "Export Excel";
+var frontend_export_excel_toast$1 = "Exporting, please wait";
 var frontend_operation$1 = "Operation";
 var frontend_import_data$1 = "Import data";
 var frontend_import_data_object_name$1 = "Import object";
@@ -4267,6 +4268,7 @@ var en_us = {
 	frontend_listview_control_share: frontend_listview_control_share$1,
 	frontend_listview_control_sort: frontend_listview_control_sort$1,
 	frontend_export_excel: frontend_export_excel$1,
+	frontend_export_excel_toast: frontend_export_excel_toast$1,
 	frontend_operation: frontend_operation$1,
 	frontend_import_data: frontend_import_data$1,
 	frontend_import_data_object_name: frontend_import_data_object_name$1,
@@ -4353,6 +4355,7 @@ var frontend_listview_control_rename_title = "重命名 列表视图";
 var frontend_listview_control_share = "共享设置";
 var frontend_listview_control_sort = "默认排序规则";
 var frontend_export_excel = "导出";
+var frontend_export_excel_toast = "正在导出,请稍后...";
 var frontend_operation = "操作";
 var frontend_import_data = "导入数据";
 var frontend_import_data_object_name = "导入对象";
@@ -4438,6 +4441,7 @@ var zh_cn = {
 	frontend_listview_control_share: frontend_listview_control_share,
 	frontend_listview_control_sort: frontend_listview_control_sort,
 	frontend_export_excel: frontend_export_excel,
+	frontend_export_excel_toast: frontend_export_excel_toast,
 	frontend_operation: frontend_operation,
 	frontend_import_data: frontend_import_data,
 	frontend_import_data_object_name: frontend_import_data_object_name,
@@ -5643,90 +5647,69 @@ const getSchema$1 = (uiSchema)=>{
 };
 
 const getSchema$6 = async (uiSchema, ctx) => {
-  const requestAdaptor = `
-      // 获取列表视图的属性
-      let uiSchema = api.body.uiSchema;
-      let list_views = uiSchema.list_views;
-      let list_views_name = api.body.listName;
-      let col = list_views[list_views_name].columns;
-      let sort_test = list_views[list_views_name].sort;
-
-      // 获取下载字段
-      let select = [];
-      _.each(col, (col) => {
-          if (col.field == undefined)
-              select.push(col);
-          else select.push(col.field);
-      });
-
-      // 获取排序字段
-
-      let sort = [];
-      _.forEach(sort_test, (sortField) => {
-          if (sortField.field_name == undefined)
-              sort.push(sortField);
-          else sort.push([sortField.field_name, sortField.order]);
-      })
-
-      let orders = [];
-      _.map(sort, (value) => {
-          let order_tmp = [];
-          if (value[1] == "desc")
-              order_tmp = value[0] + ' desc';
-          else
-              order_tmp = value[0];
-          orders.push(order_tmp);
-      });
-      let order = orders.join(',');
-
-      let filename = uiSchema.label + "-" + list_views[list_views_name].label;
-
-      url_tmp = api.url.split('?')[0];
-      api.url = url_tmp + "?$select=" + encodeURIComponent(select.toString()) + "&filename=" + encodeURIComponent(filename);
-
-      // 判断sort 和 filters
-      if (sort.length > 0) {
-          api.url += "&$orderby=" + encodeURIComponent(order);
-      }
-      let filters = list_views[list_views_name].filters;
-      if (filters && filters.length > 0) {
-          api.url = api.url + "&filters=" + encodeURIComponent(JSON.stringify(filters));
-      }
-      return api;
-  `;
+  const requestAdaptor = function () {
+    let uiSchema = api.body.uiSchema;
+    let list_views_name = api.body.listName;
+    let list_views = uiSchema.list_views;
+    const listViewPropsStoreKey = location.pathname + "/crud/query";
+    const query = JSON.parse(sessionStorage.getItem(listViewPropsStoreKey));
+    const { filters, sort, fields: select } = query;
+    let filename = uiSchema.label + "-" + list_views[list_views_name].label;
+
+    var url_tmp = api.url.split('?')[0];
+    api.url = url_tmp + "?$select=" + encodeURIComponent(select.toString()) + "&filename=" + encodeURIComponent(filename);
+    // 判断sort 和 filters
+    if (sort.length > 0) {
+      api.url += "&$orderby=" + encodeURIComponent(sort);
+    }
+    if (filters && filters.length > 0) {
+      api.url = api.url + "&filters=" + encodeURIComponent(JSON.stringify(filters));
+    }
+    return api;
+  };
   return {
     "type": "service",
-    "body": [{
-      "type": "button",
-      "label": instance.t('frontend_export_excel'),
-      "id": "u:standard_export_excel",
-      "level": "default",
-      "onEvent": {
-        "click": {
-          "weight": 0,
-          "actions": [
-            {
-              "args": {
-                "api": {
-                  "url": "${context.rootUrl}/api/record/export/${objectName}",
-                  "method": "get",
-                  "messages": {},
-                  "requestAdaptor": requestAdaptor,
-                  "data": {
-                    "uiSchema": "${uiSchema}",
-                    "listName": "${listName}"
-                  },
-                  "headers": {
-                    "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+    "body": [
+      {
+        "type": "button",
+        "label": instance.t('frontend_export_excel'),
+        "id": "u:standard_export_excel",
+        "level": "default",
+        "disabledTip": instance.t('frontend_export_excel_toast'),
+        "onEvent": {
+          "click": {
+            "weight": 0,
+            "actions": [{
+              "componentId": "u:standard_export_excel",
+              "actionType": "disabled"
+            },
+              {
+                "args": {
+                  "api": {
+                    "url": "${context.rootUrl}/api/record/export/${objectName}",
+                    "method": "get",
+                    "messages": {},
+                    "requestAdaptor": requestAdaptor.toString().match(/function[^{]+\{([\s\S]*)\}$/)[1],
+                    "data": {
+                      "uiSchema": "${uiSchema}",
+                      "listName": "${listName}"
+                    },
+                    "headers": {
+                      "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+                    }
                   }
-                }
+                },
+                "actionType": "download"
               },
-              "actionType": "download"
-            }
-          ]
+              {
+                "componentId": "u:standard_export_excel",
+                "actionType": "enabled"
+              }
+            ]
+          }
         }
       }
-    }]
+    ]
   }
 };
 
@@ -8606,15 +8589,15 @@ function getObjectHeaderToolbar(mainObject, fields, formFactor, {
 
 function getObjectFooterToolbar(mainObject, formFactor, options) {
   if (formFactor === 'SMALL') {
-    return [
-      "load-more",
-    ]
     // return [
-    //   {
-    //     "type": "pagination",
-    //     "maxButtons": 5
-    //   }
+    //   "load-more",
     // ]
+    return [
+      {
+        "type": "pagination",
+        "maxButtons": 5
+      }
+    ]
   }
   else {
     if(options && options.isRelated){
@@ -11207,7 +11190,7 @@ async function getTableColumns$1(fields, options){
  */
 function getMobileLines(tpls){
     let lines = [];
-    let maxLineCount = 2;
+    let maxLineCount = 3;
     let lineChildren = [];
     let isNewLine = false;
     let isLeft = true;
@@ -11225,10 +11208,10 @@ function getMobileLines(tpls){
         }
         if(isLeft){
             // 左侧半行
-            lineChildrenClassName = "steedos-listview-item-left two-lines-truncate";
+            lineChildrenClassName = "steedos-listview-item-left truncate";
             if(item.field.is_wide){
-                // 左侧全行样式可以单独写
-                lineChildrenClassName = "steedos-listview-item-wide two-lines-truncate";
+                // 左侧全行样式可以单独写，如果需要配置两行省略号效果，可以加样式类 two-lines-truncate
+                lineChildrenClassName = "steedos-listview-item-wide";
             }
             if(lines.length === 0){
                 // 第一个字段加粗黑色显示
@@ -11236,7 +11219,7 @@ function getMobileLines(tpls){
             }
         }
         else {
-            // 右侧半行
+            // 右侧半行，这里加样式类 flex flex-shrink-0，是为了省略号只显示在左半行，右半行文字一般比较短，如果也加省略号效果的话，左侧文字多的话，右侧没几个字就显示省略号了
             lineChildrenClassName = "steedos-listview-item-right truncate ml-2 flex flex-shrink-0";
         }
         lineChildren.push({
@@ -11495,6 +11478,7 @@ async function getTableSchema$1(fields, options){
             columns.push(await getTableOperation(options));
         }
     }
+
     return {
         mode: "table",
         name: "thelist",
@@ -11604,9 +11588,9 @@ async function getTableApi(mainObject, fields, options){
                     // 如果是第一次加载组件始终让翻页页码从本地存储中取值
                     let formFactor = "${options.formFactor}";
                     // 移动端不识别本地存储中的翻页页码，否则点击加载更多按钮后无法刷新回第一页
-                    api.data.pageNo = formFactor === "SMALL" ? 1 : (localListViewProps.page || 1);
+                    // api.data.pageNo = formFactor === "SMALL" ? 1 : (localListViewProps.page || 1);
                     // 移动端暂时去除加载更多，放开翻页
-                    // api.data.pageNo = localListViewProps.page || 1;
+                    api.data.pageNo = localListViewProps.page || 1;
                 }
             }
         }
@@ -11727,7 +11711,17 @@ async function getTableApi(mainObject, fields, options){
         api.data = {
             query: api.data.query.replace(/{__filters}/g, JSON.stringify(filters)).replace('{__top}', pageSize).replace('{__skip}', skip).replace('{__sort}', sort.trim())
         }
-        ${options.requestAdaptor || ''}
+        ${options.requestAdaptor || ''};
+
+        //写入本次存储filters、sort
+        const listViewPropsStoreKey = location.pathname + "/crud/query";
+        sessionStorage.setItem(listViewPropsStoreKey, JSON.stringify({
+            filters: filters,
+            sort: sort.trim(),
+            pageSize: pageSize,
+            skip: skip,
+            fields: ${JSON.stringify(___default__namespace.map(fields, 'name'))}
+        }));
         return api;
     `;
     api.adaptor = `
@@ -11806,8 +11800,8 @@ async function getTableApi(mainObject, fields, options){
                 // 如果是第一次加载组件始终让翻页页码从本地存储中取值
                 let formFactor = "${options.formFactor}";
                 // 移动端不识别本地存储中的翻页页码，否则点击加载更多按钮后无法刷新回第一页
-                selfData.page = formFactor === "SMALL" ? 1 : (localListViewProps.page || 1);
-                // selfData.page = localListViewProps.page || 1;
+                // selfData.page = formFactor === "SMALL" ? 1 : (localListViewProps.page || 1);
+                selfData.page = localListViewProps.page || 1;
             }
         }
         delete selfData.context;
@@ -13088,6 +13082,10 @@ async function getObjectCRUD(objectSchema, fields, options){
             }
         }
       `;
+      let autoFillHeight = true;
+      if(options.isRelated || Steedos.isMobile()){
+        autoFillHeight = false;
+      }
 
       body = Object.assign({}, table, {
         type: 'crud', 
@@ -13098,7 +13096,7 @@ async function getObjectCRUD(objectSchema, fields, options){
         keepItemSelectionOnPageChange: true, 
         api: await getTableApi(objectSchema, fields, options),
         hiddenOn: options.tableHiddenOn,
-        autoFillHeight: options.isRelated ? false : true,
+        autoFillHeight,
         className: `flex-auto ${crudClassName || ""}`,
         bodyClassName: "bg-white",
         crudClassName: crudClassName,
@@ -13804,8 +13802,8 @@ async function getRelatedListSchema(
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-05 15:55:39
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-08-17 18:03:51
+ * @LastEditors: liaodaxue
+ * @LastEditTime: 2023-08-25 11:55:15
  * @Description:
  */
 
@@ -14070,7 +14068,7 @@ async function getListSchema(
      * 本次存储代码段
      */
     try {
-      const listViewPropsStoreKey = location.pathname + "/crud/" + (listViewName || "");
+      const listViewPropsStoreKey = location.pathname + "/crud";
       let localListViewProps = sessionStorage.getItem(listViewPropsStoreKey);
       /**
        * localListViewProps规范来自crud请求api中api.data.$self参数值的。
@@ -14092,11 +14090,12 @@ async function getListSchema(
         if(localListViewProps.orderDir){
             listSchema.orderDir = localListViewProps.orderDir;
         }
-        // if(localListViewProps.perPage){
-        //     listSchema.defaultParams = {
-        //         perPage: localListViewProps.perPage
-        //     }
-        // }
+
+        if(localListViewProps.perPage){
+            listSchema.defaultParams = {
+                perPage: localListViewProps.perPage
+            };
+        }
         defaults.listSchema = ___default.defaultsDeep({}, listSchema, defaults.listSchema || {});
       }
     }