amis 2.6.1-alpha.0 → 2.7.1

package/lib/renderers/Link.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.6.1-alpha.0
+ * amis v2.7.1
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/List.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.6.1-alpha.0
+ * amis v2.7.1
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Log.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.6.1-alpha.0
+ * amis v2.7.1
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Mapping.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.6.1-alpha.0
+ * amis v2.7.1
  * Copyright 2018-2023 baidu
  */
 
@@ -176,8 +176,12 @@ var MappingField = amisUi.withStore(function (props) {
         };
         class_1.prototype.render = function () {
             var _this = this;
-            var style = this.props.style;
+            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) {
+                mapKey = amisCore.resolveVariableAndFilter(defaultValue, data, '| raw');
+            }
             if (Array.isArray(mapKey)) {
                 return (React__default["default"].createElement("span", { style: style }, mapKey.map(function (singleKey, index) {
                     return _this.renderSingleValue(singleKey, index);

package/lib/renderers/Markdown.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.6.1-alpha.0
+ * amis v2.7.1
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/MultilineText.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.6.1-alpha.0
+ * amis v2.7.1
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Nav.d.ts

@@ -1,11 +1,16 @@
 /// <reference types="hoist-non-react-statics" />
 import React from 'react';
-import { RendererEnv, RendererProps } from 'amis-core';
+import { RendererEnv, RendererProps, ActionObject } from 'amis-core';
 import { ThemeProps } from 'amis-core';
 import { SpinnerExtraProps } from 'amis-ui';
 import { BadgeObject } from 'amis-ui';
 import { IScopedContext } from 'amis-core';
+import type { NavigationItem } from 'amis-ui/lib/components/menu';
 import type { BaseSchema, SchemaObject, SchemaApi, SchemaIcon, SchemaUrlPath, SchemaCollection, SchemaClassName } from '../Schema';
+export type IconItemSchema = {
+    icon?: SchemaIcon;
+    position: string;
+};
 export type NavItemSchema = {
     /**
      * 文字说明
@@ -14,7 +19,7 @@ export type NavItemSchema = {
     /**
      * 图标类名，参考 fontawesome 4。
      */
-    icon?: SchemaIcon;
+    icon?: SchemaIcon | Array<IconItemSchema>;
     to?: SchemaUrlPath;
     target?: string;
     unfolded?: boolean;
@@ -22,6 +27,11 @@ export type NavItemSchema = {
     defer?: boolean;
     deferApi?: SchemaApi;
     children?: Array<NavItemSchema>;
+    key?: string;
+    disabled?: boolean;
+    disabledTip?: string;
+    className?: string;
+    accordion?: boolean;
 } & Omit<BaseSchema, 'type'>;
 export interface NavOverflow {
     /**
@@ -90,7 +100,7 @@ export interface NavSchema extends BaseSchema {
      */
     links?: Array<NavItemSchema>;
     /**
-     * @default 24
+     * @default 16
      */
     indentSize: number;
     /**
@@ -104,7 +114,7 @@ export interface NavSchema extends BaseSchema {
     /**
      * true 为垂直排列，false 为水平排列类似如 tabs。
      */
-    stacked?: boolean;
+    stacked?: true | false;
     /**
      * 更多操作菜单列表
      */
@@ -121,6 +131,10 @@ export interface NavSchema extends BaseSchema {
      * 角标
      */
     itemBadge?: BadgeObject;
+    /**
+     * 角标
+     */
+    badge?: BadgeObject;
     /**
      * 仅允许同层级拖拽
      */
@@ -129,6 +143,30 @@ export interface NavSchema extends BaseSchema {
      * 横向导航时自动收纳配置
      */
     overflow?: NavOverflow;
+    /**
+     * 最多展示多少层级
+     */
+    level?: number;
+    /**
+     * 控制仅展示指定key菜单下的子菜单项
+     */
+    showKey?: string;
+    /**
+     * 控制仅展示指定key菜单下的子菜单项
+     */
+    collapsed?: boolean;
+    /**
+     * 垂直模式 非折叠状态下 控制菜单打开方式
+     */
+    mode?: 'float' | 'inline';
+    /**
+     * 自定义展开图标
+     */
+    expandIcon?: string | SchemaObject;
+    /**
+     * 自定义展开图标位置 默认在前面 before after
+     */
+    expandPosition?: string;
 }
 export interface Link {
     className?: string;
@@ -144,7 +182,8 @@ export interface Link {
     loading?: boolean;
     loaded?: boolean;
     [propName: string]: any;
-    itemBadge?: BadgeObject;
+    disabled?: boolean;
+    disabledTip?: string;
 }
 export interface Links extends Array<Link> {
 }
@@ -157,9 +196,10 @@ export interface NavigationState {
         height?: number;
         opacity?: number;
     };
+    collapsed?: boolean;
 }
-export interface NavigationProps extends ThemeProps, Omit<NavSchema, 'type' | 'className'>, SpinnerExtraProps {
-    onSelect?: (item: Link) => void | false;
+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;
     onDragUpdate?: (dropInfo: IDropInfo) => void;
     onOrderChange?: (res: Link[]) => void;
@@ -192,47 +232,49 @@ export declare class Navigation extends React.Component<NavigationProps, Navigat
         x: number;
     };
     state: NavigationState;
-    handleClick(link: Link): void;
+    handleClick(link: Link, depth: number): Promise<false | void | undefined>;
     toggleLink(target: Link, forceFold?: boolean): void;
     getDropInfo(e: DragEvent, id: string, depth: number): IDropInfo;
     updateDropIndicator(e: DragEvent): void;
     handleDragStart(link: Link): (e: React.DragEvent) => void;
     handleDragOver(e: DragEvent): void;
     handleDragEnd(e: DragEvent): void;
-    renderItem(link: Link, index: number, depth?: number): JSX.Element | null;
-    renderOverflowNavs(overflowConfig: NavOverflow & {
-        __id?: string | number;
-    }): JSX.Element;
+    normalizeNavigations(links: Links, depth: number): Array<NavigationItem>;
     render(): JSX.Element;
 }
 declare const ThemedNavigation: {
-    new (props: Pick<Omit<NavigationProps, keyof ThemeProps>, "hidden" | "static" | "$ref" | "disabled" | "disabledOn" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "staticOn" | "staticPlaceholder" | "staticClassName" | "staticLabelClassName" | "staticInputClassName" | "staticSchema" | "render" | "env" | "data" | "reload" | "source" | "loadingConfig" | "itemBadge" | "loading" | "deferApi" | "onToggle" | "draggable" | "onSelect" | "links" | "itemActions" | "saveOrderApi" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps): {
+    new (props: Omit<NavigationProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps): {
         ref: any;
         childRef(ref: any): void;
         getWrappedInstance(): any;
         render(): JSX.Element;
         context: any;
-        setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "hidden" | "static" | "$ref" | "disabled" | "disabledOn" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "staticOn" | "staticPlaceholder" | "staticClassName" | "staticLabelClassName" | "staticInputClassName" | "staticSchema" | "render" | "env" | "data" | "reload" | "source" | "loadingConfig" | "itemBadge" | "loading" | "deferApi" | "onToggle" | "draggable" | "onSelect" | "links" | "itemActions" | "saveOrderApi" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
+        setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<NavigationProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;
-        readonly props: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "hidden" | "static" | "$ref" | "disabled" | "disabledOn" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "staticOn" | "staticPlaceholder" | "staticClassName" | "staticLabelClassName" | "staticInputClassName" | "staticSchema" | "render" | "env" | "data" | "reload" | "source" | "loadingConfig" | "itemBadge" | "loading" | "deferApi" | "onToggle" | "draggable" | "onSelect" | "links" | "itemActions" | "saveOrderApi" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps> & Readonly<{
+        readonly props: Readonly<Omit<NavigationProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps> & Readonly<{
             children?: React.ReactNode;
-        }>;
+        }>; /**
+         * 菜单DOM挂载点
+         */
         state: Readonly<{}>;
         refs: {
             [key: string]: React.ReactInstance;
         };
         componentDidMount?(): void;
-        shouldComponentUpdate?(nextProps: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "hidden" | "static" | "$ref" | "disabled" | "disabledOn" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "staticOn" | "staticPlaceholder" | "staticClassName" | "staticLabelClassName" | "staticInputClassName" | "staticSchema" | "render" | "env" | "data" | "reload" | "source" | "loadingConfig" | "itemBadge" | "loading" | "deferApi" | "onToggle" | "draggable" | "onSelect" | "links" | "itemActions" | "saveOrderApi" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): boolean;
+        shouldComponentUpdate?(nextProps: Readonly<Omit<NavigationProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): boolean;
         componentWillUnmount?(): void;
+        /**
+         * 懒加载 api，如果不配置复用 source 接口。
+         */
         componentDidCatch?(error: Error, errorInfo: React.ErrorInfo): void;
-        getSnapshotBeforeUpdate?(prevProps: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "hidden" | "static" | "$ref" | "disabled" | "disabledOn" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "staticOn" | "staticPlaceholder" | "staticClassName" | "staticLabelClassName" | "staticInputClassName" | "staticSchema" | "render" | "env" | "data" | "reload" | "source" | "loadingConfig" | "itemBadge" | "loading" | "deferApi" | "onToggle" | "draggable" | "onSelect" | "links" | "itemActions" | "saveOrderApi" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>): any;
-        componentDidUpdate?(prevProps: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "hidden" | "static" | "$ref" | "disabled" | "disabledOn" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "staticOn" | "staticPlaceholder" | "staticClassName" | "staticLabelClassName" | "staticInputClassName" | "staticSchema" | "render" | "env" | "data" | "reload" | "source" | "loadingConfig" | "itemBadge" | "loading" | "deferApi" | "onToggle" | "draggable" | "onSelect" | "links" | "itemActions" | "saveOrderApi" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>, snapshot?: any): void;
+        getSnapshotBeforeUpdate?(prevProps: Readonly<Omit<NavigationProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>): any;
+        componentDidUpdate?(prevProps: Readonly<Omit<NavigationProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>, snapshot?: any): void;
         componentWillMount?(): void;
         UNSAFE_componentWillMount?(): void;
-        componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "hidden" | "static" | "$ref" | "disabled" | "disabledOn" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "staticOn" | "staticPlaceholder" | "staticClassName" | "staticLabelClassName" | "staticInputClassName" | "staticSchema" | "render" | "env" | "data" | "reload" | "source" | "loadingConfig" | "itemBadge" | "loading" | "deferApi" | "onToggle" | "draggable" | "onSelect" | "links" | "itemActions" | "saveOrderApi" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
-        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "hidden" | "static" | "$ref" | "disabled" | "disabledOn" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "staticOn" | "staticPlaceholder" | "staticClassName" | "staticLabelClassName" | "staticInputClassName" | "staticSchema" | "render" | "env" | "data" | "reload" | "source" | "loadingConfig" | "itemBadge" | "loading" | "deferApi" | "onToggle" | "draggable" | "onSelect" | "links" | "itemActions" | "saveOrderApi" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
-        componentWillUpdate?(nextProps: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "hidden" | "static" | "$ref" | "disabled" | "disabledOn" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "staticOn" | "staticPlaceholder" | "staticClassName" | "staticLabelClassName" | "staticInputClassName" | "staticSchema" | "render" | "env" | "data" | "reload" | "source" | "loadingConfig" | "itemBadge" | "loading" | "deferApi" | "onToggle" | "draggable" | "onSelect" | "links" | "itemActions" | "saveOrderApi" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
-        UNSAFE_componentWillUpdate?(nextProps: Readonly<Pick<Omit<NavigationProps, keyof ThemeProps>, "hidden" | "static" | "$ref" | "disabled" | "disabledOn" | "hiddenOn" | "visible" | "visibleOn" | "id" | "onEvent" | "staticOn" | "staticPlaceholder" | "staticClassName" | "staticLabelClassName" | "staticInputClassName" | "staticSchema" | "render" | "env" | "data" | "reload" | "source" | "loadingConfig" | "itemBadge" | "loading" | "deferApi" | "onToggle" | "draggable" | "onSelect" | "links" | "itemActions" | "saveOrderApi" | "stacked" | "dragOnSameLevel" | "overflow" | "onDragUpdate" | "onOrderChange" | "togglerClassName"> & Partial<Pick<Omit<NavigationProps, keyof ThemeProps>, "indentSize">> & Partial<Pick<Pick<NavigationProps, "indentSize">, never>> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
+        componentWillReceiveProps?(nextProps: Readonly<Omit<NavigationProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
+        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Omit<NavigationProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
+        componentWillUpdate?(nextProps: Readonly<Omit<NavigationProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
+        UNSAFE_componentWillUpdate?(nextProps: Readonly<Omit<NavigationProps, keyof ThemeProps> & import("amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
     };
     displayName: string;
     contextType: React.Context<string>;
@@ -243,13 +285,21 @@ declare const ThemedNavigation: {
 export default ThemedNavigation;
 export declare class NavigationRenderer extends React.Component<RendererProps> {
     static contextType: React.Context<IScopedContext>;
+    navRef: any;
     remoteRef: {
         loadConfig: (ctx?: any) => Promise<any> | void;
         setConfig: (value: any) => void;
+        setFilterConfig: (value: any) => void;
     } | undefined;
     remoteConfigRef(ref: any): void;
+    getRef(ref: any): void;
     constructor(props: RendererProps, context: IScopedContext);
     componentWillUnmount(): void;
+    doAction(action: ActionObject, args: {
+        value?: string | {
+            [key: string]: string;
+        };
+    }): void;
     reload(target?: string, query?: any, values?: object): void;
     receive(values: object): void;
     render(): JSX.Element;