amis 2.4.0 → 2.4.1-beta.0

package/lib/renderers/Form/InputNumber.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -9,7 +9,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var React = require('react');
-var MiniDecimal = require('../../node_modules/rc-input-number/lib/utils/MiniDecimal.js');
+var MiniDecimal = require('rc-input-number/lib/utils/MiniDecimal');
 var amisCore = require('amis-core');
 var cx = require('classnames');
 var amisUi = require('amis-ui');
@@ -57,7 +57,7 @@ var NumberControl = /** @class */ (function (_super) {
         }
         else if (actionType === 'reset') {
             var finalPrecision = amisUi.NumberInput.normalizePrecision(this.filterNum(precision), this.filterNum(step));
-            var value = amisUi.NumberInput.normalizeValue(resetValue !== null && resetValue !== void 0 ? resetValue : '', this.filterNum(min), this.filterNum(max), finalPrecision, resetValue !== null && resetValue !== void 0 ? resetValue : '', big);
+            var value = amisUi.NumberInput.normalizeValue(resetValue !== null && resetValue !== void 0 ? resetValue : '', this.filterNum(min, big), this.filterNum(max, big), finalPrecision, resetValue !== null && resetValue !== void 0 ? resetValue : '', big);
             onChange === null || onChange === void 0 ? void 0 : onChange(value);
         }
     };
@@ -131,13 +131,15 @@ var NumberControl = /** @class */ (function (_super) {
         });
     };
     /** 处理数字类的props，支持从数据域获取变量值 */
