amis 2.5.1 → 2.5.2

package/lib/renderers/Form/InputRichText.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.1
+ * amis v2.5.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/InputSubForm.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.1
+ * amis v2.5.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/InputTable.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.1
+ * amis v2.5.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/InputTag.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.1
+ * amis v2.5.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/InputText.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.1
+ * amis v2.5.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/InputTree.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.1
+ * amis v2.5.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/InputYearRange.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.1
+ * amis v2.5.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/JSONSchema.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.1
+ * amis v2.5.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/JSONSchemaEditor.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.1
+ * amis v2.5.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/ListSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.1
+ * amis v2.5.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/LocationPicker.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.1
+ * amis v2.5.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/MatrixCheckboxes.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.1
+ * amis v2.5.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/NestedSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.1
+ * amis v2.5.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/Picker.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.1
+ * amis v2.5.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/Radios.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.1
+ * amis v2.5.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/Select.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.1
+ * amis v2.5.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/Static.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.1
+ * amis v2.5.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/StaticHoc.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.1
+ * amis v2.5.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/Switch.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.1
+ * amis v2.5.2
  * Copyright 2018-2022 baidu
  */
 

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

@@ -23,6 +23,9 @@ export declare class BaseTabsTransferRenderer<T extends OptionsControlProps = Ta
     handleChange(value: Array<Option> | Option, optionModified?: boolean): Promise<void>;
 }
 export declare class TabsTransferRenderer extends BaseTabsTransferRenderer<TabsTransferProps> {
+    static defaultProps: {
+        multiple: boolean;
+    };
     optionItemRender(option: any, states: ItemRenderStates): JSX.Element;
     doAction(action: ActionObject, args: any): void;
     render(): JSX.Element;

package/lib/renderers/Form/TabsTransfer.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.1
+ * amis v2.5.2
  * Copyright 2018-2022 baidu
  */
 
@@ -13,6 +13,7 @@ var React = require('react');
 var find = require('lodash/find');
 var amisUi = require('amis-ui');
 var Transfer = require('./Transfer.js');
+var Selection = require('amis-ui/lib/components/Selection');
 var StaticHoc = require('./StaticHoc.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -209,7 +210,7 @@ var BaseTabsTransferRenderer = /** @class */ (function (_super) {
                 data: amisCore.createObject(amisCore.createObject(data, tslib.__assign(tslib.__assign({}, states), ctx)), option)
             });
         }
