amis-ui 2.0.2 → 2.1.0

package/lib/components/Tinymce2.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.2
+ * amis-ui v2.1.0
  * Copyright 2018-2022 fex
  */
 
@@ -12,13 +12,13 @@ var React = require('react');
 var tinymce = require('tinymce/tinymce');
 require('tinymce/icons/default/index');
 require('tinymce/themes/silver');
+require('tinymce/models/dom/model');
 require('tinymce/plugins/advlist');
 require('tinymce/plugins/autolink');
 require('tinymce/plugins/lists');
 require('tinymce/plugins/link');
 require('tinymce/plugins/image');
 require('tinymce/plugins/charmap');
-require('tinymce/plugins/print');
 require('tinymce/plugins/preview');
 require('tinymce/plugins/anchor');
 require('tinymce/plugins/searchreplace');
@@ -28,10 +28,8 @@ require('tinymce/plugins/fullscreen');
 require('tinymce/plugins/insertdatetime');
 require('tinymce/plugins/media');
 require('tinymce/plugins/table');
-require('tinymce/plugins/paste');
 require('tinymce/plugins/help');
 require('tinymce/plugins/wordcount');
-require('tinymce/plugins/hr');
 require('tinymce/plugins/pagebreak');
 require('tinymce/plugins/visualchars');
 require('tinymce/plugins/template');
