amis-ui 2.8.0 → 3.0.0

package/lib/components/menu/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.8.0
+ * amis-ui v3.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -54,7 +54,11 @@ var Menu = /** @class */ (function (_super) {
                 // 顺序也要保持一致
                 for (var _b = tslib.__values(props.navigations.entries()), _c = _b.next(); !_c.done; _c = _b.next()) {
                     var _d = tslib.__read(_c.value, 2), index = _d[0], item = _d[1];
-                    if (!isEqual__default["default"](item, prevProps.navigations[index])) {
+                    // 对比navigations中的link属性 否则item中包含很多处理过的属性 甚至包含react组件 对比会引发性能问题
+                    // 如果作为组件使用时 可以通过配置link 配置关键对比属性 如果没有 那直接跳过
+                    // 如果没有link 就先不对比了
+                    if (!item.link ||
+                        (item.link && !isEqual__default["default"](item.link, prevProps.navigations[index].link))) {
                         isNavDiff = true;
                         break;
                     }
@@ -94,7 +98,7 @@ var Menu = /** @class */ (function (_super) {
         var openKeys = [];
         var transformedNav = amisCore.mapTree(amisCore.filterTree(navigations, function (item, key, level) {
             // 水平导航不需要分割线
-            if (!stacked && (item === null || item === void 0 ? void 0 : item.isDivider)) {
+            if (!stacked && item.mode === 'divider') {
                 return false;
             }
             return true;
@@ -223,7 +227,7 @@ var Menu = /** @class */ (function (_super) {
     };
     Menu.prototype.renderMenuContent = function (list, level) {
         var _this = this;
-        var _a = this.props, renderLink = _a.renderLink, cx = _a.classnames, themeColor = _a.themeColor, disabled = _a.disabled, badge = _a.badge, data = _a.data, isActive = _a.isActive, collapsed = _a.collapsed;
+        var _a = this.props, renderLink = _a.renderLink, cx = _a.classnames, themeColor = _a.themeColor, disabled = _a.disabled, badge = _a.badge, data = _a.data, isActive = _a.isActive, collapsed = _a.collapsed, overflowedIndicator = _a.overflowedIndicator, overflowMaxCount = _a.overflowMaxCount, popupClassName = _a.popupClassName;
         return list.map(function (item, index) {
             var _a;
             // 如果这一级是分组标题 那么level不递增
@@ -233,29 +237,29 @@ var Menu = /** @class */ (function (_super) {
                     collapsed && index > 0 ? (React__default["default"].createElement(RcMenu.Divider, { key: 'group-divider' + item.id })) : null,
                     _this.renderMenuContent(item.children || [], item.depth)));
             }
-            var itemDisabled = item.disabled === undefined ? disabled : item.disabled;
+            var itemDisabled = disabled || item.disabled;
             var link = item.link;
             if ((link && link.defer && !link.loaded) ||
                 (item.children && item.children.length)) {
-                return (React__default["default"].createElement(SubMenu["default"], tslib.__assign({}, item, { key: item.id, disabled: itemDisabled || link.loading, active: isActive(item), badge: badge, renderLink: renderLink, depth: level || 1 }), _this.renderMenuContent(item.children || [], item.depth + 1)));
+                return (React__default["default"].createElement(SubMenu["default"], tslib.__assign({}, item, { key: item.id, disabled: itemDisabled || link.loading, active: isActive(item), badge: badge, renderLink: renderLink, depth: level || 1, popupClassName: popupClassName }), _this.renderMenuContent(item.children || [], item.depth + 1)));
             }
-            return item.isDivider ? (React__default["default"].createElement(RcMenu.Divider, { key: item.id, className: cx("Nav-Menu-item-divider", (_a = {},
+            return item.mode === 'divider' ? (React__default["default"].createElement(RcMenu.Divider, { key: item.id, className: cx("Nav-Menu-item-divider", (_a = {},
                     _a['Nav-Menu-item-divider-dark'] = themeColor === 'dark',
-                    _a)) })) : (React__default["default"].createElement(MenuItem["default"], tslib.__assign({}, item, { key: item.id, disabled: itemDisabled, renderLink: renderLink, badge: badge, data: data, depth: level || 1 })));
+                    _a)) })) : (React__default["default"].createElement(MenuItem["default"], tslib.__assign({}, item, { key: item.id, disabled: itemDisabled, renderLink: renderLink, badge: badge, data: data, depth: level || 1, order: index, overflowedIndicator: overflowedIndicator, overflowMaxCount: overflowMaxCount })));
         });
     };
     Menu.prototype.render = function () {
         var _a;
         var _b;
-        var _c = this.props, classPrefix = _c.classPrefix, className = _c.className, cx = _c.classnames, collapsed = _c.collapsed, themeColor = _c.themeColor, stacked = _c.stacked, mode = _c.mode, accordion = _c.accordion, prefix = _c.prefix, disabled = _c.disabled, draggable = _c.draggable, triggerSubMenuAction = _c.triggerSubMenuAction, direction = _c.direction, overflowedIndicator = _c.overflowedIndicator, disabledOverflow = _c.disabledOverflow, overflowMaxCount = _c.overflowMaxCount, overflowComponent = _c.overflowComponent, overflowedIndicatorPopupClassName = _c.overflowedIndicatorPopupClassName, overflowSuffix = _c.overflowSuffix, overflowItemWidth = _c.overflowItemWidth, overflowStyle = _c.overflowStyle, popOverContainer = _c.popOverContainer, inlineIndent = _c.inlineIndent, expandBefore = _c.expandBefore, onDragStart = _c.onDragStart;
+        var _c = this.props, classPrefix = _c.classPrefix, cx = _c.classnames, collapsed = _c.collapsed, themeColor = _c.themeColor, stacked = _c.stacked, mode = _c.mode, accordion = _c.accordion, prefix = _c.prefix, disabled = _c.disabled, draggable = _c.draggable, className = _c.className, triggerSubMenuAction = _c.triggerSubMenuAction, direction = _c.direction, overflowedIndicator = _c.overflowedIndicator, disabledOverflow = _c.disabledOverflow, overflowMaxCount = _c.overflowMaxCount, overflowComponent = _c.overflowComponent, overflowedIndicatorPopupClassName = _c.overflowedIndicatorPopupClassName, overflowSuffix = _c.overflowSuffix, overflowItemWidth = _c.overflowItemWidth, overflowStyle = _c.overflowStyle, popOverContainer = _c.popOverContainer, inlineIndent = _c.inlineIndent, expandBefore = _c.expandBefore, onDragStart = _c.onDragStart;
         var _d = this.state, navigations = _d.navigations, activeKey = _d.activeKey, defaultOpenKeys = _d.defaultOpenKeys, openKeys = _d.openKeys;
         var isDarkTheme = themeColor === 'dark';
-        var disabledItem = amisCore.findTree(navigations, function (item) { return !!item.disabled; });
         var rcMode = stacked
             ? mode === 'float'
                 ? 'vertical-right'
                 : 'vertical'
             : 'horizontal';
+        var disableOpen = collapsed || !stacked || (stacked && mode === 'float');
         return (React__default["default"].createElement(MenuContext.MenuContext.Provider, { value: {
                 themeColor: themeColor,
                 stacked: stacked,
@@ -273,7 +277,7 @@ var Menu = /** @class */ (function (_super) {
                     _a['Nav-Menu-collapsed'] = stacked && collapsed,
                     _a['Nav-Menu-dark'] = isDarkTheme,
                     _a['Nav-Menu-light'] = !isDarkTheme,
-                    _a['Nav-Menu-disabled'] = disabled || !!disabledItem,
+                    _a['Nav-Menu-disabled'] = disabled,
                     _a['Nav-Menu-expand-before'] = stacked && mode === 'inline' && !collapsed && expandBefore,
                     _a)), direction: direction, 
                 // @ts-ignore
@@ -285,9 +289,7 @@ var Menu = /** @class */ (function (_super) {
                 // @ts-ignore
                 maxCount: stacked || disabledOverflow
                     ? Overflow["default"].INVALIDATE
-                    : overflowMaxCount || Overflow["default"].RESPONSIVE, component: overflowComponent || 'ul', style: overflowStyle, overflowedIndicatorPopupClassName: overflowedIndicatorPopupClassName, suffix: overflowSuffix ? overflowSuffix : null, itemWidth: overflowItemWidth ? overflowItemWidth : null, selectedKeys: activeKey != null ? activeKey : [], defaultOpenKeys: defaultOpenKeys, openKeys: collapsed || !stacked || (stacked && mode === 'float')
-                    ? undefined
-                    : openKeys, onClick: this.handleItemClick }, this.renderMenuContent(navigations))));
+                    : overflowMaxCount || Overflow["default"].RESPONSIVE, component: overflowComponent || 'ul', style: overflowStyle, overflowedIndicatorPopupClassName: overflowedIndicatorPopupClassName, suffix: overflowSuffix ? overflowSuffix : null, itemWidth: overflowItemWidth ? overflowItemWidth : null, selectedKeys: activeKey != null ? activeKey : [], defaultOpenKeys: disableOpen ? undefined : defaultOpenKeys, openKeys: disableOpen ? undefined : openKeys, onClick: this.handleItemClick }, this.renderMenuContent(navigations))));
     };
     Menu.defaultProps = {
         collapsed: false,
@@ -296,7 +298,7 @@ var Menu = /** @class */ (function (_super) {
         mode: 'inline',
         direction: 'ltr',
         prefix: '',
-        triggerSubMenuAction: 'click',
+        triggerSubMenuAction: 'hover',
         inlineIndent: 15,
         popOverContainer: function () { return document.body; },
         renderLink: function (link) {

package/lib/components/schema-editor/Array.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SchemaEditorItemCommon } from './Common';
 export declare class SchemaEditorItemArray extends SchemaEditorItemCommon {
     state: {

package/lib/components/schema-editor/Array.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.8.0
+ * amis-ui v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/schema-editor/Common.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.8.0
+ * amis-ui v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/schema-editor/Item.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.8.0
+ * amis-ui v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/schema-editor/Object.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { JSONSchema } from 'amis-core';
 import { SchemaEditorItemCommon } from './Common';
 import type { SchemaEditorItemCommonProps } from './Common';

package/lib/components/schema-editor/Object.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.8.0
+ * amis-ui v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/schema-editor/SchemaVariableList.d.ts

@@ -33,7 +33,7 @@ declare const _default: {
         childRef(ref: any): void;
         getWrappedInstance(): any;
         render(): JSX.Element;
-        context: any;
+        context: unknown;
         setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<Omit<SchemaVariableListProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps, keyof LocaleProps> & {
             locale?: string | undefined;
             translate?: ((str: string, ...args: any[]) => string) | undefined;
@@ -42,8 +42,6 @@ declare const _default: {
         readonly props: Readonly<Omit<Omit<SchemaVariableListProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps, keyof LocaleProps> & {
             locale?: string | undefined;
             translate?: ((str: string, ...args: any[]) => string) | undefined;
-        }> & Readonly<{
-            children?: React.ReactNode;
         }>;
         state: Readonly<{}>;
         refs: {
@@ -91,12 +89,10 @@ declare const _default: {
             childRef(ref: any): void;
             getWrappedInstance(): any;
             render(): JSX.Element;
-            context: any;
+            context: unknown;
             setState<K_1 extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<SchemaVariableListProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>) => {} | Pick<{}, K_1> | null) | Pick<{}, K_1> | null, callback?: (() => void) | undefined): void;
             forceUpdate(callback?: (() => void) | undefined): void;
-            readonly props: Readonly<Omit<SchemaVariableListProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps> & Readonly<{
-                children?: React.ReactNode;
-            }>;
+            readonly props: Readonly<Omit<SchemaVariableListProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>;
             state: Readonly<{}>;
             refs: {
                 [key: string]: React.ReactInstance;
@@ -126,12 +122,10 @@ declare const _default: {
         childRef(ref: any): void;
         getWrappedInstance(): any;
         render(): JSX.Element;
-        context: any;
+        context: unknown;
         setState<K_1 extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<SchemaVariableListProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>) => {} | Pick<{}, K_1> | null) | Pick<{}, K_1> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;
-        readonly props: Readonly<Omit<SchemaVariableListProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps> & Readonly<{
-            children?: React.ReactNode;
-        }>;
+        readonly props: Readonly<Omit<SchemaVariableListProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>;
         state: Readonly<{}>;
         refs: {
             [key: string]: React.ReactInstance;
@@ -161,12 +155,10 @@ declare const _default: {
             childRef(ref: any): void;
             getWrappedInstance(): any;
             render(): JSX.Element;
-            context: any;
+            context: unknown;
             setState<K_1 extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<SchemaVariableListProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>) => {} | Pick<{}, K_1> | null) | Pick<{}, K_1> | null, callback?: (() => void) | undefined): void;
             forceUpdate(callback?: (() => void) | undefined): void;
-            readonly props: Readonly<Omit<SchemaVariableListProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps> & Readonly<{
-                children?: React.ReactNode;
-            }>;
+            readonly props: Readonly<Omit<SchemaVariableListProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>;
             state: Readonly<{}>;
             refs: {
                 [key: string]: React.ReactInstance;

package/lib/components/schema-editor/SchemaVariableList.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.8.0
+ * amis-ui v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/schema-editor/SchemaVariableListPicker.d.ts

@@ -26,7 +26,7 @@ declare const _default: {
         childRef(ref: any): void;
         getWrappedInstance(): any;
         render(): JSX.Element;
-        context: any;
+        context: unknown;
         setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<Omit<SchemaVariableListPickerProps, keyof import("amis-core").ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps, keyof import("amis-core").LocaleProps> & {
             locale?: string | undefined;
             translate?: ((str: string, ...args: any[]) => string) | undefined;
@@ -35,8 +35,6 @@ declare const _default: {
         readonly props: Readonly<Omit<Omit<SchemaVariableListPickerProps, keyof import("amis-core").ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps, keyof import("amis-core").LocaleProps> & {
             locale?: string | undefined;
             translate?: ((str: string, ...args: any[]) => string) | undefined;
-        }> & Readonly<{
-            children?: React.ReactNode;
         }>;
         state: Readonly<{}>;
         refs: {
@@ -84,12 +82,10 @@ declare const _default: {
             childRef(ref: any): void;
             getWrappedInstance(): any;
             render(): JSX.Element;
-            context: any;
+            context: unknown;
             setState<K_1 extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<SchemaVariableListPickerProps, keyof import("amis-core").ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>) => {} | Pick<{}, K_1> | null) | Pick<{}, K_1> | null, callback?: (() => void) | undefined): void;
             forceUpdate(callback?: (() => void) | undefined): void;
-            readonly props: Readonly<Omit<SchemaVariableListPickerProps, keyof import("amis-core").ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps> & Readonly<{
-                children?: React.ReactNode;
-            }>;
+            readonly props: Readonly<Omit<SchemaVariableListPickerProps, keyof import("amis-core").ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>;
             state: Readonly<{}>;
             refs: {
                 [key: string]: React.ReactInstance;
@@ -119,12 +115,10 @@ declare const _default: {
         childRef(ref: any): void;
         getWrappedInstance(): any;
         render(): JSX.Element;
-        context: any;
+        context: unknown;
         setState<K_1 extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<SchemaVariableListPickerProps, keyof import("amis-core").ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>) => {} | Pick<{}, K_1> | null) | Pick<{}, K_1> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;
-        readonly props: Readonly<Omit<SchemaVariableListPickerProps, keyof import("amis-core").ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps> & Readonly<{
-            children?: React.ReactNode;
-        }>;
+        readonly props: Readonly<Omit<SchemaVariableListPickerProps, keyof import("amis-core").ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>;
         state: Readonly<{}>;
         refs: {
             [key: string]: React.ReactInstance;
@@ -154,12 +148,10 @@ declare const _default: {
             childRef(ref: any): void;
             getWrappedInstance(): any;
             render(): JSX.Element;
-            context: any;
+            context: unknown;
             setState<K_1 extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<SchemaVariableListPickerProps, keyof import("amis-core").ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>) => {} | Pick<{}, K_1> | null) | Pick<{}, K_1> | null, callback?: (() => void) | undefined): void;
             forceUpdate(callback?: (() => void) | undefined): void;
-            readonly props: Readonly<Omit<SchemaVariableListPickerProps, keyof import("amis-core").ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps> & Readonly<{
-                children?: React.ReactNode;
-            }>;
+            readonly props: Readonly<Omit<SchemaVariableListPickerProps, keyof import("amis-core").ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>;
             state: Readonly<{}>;
             refs: {
                 [key: string]: React.ReactInstance;

package/lib/components/schema-editor/SchemaVariableListPicker.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.8.0
+ * amis-ui v3.0.0
  * Copyright 2018-2023 fex
  */