-        return amisUi.Selection.itemRender(option, states);
+        return Selection.BaseSelection.itemRender(option, states);
     };
     // 动作
     TabsTransferRenderer.prototype.doAction = function (action, args) {
@@ -230,11 +231,14 @@ var BaseTabsTransferRenderer = /** @class */ (function (_super) {
         }
     };
     TabsTransferRenderer.prototype.render = function () {
-        var _a = this.props, className = _a.className, cx = _a.classnames, options = _a.options, selectedOptions = _a.selectedOptions, sortable = _a.sortable, loading = _a.loading, searchResultMode = _a.searchResultMode, showArrow = _a.showArrow, deferLoad = _a.deferLoad, leftDeferLoad = _a.leftDeferLoad, disabled = _a.disabled, selectTitle = _a.selectTitle, resultTitle = _a.resultTitle, itemHeight = _a.itemHeight, virtualThreshold = _a.virtualThreshold;
+        var _a = this.props, className = _a.className, cx = _a.classnames, options = _a.options, selectedOptions = _a.selectedOptions, sortable = _a.sortable, loading = _a.loading, searchResultMode = _a.searchResultMode, showArrow = _a.showArrow, deferLoad = _a.deferLoad, leftDeferLoad = _a.leftDeferLoad, disabled = _a.disabled, selectTitle = _a.selectTitle, resultTitle = _a.resultTitle, itemHeight = _a.itemHeight, virtualThreshold = _a.virtualThreshold, onlyChildren = _a.onlyChildren;
         return (React__default["default"].createElement("div", { className: cx('TabsTransferControl', className) },
-            React__default["default"].createElement(amisUi.TabsTransfer, { activeKey: this.state.activeKey, value: selectedOptions, disabled: disabled, options: options, onChange: this.handleChange, option2value: this.option2value, sortable: sortable, searchResultMode: searchResultMode, onSearch: this.handleTabSearch, showArrow: showArrow, onDeferLoad: deferLoad, onLeftDeferLoad: leftDeferLoad, selectTitle: selectTitle, resultTitle: resultTitle, optionItemRender: this.optionItemRender, resultItemRender: this.resultItemRender, onTabChange: this.onTabChange, itemHeight: amisCore.toNumber(itemHeight) > 0 ? amisCore.toNumber(itemHeight) : undefined, virtualThreshold: virtualThreshold }),
+            React__default["default"].createElement(amisUi.TabsTransfer, { onlyChildren: onlyChildren, activeKey: this.state.activeKey, value: selectedOptions, disabled: disabled, options: options, onChange: this.handleChange, option2value: this.option2value, sortable: sortable, searchResultMode: searchResultMode, onSearch: this.handleTabSearch, showArrow: showArrow, onDeferLoad: deferLoad, onLeftDeferLoad: leftDeferLoad, selectTitle: selectTitle, resultTitle: resultTitle, optionItemRender: this.optionItemRender, resultItemRender: this.resultItemRender, onTabChange: this.onTabChange, itemHeight: amisCore.toNumber(itemHeight) > 0 ? amisCore.toNumber(itemHeight) : undefined, virtualThreshold: virtualThreshold }),
             React__default["default"].createElement(amisUi.Spinner, { overlay: true, key: "info", show: loading })));
     };
+    TabsTransferRenderer.defaultProps = {
+        multiple: true
+    };
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),

package/lib/renderers/Form/TabsTransferPicker.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.1
+ * amis v2.5.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/Textarea.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.1
+ * amis v2.5.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/Transfer.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.1
+ * amis v2.5.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/TransferPicker.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.1
+ * amis v2.5.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/TreeSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.1
+ * amis v2.5.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/UUID.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.1
+ * amis v2.5.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/UserSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.1
+ * amis v2.5.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Grid.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.1
+ * amis v2.5.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Grid2D.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.1
+ * amis v2.5.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/GridNav.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.1
+ * amis v2.5.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/HBox.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.1
+ * amis v2.5.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/IFrame.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.1
+ * amis v2.5.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Icon.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.1
+ * amis v2.5.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Image.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.1
+ * amis v2.5.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Images.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.1
+ * amis v2.5.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Json.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.1
+ * amis v2.5.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Link.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.1
+ * amis v2.5.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/List.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.1
+ * amis v2.5.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Log.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.1
+ * amis v2.5.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Mapping.d.ts

@@ -2,7 +2,7 @@
 import React from 'react';
 import { RendererEnv, RendererProps } from 'amis-core';
 import { Api } from 'amis-core';
-import { BaseSchema, SchemaApi, SchemaTokenizeableString, SchemaTpl } from '../Schema';
+import { BaseSchema, SchemaApi, SchemaTokenizeableString, SchemaTpl, SchemaCollection } from '../Schema';
 import { Instance } from 'mobx-state-tree';
 /**
  * Mapping 映射展示控件。
@@ -23,6 +23,18 @@ export interface MappingSchema extends BaseSchema {
     map?: {
         [propName: string]: SchemaTpl;
     };
+    /**
+     * map或source为对象数组时，作为value值的字段名
+     */
+    valueField?: string;
+    /**
+     * map或source为对象数组时，作为label值的字段名
+     */
+    labelField?: string;
+    /**
+     * 自定义渲染映射值，支持html或schema
+     */
+    itemSchema?: SchemaCollection;
     /**
      * 如果想远程拉取字典，请配置 source 为接口。
      */