@@ -54,13 +52,32 @@ var TinymceEditor = /** @class */ (function (_super) {
     TinymceEditor.prototype.componentDidMount = function () {
         var _this = this;
         var locale = this.props.locale;
-        this.config = tslib.__assign(tslib.__assign({ inline: false, skin: false, content_css: false, height: 400, language: !locale || locale === 'zh-CN' ? 'zh_CN' : 'en', plugins: [
-                'advlist autolink link image lists charmap print preview hr anchor pagebreak',
-                'searchreplace wordcount visualblocks visualchars code fullscreen insertdatetime media nonbreaking',
-                'table emoticons template paste help'
-            ], toolbar: 'undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | ' +
-                'bullist numlist outdent indent | link image | print preview media fullpage | ' +
-                'forecolor backcolor emoticons | help', menu: {
+        this.config = tslib.__assign(tslib.__assign({ inline: false, skin: false, content_css: false, height: 400, language: !locale || locale === 'zh-CN' ? 'zh_CN' : 'en', branding: false, plugins: [
+                'advlist',
+                'autolink',
+                'link',
+                'image',
+                'lists',
+                'charmap',
+                'preview',
+                'anchor',
+                'pagebreak',
+                'searchreplace',
+                'wordcount',
+                'visualblocks',
+                'visualchars',
+                'code',
+                'fullscreen',
+                'insertdatetime',
+                'media',
+                'nonbreaking',
+                'table',
+                'emoticons',
+                'template',
+                'help'
+            ], toolbar: 'undo redo | blocks | bold italic | alignleft aligncenter alignright alignjustify | ' +
+                'bullist numlist outdent indent | link image | preview media | ' +
+                'fontfamily fontsize forecolor backcolor emoticons | print help', menu: {
                 file: {
                     title: 'File',
                     items: 'newdocument restoredraft | preview | print '
@@ -79,7 +96,7 @@ var TinymceEditor = /** @class */ (function (_super) {
                 },
                 format: {
                     title: 'Format',
-                    items: 'bold italic underline strikethrough superscript subscript codeformat | formats blockformats fontformats fontsizes align | forecolor backcolor | removeformat'
+                    items: 'bold italic underline strikethrough superscript subscript codeformat | styles blocks fontsize align | forecolor backcolor | removeformat'
                 },
                 tools: {
                     title: 'Tools',

package/lib/components/TitleBar.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.2
+ * amis-ui v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/components/Toast.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.2
+ * amis-ui v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/components/Tooltip.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.2
+ * amis-ui v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/components/TooltipWrapper.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.2
+ * amis-ui v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/components/Transfer.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.2
+ * amis-ui v2.1.0
  * Copyright 2018-2022 fex
  */
 
@@ -242,7 +242,14 @@ var Transfer = /** @class */ (function (_super) {
         var _b = this.state, resultSelectMode = _b.resultSelectMode, isTreeDeferLoad = _b.isTreeDeferLoad;
         var searchable = !isTreeDeferLoad && resultSearchable;
         var placeholder = resultSearchPlaceholder || __('Transfer.selectFromLeft');
-        return resultSelectMode === 'table' ? (React__default["default"].createElement(ResultTableList["default"], { classnames: cx, columns: columns, options: options || [], value: value, disabled: disabled, option2value: option2value, cellRender: cellRender, onChange: onChange, multiple: false, searchable: searchable, placeholder: placeholder, onSearch: onResultSearch })) : resultSelectMode === 'tree' ? (React__default["default"].createElement(ResultTreeList["default"], { classnames: cx, options: options, valueField: 'value', value: value || [], onChange: onChange, itemRender: resultItemRender, searchable: searchable, placeholder: placeholder, onSearch: onResultSearch })) : (React__default["default"].createElement(ResultList["default"], { className: cx('Transfer-value'), sortable: sortable, disabled: disabled, value: value, onChange: onChange, placeholder: placeholder, itemRender: resultItemRender, searchable: searchable, onSearch: onResultSearch }));
+        switch (resultSelectMode) {
+            case 'table':
+                return (React__default["default"].createElement(ResultTableList["default"], { classnames: cx, columns: columns, options: options || [], value: value, disabled: disabled, option2value: option2value, cellRender: cellRender, onChange: onChange, multiple: false, searchable: searchable, placeholder: placeholder, onSearch: onResultSearch }));
+            case 'tree':
+                return (React__default["default"].createElement(ResultTreeList["default"], { classnames: cx, className: cx('Transfer-value'), options: options, valueField: 'value', value: value || [], onChange: onChange, itemRender: resultItemRender, searchable: searchable, placeholder: placeholder, onSearch: onResultSearch }));
+            default:
+                return (React__default["default"].createElement(ResultList["default"], { className: cx('Transfer-value'), sortable: sortable, disabled: disabled, value: value, onChange: onChange, placeholder: placeholder, itemRender: resultItemRender, searchable: searchable, onSearch: onResultSearch }));
+        }
     };
     Transfer.prototype.render = function () {
         var _a = this.props, inline = _a.inline, cx = _a.classnames, className = _a.className, value = _a.value, resultTitle = _a.resultTitle, options = _a.options, option2value = _a.option2value, disabled = _a.disabled, statistics = _a.statistics, showArrow = _a.showArrow, resultListModeFollowSelect = _a.resultListModeFollowSelect, _b = _a.selectMode, selectMode = _b === void 0 ? 'list' : _b, __ = _a.translate;

package/lib/components/TransferDropDown.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.2
+ * amis-ui v2.1.0
  * Copyright 2018-2022 fex
  */
 
@@ -53,8 +53,7 @@ var TransferDropDown = /** @class */ (function (_super) {
                                 }, multiple: multiple }))));
             } }, function (_a) {
             var onClick = _a.onClick, isOpened = _a.isOpened, ref = _a.ref;
-            return (React__default["default"].createElement(ResultBox["default"], { className: cx('TransferDropDown', className, isOpened ? 'is-active' : ''), borderMode: borderMode, allowInput: false, result: multiple ? value : (value === null || value === void 0 ? void 0 : value[0]) ? value === null || value === void 0 ? void 0 : value[0] : null, onResultChange: onChange, onResultClick: onClick, placeholder: __('Select.placeholder'), disabled: disabled, clearable: clearable, maxTagCount: maxTagCount, overflowTagPopover: overflowTagPopover, ref: ref, itemRender: itemRender, useMobileUI: useMobileUI }, !mobileUI ? (React__default["default"].createElement("span", { className: cx('TransferDropDown-icon') },
-                React__default["default"].createElement(icons.Icon, { icon: "right-arrow-bold", className: "icon" }))) : (React__default["default"].createElement(React__default["default"].Fragment, null))));
+            return (React__default["default"].createElement(ResultBox["default"], { className: cx('TransferDropDown', className, isOpened ? 'is-opened' : ''), borderMode: borderMode, allowInput: false, result: multiple ? value : (value === null || value === void 0 ? void 0 : value[0]) ? value === null || value === void 0 ? void 0 : value[0] : null, onResultChange: onChange, onResultClick: onClick, placeholder: __('Select.placeholder'), disabled: disabled, clearable: clearable, maxTagCount: maxTagCount, overflowTagPopover: overflowTagPopover, ref: ref, itemRender: itemRender, useMobileUI: useMobileUI, hasDropDownArrow: !mobileUI }));
         }));
     };
     return TransferDropDown;

package/lib/components/TransferPicker.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.2
+ * amis-ui v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/components/TransferSearch.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.2
+ * amis-ui v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/components/Tree.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.2
+ * amis-ui v2.1.0
  * Copyright 2018-2022 fex
  */
 
@@ -546,38 +546,39 @@ var TreeSelector = /** @class */ (function (_super) {
                         }) },
                         React__default["default"].createElement(icons.Icon, { icon: "down-arrow-bold", className: "icon" }))) : (React__default["default"].createElement("span", { className: cx('Tree-itemArrowPlaceholder') })),
                     checkbox,
-                    showIcon ? (React__default["default"].createElement("i", { className: cx("Tree-itemIcon ".concat(childrenItems ? 'Tree-folderIcon' : 'Tree-leafIcon')), onClick: function () {
-                            return !nodeDisabled &&
-                                (multiple
-                                    ? _this.handleCheck(item, !selfChecked)
-                                    : _this.handleSelect(item));
-                        } }, icons.getIcon(iconValue) ? (React__default["default"].createElement(icons.Icon, { icon: iconValue, className: "icon" })) : (React__default["default"].createElement("i", { className: iconValue })))) : null,
-                    React__default["default"].createElement("span", { className: cx('Tree-itemText'), onClick: function () {
-                            return !nodeDisabled &&
-                                (multiple
-                                    ? _this.handleCheck(item, !selfChecked)
-                                    : _this.handleSelect(item));
-                        } }, highlightTxt
-                        ? amisCore.highlight("".concat(item[labelField]), highlightTxt)
-                        : itemRender
-                            ? itemRender(item, {
-                                index: key,
-                                multiple: multiple,
-                                checked: checked,
-                                onChange: function () { return _this.handleCheck(item, !selfChecked); },
-                                disabled: disabled || item.disabled
-                            })
-                            : "".concat(item[labelField])),
-                    !nodeDisabled &&
-                        !isAdding &&
-                        !isEditing &&
-                        !(item.defer && !item.loaded) ? (React__default["default"].createElement("div", { className: cx('Tree-item-icons') },
-                        creatable && amisCore.hasAbility(item, 'creatable') ? (React__default["default"].createElement("a", { onClick: _this.handleAdd.bind(_this, item), "data-tooltip": __(createTip), "data-position": "left" },
-                            React__default["default"].createElement(icons.Icon, { icon: "plus", className: "icon" }))) : null,
-                        removable && amisCore.hasAbility(item, 'removable') ? (React__default["default"].createElement("a", { onClick: _this.handleRemove.bind(_this, item), "data-tooltip": __(removeTip), "data-position": "left" },
-                            React__default["default"].createElement(icons.Icon, { icon: "minus", className: "icon" }))) : null,
-                        editable && amisCore.hasAbility(item, 'editable') ? (React__default["default"].createElement("a", { onClick: _this.handleEdit.bind(_this, item), "data-tooltip": __(editTip), "data-position": "left" },
-                            React__default["default"].createElement(icons.Icon, { icon: "pencil", className: "icon" }))) : null)) : null)),
+                    React__default["default"].createElement("div", { className: cx('Tree-itemLabel-item') },
+                        showIcon ? (React__default["default"].createElement("i", { className: cx("Tree-itemIcon ".concat(childrenItems ? 'Tree-folderIcon' : 'Tree-leafIcon')), onClick: function () {
+                                return !nodeDisabled &&
+                                    (multiple
+                                        ? _this.handleCheck(item, !selfChecked)
+                                        : _this.handleSelect(item));
+                            } }, icons.getIcon(iconValue) ? (React__default["default"].createElement(icons.Icon, { icon: iconValue, className: "icon" })) : React__default["default"].isValidElement(iconValue) ? (iconValue) : (React__default["default"].createElement("i", { className: iconValue })))) : null,
+                        React__default["default"].createElement("span", { className: cx('Tree-itemText'), onClick: function () {
+                                return !nodeDisabled &&
+                                    (multiple
+                                        ? _this.handleCheck(item, !selfChecked)
+                                        : _this.handleSelect(item));
+                            }, title: item[labelField] }, highlightTxt
+                            ? amisCore.highlight("".concat(item[labelField]), highlightTxt)
+                            : itemRender
+                                ? itemRender(item, {
+                                    index: key,
+                                    multiple: multiple,
+                                    checked: checked,
+                                    onChange: function () { return _this.handleCheck(item, !selfChecked); },
+                                    disabled: disabled || item.disabled
+                                })
+                                : "".concat(item[labelField])),
+                        !nodeDisabled &&
+                            !isAdding &&
+                            !isEditing &&
+                            !(item.defer && !item.loaded) ? (React__default["default"].createElement("div", { className: cx('Tree-item-icons') },
+                            creatable && amisCore.hasAbility(item, 'creatable') ? (React__default["default"].createElement("a", { onClick: _this.handleAdd.bind(_this, item), "data-tooltip": __(createTip), "data-position": "left" },
+                                React__default["default"].createElement(icons.Icon, { icon: "plus", className: "icon" }))) : null,
+                            removable && amisCore.hasAbility(item, 'removable') ? (React__default["default"].createElement("a", { onClick: _this.handleRemove.bind(_this, item), "data-tooltip": __(removeTip), "data-position": "left" },
+                                React__default["default"].createElement(icons.Icon, { icon: "minus", className: "icon" }))) : null,
+                            editable && amisCore.hasAbility(item, 'editable') ? (React__default["default"].createElement("a", { onClick: _this.handleEdit.bind(_this, item), "data-tooltip": __(editTip), "data-position": "left" },
+                                React__default["default"].createElement(icons.Icon, { icon: "new-edit", className: "icon" }))) : null)) : null))),
                 (childrenItems && _this.isUnfolded(item)) ||
                     (isAdding && addingParent === item) ? (React__default["default"].createElement("ul", { className: cx('Tree-sublist') },
                     isAdding && addingParent === item ? (React__default["default"].createElement("li", { className: cx('Tree-item') }, _this.renderInput(checkbox

package/lib/components/TreeSelection.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.2
+ * amis-ui v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/components/UserSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.2
+ * amis-ui v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/components/UserTabSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.2
+ * amis-ui v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/components/WithRemoteConfig.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.2
+ * amis-ui v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/components/WithStore.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.2
+ * amis-ui v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/components/calendar/Calendar.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.2
+ * amis-ui v2.1.0
  * Copyright 2018-2022 fex
  */
 
@@ -489,7 +489,9 @@ var BaseDatePicker = /** @class */ (function (_super) {
                         ? 'rdtPickerTime'
                         : dateFormat && !timeFormat
                             ? 'rdtPickerDate'
-                            : '') },
+                            : '', viewMode === 'months' || viewMode === 'years' || viewMode === 'quarters'
+                    ? 'rdtPickerNotDays'
+                    : '') },
                 React__default["default"].createElement(Component, { view: this.state.currentView, viewProps: viewProps, timeRangeHeader: timeRangeHeader }))));
     };
     return BaseDatePicker;

