amis 2.7.2 → 2.8.0

package/lib/renderers/Drawer.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.2
+ * amis v2.8.0
  * Copyright 2018-2023 baidu
  */
 
@@ -132,7 +132,7 @@ var Drawer = /** @class */ (function (_super) {
         var drawerAction = store.action;
         var drawer = drawerAction.drawer;
         if (drawer.onConfirm &&
-            drawer.onConfirm.apply(drawer, tslib.__spreadArray([values, action], args, false)) === false) {
+            drawer.onConfirm.apply(drawer, tslib.__spreadArray([values, action], tslib.__read(args), false)) === false) {
             return;
         }
         store.closeDrawer();
@@ -145,7 +145,7 @@ var Drawer = /** @class */ (function (_super) {
         var store = this.props.store;
         var action = store.action;
         var drawer = action.drawer;
-        if (drawer.onClose && drawer.onClose.apply(drawer, args) === false) {
+        if (drawer.onClose && drawer.onClose.apply(drawer, tslib.__spreadArray([], tslib.__read(args), false)) === false) {
             return;
         }
         store.closeDrawer();
@@ -162,7 +162,7 @@ var Drawer = /** @class */ (function (_super) {
         var dialogAction = store.action;
         var dialog = dialogAction.dialog;
         if (dialog.onConfirm &&
-            dialog.onConfirm.apply(dialog, tslib.__spreadArray([values, action], args, false)) === false) {
+            dialog.onConfirm.apply(dialog, tslib.__spreadArray([values, action], tslib.__read(args), false)) === false) {
             return;
         }
         store.closeDialog(true);
@@ -175,7 +175,7 @@ var Drawer = /** @class */ (function (_super) {
         var store = this.props.store;
         var action = store.action;
         var dialog = action.dialog;
-        if (dialog.onClose && dialog.onClose.apply(dialog, args) === false) {
+        if (dialog.onClose && dialog.onClose.apply(dialog, tslib.__spreadArray([], tslib.__read(args), false)) === false) {
             return;
         }
         store.closeDialog(args[1]);
@@ -397,12 +397,13 @@ var Drawer = /** @class */ (function (_super) {
         var targets = [];
         var _a = this.props, onConfirm = _a.onConfirm, store = _a.store;
         if (action.target) {
-            targets.push.apply(targets, action.target
+            targets.push.apply(targets, tslib.__spreadArray([], tslib.__read(action.target
                 .split(',')
                 .map(function (name) { return scoped.getComponentByName(name); })
-                .filter(function (item) { return item && item.doAction; }));
+                .filter(function (item) { return item && item.doAction; })), false));
         }
-        if (!targets.length) {
+        /** 如果为隔离动作, 则不做联动处理, 继续交给handleAction */
+        if ((action === null || action === void 0 ? void 0 : action.isolateScope) !== true && !targets.length) {
             var components = scoped
                 .getComponents()
                 .filter(function (item) { return !~['drawer', 'dialog'].indexOf(item.props.type); });
@@ -578,7 +579,7 @@ var Drawer = /** @class */ (function (_super) {
         for (var _i = 2; _i < arguments.length; _i++) {
             rest[_i - 2] = arguments[_i];
         }
-        _super.prototype.handleDialogConfirm.apply(this, tslib.__spreadArray([values, action], rest, false));
+        _super.prototype.handleDialogConfirm.apply(this, tslib.__spreadArray([values, action], tslib.__read(rest), false));
         var scoped = this.context;
         var store = this.props.store;
         var dialogAction = store.action;

package/lib/renderers/DropDownButton.d.ts

@@ -104,7 +104,7 @@ export default class DropDownButton extends React.Component<DropDownButtonProps,
     domRef(ref: any): void;
     toogle(e: React.MouseEvent<any>): void;
     open(): Promise<void>;
-    close(): void;
+    close(e?: React.MouseEvent<any>): void;
     keepOpen(): void;
     renderButton(button: DropdownButton, index: number | string): React.ReactNode;
     renderOuter(): JSX.Element;

package/lib/renderers/DropDownButton.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.2
+ * amis v2.8.0
  * Copyright 2018-2023 baidu
  */
 
@@ -66,7 +66,7 @@ var DropDownButton = /** @class */ (function (_super) {
             });
         });
     };
-    DropDownButton.prototype.close = function () {
+    DropDownButton.prototype.close = function (e) {
         var _this = this;
         this.timer = setTimeout(function () {
             _this.props.dispatchEvent('mouseleave', amisCore.createObject(_this.props.data, { items: _this.props.buttons }));
@@ -74,6 +74,8 @@ var DropDownButton = /** @class */ (function (_super) {
                 isOpened: false
             });
         }, 200);
+        // PopOver hide会直接调用close方法
+        e && e.preventDefault();
     };
     DropDownButton.prototype.keepOpen = function () {
         if (this.timer) {
@@ -111,10 +113,7 @@ var DropDownButton = /** @class */ (function (_super) {
         var _a;
         var _b = this.props; _b.render; var buttons = _b.buttons; _b.data; var popOverContainer = _b.popOverContainer, cx = _b.classnames, ns = _b.classPrefix, children = _b.children; _b.align; var closeOnClick = _b.closeOnClick, closeOnOutside = _b.closeOnOutside, menuClassName = _b.menuClassName;
         var body = (React__default["default"].createElement(amisCore.RootClose, { disabled: !this.state.isOpened, onRootClose: closeOnOutside !== false ? this.close : amisCore.noop }, function (ref) {
-            return (React__default["default"].createElement("ul", { className: cx('DropDown-menu-root', 'DropDown-menu', menuClassName), onClick: function (e) {
-                    closeOnClick ? _this.close() : amisCore.noop;
-                    e.preventDefault();
-                }, onMouseEnter: _this.keepOpen, ref: ref }, children
+            return (React__default["default"].createElement("ul", { className: cx('DropDown-menu-root', 'DropDown-menu', menuClassName), onClick: closeOnClick ? _this.close : amisCore.noop, onMouseEnter: _this.keepOpen, ref: ref }, children
                 ? children
                 : Array.isArray(buttons)
                     ? buttons.map(function (button, index) {
@@ -129,14 +128,14 @@ var DropDownButton = /** @class */ (function (_super) {
         return body;
     };
     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, _b = _a.size, size = _b === void 0 ? 'default' : _b, label = _a.label, level = _a.level, primary = _a.primary, className = _a.className, style = _a.style, 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 _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, _b = _a.size, size = _b === void 0 ? 'default' : _b, label = _a.label, level = _a.level, primary = _a.primary, className = _a.className, style = _a.style, 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, env = _a.env;
         return (React__default["default"].createElement("div", { className: cx('DropDown ', {
                 'DropDown--block': block,
                 'DropDown--alignRight': align === 'right',
                 'is-opened': this.state.isOpened,
                 'is-actived': isActived
             }, className), style: style, onMouseEnter: trigger === 'hover' ? this.open : function () { }, onMouseLeave: trigger === 'hover' ? this.close : function () { }, ref: this.domRef },
-            React__default["default"].createElement(amisUi.TooltipWrapper, { placement: placement, tooltip: disabled ? disabledTip : tooltip, container: tooltipContainer, trigger: tooltipTrigger, rootClose: tooltipRootClose },
+            React__default["default"].createElement(amisUi.TooltipWrapper, { placement: placement, tooltip: disabled ? disabledTip : tooltip, container: tooltipContainer || (env === null || env === void 0 ? void 0 : env.getModalContainer), trigger: tooltipTrigger, rootClose: tooltipRootClose },
                 React__default["default"].createElement("button", { onClick: this.toogle, disabled: disabled || btnDisabled, className: cx('Button', btnClassName, typeof level === 'undefined'
                         ? 'Button--default'
                         : level

package/lib/renderers/Each.js

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

package/lib/renderers/Flex.js

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

package/lib/renderers/Form/ButtonGroupSelect.js

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

package/lib/renderers/Form/ButtonToolbar.js

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

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

@@ -11,13 +11,14 @@ export interface ChainedSelectControlSchema extends FormOptionsSchema {
 }
 export interface ChainedSelectProps extends OptionsControlProps, Omit<ChainedSelectControlSchema, 'options' | 'type' | 'source' | 'className' | 'descriptionClassName' | 'inputClassName'> {
 }
+export interface StackItem {
+    options: Array<Option>;
+    parentId: any;
+    loading: boolean;
+    visible?: boolean;
+}
 export interface SelectState {
-    stack: Array<{
-        options: Array<Option>;
-        parentId: any;
-        loading: boolean;
-        visible?: boolean;
-    }>;
+    stack: Array<StackItem>;
 }
 export default class ChainedSelectControl extends React.Component<ChainedSelectProps, SelectState> {
     static defaultProps: Partial<ChainedSelectProps>;

package/lib/renderers/Form/ChainedSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.2
+ * amis v2.8.0
  * Copyright 2018-2023 baidu
  */
 
@@ -14,6 +14,7 @@ var amisCore = require('amis-core');
 var amisUi = require('amis-ui');
 var StaticHoc = require('./StaticHoc.js');
 var find = require('lodash/find');
+var lodash = require('lodash');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -137,7 +138,7 @@ var ChainedSelectControl = /** @class */ (function (_super) {
                                 options: options,
                                 parentId: parentId,
                                 loading: false,
-                                visible: !!options
+                                visible: Array.isArray(options) && !lodash.isEmpty(options)
                             });
                             this.setState({
                                 stack: stack
@@ -185,9 +186,7 @@ var ChainedSelectControl = /** @class */ (function (_super) {
     ChainedSelectControl.prototype.renderStatic = function (displayValue) {
         if (displayValue === void 0) { displayValue = '-'; }
         var _a = this.props, _b = _a.options, options = _b === void 0 ? [] : _b, _c = _a.labelField, labelField = _c === void 0 ? 'label' : _c, _d = _a.valueField, valueField = _d === void 0 ? 'value' : _d, classPrefix = _a.classPrefix, cx = _a.classnames, className = _a.className, value = _a.value, delimiter = _a.delimiter;
-        var allOptions = tslib.__spreadArray([
-            { options: options, visible: true }
-        ], (this.state.stack || []), true);
+        var allOptions = tslib.__spreadArray([{ options: options, visible: true }], tslib.__read((this.state.stack || [])), false);
         var valueArr = Array.isArray(value)
             ? value.concat()
             : value && typeof value === 'string'
@@ -210,7 +209,7 @@ var ChainedSelectControl = /** @class */ (function (_super) {
                 .filter(function (v) { return v != null; })
                 .join(' > ');
         }
-        return React__default["default"].createElement("div", { className: cx("".concat(classPrefix, "SelectStaticControl"), className) }, displayValue);
+        return (React__default["default"].createElement("div", { className: cx("".concat(classPrefix, "SelectStaticControl"), className) }, displayValue));
     };
     ChainedSelectControl.prototype.render = function () {
         var _this = this;
@@ -220,6 +219,7 @@ var ChainedSelectControl = /** @class */ (function (_super) {
             : value && typeof value === 'string'
                 ? value.split(delimiter || ',')
                 : [];
+        var hasStackLoading = this.state.stack.find(function (a) { return a.loading; });
         var mobileUI = useMobileUI && amisCore.isMobile();
         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
@@ -227,10 +227,12 @@ var ChainedSelectControl = /** @class */ (function (_super) {
                     : 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
+                // loading 中的选项不展示，避免没值再隐藏造成的闪烁，改用一个 Spinner 来展示 loading 状态
+                return visible === false || loading ? 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: Array.isArray(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), inline: true })));
+            }),
+            hasStackLoading && (React__default["default"].createElement(amisUi.Spinner, { size: "sm", className: cx__default["default"]("".concat(ns, "ChainedSelectControl-spinner")) }))));
     };
     ChainedSelectControl.defaultProps = {
         clearable: false,

package/lib/renderers/Form/ChartRadios.js

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

package/lib/renderers/Form/Checkbox.js

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

package/lib/renderers/Form/Checkboxes.js

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

package/lib/renderers/Form/Combo.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.2
+ * amis v2.8.0
  * Copyright 2018-2023 baidu
  */
 
@@ -287,8 +287,9 @@ var ComboControl = /** @class */ (function (_super) {
         });
     };
     ComboControl.prototype.handleChange = function (values, diff, _a) {
+        var e_1, _b, e_2, _c;
         var index = _a.index;
-        var _b = this.props, flat = _b.flat, store = _b.store, joinValues = _b.joinValues, delimiter = _b.delimiter, disabled = _b.disabled, submitOnChange = _b.submitOnChange, type = _b.type;
+        var _d = this.props, flat = _d.flat, store = _d.store, joinValues = _d.joinValues, delimiter = _d.delimiter, disabled = _d.disabled, submitOnChange = _d.submitOnChange, type = _d.type;
         if (disabled) {
             return;
         }
@@ -300,14 +301,23 @@ var ComboControl = /** @class */ (function (_super) {
         if (type === 'input-kv') {
             var hasDuplicateKey = false;
             var keys = {};
-            for (var _i = 0, value_1 = value; _i < value_1.length; _i++) {
-                var item = value_1[_i];
-                if (keys[item.key]) {
-                    hasDuplicateKey = true;
+            try {
+                for (var value_1 = tslib.__values(value), value_1_1 = value_1.next(); !value_1_1.done; value_1_1 = value_1.next()) {
+                    var item = value_1_1.value;
+                    if (keys[item.key]) {
+                        hasDuplicateKey = true;
+                    }
+                    else {
+                        keys[item.key] = true;
+                    }
                 }
-                else {
-                    keys[item.key] = true;
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (value_1_1 && !value_1_1.done && (_b = value_1.return)) _b.call(value_1);
                 }
+                finally { if (e_1) throw e_1.error; }
             }
             // 有重复值就不触发修改，因为 KV 模式下无法支持重复值
             if (!hasDuplicateKey) {
@@ -318,17 +328,26 @@ var ComboControl = /** @class */ (function (_super) {
             // 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;
+            try {
+                for (var value_2 = tslib.__values(value), value_2_1 = value_2.next(); !value_2_1.done; value_2_1 = value_2.next()) {
+                    var item = value_2_1.value;
+                    if ('_key' in item) {
+                        if (keys[item._key]) {
+                            hasDuplicateKey = true;
+                        }
+                        else {
+                            keys[item._key] = true;
+                        }
                     }
                 }
             }
+            catch (e_2_1) { e_2 = { error: e_2_1 }; }
+            finally {
+                try {
+                    if (value_2_1 && !value_2_1.done && (_c = value_2.return)) _c.call(value_2);
+                }
+                finally { if (e_2) throw e_2.error; }
+            }
             // 有重复值就不触发修改，因为 KV 模式下无法支持重复值
             if (!hasDuplicateKey) {
                 this.props.onChange(value, submitOnChange, true);
@@ -756,7 +775,7 @@ var ComboControl = /** @class */ (function (_super) {
     };
     // 为了给 editor 重写使用
     ComboControl.prototype.renderItems = function (finnalControls, data, index) {
-        var _a = this.props, cx = _a.classnames, formClassName = _a.formClassName, render = _a.render, multiLine = _a.multiLine, disabled = _a.disabled, canAccessSuperData = _a.canAccessSuperData, multiple = _a.multiple, tabsMode = _a.tabsMode, subFormMode = _a.subFormMode, changeImmediately = _a.changeImmediately, lazyLoad = _a.lazyLoad; _a.translate;
+        var _a = this.props, cx = _a.classnames, formClassName = _a.formClassName, render = _a.render, multiLine = _a.multiLine, disabled = _a.disabled, canAccessSuperData = _a.canAccessSuperData, multiple = _a.multiple, tabsMode = _a.tabsMode, subFormMode = _a.subFormMode, changeImmediately = _a.changeImmediately, lazyLoad = _a.lazyLoad; _a.translate; var isStatic = _a.static;
         // 单个
         if (!multiple) {
             return render('single', {
@@ -768,6 +787,7 @@ var ComboControl = /** @class */ (function (_super) {
                 className: cx("Combo-form", formClassName)
             }, {
                 disabled: disabled,
+                static: isStatic,
                 data: data,
                 onChange: this.handleSingleFormChange,
                 ref: this.makeFormRef(0),
@@ -784,7 +804,7 @@ var ComboControl = /** @class */ (function (_super) {
                 wrapWithPanel: false,
                 mode: tabsMode ? subFormMode : multiLine ? subFormMode : 'row',
                 className: cx("Combo-form", formClassName)
-            }, tslib.__assign({ index: index, disabled: disabled, data: data, onChange: this.handleChange, onInit: this.handleFormInit, onAction: this.handleAction, ref: this.makeFormRef(index), canAccessSuperData: canAccessSuperData, lazyChange: changeImmediately ? false : true, formLazyChange: false, value: undefined, formItemValue: undefined, formStore: undefined }, (tabsMode ? {} : { lazyLoad: lazyLoad })));
+            }, tslib.__assign({ index: index, disabled: disabled, static: isStatic, data: data, onChange: this.handleChange, onInit: this.handleFormInit, onAction: this.handleAction, ref: this.makeFormRef(index), canAccessSuperData: canAccessSuperData, lazyChange: changeImmediately ? false : true, formLazyChange: false, value: undefined, formItemValue: undefined, formStore: undefined }, (tabsMode ? {} : { lazyLoad: lazyLoad })));
         }
         return React__default["default"].createElement(React__default["default"].Fragment, null);
     };
@@ -878,7 +898,7 @@ var ComboControl = /** @class */ (function (_super) {
         var _a = this.props, multiple = _a.multiple, onChange = _a.onChange, submitOnChange = _a.submitOnChange;
         if (multiple) {
             if (index !== undefined && ~index) {
-                var newValue = tslib.__spreadArray([], this.getValueAsArray(), true);
+                var newValue = tslib.__spreadArray([], tslib.__read(this.getValueAsArray()), false);
                 newValue.splice(index, 1, tslib.__assign(tslib.__assign({}, newValue[index]), value));
                 onChange === null || onChange === void 0 ? void 0 : onChange(newValue, submitOnChange, true);
             }

package/lib/renderers/Form/ConditionBuilder.js

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

package/lib/renderers/Form/Control.js

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