amis 2.1.1-beta.2 → 2.2.0

package/lib/renderers/QuickEdit.d.ts

@@ -18,6 +18,11 @@ export declare type SchemaQuickEditObject =
      * 接口保存失败后，是否重置组件编辑状态
      */
     resetOnFailed?: boolean;
+    /**
+     * 配置刷新目标，默认就会刷新所属 crud 组件，
+     * 如果不需要，请配置为 "none"
+     */
+    reload?: string;
     /**
      * 是否直接内嵌
      */
@@ -35,6 +40,11 @@ export declare type SchemaQuickEditObject =
      * 接口保存失败后，是否重置组件编辑状态
      */
     resetOnFailed?: boolean;
+    /**
+     * 配置刷新目标，默认就会刷新所属 crud 组件，
+     * 如果不需要，请配置为 "none"
+     */
+    reload?: string;
     /**
      * 是否直接内嵌
      */
@@ -45,6 +55,7 @@ export declare type SchemaQuickEdit = boolean | SchemaQuickEditObject;
 export interface QuickEditConfig {
     saveImmediately?: boolean;
     resetOnFailed?: boolean;
+    reload?: string;
     mode?: 'inline' | 'dialog' | 'popOver' | 'append';
     type?: string;
     body?: any;

package/lib/renderers/QuickEdit.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.1.1-beta.2
+ * amis v2.2.0
  * Copyright 2018-2022 baidu
  */
 
@@ -185,7 +185,7 @@ var HocQuickEdit = function (config) {
             QuickEditComponent.prototype.handleSubmit = function (values) {
                 var _a = this.props, onQuickChange = _a.onQuickChange, quickEdit = _a.quickEdit;
                 this.closeQuickEdit();
-                onQuickChange(values, quickEdit.saveImmediately, false, quickEdit.resetOnFailed);
+                onQuickChange(values, quickEdit.saveImmediately, false, quickEdit);
                 return false;
             };
             QuickEditComponent.prototype.handleInit = function (values) {
@@ -194,7 +194,7 @@ var HocQuickEdit = function (config) {
             };
             QuickEditComponent.prototype.handleChange = function (values) {
                 var _a = this.props, onQuickChange = _a.onQuickChange, quickEdit = _a.quickEdit;
-                onQuickChange(values, quickEdit.saveImmediately, false, quickEdit.resetOnFailed);
+                onQuickChange(values, quickEdit.saveImmediately, false, quickEdit);
             };
             QuickEditComponent.prototype.openQuickEdit = function () {
                 currentOpened = this;

package/lib/renderers/Remark.d.ts

@@ -47,9 +47,9 @@ export declare function filterContents(tooltip: string | undefined | {
     content?: string;
     body?: string;
 }, data: any): string | {
-    children: any;
     title: string;
     content: string | undefined;
+    children?: any;
 } | undefined;
 export interface RemarkProps extends RendererProps, Omit<RemarkSchema, 'type' | 'className'> {
     icon: string;
@@ -65,7 +65,39 @@ declare class Remark extends React.Component<RemarkProps> {
     renderLabel(finalIcon: any, finalLabel: string, cx: ClassNamesFn, shape?: 'circle' | 'square'): JSX.Element;
     render(): JSX.Element;
 }
-declare const _default: (React.ComponentType<any> & import("hoist-non-react-statics").NonReactStatics<React.ComponentType<any>, {}>) & {
+declare const _default: {
+    new (props: Omit<RemarkProps, keyof import("amis-core").ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps): {
+        ref: any;
+        childRef(ref: any): void;
+        getWrappedInstance(): any;
+        render(): JSX.Element;
+        context: any;
+        setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<RemarkProps, keyof import("amis-core").ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
+        forceUpdate(callback?: (() => void) | undefined): void;
+        readonly props: Readonly<Omit<RemarkProps, keyof import("amis-core").ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps> & Readonly<{
+            children?: React.ReactNode;
+        }>;
+        state: Readonly<{}>;
+        refs: {
+            [key: string]: React.ReactInstance;
+        };
+        componentDidMount?(): void;
+        shouldComponentUpdate?(nextProps: Readonly<Omit<RemarkProps, keyof import("amis-core").ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): boolean;
+        componentWillUnmount?(): void;
+        componentDidCatch?(error: Error, errorInfo: React.ErrorInfo): void;
+        getSnapshotBeforeUpdate?(prevProps: Readonly<Omit<RemarkProps, keyof import("amis-core").ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>): any;
+        componentDidUpdate?(prevProps: Readonly<Omit<RemarkProps, keyof import("amis-core").ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>, snapshot?: any): void;
+        componentWillMount?(): void;
+        UNSAFE_componentWillMount?(): void;
+        componentWillReceiveProps?(nextProps: Readonly<Omit<RemarkProps, keyof import("amis-core").ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
+        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Omit<RemarkProps, keyof import("amis-core").ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
+        componentWillUpdate?(nextProps: Readonly<Omit<RemarkProps, keyof import("amis-core").ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
+        UNSAFE_componentWillUpdate?(nextProps: Readonly<Omit<RemarkProps, keyof import("amis-core").ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
+    };
+    displayName: string;
+    contextType: React.Context<string>;
+    ComposedComponent: React.ComponentType<typeof Remark>;
+} & import("hoist-non-react-statics").NonReactStatics<typeof Remark, {}> & {
     ComposedComponent: typeof Remark;
 };
 export default _default;

package/lib/renderers/Remark.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.1.1-beta.2
+ * amis v2.2.0
  * Copyright 2018-2022 baidu
  */
 
@@ -21,17 +21,9 @@ function filterContents(tooltip, data) {
         return amisCore.filter(tooltip, data);
     }
     else if (tooltip) {
-        return tooltip.title
-            ? {
-                children: tooltip === null || tooltip === void 0 ? void 0 : tooltip.children,
-                title: amisCore.filter(tooltip.title, data),
-                content: tooltip.content || tooltip.body
-                    ? amisCore.filter(tooltip.content || tooltip.body || '', data)
-                    : undefined
-            }
-            : tooltip.content || tooltip.body
-                ? amisCore.filter(tooltip.content || tooltip.body || '', data)
-                : undefined;
+        var title = tooltip.title, content = tooltip.content, body = tooltip.body, rest = tslib.__rest(tooltip, ["title", "content", "body"]);
+        return title || content || body
+            ? tslib.__assign(tslib.__assign({}, rest), { title: amisCore.filter(title, data), content: content || body ? amisCore.filter(content || body || '', data) : undefined }) : undefined;
     }
     return tooltip;
 }

package/lib/renderers/SearchBox.js

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

package/lib/renderers/Service.js

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

package/lib/renderers/SparkLine.js

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

package/lib/renderers/Spinner.js

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

package/lib/renderers/Status.js

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

package/lib/renderers/Steps.js

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

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

@@ -3,7 +3,7 @@ import Sortable from 'sortablejs';
 import { RendererProps } from 'amis-core';
 import type { TooltipObject } from 'amis-ui/lib/components/TooltipWrapper';
 import { IColumn } from 'amis-core/lib/store/table';
-import type { IColumnV2 } from 'amis-core/lib/store/table-v2';
+import type { IColumn2 } from 'amis-core/lib/store/table2';
 export interface ColumnTogglerProps extends RendererProps {
     /**
      * 按钮文字
@@ -80,12 +80,12 @@ export interface ColumnTogglerProps extends RendererProps {
     /**
      * 列数据
      */
-    columns: Array<IColumn | IColumnV2>;
+    columns: Array<IColumn | IColumn2>;
     /**
      * 弹窗底部按钮大小
      */
     footerBtnSize?: 'xs' | 'sm' | 'md' | 'lg';
-    activeToggaleColumns: Array<IColumn | IColumnV2>;
+    activeToggaleColumns: Array<IColumn | IColumn2>;
     onColumnToggle: (columns: Array<IColumn>) => void;
     modalContainer?: () => HTMLElement;
 }

package/lib/renderers/Table/ColumnToggler.js

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

package/lib/renderers/Table/HeadCellFilterDropdown.js

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

package/lib/renderers/Table/HeadCellSearchDropdown.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.1.1-beta.2
+ * amis v2.2.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.2.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Table/TableBody.js

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

package/lib/renderers/Table/TableCell.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.1.1-beta.2
+ * amis v2.2.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.2.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.2.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.2.0
  * Copyright 2018-2022 baidu
  */
 

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;