@steedos-widgets/amis-lib 1.1.6 → 1.1.7

package/dist/index.umd.js

@@ -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"
@@ -3418,7 +3414,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;
@@ -3477,6 +3473,7 @@ setTimeout(()=>{
     }else {
       return [
         // "filter-toggler",
+        ...(headerToolbarItems || []),
         "bulkActions",
         {
           "type": "columns-toggler",
@@ -4144,20 +4141,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 +4970,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 +5024,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 +5748,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;
@@ -7973,7 +7986,8 @@ setTimeout(()=>{
           "sort": sort,
           "ctx": ctx,
           "requestAdaptor": listView.requestAdaptor,  
-          "adaptor": listView.adaptor
+          "adaptor": listView.adaptor,
+          "headerToolbarItems": ctx.headerToolbarItems
       };
       return {
           uiSchema,
@@ -8034,6 +8048,7 @@ setTimeout(()=>{
           ...ctx,
           filter: ctx.filters,
           sort,
+          headerToolbarItems: ctx.headerToolbarItems,
           buttons: await getListViewItemButtons(uiSchema, ctx)
       });
       return {