@steedos-widgets/amis-object 1.1.6 → 1.1.7

package/dist/amis-object.cjs.js

@@ -1935,8 +1935,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 {
@@ -1966,15 +1966,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"
@@ -3779,7 +3775,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;
@@ -3838,6 +3834,7 @@ function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false,
   }else {
     return [
       // "filter-toggler",
+      ...(headerToolbarItems || []),
       "bulkActions",
       {
         "type": "columns-toggler",
@@ -4505,20 +4502,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;
@@ -5334,13 +5331,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 = {
@@ -5382,12 +5385,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':
@@ -6100,7 +6109,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;
@@ -8334,7 +8347,8 @@ async function getListSchema(
         "sort": sort,
         "ctx": ctx,
         "requestAdaptor": listView.requestAdaptor,  
-        "adaptor": listView.adaptor
+        "adaptor": listView.adaptor,
+        "headerToolbarItems": ctx.headerToolbarItems
     };
     return {
         uiSchema,
@@ -8395,6 +8409,7 @@ async function getTableSchema(
         ...ctx,
         filter: ctx.filters,
         sort,
+        headerToolbarItems: ctx.headerToolbarItems,
         buttons: await getListViewItemButtons(uiSchema, ctx)
     });
     return {
@@ -11982,11 +11997,11 @@ var AmisObjectForm = function (props) { return __awaiter(void 0, void 0, void 0,
 }); };
 
 var AmisObjectListView = function (props) { return __awaiter(void 0, void 0, void 0, function () {
-    var $schema, top, perPage, _a, showHeader, headerSchema, data, defaultData, _b, className, crudClassName, _c, showDisplayAs, sideSchema, ctx, listName, defaults, objectApiName, displayAs, formFactor, isMobile, objectUiSchema, listView, schemaKeys, listSchema, setDataToComponentId, amisSchemaData, listViewId, schema, amisSchema, uiSchema, body, firstLineSchema, serviceData;
+    var $schema, top, perPage, _a, showHeader, headerSchema, data, defaultData, _b, className, crudClassName, _c, showDisplayAs, sideSchema, headerToolbarItems, ctx, listName, defaults, objectApiName, displayAs, formFactor, isMobile, objectUiSchema, listView, schemaKeys, listSchema, setDataToComponentId, amisSchemaData, listViewId, schema, amisSchema, uiSchema, body, firstLineSchema, serviceData;
     return __generator(this, function (_e) {
         switch (_e.label) {
             case 0:
-                $schema = props.$schema, top = props.top, perPage = props.perPage, _a = props.showHeader, showHeader = _a === void 0 ? true : _a, headerSchema = props.headerSchema, data = props.data, defaultData = props.defaultData, _b = props.className, className = _b === void 0 ? "" : _b, crudClassName = props.crudClassName, _c = props.showDisplayAs, showDisplayAs = _c === void 0 ? false : _c, sideSchema = props.sideSchema, props.columnsTogglable;
+                $schema = props.$schema, top = props.top, perPage = props.perPage, _a = props.showHeader, showHeader = _a === void 0 ? true : _a, headerSchema = props.headerSchema, data = props.data, defaultData = props.defaultData, _b = props.className, className = _b === void 0 ? "" : _b, crudClassName = props.crudClassName, _c = props.showDisplayAs, showDisplayAs = _c === void 0 ? false : _c, sideSchema = props.sideSchema, props.columnsTogglable, headerToolbarItems = props.headerToolbarItems;
                 ctx = props.ctx;
                 listName = (defaultData === null || defaultData === void 0 ? void 0 : defaultData.listName) || (data === null || data === void 0 ? void 0 : data.listName) || (props === null || props === void 0 ? void 0 : props.listName);
                 defaults = {};
@@ -12067,7 +12082,7 @@ var AmisObjectListView = function (props) { return __awaiter(void 0, void 0, voi
                 }
                 amisSchemaData = Object.assign({}, data, defaultData);
                 listViewId = (ctx === null || ctx === void 0 ? void 0 : ctx.listViewId) || amisSchemaData.listViewId;
-                return [4 /*yield*/, getListSchema(amisSchemaData.appId, objectApiName, listName, __assign$2(__assign$2({ top: top, perPage: perPage, showHeader: showHeader, defaults: defaults }, ctx), { listViewId: listViewId, setDataToComponentId: setDataToComponentId, filterVisible: true, showDisplayAs: showDisplayAs, displayAs: displayAs }))];
+                return [4 /*yield*/, getListSchema(amisSchemaData.appId, objectApiName, listName, __assign$2(__assign$2({ top: top, perPage: perPage, showHeader: showHeader, defaults: defaults }, ctx), { listViewId: listViewId, setDataToComponentId: setDataToComponentId, filterVisible: true, showDisplayAs: showDisplayAs, displayAs: displayAs, headerToolbarItems: headerToolbarItems }))];
             case 2:
                 schema = (_e.sent());
                 amisSchema = schema.amisSchema;
@@ -12140,11 +12155,11 @@ function getTableColumns(columns, includedFields, fieldsExtend) {
     return tableColumns;
 }
 var AmisObjectTable = function (props) { return __awaiter(void 0, void 0, void 0, function () {
-    var $schema, filters, filtersFunction, amisCondition, top, headerSchema, includedFields, fieldsExtend, sort, sortField, sortOrder, extraColumns, data, defaultData, _a, formFactor, _b, className, requestAdaptor, adaptor, ctx, columns, defaults, objectApiName, schemaKeys, listSchema, setDataToComponentId, amisFilters, tableFilters, amisSchemaData, appId, amisSchema;
+    var $schema, filters, filtersFunction, amisCondition, top, headerSchema, includedFields, fieldsExtend, sort, sortField, sortOrder, extraColumns, data, defaultData, _a, formFactor, _b, className, requestAdaptor, adaptor, headerToolbarItems, ctx, columns, defaults, objectApiName, schemaKeys, listSchema, setDataToComponentId, amisFilters, tableFilters, amisSchemaData, appId, amisSchema;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0:
-                $schema = props.$schema, filters = props.filters, filtersFunction = props.filtersFunction, amisCondition = props.amisCondition, top = props.top, headerSchema = props.headerSchema, includedFields = props.fields, fieldsExtend = props.fieldsExtend, sort = props.sort, sortField = props.sortField, sortOrder = props.sortOrder, extraColumns = props.extraColumns, data = props.data, defaultData = props.defaultData, _a = props.formFactor, formFactor = _a === void 0 ? window.innerWidth < 768 ? 'SMALL' : 'LARGE' : _a, _b = props.className, className = _b === void 0 ? "" : _b, requestAdaptor = props.requestAdaptor, adaptor = props.adaptor;
+                $schema = props.$schema, filters = props.filters, filtersFunction = props.filtersFunction, amisCondition = props.amisCondition, top = props.top, headerSchema = props.headerSchema, includedFields = props.fields, fieldsExtend = props.fieldsExtend, sort = props.sort, sortField = props.sortField, sortOrder = props.sortOrder, extraColumns = props.extraColumns, data = props.data, defaultData = props.defaultData, _a = props.formFactor, formFactor = _a === void 0 ? window.innerWidth < 768 ? 'SMALL' : 'LARGE' : _a, _b = props.className, className = _b === void 0 ? "" : _b, requestAdaptor = props.requestAdaptor, adaptor = props.adaptor, headerToolbarItems = props.headerToolbarItems;
                 ctx = props.ctx;
                 if (!ctx) {
                     ctx = {};
@@ -12178,7 +12193,7 @@ var AmisObjectTable = function (props) { return __awaiter(void 0, void 0, void 0
                 appId = (data === null || data === void 0 ? void 0 : data.appId) || (defaultData === null || defaultData === void 0 ? void 0 : defaultData.appId);
                 // ctx中值为undefined的属性不能保留，否则会导致 filters等被覆盖。
                 ctx = ___default.pickBy(ctx, function (value) { return value !== undefined; });
-                return [4 /*yield*/, getTableSchema(appId, objectApiName, columns, __assign$2(__assign$2({ filters: tableFilters, filtersFunction: filtersFunction, top: top, sort: sort, sortField: sortField, sortOrder: sortOrder, extraColumns: extraColumns, defaults: defaults }, ctx), { setDataToComponentId: setDataToComponentId, requestAdaptor: requestAdaptor, adaptor: adaptor }))];
+                return [4 /*yield*/, getTableSchema(appId, objectApiName, columns, __assign$2(__assign$2({ filters: tableFilters, filtersFunction: filtersFunction, top: top, sort: sort, sortField: sortField, sortOrder: sortOrder, extraColumns: extraColumns, defaults: defaults }, ctx), { setDataToComponentId: setDataToComponentId, requestAdaptor: requestAdaptor, adaptor: adaptor, headerToolbarItems: headerToolbarItems }))];
             case 1:
                 amisSchema = (_c.sent()).amisSchema;
                 amisSchema.data = Object.assign({}, amisSchema.data, amisSchemaData);