amis-ui 6.2.2 → 6.3.0

package/esm/components/json-schema/Object.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.2.2
+ * amis-ui v6.3.0
  * Copyright 2018-2024 fex
  */
 
@@ -12,35 +12,39 @@ import InputBox from '../InputBox.js';
 import InputBoxWithSuggestion from '../InputBoxWithSuggestion.js';
 import EnhancedSelect from '../Select.js';
 import { InputJSONSchemaItem } from './Item.js';
+import isEqual from 'lodash/isEqual';
 
 function InputJSONSchemaObject(props) {
     var _a, _b;
-    var cx = props.classnames, value = props.value, onChange = props.onChange, disabled = props.disabled, __ = props.translate, renderKey = props.renderKey, collapsable = props.collapsable, renderValue = props.renderValue, mobileUI = props.mobileUI;
+    var cx = props.classnames, value = props.value, onChange = props.onChange, disabled = props.disabled, __ = props.translate, renderKey = props.renderKey, collapsable = props.collapsable, renderValue = props.renderValue, mobileUI = props.mobileUI, className = props.className, addButtonText = props.addButtonText;
     var buildMembers = React__default.useCallback(function (schema, value) {
         var e_1, _a;
         var members = [];
         var required = Array.isArray(schema.required) ? schema.required : [];
         Object.keys(schema.properties || {}).forEach(function (key) {
+            var _a;
             var child = schema.properties[key];
             members.push({
                 key: guid(),
                 name: key,
                 nameMutable: !required.includes(key),
                 required: required.includes(key),
-                schema: child
+                schema: child,
+                value: (_a = value === null || value === void 0 ? void 0 : value[key]) !== null && _a !== void 0 ? _a : child.default
             });
         });
         var keys = Object.keys(value || {});
         var _loop_1 = function (key) {
             var exists = members.find(function (m) { return m.name === key; });
-            if (!exists) {
+            if (!exists && schema.additionalProperties !== false) {
                 members.push({
                     key: guid(),
                     name: key,
                     nameMutable: true,
                     schema: {
                         type: 'string'
-                    }
+                    },
+                    value: value[key]
                 });
             }
         };
@@ -57,7 +61,7 @@ function InputJSONSchemaObject(props) {
             }
             finally { if (e_1) throw e_1.error; }
         }
-        if (!members.length) {
+        if (!members.length && schema.additionalProperties !== false) {
             members.push({
                 key: guid(),
                 name: '',
@@ -69,67 +73,91 @@ function InputJSONSchemaObject(props) {
         }
         return members;
     }, []);
-    var _c = __read(React__default.useState(buildMembers(props.schema, props.value)), 2), members = _c[0], setMembers = _c[1];
+    var _c = __read(React__default.useState([]), 2), members = _c[0], _setMembers = _c[1];
     var membersRef = React__default.useRef();
     membersRef.current = members;
+    var setMembers = function (members) {
+        _setMembers(members);
+        membersRef.current = members;
+    };
     var _d = __read(React__default.useState(collapsable ? true : false), 2), collapsed = _d[0], setCollapsed = _d[1];
     var toggleCollapsed = function () {
         setCollapsed(!collapsed);
     };
+    var emitChange = function () {
+        var members = membersRef.current;
+        var value = {};
+        members.forEach(function (member) {
+            if (!member.invalid &&
+                (typeof member.value !== 'undefined' ||
+                    typeof value[member.name] !== 'undefined')) {
+                value[member.name] = member.value;
+            }
+        });
+        if (!isEqual(value, props.value || {})) {
+            onChange === null || onChange === void 0 ? void 0 : onChange(value);
+        }
+    };
     var onMemberChange = function (member, memberValue) {
-        var _a;
-        var newValue = __assign(__assign({}, props.value), (_a = {}, _a[member.name] = memberValue, _a));
-        onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
+        var arr = members.concat();
+        var idx = arr.indexOf(member);
+        if (!~idx) {
+            throw new Error('member object not found');
+        }
+        arr.splice(idx, 1, __assign(__assign({}, arr[idx]), { value: memberValue }));
+        setMembers(arr);
+        emitChange();
     };
-    var onMemberKeyChange = function (member, memberValue) {
+    var onMemberKeyChange = function (member, memberKey) {
         var _a, _b;
         var idx = members.indexOf(member);
         if (!~idx) {
             throw new Error('member object not found');
         }
-        var newValue = __assign({}, props.value);
-        var m = members.concat();
-        m.splice(idx, 1, __assign(__assign({}, member), { schema: ((_b = (_a = props.schema) === null || _a === void 0 ? void 0 : _a.properties) === null || _b === void 0 ? void 0 : _b[memberValue]) || {
+        var arr = members.concat();
+        arr.splice(idx, 1, __assign(__assign({}, member), { schema: ((_b = (_a = props.schema) === null || _a === void 0 ? void 0 : _a.properties) === null || _b === void 0 ? void 0 : _b[memberKey]) || {
                 type: 'string'
-            }, name: memberValue, invalid: !memberValue ||
-                members.some(function (a, b) { return a.name === memberValue && b !== idx; }) }));
-        setMembers(m);
-        newValue[memberValue] = newValue[member.name];
-        delete newValue[member.name];
-        onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
+            }, name: memberKey, invalid: !memberKey || members.some(function (a, b) { return a.name === memberKey && b !== idx; }) }));
+        setMembers(arr);
+        emitChange();
     };
     var onMemberDelete = function (member) {
         var idx = members.indexOf(member);
         if (!~idx) {
             throw new Error('member object not found');
         }
-        var m = members.concat();
-        m.splice(idx, 1);
-        setMembers(m);
-        var newValue = __assign({}, props.value);
-        delete newValue[member.name];
-        onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
+        var arr = members.concat();
+        arr.splice(idx, 1);
+        setMembers(arr);
+        emitChange();
     };
     React__default.useEffect(function () {
-        setMembers(buildMembers(props.schema, props.value));
+        var members = buildMembers(props.schema, props.value);
+        setMembers(members);
+        emitChange();
     }, [JSON.stringify(props.schema)]);
     React__default.useEffect(function () {
         var e_2, _a;
         var value = props.value;
-        var m = membersRef.current.concat();
+        var arr = membersRef.current.concat();
         var keys = Object.keys(value || {});
         var _loop_2 = function (key) {
-            var exists = m.find(function (m) { return m.name === key; });
-            if (!exists) {
-                m.push({
+            var idx = arr.findIndex(function (m) { return m.name === key; });
+            var exists = arr[idx];
+            if (!exists && props.schema.additionalProperties !== false) {
+                arr.push({
                     key: guid(),
                     name: key,
                     nameMutable: true,
                     schema: {
                         type: 'string'
-                    }
+                    },
+                    value: value === null || value === void 0 ? void 0 : value[key]
                 });
             }
+            else {
+                arr.splice(idx, 1, __assign(__assign({}, exists), { value: value === null || value === void 0 ? void 0 : value[key] }));
+            }
         };
         try {
             for (var keys_2 = __values(keys), keys_2_1 = keys_2.next(); !keys_2_1.done; keys_2_1 = keys_2.next()) {
@@ -144,19 +172,18 @@ function InputJSONSchemaObject(props) {
             }
             finally { if (e_2) throw e_2.error; }
         }
-        if (m.length !== membersRef.current.length) {
-            setMembers(m);
-        }
+        setMembers(arr);
     }, [JSON.stringify(props.value)]);
     var handleAdd = React__default.useCallback(function () {
-        var m = members.concat();
-        m.push({
+        var arr = members.concat();
+        arr.push({
             key: guid(),
             name: '',
             invalid: true,
             nameMutable: true
         });
-        setMembers(m);
+        setMembers(arr);
+        emitChange();
     }, [members]);
     var options = [];
     var properties = ((_a = props.schema) === null || _a === void 0 ? void 0 : _a.properties) || {};
@@ -176,7 +203,7 @@ function InputJSONSchemaObject(props) {
                 'is-collapsed': collapsed
             }), onClick: toggleCollapsed },
             React__default.createElement(Icon, { icon: "right-arrow-bold", className: "icon" }))) : null,
-        React__default.createElement("div", { className: cx('JSONSchemaObject', {
+        React__default.createElement("div", { className: cx('JSONSchemaObject', className, {
                 'is-mobile': mobileUI,
                 'is-expanded': collapsable && !collapsed
             }) },
@@ -192,13 +219,13 @@ function InputJSONSchemaObject(props) {
                         member.required ? (React__default.createElement("span", { className: cx("Form-star") }, "*")) : null,
                         ((_a = member.schema) === null || _a === void 0 ? void 0 : _a.title) || member.name))),
                     React__default.createElement("div", { className: cx('JSONSchemaMember-value') },
-                        React__default.createElement(InputJSONSchemaItem, __assign({}, props, { value: value === null || value === void 0 ? void 0 : value[member.name], onChange: onMemberChange.bind(null, member), schema: member.schema || {
+                        React__default.createElement(InputJSONSchemaItem, __assign({}, props, { className: "", addButtonText: undefined, required: member.required, value: value === null || value === void 0 ? void 0 : value[member.name], onChange: onMemberChange.bind(null, member), schema: member.schema || {
                                 type: 'string'
                             }, placeholder: (_b = member.schema) === null || _b === void 0 ? void 0 : _b.description, collapsable: true }))),
                     !member.required ? (React__default.createElement(Button, { className: cx('SchemaEditor-btn'), onClick: onMemberDelete.bind(null, member), iconOnly: true, disabled: disabled || !!(value === null || value === void 0 ? void 0 : value.$ref) },
                         React__default.createElement(Icon, { icon: "remove", className: "icon" }))) : null));
             })),
-            allowAdd && !collapsed ? (React__default.createElement(Button, { level: "link", onClick: handleAdd, size: "xs", disabled: disabled }, __('JSONSchema.add_prop'))) : null)));
+            allowAdd && !collapsed ? (React__default.createElement(Button, { level: "link", onClick: handleAdd, size: "xs", disabled: disabled }, addButtonText !== null && addButtonText !== void 0 ? addButtonText : __('JSONSchema.add_prop'))) : null)));
 }
 
 export { InputJSONSchemaObject };

package/esm/components/json-schema/index.d.ts

@@ -12,6 +12,8 @@ export interface InputJSONSchemaItemProps extends ThemeProps, LocaleProps {
     renderKey?: (value: any, onChange: (value: any) => void, schema: any, props: any) => JSX.Element;
     collapsable?: boolean;
     placeholder?: string;
+    required?: boolean;
+    addButtonText?: string;
 }
 export interface InputJSONSchemaProps extends Omit<InputJSONSchemaItemProps, 'schema'> {
     schema?: any;

package/esm/components/json-schema/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.2.2
+ * amis-ui v6.3.0
  * Copyright 2018-2024 fex
  */
 

package/esm/components/menu/MenuContext.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.2.2
+ * amis-ui v6.3.0
  * Copyright 2018-2024 fex
  */
 

package/esm/components/menu/MenuItem.d.ts

@@ -6,7 +6,7 @@
 /// <reference types="hoist-non-react-statics" />
 import React from 'react';
 import { MenuItemProps as RcMenuItemProps } from 'rc-menu';
-import { ClassNamesFn } from 'amis-core';
+import { ClassNamesFn, TestIdBuilder } from 'amis-core';
 import { Trigger } from '../TooltipWrapper';
 import { MenuContextProps } from './MenuContext';
 import type { NavigationItem } from './';
@@ -21,6 +21,7 @@ export interface MenuItemProps extends Omit<NavigationItem, 'children'>, RcMenuI
     tooltipTrigger?: Trigger | Array<Trigger>;
     renderLink: Function;
     testid?: string;
+    testIdBuilder?: TestIdBuilder;
     extra?: React.ReactNode;
 }
 export declare class MenuItem extends React.Component<MenuItemProps> {

package/esm/components/menu/MenuItem.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.2.2
+ * amis-ui v6.3.0
  * Copyright 2018-2024 fex
  */
 
@@ -7,7 +7,7 @@ import { __extends, __assign } from 'tslib';
 import React__default from 'react';
 import pick from 'lodash/pick';
 import { Item } from 'rc-menu';
-import { createObject, buildTestId, themeable } from 'amis-core';
+import { createObject, themeable } from 'amis-core';
 import { Badge } from '../Badge.js';
 import { getIcon } from '../icons.js';
 import TooltipWrapper from '../TooltipWrapper.js';
@@ -51,7 +51,7 @@ var MenuItem = /** @class */ (function (_super) {
         var _a, _b, _c, _d;
         var _e, _f;
         var _g = this.context, collapsed = _g.collapsed, draggable = _g.draggable, stacked = _g.stacked, mode = _g.mode, onDragStart = _g.onDragStart;
-        var _h = this.props, cx = _h.classnames, icon = _h.icon, label = _h.label, labelExtra = _h.labelExtra, path = _h.path, depth = _h.depth, badge = _h.badge, badgeClassName = _h.badgeClassName, renderLink = _h.renderLink, extra = _h.extra, disabled = _h.disabled, testid = _h.testid, id = _h.id, defaultData = _h.data;
+        var _h = this.props, cx = _h.classnames, icon = _h.icon, label = _h.label, labelExtra = _h.labelExtra, path = _h.path, depth = _h.depth, badge = _h.badge, badgeClassName = _h.badgeClassName, renderLink = _h.renderLink, extra = _h.extra, disabled = _h.disabled, testIdBuilder = _h.testIdBuilder, id = _h.id, defaultData = _h.data;
         var isCollapsedNode = collapsed && depth === 1;
         var iconNode = icon ? (typeof icon === 'string' ? (this.isImgPath(icon) ? (React__default.createElement("div", { className: cx("Nav-Menu-item-icon") },
             React__default.createElement("img", { width: "14px", src: icon }))) : (React__default.createElement("i", { className: cx("Nav-Menu-item-icon", icon, (_a = {},
@@ -77,7 +77,7 @@ var MenuItem = /** @class */ (function (_super) {
         return (React__default.createElement("div", { className: cx('Nav-Menu-item-wrap') },
             React__default.createElement(Badge, { classnames: cx, badge: badge && !isCollapsedNode // 收起模式下 不展示角标
                     ? __assign(__assign({}, badge), { className: badgeClassName }) : null, data: createObject(defaultData, link) },
-                React__default.createElement("a", __assign({ className: cx('Nav-Menu-item-link'), title: typeof (link === null || link === void 0 ? void 0 : link.label) === 'string' ? link === null || link === void 0 ? void 0 : link.label : undefined, "data-id": (link === null || link === void 0 ? void 0 : link.__id) || id, "data-depth": depth, onDragStart: onDragStart === null || onDragStart === void 0 ? void 0 : onDragStart(link) }, buildTestId(testid, link)), isCollapsedNode ? (React__default.createElement(React__default.Fragment, null, iconNode || labelNode)) : (React__default.createElement(React__default.Fragment, null,
+                React__default.createElement("a", __assign({ className: cx('Nav-Menu-item-link'), title: typeof (link === null || link === void 0 ? void 0 : link.label) === 'string' ? link === null || link === void 0 ? void 0 : link.label : undefined, "data-id": (link === null || link === void 0 ? void 0 : link.__id) || id, "data-depth": depth, onDragStart: onDragStart === null || onDragStart === void 0 ? void 0 : onDragStart(link) }, testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getTestId()), isCollapsedNode ? (React__default.createElement(React__default.Fragment, null, iconNode || labelNode)) : (React__default.createElement(React__default.Fragment, null,
                     dragNode,
                     iconNode,
                     labelNode,

package/esm/components/menu/SubMenu.d.ts

@@ -6,7 +6,7 @@
 /// <reference types="hoist-non-react-statics" />
 import React from 'react';
 import { SubMenuProps as RcSubMenuProps } from 'rc-menu';
-import { ClassNamesFn } from 'amis-core';
+import { ClassNamesFn, TestIdBuilder } from 'amis-core';
 import { MenuContextProps } from './MenuContext';
 import type { NavigationItem } from './';
 interface MenuItemTitleInfo {
@@ -25,6 +25,7 @@ export interface SubMenuProps extends Omit<NavigationItem, 'children'>, Omit<RcS
     onTitleClick?: (e: MenuItemTitleInfo) => void;
     renderLink: Function;
     [propName: string]: any;
+    testIdBuilder?: TestIdBuilder;
 }
 export declare class SubMenu extends React.Component<SubMenuProps> {
     static contextType: React.Context<MenuContextProps>;

package/esm/components/menu/SubMenu.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.2.2
+ * amis-ui v6.3.0
  * Copyright 2018-2024 fex
  */
 
@@ -7,7 +7,7 @@ import { __extends, __assign, __decorate, __metadata } from 'tslib';
 import React__default from 'react';
 import pick from 'lodash/pick';
 import { SubMenu as SubMenu$2 } from 'rc-menu';
-import { createObject, buildTestId, autobind, themeable } from 'amis-core';
+import { createObject, autobind, themeable } from 'amis-core';
 import { getIcon, Icon } from '../icons.js';
 import { Badge } from '../Badge.js';
 import { MenuContext } from './MenuContext.js';
@@ -63,7 +63,7 @@ var SubMenu = /** @class */ (function (_super) {
         var _a, _b, _c, _d;
         var _e, _f;
         var _g = this.context, collapsed = _g.collapsed, stacked = _g.stacked, mode = _g.mode, draggable = _g.draggable, onDragStart = _g.onDragStart;
-        var _h = this.props, cx = _h.classnames, id = _h.id, label = _h.label, labelExtra = _h.labelExtra, icon = _h.icon, path = _h.path, depth = _h.depth, badge = _h.badge, badgeClassName = _h.badgeClassName, disabled = _h.disabled, defaultData = _h.data, extra = _h.extra, testid = _h.testid, renderLink = _h.renderLink;
+        var _h = this.props, cx = _h.classnames, id = _h.id, label = _h.label, labelExtra = _h.labelExtra, icon = _h.icon, path = _h.path, depth = _h.depth, badge = _h.badge, badgeClassName = _h.badgeClassName, disabled = _h.disabled, defaultData = _h.data, extra = _h.extra, testIdBuilder = _h.testIdBuilder, renderLink = _h.renderLink;
         var isCollapsedNode = collapsed && depth === 1;
         var link = renderLink && typeof renderLink === 'function'
             ? renderLink(this.props)
@@ -85,7 +85,7 @@ var SubMenu = /** @class */ (function (_super) {
                 _d['Nav-Menu-item-label-subTitle'] = !isCollapsedNode,
                 _d))
         })) : null;
-        var dragNode = !disabled && stacked && mode === 'inline' && !collapsed && draggable ? (React__default.createElement("span", { className: cx('Nav-Menu-item-dragBar'), draggable: true },
+        var dragNode = !disabled && stacked && mode === 'inline' && !collapsed && draggable ? (React__default.createElement("span", __assign({ className: cx('Nav-Menu-item-dragBar'), draggable: true }, testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild('drag-bar').getTestId()),
             React__default.createElement(DragIcon, null))) : null;
         var renderContent = function () {
             return isCollapsedNode ? (React__default.createElement(React__default.Fragment, null, iconNode || labelNode)) : (React__default.createElement(React__default.Fragment, null,
@@ -93,13 +93,13 @@ var SubMenu = /** @class */ (function (_super) {
                 iconNode,
                 labelNode,
                 labelExtra,
-                !stacked && depth === 1 ? (React__default.createElement("span", { key: "expand-toggle", className: cx('Nav-Menu-submenu-arrow') },
+                !stacked && depth === 1 ? (React__default.createElement("span", __assign({ key: "expand-toggle", className: cx('Nav-Menu-submenu-arrow') }, testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild('expand-toggle').getTestId()),
                     React__default.createElement(Icon, { icon: "right-arrow-bold", className: "icon" }))) : null));
         };
         return (React__default.createElement("div", { className: cx('Nav-Menu-item-wrap') },
             React__default.createElement(Badge, { classnames: cx, badge: badge && !isCollapsedNode // 收起模式下 不展示角标
                     ? __assign(__assign({}, badge), { className: badgeClassName }) : null, data: createObject(defaultData, link) },
-                React__default.createElement("a", __assign({ className: cx("Nav-Menu-item-link"), "data-id": (link === null || link === void 0 ? void 0 : link.__id) || id, "data-depth": depth, onDragStart: onDragStart === null || onDragStart === void 0 ? void 0 : onDragStart(link) }, buildTestId(testid, link)), renderContent())),
+                React__default.createElement("a", __assign({ className: cx("Nav-Menu-item-link"), "data-id": (link === null || link === void 0 ? void 0 : link.__id) || id, "data-depth": depth, onDragStart: onDragStart === null || onDragStart === void 0 ? void 0 : onDragStart(link) }, testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getTestId()), renderContent())),
             extra ? (React__default.createElement("div", { className: cx('Nav-Menu-item-extra') }, extra)) : null));
     };
     SubMenu.prototype.render = function () {