amis 2.2.0 → 2.3.1

package/esm/renderers/Form/Picker.js

@@ -1,14 +1,15 @@
 /**
- * amis v2.2.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
 
 import { __extends, __assign, __awaiter, __generator, __decorate, __metadata } from 'tslib';
 import React from 'react';
-import { anyChanged, isApiOutdated, createObject, isPureVariable, resolveVariableAndFilter, isEffectiveApi, filter, getVariable, noop, autobind, OptionsControl } from 'amis-core';
 import cx from 'classnames';
 import find from 'lodash/find';
+import isEqual from 'lodash/isEqual';
 import findIndex from 'lodash/findIndex';
+import { isApiOutdated, createObject, isPureVariable, resolveVariableAndFilter, isEffectiveApi, getVariable, filter, noop, autobind, OptionsControl } from 'amis-core';
 import { Html, Icon } from 'amis-ui';
 
 var PickerControl = /** @class */ (function (_super) {
@@ -28,7 +29,8 @@ var PickerControl = /** @class */ (function (_super) {
     };
     PickerControl.prototype.componentDidUpdate = function (prevProps) {
         var props = this.props;
-        if (anyChanged(['pickerSchema', 'multiple', 'source'], prevProps, props)) {
+        var detectedProps = ['multiple', 'source', 'pickerSchema'];
+        if (detectedProps.some(function (key) { return !isEqual(prevProps[key], props[key]); })) {
             this.setState({
                 schema: this.buildSchema(props)
             });
@@ -100,9 +102,20 @@ var PickerControl = /** @class */ (function (_super) {
         });
     };
     PickerControl.prototype.handleModalConfirm = function (values, action, ctx, components) {
-        var idx = findIndex(components, function (item) { return item.props.type === 'crud'; });
-        this.handleChange(values[idx].items);
-        this.close();
+        return __awaiter(this, void 0, void 0, function () {
+            var idx;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        idx = findIndex(components, function (item) { return item.props.type === 'crud'; });
+                        return [4 /*yield*/, this.handleChange(values[idx].items)];
+                    case 1:
+                        _a.sent();
+                        this.close();
+                        return [2 /*return*/];
+                }
+            });
+        });
     };
     PickerControl.prototype.handleChange = function (items) {
         return __awaiter(this, void 0, void 0, function () {
@@ -110,7 +123,7 @@ var PickerControl = /** @class */ (function (_super) {
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = this.props, joinValues = _a.joinValues, valueField = _a.valueField, delimiter = _a.delimiter, extractValue = _a.extractValue, multiple = _a.multiple, options = _a.options, data = _a.data, dispatchEvent = _a.dispatchEvent, setOptions = _a.setOptions, onChange = _a.onChange;
+                        _a = this.props, joinValues = _a.joinValues, valueField = _a.valueField, delimiter = _a.delimiter, extractValue = _a.extractValue, multiple = _a.multiple, options = _a.options, data = _a.data, dispatchEvent = _a.dispatchEvent, _a.selectedOptions, setOptions = _a.setOptions, onChange = _a.onChange;
                         value = items;
                         if (joinValues) {
                             value = items
@@ -144,6 +157,24 @@ var PickerControl = /** @class */ (function (_super) {
             });
         });
     };
+    PickerControl.prototype.handleItemClick = function (itemlabel, itemid) {
+        return __awaiter(this, void 0, void 0, function () {
+            var _a, data, dispatchEvent, rendererEvent;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = this.props, data = _a.data, dispatchEvent = _a.dispatchEvent, _a.setOptions;
+                        return [4 /*yield*/, dispatchEvent('itemclick', createObject(data, { label: itemlabel, id: itemid }))];
+                    case 1:
+                        rendererEvent = _b.sent();
+                        if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
+                            return [2 /*return*/];
+                        }
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
     PickerControl.prototype.removeItem = function (index) {
         var _a = this.props, selectedOptions = _a.selectedOptions, joinValues = _a.joinValues, extractValue = _a.extractValue, delimiter = _a.delimiter, valueField = _a.valueField, onChange = _a.onChange, multiple = _a.multiple;
         var items = selectedOptions.concat();
@@ -202,7 +233,10 @@ var PickerControl = /** @class */ (function (_super) {
                     e.stopPropagation();
                     _this.removeItem(index);
                 } }, "\u00D7"),
-            React.createElement("span", { className: "".concat(ns, "Picker-valueLabel") }, labelTpl ? (React.createElement(Html, { html: filter(labelTpl, item) })) : ("".concat(getVariable(item, labelField || 'label') ||
+            React.createElement("span", { className: "".concat(ns, "Picker-valueLabel"), onClick: function (e) {
+                    e.stopPropagation();
+                    _this.handleItemClick(getVariable(item, labelField || 'label'), getVariable(item, 'id') || '');
+                } }, labelTpl ? (React.createElement(Html, { html: filter(labelTpl, item) })) : ("".concat(getVariable(item, labelField || 'label') ||
                 getVariable(item, 'id')))))); })));
     };
     PickerControl.prototype.renderBody = function (_a) {
@@ -220,7 +254,7 @@ var PickerControl = /** @class */ (function (_super) {
         });
     };
     PickerControl.prototype.render = function () {
-        var _a = this.props, className = _a.className, cx = _a.classnames, disabled = _a.disabled, render = _a.render, modalMode = _a.modalMode, source = _a.source, size = _a.size; _a.env; var clearable = _a.clearable, multiple = _a.multiple, placeholder = _a.placeholder, embed = _a.embed; _a.value; var selectedOptions = _a.selectedOptions, __ = _a.translate, popOverContainer = _a.popOverContainer;
+        var _a = this.props, className = _a.className, cx = _a.classnames, disabled = _a.disabled, render = _a.render, modalMode = _a.modalMode, source = _a.source, size = _a.size, clearable = _a.clearable, multiple = _a.multiple, placeholder = _a.placeholder, embed = _a.embed, selectedOptions = _a.selectedOptions, __ = _a.translate, popOverContainer = _a.popOverContainer;
         return (React.createElement("div", { className: cx("PickerControl", className) }, embed ? (React.createElement("div", { className: cx('Picker') }, this.renderBody({ popOverContainer: popOverContainer }))) : (React.createElement("div", { className: cx("Picker", {
                 'Picker--single': !multiple,
                 'Picker--multi': multiple,
@@ -301,7 +335,7 @@ var PickerControl = /** @class */ (function (_super) {
         autobind,
         __metadata("design:type", Function),
         __metadata("design:paramtypes", [Array, Object, Object, Array]),
-        __metadata("design:returntype", void 0)
+        __metadata("design:returntype", Promise)
     ], PickerControl.prototype, "handleModalConfirm", null);
     __decorate([
         autobind,
@@ -309,6 +343,12 @@ var PickerControl = /** @class */ (function (_super) {
         __metadata("design:paramtypes", [Array]),
         __metadata("design:returntype", Promise)
     ], PickerControl.prototype, "handleChange", null);
+    __decorate([
+        autobind,
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [String, String]),
+        __metadata("design:returntype", Promise)
+    ], PickerControl.prototype, "handleItemClick", null);
     __decorate([
         autobind,
         __metadata("design:type", Function),

package/esm/renderers/Form/Radios.js

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

package/esm/renderers/Form/Select.d.ts

@@ -118,7 +118,7 @@ export default class SelectControl extends React.Component<SelectProps, any> {
     componentWillUnmount(): void;
     inputRef(ref: any): void;
     foucs(): void;
-    getValue(value: Option | Array<Option> | string | void): string | void | Option | Option[];
+    getValue(value: Option | Array<Option> | string | void, additonalOptions?: Array<any>): string | void | Option | Option[];
     dispatchEvent(eventName: SelectRendererEvent, eventData?: any): Promise<void>;
     changeValue(value: Option | Array<Option> | string | void): Promise<void>;
     loadRemote(input: string): Promise<(() => void) | {

package/esm/renderers/Form/Select.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
 
@@ -41,13 +41,15 @@ var SelectControl = /** @class */ (function (_super) {
     SelectControl.prototype.foucs = function () {
         this.input && this.input.focus();
     };
-    SelectControl.prototype.getValue = function (value) {
+    SelectControl.prototype.getValue = function (value, additonalOptions) {
+        if (additonalOptions === void 0) { additonalOptions = []; }
         var _a = this.props, joinValues = _a.joinValues, extractValue = _a.extractValue, delimiter = _a.delimiter, multiple = _a.multiple, valueField = _a.valueField, options = _a.options;
         var newValue = value;
         (Array.isArray(value) ? value : value ? [value] : []).forEach(function (option) {
-            find(options, function (item) {
+            var resolved = find(options, function (item) {
                 return item[valueField || 'value'] == option[valueField || 'value'];
             });
+            resolved || additonalOptions.push(option);
         });
         if (joinValues) {
             if (multiple) {
@@ -106,13 +108,13 @@ var SelectControl = /** @class */ (function (_super) {
     };
     SelectControl.prototype.changeValue = function (value) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, onChange, setOptions, options, data, dispatchEvent, newValue, additonalOptions, rendererEvent;
+            var _a, onChange, setOptions, options, data, dispatchEvent, additonalOptions, newValue, rendererEvent;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         _a = this.props, onChange = _a.onChange, setOptions = _a.setOptions, options = _a.options, data = _a.data, dispatchEvent = _a.dispatchEvent;
-                        newValue = this.getValue(value);
                         additonalOptions = [];
+                        newValue = this.getValue(value, additonalOptions);
                         // 不设置没法回显
                         additonalOptions.length && setOptions(options.concat(additonalOptions));
                         return [4 /*yield*/, dispatchEvent('change', createObject(data, {
@@ -260,7 +262,7 @@ var TransferDropdownRenderer = /** @class */ (function (_super) {
         var _c = this.props, options = _c.options, leftOptions = _c.leftOptions, leftDefaultValue = _c.leftDefaultValue;
         if (selectMode === 'associated' &&
             options &&
-            options.length === 1 &&
+            options.length &&
             options[0].leftOptions &&
             Array.isArray(options[0].children)) {
             leftOptions = options[0].leftOptions;

package/esm/renderers/Form/Static.js

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

package/esm/renderers/Form/Switch.js

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

package/esm/renderers/Form/TabsTransfer.js

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

package/esm/renderers/Form/TabsTransferPicker.js

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

package/esm/renderers/Form/Textarea.js

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

package/esm/renderers/Form/Transfer.d.ts

@@ -86,6 +86,10 @@ export interface TransferControlSchema extends FormOptionsSchema {
      * 右侧列表搜索框提示
      */
     resultSearchPlaceholder?: string;
+    /**
+     * 统计数字
+     */
+    statistics?: boolean;
 }
 export interface BaseTransferProps extends OptionsControlProps, Omit<TransferControlSchema, 'type' | 'options' | 'className' | 'descriptionClassName' | 'inputClassName'> {
     resultItemRender?: (option: Option) => JSX.Element;

package/esm/renderers/Form/Transfer.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
 
@@ -20,7 +20,7 @@ var BaseTransferRenderer = /** @class */ (function (_super) {
     };
     BaseTransferRenderer.prototype.handleChange = function (value, optionModified) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, onChange, joinValues, delimiter, valueField, extractValue, options, dispatchEvent, setOptions, newValue, newOptions, rendererEvent;
+            var _a, onChange, joinValues, delimiter, valueField, extractValue, options, dispatchEvent, setOptions, newValue, newOptions, indexes, origin_1, rendererEvent;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -34,8 +34,8 @@ var BaseTransferRenderer = /** @class */ (function (_super) {
                                     newOptions.push(item);
                                 }
                                 else if (optionModified) {
-                                    var origin_1 = getTree(newOptions, indexes);
-                                    newOptions = spliceTree(newOptions, indexes, 1, __assign(__assign({}, origin_1), item));
+                                    var origin_2 = getTree(newOptions, indexes);
+                                    newOptions = spliceTree(newOptions, indexes, 1, __assign(__assign({}, origin_2), item));
                                 }
                                 return joinValues || extractValue
                                     ? item[valueField || 'value']
@@ -50,6 +50,14 @@ var BaseTransferRenderer = /** @class */ (function (_super) {
                                 joinValues || extractValue
                                     ? value[valueField || 'value']
                                     : value;
+                            indexes = findTreeIndex(options, optionValueCompare(value[valueField || 'value'], valueField || 'value'));
+                            if (!indexes) {
+                                newOptions.push(value);
+                            }
+                            else if (optionModified) {
+                                origin_1 = getTree(newOptions, indexes);
+                                newOptions = spliceTree(newOptions, indexes, 1, __assign(__assign({}, origin_1), value));
+                            }
                         }
                         (newOptions.length > options.length || optionModified) &&
                             setOptions(newOptions, true);
@@ -92,7 +100,7 @@ var BaseTransferRenderer = /** @class */ (function (_super) {
                         }
                         result = payload.data.options || payload.data.items || payload.data;
                         if (!Array.isArray(result)) {
-                            throw new Error('CRUD.invalidArray');
+                            throw new Error(__('CRUD.invalidArray'));
                         }
                         return [2 /*return*/, result.map(function (item) {
                                 var resolved = null;
@@ -150,7 +158,7 @@ var BaseTransferRenderer = /** @class */ (function (_super) {
                 data: createObject(createObject(data, states), option)
             });
         }
-        return ResultList.itemRender(option);
+        return ResultList.itemRender(option, states);
     };
     BaseTransferRenderer.prototype.renderCell = function (column, option, colIndex, rowIndex) {
         var _a = this.props, render = _a.render, data = _a.data;
@@ -166,8 +174,8 @@ var BaseTransferRenderer = /** @class */ (function (_super) {
         this.tranferRef = ref;
     };
     BaseTransferRenderer.prototype.onSelectAll = function (options) {
-        var dispatchEvent = this.props.dispatchEvent;
-        dispatchEvent('selectAll', options);
+        var _a = this.props, dispatchEvent = _a.dispatchEvent, data = _a.data;
+        dispatchEvent('selectAll', createObject(data, { options: options }));
     };
     // 动作
     BaseTransferRenderer.prototype.doAction = function (action, data, throwErrors) {
@@ -187,7 +195,7 @@ var BaseTransferRenderer = /** @class */ (function (_super) {
     };
     BaseTransferRenderer.prototype.render = function () {
         var _a;
-        var _b = this.props, className = _b.className, cx = _b.classnames, selectedOptions = _b.selectedOptions, showArrow = _b.showArrow, sortable = _b.sortable, selectMode = _b.selectMode, columns = _b.columns, loading = _b.loading, searchable = _b.searchable, searchResultMode = _b.searchResultMode, searchResultColumns = _b.searchResultColumns, deferLoad = _b.deferLoad, leftMode = _b.leftMode, rightMode = _b.rightMode, disabled = _b.disabled, selectTitle = _b.selectTitle, resultTitle = _b.resultTitle; _b.menuTpl; var searchPlaceholder = _b.searchPlaceholder, _c = _b.resultListModeFollowSelect, resultListModeFollowSelect = _c === void 0 ? false : _c, resultSearchPlaceholder = _b.resultSearchPlaceholder, _d = _b.resultSearchable, resultSearchable = _d === void 0 ? false : _d;
+        var _b = this.props, className = _b.className, cx = _b.classnames, selectedOptions = _b.selectedOptions, showArrow = _b.showArrow, sortable = _b.sortable, selectMode = _b.selectMode, columns = _b.columns, loading = _b.loading, searchable = _b.searchable, searchResultMode = _b.searchResultMode, searchResultColumns = _b.searchResultColumns, deferLoad = _b.deferLoad, leftMode = _b.leftMode, rightMode = _b.rightMode, disabled = _b.disabled, selectTitle = _b.selectTitle, resultTitle = _b.resultTitle; _b.menuTpl; var searchPlaceholder = _b.searchPlaceholder, _c = _b.resultListModeFollowSelect, resultListModeFollowSelect = _c === void 0 ? false : _c, resultSearchPlaceholder = _b.resultSearchPlaceholder, _d = _b.resultSearchable, resultSearchable = _d === void 0 ? false : _d, statistics = _b.statistics, labelField = _b.labelField;
         // 目前 LeftOptions 没有接口可以动态加载
         // 为了方便可以快速实现动态化，让选项的第一个成员携带
         // LeftOptions 信息
@@ -202,7 +210,7 @@ var BaseTransferRenderer = /** @class */ (function (_super) {
             options = options[0].children;
         }
         return (React.createElement("div", { className: cx('TransferControl', className) },
-            React.createElement(Transfer, { value: selectedOptions, options: options, disabled: disabled, onChange: this.handleChange, option2value: this.option2value, sortable: sortable, showArrow: showArrow, selectMode: selectMode, searchResultMode: searchResultMode, searchResultColumns: searchResultColumns, columns: columns, onSearch: searchable ? this.handleSearch : undefined, onDeferLoad: deferLoad, leftOptions: leftOptions, leftMode: leftMode, rightMode: rightMode, cellRender: this.renderCell, selectTitle: selectTitle, resultTitle: resultTitle, resultListModeFollowSelect: resultListModeFollowSelect, onResultSearch: this.handleResultSearch, searchPlaceholder: searchPlaceholder, resultSearchable: resultSearchable, resultSearchPlaceholder: resultSearchPlaceholder, optionItemRender: this.optionItemRender, resultItemRender: this.resultItemRender, onSelectAll: this.onSelectAll, onRef: this.getRef }),
+            React.createElement(Transfer, { value: selectedOptions, options: options, disabled: disabled, onChange: this.handleChange, option2value: this.option2value, sortable: sortable, showArrow: showArrow, selectMode: selectMode, searchResultMode: searchResultMode, searchResultColumns: searchResultColumns, columns: columns, onSearch: searchable ? this.handleSearch : undefined, onDeferLoad: deferLoad, leftOptions: leftOptions, leftMode: leftMode, rightMode: rightMode, cellRender: this.renderCell, selectTitle: selectTitle, resultTitle: resultTitle, resultListModeFollowSelect: resultListModeFollowSelect, onResultSearch: this.handleResultSearch, searchPlaceholder: searchPlaceholder, resultSearchable: resultSearchable, resultSearchPlaceholder: resultSearchPlaceholder, statistics: statistics, labelField: labelField, optionItemRender: this.optionItemRender, resultItemRender: this.resultItemRender, onSelectAll: this.onSelectAll, onRef: this.getRef }),
             React.createElement(Spinner, { overlay: true, key: "info", show: loading })));
     };
     __decorate([

package/esm/renderers/Form/TransferPicker.js

@@ -1,10 +1,10 @@
 /**
- * amis v2.2.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
 
 import { __extends, __decorate, __metadata } from 'tslib';
-import { autobind, OptionsControl } from 'amis-core';
+import { createObject, autobind, OptionsControl } from 'amis-core';
 import React from 'react';
 import { TransferPicker, Spinner } from 'amis-ui';
 import { BaseTransferRenderer } from './Transfer.js';
@@ -15,8 +15,8 @@ import { BaseTransferRenderer } from './Transfer.js';
         return _super !== null && _super.apply(this, arguments) || this;
     }
     TransferPickerRenderer.prototype.dispatchEvent = function (name) {
-        var _a = this.props, dispatchEvent = _a.dispatchEvent, data = _a.data;
-        dispatchEvent(name, data);
+        var _a = this.props, dispatchEvent = _a.dispatchEvent, data = _a.data, value = _a.value;
+        dispatchEvent(name, createObject(data, { value: value }));
     };
     // 动作
     TransferPickerRenderer.prototype.doAction = function (action) {
@@ -40,7 +40,7 @@ import { BaseTransferRenderer } from './Transfer.js';
         var _c = this.props, options = _c.options, leftOptions = _c.leftOptions, leftDefaultValue = _c.leftDefaultValue;
         if (selectMode === 'associated' &&
             options &&
-            options.length === 1 &&
+            options.length &&
             options[0].leftOptions &&
             Array.isArray(options[0].children)) {
             leftOptions = options[0].leftOptions;

package/esm/renderers/Form/TreeSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
 
@@ -305,7 +305,7 @@ var TreeSelectControl = /** @class */ (function (_super) {
                     ? selectedOptions
                     : selectedOptions.length
                         ? this.renderItem(selectedOptions[0])
-                        : '', onResultClick: this.handleOutClick, value: this.state.inputValue, onChange: this.handleInputChange, onResultChange: this.handleResultChange, itemRender: this.renderItem, onKeyPress: this.handleKeyPress, onFocus: this.handleFocus, onBlur: this.handleBlur, onKeyDown: this.handleInputKeyDown, clearable: clearable, allowInput: searchable || isEffectiveApi(autoComplete) }, loading ? React.createElement(Spinner, { size: "sm" }) : undefined),
+                        : '', onResultClick: this.handleOutClick, value: this.state.inputValue, onChange: this.handleInputChange, onResultChange: this.handleResultChange, itemRender: this.renderItem, onKeyPress: this.handleKeyPress, onFocus: this.handleFocus, onBlur: this.handleBlur, onKeyDown: this.handleInputKeyDown, clearable: clearable, allowInput: searchable || isEffectiveApi(autoComplete), hasDropDownArrow: true }, loading ? React.createElement(Spinner, { size: "sm" }) : undefined),
             !mobileUI && isOpened ? (React.createElement(Overlay, { container: popOverContainer || (function () { return _this.container.current; }), target: function () { return _this.target; }, show: true },
                 React.createElement(PopOver, { classPrefix: ns, className: "".concat(ns, "TreeSelect-popover"), style: {
                         minWidth: this.target ? this.target.offsetWidth : undefined

package/esm/renderers/Form/UUID.js

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

package/esm/renderers/Form/UserSelect.js

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

package/esm/renderers/Grid.js

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

package/esm/renderers/Grid2D.js

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

package/esm/renderers/GridNav.js

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

package/esm/renderers/HBox.js

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

package/esm/renderers/IFrame.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.2.0
+ * amis v2.3.1
  * Copyright 2018-2022 baidu
  */
 
@@ -92,7 +92,7 @@ var IFrame = /** @class */ (function (_super) {
     };
     IFrame.prototype.render = function () {
         var _a = this.state, width = _a.width, height = _a.height;
-        var _b = this.props, className = _b.className, src = _b.src, name = _b.name, frameBorder = _b.frameBorder, data = _b.data, style = _b.style, allow = _b.allow, sandbox = _b.sandbox, referrerpolicy = _b.referrerpolicy;
+        var _b = this.props, className = _b.className, src = _b.src, name = _b.name, frameBorder = _b.frameBorder, data = _b.data, style = _b.style, allow = _b.allow, sandbox = _b.sandbox, referrerpolicy = _b.referrerpolicy, __ = _b.translate, env = _b.env;
         var tempStyle = {};
         width !== void 0 && (tempStyle.width = width);
         height !== void 0 && (tempStyle.height = height);
@@ -103,7 +103,12 @@ var IFrame = /** @class */ (function (_super) {
         if (typeof finalSrc === 'string' &&
             finalSrc &&
             !/^(\.\/|\.\.\/|\/|https?\:\/\/|\/\/)/.test(finalSrc)) {
-            return React.createElement("p", null, "\u8BF7\u586B\u5199\u5408\u6CD5\u7684 iframe \u5730\u5740");
+            return React.createElement("p", null, __('Iframe.invalid'));
+        }
+        if (location.protocol === 'https:' &&
+            finalSrc &&
+            finalSrc.startsWith('http://')) {
+            env.notify('error', __('Iframe.invalidProtocol'));
         }
         return (React.createElement("iframe", { name: name, className: className, frameBorder: frameBorder, style: style, ref: this.IFrameRef, onLoad: this.onLoad, src: finalSrc, allow: allow, referrerPolicy: referrerpolicy, sandbox: sandbox }));
     };

package/esm/renderers/Icon.js

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

package/esm/renderers/Image.d.ts

@@ -4,6 +4,14 @@ import { RendererProps } from 'amis-core';
 import { ThemeProps } from 'amis-core';
 import { LocaleProps } from 'amis-core';
 import { BaseSchema, SchemaClassName, SchemaTpl, SchemaUrlPath } from '../Schema';
+import type { ImageAction, ImageActionKey } from 'amis-ui/lib/components/ImageGallery';
+export interface ImageToolbarAction {
+    key: keyof typeof ImageActionKey;
+    label?: string;
+    icon?: string;
+    iconClassName?: string;
+    disabled?: boolean;
+}
 /**
  * 图片展示控件。
  * 文档：https://baidu.gitee.io/amis/docs/components/image
@@ -96,6 +104,14 @@ export interface ImageSchema extends BaseSchema {
      * 链接的 target
      */
     htmlTarget?: string;
+    /**
+     * 是否展示图片工具栏
+     */
+    showToolbar?: boolean;
+    /**
+     * 工具栏配置
+     */
+    toolbarActions?: ImageToolbarAction[];
 }
 export interface ImageThumbProps extends LocaleProps, ThemeProps, Omit<ImageSchema, 'type' | 'className' | 'innerClassName'> {
     onEnlarge?: (info: ImageThumbProps) => void;
@@ -174,22 +190,12 @@ declare const ThemedImageThumb: {
             translate?: ((str: string, ...args: any[]) => string) | undefined;
         }): {
             ref: any;
-            /**
-             * 图片无法显示时的替换文本
-             */
-            childRef(ref: any): void; /**
-             * 图片无法显示时的替换文本
-             */
+            childRef(ref: any): void;
             getWrappedInstance(): any;
             render(): JSX.Element;
-            context: any; /**
-             * 宽度
-             */
+            context: any;
             setState<K_1 extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<ImageThumbProps, keyof LocaleProps> & {
                 locale?: string | undefined;
-                /**
-                 * 图片缩略图外层 css 类名
-                 */
                 translate?: ((str: string, ...args: any[]) => string) | undefined;
             }>) => {} | Pick<{}, K_1> | null) | Pick<{}, K_1> | null, callback?: (() => void) | undefined): void;
             forceUpdate(callback?: (() => void) | undefined): void;
@@ -203,6 +209,9 @@ declare const ThemedImageThumb: {
             refs: {
                 [key: string]: React.ReactInstance;
             };
+            /**
+             * 是否展示图片工具栏
+             */
             componentDidMount?(): void;
             shouldComponentUpdate?(nextProps: Readonly<Omit<ImageThumbProps, keyof LocaleProps> & {
                 locale?: string | undefined;
@@ -249,22 +258,12 @@ declare const ThemedImageThumb: {
         translate?: ((str: string, ...args: any[]) => string) | undefined;
     }): {
         ref: any;
-        /**
-         * 图片无法显示时的替换文本
-         */
-        childRef(ref: any): void; /**
-         * 图片无法显示时的替换文本
-         */
+        childRef(ref: any): void;
         getWrappedInstance(): any;
         render(): JSX.Element;
-        context: any; /**
-         * 宽度
-         */
+        context: any;
         setState<K_1 extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<ImageThumbProps, keyof LocaleProps> & {
             locale?: string | undefined;
-            /**
-             * 图片缩略图外层 css 类名
-             */
             translate?: ((str: string, ...args: any[]) => string) | undefined;
         }>) => {} | Pick<{}, K_1> | null) | Pick<{}, K_1> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;
@@ -278,6 +277,9 @@ declare const ThemedImageThumb: {
         refs: {
             [key: string]: React.ReactInstance;
         };
+        /**
+         * 是否展示图片工具栏
+         */
         componentDidMount?(): void;
         shouldComponentUpdate?(nextProps: Readonly<Omit<ImageThumbProps, keyof LocaleProps> & {
             locale?: string | undefined;
@@ -324,22 +326,12 @@ declare const ThemedImageThumb: {
             translate?: ((str: string, ...args: any[]) => string) | undefined;
         }): {
             ref: any;
-            /**
-             * 图片无法显示时的替换文本
-             */
-            childRef(ref: any): void; /**
-             * 图片无法显示时的替换文本
-             */
+            childRef(ref: any): void;
             getWrappedInstance(): any;
             render(): JSX.Element;
-            context: any; /**
-             * 宽度
-             */
+            context: any;
             setState<K_1 extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<ImageThumbProps, keyof LocaleProps> & {
                 locale?: string | undefined;
-                /**
-                 * 图片缩略图外层 css 类名
-                 */
                 translate?: ((str: string, ...args: any[]) => string) | undefined;
             }>) => {} | Pick<{}, K_1> | null) | Pick<{}, K_1> | null, callback?: (() => void) | undefined): void;
             forceUpdate(callback?: (() => void) | undefined): void;
@@ -353,6 +345,9 @@ declare const ThemedImageThumb: {
             refs: {
                 [key: string]: React.ReactInstance;
             };
+            /**
+             * 是否展示图片工具栏
+             */
             componentDidMount?(): void;
             shouldComponentUpdate?(nextProps: Readonly<Omit<ImageThumbProps, keyof LocaleProps> & {
                 locale?: string | undefined;
@@ -410,6 +405,8 @@ export interface ImageFieldProps extends RendererProps {
     thumbRatio: '1:1' | '4:3' | '16:9';
     originalSrc?: string;
     enlargeAble?: boolean;
+    showToolbar?: boolean;
+    toolbarActions?: ImageAction[];
     onImageEnlarge?: (info: {
         src: string;
         originalSrc: string;
@@ -417,6 +414,8 @@ export interface ImageFieldProps extends RendererProps {
         caption?: string;
         thumbMode?: 'w-full' | 'h-full' | 'contain' | 'cover';
         thumbRatio?: '1:1' | '4:3' | '16:9';
+        showToolbar?: boolean;
+        toolbarActions?: ImageAction[];
     }, target: any) => void;
 }
 export declare class ImageField extends React.Component<ImageFieldProps, object> {