amis 2.7.2 → 2.8.0

package/lib/renderers/Status.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.2
+ * 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.2
+ * 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;

package/lib/renderers/Table/ColumnToggler.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.2
+ * amis v2.8.0
  * Copyright 2018-2023 baidu
  */
 
@@ -151,7 +151,7 @@ var ColumnToggler = /** @class */ (function (_super) {
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
                             return [2 /*return*/];
                         }
-                        onColumnToggle && onColumnToggle(tslib.__spreadArray([], tempColumns, true));
+                        onColumnToggle && onColumnToggle(tslib.__spreadArray([], tslib.__read(tempColumns), false));
                         this.setState({
                             isOpened: false,
                             enableSorting: false
@@ -176,7 +176,7 @@ var ColumnToggler = /** @class */ (function (_super) {
     };
     ColumnToggler.prototype.renderModal = function () {
         var _this = this;
-        var _a = this.props; _a.render; var cx = _a.classnames, ns = _a.classPrefix, modalContainer = _a.modalContainer, draggable = _a.draggable, overlay = _a.overlay, __ = _a.translate, footerBtnSize = _a.footerBtnSize;
+        var _a = this.props; _a.render; var cx = _a.classnames, ns = _a.classPrefix, modalContainer = _a.modalContainer, draggable = _a.draggable, overlay = _a.overlay, __ = _a.translate, footerBtnSize = _a.footerBtnSize, env = _a.env;
         var _b = this.state, enableSorting = _b.enableSorting, tempColumns = _b.tempColumns;
         return (React__default["default"].createElement(React__default["default"].Fragment, null,
             React__default["default"].createElement(amisUi.Modal, { closeOnEsc: true, onHide: this.close, show: this.state.isOpened, contentClassName: cx('ColumnToggler-modal'), container: modalContainer || this.target, overlay: typeof overlay === 'boolean' ? overlay : false },
@@ -185,7 +185,7 @@ var ColumnToggler = /** @class */ (function (_super) {
                     React__default["default"].createElement("a", { "data-tooltip": __('Dialog.close'), "data-position": "left", className: cx('Modal-close'), onClick: this.close },
                         React__default["default"].createElement(amisUi.Icon, { icon: "close", className: "icon" }))),
                 React__default["default"].createElement("ul", { className: cx('ColumnToggler-modal-content'), ref: this.dragRef }, Array.isArray(tempColumns)
-                    ? tempColumns.map(function (column, index) { return (React__default["default"].createElement(amisUi.TooltipWrapper, { tooltipClassName: cx('ColumnToggler-tooltip'), placement: "top", tooltip: column.label || '', trigger: enableSorting ? [] : 'hover', key: column.index },
+                    ? tempColumns.map(function (column, index) { return (React__default["default"].createElement(amisUi.TooltipWrapper, { tooltipClassName: cx('ColumnToggler-tooltip'), placement: "top", tooltip: column.label || '', trigger: enableSorting ? [] : 'hover', key: column.index, container: modalContainer || (env === null || env === void 0 ? void 0 : env.getModalContainer) },
                         React__default["default"].createElement("li", { className: cx('ColumnToggler-menuItem'), key: column.index }, enableSorting && draggable && tempColumns.length > 1 ? (React__default["default"].createElement(React__default["default"].Fragment, null,
                             React__default["default"].createElement("a", { className: cx('ColumnToggler-menuItem-dragBar') },
                                 React__default["default"].createElement(amisUi.Icon, { icon: "drag", className: cx('icon') })),

package/lib/renderers/Table/HeadCellFilterDropdown.js

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

package/lib/renderers/Table/HeadCellSearchDropdown.js

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

package/lib/renderers/Table/ItemActionsWrapper.js

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

package/lib/renderers/Table/TableBody.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.2
+ * amis v2.8.0
  * Copyright 2018-2023 baidu
  */
 
@@ -47,7 +47,7 @@ var TableBody = /** @class */ (function (_super) {
             }
             else if (item.children.length && item.expanded) {
                 // 嵌套表格
-                doms.push.apply(doms, _this.renderRows(item.children, columns, tslib.__assign(tslib.__assign({}, rowProps), { parent: item })));
+                doms.push.apply(doms, tslib.__spreadArray([], tslib.__read(_this.renderRows(item.children, columns, tslib.__assign(tslib.__assign({}, rowProps), { parent: item }))), false));
             }
             return doms;
         });

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

@@ -2,13 +2,15 @@ import React from 'react';
 import { RendererProps } from 'amis-core';
 export interface TableCellProps extends RendererProps {
     wrapperComponent?: React.ReactType;
-    column: object;
+    column: any;
+    contentsOnly?: boolean;
 }
-export declare class TableCell extends React.Component<RendererProps> {
+export declare class TableCell extends React.Component<TableCellProps> {
     static defaultProps: {
         wrapperComponent: string;
     };
     static propsList: Array<string>;
+    readonly propsNeedRemove: string[];
     render(): JSX.Element;
 }
 export declare class TableCellRenderer extends TableCell {

package/lib/renderers/Table/TableCell.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.2
+ * amis v2.8.0
  * Copyright 2018-2023 baidu
  */
 
@@ -25,10 +25,12 @@ var omit__default = /*#__PURE__*/_interopDefaultLegacy(omit);
 var TableCell = /** @class */ (function (_super) {
     tslib.__extends(TableCell, _super);
     function TableCell() {
-        return _super !== null && _super.apply(this, arguments) || this;
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.propsNeedRemove = [];
+        return _this;
     }
     TableCell.prototype.render = function () {
-        var _a = this.props, cx = _a.classnames, className = _a.className; _a.classNameExpr; var render = _a.render, _b = _a.style, style = _b === void 0 ? {} : _b, Component = _a.wrapperComponent, column = _a.column, value = _a.value, data = _a.data, children = _a.children, width = _a.width, align = _a.align, innerClassName = _a.innerClassName; _a.label; var tabIndex = _a.tabIndex, onKeyUp = _a.onKeyUp, rowSpan = _a.rowSpan; _a.body; _a.tpl; _a.remark; var prefix = _a.prefix, affix = _a.affix, isHead = _a.isHead; _a.colIndex; var row = _a.row, showBadge = _a.showBadge, itemBadge = _a.itemBadge, rest = tslib.__rest(_a, ["classnames", "className", "classNameExpr", "render", "style", "wrapperComponent", "column", "value", "data", "children", "width", "align", "innerClassName", "label", "tabIndex", "onKeyUp", "rowSpan", "body", "tpl", "remark", "prefix", "affix", "isHead", "colIndex", "row", "showBadge", "itemBadge"]);
+        var _a = this.props, cx = _a.classnames, className = _a.className; _a.classNameExpr; var render = _a.render, _b = _a.style, style = _b === void 0 ? {} : _b, Component = _a.wrapperComponent, contentsOnly = _a.contentsOnly, column = _a.column, value = _a.value, data = _a.data, children = _a.children, width = _a.width, align = _a.align, innerClassName = _a.innerClassName; _a.label; var tabIndex = _a.tabIndex, onKeyUp = _a.onKeyUp, rowSpan = _a.rowSpan; _a.body; _a.tpl; _a.remark; var prefix = _a.prefix, affix = _a.affix, isHead = _a.isHead; _a.colIndex; var row = _a.row, showBadge = _a.showBadge, itemBadge = _a.itemBadge, rest = tslib.__rest(_a, ["classnames", "className", "classNameExpr", "render", "style", "wrapperComponent", "contentsOnly", "column", "value", "data", "children", "width", "align", "innerClassName", "label", "tabIndex", "onKeyUp", "rowSpan", "body", "tpl", "remark", "prefix", "affix", "isHead", "colIndex", "row", "showBadge", "itemBadge"]);
         var schema = tslib.__assign(tslib.__assign({}, column), { className: innerClassName, type: (column && column.type) || 'plain' });
         var canAccessSuperData = (schema === null || schema === void 0 ? void 0 : schema.canAccessSuperData) !== false;
         // 如果本来就是 type 为 button，不要删除，其他情况下都应该删除。
@@ -37,7 +39,7 @@ var TableCell = /** @class */ (function (_super) {
         }
         var body = children
             ? children
-            : render('field', schema, tslib.__assign(tslib.__assign({}, omit__default["default"](rest, Object.keys(schema))), { 
+            : render('field', schema, tslib.__assign(tslib.__assign({}, omit__default["default"](rest, Object.keys(schema), this.propsNeedRemove)), { 
                 // inputOnly 属性不能传递给子组件，在 SchemaRenderer.renderChild 中处理掉了
                 inputOnly: true, 
                 /** value没有返回值时设置默认值，避免错误获取到父级数据域的值 */
@@ -68,10 +70,10 @@ var TableCell = /** @class */ (function (_super) {
                 max = amisCore.resolveVariableAndFilter(max, data, '| raw');
             }
             if (typeof min === 'undefined') {
-                min = Math.min.apply(Math, data.rows.map(function (r) { return r[column.name]; }));
+                min = Math.min.apply(Math, tslib.__spreadArray([], tslib.__read(data.rows.map(function (r) { return r[column.name]; })), false));
             }
             if (typeof max === 'undefined') {
-                max = Math.max.apply(Math, data.rows.map(function (r) { return r[column.name]; }));
+                max = Math.max.apply(Math, tslib.__spreadArray([], tslib.__read(data.rows.map(function (r) { return r[column.name]; })), false));
             }
             var colorScale = new amisCore.ColorScale(min, max, backgroundScale.colors || ['#FFEF9C', '#FF7127']);
             var value_1 = data[column.name];
@@ -81,12 +83,15 @@ var TableCell = /** @class */ (function (_super) {
             var color = colorScale.getColor(Number(value_1)).toHexString();
             style.background = color;
         }
-        if (!Component) {
+        if (contentsOnly) {
             return body;
         }
         if (isHead) {
             Component = 'th';
         }
+        else {
+            Component = Component || 'td';
+        }
         return (React__default["default"].createElement(Component, { rowSpan: rowSpan > 1 ? rowSpan : undefined, style: style, className: cx(className, column.classNameExpr ? amisCore.filter(column.classNameExpr, data) : null), tabIndex: tabIndex, onKeyUp: onKeyUp },
             showBadge ? (React__default["default"].createElement(amisUi.Badge, { classnames: cx, badge: tslib.__assign(tslib.__assign({}, itemBadge), { className: cx("Table-badge", itemBadge === null || itemBadge === void 0 ? void 0 : itemBadge.className) }), data: row.data })) : null,
             prefix,
@@ -103,7 +108,8 @@ var TableCell = /** @class */ (function (_super) {
         'body',
         'tpl',
         'rowSpan',
-        'remark'
+        'remark',
+        'contentsOnly'
     ];
     return TableCell;
 }(React__default["default"].Component));
@@ -118,7 +124,7 @@ var TableCell = /** @class */ (function (_super) {
         'popOver',
         'copyable',
         'inline'
-    ], TableCell.propsList, true);
+    ], tslib.__read(TableCell.propsList), false);
     TableCellRenderer = tslib.__decorate([
         amisCore.Renderer({
             test: /(^|\/)table\/(?:.*\/)?cell$/,

package/lib/renderers/Table/TableContent.js

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

package/lib/renderers/Table/TableRow.js

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