@steedos-widgets/amis-lib 1.1.6 → 1.1.8

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 }; }
@@ -1574,8 +1574,8 @@
   /*
    * @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 {
@@ -1605,15 +1605,11 @@
                                       },
                                       "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"
@@ -3320,17 +3316,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 {
@@ -3418,7 +3419,7 @@ setTimeout(()=>{
   `
   }
 
-  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;
@@ -3472,11 +3473,12 @@ setTimeout(()=>{
             }
           }
         },
-        showDisplayAs? getDisplayAsButton() : {}
+        showDisplayAs? getDisplayAsButton(mainObject?.name) : {}
     ]
     }else {
       return [
         // "filter-toggler",
+        ...(headerToolbarItems || []),
         "bulkActions",
         {
           "type": "columns-toggler",
@@ -3552,7 +3554,7 @@ setTimeout(()=>{
             }
           }
         },
-        showDisplayAs? getDisplayAsButton() : {}
+        showDisplayAs? getDisplayAsButton(showDisplayAs) : {}
         // {
         //   "type": "search-box",
         //   "align": "right",
@@ -4144,20 +4146,20 @@ setTimeout(()=>{
 
       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;
@@ -4973,13 +4975,19 @@ setTimeout(()=>{
               };
               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 = {
@@ -5021,12 +5029,18 @@ setTimeout(()=>{
               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':
@@ -5739,7 +5753,11 @@ setTimeout(()=>{
         }
       }
 
-      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;
@@ -5778,7 +5796,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,
         }, 
@@ -5938,6 +5956,10 @@ setTimeout(()=>{
                     "objectName": "${_master.objectName}"
                   },
                   "expression": `\${_master.objectName != '${objectSchema.name}' && _master.objectName}`
+                },
+                {
+                  "args": {},
+                  "actionType": "closeDialog"
                 }
               ]
             }
@@ -7973,7 +7995,8 @@ setTimeout(()=>{
           "sort": sort,
           "ctx": ctx,
           "requestAdaptor": listView.requestAdaptor,  
-          "adaptor": listView.adaptor
+          "adaptor": listView.adaptor,
+          "headerToolbarItems": ctx.headerToolbarItems
       };
       return {
           uiSchema,
@@ -8034,6 +8057,7 @@ setTimeout(()=>{
           ...ctx,
           filter: ctx.filters,
           sort,
+          headerToolbarItems: ctx.headerToolbarItems,
           buttons: await getListViewItemButtons(uiSchema, ctx)
       });
       return {