package/lib/components/calendar/CalendarContainer.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.2
+ * amis-ui v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/components/calendar/DaysView.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.2
+ * amis-ui v2.1.0
  * Copyright 2018-2022 fex
  */
 
@@ -15,6 +15,7 @@ var findIndex = require('lodash/findIndex');
 var merge = require('lodash/merge');
 var amisCore = require('amis-core');
 var Picker = require('../Picker.js');
+var icons = require('../icons.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -223,7 +224,6 @@ var CustomDaysView = /** @class */ (function (_super) {
             var date = selectedDate || (isEndDate ? viewDate.endOf('day') : viewDate);
             var inputs = [];
             var timeConstraints = _this.timeConstraints;
-            inputs.push(_this.showTime());
             timeFormat.split(':').forEach(function (format, i) {
                 var type = /h/i.test(format)
                     ? 'hours'
@@ -269,7 +269,9 @@ var CustomDaysView = /** @class */ (function (_super) {
                 }
             });
             inputs.length && inputs.pop();
-            return React__default["default"].createElement("div", null, inputs);
+            return (React__default["default"].createElement("div", { className: cx('CalendarTimesWrapper') },
+                _this.showTime(),
+                React__default["default"].createElement("div", { className: cx('CalendarInputsWrapper') }, inputs)));
         };
         _this.renderFooter = function () {
             if (!_this.props.requiredConfirm) {
@@ -427,13 +429,18 @@ var CustomDaysView = /** @class */ (function (_super) {
                 React__default["default"].createElement("tr", null,
                     React__default["default"].createElement("th", { colSpan: 7 },
                         React__default["default"].createElement("div", { className: "rdtHeader" },
-                            React__default["default"].createElement("a", { className: "rdtPrev", onClick: this.props.subtractTime(1, 'years') }, "\u00AB"),
-                            React__default["default"].createElement("a", { className: "rdtPrev", onClick: this.props.subtractTime(1, 'months') }, "\u2039"),
+                            React__default["default"].createElement("a", { className: "rdtPrev", onClick: this.props.subtractTime(1, 'years') },
+                                React__default["default"].createElement(icons.Icon, { icon: "right-double-arrow", className: "icon date-icon-arrow-left" })),
+                            React__default["default"].createElement("a", { className: "rdtPrev", onClick: this.props.subtractTime(1, 'months') },
+                                React__default["default"].createElement(icons.Icon, { icon: "right-arrow", className: "icon date-icon-arrow-left" })),
                             React__default["default"].createElement("div", { className: "rdtCenter" },
                                 React__default["default"].createElement("a", { className: "rdtSwitch", onClick: this.props.showView('years') }, date.format(__('dateformat.year'))),
                                 React__default["default"].createElement("a", { className: "rdtSwitch", onClick: this.props.showView('months') }, date.format(__('MMM')))),
-                            React__default["default"].createElement("a", { className: "rdtNext", onClick: this.props.addTime(1, 'months') }, "\u203A"),
-                            React__default["default"].createElement("a", { className: "rdtNext", onClick: this.props.addTime(1, 'years') }, "\u00BB")))),
+                            React__default["default"].createElement("a", { className: "rdtNext", onClick: this.props.addTime(1, 'months') },
+                                React__default["default"].createElement(icons.Icon, { icon: "right-arrow", className: "icon date-icon-arrow" })),
+                            React__default["default"].createElement("a", { className: "rdtNext", onClick: this.props.addTime(1, 'years') },
+                                React__default["default"].createElement(icons.Icon, { icon: "right-double-arrow", className: "icon date-icon-arrow" }))),
+                        React__default["default"].createElement("div", { className: 'header-line' }))),
                 React__default["default"].createElement("tr", null, this.getDaysOfWeek(locale).map(function (day, index) { return (React__default["default"].createElement("th", { key: day + index, className: "dow" }, day)); })))),
             React__default["default"].createElement("tbody", { key: "tb" }, this.renderDays())
         ];