-    NumberControl.prototype.filterNum = function (value) {
+    NumberControl.prototype.filterNum = function (value, isbig) {
+        if (isbig === void 0) { isbig = false; }
         if (typeof value === 'undefined') {
             return undefined;
         }
         if (typeof value !== 'number') {
             value = amisCore.filter(value, this.props.data);
-            value = /^[-]?\d+/.test(value) ? +value : undefined;
+            // 大数模式，不转数字
+            value = /^[-]?\d+/.test(value) ? (isbig ? value : +value) : undefined;
         }
         return value;
     };
@@ -211,7 +213,7 @@ var NumberControl = /** @class */ (function (_super) {
         return (React__default["default"].createElement("div", { className: cx__default["default"]("".concat(ns, "NumberControl"), (_a = {},
                 _a["".concat(ns, "NumberControl--withUnit")] = unitOptions,
                 _a), className) },
-            React__default["default"].createElement(amisUi.NumberInput, { inputRef: this.inputRef, value: finalValue, resetValue: resetValue, step: step, max: this.filterNum(max), min: this.filterNum(min), formatter: formatter, parser: parser, onChange: this.handleChange, disabled: disabled, placeholder: placeholder, precision: finalPrecision, showSteps: showSteps, borderMode: borderMode, readOnly: readOnly, onFocus: function () { return _this.dispatchEvent('focus'); }, onBlur: function () { return _this.dispatchEvent('blur'); }, keyboard: keyboard, displayMode: displayMode, big: big }),
+            React__default["default"].createElement(amisUi.NumberInput, { inputRef: this.inputRef, value: finalValue, resetValue: resetValue, step: step, max: this.filterNum(max, big), min: this.filterNum(min, big), formatter: formatter, parser: parser, onChange: this.handleChange, disabled: disabled, placeholder: placeholder, precision: finalPrecision, showSteps: showSteps, borderMode: borderMode, readOnly: readOnly, onFocus: function () { return _this.dispatchEvent('focus'); }, onBlur: function () { return _this.dispatchEvent('blur'); }, keyboard: keyboard, displayMode: displayMode, big: big }),
             unitOptions ? (React__default["default"].createElement(amisUi.Select, { value: unit, clearable: false, options: this.state.unitOptions || [], onChange: this.handleChangeUnit })) : null));
     };
     NumberControl.defaultProps = {

package/lib/renderers/Form/InputQuarterRange.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/InputRange.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/InputRating.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -58,8 +58,11 @@ var RatingControl = /** @class */ (function (_super) {
     };
     RatingControl.prototype.render = function () {
         var _a = this.props, className = _a.className, value = _a.value, count = _a.count, half = _a.half, readOnly = _a.readOnly, disabled = _a.disabled, onHoverChange = _a.onHoverChange, allowClear = _a.allowClear, char = _a.char, inactiveColor = _a.inactiveColor, colors = _a.colors, texts = _a.texts, charClassName = _a.charClassName, textClassName = _a.textClassName, textPosition = _a.textPosition, cx = _a.classnames;
+        var finalCount = getFinalCount(count, this.props.data);
+        // 限制最大 100 星，避免渲染卡死问题
+        finalCount > 100 && (finalCount = 100);
         return (React__default["default"].createElement("div", { className: cx('RatingControl', className) },
-            React__default["default"].createElement(amisUi.Rating, { classnames: cx, value: value, disabled: disabled, count: count, half: half, allowClear: allowClear, readOnly: readOnly, char: char, inactiveColor: inactiveColor, colors: colors, texts: texts, charClassName: charClassName, textClassName: textClassName, textPosition: textPosition, onChange: this.handleChange, onHoverChange: function (value) {
+            React__default["default"].createElement(amisUi.Rating, { classnames: cx, value: value, disabled: disabled, count: finalCount, half: half, allowClear: allowClear, readOnly: readOnly, char: char, inactiveColor: inactiveColor, colors: colors, texts: texts, charClassName: charClassName, textClassName: textClassName, textPosition: textPosition, onChange: this.handleChange, onHoverChange: function (value) {
                     onHoverChange && onHoverChange(value);
                 } })));
     };
@@ -83,6 +86,12 @@ var RatingControl = /** @class */ (function (_super) {
     ], RatingControl.prototype, "render", null);
     return RatingControl;
 }(React__default["default"].Component));
+function getFinalCount(name, data) {
+    if (typeof name === 'number') {
+        return name;
+    }
+    return amisCore.toNumber(amisCore.filter(name, data));
+}
 /** @class */ ((function (_super) {
     tslib.__extends(RatingControlRenderer, _super);
     function RatingControlRenderer() {
@@ -91,7 +100,20 @@ var RatingControl = /** @class */ (function (_super) {
     RatingControlRenderer = tslib.__decorate([
         amisCore.FormItem({
             type: 'input-rating',
-            sizeMutable: false
+            sizeMutable: false,
+            shouldComponentUpdate: function (props, prevProps) {
+                return getFinalCount(props.count, props.data) !==
+                    getFinalCount(prevProps.count, prevProps.data);
+            },
+            detectProps: [
+                'half',
+                'allowClear',
+                'colors',
+                'inactiveColor',
+                'texts',
+                'textPosition',
+                'char'
+            ]
         })
     ], RatingControlRenderer);
     return RatingControlRenderer;

package/lib/renderers/Form/InputRepeat.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/InputRichText.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/InputSubForm.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/InputTable.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -432,7 +432,9 @@ var FormTable = /** @class */ (function (_super) {
             btns.push({
                 children: function (_a) {
                     var key = _a.key, rowIndex = _a.rowIndex, offset = _a.offset;
-                    return ~_this.state.editIndex && needConfirm !== false ? null : (React__default["default"].createElement(amisUi.Button, { classPrefix: ns, size: "sm", key: key, level: "link", tooltip: __('Table.addRow'), tooltipContainer: env && env.getModalContainer ? env.getModalContainer : undefined, onClick: _this.addItem.bind(_this, rowIndex + offset, undefined) },
+                    return (~_this.state.editIndex && needConfirm !== false) ||
+                        (_this.props.maxLength &&
+                            _this.props.maxLength <= _this.state.items.length) ? null : (React__default["default"].createElement(amisUi.Button, { classPrefix: ns, size: "sm", key: key, level: "link", tooltip: __('Table.addRow'), tooltipContainer: env && env.getModalContainer ? env.getModalContainer : undefined, onClick: _this.addItem.bind(_this, rowIndex + offset, undefined) },
                         props.addBtnLabel ? React__default["default"].createElement("span", null, props.addBtnLabel) : null,
                         props.addBtnIcon ? (typeof props.addBtnIcon === 'string' ? (React__default["default"].createElement(amisUi.Icon, { icon: props.addBtnIcon, className: "icon" })) : (amisCore.generateIcon(props.classnames, props.addBtnIcon))) : null));
                 }
@@ -497,8 +499,10 @@ var FormTable = /** @class */ (function (_super) {
             btns.push({
                 children: function (_a) {
                     var key = _a.key, rowIndex = _a.rowIndex, data = _a.data, offset = _a.offset;
-                    return (~_this.state.editIndex || (data && data.__isPlaceholder)) &&
-                        needConfirm !== false ? null : (React__default["default"].createElement(amisUi.Button, { classPrefix: ns, size: "sm", key: key, level: "link", tooltip: __('Table.deleteRow'), tooltipContainer: env && env.getModalContainer ? env.getModalContainer : undefined, onClick: _this.removeItem.bind(_this, rowIndex + offset) },
+                    return ((~_this.state.editIndex || (data && data.__isPlaceholder)) &&
+                        needConfirm !== false) ||
+                        (_this.props.minLength &&
+                            _this.props.minLength >= _this.state.items.length) ? null : (React__default["default"].createElement(amisUi.Button, { classPrefix: ns, size: "sm", key: key, level: "link", tooltip: __('Table.deleteRow'), tooltipContainer: env && env.getModalContainer ? env.getModalContainer : undefined, onClick: _this.removeItem.bind(_this, rowIndex + offset) },
                         props.deleteBtnLabel ? (React__default["default"].createElement("span", null, props.deleteBtnLabel)) : null,
                         props.deleteBtnIcon ? (typeof props.deleteBtnIcon === 'string' ? (React__default["default"].createElement(amisUi.Icon, { icon: props.deleteBtnIcon, className: "icon" })) : (amisCore.generateIcon(props.classnames, props.deleteBtnIcon))) : null));
                 }
@@ -649,7 +653,7 @@ var FormTable = /** @class */ (function (_super) {
     FormTable.prototype.render = function () {
         var _this = this;
         var _a, _b;
-        var _c = this.props, className = _c.className; _c.value; var showAddBtn = _c.showAddBtn, disabled = _c.disabled, render = _c.render, placeholder = _c.placeholder, draggable = _c.draggable, addable = _c.addable, columnsTogglable = _c.columnsTogglable, combineNum = _c.combineNum, combineFromIndex = _c.combineFromIndex, __ = _c.translate, canAccessSuperData = _c.canAccessSuperData, expandConfig = _c.expandConfig, affixRow = _c.affixRow, prefixRow = _c.prefixRow, formInited = _c.formInited, perPage = _c.perPage, cx = _c.classnames, rowClassName = _c.rowClassName, rowClassNameExpr = _c.rowClassNameExpr, _d = _c.affixHeader, affixHeader = _d === void 0 ? false : _d, _e = _c.autoFillHeight, autoFillHeight = _e === void 0 ? false : _e, tableContentClassName = _c.tableContentClassName;
+        var _c = this.props, className = _c.className; _c.value; var showAddBtn = _c.showAddBtn, disabled = _c.disabled, render = _c.render, placeholder = _c.placeholder, draggable = _c.draggable, addable = _c.addable, columnsTogglable = _c.columnsTogglable, combineNum = _c.combineNum, combineFromIndex = _c.combineFromIndex, __ = _c.translate, canAccessSuperData = _c.canAccessSuperData, expandConfig = _c.expandConfig, affixRow = _c.affixRow, prefixRow = _c.prefixRow, formInited = _c.formInited, perPage = _c.perPage, cx = _c.classnames, rowClassName = _c.rowClassName, rowClassNameExpr = _c.rowClassNameExpr, _d = _c.affixHeader, affixHeader = _d === void 0 ? false : _d, _e = _c.autoFillHeight, autoFillHeight = _e === void 0 ? false : _e, tableContentClassName = _c.tableContentClassName, maxLength = _c.maxLength;
         if (formInited === false) {
             return null;
         }
@@ -699,7 +703,10 @@ var FormTable = /** @class */ (function (_super) {
                 // TODO: 这里是为了处理columns里使用value变量添加的，目前会影响初始化数据加载后的组件行为，先回滚
                 // onPristineChange: this.handlePristineChange
             }),
-            (addable && showAddBtn !== false) || showPager ? (React__default["default"].createElement("div", { className: cx('InputTable-toolbar') },
+            (addable &&
+                showAddBtn !== false &&
+                (!maxLength || maxLength > items.length)) ||
+                showPager ? (React__default["default"].createElement("div", { className: cx('InputTable-toolbar') },
                 addable && showAddBtn !== false ? (React__default["default"].createElement(amisUi.Button, { disabled: disabled, size: "sm", onClick: function () { return _this.addItem(_this.state.items.length); } },
                     React__default["default"].createElement(amisUi.Icon, { icon: "plus", className: "icon" }),
                     React__default["default"].createElement("span", null, __('add')))) : null,

package/lib/renderers/Form/InputTag.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/InputText.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -254,12 +254,14 @@ var TextControl = /** @class */ (function (_super) {
         });
     };
     TextControl.prototype.handleKeyDown = function (evt) {
+        var _a;
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, selectedOptions, onChange, multiple, creatable, dispatchEvent, newValue, value_1, newValue, rendererEvent;
-            return tslib.__generator(this, function (_b) {
-                switch (_b.label) {
+            var _b, selectedOptions, onChange, multiple, creatable, dispatchEvent, valueField, newValue, value_1, newValue, rendererEvent;
+            return tslib.__generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
-                        _a = this.props, selectedOptions = _a.selectedOptions, onChange = _a.onChange, multiple = _a.multiple, creatable = _a.creatable, dispatchEvent = _a.dispatchEvent;
+                        _b = this.props, selectedOptions = _b.selectedOptions, onChange = _b.onChange, multiple = _b.multiple, creatable = _b.creatable, dispatchEvent = _b.dispatchEvent;
+                        valueField = ((_a = this.props) === null || _a === void 0 ? void 0 : _a.valueField) || 'value';
                         if (!(selectedOptions.length && !this.state.inputValue && evt.keyCode === 8)) return [3 /*break*/, 1];
                         evt.preventDefault();
                         newValue = selectedOptions.concat();
@@ -276,25 +278,28 @@ var TextControl = /** @class */ (function (_super) {
                             creatable !== false)) return [3 /*break*/, 3];
                         evt.preventDefault();
                         value_1 = this.state.inputValue;
-                        if (multiple &&
-                            value_1 &&
-                            !find__default["default"](selectedOptions, function (item) { return item.value == value_1; })) {
-                            newValue = selectedOptions.concat();
-                            newValue.push({
-                                label: value_1,
-                                value: value_1
-                            });
-                            value_1 = this.normalizeValue(newValue).concat();
+                        if (multiple && value_1) {
+                            if (!find__default["default"](selectedOptions, function (item) { return item[valueField] == value_1; })) {
+                                newValue = selectedOptions.concat();
+                                newValue.push({
+                                    label: value_1,
+                                    value: value_1
+                                });
+                                value_1 = this.normalizeValue(newValue).concat();
+                            }
+                            else {
+                                value_1 = this.normalizeValue(selectedOptions).concat();
+                            }
                         }
                         return [4 /*yield*/, dispatchEvent('enter', amisCore.resolveEventData(this.props, { value: value_1 }, 'value'))];
                     case 2:
-                        rendererEvent = _b.sent();
+                        rendererEvent = _c.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
                             return [2 /*return*/];
                         }
                         onChange(value_1);
                         this.setState({
-                            inputValue: '',
+                            inputValue: multiple ? '' : value_1,
                             isOpen: false
                         }, this.loadAutoComplete);
                         return [3 /*break*/, 4];
@@ -306,7 +311,7 @@ var TextControl = /** @class */ (function (_super) {
                                 isOpen: false
                             });
                         }
-                        _b.label = 4;
+                        _c.label = 4;
                     case 4: return [2 /*return*/];
                 }
             });
@@ -469,7 +474,8 @@ var TextControl = /** @class */ (function (_super) {
             if (_this.state.inputValue &&
                 creatable !== false &&
                 multiple &&
-                !filtedOptions.some(function (option) { return option.value === _this.state.inputValue; })) {
+                !filtedOptions.some(function (option) { return option.value === _this.state.inputValue; }) &&
+                !~selectedItem.indexOf(_this.state.inputValue)) {
                 filtedOptions.push((_b = {},
                     _b[labelField || 'label'] = _this.state.inputValue,
                     _b[valueField || 'value'] = _this.state.inputValue,

package/lib/renderers/Form/InputTree.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/InputYearRange.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/JSONSchema.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/JSONSchemaEditor.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/ListSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/LocationPicker.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/MatrixCheckboxes.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/NestedSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/Picker.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/Radios.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/Select.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/Static.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/StaticHoc.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/Switch.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/TabsTransfer.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/TabsTransferPicker.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/Textarea.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/Transfer.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -174,8 +174,8 @@ var BaseTransferRenderer = /** @class */ (function (_super) {
         return amisUi.ResultList.itemRender(option, states);
     };
     BaseTransferRenderer.prototype.renderCell = function (column, option, colIndex, rowIndex) {
-        var _a = this.props, render = _a.render, data = _a.data;
-        return render("cell/".concat(colIndex, "/").concat(rowIndex), tslib.__assign({ type: 'text' }, column), {
+        var _a = this.props, render = _a.render, data = _a.data, cx = _a.classnames;
+        return render("cell/".concat(colIndex, "/").concat(rowIndex), tslib.__assign({ type: 'text', className: cx({ 'is-invalid': option === null || option === void 0 ? void 0 : option.__unmatched }) }, column), {
             value: amisCore.resolveVariable(column.name, option),
             data: amisCore.createObject(data, option)
         });

package/lib/renderers/Form/TransferPicker.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/TreeSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/UUID.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/UserSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Grid.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Grid2D.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/GridNav.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/HBox.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/IFrame.d.ts

@@ -39,6 +39,8 @@ export default class IFrame extends React.Component<IFrameProps, object> {
     componentDidMount(): void;
     componentDidUpdate(prevProps: IFrameProps): void;
     componentWillUnmount(): void;
+    /** 校验URL是否合法 */
+    validateURL(url: any): boolean;
     onMessage(e: MessageEvent): void;
     onLoad(): void;
     reload(subpath?: any, query?: any): void;

package/lib/renderers/IFrame.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -45,6 +45,22 @@ var IFrame = /** @class */ (function (_super) {
     IFrame.prototype.componentWillUnmount = function () {
         window.removeEventListener('message', this.onMessage);
     };
+    /** 校验URL是否合法 */
+    IFrame.prototype.validateURL = function (url) {
+        // base64编码格式
+        if (url &&
+            typeof url === 'string' &&
+            /^data:([a-zA-Z0-9]+\/[a-zA-Z0-9]+);base64,.*/.test(url)) {
+            return true;
+        }
+        // HTTP[S]协议
+        if (url &&
+            typeof url === 'string' &&
+            !/^(\.\/|\.\.\/|\/|https?\:\/\/|\/\/)/.test(url)) {
+            return false;
+        }
+        return true;
+    };
     IFrame.prototype.onMessage = function (e) {
         var _a;
         var _b = this.props, events = _b.events, onAction = _b.onAction, data = _b.data;
@@ -108,9 +124,7 @@ var IFrame = /** @class */ (function (_super) {
         var finalSrc = src
             ? amisCore.resolveVariableAndFilter(src, data, '| raw')
             : undefined;
-        if (typeof finalSrc === 'string' &&
-            finalSrc &&
-            !/^(\.\/|\.\.\/|\/|https?\:\/\/|\/\/)/.test(finalSrc)) {
+        if (!this.validateURL(finalSrc)) {
             return React__default["default"].createElement("p", null, __('Iframe.invalid'));
         }
         if (location.protocol === 'https:' &&

package/lib/renderers/Icon.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -11,7 +11,6 @@ var tslib = require('tslib');
 var React = require('react');
 var amisCore = require('amis-core');
 var amisUi = require('amis-ui');
-var icons = require('amis-ui/lib/components/icons');
 var lodash = require('lodash');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -36,7 +35,7 @@ var Icon = /** @class */ (function (_super) {
             }
             return;
         }
-        var CustomIcon = icons.getIcon(icon);
+        var CustomIcon = amisUi.getIcon(icon);
         if (CustomIcon) {
             return React__default["default"].createElement(CustomIcon, { className: cx(className, "icon-".concat(icon)) });
         }

package/lib/renderers/Image.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Images.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Json.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Link.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/List.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */