amis 2.0.0 → 2.1.0

package/lib/renderers/DropDownButton.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 
@@ -47,13 +47,24 @@ var DropDownButton = /** @class */ (function (_super) {
         });
     };
     DropDownButton.prototype.open = function () {
-        this.setState({
-            isOpened: true
+        return tslib.__awaiter(this, void 0, void 0, function () {
+            return tslib.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.props.dispatchEvent('mouseenter', { data: this.props.buttons })];
+                    case 1:
+                        _a.sent();
+                        this.setState({
+                            isOpened: true
+                        });
+                        return [2 /*return*/];
+                }
+            });
         });
     };
     DropDownButton.prototype.close = function () {
         var _this = this;
         this.timer = setTimeout(function () {
+            _this.props.dispatchEvent('mouseleave', { data: _this.props.buttons });
             _this.setState({
                 isOpened: false
             });
@@ -111,8 +122,6 @@ var DropDownButton = /** @class */ (function (_super) {
     };
     DropDownButton.prototype.render = function () {
         var _a = this.props, tooltip = _a.tooltip, placement = _a.placement, tooltipContainer = _a.tooltipContainer, tooltipTrigger = _a.tooltipTrigger, tooltipRootClose = _a.tooltipRootClose, disabledTip = _a.disabledTip, block = _a.block, disabled = _a.disabled, btnDisabled = _a.btnDisabled, btnClassName = _a.btnClassName, size = _a.size, label = _a.label, level = _a.level, primary = _a.primary, className = _a.className, cx = _a.classnames, align = _a.align, iconOnly = _a.iconOnly, icon = _a.icon, rightIcon = _a.rightIcon, isActived = _a.isActived, trigger = _a.trigger, data = _a.data, hideCaret = _a.hideCaret;
-        var iconElement = amisCore.generateIcon(cx, icon, 'm-r-xs');
-        var rightIconElement = amisCore.generateIcon(cx, rightIcon, 'm-l-xs');
         return (React__default["default"].createElement("div", { className: cx('DropDown ', {
                 'DropDown--block': block,
                 'DropDown--alignRight': align === 'right',
@@ -129,9 +138,13 @@ var DropDownButton = /** @class */ (function (_super) {
                         'Button--primary': primary,
                         'Button--iconOnly': iconOnly
                     }, size ? "Button--".concat(size) : '') },
-                    iconElement,
+                    amisUi.hasIcon(icon)
+                        ? React__default["default"].createElement(amisUi.Icon, { icon: icon, className: "icon" })
+                        : amisCore.generateIcon(cx, icon, 'm-r-xs'),
                     typeof label === 'string' ? amisCore.filter(label, data) : label,
-                    rightIconElement,
+                    rightIcon && amisUi.hasIcon(rightIcon)
+                        ? React__default["default"].createElement(amisUi.Icon, { icon: icon, className: "icon" })
+                        : amisCore.generateIcon(cx, rightIcon, 'm-l-xs'),
                     !hideCaret ? (React__default["default"].createElement("span", { className: cx('DropDown-caret') },
                         React__default["default"].createElement(amisUi.Icon, { icon: "caret", className: "icon" }))) : null)),
             this.state.isOpened ? this.renderOuter() : null));

package/lib/renderers/Each.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Flex.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/ButtonGroupSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/ButtonToolbar.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

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

@@ -3,7 +3,7 @@ import { OptionsControlProps, Option } from 'amis-core';
 import { ActionObject } from 'amis-core';
 import { FormOptionsSchema } from '../../Schema';
 /**
- * 级联选择框
+ * 链式下拉框
  * 文档：https://baidu.gitee.io/amis/docs/components/form/chained-select
  */
 export interface ChainedSelectControlSchema extends FormOptionsSchema {

package/lib/renderers/Form/ChainedSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 
@@ -105,12 +105,17 @@ var ChainedSelectControl = /** @class */ (function (_super) {
                 .fetcher(source, tslib.__assign(tslib.__assign({}, data), { value: arr, level: idx + 1, parentId: parentId, parent: arr[idx] }))
                 .then(function (ret) { return tslib.__awaiter(_this, void 0, void 0, function () {
                 var stack, remoteValue, options, valueRes, rendererEvent;
-                return tslib.__generator(this, function (_a) {
-                    switch (_a.label) {
+                var _a, _b, _c;
+                return tslib.__generator(this, function (_d) {
+                    switch (_d.label) {
                         case 0:
                             stack = this.state.stack.concat();
                             remoteValue = ret.data ? ret.data.value : undefined;
-                            options = (ret.data && ret.data.options) || ret.data;
+                            options = ((_a = ret === null || ret === void 0 ? void 0 : ret.data) === null || _a === void 0 ? void 0 : _a.options) ||
+                                ((_b = ret === null || ret === void 0 ? void 0 : ret.data) === null || _b === void 0 ? void 0 : _b.items) ||
+                                ((_c = ret === null || ret === void 0 ? void 0 : ret.data) === null || _c === void 0 ? void 0 : _c.rows) ||
+                                ret.data ||
+                                [];
                             stack.splice(idx, stack.length - idx);
                             if (!(typeof remoteValue !== 'undefined')) return [3 /*break*/, 2];
                             arr.splice(idx + 1, value.length - idx - 1);
@@ -120,12 +125,12 @@ var ChainedSelectControl = /** @class */ (function (_super) {
                                     value: valueRes
                                 }))];
                         case 1:
-                            rendererEvent = _a.sent();
+                            rendererEvent = _d.sent();
                             if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
                                 return [2 /*return*/];
                             }
                             onChange(valueRes);
-                            _a.label = 2;
+                            _d.label = 2;
                         case 2:
                             stack.push({
                                 options: options,
@@ -190,12 +195,12 @@ var ChainedSelectControl = /** @class */ (function (_super) {
         return (React__default["default"].createElement("div", { className: cx__default["default"]("".concat(ns, "ChainedSelectControl"), className) },
             React__default["default"].createElement(amisUi.Select, tslib.__assign({}, rest, { useMobileUI: useMobileUI, popOverContainer: mobileUI && env && env.getModalContainer
                     ? env.getModalContainer
-                    : rest.popOverContainer, classPrefix: ns, key: "base", options: options, value: arr[0], onChange: this.handleChange.bind(this, 0), loading: loading, inline: true })),
+                    : rest.popOverContainer, classPrefix: ns, key: "base", options: Array.isArray(options) ? options : [], value: arr[0], onChange: this.handleChange.bind(this, 0), loading: loading, inline: true })),
             this.state.stack.map(function (_a, index) {
                 var options = _a.options, loading = _a.loading, visible = _a.visible;
                 return visible === false ? null : (React__default["default"].createElement(amisUi.Select, tslib.__assign({}, rest, { useMobileUI: useMobileUI, popOverContainer: mobileUI && env && env.getModalContainer
                         ? env.getModalContainer
-                        : rest.popOverContainer, classPrefix: ns, key: "x-".concat(index + 1), options: options, value: arr[index + 1], onChange: _this.handleChange.bind(_this, index + 1), loading: loading, inline: true })));
+                        : rest.popOverContainer, classPrefix: ns, key: "x-".concat(index + 1), options: Array.isArray(options) ? options : [], value: arr[index + 1], onChange: _this.handleChange.bind(_this, index + 1), loading: loading, inline: true })));
             })));
     };
     ChainedSelectControl.defaultProps = {

package/lib/renderers/Form/ChartRadios.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/Checkbox.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 
@@ -57,9 +57,9 @@ var CheckboxControl = /** @class */ (function (_super) {
     };
     CheckboxControl.prototype.render = function () {
         var _this = this;
-        var _a = this.props, className = _a.className, value = _a.value, trueValue = _a.trueValue, falseValue = _a.falseValue, option = _a.option; _a.onChange; var disabled = _a.disabled, render = _a.render, partial = _a.partial, optionType = _a.optionType, checked = _a.checked, ns = _a.classPrefix;
+        var _a = this.props, className = _a.className, value = _a.value, trueValue = _a.trueValue, falseValue = _a.falseValue, option = _a.option; _a.onChange; var disabled = _a.disabled, render = _a.render, partial = _a.partial, optionType = _a.optionType, checked = _a.checked, labelClassName = _a.labelClassName, ns = _a.classPrefix;
         return (React__default["default"].createElement("div", { className: cx__default["default"]("".concat(ns, "CheckboxControl"), className) },
-            React__default["default"].createElement(amisUi.Checkbox, { inline: true, value: value || '', trueValue: trueValue, falseValue: falseValue, disabled: disabled, onChange: function (value) { return _this.dispatchChangeEvent(value); }, partial: partial, optionType: optionType, checked: checked }, option ? render('option', option) : null)));
+            React__default["default"].createElement(amisUi.Checkbox, { inline: true, value: value || '', trueValue: trueValue, falseValue: falseValue, disabled: disabled, onChange: function (value) { return _this.dispatchChangeEvent(value); }, partial: partial, optionType: optionType, checked: checked, labelClassName: labelClassName }, option ? render('option', option) : null)));
     };
     CheckboxControl.defaultProps = {
         trueValue: true,

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

@@ -1,6 +1,5 @@
 import React from 'react';
-import { OptionsControlProps, Option } from 'amis-core';
-import { ActionObject, Api } from 'amis-core';
+import type { ActionObject, Api, OptionsControlProps, Option } from 'amis-core';
 import { FormOptionsSchema } from '../../Schema';
 /**
  * 复选框

package/lib/renderers/Form/Checkboxes.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 
@@ -9,12 +9,14 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var React = require('react');
+var inRange = require('lodash/inRange');
 var amisCore = require('amis-core');
 var amisUi = require('amis-ui');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+var inRange__default = /*#__PURE__*/_interopDefaultLegacy(inRange);
 
 var CheckboxesControl = /** @class */ (function (_super) {
     tslib.__extends(CheckboxesControl, _super);
@@ -153,7 +155,8 @@ var CheckboxesControl = /** @class */ (function (_super) {
         }
         var _a = this.props, render = _a.render, itemClassName = _a.itemClassName, onToggle = _a.onToggle, selectedOptions = _a.selectedOptions, disabled = _a.disabled, inline = _a.inline, labelClassName = _a.labelClassName, labelField = _a.labelField, removable = _a.removable, editable = _a.editable, __ = _a.translate, optionType = _a.optionType, menuTpl = _a.menuTpl, data = _a.data;
         var labelText = String(option[labelField || 'label']);
-        return (React__default["default"].createElement(amisUi.Checkbox, { className: itemClassName, key: index, onChange: function () { return onToggle(option); }, checked: !!~selectedOptions.indexOf(option), disabled: disabled || option.disabled, inline: inline, labelClassName: labelClassName, description: option.description, optionType: optionType },
+        var optionLabelClassName = option['labelClassName'];
+        return (React__default["default"].createElement(amisUi.Checkbox, { className: itemClassName, key: index, onChange: function () { return onToggle(option); }, checked: !!~selectedOptions.indexOf(option), disabled: disabled || option.disabled, inline: inline, labelClassName: optionLabelClassName || labelClassName, description: option.description, optionType: optionType },
             menuTpl
                 ? render("checkboxes/".concat(index), menuTpl, {
                     data: amisCore.createObject(data, option)
@@ -172,8 +175,7 @@ var CheckboxesControl = /** @class */ (function (_super) {
             body = options.map(function (option, key) { return _this.renderItem(option, key); });
         }
         if (checkAll && body.length && optionType === 'default') {
-            body.unshift(React__default["default"].createElement(amisUi.Checkbox, { key: "checkall", className: itemClassName, onChange: onToggleAll, checked: !!selectedOptions.length, partial: !!(selectedOptions.length &&
-                    selectedOptions.length !== options.length), disabled: disabled, inline: inline, labelClassName: labelClassName }, __('Checkboxes.selectAll')));
+            body.unshift(React__default["default"].createElement(amisUi.Checkbox, { key: "checkall", className: itemClassName, onChange: onToggleAll, checked: !!selectedOptions.length, partial: inRange__default["default"](selectedOptions.length, 0, amisCore.flattenTreeWithLeafNodes(options).length), disabled: disabled, inline: inline, labelClassName: labelClassName }, __('Checkboxes.selectAll')));
         }
         body = amisCore.columnsSplit(body, cx, columnsCount);
         return (React__default["default"].createElement("div", { className: cx("CheckboxesControl", className), ref: "checkboxRef" },

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

@@ -249,3 +249,5 @@ export declare class ComboControlRenderer extends ComboControl {
 }
 export declare class KVControlRenderer extends ComboControl {
 }
+export declare class KVSControlRenderer extends ComboControl {
+}

package/lib/renderers/Form/Combo.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 
@@ -257,6 +257,26 @@ var ComboControl = /** @class */ (function (_super) {
                 this.props.onChange(value, submitOnChange, true);
             }
         }
+        else if (type === 'input-kvs') {
+            // input-kvs 为了避免冲突 key 改成了 _key
+            var hasDuplicateKey = false;
+            var keys = {};
+            for (var _c = 0, value_2 = value; _c < value_2.length; _c++) {
+                var item = value_2[_c];
+                if ('_key' in item) {
+                    if (keys[item._key]) {
+                        hasDuplicateKey = true;
+                    }
+                    else {
+                        keys[item._key] = true;
+                    }
+                }
+            }
+            // 有重复值就不触发修改，因为 KV 模式下无法支持重复值
+            if (!hasDuplicateKey) {
+                this.props.onChange(value, submitOnChange, true);
+            }
+        }
         else {
             this.props.onChange(value, submitOnChange, true);
         }
@@ -830,5 +850,19 @@ var ComboControl = /** @class */ (function (_super) {
     ], KVControlRenderer);
     return KVControlRenderer;
 })(ComboControl));
+/** @class */ ((function (_super) {
+    tslib.__extends(KVSControlRenderer, _super);
+    function KVSControlRenderer() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    KVSControlRenderer = tslib.__decorate([
+        amisCore.FormItem({
+            type: 'input-kvs',
+            storeType: amisCore.ComboStore.name,
+            extendsData: false
+        })
+    ], KVSControlRenderer);
+    return KVSControlRenderer;
+})(ComboControl));
 
 exports["default"] = ComboControl;

package/lib/renderers/Form/ConditionBuilder.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/Control.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

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

@@ -3809,7 +3809,7 @@ export declare class DiffEditorControlRenderer extends DiffEditor {
             loadAutoUpdateData: (api: import("amis-core").Api, data?: object | undefined, silent?: boolean | undefined) => Promise<import("amis-core").Payload>;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>) | undefined;
         formInited?: boolean | undefined;
-        formMode?: "horizontal" | "inline" | "normal" | "row" | "default" | undefined;
+        formMode?: "normal" | "horizontal" | "default" | "inline" | "row" | undefined;
         formHorizontal?: import("amis-core").FormHorizontal | undefined;
         formLabelAlign?: import("amis-core/lib/renderers/Item").LabelAlign | undefined;
         formLabelWidth?: string | number | undefined;
@@ -3850,20 +3850,27 @@ export declare class DiffEditorControlRenderer extends DiffEditor {
         } | undefined;
         error?: string | undefined;
         showErrorMsg?: boolean | undefined;
+        placeholder?: string | undefined;
+        $ref?: string | undefined;
+        disabledOn?: string | undefined;
+        hidden?: boolean | undefined;
+        hiddenOn?: string | undefined;
+        visible?: boolean | undefined;
+        visibleOn?: string | undefined;
+        id?: string | undefined;
+        label?: string | false | undefined;
         remark?: import("../Remark").SchemaRemark | undefined;
+        desc?: string | undefined;
+        mode?: "normal" | "horizontal" | "inline" | undefined;
+        horizontal?: import("amis-core").FormHorizontal | undefined;
+        labelClassName?: string | undefined;
+        inline?: boolean | undefined;
+        readOnly?: boolean | undefined;
         labelRemark?: import("../Remark").SchemaRemark | undefined;
         options?: any;
-        label?: string | false | undefined;
-        labelClassName?: string | undefined;
         submitOnChange?: boolean | undefined;
-        readOnly?: boolean | undefined;
         readOnlyOn?: string | undefined;
         validateOnChange?: boolean | undefined;
-        desc?: string | undefined;
-        mode?: "horizontal" | "inline" | "normal" | undefined;
-        horizontal?: import("amis-core").FormHorizontal | undefined;
-        inline?: boolean | undefined;
-        placeholder?: string | undefined;
         required?: boolean | undefined;
         validationErrors?: {
             [propName: string]: any;
@@ -3912,13 +3919,6 @@ export declare class DiffEditorControlRenderer extends DiffEditor {
         } | undefined;
         clearValueOnHidden?: boolean | undefined;
         validateApi?: string | import("amis-core").BaseApiObject | undefined;
-        $ref?: string | undefined;
-        disabledOn?: string | undefined;
-        hidden?: boolean | undefined;
-        hiddenOn?: string | undefined;
-        visible?: boolean | undefined;
-        visibleOn?: string | undefined;
-        id?: string | undefined;
         diffValue?: string | undefined;
         language?: string | undefined;
     };

package/lib/renderers/Form/DiffEditor.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

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

@@ -3811,7 +3811,7 @@ export declare class EditorControlRenderer extends EditorControl {
             loadAutoUpdateData: (api: import("amis-core").Api, data?: object | undefined, silent?: boolean | undefined) => Promise<import("amis-core").Payload>;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>) | undefined;
         formInited?: boolean | undefined;
-        formMode?: "horizontal" | "inline" | "normal" | "row" | "default" | undefined;
+        formMode?: "normal" | "horizontal" | "default" | "inline" | "row" | undefined;
         formHorizontal?: import("amis-core").FormHorizontal | undefined;
         formLabelAlign?: import("amis-core/lib/renderers/Item").LabelAlign | undefined;
         formLabelWidth?: string | number | undefined;

package/lib/renderers/Form/Editor.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/FieldSet.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/Formula.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/Group.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 
@@ -66,8 +66,9 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
                 return null;
             }
             var controlMode = (control === null || control === void 0 ? void 0 : control.mode) || formMode;
-            if (controlMode === 'inline' ||
-                (control && control.type === 'formula')) {
+            if (controlMode === 'inline'
+                // hidden 直接渲染，否则会有个空 Form-groupColumn 层
+                || (control === null || control === void 0 ? void 0 : control.type) && ['formula', 'hidden'].includes(control.type)) {
                 return _this.renderControl(control, index, {
                     key: index,
                     className: cx(control.className, control.columnClassName)

package/lib/renderers/Form/Hidden.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/IconPicker.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/IconPickerIcons.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/InputArray.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */