amis 2.7.3-beta.0 → 2.8.0

package/lib/renderers/Nav.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.8.0
  * Copyright 2018-2023 baidu
  */
 
@@ -99,8 +99,10 @@ var Navigation = /** @class */ (function (_super) {
         var targetDepth = Number(target === null || target === void 0 ? void 0 : target.getAttribute('data-depth'));
         var wrapperComponent = overflow && overflow.enable ? overflow.wrapperComponent || 'ul' : 'ul';
         if (dragOnSameLevel &&
-            ((_a = this.dragNode) === null || _a === void 0 ? void 0 : _a.node.closest(wrapperComponent)) !==
-                (target === null || target === void 0 ? void 0 : target.closest(wrapperComponent))) {
+            // menu里原来menuItem套了一层div 后来改成了ul 这里的判断条件需要加限制
+            // 否则始终不相等
+            ((_a = this.dragNode) === null || _a === void 0 ? void 0 : _a.node.closest("".concat(wrapperComponent, "[role=\"menu\"]"))) !==
+                (target === null || target === void 0 ? void 0 : target.closest("".concat(wrapperComponent, "[role=\"menu\"]")))) {
             this.setState({ dropIndicator: undefined });
             this.dropInfo = null;
             return;
@@ -256,18 +258,21 @@ var Navigation = /** @class */ (function (_super) {
                 extra: itemActions
                     ? render('inline', itemActions, {
                         data: amisCore.createObject(data, link),
-                        popOverContainer: function () { return document.body; }
+                        popOverContainer: function () { return document.body; },
+                        // 点击操作之后 就关闭 因为close方法里执行了preventDefault
+                        closeOnClick: true
                     })
                     : null,
                 disabled: !!link.disabled,
                 disabledTip: link.disabledTip,
                 hidden: link.hidden,
-                className: link.className
+                className: link.className,
+                mode: link.mode
             };
         });
     };
     Navigation.prototype.render = function () {
-        var _a = this.props, className = _a.className, style = _a.style, stacked = _a.stacked, mode = _a.mode, cx = _a.classnames, links = _a.links, loading = _a.loading, overflow = _a.overflow, loadingConfig = _a.loadingConfig, itemBadge = _a.itemBadge, badge = _a.badge, data = _a.data, location = _a.location, collapsed = _a.collapsed, expandIcon = _a.expandIcon, indentSize = _a.indentSize, accordion = _a.accordion, draggable = _a.draggable, expandPosition = _a.expandPosition, render = _a.render;
+        var _a = this.props, className = _a.className, style = _a.style, stacked = _a.stacked, mode = _a.mode, cx = _a.classnames, links = _a.links, loading = _a.loading, overflow = _a.overflow, loadingConfig = _a.loadingConfig, itemBadge = _a.itemBadge, badge = _a.badge, data = _a.data, location = _a.location, collapsed = _a.collapsed, expandIcon = _a.expandIcon, indentSize = _a.indentSize, accordion = _a.accordion, draggable = _a.draggable, themeColor = _a.themeColor, expandPosition = _a.expandPosition, render = _a.render;
         var dropIndicator = this.state.dropIndicator;
         var overflowedIndicator = null;
         if (overflow && amisCore.isObject(overflow) && overflow.enable) {
@@ -287,7 +292,7 @@ var Navigation = /** @class */ (function (_super) {
                         var path = link.path;
                         var ret = location.pathname === path;
                         return !!ret;
-                    }, isOpen: function (item) { return !!item.open; }, stacked: !!stacked, mode: mode, location: location, onSelect: this.handleClick, onToggle: this.toggleLink, renderLink: function (link) { return link.link; }, badge: itemBadge || badge, collapsed: collapsed, overflowedIndicator: overflowedIndicator, overflowMaxCount: overflow === null || overflow === void 0 ? void 0 : overflow.maxVisibleCount, overflowedIndicatorPopupClassName: cx(overflow === null || overflow === void 0 ? void 0 : overflow.overflowPopoverClassName), overflowSuffix: (overflow === null || overflow === void 0 ? void 0 : overflow.overflowSuffix)
+                    }, isOpen: function (item) { return !!item.open; }, stacked: !!stacked, mode: mode, themeColor: themeColor, location: location, onSelect: this.handleClick, onToggle: this.toggleLink, renderLink: function (link) { return link.link; }, badge: itemBadge || badge, collapsed: collapsed, overflowedIndicator: overflowedIndicator, overflowMaxCount: overflow === null || overflow === void 0 ? void 0 : overflow.maxVisibleCount, overflowedIndicatorPopupClassName: cx(overflow === null || overflow === void 0 ? void 0 : overflow.overflowPopoverClassName), overflowSuffix: (overflow === null || overflow === void 0 ? void 0 : overflow.overflowSuffix)
                         ? render('nav-overflow-suffix', overflow === null || overflow === void 0 ? void 0 : overflow.overflowSuffix)
                         : null, overflowItemWidth: overflow === null || overflow === void 0 ? void 0 : overflow.itemWidth, overflowComponent: overflow === null || overflow === void 0 ? void 0 : overflow.wrapperComponent, overflowStyle: overflow === null || overflow === void 0 ? void 0 : overflow.style, expandIcon: expandIcon
                         ? typeof expandIcon === 'string'
@@ -395,7 +400,7 @@ var ConditionBuilderWithRemoteOptions = amisUi.withRemoteConfig({
     }); },
     normalizeConfig: function (links, origin, props, motivation) {
         if (Array.isArray(links) && motivation !== 'toggle') {
-            var data_1 = props.data, env_1 = props.env, unfoldedField_1 = props.unfoldedField, foldedField_1 = props.foldedField, location_1 = props.location, level_1 = props.level, config = props.config, dispatchEvent_1 = props.dispatchEvent;
+            var data_1 = props.data, env_1 = props.env, unfoldedField_1 = props.unfoldedField, foldedField_1 = props.foldedField, location_1 = props.location, level_1 = props.level, defaultOpenLevel_1 = props.defaultOpenLevel, config = props.config, dispatchEvent_1 = props.dispatchEvent;
             var isActive_1 = function (link, depth) {
                 if (!!link.disabled) {
                     return false;
@@ -420,12 +425,17 @@ var ConditionBuilderWithRemoteOptions = amisUi.withRemoteConfig({
             links = amisCore.mapTree(links, function (link, index, depth) {
                 var _a;
                 var item = tslib.__assign(tslib.__assign(tslib.__assign({}, link), amisCore.getExprProperties(link, data_1)), { active: isActive_1(link, depth), __id: (_a = link.__id) !== null && _a !== void 0 ? _a : amisCore.guid() });
+                // defaultOpenLevel depth <= defaultOpenLevel的默认全部展开
+                // 优先级比unfolded属性低 如果用户配置了unfolded为false 那么默认不展开
                 item.unfolded =
-                    amisCore.isUnfolded(item, { unfoldedField: unfoldedField_1, foldedField: foldedField_1 }) ||
-                        (link.children &&
-                            !!amisCore.findTree(link.children, function (child, i, d) {
-                                return isActive_1(child, depth + d);
-                            }));
+                    typeof link.unfolded !== 'undefined'
+                        ? amisCore.isUnfolded(item, { unfoldedField: unfoldedField_1, foldedField: foldedField_1 })
+                        : defaultOpenLevel_1 && depth <= defaultOpenLevel_1
+                            ? true
+                            : link.children &&
+                                !!amisCore.findTree(link.children, function (child, i, d) {
+                                    return isActive_1(child, depth + d);
+                                });
                 return item;
             }, 1, true);
             var currentActiveItems_1 = getActiveItems(links, 1, level_1);
@@ -536,7 +546,7 @@ var ConditionBuilderWithRemoteOptions = amisUi.withRemoteConfig({
                         }
                         else {
                             updateConfig(amisCore.mapTree(config, function (link) {
-                                return target === link
+                                return target.__id === link.__id
                                     ? tslib.__assign(tslib.__assign({}, link), { unfolded: typeof forceFold !== 'undefined'
                                             ? !forceFold
                                             : !link.unfolded }) : tslib.__assign(tslib.__assign({}, link), { unfolded: isAccordion
@@ -544,10 +554,6 @@ var ConditionBuilderWithRemoteOptions = amisUi.withRemoteConfig({
                                         : link.unfolded });
                             }), 'toggle');
                         }
-                        // 如果父菜单项也配置了链接 同样要支持跳转
-                        if (target.to) {
-                            this.handleSelect(target, depth);
-                        }
                         return [2 /*return*/];
                 }
             });
@@ -581,7 +587,7 @@ var ConditionBuilderWithRemoteOptions = amisUi.withRemoteConfig({
                                 idx = amisCore.findTreeIndex(links, function (link) { return link.__id === nodeId; });
                                 // 插入节点之后
                                 if (position === 'bottom') {
-                                    idx.push(idx.pop() + 1);
+                                    idx && idx.push(idx.pop() + 1);
                                 }
                                 links = amisCore.spliceTree(links, idx, 0, dragLink);
                             }

package/lib/renderers/Operation.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.8.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Page.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.8.0
  * Copyright 2018-2023 baidu
  */
 
@@ -238,7 +238,7 @@ var Page = /** @class */ (function (_super) {
         var dialog = store.action.dialog;
         if (dialog &&
             dialog.onConfirm &&
-            dialog.onConfirm.apply(dialog, tslib.__spreadArray([values, action], args, false)) === false) {
+            dialog.onConfirm.apply(dialog, tslib.__spreadArray([values, action], tslib.__read(args), false)) === false) {
             return;
         }
         store.closeDialog(true);
@@ -260,7 +260,7 @@ var Page = /** @class */ (function (_super) {
         var dialog = store.action.dialog;
         if (dialog &&
             dialog.onConfirm &&
-            dialog.onConfirm.apply(dialog, tslib.__spreadArray([values, action], args, false)) === false) {
+            dialog.onConfirm.apply(dialog, tslib.__spreadArray([values, action], tslib.__read(args), false)) === false) {
             return;
         }
         store.closeDrawer();
@@ -567,7 +567,7 @@ var Page = /** @class */ (function (_super) {
         for (var _i = 2; _i < arguments.length; _i++) {
             rest[_i - 2] = arguments[_i];
         }
-        _super.prototype.handleDialogConfirm.apply(this, tslib.__spreadArray([values, action], rest, false));
+        _super.prototype.handleDialogConfirm.apply(this, tslib.__spreadArray([values, action], tslib.__read(rest), false));
         var scoped = this.context;
         var store = this.props.store;
         var dialogAction = store.action;

package/lib/renderers/Pagination.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.8.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/PaginationWrapper.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.8.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Panel.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.8.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Password.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.8.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Plain.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.8.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/PopOver.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.8.0
  * Copyright 2018-2023 baidu
  */
 
@@ -167,12 +167,12 @@ var HocPopOver = function (config) {
                 return (React__default["default"].createElement(Component, tslib.__assign({}, this.props, { className: cx("Field--popOverAble", className, {
                         in: this.state.isOpened
                     }), ref: config.targetOutter ? this.targetRef : undefined }), (popOver === null || popOver === void 0 ? void 0 : popOver.showIcon) !== false ? (React__default["default"].createElement(React__default["default"].Fragment, null,
-                    React__default["default"].createElement(Component, tslib.__assign({}, this.props, { wrapperComponent: '', noHoc: true })),
+                    React__default["default"].createElement(Component, tslib.__assign({}, this.props, { contentsOnly: true, noHoc: true })),
                     React__default["default"].createElement("span", tslib.__assign({ key: "popover-btn", className: cx('Field-popOverBtn') }, triggerProps, { ref: config.targetOutter ? undefined : this.targetRef }),
                         React__default["default"].createElement(amisUi.Icon, { icon: "zoom-in", className: "icon" })),
                     this.state.isOpened ? this.renderPopOver() : null)) : (React__default["default"].createElement(React__default["default"].Fragment, null,
                     React__default["default"].createElement("div", tslib.__assign({ className: cx('Field-popOverWrap') }, triggerProps, { ref: config.targetOutter ? undefined : this.targetRef }),
-                        React__default["default"].createElement(Component, tslib.__assign({}, this.props, { wrapperComponent: '', noHoc: true }))),
+                        React__default["default"].createElement(Component, tslib.__assign({}, this.props, { contentsOnly: true, noHoc: true }))),
                     this.state.isOpened ? this.renderPopOver() : null))));
             };
             PopOverComponent.ComposedComponent = Component;

package/lib/renderers/Portlet.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.8.0
  * Copyright 2018-2023 baidu
  */
 
@@ -95,7 +95,7 @@ var Portlet = /** @class */ (function (_super) {
         if (Array.isArray(arr)) {
             arr.forEach(function (value, index) {
                 var ctx = amisCore.createObject(data, amisCore.isObject(value) ? tslib.__assign({ index: index }, value) : { item: value, index: index });
-                children.push.apply(children, tabs.map(function (tab, tabIndex) {
+                children.push.apply(children, tslib.__spreadArray([], tslib.__read(tabs.map(function (tab, tabIndex) {
                     return amisCore.isVisible(tab, ctx) ? (React__default["default"].createElement(amisUi.Tab, tslib.__assign({}, tab, { title: amisCore.filter(tab.title, ctx), disabled: amisCore.isDisabled(tab, ctx), key: "".concat(index * 1000 + tabIndex), eventKey: index * 1000 + tabIndex, mountOnEnter: mountOnEnter, unmountOnExit: typeof tab.reload === 'boolean'
                             ? tab.reload
                             : typeof tab.unmountOnExit === 'boolean'
@@ -103,7 +103,7 @@ var Portlet = /** @class */ (function (_super) {
                                 : unmountOnExit }), render("item/".concat(index, "/").concat(tabIndex), (tab === null || tab === void 0 ? void 0 : tab.type) ? tab : tab.tab || tab.body, {
                         data: ctx
                     }))) : null;
-                }));
+                })), false));
             });
         }
         else {

package/lib/renderers/Progress.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.8.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Property.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.8.0
  * Copyright 2018-2023 baidu
  */
 
@@ -27,36 +27,46 @@ var Property = /** @class */ (function (_super) {
      * 算好每行的分布情况，方便后续渲染
      */
     Property.prototype.prepareRows = function () {
-        var _a = this.props, _b = _a.column, column = _b === void 0 ? 3 : _b, items = _a.items, source = _a.source, data = _a.data;
+        var e_1, _a;
+        var _b = this.props, _c = _b.column, column = _c === void 0 ? 3 : _c, items = _b.items, source = _b.source, data = _b.data;
         var propertyItems = items ? items : source || [];
         var rows = [];
         var row = [];
         var columnLeft = column;
         var index = 0;
         var filteredItems = amisCore.visibilityFilter(propertyItems, data);
-        for (var _i = 0, filteredItems_1 = filteredItems; _i < filteredItems_1.length; _i++) {
-            var item = filteredItems_1[_i];
-            index = index + 1;
-            var span = Math.min(item.span || 1, column);
-            columnLeft = columnLeft - span;
-            var rowItem = {
-                label: item.label,
-                content: item.content,
-                span: span
-            };
-            // 如果还能放得下就放这一行
-            if (columnLeft >= 0) {
-                row.push(rowItem);
+        try {
+            for (var filteredItems_1 = tslib.__values(filteredItems), filteredItems_1_1 = filteredItems_1.next(); !filteredItems_1_1.done; filteredItems_1_1 = filteredItems_1.next()) {
+                var item = filteredItems_1_1.value;
+                index = index + 1;
+                var span = Math.min(item.span || 1, column);
+                columnLeft = columnLeft - span;
+                var rowItem = {
+                    label: item.label,
+                    content: item.content,
+                    span: span
+                };
+                // 如果还能放得下就放这一行
+                if (columnLeft >= 0) {
+                    row.push(rowItem);
+                }
+                else {
+                    rows.push(row);
+                    columnLeft = column - span;
+                    row = [rowItem];
+                }
+                // 最后一行将最后的数据 push
+                if (index === filteredItems.length) {
+                    rows.push(row);
+                }
             }
-            else {
-                rows.push(row);
-                columnLeft = column - span;
-                row = [rowItem];
-            }
-            // 最后一行将最后的数据 push
-            if (index === filteredItems.length) {
-                rows.push(row);
+        }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (filteredItems_1_1 && !filteredItems_1_1.done && (_a = filteredItems_1.return)) _a.call(filteredItems_1);
             }
+            finally { if (e_1) throw e_1.error; }
         }
         return rows;
     };

package/lib/renderers/QRCode.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.8.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/QuickEdit.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.8.0
  * Copyright 2018-2023 baidu
  */
 
@@ -332,7 +332,7 @@ var HocQuickEdit = function (config) {
                         }), tabIndex: quickEdit.focusable === false
                             ? undefined
                             : '0', onKeyUp: this.handleKeyUp }),
-                        React__default["default"].createElement(Component, tslib.__assign({}, this.props, { wrapperComponent: '', noHoc: true })),
+                        React__default["default"].createElement(Component, tslib.__assign({}, this.props, { contentsOnly: true, noHoc: true })),
                         React__default["default"].createElement("span", { key: "edit-btn", className: cx('Field-quickEditBtn'), onClick: this.openQuickEdit },
                             React__default["default"].createElement(amisUi.Icon, { icon: "edit", className: "icon" })),
                         this.state.isOpened ? this.renderPopOver() : null));

package/lib/renderers/Remark.d.ts

@@ -59,7 +59,7 @@ declare class Remark extends React.Component<RemarkProps> {
     static propsList: Array<string>;
     static defaultProps: {
         icon: string;
-        trigger: ("click" | "hover" | "focus")[];
+        trigger: ("focus" | "hover" | "click")[];
     };
     showModalTip(tooltip?: string | TooltipObject): (e: React.MouseEvent) => void;
     renderLabel(finalIcon: any, finalLabel: string, cx: ClassNamesFn, shape?: 'circle' | 'square'): JSX.Element;

package/lib/renderers/Remark.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.8.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/SearchBox.d.ts

@@ -42,6 +42,10 @@ export interface SearchBoxSchema extends BaseSchema {
      * 是否立马搜索。
      */
     searchImediately?: boolean;
+    /**
+     * 是否开启清空内容后立即重新搜索
+     */
+    clearAndSubmit?: boolean;
 }
 interface SearchBoxProps extends RendererProps, Omit<SearchBoxSchema, 'type' | 'className'> {
     name: string;
@@ -59,6 +63,7 @@ export declare class SearchBoxRenderer extends React.Component<SearchBoxProps, S
         enhance: boolean;
         clearable: boolean;
         searchImediately: boolean;
+        clearAndSubmit: boolean;
     };
     static contextType: React.Context<IScopedContext>;
     static propsList: Array<string>;

package/lib/renderers/SearchBox.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.8.0
  * Copyright 2018-2023 baidu
  */
 
@@ -97,16 +97,17 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
     };
     SearchBoxRenderer.prototype.render = function () {
         var _this = this;
-        var _a = this.props; _a.data; var name = _a.name, onQuery = _a.onQuery, mini = _a.mini, enhance = _a.enhance, clearable = _a.clearable, searchImediately = _a.searchImediately, placeholder = _a.placeholder, onChange = _a.onChange, className = _a.className, style = _a.style;
+        var _a = this.props; _a.data; var name = _a.name, onQuery = _a.onQuery, mini = _a.mini, enhance = _a.enhance, clearable = _a.clearable, searchImediately = _a.searchImediately, clearAndSubmit = _a.clearAndSubmit, placeholder = _a.placeholder, onChange = _a.onChange, className = _a.className, style = _a.style;
         var value = this.state.value;
-        return (React__default["default"].createElement(amisUi.SearchBox, { className: className, style: style, name: name, disabled: !onQuery, defaultActive: !!value, defaultValue: onChange ? undefined : value, value: value, mini: mini, enhance: enhance, clearable: clearable, searchImediately: searchImediately, onSearch: this.handleSearch, onCancel: this.handleCancel, placeholder: placeholder, onChange: this.handleChange, onFocus: function () { return _this.dispatchEvent('focus'); }, onBlur: function () { return _this.dispatchEvent('blur'); } }));
+        return (React__default["default"].createElement(amisUi.SearchBox, { className: className, style: style, name: name, disabled: !onQuery, defaultActive: !!value, defaultValue: onChange ? undefined : value, value: value, mini: mini, enhance: enhance, clearable: clearable, searchImediately: searchImediately, clearAndSubmit: clearAndSubmit, onSearch: this.handleSearch, onCancel: this.handleCancel, placeholder: placeholder, onChange: this.handleChange, onFocus: function () { return _this.dispatchEvent('focus'); }, onBlur: function () { return _this.dispatchEvent('blur'); } }));
     };
     SearchBoxRenderer.defaultProps = {
         name: 'keywords',
         mini: false,
         enhance: false,
         clearable: false,
-        searchImediately: false
+        searchImediately: false,
+        clearAndSubmit: false
     };
     SearchBoxRenderer.contextType = amisCore.ScopedContext;
     SearchBoxRenderer.propsList = ['mini', 'searchImediately'];

package/lib/renderers/Service.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.8.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/SparkLine.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.8.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Spinner.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.8.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Status.d.ts

@@ -1,6 +1,14 @@
 import React from 'react';
 import { RendererProps } from 'amis-core';
 import { BaseSchema } from '../Schema';
+export interface StatusSource {
+    [propName: string]: {
+        icon?: string;
+        label?: string;
+        color?: string;
+        className?: string;
+    };
+}
 /**
  * 状态展示控件。
  * 文档：https://baidu.gitee.io/amis/docs/components/status
@@ -17,6 +25,7 @@ export interface StatusSchema extends BaseSchema {
     placeholder?: string;
     /**
      * 状态图标映射关系
+     * @deprecated 已废弃，2.8.0 废弃，兼容中
      * @default {
      *    0: 'svg-fail',
      *    1: 'svg-success',
@@ -32,7 +41,7 @@ export interface StatusSchema extends BaseSchema {
     };
     /**
      * 文字映射关系
-     *
+     * @deprecated 已废弃，2.8.0 废弃，兼容中
      * @default {
      *     success: '成功',
      *     pending: '运行中',
@@ -44,6 +53,12 @@ export interface StatusSchema extends BaseSchema {
     labelMap?: {
         [propName: string]: string;
     };
+    /**
+     * 新版配置映射源的字段
+     * 可以兼容新版icon并且配置颜色
+     * 2.8.0 新增
+     */
+    source?: StatusSource;
 }
 export interface StatusProps extends RendererProps, Omit<StatusSchema, 'className'> {
 }

package/lib/renderers/Status.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.8.0
  * Copyright 2018-2023 baidu
  */
 
@@ -10,6 +10,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var tslib = require('tslib');
 var React = require('react');
 var merge = require('lodash/merge');
+var assign = require('lodash/assign');
 var amisCore = require('amis-core');
 var amisUi = require('amis-ui');
 
@@ -17,6 +18,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var merge__default = /*#__PURE__*/_interopDefaultLegacy(merge);
+var assign__default = /*#__PURE__*/_interopDefaultLegacy(assign);
 
 var StatusField = /** @class */ (function (_super) {
     tslib.__extends(StatusField, _super);
@@ -25,40 +27,85 @@ var StatusField = /** @class */ (function (_super) {
     }
     StatusField.prototype.render = function () {
         var _a, _b;
-        var _c = this.props, className = _c.className, style = _c.style, placeholder = _c.placeholder, cx = _c.classnames, data = _c.data;
+        var _c = this.props, defaultValue = _c.defaultValue, className = _c.className, style = _c.style, placeholder = _c.placeholder, cx = _c.classnames, data = _c.data;
         var map = merge__default["default"](StatusField.defaultProps.map, (_a = this.props) === null || _a === void 0 ? void 0 : _a.map);
         var labelMap = merge__default["default"](StatusField.defaultProps.labelMap, (_b = this.props) === null || _b === void 0 ? void 0 : _b.labelMap);
+        // 兼容旧版
+        var oldSource = {};
+        map &&
+            Object.entries(map).forEach(function (_a) {
+                var _b = tslib.__read(_a, 2), value = _b[0], icon = _b[1];
+                if (!oldSource[value]) {
+                    oldSource[value] = { icon: icon };
+                }
+                else {
+                    oldSource[value] = tslib.__assign(tslib.__assign({}, oldSource[value]), { icon: icon });
+                }
+            });
+        labelMap &&
+            Object.entries(labelMap).forEach(function (_a) {
+                var _b = tslib.__read(_a, 2), value = _b[0], label = _b[1];
+                if (!oldSource[value]) {
+                    oldSource[value] = { label: label };
+                }
+                else {
+                    oldSource[value] = tslib.__assign(tslib.__assign({}, oldSource[value]), { label: label });
+                }
+            });
+        // 合并source
+        var source = this.props.source || {};
+        if (amisCore.isPureVariable(source)) {
+            source = amisCore.resolveVariableAndFilter(source, data, '| raw');
+        }
+        source = assign__default["default"](oldSource, source);
+        // 获取默认值，支持表达式
         var value = amisCore.getPropValue(this.props);
-        var viewValue = (React__default["default"].createElement("span", { className: "text-muted", key: "status-value" }, placeholder));
-        var wrapClassName = '';
-        if (value != undefined && value !== '' && map) {
+        if (defaultValue && amisCore.isPureVariable(defaultValue)) {
+            value = amisCore.resolveVariableAndFilter(defaultValue, data, '| raw');
+        }
+        if (value != undefined && value !== '') {
             if (typeof value === 'boolean') {
                 value = value ? 1 : 0;
             }
             else if (/^\d+$/.test(value)) {
                 value = parseInt(value, 10) || 0;
             }
+        }
+        var status = source[value] || {};
+        if (!status.icon && !status.label) {
+            return (React__default["default"].createElement("span", { className: cx('StatusField', className), style: style },
+                React__default["default"].createElement("span", { className: "text-muted", key: "status-value" }, placeholder)));
+        }
+        var wrapClassName = '';
+        // icon element
+        var iconElement = null;
+        if (status.icon) {
             wrapClassName = "StatusField--".concat(value);
-            var itemClassName = amisCore.filter(map[value], data) || '';
+            var icon = status.icon;
             var svgIcon_1 = '';
-            itemClassName = itemClassName.replace(/\bsvg-([^\s|$]+)\b/g, function (_, icon) {
-                svgIcon_1 = icon;
-                return 'icon';
-            });
-            if (svgIcon_1) {
-                viewValue = (React__default["default"].createElement(amisUi.Icon, { icon: svgIcon_1, className: cx('Status-icon icon', itemClassName), key: "icon" }));
+            var itemClassName = '';
+            if (typeof icon === 'string') {
+                icon = amisCore.filter(icon, data) || '';
+                itemClassName = icon.replace(/\bsvg-([^\s|$]+)\b/g, function (_, svgName) {
+                    svgIcon_1 = svgName;
+                    return 'icon';
+                });
             }
-            else if (itemClassName) {
-                viewValue = (React__default["default"].createElement("i", { className: cx('Status-icon', itemClassName), key: "icon" }));
+            // 兼容 默认icon 和 旧版 iconfont icon
+            if (svgIcon_1) {
+                iconElement = (React__default["default"].createElement(amisUi.Icon, { icon: svgIcon_1, className: cx('Status-icon icon', itemClassName), key: "icon" }));
             }
-            if (labelMap && labelMap[value]) {
-                viewValue = [
-                    viewValue,
-                    React__default["default"].createElement("span", { className: cx('StatusField-label'), key: "label" }, amisCore.filter(labelMap[value], data))
-                ];
+            else {
+                iconElement = amisCore.generateIcon(cx, icon, 'Status-icon');
             }
         }
-        return (React__default["default"].createElement("span", { className: cx('StatusField', wrapClassName, className), style: style }, viewValue));
+        var labelElement = null;
+        if (status.label !== '' && status.label != null) {
+            labelElement = (React__default["default"].createElement("span", { className: cx('StatusField-label'), key: "label" }, amisCore.filter('' + status.label, data)));
+        }
+        return (React__default["default"].createElement("span", { className: cx('StatusField', wrapClassName, className, status.className), style: tslib.__assign(tslib.__assign({}, style), (status.color ? { color: amisCore.filter(status.color, data) } : {})) },
+            iconElement,
+            labelElement));
     };
     StatusField.defaultProps = {
         placeholder: '-',

package/lib/renderers/Steps.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.8.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Table/ColumnToggler.d.ts

@@ -88,6 +88,7 @@ export interface ColumnTogglerProps extends RendererProps {
     activeToggaleColumns: Array<IColumn | IColumn2>;
     onColumnToggle: (columns: Array<IColumn>) => void;
     modalContainer?: () => HTMLElement;
+    tooltipContainer?: any;
 }
 export interface ColumnTogglerState {
     isOpened: boolean;