amis 2.0.2 → 2.1.0

package/esm/Schema.d.ts

@@ -122,7 +122,7 @@ export interface SchemaApiObject {
     /**
      * API 发送类型
      */
-    method?: 'get' | 'post' | 'put' | 'delete' | 'patch' | 'jsonp';
+    method?: 'get' | 'post' | 'put' | 'delete' | 'patch' | 'jsonp' | 'js';
     /**
      * API 发送目标地址
      */

package/esm/compat.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/index.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/preset.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Action.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 
@@ -306,16 +306,17 @@ var ActionRenderer = /** @class */ (function (_super) {
     };
     ActionRenderer.prototype.handleAction = function (e, action) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, env, onAction, data, ignoreConfirm, dispatchEvent, mergedData, confirmed, rendererEvent, rendererEvent;
+            var _a, env, onAction, data, ignoreConfirm, dispatchEvent, $schema, mergedData, hasOnEvent, confirmed, rendererEvent, rendererEvent;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = this.props, env = _a.env, onAction = _a.onAction, data = _a.data, ignoreConfirm = _a.ignoreConfirm, dispatchEvent = _a.dispatchEvent;
+                        _a = this.props, env = _a.env, onAction = _a.onAction, data = _a.data, ignoreConfirm = _a.ignoreConfirm, dispatchEvent = _a.dispatchEvent, $schema = _a.$schema;
                         mergedData = data;
                         if ((action === null || action === void 0 ? void 0 : action.actionType) === 'click' && isObject(action === null || action === void 0 ? void 0 : action.args)) {
                             mergedData = createObject(data, action.args);
                         }
-                        if (!(!ignoreConfirm && action.confirmText && env.confirm)) return [3 /*break*/, 6];
+                        hasOnEvent = $schema.onEvent && Object.keys($schema.onEvent).length;
+                        if (!((!ignoreConfirm || hasOnEvent) && action.confirmText && env.confirm)) return [3 /*break*/, 6];
                         return [4 /*yield*/, env.confirm(filter(action.confirmText, mergedData))];
                     case 1:
                         confirmed = _b.sent();
@@ -327,8 +328,10 @@ var ActionRenderer = /** @class */ (function (_super) {
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
                             return [2 /*return*/];
                         }
-                        return [4 /*yield*/, onAction(e, action, mergedData)];
+                        // 因为crud里面也会处理二次确认，所以如果按钮处理过了就跳过crud的二次确认
+                        return [4 /*yield*/, onAction(e, __assign(__assign({}, action), { ignoreConfirm: !!hasOnEvent }), mergedData)];
                     case 3:
+                        // 因为crud里面也会处理二次确认，所以如果按钮处理过了就跳过crud的二次确认
                         _b.sent();
                         return [3 /*break*/, 5];
                     case 4:

package/esm/renderers/Alert.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/AnchorNav.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/App.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Audio.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Avatar.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/BarCode.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Breadcrumb.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/ButtonGroup.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/CRUD.d.ts

@@ -254,7 +254,7 @@ export default class CRUD extends React.Component<CRUDProps, any> {
     handleBulkAction(selectedItems: Array<any>, unSelectedItems: Array<any>, e: React.UIEvent<any>, action: ActionObject): void;
     handleItemAction(action: ActionObject, ctx: any): void;
     handleFilterInit(values: object): void;
-    handleFilterReset(values: object): void;
+    handleFilterReset(values: object, action: any): void;
     handleFilterSubmit(values: object, jumpToFirstPage?: boolean, replaceLocation?: boolean, search?: boolean): void;
     handleBulkGo(selectedItems: Array<any>, unSelectedItems: Array<any>, e: React.MouseEvent<any>): void | Promise<false | void>;
     handleDialogConfirm(values: object[], action: ActionObject, ctx: any, components: Array<any>): any;

package/esm/renderers/CRUD.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 
@@ -273,7 +273,8 @@ var CRUD = /** @class */ (function (_super) {
                 onAction(e, action, ctx, false, _this.context);
             }
         };
-        if (action.confirmText && env.confirm) {
+        // Action如果配了事件动作也会处理二次确认，这里需要处理一下忽略
+        if (!action.ignoreConfirm && action.confirmText && env.confirm) {
             env
                 .confirm(filter(action.confirmText, ctx))
                 .then(function (confirmed) { return confirmed && fn(); });
@@ -300,12 +301,17 @@ var CRUD = /** @class */ (function (_super) {
                 items: options || []
             });
     };
-    CRUD.prototype.handleFilterReset = function (values) {
+    CRUD.prototype.handleFilterReset = function (values, action) {
         var _a = this.props, store = _a.store, syncLocation = _a.syncLocation, env = _a.env, pageField = _a.pageField, perPageField = _a.perPageField;
         store.updateQuery(store.pristineQuery, syncLocation && env && env.updateLocation
             ? function (location) { return env.updateLocation(location); }
             : undefined, pageField, perPageField, true);
         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)) {
+            return;
+        }
         this.search();
     };
     CRUD.prototype.handleFilterSubmit = function (values, jumpToFirstPage, replaceLocation, search) {
@@ -788,7 +794,10 @@ var CRUD = /** @class */ (function (_super) {
         var unSelectedItems = store.unSelectedItems;
         var bulkBtns = [];
         var itemBtns = [];
-        var ctx = store.mergedData;
+        var ctx = createObject(store.mergedData, {
+            selectedItems: selectedItems.concat(),
+            unSelectedItems: unSelectedItems.concat()
+        });
         // const ctx = createObject(store.data, {
         //     ...store.query,
         //     items: childProps.items,

package/esm/renderers/CRUD2.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Calendar.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Card.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Card2.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Cards.d.ts

@@ -107,6 +107,7 @@ export interface GridProps extends RendererProps, Omit<CardsSchema, 'className'
     multiple?: boolean;
     valueField?: string;
     draggable?: boolean;
+    dragIcon?: SVGAElement;
     onSelect: (selectedItems: Array<object>, unSelectedItems: Array<object>) => void;
     onSave?: (items: Array<object> | object, diff: Array<object> | object, rowIndexes: Array<number> | number, unModifiedItems?: Array<object>, rowOrigins?: Array<object> | object, resetOnFailed?: boolean) => void;
     onSaveOrder?: (moved: Array<object>, items: Array<object>) => void;

package/esm/renderers/Cards.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 
@@ -7,7 +7,7 @@ import { __extends, __assign, __decorate, __metadata } from 'tslib';
 import React from 'react';
 import { findDOMNode } from 'react-dom';
 import { resolveVariableAndFilter, getScrollParent, anyChanged, isPureVariable, createObject, difference, filter, ucFirst, autobind, Renderer, ListStore } from 'amis-core';
-import { Icon, Button } from 'amis-ui';
+import { Icon, Button, Spinner } from 'amis-ui';
 import Sortable from 'sortablejs';
 
 var Cards = /** @class */ (function (_super) {
@@ -305,6 +305,7 @@ var Cards = /** @class */ (function (_super) {
     };
     Cards.prototype.destroyDragging = function () {
         this.sortable && this.sortable.destroy();
+        this.sortable = undefined;
     };
     Cards.prototype.renderActions = function (region) {
         var _this = this;
@@ -401,7 +402,8 @@ var Cards = /** @class */ (function (_super) {
         return (React.createElement(Button, { key: "checkall", tooltip: "\u5207\u6362\u5168\u9009", onClick: this.handleCheckAll, size: "sm", level: store.allChecked ? 'info' : 'default' }, "\u5168\u9009"));
     };
     Cards.prototype.renderDragToggler = function () {
-        var _a = this.props, store = _a.store; _a.multiple; _a.selectable; var env = _a.env, __ = _a.translate;
+        var _this = this;
+        var _a = this.props, store = _a.store; _a.multiple; _a.selectable; var env = _a.env, __ = _a.translate, dragIcon = _a.dragIcon;
         if (!store.draggable || store.items.length < 2) {
             return null;
         }
@@ -409,8 +411,8 @@ var Cards = /** @class */ (function (_super) {
                 e.preventDefault();
                 store.toggleDragging();
                 store.dragging && store.clear();
-            } },
-            React.createElement(Icon, { icon: "exchange", className: "icon r90" })));
+                store.dragging ? _this.initDragging() : undefined;
+            } }, React.isValidElement(dragIcon) ? (dragIcon) : (React.createElement(Icon, { icon: "exchange", className: "icon r90" }))));
     };
     Cards.prototype.renderToolbar = function (toolbar, index) {
         var type = toolbar.type || toolbar;
@@ -432,9 +434,11 @@ var Cards = /** @class */ (function (_super) {
             className: cx((card && card.className) || '', {
                 'is-checked': item.checked,
                 'is-modified': item.modified,
-                'is-moved': item.moved
+                'is-moved': item.moved,
+                'is-dragging': store.dragging
             }),
             item: item,
+            key: index,
             itemIndex: item.index,
             multiple: multiple,
             selectable: store.selectable,
@@ -459,7 +463,7 @@ var Cards = /** @class */ (function (_super) {
     };
     Cards.prototype.render = function () {
         var _this = this;
-        var _a = this.props, className = _a.className, store = _a.store, columnsCount = _a.columnsCount, itemClassName = _a.itemClassName, placeholder = _a.placeholder, card = _a.card, render = _a.render, affixHeader = _a.affixHeader, masonryLayout = _a.masonryLayout, itemsClassName = _a.itemsClassName, cx = _a.classnames, __ = _a.translate;
+        var _a = this.props, className = _a.className, store = _a.store, columnsCount = _a.columnsCount, itemClassName = _a.itemClassName, placeholder = _a.placeholder, card = _a.card, render = _a.render, affixHeader = _a.affixHeader, masonryLayout = _a.masonryLayout, itemsClassName = _a.itemsClassName, cx = _a.classnames, __ = _a.translate, _b = _a.loading, loading = _b === void 0 ? false : _b;
         this.renderedToolbars = []; // 用来记录哪些 toolbar 已经渲染了，已经渲染了就不重复渲染了。
         var itemFinalClassName = columnsCount
             ? "Grid-col--sm".concat(Math.round(12 / columnsCount))
@@ -492,7 +496,8 @@ var Cards = /** @class */ (function (_super) {
             store.items.length ? (React.createElement("div", { ref: this.itemsRef, className: cx('Cards-body Grid', itemsClassName, masonryClassName) }, store.items.map(function (item, index) {
                 return _this.renderCard(index, card, item, itemFinalClassName);
             }))) : (React.createElement("div", { className: cx('Cards-placeholder') }, render('placeholder', __(placeholder)))),
-            footer));
+            footer,
+            React.createElement(Spinner, { overlay: true, show: loading })));
     };
     Cards.propsList = [
         'header',

package/esm/renderers/Carousel.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Chart.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 
@@ -24,6 +24,7 @@ function recoverFunctionType(config) {
         'min',
         'max',
         'labelFormatter',
+        'valueFormatter',
         'pageFormatter',
         'optionToContent',
         'contentToOption',

package/esm/renderers/Code.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Collapse.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/CollapseGroup.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Color.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Container.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Copyable.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 
@@ -7,7 +7,7 @@ import { __extends, __assign } from 'tslib';
 import React from 'react';
 import hoistNonReactStatic from 'hoist-non-react-statics';
 import { filter } from 'amis-core';
-import { Icon } from 'amis-ui';
+import { TooltipWrapper, Icon } from 'amis-ui';
 
 /**
  * @file scoped.jsx.
@@ -32,8 +32,9 @@ var HocCopyable = function () {
                     if (content) {
                         return (React.createElement(Component, __assign({}, this.props, { className: cx("Field--copyable", className) }),
                             React.createElement(Component, __assign({}, this.props, { wrapperComponent: '', noHoc: true })),
-                            React.createElement("a", { key: "edit-btn", "data-tooltip": __('Copyable.tip'), className: cx('Field-copyBtn'), onClick: this.handleClick.bind(this, content) },
-                                React.createElement(Icon, { icon: "copy", className: "icon" }))));
+                            React.createElement(TooltipWrapper, { placement: "right", tooltip: '点击复制', trigger: "hover" },
+                                React.createElement("a", { key: "edit-btn", "data-tooltip": __('Copyable.tip'), className: cx('Field-copyBtn'), onClick: this.handleClick.bind(this, content) },
+                                    React.createElement(Icon, { icon: "copy", className: "icon" })))));
                     }
                 }
                 return React.createElement(Component, __assign({}, this.props));

package/esm/renderers/Custom.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Date.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */