amis 2.8.0 → 3.0.0

package/lib/renderers/QuickEdit.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 
@@ -10,9 +10,10 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var tslib = require('tslib');
 var React = require('react');
 var ReactDOM = require('react-dom');
+var amisCore = require('amis-core');
 var hoistNonReactStatic = require('hoist-non-react-statics');
 var keycode = require('keycode');
-var amisCore = require('amis-core');
+var omit = require('lodash/omit');
 var amisUi = require('amis-ui');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -20,6 +21,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var hoistNonReactStatic__default = /*#__PURE__*/_interopDefaultLegacy(hoistNonReactStatic);
 var keycode__default = /*#__PURE__*/_interopDefaultLegacy(keycode);
+var omit__default = /*#__PURE__*/_interopDefaultLegacy(omit);
 
 /**
  * @file scoped.jsx.
@@ -240,7 +242,17 @@ var HocQuickEdit = function (config) {
                     };
                 }
                 else if (quickEdit) {
-                    if (quickEdit.body &&
+                    if (quickEdit === null || quickEdit === void 0 ? void 0 : quickEdit.isFormMode) {
+                        schema = {
+                            mode: 'normal',
+                            type: 'form',
+                            wrapWithPanel: false,
+                            body: [
+                                tslib.__assign(tslib.__assign({}, omit__default["default"](quickEdit, 'isFormMode')), { label: false })
+                            ]
+                        };
+                    }
+                    else if (quickEdit.body &&
                         !~['combo', 'group', 'panel', 'fieldSet', 'fieldset'].indexOf(quickEdit.type)) {
                         schema = tslib.__assign(tslib.__assign({ title: '', autoFocus: quickEdit.mode !== 'inline' }, quickEdit), { mode: 'normal', type: 'form' });
                     }
@@ -257,8 +269,10 @@ var HocQuickEdit = function (config) {
                         };
                     }
                 }
+                var isline = quickEdit.mode === 'inline';
+                var isFormMode = quickEdit === null || quickEdit === void 0 ? void 0 : quickEdit.isFormMode;
                 if (schema) {
-                    schema = tslib.__assign(tslib.__assign({}, schema), { wrapWithPanel: quickEdit.mode !== 'inline', actions: quickEdit.mode === 'inline'
+                    schema = tslib.__assign(tslib.__assign({}, schema), { wrapWithPanel: !(isline || isFormMode), actions: isline || isFormMode
                             ? []
                             : [
                                 {
@@ -304,16 +318,19 @@ var HocQuickEdit = function (config) {
                     React__default["default"].createElement(amisCore.PopOver, { classPrefix: ns, className: cx("".concat(ns, "QuickEdit-popover"), quickEdit.popOverClassName), onHide: this.closeQuickEdit, overlay: true }, content)));
             };
             QuickEditComponent.prototype.render = function () {
-                var _a = this.props, onQuickChange = _a.onQuickChange, quickEdit = _a.quickEdit, quickEditEnabled = _a.quickEditEnabled, className = _a.className, cx = _a.classnames, render = _a.render, noHoc = _a.noHoc, canAccessSuperData = _a.canAccessSuperData, disabled = _a.disabled, readOnly = _a.readOnly;
+                var _a = this.props, onQuickChange = _a.onQuickChange, quickEdit = _a.quickEdit, quickEditEnabled = _a.quickEditEnabled, className = _a.className, cx = _a.classnames, render = _a.render, noHoc = _a.noHoc, canAccessSuperData = _a.canAccessSuperData, disabled = _a.disabled;
                 if (!quickEdit ||
                     !onQuickChange ||
-                    quickEditEnabled === false ||
-                    noHoc ||
-                    disabled ||
-                    readOnly) {
+                    (!(typeof quickEdit === 'object' && (quickEdit === null || quickEdit === void 0 ? void 0 : quickEdit.isQuickEditFormMode)) &&
+                        quickEditEnabled === false) ||
+                    noHoc
+                // 此处的readOnly会导致组件值无法传递出去，如 value: "${a + b}" 这样的 value 变化需要同步到数据域
+                // || readOnly
+                ) {
                     return React__default["default"].createElement(Component, tslib.__assign({}, this.props));
                 }
-                if (quickEdit.mode === 'inline') {
+                if (quickEdit.mode === 'inline' ||
+                    quickEdit.isFormMode) {
                     return (React__default["default"].createElement(Component, tslib.__assign({}, this.props), render('inline-form', this.buildSchema(), {
                         value: undefined,
                         wrapperComponent: 'div',
@@ -323,7 +340,8 @@ var HocQuickEdit = function (config) {
                         onInit: this.handleInit,
                         onChange: this.handleChange,
                         formLazyChange: false,
-                        canAccessSuperData: canAccessSuperData
+                        canAccessSuperData: canAccessSuperData,
+                        disabled: disabled
                     })));
                 }
                 else {
@@ -331,10 +349,10 @@ var HocQuickEdit = function (config) {
                             in: this.state.isOpened
                         }), tabIndex: quickEdit.focusable === false
                             ? undefined
-                            : '0', onKeyUp: this.handleKeyUp }),
+                            : '0', onKeyUp: disabled ? amisCore.noop : this.handleKeyUp }),
                         React__default["default"].createElement(Component, tslib.__assign({}, this.props, { contentsOnly: true, noHoc: true })),
-                        React__default["default"].createElement("span", { key: "edit-btn", className: cx('Field-quickEditBtn'), onClick: this.openQuickEdit },
-                            React__default["default"].createElement(amisUi.Icon, { icon: "edit", className: "icon" })),
+                        disabled ? null : (React__default["default"].createElement("span", { key: "edit-btn", className: cx('Field-quickEditBtn'), onClick: this.openQuickEdit },
+                            React__default["default"].createElement(amisUi.Icon, { icon: "edit", className: "icon" }))),
                         this.state.isOpened ? this.renderPopOver() : null));
                 }
             };

package/lib/renderers/Remark.d.ts

@@ -59,7 +59,7 @@ declare class Remark extends React.Component<RemarkProps> {
     static propsList: Array<string>;
     static defaultProps: {
         icon: string;
-        trigger: ("focus" | "hover" | "click")[];
+        trigger: ("click" | "hover" | "focus")[];
     };
     showModalTip(tooltip?: string | TooltipObject): (e: React.MouseEvent) => void;
     renderLabel(finalIcon: any, finalLabel: string, cx: ClassNamesFn, shape?: 'circle' | 'square'): JSX.Element;
@@ -71,12 +71,10 @@ declare const _default: {
         childRef(ref: any): void;
         getWrappedInstance(): any;
         render(): JSX.Element;
-        context: any;
+        context: unknown;
         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;
-        }>;
+        readonly props: Readonly<Omit<RemarkProps, keyof import("amis-core").ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>;
         state: Readonly<{}>;
         refs: {
             [key: string]: React.ReactInstance;

package/lib/renderers/Remark.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/SearchBox.d.ts

@@ -9,7 +9,7 @@ export interface SearchBoxSchema extends BaseSchema {
     /**
      * 指定为搜索框。
      *
-     * 文档：https://baidu.gitee.io/amis/docs/components/search-box
+     * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/search-box
      */
     type: 'search-box';
     /**

package/lib/renderers/SearchBox.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 
@@ -39,7 +39,7 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
                         this.setState({ value: value });
                         return [4 /*yield*/, dispatchEvent('change', amisCore.resolveEventData(this.props, {
                                 value: value
-                            }, 'value'))];
+                            }))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
@@ -84,7 +84,7 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
     };
     SearchBoxRenderer.prototype.dispatchEvent = function (name) {
         var dispatchEvent = this.props.dispatchEvent;
-        dispatchEvent(name, amisCore.resolveEventData(this.props, { value: this.state.value }, 'value'));
+        dispatchEvent(name, amisCore.resolveEventData(this.props, { value: this.state.value }));
     };
     SearchBoxRenderer.prototype.doAction = function (action, args) {
         var actionType = action === null || action === void 0 ? void 0 : action.actionType;

package/lib/renderers/Service.d.ts

@@ -7,13 +7,13 @@ import { SpinnerExtraProps } from 'amis-ui';
 import { BaseSchema, SchemaApi, SchemaCollection, SchemaExpression, SchemaMessage, SchemaName } from '../Schema';
 import type { ListenerAction } from 'amis-core';
 export declare const eventTypes: readonly ["inited", "onApiFetched", "onSchemaApiFetched", "onWsFetched"];
-export type ProviderEventType = typeof eventTypes[number];
+export type ProviderEventType = (typeof eventTypes)[number];
 export type DataProviderCollection = Partial<Record<ProviderEventType, DataProvider>>;
 export type DataProvider = string | Function;
 export type ComposedDataProvider = DataProvider | DataProviderCollection;
 /**
  * Service 服务类控件。
- * 文档：https://baidu.gitee.io/amis/docs/components/service
+ * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/service
  */
 export interface ServiceSchema extends BaseSchema, SpinnerExtraProps {
     /**
@@ -77,6 +77,10 @@ export interface ServiceSchema extends BaseSchema, SpinnerExtraProps {
     stopAutoRefreshWhen?: SchemaExpression;
     messages?: SchemaMessage;
     name?: SchemaName;
+    /**
+     * 是否以Alert的形式显示api接口响应的错误信息，默认展示
+     */
+    showErrorMsg?: boolean;
 }
 export interface ServiceProps extends RendererProps, Omit<ServiceSchema, 'type' | 'className'> {
     store: IServiceStore;

package/lib/renderers/Service.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 
@@ -447,7 +447,8 @@ var Service = /** @class */ (function (_super) {
                         case 2:
                             redirect = action.redirect && amisCore.filter(action.redirect, store.data);
                             redirect && env.jumpTo(redirect, action);
-                            action.reload && this.reloadTarget(action.reload, store.data);
+                            action.reload &&
+                                this.reloadTarget(amisCore.filter(action.reload, store.data), store.data);
                             return [2 /*return*/];
                     }
                 });
@@ -484,12 +485,9 @@ var Service = /** @class */ (function (_super) {
         });
     };
     Service.prototype.render = function () {
-        var _a = this.props, className = _a.className, style = _a.style, store = _a.store, render = _a.render, ns = _a.classPrefix, cx = _a.classnames, loadingConfig = _a.loadingConfig;
+        var _a = this.props, className = _a.className, style = _a.style, store = _a.store, render = _a.render, ns = _a.classPrefix, cx = _a.classnames, loadingConfig = _a.loadingConfig, showErrorMsg = _a.showErrorMsg;
         return (React__default["default"].createElement("div", { className: cx("".concat(ns, "Service"), className), style: style },
-            store.error ? (React__default["default"].createElement("div", { className: cx("Alert Alert--danger") },
-                React__default["default"].createElement("button", { className: cx('Alert-close'), onClick: function () { return store.updateMessage(''); }, type: "button" },
-                    React__default["default"].createElement("span", null, "\u00D7")),
-                store.msg)) : null,
+            store.error && showErrorMsg !== false ? (React__default["default"].createElement(amisUi.Alert2, { level: "danger", showCloseButton: true, onClose: function () { return store.updateMessage(''); } }, store.msg)) : null,
             this.renderBody(),
             React__default["default"].createElement(amisUi.Spinner, { size: "lg", overlay: true, key: "info", show: store.loading, loadingConfig: loadingConfig }),
             render(
@@ -506,7 +504,8 @@ var Service = /** @class */ (function (_super) {
     Service.defaultProps = {
         messages: {
             fetchFailed: 'fetchFailed'
-        }
+        },
+        showErrorMsg: true
     };
     Service.propsList = [];
     tslib.__decorate([

package/lib/renderers/SparkLine.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Spinner.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Status.d.ts

@@ -11,7 +11,7 @@ export interface StatusSource {
 }
 /**
  * 状态展示控件。
- * 文档：https://baidu.gitee.io/amis/docs/components/status
+ * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/status
  */
 export interface StatusSchema extends BaseSchema {
     /**

package/lib/renderers/Status.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Steps.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import { RendererProps } from 'amis-core';
-import { BaseSchema, SchemaCollection } from '../Schema';
 import { StepStatus } from 'amis-ui';
+import { BaseSchema, SchemaCollection } from '../Schema';
 import type { SchemaExpression } from 'amis-core';
 export type StepSchema = {
     /**

package/lib/renderers/Steps.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 
@@ -11,20 +11,19 @@ var tslib = require('tslib');
 var React = require('react');
 var amisCore = require('amis-core');
 var amisUi = require('amis-ui');
+var isPlainObject = require('lodash/isPlainObject');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+var isPlainObject__default = /*#__PURE__*/_interopDefaultLegacy(isPlainObject);
 
 function StepsCmpt(props) {
     var _a;
-    var className = props.className, style = props.style, steps = props.steps, status = props.status, mode = props.mode, labelPlacement = props.labelPlacement, progressDot = props.progressDot, data = props.data, source = props.source, config = props.config, render = props.render, useMobileUI = props.useMobileUI;
+    var className = props.className, style = props.style, steps = props.steps, status = props.status, mode = props.mode, labelPlacement = props.labelPlacement, progressDot = props.progressDot, data = props.data, source = props.source, render = props.render, useMobileUI = props.useMobileUI;
     var sourceResult = amisCore.resolveVariableAndFilter(source, data, '| raw');
     /** 步骤数据源 */
-    var stepsRow = (Array.isArray(sourceResult) ? sourceResult : undefined) ||
-        config ||
-        steps ||
-        [];
+    var stepsRow = (Array.isArray(sourceResult) ? sourceResult : undefined) || steps || [];
     /** 状态数据源 */
     var statusValue = amisCore.isPureVariable(status)
         ? amisCore.resolveVariableAndFilter(status, data, '| raw')
@@ -34,7 +33,7 @@ function StepsCmpt(props) {
     };
     var value = (_a = amisCore.getPropValue(props)) !== null && _a !== void 0 ? _a : 0;
     var resolveValue = typeof value === 'string' && isNaN(+value)
-        ? +amisCore.resolveVariable(value, data) || +value
+        ? amisCore.resolveVariable(value, data) || value
         : +value;
     var valueIndex = stepsRow.findIndex(function (item) { return item.value && item.value === resolveValue; });
     var currentValue = valueIndex !== -1 ? valueIndex : resolveValue;
@@ -57,16 +56,15 @@ function StepsCmpt(props) {
     }
     return (React__default["default"].createElement(amisUi.Steps, { current: currentValue, steps: resolveSteps, className: className, style: style, status: statusValue, mode: mode, progressDot: progressDot, labelPlacement: labelPlacement, useMobileUI: useMobileUI }));
 }
-var StepsWithRemoteConfig = amisUi.withRemoteConfig({
-    adaptor: function (data) { return data.steps || data; }
-})(/** @class */ (function (_super) {
+var StepsWithRemoteConfig = amisUi.withRemoteConfig()(/** @class */ (function (_super) {
     tslib.__extends(class_1, _super);
     function class_1() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
     class_1.prototype.render = function () {
         var _a = this.props, config = _a.config; _a.deferLoad; _a.loading; _a.updateConfig; var rest = tslib.__rest(_a, ["config", "deferLoad", "loading", "updateConfig"]);
-        return React__default["default"].createElement(StepsCmpt, tslib.__assign({ config: config }, rest));
+        var sourceConfig = isPlainObject__default["default"](config) ? config : null;
+        return React__default["default"].createElement(StepsCmpt, tslib.__assign({}, rest, sourceConfig));
     };
     return class_1;
 }(React__default["default"].Component)));

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

@@ -2,8 +2,8 @@ import React from 'react';
 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 { IColumn2 } from 'amis-core/lib/store/table2';
+import { IColumn } from 'amis-core';
+import type { IColumn2 } from 'amis-core';
 export interface ColumnTogglerProps extends RendererProps {
     /**
      * 按钮文字

package/lib/renderers/Table/ColumnToggler.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 

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

@@ -6,6 +6,7 @@ export interface QuickFilterConfig {
     multiple: boolean;
     strictMode?: boolean;
     [propName: string]: any;
+    refreshOnOpen?: boolean;
 }
 export interface HeadCellFilterProps extends RendererProps {
     data: any;
@@ -22,11 +23,11 @@ export declare class HeadCellFilterDropDown extends React.Component<HeadCellFilt
     constructor(props: HeadCellFilterProps);
     componentDidMount(): void;
     componentDidUpdate(prevProps: HeadCellFilterProps, prevState: any): void;
-    fetchOptions(): void;
+    fetchOptions(): Promise<void>;
     alterOptions(options: Array<any>): any[];
     optionComparator(option: Option, selected: any): boolean;
     handleClickOutside(): void;
-    open(): void;
+    open(): Promise<void>;
     close(): void;
     handleClick(value: string): Promise<void>;
     handleCheck(value: string): Promise<void>;

package/lib/renderers/Table/HeadCellFilterDropdown.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 
@@ -36,7 +36,7 @@ var HeadCellFilterDropDown = /** @class */ (function (_super) {
     }
     HeadCellFilterDropDown.prototype.componentDidMount = function () {
         var _a;
-        var _b = this.props, filterable = _b.filterable; _b.name; _b.store;
+        var filterable = this.props.filterable;
         if (filterable.source) {
             this.fetchOptions();
         }
@@ -50,6 +50,7 @@ var HeadCellFilterDropDown = /** @class */ (function (_super) {
         var _a, _b, _c, _d;
         var name = this.props.name;
         var props = this.props;
+        this.sourceInvalid = false;
         if (prevProps.name !== props.name ||
             prevProps.filterable !== props.filterable ||
             prevProps.data !== props.data) {
@@ -92,17 +93,26 @@ var HeadCellFilterDropDown = /** @class */ (function (_super) {
         this.sourceInvalid && this.fetchOptions();
     };
     HeadCellFilterDropDown.prototype.fetchOptions = function () {
-        var _this = this;
-        var _a = this.props, env = _a.env, filterable = _a.filterable, data = _a.data;
-        if (!amisCore.isEffectiveApi(filterable.source, data)) {
-            return;
-        }
-        var api = amisCore.normalizeApi(filterable.source);
-        api.cache = 3000; // 开启 3s 缓存，因为固顶位置渲染1次会额外多次请求。
-        env.fetcher(api, data).then(function (ret) {
-            var options = (ret.data && ret.data.options) || [];
-            _this.setState({
-                filterOptions: ret && ret.data && _this.alterOptions(options)
+        return tslib.__awaiter(this, void 0, void 0, function () {
+            var _a, env, filterable, data, api, ret, options;
+            return tslib.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = this.props, env = _a.env, filterable = _a.filterable, data = _a.data;
+                        if (!amisCore.isEffectiveApi(filterable.source, data)) {
+                            return [2 /*return*/];
+                        }
+                        api = amisCore.normalizeApi(filterable.source);
+                        api.cache = 3000; // 开启 3s 缓存，因为固顶位置渲染1次会额外多次请求。
+                        return [4 /*yield*/, env.fetcher(api, data)];
+                    case 1:
+                        ret = _b.sent();
+                        options = (ret.data && ret.data.options) || [];
+                        this.setState({
+                            filterOptions: ret && ret.data && this.alterOptions(options)
+                        });
+                        return [2 /*return*/];
+                }
             });
         });
     };
@@ -136,8 +146,24 @@ var HeadCellFilterDropDown = /** @class */ (function (_super) {
         this.close();
     };
     HeadCellFilterDropDown.prototype.open = function () {
-        this.setState({
-            isOpened: true
+        return tslib.__awaiter(this, void 0, void 0, function () {
+            var filterable;
+            return tslib.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        filterable = this.props.filterable;
+                        if (!(filterable.refreshOnOpen && filterable.source)) return [3 /*break*/, 2];
+                        return [4 /*yield*/, this.fetchOptions()];
+                    case 1:
+                        _a.sent();
+                        _a.label = 2;
+                    case 2:
+                        this.setState({
+                            isOpened: true
+                        });
+                        return [2 /*return*/];
+                }
+            });
         });
     };
     HeadCellFilterDropDown.prototype.close = function () {

package/lib/renderers/Table/HeadCellSearchDropdown.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 

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

@@ -1,9 +1,9 @@
-/// <reference types="react" />
+import React from 'react';
 import { ITableStore } from 'amis-core';
 import { ClassNamesFn } from 'amis-core';
 export interface ItemActionsProps {
     classnames: ClassNamesFn;
-    children: JSX.Element;
+    children: React.ReactNode | Array<React.ReactNode>;
     store: ITableStore;
 }
 declare function ItemActionsWrapper(props: ItemActionsProps): JSX.Element;

package/lib/renderers/Table/ItemActionsWrapper.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 

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

@@ -3,7 +3,7 @@ import { ClassNamesFn } from 'amis-core';
 import { SchemaNode, ActionObject } from 'amis-core';
 import { LocaleProps } from 'amis-core';
 import { ActionSchema } from '../Action';
-import type { IColumn, IRow } from 'amis-core/lib/store/table';
+import type { IColumn, IRow } from 'amis-core';
 export interface TableBodyProps extends LocaleProps {
     className?: string;
     rowsProps?: any;
@@ -54,7 +54,7 @@ export declare class TableBody extends React.Component<TableBodyProps> {
         remark: any;
         className: any;
     } & import("mobx-state-tree/dist/internal").NonEmptyObject & {
-        toggleToggle(): void;
+        toggleToggle(min?: number | undefined): void;
         setToggled(value: boolean): void;
         setEnableSearch(value: boolean): void;
     } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -80,11 +80,11 @@ export declare class TableBody extends React.Component<TableBodyProps> {
         remark: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
         className: import("mobx-state-tree").ITypeUnion<any, any, any>;
     }, {
-        toggleToggle(): void;
+        toggleToggle(min?: number | undefined): void;
         setToggled(value: boolean): void;
         setEnableSearch(value: boolean): void;
     }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>)[], rowProps?: any): any;
-    renderSummaryRow(position: 'prefix' | 'affix', items?: Array<any>, rowIndex?: number): JSX.Element | null;
+    renderSummaryRow(position: 'prefix' | 'affix', items: Array<any>, rowIndex?: number): JSX.Element | null;
     renderSummary(position: 'prefix' | 'affix', items?: Array<any>): JSX.Element | (JSX.Element | null)[] | null;
     render(): JSX.Element;
 }

package/lib/renderers/Table/TableBody.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 
@@ -53,28 +53,28 @@ var TableBody = /** @class */ (function (_super) {
         });
     };
     TableBody.prototype.renderSummaryRow = function (position, items, rowIndex) {
-        var _a = this.props, columns = _a.columns, render = _a.render, data = _a.data, cx = _a.classnames, rows = _a.rows, prefixRowClassName = _a.prefixRowClassName, affixRowClassName = _a.affixRowClassName;
+        var _a, _b;
+        var _c = this.props, columns = _c.columns, render = _c.render, data = _c.data, cx = _c.classnames, rows = _c.rows, prefixRowClassName = _c.prefixRowClassName, affixRowClassName = _c.affixRowClassName;
         if (!(Array.isArray(items) && items.length)) {
             return null;
         }
-        var filterColumns = columns.filter(function (item) { return item.toggable; });
-        var result = [];
-        for (var index = 0; index < filterColumns.length; index++) {
-            var item = items[filterColumns[index].rawIndex];
-            item && result.push(tslib.__assign({}, item));
-        }
+        var result = items;
         //  如果是勾选栏，让它和下一列合并。
-        if (columns[0].type === '__checkme' && result[0]) {
+        if (((_a = columns[0]) === null || _a === void 0 ? void 0 : _a.type) === '__checkme' && result[0]) {
             result[0].colSpan = (result[0].colSpan || 1) + 1;
         }
         //  如果是展开栏，让它和下一列合并。
-        if (columns[0].type === '__expandme' && result[0]) {
+        if (((_b = columns[0]) === null || _b === void 0 ? void 0 : _b.type) === '__expandme' && result[0]) {
             result[0].colSpan = (result[0].colSpan || 1) + 1;
         }
         // 缺少的单元格补齐
         var appendLen = columns.length - result.reduce(function (p, c) { return p + (c.colSpan || 1); }, 0);
         if (appendLen) {
-            var item = result.pop();
+            var item = result.length
+                ? result.pop()
+                : {
+                    type: 'plain'
+                };
             result.push(tslib.__assign(tslib.__assign({}, item), { colSpan: (item.colSpan || 1) + appendLen }));
         }
         var ctx = amisCore.createObject(data, {

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

@@ -1,7 +1,7 @@
 import React from 'react';
 import { RendererProps } from 'amis-core';
 export interface TableCellProps extends RendererProps {
-    wrapperComponent?: React.ReactType;
+    wrapperComponent?: React.ElementType;
     column: any;
     contentsOnly?: boolean;
 }