amis 2.7.3-beta.0 → 2.9.0

package/lib/renderers/Form/Transfer.d.ts

@@ -103,6 +103,10 @@ export interface TransferControlSchema extends FormOptionsSchema, SpinnerExtraPr
      * 当在value值未匹配到当前options中的选项时，是否value值对应文本飘红显示
      */
     showInvalidMatch?: boolean;
+    /**
+     * 树形模式下，仅选中子节点
+     */
+    onlyChildren?: boolean;
 }
 export interface BaseTransferProps extends OptionsControlProps, Omit<TransferControlSchema, 'type' | 'options' | 'className' | 'descriptionClassName' | 'inputClassName'>, SpinnerExtraProps {
     resultItemRender?: (option: Option) => JSX.Element;
@@ -111,6 +115,9 @@ export interface BaseTransferProps extends OptionsControlProps, Omit<TransferCon
 }
 type OptionsControlWithSpinnerProps = OptionsControlProps & SpinnerExtraProps;
 export declare class BaseTransferRenderer<T extends OptionsControlWithSpinnerProps = BaseTransferProps> extends React.Component<T> {
+    static defaultProps: {
+        multiple: boolean;
+    };
     tranferRef?: any;
     reload(): void;
     handleChange(value: Array<Option> | Option, optionModified?: boolean): Promise<void>;

package/lib/renderers/Form/Transfer.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 
@@ -214,7 +214,7 @@ var BaseTransferRenderer = /** @class */ (function (_super) {
     };
     BaseTransferRenderer.prototype.render = function () {
         var _a;
-        var _b = this.props, className = _b.className; _b.style; var cx = _b.classnames, selectedOptions = _b.selectedOptions, showArrow = _b.showArrow, sortable = _b.sortable, selectMode = _b.selectMode, columns = _b.columns, loading = _b.loading, searchable = _b.searchable, searchResultMode = _b.searchResultMode, searchResultColumns = _b.searchResultColumns, deferLoad = _b.deferLoad, leftMode = _b.leftMode, rightMode = _b.rightMode, disabled = _b.disabled, selectTitle = _b.selectTitle, resultTitle = _b.resultTitle; _b.menuTpl; var searchPlaceholder = _b.searchPlaceholder, _c = _b.resultListModeFollowSelect, resultListModeFollowSelect = _c === void 0 ? false : _c, resultSearchPlaceholder = _b.resultSearchPlaceholder, _d = _b.resultSearchable, resultSearchable = _d === void 0 ? false : _d, statistics = _b.statistics, labelField = _b.labelField, virtualThreshold = _b.virtualThreshold, itemHeight = _b.itemHeight, loadingConfig = _b.loadingConfig, showInvalidMatch = _b.showInvalidMatch;
+        var _b = this.props, className = _b.className; _b.style; var cx = _b.classnames, selectedOptions = _b.selectedOptions, showArrow = _b.showArrow, sortable = _b.sortable, selectMode = _b.selectMode, columns = _b.columns, loading = _b.loading, searchable = _b.searchable, searchResultMode = _b.searchResultMode, searchResultColumns = _b.searchResultColumns, deferLoad = _b.deferLoad, leftMode = _b.leftMode, rightMode = _b.rightMode, disabled = _b.disabled, selectTitle = _b.selectTitle, resultTitle = _b.resultTitle; _b.menuTpl; var searchPlaceholder = _b.searchPlaceholder, _c = _b.resultListModeFollowSelect, resultListModeFollowSelect = _c === void 0 ? false : _c, resultSearchPlaceholder = _b.resultSearchPlaceholder, _d = _b.resultSearchable, resultSearchable = _d === void 0 ? false : _d, statistics = _b.statistics, labelField = _b.labelField, virtualThreshold = _b.virtualThreshold, itemHeight = _b.itemHeight, loadingConfig = _b.loadingConfig, showInvalidMatch = _b.showInvalidMatch, onlyChildren = _b.onlyChildren;
         // 目前 LeftOptions 没有接口可以动态加载
         // 为了方便可以快速实现动态化，让选项的第一个成员携带
         // LeftOptions 信息
@@ -229,9 +229,12 @@ var BaseTransferRenderer = /** @class */ (function (_super) {
             options = options[0].children;
         }
         return (React__default["default"].createElement("div", { className: cx('TransferControl', className) },
-            React__default["default"].createElement(amisUi.Transfer, { value: selectedOptions, options: options, disabled: disabled, onChange: this.handleChange, option2value: this.option2value, sortable: sortable, showArrow: showArrow, selectMode: selectMode, searchResultMode: searchResultMode, searchResultColumns: searchResultColumns, columns: columns, onSearch: searchable ? this.handleSearch : undefined, onDeferLoad: deferLoad, leftOptions: leftOptions, leftMode: leftMode, rightMode: rightMode, cellRender: this.renderCell, selectTitle: selectTitle, resultTitle: resultTitle, resultListModeFollowSelect: resultListModeFollowSelect, onResultSearch: this.handleResultSearch, searchPlaceholder: searchPlaceholder, resultSearchable: resultSearchable, resultSearchPlaceholder: resultSearchPlaceholder, statistics: statistics, labelField: labelField, optionItemRender: this.optionItemRender, resultItemRender: this.resultItemRender, onSelectAll: this.onSelectAll, onRef: this.getRef, virtualThreshold: virtualThreshold, itemHeight: amisCore.toNumber(itemHeight) > 0 ? amisCore.toNumber(itemHeight) : undefined, loadingConfig: loadingConfig, showInvalidMatch: showInvalidMatch }),
+            React__default["default"].createElement(amisUi.Transfer, { onlyChildren: onlyChildren, value: selectedOptions, options: options, disabled: disabled, onChange: this.handleChange, option2value: this.option2value, sortable: sortable, showArrow: showArrow, selectMode: selectMode, searchResultMode: searchResultMode, searchResultColumns: searchResultColumns, columns: columns, onSearch: searchable ? this.handleSearch : undefined, onDeferLoad: deferLoad, leftOptions: leftOptions, leftMode: leftMode, rightMode: rightMode, cellRender: this.renderCell, selectTitle: selectTitle, resultTitle: resultTitle, resultListModeFollowSelect: resultListModeFollowSelect, onResultSearch: this.handleResultSearch, searchPlaceholder: searchPlaceholder, resultSearchable: resultSearchable, resultSearchPlaceholder: resultSearchPlaceholder, statistics: statistics, labelField: labelField, optionItemRender: this.optionItemRender, resultItemRender: this.resultItemRender, onSelectAll: this.onSelectAll, onRef: this.getRef, virtualThreshold: virtualThreshold, itemHeight: amisCore.toNumber(itemHeight) > 0 ? amisCore.toNumber(itemHeight) : undefined, loadingConfig: loadingConfig, showInvalidMatch: showInvalidMatch }),
             React__default["default"].createElement(amisUi.Spinner, { overlay: true, key: "info", loadingConfig: loadingConfig, show: loading })));
     };
+    BaseTransferRenderer.defaultProps = {
+        multiple: true
+    };
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),

package/lib/renderers/Form/TransferPicker.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { OptionsControlProps } from 'amis-core';
 import { SpinnerExtraProps } from 'amis-ui';
 import { BaseTransferRenderer, TransferControlSchema } from './Transfer';

package/lib/renderers/Form/TransferPicker.js

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

package/lib/renderers/Form/TreeSelect.d.ts

@@ -5,6 +5,7 @@ import { Api } from 'amis-core';
 import { ActionObject } from 'amis-core';
 import { FormOptionsSchema } from '../../Schema';
 import { TooltipWrapperSchema } from '../TooltipWrapper';
+import type { ItemRenderStates } from 'amis-ui/lib/components/Selection';
 /**
  * Tree 下拉选择框。
  * 文档：https://baidu.gitee.io/amis/docs/components/form/tree
@@ -71,6 +72,14 @@ export interface TreeSelectControlSchema extends FormOptionsSchema {
      * 收纳标签的Popover配置
      */
     overflowTagPopover?: TooltipWrapperSchema;
+    /**
+     * 自定义选项
+     */
+    menuTpl?: string;
+    /**
+     * 是否为选项添加默认的Icon，默认值为true
+     */
+    enableDefaultIcon?: boolean;
 }
 export interface TreeSelectProps extends OptionsControlProps, SpinnerExtraProps {
     placeholder?: any;
@@ -137,6 +146,9 @@ export default class TreeSelectControl extends React.Component<TreeSelectProps,
     handleResultChange(value: Array<Option>): void;
     doAction(action: ActionObject, data: any, throwErrors: boolean): void;
     resultChangeEvent(value: any): Promise<void>;
+    /** 下拉框选项渲染 */
+    renderOptionItem(option: Option, states: ItemRenderStates): JSX.Element;
+    /** 输入框选项渲染 */
     renderItem(item: Option): any;
     domRef(ref: any): void;
     renderOuter(): JSX.Element;

package/lib/renderers/Form/TreeSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 
@@ -284,6 +284,14 @@ var TreeSelectControl = /** @class */ (function (_super) {
             });
         });
     };