package/lib/components/calendar/MonthsView.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.2
+ * amis-ui v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/components/calendar/QuartersView.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.2
+ * amis-ui v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/components/calendar/TimeView.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.2
+ * amis-ui v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/components/calendar/YearsView.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.2
+ * amis-ui v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/components/condition-builder/Expression.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.2
+ * amis-ui v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/components/condition-builder/Field.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.2
+ * amis-ui v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/components/condition-builder/Formula.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.2
+ * amis-ui v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/components/condition-builder/Func.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.2
+ * amis-ui v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/components/condition-builder/Group.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.2
+ * amis-ui v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/components/condition-builder/GroupOrItem.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.2
+ * amis-ui v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/components/condition-builder/InputSwitch.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.2
+ * amis-ui v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/components/condition-builder/Item.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.2
+ * amis-ui v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/components/condition-builder/Value.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.2
+ * amis-ui v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/components/condition-builder/config.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.2
+ * amis-ui v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/components/condition-builder/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.2
+ * amis-ui v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/components/formula/Editor.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.2
+ * amis-ui v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/components/formula/FuncList.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.2
+ * amis-ui v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/components/formula/Picker.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.2
+ * amis-ui v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/components/formula/VariableList.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.2
+ * amis-ui v2.1.0
  * Copyright 2018-2022 fex
  */
 

