@steedos-widgets/amis-lib 1.1.7 → 1.1.9

package/dist/index.umd.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('lodash'), require('lodash/isPlainObject'), require('@steedos-widgets/amis-lib')) :
-  typeof define === 'function' && define.amd ? define(['exports', 'lodash', 'lodash/isPlainObject', '@steedos-widgets/amis-lib'], factory) :
-  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global["amis-lib"] = {}, global._$1, global.isPlainObject, global.amisLib));
-})(this, (function (exports, _$1, isPlainObject, amisLib) {
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('lodash'), require('@steedos-widgets/amis-lib'), require('lodash/isPlainObject')) :
+  typeof define === 'function' && define.amd ? define(['exports', 'lodash', '@steedos-widgets/amis-lib', 'lodash/isPlainObject'], factory) :
+  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global["amis-lib"] = {}, global._$1, global.amisLib, global.isPlainObject));
+})(this, (function (exports, _$1, amisLib, isPlainObject) {
   const global = window;
 
   function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -406,7 +406,7 @@
    * @Author: baozhoutao@steedos.com
    * @Date: 2022-05-23 09:53:08
    * @LastEditors: baozhoutao@steedos.com
-   * @LastEditTime: 2023-03-09 10:00:44
+   * @LastEditTime: 2023-04-10 11:22:54
    * @Description: 
    */
 
@@ -601,6 +601,7 @@
           case 'number':
           case 'currency':
               return await getNumberTpl(field);
+          case 'percent':
           case 'formula':
           case 'summary':
               return getUiFieldTpl(field)
@@ -633,7 +634,7 @@
               if(_$1.includes(['time','date','datetime','boolean','number','currency'], field.type)){
                   fieldsName.push(`${field.name}`);
               }
-              if(_$1.includes(['time','filesize','date','datetime','boolean','number','currency', 'select', 'file', 'image', 'avatar', 'formula', 'summary', 'object', 'grid'], field.type)){
+              if(_$1.includes(['percent','time','filesize','date','datetime','boolean','number','currency', 'select', 'file', 'image', 'avatar', 'formula', 'summary', 'object', 'grid'], field.type)){
                   displayFields.push(`${field.name}`);
               }
           }
@@ -3316,17 +3317,22 @@
   async function getObjectRelatedListHeader(objectSchema, recordId, relatedObjectName) {
   }
 
-  const getDisplayAsButton = function(showDisplayAs){
+  const getDisplayAsButton = function(objectName, showDisplayAs){
+    let displayAs = amisLib.Router.getTabDisplayAs(objectName);
     let buttons = [
       {
         "type": "button",
         "label": "表格",
-        "onClick": "const url = document.location.pathname + '?display=grid'; props.env.jumpTo(url);"
+        "onClick": "let url = document.location.pathname; var urlSearch = new URLSearchParams(document.location.search); if(urlSearch.get(\"side_object\") && urlSearch.get(\"side_listview_id\")){url=`/app/${props.data.appId}/${urlSearch.get(\"side_object\")}/grid/${urlSearch.get(\"side_listview_id\")}`;}; props.env.jumpTo(url + '?display=grid');",
+        "rightIcon": displayAs != 'split' ? "fa fa-check" : null,
+        "rightIconClassName": "m-l-sm"
       },
       {
         "type": "button",
         "label": "分栏视图",
-        "onClick": "const url = document.location.pathname + '?display=split'; props.env.jumpTo(url);"
+        "onClick": "const url = document.location.pathname + '?display=split'; props.env.jumpTo(url);",
+        "rightIcon": displayAs === 'split' ? "fa fa-check" : null,
+        "rightIconClassName": "m-l-sm"
       }
     ];
     return {
@@ -3468,7 +3474,7 @@ setTimeout(()=>{
             }
           }
         },
-        showDisplayAs? getDisplayAsButton() : {}
+        showDisplayAs? getDisplayAsButton(mainObject?.name) : {}
     ]
     }else {
       return [
@@ -3549,7 +3555,7 @@ setTimeout(()=>{
             }
           }
         },
-        showDisplayAs? getDisplayAsButton() : {}
+        showDisplayAs? getDisplayAsButton(showDisplayAs) : {}
         // {
         //   "type": "search-box",
         //   "align": "right",
@@ -5791,7 +5797,7 @@ setTimeout(()=>{
           keepItemSelectionOnPageChange: true, 
           api: await getTableApi(objectSchema, fields, options),
           hiddenOn: options.tableHiddenOn,
-          autoFillHeight: true,
+          autoFillHeight: options.isRelated ? false : true,
           className: `flex-auto ${crudClassName || ""}`,
           crudClassName: crudClassName,
         }, 
@@ -5951,6 +5957,10 @@ setTimeout(()=>{
                     "objectName": "${_master.objectName}"
                   },
                   "expression": `\${_master.objectName != '${objectSchema.name}' && _master.objectName}`
+                },
+                {
+                  "args": {},
+                  "actionType": "closeDialog"
                 }
               ]
             }