amis 2.1.1-beta.2 → 2.3.0

package/esm/node_modules/rc-input-number/lib/utils/numberUtil.js

@@ -0,0 +1,146 @@
+/**
+ * amis v2.3.0
+ * Copyright 2018-2022 baidu
+ */
+
+import { __exports as numberUtil } from '../../../../_virtual/numberUtil.js';
+import { __require as requireSupportUtil } from './supportUtil.js';
+
+var hasRequiredNumberUtil;
+
+function requireNumberUtil () {
+	if (hasRequiredNumberUtil) return numberUtil;
+	hasRequiredNumberUtil = 1;
+
+	Object.defineProperty(numberUtil, "__esModule", {
+	  value: true
+	});
+	numberUtil.getDecupleSteps = getDecupleSteps;
+	numberUtil.getNumberPrecision = getNumberPrecision;
+	numberUtil.isE = isE;
+	numberUtil.num2str = num2str;
+	numberUtil.trimNumber = trimNumber;
+	numberUtil.validateNumber = validateNumber;
+
+	var _supportUtil = requireSupportUtil();
+
+	/**
+	 * Format string number to readable number
+	 */
+	function trimNumber(numStr) {
+	  var str = numStr.trim();
+	  var negative = str.startsWith('-');
+
+	  if (negative) {
+	    str = str.slice(1);
+	  }
+
+	  str = str // Remove decimal 0. `1.000` => `1.`, `1.100` => `1.1`
+	  .replace(/(\.\d*[^0])0*$/, '$1') // Remove useless decimal. `1.` => `1`
+	  .replace(/\.0*$/, '') // Remove integer 0. `0001` => `1`, 000.1' => `.1`
+	  .replace(/^0+/, '');
+
+	  if (str.startsWith('.')) {
+	    str = "0".concat(str);
+	  }
+
+	  var trimStr = str || '0';
+	  var splitNumber = trimStr.split('.');
+	  var integerStr = splitNumber[0] || '0';
+	  var decimalStr = splitNumber[1] || '0';
+
+	  if (integerStr === '0' && decimalStr === '0') {
+	    negative = false;
+	  }
+
+	  var negativeStr = negative ? '-' : '';
+	  return {
+	    negative: negative,
+	    negativeStr: negativeStr,
+	    trimStr: trimStr,
+	    integerStr: integerStr,
+	    decimalStr: decimalStr,
+	    fullStr: "".concat(negativeStr).concat(trimStr)
+	  };
+	}
+
+	function isE(number) {
+	  var str = String(number);
+	  return !Number.isNaN(Number(str)) && str.includes('e');
+	}
+	/**
+	 * [Legacy] Convert 1e-9 to 0.000000001.
+	 * This may lose some precision if user really want 1e-9.
+	 */
+
+
+	function getNumberPrecision(number) {
+	  var numStr = String(number);
+
+	  if (isE(number)) {
+	    var precision = Number(numStr.slice(numStr.indexOf('e-') + 2));
+	    var decimalMatch = numStr.match(/\.(\d+)/);
+
+	    if (decimalMatch === null || decimalMatch === void 0 ? void 0 : decimalMatch[1]) {
+	      precision += decimalMatch[1].length;
+	    }
+
+	    return precision;
+	  }
+
+	  return numStr.includes('.') && validateNumber(numStr) ? numStr.length - numStr.indexOf('.') - 1 : 0;
+	}
+	/**
+	 * Convert number (includes scientific notation) to -xxx.yyy format
+	 */
+
+
+	function num2str(number) {
+	  var numStr = String(number);
+
+	  if (isE(number)) {
+	    if (number > Number.MAX_SAFE_INTEGER) {
+	      return String((0, _supportUtil.supportBigInt)() ? BigInt(number).toString() : Number.MAX_SAFE_INTEGER);
+	    }
+
+	    if (number < Number.MIN_SAFE_INTEGER) {
+	      return String((0, _supportUtil.supportBigInt)() ? BigInt(number).toString() : Number.MIN_SAFE_INTEGER);
+	    }
+
+	    numStr = number.toFixed(getNumberPrecision(numStr));
+	  }
+
+	  return trimNumber(numStr).fullStr;
+	}
+
+	function validateNumber(num) {
+	  if (typeof num === 'number') {
+	    return !Number.isNaN(num);
+	  } // Empty
+
+
+	  if (!num) {
+	    return false;
+	  }
+
+	  return (// Normal type: 11.28
+	    /^\s*-?\d+(\.\d+)?\s*$/.test(num) || // Pre-number: 1.
+	    /^\s*-?\d+\.\s*$/.test(num) || // Post-number: .1
+	    /^\s*-?\.\d+\s*$/.test(num)
+	  );
+	}
+
+	function getDecupleSteps(step) {
+	  var stepStr = typeof step === 'number' ? num2str(step) : trimNumber(step).fullStr;
+	  var hasPoint = stepStr.includes('.');
+
+	  if (!hasPoint) {
+	    return step + '0';
+	  }
+
+	  return trimNumber(stepStr.replace(/(\d)\.(\d)/g, '$1$2.')).fullStr;
+	}
+	return numberUtil;
+}
+
+export { requireNumberUtil as __require };

