@steedos-widgets/amis-object 1.3.0-beta.3 → 1.3.0-beta.5

package/dist/amis-object.cjs.css

@@ -1187,11 +1187,21 @@ fieldset.antd-Collapse > legend{
 .steedos-select-user .antd-Table .antd-SearchBox {
   margin-top: 0;
 }
-@media (max-width: 576px) {
+@media (max-width: 768px) {
   .antd-Crud-toolbar {
     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 .two-lines-truncate {
   white-space: pre-wrap;
@@ -1568,10 +1578,22 @@ fieldset.antd-Collapse > legend{
 }
 @media (max-width: 767px) {
   .steedos-object-table .antd-Table-content {
-    max-height: calc(100vh - 195px);
+    max-height: calc(100vh - 207px);
   }
   .steedos-object-listview .antd-Table-content {
-    max-height: calc(100vh - 295px);
+    max-height: calc(100vh - 305px);
+  }
+  body.zoom-large .steedos-object-table .antd-Table-content {
+    max-height: calc(100vh - 336px);
+  }
+  body.zoom-large .steedos-object-listview .antd-Table-content {
+    max-height: calc(100vh - 432px);
+  }
+  body.zoom-extra-large .steedos-object-table .antd-Table-content {
+    max-height: calc(100vh - 526px);
+  }
+  body.zoom-extra-large .steedos-object-listview .antd-Table-content {
+    max-height: calc(100vh - 622px);
   }
   .steedos-global-footer-root .antd-Nav-Menu-horizontal:after {
     /*手机端底部导航左右间隔不平衡*/

package/dist/amis-object.cjs.js

@@ -5606,7 +5606,7 @@ const getSchema$2 = (uiSchema) => {
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-11-07 17:00:38
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2022-11-07 17:12:20
+ * @LastEditTime: 2023-08-24 16:44:42
  * @Description: 
  */
 
@@ -5626,7 +5626,7 @@ const getSchema$1 = (uiSchema)=>{
                         "componentId": "",
                         "args": {
                           "blank": false,
-                          "url": "/app/${app_id}/${objectName}/view/${_id}"
+                          "url": "/app/${app_id}/${objectName}/view/${_id}?side_object=${objectName}&side_listview_id=${listName}"
                         },
                         "actionType": "link"
                       }
@@ -7212,7 +7212,7 @@ async function getObjectRecordDetailHeader(objectSchema, recordId, options) {
                           "actions": [
                               {
                                   "actionType": "custom",
-                                  "script": "Steedos.goBack()"
+                                  "script": "window.goBack()"
                               }
                           ]
                       }
@@ -8414,7 +8414,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
 
 function getObjectHeaderQuickSearchBox(mainObject, fields, formFactor, { isLookup = false, keywordsSearchBoxName = "__keywords" } = {}){
   const searchableFieldsLabel = [];
-  _.each(fields, function (field) {
+  _.each(mainObject.fields, function (field) {
     if (isFieldQuickSearchable(field, mainObject.NAME_FIELD_KEY)) {
       searchableFieldsLabel.push(field.label);
     }
@@ -8606,8 +8606,14 @@ function getObjectHeaderToolbar(mainObject, fields, formFactor, {
 
 function getObjectFooterToolbar(mainObject, formFactor, options) {
   if (formFactor === 'SMALL') {
+    // return [
+    //   "load-more",
+    // ]
     return [
-      "load-more",
+      {
+        "type": "pagination",
+        "maxButtons": 5
+      }
     ]
   }
   else {
@@ -9006,13 +9012,16 @@ async function lookupToAmisPicker(field, readonly, ctx){
             })){
                 i++;
                 tableFields.push(field);
-                if(isFieldQuickSearchable(field, refObjectConfig.NAME_FIELD_KEY)){
-                    searchableFields.push(field.name);
-                }
             }
         }
     });
 
+    ___default__namespace.each(refObjectConfig.fields, function (field) {
+      if(isFieldQuickSearchable(field, refObjectConfig.NAME_FIELD_KEY)){
+          searchableFields.push(field.name);
+      }
+    });
+
     const fields = {
         [referenceTo.labelField.name]: referenceTo.labelField,
         [referenceTo.valueField.name]: referenceTo.valueField
@@ -11219,7 +11228,7 @@ function getMobileLines(tpls){
             lineChildrenClassName = "steedos-listview-item-left two-lines-truncate";
             if(item.field.is_wide){
                 // 左侧全行样式可以单独写
-                lineChildrenClassName = "steedos-listview-item-wide truncate";
+                lineChildrenClassName = "steedos-listview-item-wide two-lines-truncate";
             }
             if(lines.length === 0){
                 // 第一个字段加粗黑色显示
@@ -11472,6 +11481,7 @@ async function getTableOperation(ctx){
 
 async function getTableSchema$1(fields, options){
     let isLookup = options && options.isLookup;
+    let hiddenColumnOperation = options && options.hiddenColumnOperation;
     if(!options){
         options = {};
     }
@@ -11481,7 +11491,7 @@ async function getTableSchema$1(fields, options){
     }
     else {
         columns = await getTableColumns$1(fields, options);
-        if(!isLookup){
+        if(!isLookup && !hiddenColumnOperation){
             columns.push(await getTableOperation(options));
         }
     }
@@ -11532,7 +11542,7 @@ async function getTableApi(mainObject, fields, options){
         baseFilters = filter;
     }
 
-    ___default__namespace.each(fields, function (field) {
+    ___default__namespace.each(mainObject.fields, function (field) {
         if (isFieldQuickSearchable(field, mainObject.NAME_FIELD_KEY)) {
             searchableFields.push(field.name);
         }
@@ -11593,8 +11603,9 @@ async function getTableApi(mainObject, fields, options){
                     // 所以会把localSearchableFilter中已经存过的页码覆盖
                     // 如果是第一次加载组件始终让翻页页码从本地存储中取值
                     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;
                 }
             }
         }
@@ -11794,7 +11805,8 @@ async function getTableApi(mainObject, fields, options){
                 // 如果是第一次加载组件始终让翻页页码从本地存储中取值
                 let formFactor = "${options.formFactor}";
                 // 移动端不识别本地存储中的翻页页码，否则点击加载更多按钮后无法刷新回第一页
-                selfData.page = formFactor === "SMALL" ? 1 : (localListViewProps.page || 1);
+                // selfData.page = formFactor === "SMALL" ? 1 : (localListViewProps.page || 1);
+                selfData.page = localListViewProps.page || 1;
             }
         }
         delete selfData.context;
@@ -13328,7 +13340,7 @@ async function getObjectDetail(objectSchema, recordId, ctx){
                       //   "blank": false
                       // },
                       "actionType": "custom",
-                      "script": "Steedos.goBack()",
+                      "script": "window.goBack()",
                       "expression": "this.__deletedRecord === true"
                     }
                   ]
@@ -17822,12 +17834,12 @@ var AmisObjectForm = function (props) { return __awaiter(void 0, void 0, void 0,
 }); };
 
 var AmisObjectListView = function (props) { return __awaiter(void 0, void 0, void 0, function () {
-    var $schema, top, perPage, _a, showHeader, data, defaultData, _b, crud, _c, className, crudClassName, _d, showDisplayAs, sideSchema, _f, filterVisible, headerToolbarItems, rowClassNameExpr, headerSchema, ctx, listName, defaults, objectApiName, displayAs, formFactor, isMobile, uiSchema, listView, schemaKeys, listSchema, setDataToComponentId, amisSchemaData, listViewId, listViewSchemaProps, serviceData;
-    var _g;
-    return __generator(this, function (_h) {
-        switch (_h.label) {
+    var $schema, top, perPage, _a, showHeader, data, defaultData, _b, crud, _c, className, crudClassName, _d, showDisplayAs, sideSchema, _f, filterVisible, headerToolbarItems, rowClassNameExpr, _g, hiddenColumnOperation, headerSchema, ctx, listName, defaults, objectApiName, displayAs, formFactor, isMobile, uiSchema, listView, schemaKeys, listSchema, setDataToComponentId, amisSchemaData, listViewId, listViewSchemaProps, serviceData;
+    var _h;
+    return __generator(this, function (_j) {
+        switch (_j.label) {
             case 0:
-                $schema = props.$schema, top = props.top, perPage = props.perPage, _a = props.showHeader, showHeader = _a === void 0 ? true : _a, data = props.data, defaultData = props.defaultData, _b = props.crud, crud = _b === void 0 ? {} : _b, _c = props.className, className = _c === void 0 ? "" : _c, crudClassName = props.crudClassName, _d = props.showDisplayAs, showDisplayAs = _d === void 0 ? false : _d, sideSchema = props.sideSchema, props.columnsTogglable, _f = props.filterVisible, filterVisible = _f === void 0 ? true : _f, headerToolbarItems = props.headerToolbarItems, rowClassNameExpr = props.rowClassNameExpr;
+                $schema = props.$schema, top = props.top, perPage = props.perPage, _a = props.showHeader, showHeader = _a === void 0 ? true : _a, data = props.data, defaultData = props.defaultData, _b = props.crud, crud = _b === void 0 ? {} : _b, _c = props.className, className = _c === void 0 ? "" : _c, crudClassName = props.crudClassName, _d = props.showDisplayAs, showDisplayAs = _d === void 0 ? false : _d, sideSchema = props.sideSchema, props.columnsTogglable, _f = props.filterVisible, filterVisible = _f === void 0 ? true : _f, headerToolbarItems = props.headerToolbarItems, rowClassNameExpr = props.rowClassNameExpr, _g = props.hiddenColumnOperation, hiddenColumnOperation = _g === void 0 ? false : _g;
                 headerSchema = props.headerSchema;
                 ctx = props.ctx;
                 listName = (defaultData === null || defaultData === void 0 ? void 0 : defaultData.listName) || (data === null || data === void 0 ? void 0 : data.listName) || (props === null || props === void 0 ? void 0 : props.listName);
@@ -17856,7 +17868,7 @@ var AmisObjectListView = function (props) { return __awaiter(void 0, void 0, voi
                 }
                 return [4 /*yield*/, getUISchema(objectApiName, false)];
             case 1:
-                uiSchema = _h.sent();
+                uiSchema = _j.sent();
                 listView = ___default.find(uiSchema.list_views, function (listView, name) {
                     // 传入listViewName空值则取第一个
                     if (!listName) {
@@ -17907,7 +17919,7 @@ var AmisObjectListView = function (props) { return __awaiter(void 0, void 0, voi
                 }
                 amisSchemaData = Object.assign({}, data, defaultData);
                 listViewId = (ctx === null || ctx === void 0 ? void 0 : ctx.listViewId) || amisSchemaData.listViewId;
-                listViewSchemaProps = __assign$2(__assign$2({ top: top, perPage: perPage, showHeader: showHeader, defaults: defaults }, ctx), { listViewId: listViewId, setDataToComponentId: setDataToComponentId, filterVisible: filterVisible, showDisplayAs: showDisplayAs, displayAs: displayAs, headerToolbarItems: headerToolbarItems, rowClassNameExpr: rowClassNameExpr });
+                listViewSchemaProps = __assign$2(__assign$2({ top: top, perPage: perPage, showHeader: showHeader, defaults: defaults }, ctx), { listViewId: listViewId, setDataToComponentId: setDataToComponentId, filterVisible: filterVisible, showDisplayAs: showDisplayAs, displayAs: displayAs, headerToolbarItems: headerToolbarItems, rowClassNameExpr: rowClassNameExpr, hiddenColumnOperation: hiddenColumnOperation });
                 if (!headerSchema) {
                     headerSchema = getObjectListHeader$1(uiSchema, listName, ctx);
                 }
@@ -17921,7 +17933,7 @@ var AmisObjectListView = function (props) { return __awaiter(void 0, void 0, voi
                 if (!___default.has(data, 'uiSchema')) {
                     serviceData.uiSchema = uiSchema;
                 }
-                serviceData.defaultListName = listName ? listName : (_g = ___default.first(___default.values(uiSchema.list_views))) === null || _g === void 0 ? void 0 : _g.name;
+                serviceData.defaultListName = listName ? listName : (_h = ___default.first(___default.values(uiSchema.list_views))) === null || _h === void 0 ? void 0 : _h.name;
                 // console.timeEnd('AmisObjectListView')
                 // console.log('serviceData===>', serviceData)
                 // console.log('headerSchema===>', headerSchema)
@@ -19252,7 +19264,7 @@ var AmisGlobalHeader = function (props) { return __awaiter(void 0, void 0, void
                                                     "actions": [
                                                         {
                                                             "actionType": "custom",
-                                                            "script": "Steedos.goBack()"
+                                                            "script": "window.goBack()"
                                                         }
                                                     ]
                                                 }