@steedos-widgets/amis-lib 1.1.6 → 1.1.8

package/dist/index.esm.js

@@ -1,7 +1,7 @@
 import * as _$1 from 'lodash';
 import ___default, { isEmpty, isArray, each, find, endsWith, cloneDeep, includes, get, map, keys, sortBy, compact, toArray, mergeWith, isBoolean, omitBy, isNil, isString, slice, defaultsDeep as defaultsDeep$1, isObject as isObject$1, has, filter, startsWith } from 'lodash';
-import isPlainObject from 'lodash/isPlainObject';
 import { Router as Router$1, getSteedosAuth as getSteedosAuth$1, lookupToAmis as lookupToAmis$1, fetchAPI as fetchAPI$1 } from '@steedos-widgets/amis-lib';
+import isPlainObject from 'lodash/isPlainObject';
 
 /*
  * @Author: baozhoutao@steedos.com
@@ -1548,8 +1548,8 @@ const getSchema$3 = async (uiSchema, ctx) => {
 /*
  * @Author: 殷亮辉 yinlianghui@hotoa.com
  * @Date: 2023-03-22 09:31:21
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2023-03-28 14:06:47
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2023-04-06 16:04:20
  */
 const getSchema$2 = (uiSchema)=>{
     return {
@@ -1579,15 +1579,11 @@ const getSchema$2 = (uiSchema)=>{
                                     },
                                     "adaptor": `
                                         if(payload.errors){
-                                            payload.status = 2;
-                                            payload.msg = payload.errors[0].message;
+                                          payload.status = 2;
+                                          payload.msg = window.t ? window.t(payload.errors[0].message) : payload.errors[0].message;
                                         }
                                         return payload;
                                     `,
-                                },
-                                "messages": {
-                                    "success": "删除成功",
-                                    "failed": "删除失败"
                                 }
                               },
                               "actionType": "ajax"
@@ -3294,17 +3290,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 {
@@ -3392,7 +3393,7 @@ function getExportApiRequestAdaptorScript(){
   `
 }
 
-function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false, hiddenCount = false} = {}){
+function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false, hiddenCount = false, headerToolbarItems} = {}){
   const isMobile = window.innerWidth < 768;
   if(isMobile){
     showDisplayAs = false;
@@ -3446,11 +3447,12 @@ function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false,
           }
         }
       },
-      showDisplayAs? getDisplayAsButton() : {}
+      showDisplayAs? getDisplayAsButton(mainObject?.name) : {}
   ]
   }else {
     return [
       // "filter-toggler",
+      ...(headerToolbarItems || []),
       "bulkActions",
       {
         "type": "columns-toggler",
@@ -3526,7 +3528,7 @@ function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false,
           }
         }
       },
-      showDisplayAs? getDisplayAsButton() : {}
+      showDisplayAs? getDisplayAsButton(showDisplayAs) : {}
       // {
       //   "type": "search-box",
       //   "align": "right",
@@ -4118,20 +4120,20 @@ async function lookupToAmisSelect(field, readonly, ctx){
 
     if(referenceTo){
         // 字段值单独走一个请求合并到source的同一个GraphQL接口中
-        const defaultValueOptionsQueryData = await getFindQuery({ name: referenceTo.objectName }, null, {
-            [referenceTo.labelField.name]: Object.assign({}, referenceTo.labelField, {alias: 'label'}),
-            [referenceTo.valueField.name]: Object.assign({}, referenceTo.valueField, {alias: 'value'})
-        }, {
+        const defaultValueOptionsQueryData = await getFindQuery({ name: referenceTo.objectName }, null, [
+            Object.assign({}, referenceTo.labelField, {alias: 'label'}),
+            Object.assign({}, referenceTo.valueField, {alias: 'value'})
+        ], {
             alias: "defaultValueOptions",
             filters: "{__options_filters}",
             count: false
         });
         apiInfo = await getApi$1({
             name: referenceTo.objectName
-        }, null, {
-            [referenceTo.labelField.name]: Object.assign({}, referenceTo.labelField, {alias: 'label'}),
-            [referenceTo.valueField.name]: Object.assign({}, referenceTo.valueField, {alias: 'value'})
-        }, {expand: false, alias: 'options', queryOptions: `filters: {__filters}, top: {__top}, sort: "{__sort}"`, moreQueries: [defaultValueOptionsQueryData.query]});
+        }, null, [
+            Object.assign({}, referenceTo.labelField, {alias: 'label'}),
+            Object.assign({}, referenceTo.valueField, {alias: 'value'})
+        ], {expand: false, alias: 'options', queryOptions: `filters: {__filters}, top: {__top}, sort: "{__sort}"`, moreQueries: [defaultValueOptionsQueryData.query]});
 
         apiInfo.adaptor = `
             const data = payload.data;
@@ -4947,13 +4949,19 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
             };
             break;
         case 'percent':
-            //TODO
-            convertData = {
-                type: getAmisStaticFieldType('number', readonly),
-                min: field.min,
-                max: field.max,
-                precision: field.scale
-            };
+            if(readonly){
+                convertData = {
+                    type: 'static-tpl',
+                    tpl: getUiFieldTpl(field)
+                };
+            }else {
+                convertData = {
+                    type: getAmisStaticFieldType('number', readonly),
+                    min: field.min,
+                    max: field.max,
+                    precision: field.scale
+                };
+            }
             break;
         case 'password':
             convertData = {
@@ -4995,12 +5003,18 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
             break;
         case 'formula':
             if(readonly){
-                convertData.type = getAmisStaticFieldType(field.data_type, readonly);
+                convertData = {
+                    type: 'static-tpl',
+                    tpl: getUiFieldTpl(field)
+                };
             }
             break;
         case 'summary':
             if(readonly){
-                convertData.type = getAmisStaticFieldType(field.data_type, readonly);
+                convertData = {
+                    type: 'static-tpl',
+                    tpl: getUiFieldTpl(field)
+                };
             }
             break;
         case 'code':
@@ -5713,7 +5727,11 @@ async function getObjectCRUD(objectSchema, fields, options){
       }
     }
 
-    bodyProps.headerToolbar = getObjectHeaderToolbar(objectSchema, options.formFactor, {showDisplayAs, hiddenCount: options.queryCount === false});
+    bodyProps.headerToolbar = getObjectHeaderToolbar(objectSchema, options.formFactor, {
+      showDisplayAs, 
+      hiddenCount: options.queryCount === false, 
+      headerToolbarItems: options.headerToolbarItems
+    });
 
 
     let body = null;
@@ -5752,7 +5770,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,
       }, 
@@ -5912,6 +5930,10 @@ async function getObjectForm(objectSchema, ctx){
                   "objectName": "${_master.objectName}"
                 },
                 "expression": `\${_master.objectName != '${objectSchema.name}' && _master.objectName}`
+              },
+              {
+                "args": {},
+                "actionType": "closeDialog"
               }
             ]
           }
@@ -7947,7 +7969,8 @@ async function getListSchema(
         "sort": sort,
         "ctx": ctx,
         "requestAdaptor": listView.requestAdaptor,  
-        "adaptor": listView.adaptor
+        "adaptor": listView.adaptor,
+        "headerToolbarItems": ctx.headerToolbarItems
     };
     return {
         uiSchema,
@@ -8008,6 +8031,7 @@ async function getTableSchema(
         ...ctx,
         filter: ctx.filters,
         sort,
+        headerToolbarItems: ctx.headerToolbarItems,
         buttons: await getListViewItemButtons(uiSchema, ctx)
     });
     return {