amis 2.3.1 → 2.3.2-beta.1

package/lib/renderers/Form/UserSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 
@@ -101,11 +101,11 @@ var UserSelectControl = /** @class */ (function (_super) {
     };
     UserSelectControl.prototype.changeValue = function (value) {
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, joinValues, extractValue, delimiter, multiple, valueField, onChange, options, data, dispatchEvent, newValue, additonalOptions, rendererEvent;
+            var _a, joinValues, extractValue, delimiter, multiple, valueField, onChange, options, dispatchEvent, newValue, additonalOptions, rendererEvent;
             return tslib.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = this.props, joinValues = _a.joinValues, extractValue = _a.extractValue, delimiter = _a.delimiter, multiple = _a.multiple, valueField = _a.valueField, onChange = _a.onChange, options = _a.options, _a.setOptions, data = _a.data, dispatchEvent = _a.dispatchEvent;
+                        _a = this.props, joinValues = _a.joinValues, extractValue = _a.extractValue, delimiter = _a.delimiter, multiple = _a.multiple, valueField = _a.valueField, onChange = _a.onChange, options = _a.options, _a.setOptions, _a.data, dispatchEvent = _a.dispatchEvent;
                         newValue = value;
                         additonalOptions = [];
                         (Array.isArray(value) ? value : value ? [value] : []).forEach(function (option) {
@@ -140,10 +140,11 @@ var UserSelectControl = /** @class */ (function (_super) {
                                 newValue = newValue ? newValue[valueField || 'value'] : '';
                             }
                         }
-                        return [4 /*yield*/, dispatchEvent('change', amisCore.createObject(data, {
+                        return [4 /*yield*/, dispatchEvent('change', amisCore.resolveEventData(this.props, {
                                 value: newValue,
-                                options: options
-                            }))];
+                                options: options,
+                                items: options // 为了保持名字统一
+                            }, 'value'))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {

package/lib/renderers/Grid.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Grid2D.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/GridNav.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/HBox.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/IFrame.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Icon.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Image.d.ts

@@ -119,7 +119,14 @@ export interface ImageThumbProps extends LocaleProps, ThemeProps, Omit<ImageSche
     onLoad?: React.EventHandler<any>;
     overlays?: JSX.Element;
 }
-export declare class ImageThumb extends React.Component<ImageThumbProps> {
+interface ImageThumbState {
+    imageLoading: boolean;
+}
+export declare class ImageThumb extends React.Component<ImageThumbProps, ImageThumbState> {
+    constructor(props: ImageThumbProps);
+    componentDidUpdate(preProps: ImageThumbProps): void;
+    handleImgLoaded(e: React.SyntheticEvent<HTMLImageElement, Event>): void;
+    handleImgError(e: React.SyntheticEvent<HTMLImageElement, Event>): void;
     handleEnlarge(): void;
     render(): JSX.Element;
 }

package/lib/renderers/Image.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 
@@ -18,27 +18,55 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
 var ImageThumb = /** @class */ (function (_super) {
     tslib.__extends(ImageThumb, _super);
-    function ImageThumb() {
-        return _super !== null && _super.apply(this, arguments) || this;
+    function ImageThumb(props) {
+        var _this = _super.call(this, props) || this;
+        _this.state = {
+            imageLoading: false
+        };
+        return _this;
     }
+    ImageThumb.prototype.componentDidUpdate = function (preProps) {
+        if (preProps.src !== this.props.src) {
+            this.setState({
+                imageLoading: true
+            });
+        }
+    };
+    ImageThumb.prototype.handleImgLoaded = function (e) {
+        var _a, _b;
+        this.setState({
+            imageLoading: false
+        });
+        (_b = (_a = this.props) === null || _a === void 0 ? void 0 : _a.onLoad) === null || _b === void 0 ? void 0 : _b.call(_a, e);
+    };
+    ImageThumb.prototype.handleImgError = function (e) {
+        this.setState({
+            imageLoading: false
+        });
+    };
     ImageThumb.prototype.handleEnlarge = function () {
         var _a = this.props, onEnlarge = _a.onEnlarge, rest = tslib.__rest(_a, ["onEnlarge"]);
         onEnlarge && onEnlarge(rest);
     };
     ImageThumb.prototype.render = function () {
-        var _a = this.props, cx = _a.classnames, className = _a.className, imageClassName = _a.imageClassName, thumbClassName = _a.thumbClassName, thumbMode = _a.thumbMode, thumbRatio = _a.thumbRatio, height = _a.height, width = _a.width, src = _a.src, alt = _a.alt, title = _a.title, caption = _a.caption, href = _a.href, _b = _a.blank, blank = _b === void 0 ? true : _b, htmlTarget = _a.htmlTarget, onLoad = _a.onLoad, enlargeAble = _a.enlargeAble, __ = _a.translate, overlays = _a.overlays, imageMode = _a.imageMode;
+        var _a = this.props, cx = _a.classnames, className = _a.className, imageClassName = _a.imageClassName, thumbClassName = _a.thumbClassName, thumbMode = _a.thumbMode, thumbRatio = _a.thumbRatio, height = _a.height, width = _a.width, src = _a.src, alt = _a.alt, title = _a.title, caption = _a.caption, href = _a.href, _b = _a.blank, blank = _b === void 0 ? true : _b, htmlTarget = _a.htmlTarget; _a.onLoad; var enlargeAble = _a.enlargeAble, __ = _a.translate, overlays = _a.overlays, imageMode = _a.imageMode;
+        var imageLoading = this.state.imageLoading;
+        var imageContent = (React__default["default"].createElement(React__default["default"].Fragment, null,
+            imageLoading ? (React__default["default"].createElement("img", { className: cx('Image-image', imageClassName), src: imagePlaceholder, alt: alt })) : null,
+            React__default["default"].createElement("img", { onLoad: this.handleImgLoaded, onError: this.handleImgError, className: cx('Image-image', imageClassName, {
+                    'Image-image--loading': imageLoading
+                }), src: src, alt: alt })));
         var enlarge = enlargeAble || overlays ? (React__default["default"].createElement("div", { key: "overlay", className: cx('Image-overlay') },
             enlargeAble ? (React__default["default"].createElement("a", { "data-tooltip": __('Image.zoomIn'), "data-position": "bottom", target: "_blank", onClick: this.handleEnlarge },
                 React__default["default"].createElement(amisUi.Icon, { icon: "view", className: "icon" }))) : null,
             overlays)) : null;
         var image = (React__default["default"].createElement("div", { className: cx('Image', imageMode === 'original' ? 'Image--original' : 'Image--thumb', className) },
             imageMode === 'original' ? (React__default["default"].createElement("div", { className: cx('Image-origin', thumbMode ? "Image-origin--".concat(thumbMode) : ''), style: { height: height, width: width } },
-                React__default["default"].createElement("img", { onLoad: onLoad, className: cx('Image-image', imageClassName), src: src, alt: alt }),
+                imageContent,
                 enlarge)) : (React__default["default"].createElement("div", { className: cx('Image-thumbWrap') },
                 React__default["default"].createElement("div", { className: cx('Image-thumb', thumbClassName, thumbMode ? "Image-thumb--".concat(thumbMode) : '', thumbRatio
                         ? "Image-thumb--".concat(thumbRatio.replace(/:/g, '-'))
-                        : ''), style: { height: height, width: width } },
-                    React__default["default"].createElement("img", { onLoad: onLoad, className: cx('Image-image', imageClassName), src: src, alt: alt })),
+                        : ''), style: { height: height, width: width } }, imageContent),
                 enlarge)),
             title || caption ? (React__default["default"].createElement("div", { key: "caption", className: cx('Image-info') },
                 title ? (React__default["default"].createElement("div", { className: cx('Image-title'), title: title }, title)) : null,
@@ -48,6 +76,18 @@ var ImageThumb = /** @class */ (function (_super) {
         }
         return image;
     };
+    tslib.__decorate([
+        amisCore.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", [Object]),
+        tslib.__metadata("design:returntype", void 0)
+    ], ImageThumb.prototype, "handleImgLoaded", null);
+    tslib.__decorate([
+        amisCore.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", [Object]),
+        tslib.__metadata("design:returntype", void 0)
+    ], ImageThumb.prototype, "handleImgError", null);
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),

package/lib/renderers/Images.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Json.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Link.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/List.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Log.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Mapping.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Markdown.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Nav.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Operation.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Page.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Pagination.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/PaginationWrapper.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Panel.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Plain.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/PopOver.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Portlet.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Progress.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Property.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/QRCode.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/QuickEdit.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Remark.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/SearchBox.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Service.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/SparkLine.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Spinner.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Status.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Steps.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Table/ColumnToggler.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Table/HeadCellFilterDropdown.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Table/HeadCellSearchDropdown.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Table/ItemActionsWrapper.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Table/TableBody.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Table/TableCell.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Table/TableContent.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Table/TableRow.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Table/exportExcel.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Table/index.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 
@@ -225,6 +225,7 @@ var Table = /** @class */ (function (_super) {
         }
     };
     Table.prototype.componentDidUpdate = function (prevProps) {
+        var _this = this;
         var props = this.props;
         var store = props.store;
         if (amisCore.anyChanged([
@@ -284,7 +285,8 @@ var Table = /** @class */ (function (_super) {
             var selectedRows = store.selectedRows.map(function (item) { return item.id; }).join(',');
             prevSelectedRows !== selectedRows && this.syncSelected();
         }
-        this.updateTableInfoLazy();
+        // 延迟执行，否则表格还没更新，拿到的宽度不对，导致表头错位
+        Promise.resolve().then(function () { return _this.updateTableInfoLazy(); });
     };
     Table.prototype.componentWillUnmount = function () {
         var formItem = this.props.formItem;

package/lib/renderers/Table2/ColumnToggler.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Table2/HeadCellSearchDropdown.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Table2/TableCell.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Table2/index.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/TableView.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Tabs.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 
@@ -292,11 +292,11 @@ var Tabs = /** @class */ (function (_super) {
     Tabs.prototype.handleSelect = function (key) {
         var _a;
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _b, dispatchEvent, data, env, onSelect, id, localTabs, tab, rendererEvent, selectFunc;
+            var _b, dispatchEvent, env, onSelect, id, localTabs, tab, rendererEvent, selectFunc;
             return tslib.__generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
-                        _b = this.props, dispatchEvent = _b.dispatchEvent, data = _b.data, env = _b.env, onSelect = _b.onSelect, id = _b.id;
+                        _b = this.props, dispatchEvent = _b.dispatchEvent, _b.data, env = _b.env, onSelect = _b.onSelect, id = _b.id;
                         localTabs = this.state.localTabs;
                         (_a = env.tracker) === null || _a === void 0 ? void 0 : _a.call(env, {
                             eventType: 'tabChange',
@@ -306,9 +306,9 @@ var Tabs = /** @class */ (function (_super) {
                             }
                         });
                         tab = localTabs === null || localTabs === void 0 ? void 0 : localTabs.find(function (item, index) { return key === (item.hash ? item.hash : index); });
-                        return [4 /*yield*/, dispatchEvent('change', amisCore.createObject(data, {
+                        return [4 /*yield*/, dispatchEvent('change', amisCore.resolveEventData(this.props, {
                                 value: (tab === null || tab === void 0 ? void 0 : tab.hash) ? tab === null || tab === void 0 ? void 0 : tab.hash : key + 1
-                            }))];
+                            }, 'value'))];
                     case 1:
                         rendererEvent = _c.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {

package/lib/renderers/Tag.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Tasks.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Timeline.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/TooltipWrapper.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Tpl.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/VBox.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Video.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */