@steedos-widgets/amis-object 1.1.4 → 1.1.7

package/dist/amis-object.umd.css

@@ -993,6 +993,10 @@ body {
 #main {
     overflow: hidden;
 }
+
+#steedosPageRoot{
+    overflow: auto;
+}
 .steedos-listview .is-loading .antd-Table-contentWrap {
   height: 50px;
 }

package/dist/amis-object.umd.js

@@ -1933,8 +1933,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 {
@@ -1964,15 +1964,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"
@@ -3777,7 +3773,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;
@@ -3836,6 +3832,7 @@ setTimeout(()=>{
       }else {
         return [
           // "filter-toggler",
+          ...(headerToolbarItems || []),
           "bulkActions",
           {
             "type": "columns-toggler",
@@ -4503,20 +4500,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;
@@ -5332,13 +5329,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 = {
@@ -5380,12 +5383,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':
@@ -6098,7 +6107,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;
@@ -8332,7 +8345,8 @@ setTimeout(()=>{
             "sort": sort,
             "ctx": ctx,
             "requestAdaptor": listView.requestAdaptor,  
-            "adaptor": listView.adaptor
+            "adaptor": listView.adaptor,
+            "headerToolbarItems": ctx.headerToolbarItems
         };
         return {
             uiSchema,
@@ -8393,6 +8407,7 @@ setTimeout(()=>{
             ...ctx,
             filter: ctx.filters,
             sort,
+            headerToolbarItems: ctx.headerToolbarItems,
             buttons: await getListViewItemButtons(uiSchema, ctx)
         });
         return {
@@ -11980,11 +11995,11 @@ setTimeout(()=>{
     }); };
 
     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 = {};
@@ -12065,7 +12080,7 @@ setTimeout(()=>{
                     }
                     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;
@@ -12138,11 +12153,11 @@ setTimeout(()=>{
         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 = {};
@@ -12176,7 +12191,7 @@ setTimeout(()=>{
                     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);