package/esm/node_modules/rc-input-number/lib/utils/supportUtil.js

@@ -0,0 +1,25 @@
+/**
+ * amis v2.3.0
+ * Copyright 2018-2022 baidu
+ */
+
+import { __exports as supportUtil } from '../../../../_virtual/supportUtil.js';
+
+var hasRequiredSupportUtil;
+
+function requireSupportUtil () {
+	if (hasRequiredSupportUtil) return supportUtil;
+	hasRequiredSupportUtil = 1;
+
+	Object.defineProperty(supportUtil, "__esModule", {
+	  value: true
+	});
+	supportUtil.supportBigInt = supportBigInt;
+
+	function supportBigInt() {
+	  return typeof BigInt === 'function';
+	}
+	return supportUtil;
+}
+
+export { requireSupportUtil as __require };

package/esm/preset.js

@@ -1,10 +1,10 @@
 /**
- * amis v2.1.1-beta.2
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 
-import { extendDefaultEnv, render, addRootWrapper, LazyComponent } from 'amis-core';
-import { alert, confirm, toast, setRenderSchemaFn, ImageGallery, Spinner } from 'amis-ui';
+import { extendDefaultEnv, render, addRootWrapper, themeable, LazyComponent } from 'amis-core';
+import { alert, confirm, toast, setRenderSchemaFn, ImageGallery } from 'amis-ui';
 import React from 'react';
 
 extendDefaultEnv({
@@ -37,4 +37,9 @@ addRootWrapper(function (props) {
     var env = props.env, children = props.children;
     return (React.createElement(ImageGallery, { modalContainer: env.getModalContainer }, children));
 });
-LazyComponent.defaultProps.placeholder = React.createElement(Spinner, null);
+var SimpleSpinner = themeable(function (props) {
+    var cx = props.classnames;
+    return (React.createElement("div", { "data-testid": "spinner", className: cx("Spinner", 'in', props.className) },
+        React.createElement("div", { className: cx("Spinner-icon", 'Spinner-icon--default', props.spinnerClassName) })));
+});
+LazyComponent.defaultProps.placeholder = React.createElement(SimpleSpinner, null);

package/esm/renderers/Action.d.ts

@@ -280,6 +280,7 @@ export declare const createSyntheticEvent: <T extends Element, E extends Event>(
 export interface ActionProps extends Omit<ButtonSchema, 'className' | 'iconClassName' | 'rightIconClassName' | 'loadingClassName'>, ThemeProps, Omit<AjaxActionSchema, 'type' | 'className' | 'iconClassName' | 'rightIconClassName' | 'loadingClassName'>, Omit<UrlActionSchema, 'type' | 'className' | 'iconClassName' | 'rightIconClassName' | 'loadingClassName'>, Omit<LinkActionSchema, 'type' | 'className' | 'iconClassName' | 'rightIconClassName' | 'loadingClassName'>, Omit<DialogActionSchema, 'type' | 'className' | 'iconClassName' | 'rightIconClassName' | 'loadingClassName'>, Omit<DrawerActionSchema, 'type' | 'className' | 'iconClassName' | 'rightIconClassName' | 'loadingClassName'>, Omit<ToastSchemaBase, 'type' | 'className' | 'iconClassName' | 'rightIconClassName' | 'loadingClassName'>, Omit<CopyActionSchema, 'type' | 'className' | 'iconClassName' | 'rightIconClassName' | 'loadingClassName'>, Omit<ReloadActionSchema, 'type' | 'className' | 'iconClassName' | 'rightIconClassName' | 'loadingClassName'>, Omit<EmailActionSchema, 'type' | 'className' | 'iconClassName' | 'rightIconClassName' | 'loadingClassName' | 'body'>, Omit<OtherActionSchema, 'type' | 'className' | 'iconClassName' | 'rightIconClassName' | 'loadingClassName'> {
     actionType: any;
     onAction?: (e: React.MouseEvent<any> | void | null, action: ActionSchema) => void;
+    onActionSensor?: (promise?: Promise<any>) => void;
     isCurrentUrl?: (link: string) => boolean;
     onClick?: ((e: React.MouseEvent<any>, props: any) => void) | string | Function | null;
     componentClass: React.ReactType;
@@ -312,7 +313,52 @@ export declare class Action extends React.Component<ActionProps, ActionState> {
     componentWillUnmount(): void;
     render(): JSX.Element;
 }
-declare const _default: (React.ComponentType<any> & import("hoist-non-react-statics").NonReactStatics<React.ComponentType<any>, {}>) & {
+declare const _default: {
+    new (props: Omit<ActionProps, keyof 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<ActionProps, keyof 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<ActionProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps> & Readonly<{
+            children?: React.ReactNode;
+        }>;
+        state: Readonly<{}>;
+        refs: {
+            [key: string]: React.ReactInstance;
+        };
+        componentDidMount?(): void;
+        shouldComponentUpdate?(nextProps: Readonly<Omit<ActionProps, keyof 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<ActionProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>): any;
+        componentDidUpdate?(prevProps: Readonly<Omit<ActionProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>, snapshot?: any): void;
+        componentWillMount?(): void;
+        UNSAFE_componentWillMount?(): void;
+        componentWillReceiveProps?(nextProps: Readonly<Omit<ActionProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
+        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Omit<ActionProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
+        componentWillUpdate?(nextProps: Readonly<Omit<ActionProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
+        UNSAFE_componentWillUpdate?(nextProps: Readonly<Omit<ActionProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
+    };
+    /**
+     * 跳转到哪？支持配置相对路径。
+     */
+    displayName: string;
+    contextType: React.Context<string>;
+    ComposedComponent: React.ComponentType<typeof Action>; /**
+     * 指定为刷新目标组件。
+     */
+} & import("hoist-non-react-statics").NonReactStatics<typeof Action, {}> & {
+    /**
+     * 指定目标组件。
+     */
     ComposedComponent: typeof Action;
 };
 export default _default;

