amis 2.0.2 → 2.2.0

package/esm/renderers/Card.js

@@ -1,12 +1,11 @@
 /**
- * amis v2.0.2
+ * amis v2.2.0
  * Copyright 2018-2022 baidu
  */
 
 import { __extends, __assign, __rest, __decorate, __metadata, __spreadArray } from 'tslib';
 import React from 'react';
 import omit from 'lodash/omit';
-import merge from 'lodash/merge';
 import { filter, evalExpression, noop, padArr, isVisible, isDisabled, resolveVariable, hashCode, resolveVariableAndFilter, Renderer } from 'amis-core';
 import { Checkbox, Icon, Card } from 'amis-ui';
 import { HocQuickEdit } from './QuickEdit.js';
@@ -58,10 +57,10 @@ var CardRenderer = /** @class */ (function (_super) {
     CardRenderer.prototype.getPopOverContainer = function () {
         return findDOMNode(this);
     };
-    CardRenderer.prototype.handleQuickChange = function (values, saveImmediately, savePristine, resetOnFailed) {
+    CardRenderer.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);
     };
     CardRenderer.prototype.renderToolbar = function () {
         var _a = this.props, selectable = _a.selectable, checkable = _a.checkable, selected = _a.selected, checkOnItemClick = _a.checkOnItemClick, multiple = _a.multiple, hideCheckToggler = _a.hideCheckToggler, cx = _a.classnames, toolbar = _a.toolbar, render = _a.render, dragging = _a.dragging, data = _a.data, header = _a.header;
@@ -130,7 +129,8 @@ var CardRenderer = /** @class */ (function (_super) {
         return this.renderFeild("column/".concat(index), field, index, props);
     };
     CardRenderer.prototype.renderFeild = function (region, field, key, props) {
-        var render = props.render, cx = props.classnames, itemIndex = props.itemIndex, useCardLabel = props.useCardLabel;
+        var render = props.render, cx = props.classnames, itemIndex = props.itemIndex;
+        var useCardLabel = (props === null || props === void 0 ? void 0 : props.useCardLabel) !== false;
         var data = this.props.data;
         if (!field || !isVisible(field, data)) {
             return;
@@ -138,9 +138,8 @@ var CardRenderer = /** @class */ (function (_super) {
         var $$id = field.$$id ? "".concat(field.$$id, "-field") : '';
         return (React.createElement("div", { className: cx('Card-field'), key: key },
             useCardLabel && field.label ? (React.createElement("label", { className: cx('Card-fieldLabel', field.labelClassName) }, field.label)) : null,
-            render(region, merge(__assign(__assign({}, field), { field: field, $$id: $$id, type: 'card-item-field' }), useCardLabel
-                ? { label: false, field: __assign(__assign({}, field), { label: false }) }
-                : {}), {
+            render(region, __assign(__assign({}, field), { field: field, $$id: $$id, type: 'card-item-field' }), {
+                useCardLabel: useCardLabel,
                 className: cx('Card-fieldValue', field.className),
                 rowIndex: itemIndex,
                 colIndex: key,
@@ -339,8 +338,10 @@ var CardRenderer = /** @class */ (function (_super) {
         return _super !== null && _super.apply(this, arguments) || this;
     }
     CardItemFieldRenderer.prototype.render = function () {
-        var _a = this.props; _a.type; var className = _a.className, render = _a.render, style = _a.style, Component = _a.wrapperComponent; _a.labelClassName; var value = _a.value, data = _a.data, children = _a.children, width = _a.width, innerClassName = _a.innerClassName; _a.label; var tabIndex = _a.tabIndex, onKeyUp = _a.onKeyUp, field = _a.field, rest = __rest(_a, ["type", "className", "render", "style", "wrapperComponent", "labelClassName", "value", "data", "children", "width", "innerClassName", "label", "tabIndex", "onKeyUp", "field"]);
-        var schema = __assign(__assign({}, field), { className: innerClassName, type: (field && field.type) || 'plain' });
+        var _a = this.props; _a.type; var className = _a.className, render = _a.render, style = _a.style, Component = _a.wrapperComponent; _a.labelClassName; var value = _a.value, data = _a.data, children = _a.children, width = _a.width, innerClassName = _a.innerClassName; _a.label; var tabIndex = _a.tabIndex, onKeyUp = _a.onKeyUp, field = _a.field, useCardLabel = _a.useCardLabel, rest = __rest(_a, ["type", "className", "render", "style", "wrapperComponent", "labelClassName", "value", "data", "children", "width", "innerClassName", "label", "tabIndex", "onKeyUp", "field", "useCardLabel"]);
+        var schema = __assign(__assign({}, field), { 
+            /** 针对带有label的表单项组件，默认不渲染组件自带的label，否则会出现重复的label */
+            renderLabel: !useCardLabel, className: innerClassName, type: (field && field.type) || 'plain' });
         var body = children
             ? children
             : render('field', schema, __assign(__assign({}, omit(rest, Object.keys(schema))), { value: value, data: data }));

package/esm/renderers/Card2.js

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

package/esm/renderers/Cards.d.ts

@@ -107,8 +107,12 @@ 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;
+    onSave?: (items: Array<object> | object, diff: Array<object> | object, rowIndexes: Array<number> | number, 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;
 }
@@ -136,7 +140,10 @@ export default class Cards extends React.Component<GridProps, object> {
     handleSelectAll(): void;
     handleClearAll(): void;
     syncSelected(): void;
-    handleQuickChange(item: IItem, values: object, saveImmediately?: boolean | any, saveSilent?: boolean, resetOnFailed?: boolean): void;
+    handleQuickChange(item: IItem, values: object, saveImmediately?: boolean | any, savePristine?: boolean, options?: {
+        resetOnFailed?: boolean;
+        reload?: string;
+    }): void;
     handleSave(): void;
     handleSaveOrder(): void;
     reset(): void;

package/esm/renderers/Cards.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.2.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) {
@@ -214,15 +214,16 @@ var Cards = /** @class */ (function (_super) {
         }));
         onSelect && onSelect(selectItems, unSelectItems);
     };
-    Cards.prototype.handleQuickChange = function (item, values, saveImmediately, saveSilent, resetOnFailed) {
-        item.change(values, saveSilent);
-        if (!saveImmediately || saveSilent) {
+    Cards.prototype.handleQuickChange = function (item, values, saveImmediately, savePristine, options) {
+        item.change(values, savePristine);
+        if (!saveImmediately || savePristine) {
             return;
         }
         if (saveImmediately && saveImmediately.api) {
             this.props.onAction(null, {
                 actionType: 'ajax',
-                api: saveImmediately.api
+                api: saveImmediately.api,
+                reload: options === null || options === void 0 ? void 0 : options.reload
             }, values);
             return;
         }
@@ -230,7 +231,7 @@ var Cards = /** @class */ (function (_super) {
         if (!onSave) {
             return;
         }
-        onSave(item.data, difference(item.data, item.pristine, ['id', primaryField]), item.index, undefined, item.pristine, resetOnFailed);
+        onSave(item.data, difference(item.data, item.pristine, ['id', primaryField]), item.index, undefined, item.pristine, options);
     };
     Cards.prototype.handleSave = function () {
         var _a = this.props, store = _a.store, onSave = _a.onSave, primaryField = _a.primaryField;
@@ -305,6 +306,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 +403,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 +412,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 +435,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 +464,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 +497,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.2.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Chart.js

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

package/esm/renderers/Collapse.js

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

package/esm/renderers/CollapseGroup.js

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

package/esm/renderers/Color.js

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

package/esm/renderers/Container.js

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

package/esm/renderers/Copyable.js

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

package/esm/renderers/Date.js

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