@steedos-widgets/amis-object 1.1.7 → 1.1.9

package/dist/amis-object.cjs.css

@@ -297,8 +297,8 @@ body {
 .top-0 {
     top: 0px
 }
-.z-50 {
-    z-index: 50
+.z-10 {
+    z-index: 10
 }
 .col-span-2 {
     grid-column: span 2 / span 2
@@ -840,6 +840,9 @@ body {
     .sm\:p-0 {
         padding: 0px
     }
+    .sm\:p-3 {
+        padding: 0.75rem
+    }
     .sm\:shadow {
         --tw-shadow: 0 1px 3px 0 rgb(0 0 0 / 0.1), 0 1px 2px -1px rgb(0 0 0 / 0.1);
         --tw-shadow-colored: 0 1px 3px 0 var(--tw-shadow-color), 0 1px 2px -1px var(--tw-shadow-color);

package/dist/amis-object.cjs.js

@@ -767,7 +767,7 @@ const Router$1 = {
  * @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: 
  */
 
@@ -962,6 +962,7 @@ async function getFieldTpl (field, options){
         case 'number':
         case 'currency':
             return await getNumberTpl(field);
+        case 'percent':
         case 'formula':
         case 'summary':
             return getUiFieldTpl(field)
@@ -994,7 +995,7 @@ async function getFieldsTemplate(fields, expand){
             if(___default.includes(['time','date','datetime','boolean','number','currency'], field.type)){
                 fieldsName.push(`${field.name}`);
             }
-            if(___default.includes(['time','filesize','date','datetime','boolean','number','currency', 'select', 'file', 'image', 'avatar', 'formula', 'summary', 'object', 'grid'], field.type)){
+            if(___default.includes(['percent','time','filesize','date','datetime','boolean','number','currency', 'select', 'file', 'image', 'avatar', 'formula', 'summary', 'object', 'grid'], field.type)){
                 displayFields.push(`${field.name}`);
             }
         }
@@ -3677,17 +3678,22 @@ async function getObjectRecordDetailRelatedListHeader(relatedObjectSchema, relat
 async function getObjectRelatedListHeader(objectSchema, recordId, relatedObjectName) {
 }
 
-const getDisplayAsButton = function(showDisplayAs){
+const getDisplayAsButton = function(objectName, showDisplayAs){
+  let displayAs = Router$1.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 {
@@ -3829,7 +3835,7 @@ function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false,
           }
         }
       },
-      showDisplayAs? getDisplayAsButton() : {}
+      showDisplayAs? getDisplayAsButton(mainObject?.name) : {}
   ]
   }else {
     return [
@@ -3910,7 +3916,7 @@ function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false,
           }
         }
       },
-      showDisplayAs? getDisplayAsButton() : {}
+      showDisplayAs? getDisplayAsButton(showDisplayAs) : {}
       // {
       //   "type": "search-box",
       //   "align": "right",
@@ -6152,7 +6158,7 @@ async function getObjectCRUD(objectSchema, fields, options){
         keepItemSelectionOnPageChange: true, 
         api: await getTableApi(objectSchema, fields, options),
         hiddenOn: options.tableHiddenOn,
-        autoFillHeight: true,
+        autoFillHeight: options.isRelated ? false : true,
         className: `flex-auto ${crudClassName || ""}`,
         crudClassName: crudClassName,
       }, 
@@ -6312,6 +6318,10 @@ async function getObjectForm(objectSchema, ctx){
                   "objectName": "${_master.objectName}"
                 },
                 "expression": `\${_master.objectName != '${objectSchema.name}' && _master.objectName}`
+              },
+              {
+                "args": {},
+                "actionType": "closeDialog"
               }
             ]
           }
@@ -12240,7 +12250,7 @@ var AmisRecordDetailHeader = function (props) { return __awaiter(void 0, void 0,
     return __generator(this, function (_d) {
         switch (_d.label) {
             case 0:
-                _a = props.className, className = _a === void 0 ? 'sticky top-0 z-50 bg-gray-100 border-b sm:shadow sm:rounded sm:border border-slate-300 p-4' : _a;
+                _a = props.className, className = _a === void 0 ? 'sticky top-0 z-10 bg-gray-100 border-b sm:shadow sm:rounded sm:border border-slate-300 p-4' : _a;
                 return [4 /*yield*/, getUISchema(props.objectApiName || "space_users", false)];
             case 1:
                 objectUiSchema = _d.sent();
@@ -12548,8 +12558,6 @@ var AmisAppLauncher = function (props) { return __awaiter(void 0, void 0, void 0
                                         "items": {
                                             "type": "button",
                                             "level": "link",
-                                            "actionType": "link",
-                                            "link": "${path}",
                                             "body": [{
                                                     "type": "tpl",
                                                     "tpl": "<div class='slds-app-launcher__tile slds-text-link_reset'><div class='slds-app-launcher__tile-figure'><svg class='w-12 h-12 slds-icon slds-icon_container slds-icon-standard-${REPLACE(icon, '_', '-')}' aria-hidden='true'><use xlink:href='/assets/icons/standard-sprite/svg/symbols.svg#${icon}'></use></svg><span class='slds-assistive-text'>${name}</span></div><div class='slds-app-launcher__tile-body'><span class='slds-link text-blue-600 text-lg'><span title='${name}'>${name}</span></span><div style='display: -webkit-box; -webkit-line-clamp: 1;-webkit-box-orient: vertical;overflow: hidden;'><span title='${description}'>${description}</span></div></div></div>",
@@ -12576,6 +12584,21 @@ var AmisAppLauncher = function (props) { return __awaiter(void 0, void 0, void 0
                                                     "actions": [
                                                         {
                                                             "actionType": "closeDialog"
+                                                        },
+                                                        {
+                                                            "actionType": "link",
+                                                            "args": {
+                                                                "link": "${path}"
+                                                            },
+                                                            "expression": "${!blank}"
+                                                        },
+                                                        {
+                                                            "actionType": "url",
+                                                            "args": {
+                                                                "url": "${path}",
+                                                                "blank": true
+                                                            },
+                                                            "expression": "${blank}"
                                                         }
                                                     ]
                                                 }
@@ -13310,14 +13333,14 @@ var PageListView = function (props) { return __awaiter(void 0, void 0, void 0, f
                     "showHeader": true,
                     "showDisplayAs": (defaultFormFactor !== 'SMALL'),
                     "formFactor": formFactor,
-                    "className": (displayAs === 'split') ? 'w-full' : 'p-0 flex-1 sm:m-3 sm:border sm:shadow sm:rounded border-slate-300 border-solid bg-gray-100'
+                    "className": (displayAs === 'split') ? 'w-full' : 'p-0 flex-1 m-0 sm:border sm:shadow sm:rounded border-slate-300 border-solid bg-gray-100'
                 };
                 defData = __assign$2(__assign$2({}, $schema.data), { objectName: objectApiName, listViewId: listViewId, listName: listName || listviewId, appId: appId, formFactor: formFactor, displayAs: displayAs });
                 // console.log("defData====>", defData)
                 return [2 /*return*/, {
                         type: 'service',
                         data: defData,
-                        "className": (displayAs === 'grid') ? 'h-full' : 'p-0 flex flex-1 overflow-hidden h-full',
+                        "className": (displayAs === 'grid') ? 'h-full sm:p-3' : 'p-0 flex flex-1 overflow-hidden h-full',
                         body: (displayAs === 'grid') ? ___default.defaultsDeep({ data: defData }, listSchema) : [
                             {
                                 "type": "wrapper",