+    /** 下拉框选项渲染 */
+    TreeSelectControl.prototype.renderOptionItem = function (option, states) {
+        var _a = this.props, menuTpl = _a.menuTpl, render = _a.render, data = _a.data;
+        return render("option/".concat(states.index), menuTpl, {
+            data: amisCore.createObject(amisCore.createObject(data, tslib.__assign({}, states)), option)
+        });
+    };
+    /** 输入框选项渲染 */
     TreeSelectControl.prototype.renderItem = function (item) {
         var _a = this.props, labelField = _a.labelField, options = _a.options, hideNodePathLabel = _a.hideNodePathLabel;
         if (hideNodePathLabel) {
@@ -299,11 +307,11 @@ var TreeSelectControl = /** @class */ (function (_super) {
         this.treeRef = ref;
     };
     TreeSelectControl.prototype.renderOuter = function () {
-        var _a = this.props, value = _a.value, enableNodePath = _a.enableNodePath, _b = _a.pathSeparator, pathSeparator = _b === void 0 ? '/' : _b, disabled = _a.disabled, joinValues = _a.joinValues, extractValue = _a.extractValue, delimiter = _a.delimiter; _a.placeholder; var options = _a.options, multiple = _a.multiple, valueField = _a.valueField, initiallyOpen = _a.initiallyOpen, unfoldedLevel = _a.unfoldedLevel, withChildren = _a.withChildren, rootLabel = _a.rootLabel, cascade = _a.cascade, rootValue = _a.rootValue, showIcon = _a.showIcon, showRadio = _a.showRadio; _a.popOverContainer; var onlyChildren = _a.onlyChildren, onlyLeaf = _a.onlyLeaf, ns = _a.classPrefix, optionsPlaceholder = _a.optionsPlaceholder, searchable = _a.searchable, autoComplete = _a.autoComplete, maxLength = _a.maxLength, minLength = _a.minLength, labelField = _a.labelField, nodePath = _a.nodePath, onAdd = _a.onAdd, creatable = _a.creatable, createTip = _a.createTip, addControls = _a.addControls, onEdit = _a.onEdit, editable = _a.editable, editTip = _a.editTip, editControls = _a.editControls, removable = _a.removable, removeTip = _a.removeTip, onDelete = _a.onDelete, rootCreatable = _a.rootCreatable, rootCreateTip = _a.rootCreateTip, __ = _a.translate, deferLoad = _a.deferLoad, expandTreeOptions = _a.expandTreeOptions, selfDisabledAffectChildren = _a.selfDisabledAffectChildren, showOutline = _a.showOutline, autoCheckChildren = _a.autoCheckChildren, hideRoot = _a.hideRoot, virtualThreshold = _a.virtualThreshold, itemHeight = _a.itemHeight;
+        var _a = this.props, value = _a.value, enableNodePath = _a.enableNodePath, _b = _a.pathSeparator, pathSeparator = _b === void 0 ? '/' : _b, disabled = _a.disabled, joinValues = _a.joinValues, extractValue = _a.extractValue, delimiter = _a.delimiter; _a.placeholder; var options = _a.options, multiple = _a.multiple, valueField = _a.valueField, initiallyOpen = _a.initiallyOpen, unfoldedLevel = _a.unfoldedLevel, withChildren = _a.withChildren, rootLabel = _a.rootLabel, cascade = _a.cascade, rootValue = _a.rootValue, showIcon = _a.showIcon, showRadio = _a.showRadio; _a.popOverContainer; var onlyChildren = _a.onlyChildren, onlyLeaf = _a.onlyLeaf, ns = _a.classPrefix, optionsPlaceholder = _a.optionsPlaceholder, searchable = _a.searchable, autoComplete = _a.autoComplete, maxLength = _a.maxLength, minLength = _a.minLength, labelField = _a.labelField, nodePath = _a.nodePath, onAdd = _a.onAdd, creatable = _a.creatable, createTip = _a.createTip, addControls = _a.addControls, onEdit = _a.onEdit, editable = _a.editable, editTip = _a.editTip, editControls = _a.editControls, removable = _a.removable, removeTip = _a.removeTip, onDelete = _a.onDelete, rootCreatable = _a.rootCreatable, rootCreateTip = _a.rootCreateTip, __ = _a.translate, deferLoad = _a.deferLoad, expandTreeOptions = _a.expandTreeOptions, selfDisabledAffectChildren = _a.selfDisabledAffectChildren, showOutline = _a.showOutline, autoCheckChildren = _a.autoCheckChildren, hideRoot = _a.hideRoot, virtualThreshold = _a.virtualThreshold, itemHeight = _a.itemHeight, menuTpl = _a.menuTpl, enableDefaultIcon = _a.enableDefaultIcon;
         var filtedOptions = !amisCore.isEffectiveApi(autoComplete) && searchable && this.state.inputValue
             ? this.filterOptions(options, this.state.inputValue)
             : options;
-        return (React__default["default"].createElement(amisUi.Tree, { classPrefix: ns, onRef: this.domRef, onlyChildren: onlyChildren, onlyLeaf: onlyLeaf, labelField: labelField, valueField: valueField, disabled: disabled, onChange: this.handleChange, joinValues: joinValues, extractValue: extractValue, delimiter: delimiter, placeholder: __(optionsPlaceholder), options: filtedOptions, highlightTxt: this.state.inputValue, multiple: multiple, initiallyOpen: initiallyOpen, unfoldedLevel: unfoldedLevel, withChildren: withChildren, autoCheckChildren: autoCheckChildren, rootLabel: __(rootLabel), rootValue: rootValue, showIcon: showIcon, showRadio: showRadio, showOutline: showOutline, cascade: cascade, foldedField: "collapsed", hideRoot: hideRoot, value: value || '', nodePath: nodePath, enableNodePath: enableNodePath, pathSeparator: pathSeparator, maxLength: maxLength, minLength: minLength, onAdd: onAdd, creatable: creatable, createTip: createTip, rootCreatable: rootCreatable, rootCreateTip: rootCreateTip, onEdit: onEdit, editable: editable, editTip: editTip, removable: removable, removeTip: removeTip, onDelete: onDelete, bultinCUD: !addControls && !editControls, onDeferLoad: deferLoad, onExpandTree: expandTreeOptions, selfDisabledAffectChildren: selfDisabledAffectChildren, virtualThreshold: virtualThreshold, itemHeight: amisCore.toNumber(itemHeight) > 0 ? amisCore.toNumber(itemHeight) : undefined }));
+        return (React__default["default"].createElement(amisUi.Tree, { classPrefix: ns, onRef: this.domRef, onlyChildren: onlyChildren, onlyLeaf: onlyLeaf, labelField: labelField, valueField: valueField, disabled: disabled, onChange: this.handleChange, joinValues: joinValues, extractValue: extractValue, delimiter: delimiter, placeholder: __(optionsPlaceholder), options: filtedOptions, highlightTxt: this.state.inputValue, multiple: multiple, initiallyOpen: initiallyOpen, unfoldedLevel: unfoldedLevel, withChildren: withChildren, autoCheckChildren: autoCheckChildren, rootLabel: __(rootLabel), rootValue: rootValue, showIcon: showIcon, showRadio: showRadio, showOutline: showOutline, cascade: cascade, foldedField: "collapsed", hideRoot: hideRoot, value: value || '', nodePath: nodePath, enableNodePath: enableNodePath, pathSeparator: pathSeparator, maxLength: maxLength, minLength: minLength, onAdd: onAdd, creatable: creatable, createTip: createTip, rootCreatable: rootCreatable, rootCreateTip: rootCreateTip, onEdit: onEdit, editable: editable, editTip: editTip, removable: removable, removeTip: removeTip, onDelete: onDelete, bultinCUD: !addControls && !editControls, onDeferLoad: deferLoad, onExpandTree: expandTreeOptions, selfDisabledAffectChildren: selfDisabledAffectChildren, virtualThreshold: virtualThreshold, itemHeight: amisCore.toNumber(itemHeight) > 0 ? amisCore.toNumber(itemHeight) : undefined, itemRender: menuTpl ? this.renderOptionItem : undefined, enableDefaultIcon: enableDefaultIcon }));
     };
     TreeSelectControl.prototype.render = function () {
         var _this = this;
@@ -365,6 +373,12 @@ var TreeSelectControl = /** @class */ (function (_super) {
         tslib.__metadata("design:paramtypes", [Object]),
         tslib.__metadata("design:returntype", Promise)
     ], TreeSelectControl.prototype, "resultChangeEvent", null);
+    tslib.__decorate([
+        amisCore.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", [Object, Object]),
+        tslib.__metadata("design:returntype", void 0)
+    ], TreeSelectControl.prototype, "renderOptionItem", null);
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),

package/lib/renderers/Form/UUID.js

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

package/lib/renderers/Form/UserSelect.js

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

package/lib/renderers/Grid.js

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

package/lib/renderers/Grid2D.js

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

package/lib/renderers/GridNav.js

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

package/lib/renderers/HBox.js

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

package/lib/renderers/IFrame.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 
@@ -72,7 +72,7 @@ var IFrame = /** @class */ (function (_super) {
                         if (typeof ((_a = e === null || e === void 0 ? void 0 : e.data) === null || _a === void 0 ? void 0 : _a.type) !== 'string') {
                             return [2 /*return*/];
                         }
-                        _e = e.data.type.split(':'), prefix = _e[0], type = _e[1];
+                        _e = tslib.__read(e.data.type.split(':'), 2), prefix = _e[0], type = _e[1];
                         if (prefix !== 'amis' || !type) {
                             return [2 /*return*/];
                         }

package/lib/renderers/Icon.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 
@@ -41,9 +41,14 @@ var Icon = /** @class */ (function (_super) {
         }));
     };
     Icon.prototype.render = function () {
-        var _a = this.props, vendor = _a.vendor, cx = _a.classnames, className = _a.className, style = _a.style, data = _a.data;
+        var _a = this.props, vendor = _a.vendor, cx = _a.classnames, className = _a.className, style = _a.style, data = _a.data, css = _a.css, id = _a.id;
         var icon = this.props.icon;
-        icon = amisCore.filter(icon, data);
+        amisCore.insertCustomStyle(css, [
+            {
+                key: 'className',
+                value: className
+            }
+        ], id);
         if (typeof icon !== 'string') {
             if (lodash.isObject(icon) &&
                 typeof icon.id === 'string' &&
@@ -53,6 +58,7 @@ var Icon = /** @class */ (function (_super) {
             }
             return;
         }
+        icon = amisCore.filter(icon, data);
         var CustomIcon = amisUi.getIcon(icon);
         if (CustomIcon) {
             return (React__default["default"].createElement(CustomIcon, { className: cx(className, "icon-".concat(icon)), style: style, onClick: this.handleClick, onMouseEnter: this.handleMouseEnter, onMouseLeave: this.handleMouseLeave }));

package/lib/renderers/Image.d.ts

@@ -141,7 +141,7 @@ declare const ThemedImageThumb: {
         childRef(ref: any): void;
         getWrappedInstance(): any;
         render(): JSX.Element;
-        context: any;
+        context: unknown;
         setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<Omit<ImageThumbProps, keyof LocaleProps> & {
             locale?: string | undefined;
             translate?: ((str: string, ...args: any[]) => string) | undefined;
@@ -150,9 +150,7 @@ declare const ThemedImageThumb: {
         readonly props: Readonly<Omit<Omit<ImageThumbProps, keyof LocaleProps> & {
             locale?: string | undefined;
             translate?: ((str: string, ...args: any[]) => string) | undefined;
-        }, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps> & Readonly<{
-            children?: React.ReactNode;
-        }>;
+        }, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>;
         state: Readonly<{}>;
         refs: {
             [key: string]: React.ReactInstance;
@@ -205,20 +203,15 @@ declare const ThemedImageThumb: {
             /**
              * 图片无法显示时的替换文本
              */
-            context: any;
+            context: unknown;
             setState<K_1 extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<ImageThumbProps, keyof LocaleProps> & {
                 locale?: string | undefined;
                 translate?: ((str: string, ...args: any[]) => string) | undefined;
             }>) => {} | Pick<{}, K_1> | null) | Pick<{}, K_1> | null, callback?: (() => void) | undefined): void;
             forceUpdate(callback?: (() => void) | undefined): void;
             readonly props: Readonly<Omit<ImageThumbProps, keyof LocaleProps> & {
-                /**
-                 * 预览图比率
-                 */
                 locale?: string | undefined;
                 translate?: ((str: string, ...args: any[]) => string) | undefined;
-            }> & Readonly<{
-                children?: React.ReactNode;
             }>;
             state: Readonly<{}>;
             refs: {
@@ -276,20 +269,15 @@ declare const ThemedImageThumb: {
         /**
          * 图片无法显示时的替换文本
          */
-        context: any;
+        context: unknown;
         setState<K_1 extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<ImageThumbProps, keyof LocaleProps> & {
             locale?: string | undefined;
             translate?: ((str: string, ...args: any[]) => string) | undefined;
         }>) => {} | Pick<{}, K_1> | null) | Pick<{}, K_1> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;
         readonly props: Readonly<Omit<ImageThumbProps, keyof LocaleProps> & {
-            /**
-             * 预览图比率
-             */
             locale?: string | undefined;
             translate?: ((str: string, ...args: any[]) => string) | undefined;
-        }> & Readonly<{
-            children?: React.ReactNode;
         }>;
         state: Readonly<{}>;
         refs: {
@@ -347,20 +335,15 @@ declare const ThemedImageThumb: {
             /**
              * 图片无法显示时的替换文本
              */
-            context: any;
+            context: unknown;
             setState<K_1 extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<ImageThumbProps, keyof LocaleProps> & {
                 locale?: string | undefined;
                 translate?: ((str: string, ...args: any[]) => string) | undefined;
             }>) => {} | Pick<{}, K_1> | null) | Pick<{}, K_1> | null, callback?: (() => void) | undefined): void;
             forceUpdate(callback?: (() => void) | undefined): void;
             readonly props: Readonly<Omit<ImageThumbProps, keyof LocaleProps> & {
-                /**
-                 * 预览图比率
-                 */
                 locale?: string | undefined;
                 translate?: ((str: string, ...args: any[]) => string) | undefined;
-            }> & Readonly<{
-                children?: React.ReactNode;
             }>;
             state: Readonly<{}>;
             refs: {

package/lib/renderers/Image.js

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

package/lib/renderers/Images.js

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

package/lib/renderers/Json.js

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

package/lib/renderers/Link.js

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

package/lib/renderers/List.d.ts

@@ -23,6 +23,10 @@ export type ListBodyFieldObject = {
      * label 类名
      */
     labelClassName?: SchemaClassName;
+    /**
+     * 内层组件的CSS类名
+     */
+    innerClassName?: SchemaClassName;
     /**
      * 绑定字段名
      */

package/lib/renderers/List.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 
@@ -44,9 +44,10 @@ var List = /** @class */ (function (_super) {
         _this.renderToolbar = _this.renderToolbar.bind(_this);
         var store = props.store, selectable = props.selectable, draggable = props.draggable, orderBy = props.orderBy, orderDir = props.orderDir, multiple = props.multiple, hideCheckToggler = props.hideCheckToggler, itemCheckableOn = props.itemCheckableOn, itemDraggableOn = props.itemDraggableOn;
         store.update({
-            multiple: multiple,
-            selectable: selectable,
-            draggable: draggable,
+            /** Card嵌套List情况下该属性获取到的值为ListStore的默认值, 会导致Schema中的配置被覆盖 */
+            multiple: multiple || (props === null || props === void 0 ? void 0 : props.$schema.multiple),
+            selectable: selectable || (props === null || props === void 0 ? void 0 : props.$schema.selectable),
+            draggable: draggable || (props === null || props === void 0 ? void 0 : props.$schema.draggable),
             orderBy: orderBy,
             orderDir: orderDir,
             hideCheckToggler: hideCheckToggler,
@@ -537,7 +538,7 @@ var ListItem = /** @class */ (function (_super) {
         }
         else if (selectable && !hideCheckToggler) {
             return (React__default["default"].createElement("div", { className: cx('ListItem-checkBtn') },
-                React__default["default"].createElement(amisUi.Checkbox, { classPrefix: ns, type: multiple ? 'checkbox' : 'radio', disabled: !checkable, checked: selected, onChange: checkOnItemClick ? amisCore.noop : this.handleCheck, inline: true })));
+                React__default["default"].createElement(amisUi.Checkbox, { classPrefix: ns, type: multiple !== false ? 'checkbox' : 'radio', disabled: !checkable, checked: selected, onChange: checkOnItemClick ? amisCore.noop : this.handleCheck, inline: true })));
         }
         return null;
     };
@@ -655,7 +656,7 @@ var ListItemRenderer = /** @class */ (function (_super) {
     function ListItemRenderer() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    ListItemRenderer.propsList = tslib.__spreadArray(['multiple'], ListItem.propsList, true);
+    ListItemRenderer.propsList = tslib.__spreadArray(['multiple'], tslib.__read(ListItem.propsList), false);
     ListItemRenderer = tslib.__decorate([
         amisCore.Renderer({
             test: /(^|\/)(?:list|list-group)\/(?:.*\/)?list-item$/,
@@ -670,7 +671,7 @@ var ListItemRenderer = /** @class */ (function (_super) {
         return _super !== null && _super.apply(this, arguments) || this;
     }
     ListItemFieldRenderer.prototype.render = function () {
-        var _a = this.props, className = _a.className, render = _a.render, style = _a.style, Component = _a.wrapperComponent; _a.labelClassName; var value = _a.value, data = _a.data, children = _a.children, width = _a.width, innerClassName = _a.innerClassName; _a.label; var tabIndex = _a.tabIndex, onKeyUp = _a.onKeyUp, field = _a.field, rest = tslib.__rest(_a, ["className", "render", "style", "wrapperComponent", "labelClassName", "value", "data", "children", "width", "innerClassName", "label", "tabIndex", "onKeyUp", "field"]);
+        var _a = this.props, className = _a.className, render = _a.render, style = _a.style, Component = _a.wrapperComponent, contentsOnly = _a.contentsOnly; _a.labelClassName; var value = _a.value, data = _a.data, children = _a.children, width = _a.width, innerClassName = _a.innerClassName; _a.label; var tabIndex = _a.tabIndex, onKeyUp = _a.onKeyUp, field = _a.field, rest = tslib.__rest(_a, ["className", "render", "style", "wrapperComponent", "contentsOnly", "labelClassName", "value", "data", "children", "width", "innerClassName", "label", "tabIndex", "onKeyUp", "field"]);
         var schema = tslib.__assign(tslib.__assign({}, field), { className: innerClassName, type: (field && field.type) || 'plain' });
         var body = children
             ? children
@@ -680,9 +681,10 @@ var ListItemRenderer = /** @class */ (function (_super) {
             style.width = style.width || width;
             body = (React__default["default"].createElement("div", { style: { width: !/%/.test(String(width)) ? width : '' } }, body));
         }
-        if (!Component) {
+        if (contentsOnly) {
             return body;
         }
+        Component = Component || 'div';
         return (React__default["default"].createElement(Component, { style: style, className: className, tabIndex: tabIndex, onKeyUp: onKeyUp }, body));
     };
     ListItemFieldRenderer.defaultProps = tslib.__assign(tslib.__assign({}, TableCell.TableCell.defaultProps), { wrapperComponent: 'div' });
@@ -692,7 +694,7 @@ var ListItemRenderer = /** @class */ (function (_super) {
         'popOver',
         'copyable',
         'inline'
-    ], TableCell.TableCell.propsList, true);
+    ], tslib.__read(TableCell.TableCell.propsList), false);
     ListItemFieldRenderer = tslib.__decorate([
         amisCore.Renderer({
             type: 'list-item-field'

package/lib/renderers/Log.js

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

package/lib/renderers/Mapping.d.ts

@@ -154,12 +154,10 @@ export declare const MappingField: {
         componentWillUnmount(): void;
         getWrappedInstance(): any;
         render(): JSX.Element;
-        context: any;
+        context: unknown;
         setState<K_1 extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<MappingProps, "store">>) => {} | Pick<{}, K_1> | null) | Pick<{}, K_1> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;
-        readonly props: Readonly<Omit<MappingProps, "store">> & Readonly<{
-            children?: React.ReactNode;
-        }>;
+        readonly props: Readonly<Omit<MappingProps, "store">>;
         state: Readonly<{}>;
         refs: {
             [key: string]: React.ReactInstance;
@@ -248,12 +246,10 @@ export declare const MappingField: {
         componentWillUnmount(): void;
         getWrappedInstance(): any;
         render(): JSX.Element;
-        context: any;
+        context: unknown;
         setState<K_1_1 extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<MappingProps, "store">>) => {} | Pick<{}, K_1_1> | null) | Pick<{}, K_1_1> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;
-        readonly props: Readonly<Omit<MappingProps, "store">> & Readonly<{
-            children?: React.ReactNode;
-        }>;
+        readonly props: Readonly<Omit<MappingProps, "store">>;
         state: Readonly<{}>;
         refs: {
             [key: string]: React.ReactInstance;
@@ -279,12 +275,10 @@ export declare const MappingField: {
             renderSingleValue(key: any, reactKey?: number, needStyle?: boolean): JSX.Element;
             renderViewValue(value: any): any;
             render(): JSX.Element;
-            context: any;
+            context: unknown;
             setState<K extends never>(state: object | ((prevState: object, props: Readonly<MappingProps>) => object | Pick<object, K> | null) | Pick<object, K> | null, callback?: (() => void) | undefined): void;
             forceUpdate(callback?: (() => void) | undefined): void;
-            readonly props: Readonly<MappingProps> & Readonly<{
-                children?: React.ReactNode;
-            }>;
+            readonly props: Readonly<MappingProps>;
             state: object;
             refs: {
                 [key: string]: React.ReactInstance;
@@ -312,12 +306,10 @@ export declare const MappingField: {
         renderSingleValue(key: any, reactKey?: number, needStyle?: boolean): JSX.Element;
         renderViewValue(value: any): any;
         render(): JSX.Element;
-        context: any;
+        context: unknown;
         setState<K extends never>(state: object | ((prevState: object, props: Readonly<MappingProps>) => object | Pick<object, K> | null) | Pick<object, K> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;
-        readonly props: Readonly<MappingProps> & Readonly<{
-            children?: React.ReactNode;
-        }>;
+        readonly props: Readonly<MappingProps>;
         state: object;
         refs: {
             [key: string]: React.ReactInstance;
@@ -344,12 +336,10 @@ export declare const MappingField: {
             renderSingleValue(key: any, reactKey?: number, needStyle?: boolean): JSX.Element;
             renderViewValue(value: any): any;
             render(): JSX.Element;
-            context: any;
+            context: unknown;
             setState<K extends never>(state: object | ((prevState: object, props: Readonly<MappingProps>) => object | Pick<object, K> | null) | Pick<object, K> | null, callback?: (() => void) | undefined): void;
             forceUpdate(callback?: (() => void) | undefined): void;
-            readonly props: Readonly<MappingProps> & Readonly<{
-                children?: React.ReactNode;
-            }>;
+            readonly props: Readonly<MappingProps>;
             state: object;
             refs: {
                 [key: string]: React.ReactInstance;

package/lib/renderers/Mapping.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.3-beta.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 
@@ -38,7 +38,7 @@ var Store = amisCore.StoreNode.named('MappingStore')
                     ret = _a.sent();
                     if (ret.ok) {
                         data_1 = amisCore.normalizeApiResponseData(ret.data);
-                        self.setMap(data_1);
+                        self.setMap(Array.isArray(data_1.options) ? data_1.options : data_1);
                     }
                     else {
                         throw new Error(ret.msg || 'fetch error');
@@ -65,8 +65,8 @@ var Store = amisCore.StoreNode.named('MappingStore')
                     }
                     else if (amisCore.isObject(now)) {
                         var keys = Object.keys(now);
-                        if (keys.length === 1
-                            || (keys.length == 2 && keys.includes('$$id'))) {
+                        if (keys.length === 1 ||
+                            (keys.length == 2 && keys.includes('$$id'))) {
                             // 针对amis-editor的特殊处理
                             keys = keys.filter(function (key) { return key !== '$$id'; });
                             // 单key 数组对象
@@ -168,10 +168,25 @@ var MappingField = amisUi.withStore(function (props) {
                         label = value[labelField || 'label'];
                     }
                 }
-                return render('tpl', label);
+                var realValue = value;
+                if (amisCore.isObject(label)
+                    && label.type === 'tag'
+                    && !amisCore.isObject(label.label)
+                    && label.label != null) {
+                    realValue = label.label;
+                }
+                return render('tpl', label, {
+                    data: amisCore.createObject(data, {
+                        value: realValue,
+                        label: realValue
+                    }),
+                    value: null
+                });
             }
             return render('mappingItemSchema', itemSchema, {
-                data: amisCore.createObject(data, amisCore.isObject(value) ? value : { item: value })
+                data: amisCore.createObject(data, amisCore.isObject(value) ? value : { item: value }),
+                // 阻止 itemSchema 从props.value 取值，否则渲染不正确
+                value: null
             });
         };
         class_1.prototype.render = function () {
@@ -179,7 +194,9 @@ var MappingField = amisUi.withStore(function (props) {
             var _a = this.props, style = _a.style, defaultValue = _a.defaultValue, data = _a.data;
             var mapKey = amisCore.getPropValue(this.props);
             // 让默认值支持表达式
-            if (defaultValue && amisCore.isPureVariable(defaultValue) && defaultValue === mapKey) {
+            if (defaultValue &&
+                amisCore.isPureVariable(defaultValue) &&
+                defaultValue === mapKey) {
                 mapKey = amisCore.resolveVariableAndFilter(defaultValue, data, '| raw');
             }
             if (Array.isArray(mapKey)) {

package/lib/renderers/Markdown.js

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

package/lib/renderers/MultilineText.js

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