@@ -42,6 +54,7 @@ export declare const Store: import("mobx-state-tree").IModelType<{
 } & {
     fetching: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
     errorMsg: import("mobx-state-tree").IType<string | undefined, string, string>;
+    valueField: import("mobx-state-tree").IType<string | undefined, string, string>;
     map: import("mobx-state-tree").IType<{
         [propName: string]: any;
     } | null | undefined, {
@@ -80,6 +93,7 @@ export declare const MappingField: {
             childrenIds: import("mobx-state-tree").IMSTArray<import("mobx-state-tree").ISimpleType<string>> & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<import("mobx-state-tree").ISimpleType<string>>, [undefined]>>;
             fetching: boolean;
             errorMsg: string;
+            valueField: string;
             map: {
                 [propName: string]: any;
             } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IType<{
@@ -113,6 +127,7 @@ export declare const MappingField: {
         } & {
             fetching: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
             errorMsg: import("mobx-state-tree").IType<string | undefined, string, string>;
+            valueField: import("mobx-state-tree").IType<string | undefined, string, string>;
             map: import("mobx-state-tree").IType<{
                 [propName: string]: any;
             } | null | undefined, {
@@ -172,6 +187,7 @@ export declare const MappingField: {
             childrenIds: import("mobx-state-tree").IMSTArray<import("mobx-state-tree").ISimpleType<string>> & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<import("mobx-state-tree").ISimpleType<string>>, [undefined]>>;
             fetching: boolean;
             errorMsg: string;
+            valueField: string;
             map: {
                 [propName: string]: any;
             } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IType<{
@@ -205,6 +221,7 @@ export declare const MappingField: {
         } & {
             fetching: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
             errorMsg: import("mobx-state-tree").IType<string | undefined, string, string>;
+            valueField: import("mobx-state-tree").IType<string | undefined, string, string>;
             map: import("mobx-state-tree").IType<{
                 [propName: string]: any;
             } | null | undefined, {
@@ -260,6 +277,7 @@ export declare const MappingField: {
             componentDidUpdate(prevProps: MappingProps): void;
             reload(): void;
             renderSingleValue(key: any, reactKey?: number): JSX.Element;
+            renderViewValue(value: any): any;
             render(): JSX.Element;
             context: any;
             setState<K extends never>(state: object | ((prevState: object, props: Readonly<MappingProps>) => object | Pick<object, K> | null) | Pick<object, K> | null, callback?: (() => void) | undefined): void;
@@ -292,6 +310,7 @@ export declare const MappingField: {
         componentDidUpdate(prevProps: MappingProps): void;
         reload(): void;
         renderSingleValue(key: any, reactKey?: number): JSX.Element;
+        renderViewValue(value: any): any;
         render(): JSX.Element;
         context: any;
         setState<K extends never>(state: object | ((prevState: object, props: Readonly<MappingProps>) => object | Pick<object, K> | null) | Pick<object, K> | null, callback?: (() => void) | undefined): void;
@@ -323,6 +342,7 @@ export declare const MappingField: {
             componentDidUpdate(prevProps: MappingProps): void;
             reload(): void;
             renderSingleValue(key: any, reactKey?: number): JSX.Element;
+            renderViewValue(value: any): any;
             render(): JSX.Element;
             context: any;
             setState<K extends never>(state: object | ((prevState: object, props: Readonly<MappingProps>) => object | Pick<object, K> | null) | Pick<object, K> | null, callback?: (() => void) | undefined): void;

package/lib/renderers/Mapping.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.1
+ * amis v2.5.2
  * Copyright 2018-2022 baidu
  */
 
@@ -22,6 +22,7 @@ var Store = amisCore.StoreNode.named('MappingStore')
     .props({
     fetching: false,
     errorMsg: '',
+    valueField: 'value',
     map: mobxStateTree.types.frozen({})
 })
     .actions(function (self) {
@@ -57,6 +58,28 @@ var Store = amisCore.StoreNode.named('MappingStore')
     return {
         load: load,
         setMap: function (options) {
+            if (Array.isArray(options)) {
+                options = options.reduce(function (res, now) {
+                    if (now == null) {
+                        return res;
+                    }
+                    else if (amisCore.isObject(now)) {
+                        var keys = Object.keys(now);
+                        if (keys.length === 1
+                            || (keys.length == 2 && keys.includes('$$id'))) {
+                            // 针对amis-editor的特殊处理
+                            keys = keys.filter(function (key) { return key !== '$$id'; });
+                            // 单key 数组对象
+                            res[keys[0]] = now[keys[0]];
+                        }
+                        else if (keys.length > 1) {
+                            // 多key 数组对象
+                            res[now[self.valueField]] = now;
+                        }
+                    }
+                    return res;
+                }, {});
+            }
             if (amisCore.isObject(options)) {
                 self.map = tslib.__assign({}, options);
             }
@@ -72,17 +95,16 @@ var MappingField = amisUi.withStore(function (props) {
         tslib.__extends(class_1, _super);
         function class_1(props) {
             var _this = _super.call(this, props) || this;
-            props.store.syncProps(props, undefined, ['map']);
+            props.store.syncProps(props, undefined, ['valueField', 'map']);
             return _this;
         }
         class_1.prototype.componentDidMount = function () {
-            var _a = this.props; _a.store; _a.source; _a.data;
             this.reload();
         };
         class_1.prototype.componentDidUpdate = function (prevProps) {
             var props = this.props;
             var _a = this.props, store = _a.store, source = _a.source, data = _a.data;
-            store.syncProps(props, prevProps, ['map']);
+            store.syncProps(props, prevProps, ['valueField', 'map']);
             if (amisCore.isPureVariable(source)) {
                 var prev = amisCore.resolveVariableAndFilter(prevProps.source, prevProps.data, '| raw');
                 var curr = amisCore.resolveVariableAndFilter(source, data, '| raw');
@@ -109,7 +131,7 @@ var MappingField = amisUi.withStore(function (props) {
         };
         class_1.prototype.renderSingleValue = function (key, reactKey) {
             var _a;
-            var _b = this.props, className = _b.className, placeholder = _b.placeholder, render = _b.render, cx = _b.classnames; _b.name; _b.data; var store = _b.store;
+            var _b = this.props, className = _b.className, placeholder = _b.placeholder, cx = _b.classnames, store = _b.store;
             var viewValue = (React__default["default"].createElement("span", { className: "text-muted" }, placeholder));
             var map = store.map;
             var value = undefined;
@@ -123,10 +145,34 @@ var MappingField = amisUi.withStore(function (props) {
                         : key === false && map['0']
                             ? map['0']
                             : map['*'])) !== undefined) {
-                viewValue = render('tpl', value);
+                viewValue = this.renderViewValue(value);
             }
             return (React__default["default"].createElement("span", { key: "map-".concat(reactKey), className: cx('MappingField', className) }, viewValue));
         };
+        class_1.prototype.renderViewValue = function (value) {
+            var _a = this.props, render = _a.render, itemSchema = _a.itemSchema, data = _a.data, labelField = _a.labelField;
+            if (!itemSchema) {
+                var label = value;
+                if (amisCore.isObject(value)) {
+                    if (labelField === undefined || labelField === '') {
+                        if (!value.hasOwnProperty('type')) {
+                            // 映射值是object
+                            // 没配置labelField
+                            // object 也没有 type，不能作为schema渲染
+                            // 默认取 label 字段
+                            label = value['label'];
+                        }
+                    }
+                    else {
+                        label = value[labelField || 'label'];
+                    }
+                }
+                return render('tpl', label);
+            }
+            return render('mappingItemSchema', itemSchema, {
+                data: amisCore.createObject(data, amisCore.isObject(value) ? value : { item: value })
+            });
+        };
         class_1.prototype.render = function () {
             var _this = this;
             var mapKey = amisCore.getPropValue(this.props);

package/lib/renderers/Markdown.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.1
+ * amis v2.5.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/MultilineText.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.1
+ * amis v2.5.2
  * Copyright 2018-2022 baidu
  */