amis 2.4.0 → 2.4.1-beta.0

package/esm/renderers/Form/InputTable.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -417,7 +417,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.createElement(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.createElement(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.createElement("span", null, props.addBtnLabel) : null,
                         props.addBtnIcon ? (typeof props.addBtnIcon === 'string' ? (React.createElement(Icon, { icon: props.addBtnIcon, className: "icon" })) : (generateIcon(props.classnames, props.addBtnIcon))) : null));
                 }
@@ -482,8 +484,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.createElement(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.createElement(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.createElement("span", null, props.deleteBtnLabel)) : null,
                         props.deleteBtnIcon ? (typeof props.deleteBtnIcon === 'string' ? (React.createElement(Icon, { icon: props.deleteBtnIcon, className: "icon" })) : (generateIcon(props.classnames, props.deleteBtnIcon))) : null));
                 }
@@ -634,7 +638,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;
         }
@@ -684,7 +688,10 @@ var FormTable = /** @class */ (function (_super) {
                 // TODO: 这里是为了处理columns里使用value变量添加的，目前会影响初始化数据加载后的组件行为，先回滚
                 // onPristineChange: this.handlePristineChange
             }),
-            (addable && showAddBtn !== false) || showPager ? (React.createElement("div", { className: cx('InputTable-toolbar') },
+            (addable &&
+                showAddBtn !== false &&
+                (!maxLength || maxLength > items.length)) ||
+                showPager ? (React.createElement("div", { className: cx('InputTable-toolbar') },
                 addable && showAddBtn !== false ? (React.createElement(Button, { disabled: disabled, size: "sm", onClick: function () { return _this.addItem(_this.state.items.length); } },
                     React.createElement(Icon, { icon: "plus", className: "icon" }),
                     React.createElement("span", null, __('add')))) : null,

package/esm/renderers/Form/InputTag.js

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

package/esm/renderers/Form/InputText.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -243,12 +243,14 @@ var TextControl = /** @class */ (function (_super) {
         });
     };
     TextControl.prototype.handleKeyDown = function (evt) {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var _a, selectedOptions, onChange, multiple, creatable, dispatchEvent, newValue, value_1, newValue, rendererEvent;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            var _b, selectedOptions, onChange, multiple, creatable, dispatchEvent, valueField, newValue, value_1, newValue, rendererEvent;
+            return __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();
@@ -265,25 +267,28 @@ var TextControl = /** @class */ (function (_super) {
                             creatable !== false)) return [3 /*break*/, 3];
                         evt.preventDefault();
                         value_1 = this.state.inputValue;
-                        if (multiple &&
-                            value_1 &&
-                            !find(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(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', 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];
@@ -295,7 +300,7 @@ var TextControl = /** @class */ (function (_super) {
                                 isOpen: false
                             });
                         }
-                        _b.label = 4;
+                        _c.label = 4;
                     case 4: return [2 /*return*/];
                 }
             });
@@ -458,7 +463,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/esm/renderers/Form/InputTree.js

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

package/esm/renderers/Form/InputYearRange.js

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

package/esm/renderers/Form/JSONSchema.js

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

package/esm/renderers/Form/JSONSchemaEditor.js

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

package/esm/renderers/Form/ListSelect.js

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

package/esm/renderers/Form/LocationPicker.js

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

package/esm/renderers/Form/MatrixCheckboxes.js

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

package/esm/renderers/Form/NestedSelect.js

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

package/esm/renderers/Form/Picker.js

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

package/esm/renderers/Form/Radios.js

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

package/esm/renderers/Form/Select.js

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

package/esm/renderers/Form/Static.js

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

package/esm/renderers/Form/StaticHoc.js

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

package/esm/renderers/Form/Switch.js

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

package/esm/renderers/Form/TabsTransfer.js

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

package/esm/renderers/Form/TabsTransferPicker.js

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

package/esm/renderers/Form/Textarea.js

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

package/esm/renderers/Form/Transfer.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -165,8 +165,8 @@ var BaseTransferRenderer = /** @class */ (function (_super) {
         return 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), __assign({ type: 'text' }, column), {
+        var _a = this.props, render = _a.render, data = _a.data, cx = _a.classnames;
+        return render("cell/".concat(colIndex, "/").concat(rowIndex), __assign({ type: 'text', className: cx({ 'is-invalid': option === null || option === void 0 ? void 0 : option.__unmatched }) }, column), {
             value: resolveVariable(column.name, option),
             data: createObject(data, option)
         });

package/esm/renderers/Form/TransferPicker.js

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

package/esm/renderers/Form/TreeSelect.js

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

package/esm/renderers/Form/UUID.js

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

package/esm/renderers/Form/UserSelect.js

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

package/esm/renderers/Grid.js

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

package/esm/renderers/Grid2D.js

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

package/esm/renderers/GridNav.js

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

package/esm/renderers/HBox.js

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

package/esm/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/esm/renderers/IFrame.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -37,6 +37,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;
@@ -100,9 +116,7 @@ var IFrame = /** @class */ (function (_super) {
         var finalSrc = src
             ? resolveVariableAndFilter(src, data, '| raw')
             : undefined;
-        if (typeof finalSrc === 'string' &&
-            finalSrc &&
-            !/^(\.\/|\.\.\/|\/|https?\:\/\/|\/\/)/.test(finalSrc)) {
+        if (!this.validateURL(finalSrc)) {
             return React.createElement("p", null, __('Iframe.invalid'));
         }
         if (location.protocol === 'https:' &&

package/esm/renderers/Icon.js

@@ -1,13 +1,12 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 
 import { __extends, __decorate } from 'tslib';
 import React from 'react';
 import { filter, Renderer } from 'amis-core';
-import { withBadge } from 'amis-ui';
-import { getIcon } from 'amis-ui/lib/components/icons';
+import { getIcon, withBadge } from 'amis-ui';
 import { isObject } from 'lodash';
 
 var Icon = /** @class */ (function (_super) {

package/esm/renderers/Image.js

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

package/esm/renderers/Images.js

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

package/esm/renderers/Json.js

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

package/esm/renderers/Link.js

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

package/esm/renderers/List.js

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

package/esm/renderers/Log.js

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

package/esm/renderers/Mapping.js

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

package/esm/renderers/Markdown.js

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

package/esm/renderers/MultilineText.js

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

package/esm/renderers/Nav.js

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

package/esm/renderers/Operation.js

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

package/esm/renderers/Page.js

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

package/esm/renderers/Pagination.js

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

package/esm/renderers/PaginationWrapper.js

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

package/esm/renderers/Panel.js

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

package/esm/renderers/Password.js

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

package/esm/renderers/Plain.js

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

package/esm/renderers/PopOver.js

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

package/esm/renderers/Portlet.js

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

package/esm/renderers/Progress.js

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

package/esm/renderers/Property.js

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

package/esm/renderers/QRCode.js

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

package/esm/renderers/QuickEdit.js

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