npm - amis - Versions diffs - 2.7.2 → 2.7.3-beta.0 - Mend

@@ -111,8 +111,11 @@ export default class TreeSelectControl extends React.Component<TreeSelectProps,
     };
     target: HTMLElement | null;
     targetRef: (ref: any) => HTMLElement | null;
+    /** source数据源是否已加载 */
+    sourceLoaded: boolean;
     constructor(props: TreeSelectProps);
     componentDidMount(): void;
+    componentWillUnmount(): void;
     open(fn?: () => void): void;
     close(): void;
     handleFocus(e: any): void;

package/lib/renderers/Form/TreeSelect.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.2
+ * amis v2.7.3-beta.0
  * Copyright 2018-2023 baidu
  */
@@ -33,6 +33,8 @@ var TreeSelectControl = /** @class */ (function (_super) {
         _this.targetRef = function (ref) {
             return (_this.target = ref ? ReactDOM.findDOMNode(ref) : null);
         };
+        /** source数据源是否已加载 */
+        _this.sourceLoaded = false;
         _this.state = {
             inputValue: '',
             isOpened: false
@@ -58,6 +60,9 @@ var TreeSelectControl = /** @class */ (function (_super) {
     TreeSelectControl.prototype.componentDidMount = function () {
         this.loadRemote('');
     };
+    TreeSelectControl.prototype.componentWillUnmount = function () {
+        this.sourceLoaded = false;
+    };
     TreeSelectControl.prototype.open = function (fn) {
         if (this.props.disabled) {
             return;
@@ -82,7 +87,11 @@ var TreeSelectControl = /** @class */ (function (_super) {
         dispatchEvent('blur', amisCore.resolveEventData(this.props, { value: value }, 'value'));
     };
     TreeSelectControl.prototype.handleKeyPress = function (e) {
-        if (e.key === ' ') {
+        /**
+         * 考虑到label/value中有空格的case
+         * 这里使用组合键关闭 win：shift + space，mac：shift + space
+         */
+        if (e.key === ' ' && e.shiftKey) {
             this.handleOutClick(e);
             e.preventDefault();
         }
@@ -170,12 +179,15 @@ var TreeSelectControl = /** @class */ (function (_super) {
     };
     TreeSelectControl.prototype.loadRemote = function (input) {
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, autoComplete, env, data, setOptions, setLoading, options, combinedOptions, ret, options, combinedOptions;
+            var _a, autoComplete, env, data, setOptions, setLoading, source, options, combinedOptions, ret, options, combinedOptions;
             return tslib.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = this.props, autoComplete = _a.autoComplete, env = _a.env, data = _a.data, setOptions = _a.setOptions, setLoading = _a.setLoading;
-                        if (!amisCore.isEffectiveApi(autoComplete, data)) {
+                        _a = this.props, autoComplete = _a.autoComplete, env = _a.env, data = _a.data, setOptions = _a.setOptions, setLoading = _a.setLoading, source = _a.source;
+                        // 同时配置source和autoComplete时，首次渲染需要加载source数据
+                        if (!amisCore.isEffectiveApi(autoComplete, data) ||
+                            (!input && amisCore.isEffectiveApi(source) && !this.sourceLoaded)) {
+                            this.sourceLoaded = true;
                             return [2 /*return*/];
                         }
                         else if (!env || !env.fetcher) {

package/lib/renderers/Form/UUID.js CHANGED Viewed

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

package/lib/renderers/Form/UserSelect.js CHANGED Viewed

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

package/lib/renderers/Grid.js CHANGED Viewed

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

package/lib/renderers/Grid2D.js CHANGED Viewed

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

package/lib/renderers/GridNav.js CHANGED Viewed

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

package/lib/renderers/HBox.js CHANGED Viewed

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

package/lib/renderers/IFrame.js CHANGED Viewed

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

package/lib/renderers/Icon.js CHANGED Viewed

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

package/lib/renderers/Image.js CHANGED Viewed

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

package/lib/renderers/Images.js CHANGED Viewed

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

package/lib/renderers/Json.js CHANGED Viewed

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

package/lib/renderers/Link.js CHANGED Viewed

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

package/lib/renderers/List.js CHANGED Viewed

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

package/lib/renderers/Log.js CHANGED Viewed

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

package/lib/renderers/Mapping.js CHANGED Viewed

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

package/lib/renderers/Markdown.js CHANGED Viewed

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

package/lib/renderers/MultilineText.js CHANGED Viewed

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

package/lib/renderers/Nav.d.ts CHANGED Viewed

@@ -200,7 +200,7 @@ export interface NavigationState {
 }
 export interface NavigationProps extends ThemeProps, Omit<RendererProps, 'className'>, Omit<NavSchema, 'type' | 'className'>, SpinnerExtraProps {
     onSelect?: (item: Link, depth: number) => void | false;
-    onToggle?: (item: Link, forceFold?: boolean) => void;
+    onToggle?: (item: Link, depth: number, forceFold?: boolean) => void;
     onDragUpdate?: (dropInfo: IDropInfo) => void;
     onOrderChange?: (res: Link[]) => void;
     togglerClassName?: string;
@@ -233,7 +233,7 @@ export declare class Navigation extends React.Component<NavigationProps, Navigat
     };
     state: NavigationState;
     handleClick(link: Link, depth: number): Promise<false | void | undefined>;
-    toggleLink(target: Link, forceFold?: boolean): void;
+    toggleLink(target: Link, depth: number, forceFold?: boolean): void;
     getDropInfo(e: DragEvent, id: string, depth: number): IDropInfo;
     updateDropIndicator(e: DragEvent): void;
     handleDragStart(link: Link): (e: React.DragEvent) => void;

package/lib/renderers/Nav.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v2.7.2
+ * amis v2.7.3-beta.0
  * Copyright 2018-2023 baidu
  */
@@ -55,9 +55,9 @@ var Navigation = /** @class */ (function (_super) {
             });
         });
     };
-    Navigation.prototype.toggleLink = function (target, forceFold) {
+    Navigation.prototype.toggleLink = function (target, depth, forceFold) {
         var _a, _b;
-        (_b = (_a = this.props).onToggle) === null || _b === void 0 ? void 0 : _b.call(_a, target, forceFold);
+        (_b = (_a = this.props).onToggle) === null || _b === void 0 ? void 0 : _b.call(_a, target, depth, forceFold);
     };
     Navigation.prototype.getDropInfo = function (e, id, depth) {
         var _a, _b;
@@ -309,7 +309,7 @@ var Navigation = /** @class */ (function (_super) {
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),
-        tslib.__metadata("design:paramtypes", [Object, Boolean]),
+        tslib.__metadata("design:paramtypes", [Object, Number, Boolean]),
         tslib.__metadata("design:returntype", void 0)
     ], Navigation.prototype, "toggleLink", null);
     tslib.__decorate([
@@ -397,6 +397,9 @@ var ConditionBuilderWithRemoteOptions = amisUi.withRemoteConfig({
         if (Array.isArray(links) && motivation !== 'toggle') {
             var data_1 = props.data, env_1 = props.env, unfoldedField_1 = props.unfoldedField, foldedField_1 = props.foldedField, location_1 = props.location, level_1 = props.level, config = props.config, dispatchEvent_1 = props.dispatchEvent;
             var isActive_1 = function (link, depth) {
+                if (!!link.disabled) {
+                    return false;
+                }
                 return motivation !== 'location-change' &&
                     typeof link.active !== 'undefined'
                     ? link.active
@@ -511,7 +514,7 @@ var ConditionBuilderWithRemoteOptions = amisUi.withRemoteConfig({
             });
         }
     };
-    class_1.prototype.toggleLink = function (target, forceFold) {
+    class_1.prototype.toggleLink = function (target, depth, forceFold) {
         return tslib.__awaiter(this, void 0, void 0, function () {
             var _a, config, updateConfig, deferLoad, dispatchEvent, stacked, mode, accordion, isAccordion, rendererEvent;
             return tslib.__generator(this, function (_b) {
@@ -536,9 +539,15 @@ var ConditionBuilderWithRemoteOptions = amisUi.withRemoteConfig({
                                 return target === link
                                     ? tslib.__assign(tslib.__assign({}, link), { unfolded: typeof forceFold !== 'undefined'
                                             ? !forceFold
-                                            : !link.unfolded }) : tslib.__assign(tslib.__assign({}, link), { unfolded: isAccordion ? false : link.unfolded });
+                                            : !link.unfolded }) : tslib.__assign(tslib.__assign({}, link), { unfolded: isAccordion
+                                        ? !!amisCore.findTree(link.children || [], function (item) { return item === target; })
+                                        : link.unfolded });
                             }), 'toggle');
                         }
+                        // 如果父菜单项也配置了链接 同样要支持跳转
+                        if (target.to) {
+                            this.handleSelect(target, depth);
+                        }
                         return [2 /*return*/];
                 }
             });

package/lib/renderers/Operation.js CHANGED Viewed

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

package/lib/renderers/Page.js CHANGED Viewed

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

package/lib/renderers/Pagination.js CHANGED Viewed

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

package/lib/renderers/PaginationWrapper.js CHANGED Viewed

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

package/lib/renderers/Panel.js CHANGED Viewed

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

package/lib/renderers/Password.js CHANGED Viewed

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

package/lib/renderers/Plain.js CHANGED Viewed

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

package/lib/renderers/PopOver.js CHANGED Viewed

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

package/lib/renderers/Portlet.js CHANGED Viewed

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

package/lib/renderers/Progress.js CHANGED Viewed

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