package/esm/renderers/Action.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.1.1-beta.2
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 
@@ -114,12 +114,12 @@ var Action = /** @class */ (function (_super) {
     }
     Action.prototype.handleAction = function (e) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, onAction, disabled, countDown, env, onClick, result, _b, action, actionType, api, countDownEnd;
+            var _a, onAction, onActionSensor, disabled, countDown, env, onClick, result, _b, action, actionType, api, sensor, countDownEnd;
             var _this = this;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
-                        _a = this.props, onAction = _a.onAction, disabled = _a.disabled, countDown = _a.countDown, env = _a.env;
+                        _a = this.props, onAction = _a.onAction, onActionSensor = _a.onActionSensor, disabled = _a.disabled, countDown = _a.countDown, env = _a.env;
                         // https://reactjs.org/docs/legacy-event-pooling.html
                         e.persist(); // 等 react 17之后去掉 event pooling 了，这个应该就没用了
                         onClick = this.props.onClick;
@@ -161,9 +161,14 @@ var Action = /** @class */ (function (_super) {
                             api.responseType = 'blob';
                             action.api = api;
                         }
-                        return [4 /*yield*/, onAction(e, action)];
+                        sensor = onAction(e, action);
+                        if (!(sensor === null || sensor === void 0 ? void 0 : sensor.then)) return [3 /*break*/, 4];
+                        onActionSensor === null || onActionSensor === void 0 ? void 0 : onActionSensor(sensor);
+                        return [4 /*yield*/, sensor];
                     case 3:
                         _c.sent();
+                        _c.label = 4;
+                    case 4:
                         if (countDown) {
                             countDownEnd = Date.now() + countDown * 1000;
                             this.setState({
@@ -244,7 +249,7 @@ var Action = /** @class */ (function (_super) {
                 _a[activeClassName || 'is-active'] = isActive,
                 _a)), size: size, level: activeLevel && isActive
                 ? activeLevel
-                : level || (primary ? 'primary' : undefined), loadingClassName: loadingClassName, loading: loading, onClick: this.handleAction, onMouseEnter: onMouseEnter, onMouseLeave: onMouseLeave, type: type && ~allowedType.indexOf(type) ? type : 'button', disabled: disabled, componentClass: isMenuItem ? 'a' : componentClass, overrideClassName: isMenuItem, tooltip: tooltip, disabledTip: disabledTip, tooltipPlacement: tooltipPlacement, tooltipContainer: tooltipContainer, tooltipTrigger: tooltipTrigger, tooltipRootClose: tooltipRootClose, block: block, iconOnly: !!(icon && !label && level !== 'link') },
+                : level || (primary ? 'primary' : undefined), loadingClassName: loadingClassName, loading: loading, onClick: this.handleAction, onMouseEnter: onMouseEnter, onMouseLeave: onMouseLeave, type: type && ~allowedType.indexOf(type) ? type : 'button', disabled: disabled, componentClass: isMenuItem ? 'a' : componentClass, overrideClassName: isMenuItem, tooltip: filterContents(tooltip, data), disabledTip: filterContents(disabledTip, data), tooltipPlacement: tooltipPlacement, tooltipContainer: tooltipContainer, tooltipTrigger: tooltipTrigger, tooltipRootClose: tooltipRootClose, block: block, iconOnly: !!(icon && !label && level !== 'link') },
             !loading ? iconElement : '',
             label ? React.createElement("span", null, filter(String(label), data)) : null,
             rightIconElement));

package/esm/renderers/Alert.js

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

package/esm/renderers/AnchorNav.js

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

package/esm/renderers/App.js

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

package/esm/renderers/Audio.js

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

package/esm/renderers/Avatar.js

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

package/esm/renderers/BarCode.js

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

package/esm/renderers/Breadcrumb.js

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

package/esm/renderers/ButtonGroup.js

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

package/esm/renderers/CRUD.d.ts

@@ -201,7 +201,7 @@ export interface CRUDCommonSchema extends BaseSchema {
     /**
      * 内容区域占满屏幕剩余空间
      */
-    autoFillHeight?: boolean;
+    autoFillHeight?: TableSchema['autoFillHeight'];
 }
 export declare type CRUDCardsSchema = CRUDCommonSchema & {
     mode: 'cards';
@@ -263,7 +263,10 @@ export default class CRUD extends React.Component<CRUDProps, any> {
     search(values?: any, silent?: boolean, clearSelection?: boolean, forceReload?: boolean): void;
     silentSearch(values?: object, clearSelection?: boolean, forceReload?: boolean): void;
     handleChangePage(page: number, perPage?: number): void;
-    handleSave(rows: Array<object> | object, diff: Array<object> | object, indexes: Array<string>, unModifiedItems?: Array<any>, rowsOrigin?: Array<object> | object, resetOnFailed?: boolean): void;
+    handleSave(rows: Array<object> | object, diff: Array<object> | object, indexes: Array<string>, unModifiedItems?: Array<any>, rowsOrigin?: Array<object> | object, options?: {
+        resetOnFailed?: boolean;
+        reload?: string;
+    }): void;
     handleSaveOrder(moved: Array<object>, rows: Array<object>): void;
     handleSelect(items: Array<any>, unSelectedItems: Array<any>): void;
     handleChildPopOverOpen(popOver: any): void;

package/esm/renderers/CRUD.js

@@ -1,11 +1,11 @@
 /**
- * amis v2.1.1-beta.2
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 
 import { __extends, __awaiter, __generator, __assign, __rest, __decorate, __metadata } from 'tslib';
 import React from 'react';
-import { qsparse, getPropValue, anyChanged, isArrayChildrenModified, isObjectShallowModified, isApiOutdated, isPureVariable, resolveVariableAndFilter, filter, createObject, isVisible, str2function, qsstringify, isEffectiveApi, evalExpression, extendObject, getExprProperties, getVariable, ScopedContext, Renderer, CRUDStore } from 'amis-core';
+import { parseQuery, getPropValue, anyChanged, isArrayChildrenModified, isObjectShallowModified, isApiOutdated, isPureVariable, resolveVariableAndFilter, filter, createObject, isVisible, str2function, qsparse, qsstringify, isEffectiveApi, evalExpression, extendObject, getExprProperties, getVariable, ScopedContext, Renderer, CRUDStore } from 'amis-core';
 import { Select, Button, Icon, Html } from 'amis-ui';
 import pick from 'lodash/pick';
 import { findDOMNode } from 'react-dom';
@@ -41,10 +41,10 @@ var CRUD = /** @class */ (function (_super) {
         var location = props.location, store = props.store, pageField = props.pageField, perPageField = props.perPageField, syncLocation = props.syncLocation; props.loadDataOnce;
         _this.mounted = true;
         if (syncLocation && location && (location.query || location.search)) {
-            store.updateQuery(qsparse(location.search.substring(1)), undefined, pageField, perPageField);
+            store.updateQuery(parseQuery(location), undefined, pageField, perPageField);
         }
         else if (syncLocation && !location && window.location.search) {
-            store.updateQuery(qsparse(window.location.search.substring(1)), undefined, pageField, perPageField);
+            store.updateQuery(parseQuery(window.location), undefined, pageField, perPageField);
         }
         _this.props.store.setFilterTogglable(!!_this.props.filterTogglable, _this.props.filterDefaultVisible);
         // 如果有 api，data 里面先写个 空数组，面得继承外层的 items
@@ -97,7 +97,7 @@ var CRUD = /** @class */ (function (_super) {
             prevProps.location &&
             prevProps.location.search !== props.location.search) {
             // 同步地址栏，那么直接检测 query 是否变了，变了就重新拉数据
-            store.updateQuery(qsparse(props.location.search.substring(1)), undefined, props.pageField, props.perPageField);
+            store.updateQuery(parseQuery(props.location), undefined, props.pageField, props.perPageField);
             dataInvalid = !!(props.api && isObjectShallowModified(store.query, this.lastQuery, false));
         }
         if (dataInvalid) ;
@@ -309,7 +309,8 @@ var CRUD = /** @class */ (function (_super) {
         this.lastQuery = store.query;
         // 对于带 submit 的 reset(包括 actionType 为 reset-and-submit clear-and-submit 和 form 的 resetAfterSubmit 属性)
         // 不执行 search，否则会多次触发接口请求
-        if ((action === null || action === void 0 ? void 0 : action.actionType) && ['reset-and-submit', 'clear-and-submit', 'submit'].includes(action.actionType)) {
+        if ((action === null || action === void 0 ? void 0 : action.actionType) &&
+            ['reset-and-submit', 'clear-and-submit', 'submit'].includes(action.actionType)) {
             return;
         }
         this.search();
@@ -458,6 +459,15 @@ var CRUD = /** @class */ (function (_super) {
                 columns: (_a = store.columns) !== null && _a !== void 0 ? _a : columns
             })
                 .then(function (value) {
+                var _a;
+                var page = store.page, lastPage = store.lastPage;
+                // 空列表 且 页数已经非法超出，则跳转到最后的合法页数
+                if (!store.data.items.length &&
+                    !interval &&
+                    page > 1 &&
+                    lastPage < page) {
+                    _this.search(__assign(__assign({}, store.query), (_a = {}, _a[pageField || 'page'] = lastPage, _a)), false, undefined);
+                }
                 interval &&
                     _this.mounted &&
                     (!stopAutoRefreshWhen ||
@@ -493,7 +503,7 @@ var CRUD = /** @class */ (function (_super) {
             scrolledY && window.scroll(0, scrolledY - offsetTop);
         }
     };
-    CRUD.prototype.handleSave = function (rows, diff, indexes, unModifiedItems, rowsOrigin, resetOnFailed) {
+    CRUD.prototype.handleSave = function (rows, diff, indexes, unModifiedItems, rowsOrigin, options) {
         var _this = this;
         var _a = this.props, store = _a.store, quickSaveApi = _a.quickSaveApi, quickSaveItemApi = _a.quickSaveItemApi, primaryField = _a.primaryField, env = _a.env, messages = _a.messages, reload = _a.reload;
         if (Array.isArray(rows)) {
@@ -521,8 +531,11 @@ var CRUD = /** @class */ (function (_super) {
                 errorMessage: messages && messages.saveSuccess
             })
                 .then(function () {
-                reload && _this.reloadTarget(reload, data_1);
-                _this.search(undefined, undefined, true, true);
+                var _a;
+                var finalReload = (_a = options === null || options === void 0 ? void 0 : options.reload) !== null && _a !== void 0 ? _a : reload;
+                finalReload
+                    ? _this.reloadTarget(finalReload, data_1)
+                    : _this.search(undefined, undefined, true, true);
             })
                 .catch(function () { });
         }
@@ -540,11 +553,14 @@ var CRUD = /** @class */ (function (_super) {
             store
                 .saveRemote(quickSaveItemApi, sendData)
                 .then(function () {
-                reload && _this.reloadTarget(reload, data_2);
-                _this.search(undefined, undefined, true, true);
+                var _a;
+                var finalReload = (_a = options === null || options === void 0 ? void 0 : options.reload) !== null && _a !== void 0 ? _a : reload;
+                finalReload
+                    ? _this.reloadTarget(finalReload, data_2)
+                    : _this.search(undefined, undefined, true, true);
             })
                 .catch(function () {
-                resetOnFailed && _this.control.reset();
+                (options === null || options === void 0 ? void 0 : options.resetOnFailed) && _this.control.reset();
             });
         }
     };
@@ -677,7 +693,7 @@ var CRUD = /** @class */ (function (_super) {
                 else {
                     oldUnselectedItems_1.push(item);
                 }
-                ~idx2 && oldItems_1.splice(idx2, 1);
+                !~idx && ~idx2 && oldItems_1.splice(idx2, 1);
             });
             newItems = oldItems_1;
             newUnSelectedItems = oldUnselectedItems_1;
@@ -979,7 +995,9 @@ var CRUD = /** @class */ (function (_super) {
                     var toolbar = _a.toolbar, child = _a.dom;
                     var type = toolbar.type || toolbar;
                     var align = toolbar.align || (type === 'pagination' ? 'right' : 'left');
-                    return (React.createElement("div", { key: index, className: cx_1('Crud-toolbar-item', align ? "Crud-toolbar-item--".concat(align) : '', toolbar.className) }, child));
+                    return (React.createElement("div", { key: index, className: cx_1('Crud-toolbar-item', align ? "Crud-toolbar-item--".concat(align) : ''
+                        // toolbar.className
+                        ) }, child));
                 })));
             }
             return null;

package/esm/renderers/CRUD2.d.ts

@@ -6,7 +6,7 @@ import { IScopedContext } from 'amis-core';
 import { BaseSchema, SchemaApi, SchemaExpression, SchemaName, SchemaObject, SchemaTokenizeableString } from '../Schema';
 import { CardsSchema } from './Cards';
 import { ListSchema } from './List';
-import { TableSchema } from './Table';
+import { TableSchema2 } from './Table2';
 import { SchemaCollection } from '../Schema';
 export declare type CRUDRendererEvent = 'search';
 export interface CRUD2CommonSchema extends BaseSchema {
@@ -17,7 +17,7 @@ export interface CRUD2CommonSchema extends BaseSchema {
     /**
      * 指定内容区的展示模式。
      */
-    mode?: 'table' | 'grid' | 'cards' | /* grid 的别名*/ 'list' | 'table-v2';
+    mode?: 'table' | 'grid' | 'cards' | /* grid 的别名*/ 'list' | 'table2';
     /**
      * 初始化数据 API
      */
@@ -123,8 +123,8 @@ export declare type CRUD2ListSchema = CRUD2CommonSchema & {
     mode: 'list';
 } & Omit<ListSchema, 'type'>;
 export declare type CRUD2TableSchema = CRUD2CommonSchema & {
-    mode?: 'table';
-} & Omit<TableSchema, 'type'>;
+    mode?: 'table2';
+} & Omit<TableSchema2, 'type'>;
 export declare type CRUD2Schema = CRUD2CardsSchema | CRUD2ListSchema | CRUD2TableSchema;
 export interface CRUD2Props extends RendererProps, Omit<CRUD2CommonSchema, 'type' | 'className'> {
     store: ICRUDStore;
@@ -184,7 +184,10 @@ export default class CRUD2 extends React.Component<CRUD2Props, any> {
     /** 加载更多数据，默认模式取props中的配置，只有事件动作需要直接触发 */
     loadMore?: boolean): void;
     handleChangePage(page: number, perPage?: number): void;
-    handleSave(rows: Array<object> | object, diff: Array<object> | object, indexes: Array<string>, unModifiedItems?: Array<any>, rowsOrigin?: Array<object> | object, resetOnFailed?: boolean): void;
+    handleSave(rows: Array<object> | object, diff: Array<object> | object, indexes: Array<string>, unModifiedItems?: Array<any>, rowsOrigin?: Array<object> | object, options?: {
+        resetOnFailed?: boolean;
+        reload?: string;
+    }): void;
     handleSaveOrder(moved: Array<object>, rows: Array<object>): void;
     handleSelect(items: Array<any>, unSelectedItems: Array<any>): void;
     /**