amis 2.1.1-beta.2 → 2.3.0

package/lib/renderers/Table/HeadCellFilterDropdown.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.1.1-beta.2
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 
@@ -107,6 +107,7 @@ var HeadCellFilterDropDown = /** @class */ (function (_super) {
         });
     };
     HeadCellFilterDropDown.prototype.alterOptions = function (options) {
+        var _this = this;
         var _a = this.props, data = _a.data, filterable = _a.filterable, name = _a.name;
         var filterValue = data && typeof data[name] !== 'undefined' ? data[name] : '';
         options = amisCore.normalizeOptions(options);
@@ -114,10 +115,23 @@ var HeadCellFilterDropDown = /** @class */ (function (_super) {
             options = options.map(function (option) { return (tslib.__assign(tslib.__assign({}, option), { selected: filterValue.split(',').indexOf(option.value) > -1 })); });
         }
         else {
-            options = options.map(function (option) { return (tslib.__assign(tslib.__assign({}, option), { selected: option.value == filterValue })); });
+            options = options.map(function (option) { return (tslib.__assign(tslib.__assign({}, option), { selected: _this.optionComparator(option, filterValue) })); });
         }
         return options;
     };
+    HeadCellFilterDropDown.prototype.optionComparator = function (option, selected) {
+        var filterable = this.props.filterable;
+        /**
+         * 无论是否严格模式，需要考虑CRUD开启syncLocation后，参数值会被转化为string的情况：
+         * 数字类需要特殊处理，如果两边都为数字类时才进行比较，否则不相等，排除 1 == true 这种情况
+         */
+        if (amisCore.isNumeric(option.value)) {
+            return amisCore.isNumeric(selected) ? option.value == selected : false;
+        }
+        return (filterable === null || filterable === void 0 ? void 0 : filterable.strictMode) === true
+            ? option.value === selected
+            : option.value == selected;
+    };
     HeadCellFilterDropDown.prototype.handleClickOutside = function () {
         this.close();
     };

package/lib/renderers/Table/HeadCellSearchDropdown.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.1.1-beta.2
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Table/ItemActionsWrapper.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ITableStore } from 'amis-core';
 import { ClassNamesFn } from 'amis-core';
 export interface ItemActionsProps {

package/lib/renderers/Table/ItemActionsWrapper.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.1.1-beta.2
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Table/TableBody.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.1.1-beta.2
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Table/TableCell.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.1.1-beta.2
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 
@@ -30,13 +30,16 @@ var TableCell = /** @class */ (function (_super) {
     TableCell.prototype.render = function () {
         var _a = this.props, cx = _a.classnames, className = _a.className; _a.classNameExpr; var render = _a.render, _b = _a.style, style = _b === void 0 ? {} : _b, Component = _a.wrapperComponent, column = _a.column, value = _a.value, data = _a.data, children = _a.children, width = _a.width, align = _a.align, innerClassName = _a.innerClassName; _a.label; var tabIndex = _a.tabIndex, onKeyUp = _a.onKeyUp, rowSpan = _a.rowSpan; _a.body; _a.tpl; _a.remark; var prefix = _a.prefix, affix = _a.affix, isHead = _a.isHead; _a.colIndex; var row = _a.row, showBadge = _a.showBadge, itemBadge = _a.itemBadge, rest = tslib.__rest(_a, ["classnames", "className", "classNameExpr", "render", "style", "wrapperComponent", "column", "value", "data", "children", "width", "align", "innerClassName", "label", "tabIndex", "onKeyUp", "rowSpan", "body", "tpl", "remark", "prefix", "affix", "isHead", "colIndex", "row", "showBadge", "itemBadge"]);
         var schema = tslib.__assign(tslib.__assign({}, column), { className: innerClassName, type: (column && column.type) || 'plain' });
+        var canAccessSuperData = (schema === null || schema === void 0 ? void 0 : schema.canAccessSuperData) !== false;
         // 如果本来就是 type 为 button，不要删除，其他情况下都应该删除。
         if (schema.type !== 'button' && schema.type !== 'dropdown-button') {
             delete schema.label;
         }
         var body = children
             ? children
-            : render('field', schema, tslib.__assign(tslib.__assign({}, omit__default["default"](rest, Object.keys(schema))), { inputOnly: true, value: value, data: data }));
+            : render('field', schema, tslib.__assign(tslib.__assign({}, omit__default["default"](rest, Object.keys(schema))), { inputOnly: true, 
+                /** value没有返回值时设置默认值，避免错误获取到父级数据域的值 */
+                value: canAccessSuperData ? value : value !== null && value !== void 0 ? value : '', data: data }));
         if (width) {
             style = tslib.__assign(tslib.__assign({}, style), { width: (style && style.width) || width });
             if (!/%$/.test(String(style.width))) {

package/lib/renderers/Table/TableContent.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.1.1-beta.2
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 
@@ -52,10 +52,12 @@ var TableContent = /** @class */ (function (_super) {
                     columnsGroup.length ? (React__default["default"].createElement("tr", null, columnsGroup.map(function (item, index) {
                         /**
                          * 勾选列和展开列的表头单独成列
-                         * 如果分组列只有一个元素，也要执行表头合并
+                         * 如果分组列只有一个元素且未分组时，也要执行表头合并
                          */
                         return !!~['__checkme', '__expandme'].indexOf(item.has[0].type) ||
-                            (item.has.length === 1 && !/^__/.test(item.has[0].type)) ? (renderHeadCell(item.has[0], {
+                            (item.has.length === 1 &&
+                                !/^__/.test(item.has[0].type) &&
+                                !item.has[0].groupName) ? (renderHeadCell(item.has[0], {
                             'data-index': item.has[0].index,
                             'key': index,
                             'colSpan': item.colSpan,

package/lib/renderers/Table/TableRow.d.ts

@@ -20,7 +20,10 @@ export declare class TableRow extends React.Component<TableRowProps> {
     constructor(props: TableRowProps);
     handleItemClick(e: React.MouseEvent<HTMLTableRowElement>): Promise<void>;
     handleAction(e: React.UIEvent<any>, action: Action, ctx: any): void;
-    handleQuickChange(values: object, saveImmediately?: boolean, savePristine?: boolean, resetOnFailed?: boolean): void;
+    handleQuickChange(values: object, saveImmediately?: boolean, savePristine?: boolean, options?: {
+        resetOnFailed?: boolean;
+        reload?: string;
+    }): void;
     handleChange(value: any, name: string, submit?: boolean, changePristine?: boolean): void;
     render(): JSX.Element | null;
 }

package/lib/renderers/Table/TableRow.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.1.1-beta.2
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 
@@ -62,10 +62,10 @@ var TableRow = /** @class */ (function (_super) {
         var _a = this.props, onAction = _a.onAction, item = _a.item;
         onAction && onAction(e, action, ctx || item.data);
     };
-    TableRow.prototype.handleQuickChange = function (values, saveImmediately, savePristine, resetOnFailed) {
+    TableRow.prototype.handleQuickChange = function (values, saveImmediately, savePristine, options) {
         var _a = this.props, onQuickChange = _a.onQuickChange, item = _a.item;
         onQuickChange &&
-            onQuickChange(item, values, saveImmediately, savePristine, resetOnFailed);
+            onQuickChange(item, values, saveImmediately, savePristine, options);
     };
     TableRow.prototype.handleChange = function (value, name, submit, changePristine) {
         var _a;

package/lib/renderers/Table/exportExcel.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.1.1-beta.2
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 
@@ -34,11 +34,11 @@ var getAbsoluteUrl = (function () {
     };
 })();
 function exportExcel(ExcelJS, props, toolbar) {
-    var _a, _b;
+    var _a, _b, _c, _d;
     return tslib.__awaiter(this, void 0, void 0, function () {
-        var store, env, __, data, columns, rows, tmpStore, filename, res, workbook, worksheet, exportColumnNames, _i, columns_1, column, filteredColumns, firstRowLabels, firstRow, remoteMappingCache, rowIndex, _c, rows_1, row, rowData, sheetRow, columIndex, _d, filteredColumns_1, column, name_1, value, type, imageData, imageDimensions, imageWidth, imageHeight, imageMaxSize, imageMatch, imageExt, imageId, linkURL, e_1, href, linkURL, body, text, absoluteURL, map, source, sourceValue, mapKey, res, viewValue, viewValue, _e, fromNow, _f, format, _g, valueFormat, ISODate, NormalDate, buffer, blob;
-        return tslib.__generator(this, function (_h) {
-            switch (_h.label) {
+        var store, env, __, data, columns, rows, tmpStore, filename, res, _i, _e, key, workbook, worksheet, exportColumnNames, _f, columns_1, column, filteredColumns, firstRowLabels, firstRow, remoteMappingCache, rowIndex, _g, rows_1, row, rowData, sheetRow, columIndex, _h, filteredColumns_1, column, name_1, value, type, imageData, imageDimensions, imageWidth, imageHeight, imageMaxSize, imageMatch, imageExt, imageId, linkURL, e_1, href, linkURL, body, text, absoluteURL, map, source, sourceValue, mapKey, res, viewValue, viewValue, _j, fromNow, _k, format, _l, valueFormat, ISODate, NormalDate, buffer, blob;
+        return tslib.__generator(this, function (_m) {
+            switch (_m.label) {
                 case 0:
                     store = props.store, env = props.env, props.classnames, __ = props.translate, data = props.data;
                     columns = store.exportColumns || [];
@@ -47,16 +47,32 @@ function exportExcel(ExcelJS, props, toolbar) {
                     if (!(typeof toolbar === 'object' && toolbar.api)) return [3 /*break*/, 2];
                     return [4 /*yield*/, env.fetcher(toolbar.api, data)];
                 case 1:
-                    res = _h.sent();
+                    res = _m.sent();
                     if (!res.data) {
                         env.notify('warning', __('placeholder.noData'));
                         return [2 /*return*/];
                     }
+                    /**
+                     * 优先找items和rows，找不到就拿第一个值为数组的字段
+                     * 和CRUD中的处理逻辑保持一致，避免能渲染和导出的不一致
+                     */
                     if (Array.isArray(res.data)) {
                         rows = res.data;
                     }
+                    else if (Array.isArray((_a = res.data) === null || _a === void 0 ? void 0 : _a.rows)) {
+                        rows = res.data.rows;
+                    }
+                    else if (Array.isArray((_b = res.data) === null || _b === void 0 ? void 0 : _b.items)) {
+                        rows = res.data.items;
+                    }
                     else {
-                        rows = res.data.rows || res.data.items;
+                        for (_i = 0, _e = Object.keys(res.data); _i < _e.length; _i++) {
+                            key = _e[_i];
+                            if (res.data.hasOwnProperty(key) && Array.isArray(res.data[key])) {
+                                rows = res.data[key];
+                                break;
+                            }
+                        }
                     }
                     // 因为很多方法是 store 里的，所以需要构建 store 来处理
                     tmpStore = amisCore.TableStore.create(mobxStateTree.getSnapshot(store));
@@ -65,7 +81,7 @@ function exportExcel(ExcelJS, props, toolbar) {
                     return [3 /*break*/, 3];
                 case 2:
                     rows = store.rows;
-                    _h.label = 3;
+                    _m.label = 3;
                 case 3:
                     if (typeof toolbar === 'object' && toolbar.filename) {
                         filename = amisCore.filter(toolbar.filename, data, '| raw');
@@ -87,8 +103,8 @@ function exportExcel(ExcelJS, props, toolbar) {
                     if (toolbar.exportColumns && Array.isArray(toolbar.exportColumns)) {
                         columns = toolbar.exportColumns;
                         // 因为后面列 props 都是从 pristine 里获取，所以这里归一一下
-                        for (_i = 0, columns_1 = columns; _i < columns_1.length; _i++) {
-                            column = columns_1[_i];
+                        for (_f = 0, columns_1 = columns; _f < columns_1.length; _f++) {
+                            column = columns_1[_f];
                             column.pristine = column;
                         }
                     }
@@ -118,20 +134,20 @@ function exportExcel(ExcelJS, props, toolbar) {
                     };
                     remoteMappingCache = {};
                     rowIndex = 1;
-                    _c = 0, rows_1 = rows;
-                    _h.label = 4;
+                    _g = 0, rows_1 = rows;
+                    _m.label = 4;
                 case 4:
-                    if (!(_c < rows_1.length)) return [3 /*break*/, 19];
-                    row = rows_1[_c];
+                    if (!(_g < rows_1.length)) return [3 /*break*/, 19];
+                    row = rows_1[_g];
                     rowData = amisCore.createObject(data, row.data);
                     rowIndex += 1;
                     sheetRow = worksheet.getRow(rowIndex);
                     columIndex = 0;
-                    _d = 0, filteredColumns_1 = filteredColumns;
-                    _h.label = 5;
+                    _h = 0, filteredColumns_1 = filteredColumns;
+                    _m.label = 5;
                 case 5:
-                    if (!(_d < filteredColumns_1.length)) return [3 /*break*/, 18];
-                    column = filteredColumns_1[_d];
+                    if (!(_h < filteredColumns_1.length)) return [3 /*break*/, 18];
+                    column = filteredColumns_1[_h];
                     columIndex += 1;
                     name_1 = column.name;
                     value = amisCore.getVariable(rowData, name_1);
@@ -150,15 +166,15 @@ function exportExcel(ExcelJS, props, toolbar) {
                     }
                     type = column.type || 'plain';
                     if (!((type === 'image' || type === 'static-image') && value)) return [3 /*break*/, 11];
-                    _h.label = 6;
+                    _m.label = 6;
                 case 6:
-                    _h.trys.push([6, 9, , 10]);
+                    _m.trys.push([6, 9, , 10]);
                     return [4 /*yield*/, amisCore.toDataURL(value)];
                 case 7:
-                    imageData = _h.sent();
+                    imageData = _m.sent();
                     return [4 /*yield*/, amisCore.getImageDimensions(imageData)];
                 case 8:
-                    imageDimensions = _h.sent();
+                    imageDimensions = _m.sent();
                     imageWidth = imageDimensions.width;
                     imageHeight = imageDimensions.height;
                     imageMaxSize = 100;
@@ -202,7 +218,7 @@ function exportExcel(ExcelJS, props, toolbar) {
                     });
                     return [3 /*break*/, 10];
                 case 9:
-                    e_1 = _h.sent();
+                    e_1 = _m.sent();
                     console.warn(e_1.stack);
                     return [3 /*break*/, 10];
                 case 10: return [3 /*break*/, 17];
@@ -237,15 +253,15 @@ function exportExcel(ExcelJS, props, toolbar) {
                     return [3 /*break*/, 15];
                 case 13: return [4 /*yield*/, env.fetcher(sourceValue, rowData)];
                 case 14:
-                    res = _h.sent();
+                    res = _m.sent();
                     if (res.data) {
                         remoteMappingCache[mapKey] = res.data;
                         map = res.data;
                     }
-                    _h.label = 15;
+                    _m.label = 15;
                 case 15:
-                    if (typeof value !== 'undefined' && map && ((_a = map[value]) !== null && _a !== void 0 ? _a : map['*'])) {
-                        viewValue = (_b = map[value]) !== null && _b !== void 0 ? _b : (value === true && map['1']
+                    if (typeof value !== 'undefined' && map && ((_c = map[value]) !== null && _c !== void 0 ? _c : map['*'])) {
+                        viewValue = (_d = map[value]) !== null && _d !== void 0 ? _d : (value === true && map['1']
                             ? map['1']
                             : value === false && map['0']
                                 ? map['0']
@@ -259,7 +275,7 @@ function exportExcel(ExcelJS, props, toolbar) {
                 case 16:
                     if (type === 'date' || type === 'static-date') {
                         viewValue = void 0;
-                        _e = column.pristine, fromNow = _e.fromNow, _f = _e.format, format = _f === void 0 ? 'YYYY-MM-DD' : _f, _g = _e.valueFormat, valueFormat = _g === void 0 ? 'X' : _g;
+                        _j = column.pristine, fromNow = _j.fromNow, _k = _j.format, format = _k === void 0 ? 'YYYY-MM-DD' : _k, _l = _j.valueFormat, valueFormat = _l === void 0 ? 'X' : _l;
                         if (value) {
                             ISODate = moment__default["default"](value, moment__default["default"].ISO_8601);
                             NormalDate = moment__default["default"](value, valueFormat);
@@ -284,16 +300,16 @@ function exportExcel(ExcelJS, props, toolbar) {
                             sheetRow.getCell(columIndex).value = value;
                         }
                     }
-                    _h.label = 17;
+                    _m.label = 17;
                 case 17:
-                    _d++;
+                    _h++;
                     return [3 /*break*/, 5];
                 case 18:
-                    _c++;
+                    _g++;
                     return [3 /*break*/, 4];
                 case 19: return [4 /*yield*/, workbook.xlsx.writeBuffer()];
                 case 20:
-                    buffer = _h.sent();
+                    buffer = _m.sent();
                     if (buffer) {
                         blob = new Blob([buffer], {
                             type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'

package/lib/renderers/Table/index.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { IScopedContext } from 'amis-core';
+import { IScopedContext, SchemaExpression } from 'amis-core';
 import { RendererProps } from 'amis-core';
 import { SchemaNode, ActionObject } from 'amis-core';
 import { BadgeObject } from 'amis-ui';
@@ -100,9 +100,16 @@ export declare type TableColumnObject = {
      * 是否唯一, 只有在 inputTable 里面才有用
      */
     unique?: boolean;
+    /**
+     * 表格列单元格是否可以获取父级数据域值，默认为true，该配置对当前列内单元格生效
+     */
+    canAccessSuperData?: boolean;
 };
 export declare type TableColumnWithType = SchemaObject & TableColumnObject;
 export declare type TableColumn = TableColumnWithType | TableColumnObject;
+interface AutoFillHeightObject {
+    height: number;
+}
 /**
  * Table 表格渲染器。
  * 文档：https://baidu.gitee.io/amis/docs/components/table
@@ -173,7 +180,7 @@ export interface TableSchema extends BaseSchema {
     /**
      * 合并单元格配置，配置数字表示从左到右的多少列自动合并单元格。
      */
-    combineNum?: number;
+    combineNum?: number | SchemaExpression;
     /**
      * 合并单元格配置，配置从第几列开始合并。
      */
@@ -202,6 +209,14 @@ export interface TableSchema extends BaseSchema {
      * 开启查询区域，会根据列元素的searchable属性值，自动生成查询条件表单
      */
     autoGenerateFilter?: boolean;
+    /**
+     * 表格是否可以获取父级数据域值，默认为false
+     */
+    canAccessSuperData?: boolean;
+    /**
+     * 表格自动计算高度
+     */
+    autoFillHeight?: boolean | AutoFillHeightObject;
 }
 export interface TableProps extends RendererProps {
     title?: string;
@@ -227,7 +242,7 @@ export interface TableProps extends RendererProps {
     columnsTogglable?: boolean | 'auto';
     affixHeader?: boolean;
     affixColumns?: boolean;
-    combineNum?: number | string;
+    combineNum?: number | SchemaExpression;
     combineFromIndex?: number;
     footable?: boolean | {
         expand?: 'first' | 'all' | 'none';
@@ -244,7 +259,10 @@ export interface TableProps extends RendererProps {
     itemActions?: Array<ActionObject>;
     onSelect: (selectedItems: Array<object>, unSelectedItems: Array<object>) => void;
     onPristineChange?: (data: object, rowIndexe: string) => void;
-    onSave?: (items: Array<object> | object, diff: Array<object> | object, rowIndexes: Array<string> | string, unModifiedItems?: Array<object>, rowOrigins?: Array<object> | object, resetOnFailed?: boolean) => void;
+    onSave?: (items: Array<object> | object, diff: Array<object> | object, rowIndexes: Array<string> | string, unModifiedItems?: Array<object>, rowOrigins?: Array<object> | object, options?: {
+        resetOnFailed?: boolean;
+        reload?: string;
+    }) => void;
     onSaveOrder?: (moved: Array<object>, items: Array<object>) => void;
     onQuery: (values: object) => void;
     onImageEnlarge?: (data: any, target: any) => void;
@@ -258,6 +276,7 @@ export interface TableProps extends RendererProps {
     reUseRow?: boolean;
     itemBadge?: BadgeObject;
     loading?: boolean;
+    autoFillHeight?: boolean | AutoFillHeightObject;
 }
 export declare type ExportExcelToolbar = SchemaNode & {
     api?: SchemaApi;
@@ -310,16 +329,16 @@ export default class Table extends React.Component<TableProps, object> {
     handleAction(e: React.UIEvent<any> | undefined, action: ActionObject, ctx: object): void;
     handleCheck(item: IRow, value: boolean, shift?: boolean): Promise<void>;
     handleCheckAll(): Promise<void>;
-    handleQuickChange(item: IRow, values: object, saveImmediately?: boolean | any, savePristine?: boolean, resetOnFailed?: boolean): void;
+    handleQuickChange(item: IRow, values: object, saveImmediately?: boolean | any, savePristine?: boolean, options?: {
+        resetOnFailed?: boolean;
+        reload?: string;
+    }): void;
     handleSave(): Promise<void>;
     handleSaveOrder(): Promise<void>;
     syncSelected(): void;
     reset(): void;
     bulkUpdate(value: any, items: Array<object>): void;
     getSelected(): any[];
-    /**
-     * 滚动重新定位Table-fixedTop
-     */
     affixDetect(): void;
     updateTableInfo(): void;
     handleOutterScroll(): void;