package/lib/components/formula/plugin.d.ts

@@ -22,6 +22,7 @@ export declare class FormulaPlugin {
     insertContent(value: any, type?: 'variable' | 'func'): void;
     markText(from: CodeMirror.Position, to: CodeMirror.Position, label: string, className?: string): void;
     autoMark(variables: Array<VariableItem>): void;
+    focus(value: string): void;
     dispose(): void;
     validate(): void;
 }

package/lib/components/formula/plugin.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.0.2
+ * amis-ui v2.1.0
  * Copyright 2018-2022 fex
  */
 
@@ -33,6 +33,7 @@ var FormulaPlugin = /** @class */ (function () {
         if (value) {
             // todo functions 也需要自动替换
             this.autoMark(variables);
+            this.focus(value);
         }
     };
     // 计算 `${`、`}` 括号的位置，如 ${a}+${b}, 结果是 [ { from: 0, to: 3 }, { from: 5, to: 8 } ]
@@ -67,7 +68,7 @@ var FormulaPlugin = /** @class */ (function () {
         if (braces.length) {
             for (var index = 0; index < braces.length; index++) {
                 var brace = braces[index];
-                if (from > brace.begin && to <= brace.end) {
+                if (from >= brace.begin && to <= brace.end) {
                     isIn = true;
                     break;
                 }
@@ -142,8 +143,7 @@ var FormulaPlugin = /** @class */ (function () {
         var varMap = {};
         amisCore.eachTree(variables, function (item) {
             if (item.value) {
-                var key = "${".concat(item.value, "}");
-                varMap[key] = item.label;
+                varMap[item.value] = item.label;
             }
         });
         var vars = Object.keys(varMap).sort(function (a, b) { return b.length - a.length; });
@@ -187,6 +187,13 @@ var FormulaPlugin = /** @class */ (function () {
             _loop_1(line);
         }
     };
+    // 焦点放在最后
+    FormulaPlugin.prototype.focus = function (value) {
+        this.editor.setCursor({
+            line: 0,
+            ch: (value === null || value === void 0 ? void 0 : value.length) || 0
+        });
+    };
     FormulaPlugin.prototype.dispose = function () { };
     FormulaPlugin.prototype.validate = function () { };
     return FormulaPlugin;

package/lib/components/icons.d.ts

@@ -26,6 +26,7 @@ import UserRemove from '../icons/user-remove.svg';
 import Role from '../icons/role.svg';
 import Department from '../icons/department.svg';
 import Post from '../icons/post.svg';
+import RightDoubleArrowIcon from '../icons/right-double-arrow.svg';
 export declare const closeIcon: JSX.Element;
 export declare const unDoIcon: JSX.Element;
 export declare const reDoIcon: JSX.Element;
@@ -42,4 +43,4 @@ export declare function registerIcon(key: string, component: React.ReactType<{}>
 export declare function Icon({ icon, className, ...rest }: {
     icon: string;
 } & React.ComponentProps<any>): JSX.Element;
-export { InputClearIcon, CloseIcon, UnDoIcon, ReDoIcon, EnterIcon, VolumeIcon, MuteIcon, PlayIcon, PauseIcon, ReloadIcon, LeftArrowIcon, RightArrowIcon, CheckIcon, PlusIcon, MinusIcon, PencilIcon, FunctionIcon, MenuIcon, UserRemove, Role, Department, Post };
+export { InputClearIcon, CloseIcon, UnDoIcon, ReDoIcon, EnterIcon, VolumeIcon, MuteIcon, PlayIcon, PauseIcon, ReloadIcon, LeftArrowIcon, RightArrowIcon, CheckIcon, PlusIcon, MinusIcon, PencilIcon, FunctionIcon, MenuIcon, UserRemove, Role, Department, Post, RightDoubleArrowIcon };