amis-ui 6.2.2 → 6.4.0

package/lib/components/menu/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.2.2
+ * amis-ui v6.4.0
  * Copyright 2018-2024 fex
  */
 
@@ -235,15 +235,18 @@ var Menu = /** @class */ (function (_super) {
     };
     Menu.prototype.renderExpandIcon = function (ctx) {
         var _this = this;
-        var _a = this.props, cx = _a.classnames, expandIcon = _a.expandIcon;
-        return (_J$X_("span", { key: "expand-toggle", className: cx('Nav-Menu-submenu-arrow'), onClick: function (e) {
+        var _a;
+        var navigations = this.state.navigations;
+        var _b = this.props, cx = _b.classnames, expandIcon = _b.expandIcon, testIdBuilder = _b.testIdBuilder;
+        var link = amisCore.findTree(navigations, function (item) { return item.id === ctx.eventKey; });
+        return (_J$X_("span", tslib.__assign({ key: "expand-toggle", className: cx('Nav-Menu-submenu-arrow'), onClick: function (e) {
                 _this.handleToggleExpand(ctx);
                 e.preventDefault();
-            } }, !React__default["default"].isValidElement(expandIcon) ? (_J$X_(icons.Icon, { icon: typeof expandIcon === 'string' ? expandIcon : 'right-arrow-bold', className: "icon" })) : (expandIcon)));
+            } }, testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild(((_a = link === null || link === void 0 ? void 0 : link.link) === null || _a === void 0 ? void 0 : _a.testid) || ctx.eventKey).getChild('expand-toggle').getTestId()), !React__default["default"].isValidElement(expandIcon) ? (_J$X_(icons.Icon, { icon: typeof expandIcon === 'string' ? expandIcon : 'right-arrow-bold', className: "icon" })) : (expandIcon)));
     };
     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, overflowedIndicator = _a.overflowedIndicator, overflowMaxCount = _a.overflowMaxCount, popupClassName = _a.popupClassName, testid = _a.testid;
+        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, testIdBuilder = _a.testIdBuilder;
         return list.map(function (item, index) {
             var _a;
             // 如果这一级是分组标题 那么level不递增
@@ -257,11 +260,11 @@ var Menu = /** @class */ (function (_super) {
             var link = item.link;
             if ((link && link.defer && !link.loaded) ||
                 (item.children && item.children.length)) {
-                return (_J$X_(SubMenu["default"], tslib.__assign({}, item, { key: item.id, disabled: itemDisabled || link.loading, active: isActive(item), badge: badge, renderLink: renderLink, depth: level || 1, testid: testid, popupClassName: popupClassName }), _this.renderMenuContent(item.children || [], item.depth + 1)));
+                return (_J$X_(SubMenu["default"], tslib.__assign({}, item, { key: item.id, disabled: itemDisabled || link.loading, active: isActive(item), badge: badge, renderLink: renderLink, depth: level || 1, testIdBuilder: testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild(link.testid || index), popupClassName: popupClassName }), _this.renderMenuContent(item.children || [], item.depth + 1)));
             }
             return item.mode === 'divider' ? (_J$X_(RcMenu.Divider, { key: item.id, className: cx("Nav-Menu-item-divider", (_a = {},
                     _a['Nav-Menu-item-divider-dark'] = themeColor === 'dark',
-                    _a)) })) : (_J$X_(MenuItem["default"], tslib.__assign({}, item, { key: item.id, disabled: itemDisabled, renderLink: renderLink, badge: badge, data: data, testid: testid, depth: level || 1, order: index, overflowedIndicator: overflowedIndicator, overflowMaxCount: overflowMaxCount })));
+                    _a)) })) : (_J$X_(MenuItem["default"], tslib.__assign({}, item, { key: item.id, disabled: itemDisabled, renderLink: renderLink, badge: badge, data: data, testIdBuilder: testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild(link.testid || index), depth: level || 1, order: index, overflowedIndicator: overflowedIndicator, overflowMaxCount: overflowMaxCount })));
         });
     };
     Menu.prototype.render = function () {

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

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.2.2
+ * amis-ui v6.4.0
  * Copyright 2018-2024 fex
  */
 
@@ -13,6 +13,7 @@ var amisCore = require('amis-core');
 var icons = require('../icons.js');
 var Common = require('./Common.js');
 var Item = require('./Item.js');
+var FormField = require('../FormField.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -41,25 +42,39 @@ var SchemaEditorItemArray = /** @class */ (function (_super) {
         (_b = (_a = this.props).onChange) === null || _b === void 0 ? void 0 : _b.call(_a, value);
     };
     SchemaEditorItemArray.prototype.renderItems = function () {
-        var _a = this.props, cx = _a.classnames, value = _a.value, renderExtraProps = _a.renderExtraProps, renderModalProps = _a.renderModalProps, locale = _a.locale, __ = _a.translate, classPrefix = _a.classPrefix, disabled = _a.disabled, showInfo = _a.showInfo, types = _a.types, onTypeChange = _a.onTypeChange, enableAdvancedSetting = _a.enableAdvancedSetting, popOverContainer = _a.popOverContainer, placeholder = _a.placeholder, mobileUI = _a.mobileUI;
+        var _a;
+        var _b = this.props, cx = _b.classnames, value = _b.value, renderExtraProps = _b.renderExtraProps, renderModalProps = _b.renderModalProps, locale = _b.locale, __ = _b.translate, classPrefix = _b.classPrefix, disabled = _b.disabled, showInfo = _b.showInfo, types = _b.types, onTypeChange = _b.onTypeChange, enableAdvancedSetting = _b.enableAdvancedSetting, popOverContainer = _b.popOverContainer, placeholder = _b.placeholder, mobileUI = _b.mobileUI, mini = _b.mini;
         var items = (value === null || value === void 0 ? void 0 : value.items) || {
             type: 'string'
         };
         return (_J$X_("div", { className: cx('SchemaEditorProps SchemaEditorArrayProps', {
                 'SchemaEditorProps--depth': showInfo !== false
             }) },
-            _J$X_(Item.SchemaEditorItem, { types: types, onTypeChange: onTypeChange, prefix: _J$X_("div", { className: cx('SchemaEditor-itemsLabel') }, __('JSONSchema.array_items')), value: items, onChange: this.handleItemsChange, renderExtraProps: renderExtraProps, renderModalProps: renderModalProps, locale: locale, translate: __, classnames: cx, classPrefix: classPrefix, disabled: disabled || !!(items === null || items === void 0 ? void 0 : items.$ref), enableAdvancedSetting: enableAdvancedSetting, popOverContainer: popOverContainer, placeholder: placeholder, mobileUI: mobileUI })));
+            _J$X_(Item.SchemaEditorItem, { types: types, onTypeChange: onTypeChange, label: (_a = types === null || types === void 0 ? void 0 : types.find(function (item) { return item.value === (items === null || items === void 0 ? void 0 : items.type); })) === null || _a === void 0 ? void 0 : _a.label, prefix: _J$X_("div", { className: cx('SchemaEditor-itemsLabel') }, __('JSONSchema.array_items')), value: items, onChange: this.handleItemsChange, renderExtraProps: renderExtraProps, renderModalProps: renderModalProps, locale: locale, translate: __, classnames: cx, classPrefix: classPrefix, disabled: disabled || !!(items === null || items === void 0 ? void 0 : items.$ref), enableAdvancedSetting: enableAdvancedSetting, popOverContainer: popOverContainer, placeholder: placeholder, mobileUI: mobileUI, mini: mini })));
     };
     SchemaEditorItemArray.prototype.render = function () {
-        var _a = this.props, cx = _a.classnames, showInfo = _a.showInfo; _a.disabled;
-        return (_J$X_("div", { className: cx('SchemaEditorItem SchemaEditorArray') },
+        var _a = this.props, cx = _a.classnames, showInfo = _a.showInfo, formMode = _a.formMode, mini = _a.mini; _a.disabled; var mobileUI = _a.mobileUI, locale = _a.locale, classPrefix = _a.classPrefix, types = _a.types, __ = _a.translate, placeholder = _a.placeholder;
+        if (formMode) {
+            return this.renderForm({
+                formAffixRender: function (methods) {
+                    return (_J$X_(React__default["default"].Fragment, null,
+                        _J$X_(FormField.Controller, { label: __('JSONSchema.array_items'), name: "items", control: methods.control, render: function (_a) {
+                                var field = _a.field;
+                                return (_J$X_(Item.SchemaEditorItem, tslib.__assign({}, field, { types: types, placeholder: placeholder, mobileUI: mobileUI, locale: locale, translate: __, classnames: cx, classPrefix: classPrefix, mini: false })));
+                            } })));
+                }
+            });
+        }
+        return (_J$X_("div", { className: cx('SchemaEditorItem SchemaEditorArray', {
+                'SchemaEditorItem--mini': mini
+            }) },
             showInfo !== false ? (_J$X_(React__default["default"].Fragment, null,
-                _J$X_("a", { className: cx('SchemaEditor-caret', {
+                mini ? null : (_J$X_("a", { className: cx('SchemaEditor-caret', {
                         'is-collapsed': this.state.collapsed
                     }), onClick: this.toggleCollapsed },
-                    _J$X_(icons.Icon, { icon: "caret", className: "icon" })),
+                    _J$X_(icons.Icon, { icon: "caret", className: "icon" }))),
                 this.renderCommon())) : null,
-            this.state.collapsed ? null : this.renderItems()));
+            this.state.collapsed || mini ? null : this.renderItems()));
     };
     tslib.__decorate([
         amisCore.autobind,

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

@@ -1,5 +1,6 @@
 import React from 'react';
 import { LocaleProps, ThemeProps, JSONSchema } from 'amis-core';
+import { UseFormReturn } from 'react-hook-form';
 export declare const schemaEditorItemPlaceholder: {
     key: string;
     title: string;
@@ -9,6 +10,7 @@ export declare const schemaEditorItemPlaceholder: {
 };
 export type SchemaEditorItemPlaceholder = Partial<typeof schemaEditorItemPlaceholder>;
 export interface SchemaEditorItemCommonProps extends LocaleProps, ThemeProps {
+    label?: string;
     value?: JSONSchema;
     onChange: (value: JSONSchema) => void;
     types: Array<{
@@ -22,6 +24,7 @@ export interface SchemaEditorItemCommonProps extends LocaleProps, ThemeProps {
     onRequiredChange?: (value: boolean) => void;
     typeMutable?: boolean;
     showInfo?: boolean;
+    addButtonText?: string;
     renderExtraProps?: (value: JSONSchema, onChange: (value: JSONSchema) => void) => JSX.Element;
     renderModalProps?: (value: JSONSchema, onChange: (value: JSONSchema) => void) => JSX.Element;
     prefix?: JSX.Element;
@@ -31,11 +34,24 @@ export interface SchemaEditorItemCommonProps extends LocaleProps, ThemeProps {
     placeholder?: SchemaEditorItemPlaceholder;
     popOverContainer?: any;
     mobileUI?: boolean;
+    mini?: boolean;
+    formMode?: boolean;
+    formRef?: any;
+    onFormConfirm?: (value: any) => void | Promise<any>;
+    expandMembers?: boolean;
+    formPrefixRender?: (methods: UseFormReturn & {
+        onSubmit: (value: any) => void;
+    }) => JSX.Element | null;
+    formAffixRender?: (methods: UseFormReturn & {
+        onSubmit: (value: any) => void;
+    }) => JSX.Element | null;
 }
 export declare class SchemaEditorItemCommon<P extends SchemaEditorItemCommonProps = SchemaEditorItemCommonProps, S = any> extends React.Component<P, S> {
     handleTypeChange(type: any): void;
-    handlePropsChange(newValue: JSONSchema): void;
+    handlePropsChange(newValue: JSONSchema): Promise<void>;
     handleBeforeSubmit(form: any): any;
     renderCommon(): React.JSX.Element;
+    handleFormChange(values: any): void;
+    renderForm(props?: Partial<SchemaEditorItemCommonProps>): React.JSX.Element;
     render(): React.JSX.Element;
 }

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

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.2.2
+ * amis-ui v6.4.0
  * Copyright 2018-2024 fex
  */
 
@@ -19,6 +19,7 @@ var InputBox = require('../InputBox.js');
 var PickerContainer = require('../PickerContainer.js');
 var Select = require('../Select.js');
 var Textarea = require('../Textarea.js');
+var Item = require('./Item.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -50,55 +51,95 @@ var SchemaEditorItemCommon = /** @class */ (function (_super) {
         onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
     };
     SchemaEditorItemCommon.prototype.handlePropsChange = function (newValue) {
-        var _a = this.props, onChange = _a.onChange, value = _a.value;
-        onChange === null || onChange === void 0 ? void 0 : onChange(tslib.__assign(tslib.__assign({}, value), newValue));
+        return tslib.__awaiter(this, void 0, void 0, function () {
+            var _a, onFormConfirm, onChange, value;
+            return tslib.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = this.props, onFormConfirm = _a.onFormConfirm, onChange = _a.onChange, value = _a.value;
+                        if (!onFormConfirm) return [3 /*break*/, 2];
+                        return [4 /*yield*/, onFormConfirm(newValue)];
+                    case 1:
+                        _b.sent();
+                        _b.label = 2;
+                    case 2:
+                        onChange === null || onChange === void 0 ? void 0 : onChange(tslib.__assign(tslib.__assign({}, value), newValue));
+                        return [2 /*return*/];
+                }
+            });
+        });
     };
     SchemaEditorItemCommon.prototype.handleBeforeSubmit = function (form) {
         return form.submit();
     };
     SchemaEditorItemCommon.prototype.renderCommon = function () {
-        var _a = this.props, value = _a.value, __ = _a.translate, typeMutable = _a.typeMutable, disabled = _a.disabled, cx = _a.classnames, required = _a.required, onRequiredChange = _a.onRequiredChange, renderExtraProps = _a.renderExtraProps, renderModalProps = _a.renderModalProps, enableAdvancedSetting = _a.enableAdvancedSetting, popOverContainer = _a.popOverContainer, prefix = _a.prefix, affix = _a.affix, types = _a.types, placeholder = _a.placeholder, mobileUI = _a.mobileUI;
+        var _this = this;
+        var _a;
+        var _b = this.props, label = _b.label, value = _b.value, __ = _b.translate, locale = _b.locale, typeMutable = _b.typeMutable, disabled = _b.disabled, cx = _b.classnames, classPrefix = _b.classPrefix, required = _b.required, onRequiredChange = _b.onRequiredChange, renderExtraProps = _b.renderExtraProps, renderModalProps = _b.renderModalProps, enableAdvancedSetting = _b.enableAdvancedSetting, popOverContainer = _b.popOverContainer, prefix = _b.prefix, affix = _b.affix, types = _b.types, placeholder = _b.placeholder, mobileUI = _b.mobileUI, mini = _b.mini, formPrefixRender = _b.formPrefixRender, formAffixRender = _b.formAffixRender;
         return (_J$X_(React__default["default"].Fragment, null,
             prefix,
-            types.length > 1 ? (_J$X_(Select["default"], { options: types, className: cx('SchemaEditor-type'), value: (value === null || value === void 0 ? void 0 : value.$ref) || (value === null || value === void 0 ? void 0 : value.type) || 'string', onChange: this.handleTypeChange, clearable: false, disabled: disabled || typeMutable === false, simpleValue: true, mobileUI: mobileUI, popOverContainer: popOverContainer })) : null,
-            onRequiredChange ? (_J$X_(Checkbox["default"], { className: cx('SchemaEditor-required'), label: __('Required'), value: required, onChange: onRequiredChange, disabled: disabled || typeMutable === false })) : null, renderExtraProps === null || renderExtraProps === void 0 ? void 0 :
+            mini ? (_J$X_("span", { className: cx('SchemaEditor-info') },
+                _J$X_("span", { className: cx('SchemaEditor-label') },
+                    (value === null || value === void 0 ? void 0 : value.isRequired) ? (_J$X_("span", { className: cx('Form-star') }, "*")) : (''), label !== null && label !== void 0 ? label : ((value === null || value === void 0 ? void 0 : value.title) || (value === null || value === void 0 ? void 0 : value.key) || '')),
+                _J$X_("span", { className: cx('SchemaEditor-typeLabel') }, ((_a = types.find(function (item) { return item.value === (value === null || value === void 0 ? void 0 : value.type); })) === null || _a === void 0 ? void 0 : _a.label) || ''))) : null,
+            !mini && types.length > 1 ? (_J$X_(Select["default"], { options: types, className: cx('SchemaEditor-type'), value: (value === null || value === void 0 ? void 0 : value.$ref) || (value === null || value === void 0 ? void 0 : value.type) || 'string', onChange: this.handleTypeChange, clearable: false, disabled: disabled || typeMutable === false, simpleValue: true, mobileUI: mobileUI, popOverContainer: popOverContainer })) : null,
+            !mini && onRequiredChange ? (_J$X_(Checkbox["default"], { className: cx('SchemaEditor-required'), label: __('Required'), value: required, onChange: onRequiredChange, disabled: disabled })) : null, renderExtraProps === null || renderExtraProps === void 0 ? void 0 :
             renderExtraProps(value, this.handlePropsChange),
-            enableAdvancedSetting ? (_J$X_(PickerContainer["default"], { mobileUI: mobileUI, value: value, bodyRender: function (_a) {
+            enableAdvancedSetting || mini ? (_J$X_(PickerContainer["default"], { mobileUI: mobileUI, value: value, bodyRender: function (_a) {
                     var isOpened = _a.isOpened, value = _a.value, onChange = _a.onChange, ref = _a.ref;
-                    return isOpened ? (_J$X_(Form["default"], { defaultValue: value, onSubmit: onChange, ref: ref }, function (_a) {
-                        var control = _a.control, getValues = _a.getValues, setValue = _a.setValue;
-                        return (_J$X_(React__default["default"].Fragment, null,
-                            _J$X_(FormField.Controller, { label: __('JSONSchema.title'), name: "title", control: control, rules: { maxLength: 20 }, isRequired: true, render: function (_a) {
-                                    var _b;
-                                    var field = _a.field;
-                                    return (_J$X_(InputBox["default"], tslib.__assign({}, field, { disabled: disabled, placeholder: __((_b = placeholder === null || placeholder === void 0 ? void 0 : placeholder.title) !== null && _b !== void 0 ? _b : ''), mobileUI: mobileUI })));
-                                } }),
-                            _J$X_(FormField.Controller, { label: __('JSONSchema.description'), name: "description", control: control, render: function (_a) {
-                                    var _b;
-                                    var field = _a.field;
-                                    return (_J$X_(Textarea["default"], tslib.__assign({}, field, { disabled: disabled, mobileUI: mobileUI, placeholder: __((_b = placeholder === null || placeholder === void 0 ? void 0 : placeholder.description) !== null && _b !== void 0 ? _b : '') })));
-                                } }),
-                            _J$X_(FormField.Controller, { label: __('JSONSchema.default'), name: "default", control: control, render: function (_a) {
-                                    var _b;
-                                    var field = _a.field;
-                                    return (_J$X_(InputBox["default"], tslib.__assign({}, field, { disabled: disabled, placeholder: __((_b = placeholder === null || placeholder === void 0 ? void 0 : placeholder.default) !== null && _b !== void 0 ? _b : ''), mobileUI: mobileUI })));
-                                } }), renderModalProps === null || renderModalProps === void 0 ? void 0 :
-                            renderModalProps(getValues(), function (values) {
-                                Object.keys(values).forEach(function (key) {
-                                    return setValue(key, values[key]);
-                                });
-                            })));
-                    })) : null;
+                    return isOpened ? (_J$X_(Item.SchemaEditorItem, { types: types, value: value, onChange: onChange, renderExtraProps: renderExtraProps, renderModalProps: renderModalProps, locale: locale, translate: __, classnames: cx, classPrefix: classPrefix, disabled: disabled, onTypeChange: _this.handleTypeChange, enableAdvancedSetting: enableAdvancedSetting, popOverContainer: popOverContainer, placeholder: placeholder, mobileUI: mobileUI, mini: mini, formRef: ref, formMode: true, formPrefixRender: formPrefixRender, formAffixRender: formAffixRender })) : null;
                 }, beforeConfirm: this.handleBeforeSubmit, onConfirm: this.handlePropsChange, title: __('SubForm.editDetail'), popOverContainer: popOverContainer }, function (_a) {
                 var onClick = _a.onClick;
-                return (_J$X_(Button["default"], { disabled: disabled || !!(value === null || value === void 0 ? void 0 : value.$ref), className: cx('SchemaEditor-btn'), onClick: onClick },
-                    _J$X_(icons.Icon, { icon: "setting", className: "icon" })));
+                return (_J$X_(Button["default"], { disabled: disabled || !!(value === null || value === void 0 ? void 0 : value.$ref), className: cx('SchemaEditor-btn'), onClick: onClick, level: mini ? 'link' : 'default' },
+                    _J$X_(icons.Icon, { icon: mini ? 'edit' : 'setting', className: "icon" })));
             })) : null,
             affix));
     };
+    SchemaEditorItemCommon.prototype.handleFormChange = function (values) {
+        var _a = this.props, originValue = _a.value, onChange = _a.onChange;
+        if ((values === null || values === void 0 ? void 0 : values.type) !== (originValue === null || originValue === void 0 ? void 0 : originValue.type)) {
+            onChange(values);
+        }
+    };
+    SchemaEditorItemCommon.prototype.renderForm = function (props) {
+        var _a = tslib.__assign(tslib.__assign({}, this.props), props), value = _a.value, onChange = _a.onChange, formRef = _a.formRef, __ = _a.translate, disabled = _a.disabled, placeholder = _a.placeholder, mobileUI = _a.mobileUI, renderModalProps = _a.renderModalProps, mini = _a.mini, types = _a.types, cx = _a.classnames, popOverContainer = _a.popOverContainer, formPrefixRender = _a.formPrefixRender, formAffixRender = _a.formAffixRender;
+        return (_J$X_(Form["default"], { defaultValue: value, onChange: this.handleFormChange, onSubmit: onChange, ref: formRef }, function (methods) {
+            var _a, _b;
+            return (_J$X_(React__default["default"].Fragment, null, (_a = formPrefixRender === null || formPrefixRender === void 0 ? void 0 : formPrefixRender(methods)) !== null && _a !== void 0 ? _a : null,
+                mini ? (_J$X_(FormField.Controller, { label: __('JSONSchema.type'), name: "type", control: methods.control, rules: { maxLength: 20 }, isRequired: true, render: function (_a) {
+                        var field = _a.field;
+                        return (_J$X_(Select["default"], tslib.__assign({}, field, { block: true, options: types, className: cx('SchemaEditor-type'), clearable: false, disabled: disabled, simpleValue: true, mobileUI: mobileUI, popOverContainer: popOverContainer })));
+                    } })) : null,
+                _J$X_(FormField.Controller, { label: __('JSONSchema.title'), name: "title", control: methods.control, rules: { maxLength: 20 }, render: function (_a) {
+                        var _b;
+                        var field = _a.field;
+                        return (_J$X_(InputBox["default"], tslib.__assign({}, field, { disabled: disabled, placeholder: __((_b = placeholder === null || placeholder === void 0 ? void 0 : placeholder.title) !== null && _b !== void 0 ? _b : ''), mobileUI: mobileUI })));
+                    } }),
+                _J$X_(FormField.Controller, { label: __('JSONSchema.description'), name: "description", control: methods.control, render: function (_a) {
+                        var _b;
+                        var field = _a.field;
+                        return (_J$X_(Textarea["default"], tslib.__assign({}, field, { disabled: disabled, mobileUI: mobileUI, placeholder: __((_b = placeholder === null || placeholder === void 0 ? void 0 : placeholder.description) !== null && _b !== void 0 ? _b : '') })));
+                    } }),
+                _J$X_(FormField.Controller, { label: __('JSONSchema.default'), name: "default", control: methods.control, render: function (_a) {
+                        var _b;
+                        var field = _a.field;
+                        return (_J$X_(InputBox["default"], tslib.__assign({}, field, { disabled: disabled, placeholder: __((_b = placeholder === null || placeholder === void 0 ? void 0 : placeholder.default) !== null && _b !== void 0 ? _b : ''), mobileUI: mobileUI })));
+                    } }), (_b = formAffixRender === null || formAffixRender === void 0 ? void 0 : formAffixRender(methods)) !== null && _b !== void 0 ? _b : null, renderModalProps === null || renderModalProps === void 0 ? void 0 :
+                renderModalProps(methods.getValues(), function (values) {
+                    Object.keys(values).forEach(function (key) {
+                        return methods.setValue(key, values[key]);
+                    });
+                })));
+        }));
+    };
     SchemaEditorItemCommon.prototype.render = function () {
-        var cx = this.props.classnames;
-        return _J$X_("div", { className: cx('SchemaEditorItem') }, this.renderCommon());
+        var _a = this.props, cx = _a.classnames, formMode = _a.formMode, mini = _a.mini;
+        if (formMode) {
+            return this.renderForm();
+        }
+        return (_J$X_("div", { className: cx('SchemaEditorItem', {
+                'SchemaEditorItem--mini': mini
+            }) }, this.renderCommon()));
     };
     tslib.__decorate([
         amisCore.autobind,
@@ -110,7 +151,7 @@ var SchemaEditorItemCommon = /** @class */ (function (_super) {
         amisCore.autobind,
         tslib.__metadata("design:type", Function),
         tslib.__metadata("design:paramtypes", [Object]),
-        tslib.__metadata("design:returntype", void 0)
+        tslib.__metadata("design:returntype", Promise)
     ], SchemaEditorItemCommon.prototype, "handlePropsChange", null);
     tslib.__decorate([
         amisCore.autobind,
@@ -118,6 +159,12 @@ var SchemaEditorItemCommon = /** @class */ (function (_super) {
         tslib.__metadata("design:paramtypes", [Object]),
         tslib.__metadata("design:returntype", void 0)
     ], SchemaEditorItemCommon.prototype, "handleBeforeSubmit", null);
+    tslib.__decorate([
+        amisCore.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", [Object]),
+        tslib.__metadata("design:returntype", void 0)
+    ], SchemaEditorItemCommon.prototype, "handleFormChange", null);
     return SchemaEditorItemCommon;
 }(React__default["default"].Component));
 

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

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.2.2
+ * amis-ui v6.4.0
  * Copyright 2018-2024 fex
  */
 
@@ -37,7 +37,7 @@ var SchemaEditorItem = /** @class */ (function (_super) {
                 Renderer = Array.SchemaEditorItemArray;
                 break;
         }
-        return _J$X_(Renderer, tslib.__assign({}, this.props));
+        return (_J$X_(Renderer, tslib.__assign({}, this.props, { key: (value === null || value === void 0 ? void 0 : value.type) || 'string' })));
     };
     return SchemaEditorItem;
 }(React__default["default"].Component));

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

@@ -2,6 +2,7 @@ import React from 'react';
 import { JSONSchema } from 'amis-core';
 import { SchemaEditorItemCommon } from './Common';
 import type { SchemaEditorItemCommonProps } from './Common';
+import { UseFormReturn } from 'react-hook-form';
 export interface SchemaEditorItemObjectState {
     members: Array<{
         id: string;
@@ -34,12 +35,17 @@ export declare class SchemaEditorItemObject extends SchemaEditorItemCommon<Schem
     }[];
     pipeOut(): void;
     handleAdd(): void;
+    handleAddProppertyConfirm({ key, isRequired: required, ...value }: any): void;
+    handleEditProppertyConfirm(index: number, value: any): void;
     handlePropKeyChange(index: number, key: string): void;
     handlePropTitleChange(index: number, title: string): void;
     handlePropRemove(index: number): void;
-    handlePropChange(index: number, item: any): void;
+    handlePropChange(index: number, { key, isRequired: required, ...item }: any): void;
     handlePropRequiredChange(index: number, required: boolean): void;
     toggleCollapsed(): void;
+    renderFormPrefix(methods: UseFormReturn & {
+        onSubmit: (value: any) => void;
+    }): React.JSX.Element;
     rendererProps(): React.JSX.Element;
     render(): React.JSX.Element;
 }

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

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.2.2
+ * amis-ui v6.4.0
  * Copyright 2018-2024 fex
  */
 
@@ -15,6 +15,9 @@ var icons = require('../icons.js');
 var InputBox = require('../InputBox.js');
 var Common = require('./Common.js');
 var Item = require('./Item.js');
+var PickerContainer = require('../PickerContainer.js');
+var FormField = require('../FormField.js');
+var Checkbox = require('../Checkbox.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -95,6 +98,29 @@ var SchemaEditorItemObject = /** @class */ (function (_super) {
             members: members
         }, this.pipeOut);
     };
+    SchemaEditorItemObject.prototype.handleAddProppertyConfirm = function (_a) {
+        var key = _a.key, required = _a.isRequired, value = tslib.__rest(_a, ["key", "isRequired"]);
+        var members = this.state.members.concat();
+        if (members.some(function (member) { return member.key === key; })) {
+            throw new Error(this.props.translate('JSONSchema.key_duplicated'));
+        }
+        members.push({
+            id: amisCore.guid(),
+            key: key || '',
+            hasError: false,
+            required: required,
+            schema: value
+        });
+        this.setState({
+            members: members
+        }, this.pipeOut);
+    };
+    SchemaEditorItemObject.prototype.handleEditProppertyConfirm = function (index, value) {
+        var exists = this.state.members.some(function (m, i) { return i !== index && m.key === value.key; });
+        if (exists) {
+            throw new Error(this.props.translate('JSONSchema.key_duplicated'));
+        }
+    };
     SchemaEditorItemObject.prototype.handlePropKeyChange = function (index, key) {
         var members = this.state.members.concat();
         members[index] = tslib.__assign(tslib.__assign({}, members[index]), { key: key, hasError: !key || members.some(function (m, i) { return i !== index && m.key === key; }) });
@@ -110,9 +136,16 @@ var SchemaEditorItemObject = /** @class */ (function (_super) {
         members.splice(index, 1);
         this.setState({ members: members }, this.pipeOut);
     };
-    SchemaEditorItemObject.prototype.handlePropChange = function (index, item) {
+    SchemaEditorItemObject.prototype.handlePropChange = function (index, _a) {
+        var key = _a.key, required = _a.isRequired, item = tslib.__rest(_a, ["key", "isRequired"]);
+        var mini = this.props.mini;
         var members = this.state.members.concat();
-        members[index] = tslib.__assign(tslib.__assign({}, members[index]), { schema: tslib.__assign({}, item) });
+        members[index] = tslib.__assign(tslib.__assign(tslib.__assign({}, members[index]), (mini
+            ? {
+                key: key,
+                required: required
+            }
+            : undefined)), { schema: tslib.__assign({}, item) });
         this.setState({ members: members }, this.pipeOut);
     };
     SchemaEditorItemObject.prototype.handlePropRequiredChange = function (index, required) {
@@ -125,35 +158,76 @@ var SchemaEditorItemObject = /** @class */ (function (_super) {
             collapsed: !this.state.collapsed
         });
     };
+    SchemaEditorItemObject.prototype.renderFormPrefix = function (methods) {
+        var _a = this.props, placeholder = _a.placeholder, mobileUI = _a.mobileUI, cx = _a.classnames, __ = _a.translate;
+        return (_J$X_(React__default["default"].Fragment, null,
+            _J$X_(FormField.Controller, { label: __('JSONSchema.key'), name: "key", control: methods.control, rules: { maxLength: 20, isVariableName: true }, isRequired: true, render: function (_a) {
+                    var _b;
+                    var field = _a.field;
+                    return (_J$X_(InputBox["default"], tslib.__assign({}, field, { placeholder: __((_b = placeholder === null || placeholder === void 0 ? void 0 : placeholder.key) !== null && _b !== void 0 ? _b : ''), mobileUI: mobileUI })));
+                } }),
+            _J$X_(FormField.Controller, { label: __('JSONSchema.required'), name: "isRequired", control: methods.control, render: function (_a) {
+                    var field = _a.field;
+                    return (_J$X_(Checkbox["default"], tslib.__assign({}, field, { value: !!field.value, className: cx('SchemaEditor-required'), label: __('Required') })));
+                } })));
+    };
     SchemaEditorItemObject.prototype.rendererProps = function () {
         var _this = this;
         var _a;
-        var _b = this.props, value = _b.value, __ = _b.translate, cx = _b.classnames, renderExtraProps = _b.renderExtraProps, renderModalProps = _b.renderModalProps, locale = _b.locale, classPrefix = _b.classPrefix, disabled = _b.disabled, showInfo = _b.showInfo, types = _b.types, onTypeChange = _b.onTypeChange, enableAdvancedSetting = _b.enableAdvancedSetting, popOverContainer = _b.popOverContainer, placeholder = _b.placeholder, mobileUI = _b.mobileUI;
+        var _b = this.props, value = _b.value, __ = _b.translate, cx = _b.classnames, renderExtraProps = _b.renderExtraProps, renderModalProps = _b.renderModalProps, locale = _b.locale, classPrefix = _b.classPrefix, disabled = _b.disabled, showInfo = _b.showInfo, types = _b.types, onTypeChange = _b.onTypeChange, enableAdvancedSetting = _b.enableAdvancedSetting, popOverContainer = _b.popOverContainer, placeholder = _b.placeholder, mobileUI = _b.mobileUI, mini = _b.mini, addButtonText = _b.addButtonText;
         var members = this.state.members;
         return (_J$X_("div", { className: cx('SchemaEditorProps', {
                 'SchemaEditorProps--depth': showInfo !== false
             }) },
             members.length ? (members.map(function (member, index) {
                 var _a, _b;
-                return (_J$X_(Item.SchemaEditorItem, { mobileUI: mobileUI, key: member.id, types: types, onTypeChange: onTypeChange, enableAdvancedSetting: enableAdvancedSetting, popOverContainer: popOverContainer, prefix: _J$X_(React__default["default"].Fragment, null,
+                return (_J$X_(Item.SchemaEditorItem, { mobileUI: mobileUI, mini: mini, key: member.id, types: types, onTypeChange: onTypeChange, enableAdvancedSetting: enableAdvancedSetting, popOverContainer: popOverContainer, prefix: mini ? undefined : (_J$X_(React__default["default"].Fragment, null,
                         _J$X_(InputBox["default"], { className: cx('SchemaEditor-key'), hasError: member.hasError, value: member.key || '', onChange: _this.handlePropKeyChange.bind(_this, index), placeholder: __((_a = placeholder === null || placeholder === void 0 ? void 0 : placeholder.key) !== null && _a !== void 0 ? _a : ''), disabled: disabled || !!(value === null || value === void 0 ? void 0 : value.$ref), mobileUI: mobileUI }),
-                        _J$X_(InputBox["default"], { className: cx('SchemaEditor-title'), value: member.schema.title || '', onChange: _this.handlePropTitleChange.bind(_this, index), placeholder: __((_b = placeholder === null || placeholder === void 0 ? void 0 : placeholder.title) !== null && _b !== void 0 ? _b : ''), disabled: disabled || !!(value === null || value === void 0 ? void 0 : value.$ref), mobileUI: mobileUI })), affix: _J$X_(Button["default"], { className: cx('SchemaEditor-btn'), onClick: _this.handlePropRemove.bind(_this, index), iconOnly: true, disabled: disabled || !!(value === null || value === void 0 ? void 0 : value.$ref) },
-                        _J$X_(icons.Icon, { icon: "remove", className: "icon" })), value: member.schema, onChange: _this.handlePropChange.bind(_this, index), renderExtraProps: renderExtraProps, renderModalProps: renderModalProps, locale: locale, translate: __, classnames: cx, classPrefix: classPrefix, disabled: disabled || !!(value === null || value === void 0 ? void 0 : value.$ref), required: member.required, onRequiredChange: _this.handlePropRequiredChange.bind(_this, index), placeholder: placeholder }));
+                        _J$X_(InputBox["default"], { className: cx('SchemaEditor-title'), value: member.schema.title || '', onChange: _this.handlePropTitleChange.bind(_this, index), placeholder: __((_b = placeholder === null || placeholder === void 0 ? void 0 : placeholder.title) !== null && _b !== void 0 ? _b : ''), disabled: disabled || !!(value === null || value === void 0 ? void 0 : value.$ref), mobileUI: mobileUI }))), affix: _J$X_(Button["default"], { className: cx('SchemaEditor-btn'), onClick: _this.handlePropRemove.bind(_this, index), iconOnly: !mini, level: mini ? 'link' : 'default', disabled: disabled || !!(value === null || value === void 0 ? void 0 : value.$ref) },
+                        _J$X_(icons.Icon, { icon: "remove", className: "icon" })), value: mini
+                        ? tslib.__assign(tslib.__assign({}, member.schema), { key: member.key, isRequired: member.required })
+                        : member.schema, onChange: _this.handlePropChange.bind(_this, index), onFormConfirm: _this.handleEditProppertyConfirm.bind(_this, index), renderExtraProps: renderExtraProps, renderModalProps: renderModalProps, locale: locale, translate: __, classnames: cx, classPrefix: classPrefix, disabled: disabled || !!(value === null || value === void 0 ? void 0 : value.$ref), required: member.required, onRequiredChange: _this.handlePropRequiredChange.bind(_this, index), placeholder: placeholder, formPrefixRender: _this.renderFormPrefix }));
             })) : (_J$X_("div", { className: cx('SchemaEditorProps-placeholder') }, __((_a = placeholder === null || placeholder === void 0 ? void 0 : placeholder.empty) !== null && _a !== void 0 ? _a : ''))),
-            _J$X_(Button["default"], { level: "link", onClick: this.handleAdd, size: "xs", disabled: disabled || !!(value === null || value === void 0 ? void 0 : value.$ref) }, __('JSONSchema.add_prop'))));
+            mini ? (_J$X_(PickerContainer["default"], { mobileUI: mobileUI, value: {
+                    type: 'string'
+                }, bodyRender: function (_a) {
+                    var isOpened = _a.isOpened, value = _a.value, onChange = _a.onChange, ref = _a.ref;
+                    return isOpened ? (_J$X_(Item.SchemaEditorItem, { types: types, value: value, onChange: onChange, renderExtraProps: renderExtraProps, renderModalProps: renderModalProps, locale: locale, translate: __, classnames: cx, classPrefix: classPrefix, disabled: disabled, onTypeChange: _this.handleTypeChange, enableAdvancedSetting: enableAdvancedSetting, popOverContainer: popOverContainer, placeholder: placeholder, mobileUI: mobileUI, mini: mini, formRef: ref, formMode: true, formPrefixRender: _this.renderFormPrefix })) : null;
+                }, beforeConfirm: this.handleBeforeSubmit, onConfirm: this.handleAddProppertyConfirm, title: __('JSONSchema.add_prop'), popOverContainer: popOverContainer }, function (_a) {
+                var onClick = _a.onClick;
+                return (_J$X_(Button["default"], { level: "enhance", block: true, onClick: onClick, size: "sm", disabled: disabled || !!(value === null || value === void 0 ? void 0 : value.$ref) }, addButtonText !== null && addButtonText !== void 0 ? addButtonText : __('JSONSchema.add_prop')));
+            })) : (_J$X_(Button["default"], { level: "link", onClick: this.handleAdd, size: "xs", disabled: disabled || !!(value === null || value === void 0 ? void 0 : value.$ref) }, addButtonText !== null && addButtonText !== void 0 ? addButtonText : __('JSONSchema.add_prop')))));
     };
     SchemaEditorItemObject.prototype.render = function () {
-        var _a = this.props, cx = _a.classnames, showInfo = _a.showInfo; _a.translate; _a.disabled;
+        var _a = this.props, cx = _a.classnames, showInfo = _a.showInfo, __ = _a.translate, formMode = _a.formMode; _a.disabled; var locale = _a.locale, classPrefix = _a.classPrefix, mini = _a.mini, types = _a.types, placeholder = _a.placeholder, mobileUI = _a.mobileUI, expandMembers = _a.expandMembers;
+        if (formMode) {
+            return this.renderForm({
+                formAffixRender: function (methods) {
+                    return (_J$X_(React__default["default"].Fragment, null,
+                        _J$X_(FormField.Controller, { label: __('JSONSchema.members'), name: "properties", control: methods.control, render: function (_a) {
+                                var field = _a.field;
+                                return (_J$X_(Item.SchemaEditorItem, tslib.__assign({}, field, { types: types, value: {
+                                        type: 'object',
+                                        required: [],
+                                        properties: field.value
+                                    }, onChange: function (value) { return field.onChange(value.properties); }, placeholder: placeholder, mobileUI: mobileUI, locale: locale, translate: __, classnames: cx, classPrefix: classPrefix, mini: false })));
+                            } })));
+                }
+            });
+        }
         return (_J$X_("div", { className: cx('SchemaEditorItem SchemaEditorObject', {
-                'is-collapsed': this.state.collapsed
+                'is-collapsed': this.state.collapsed,
+                'SchemaEditorItem--mini': mini
             }) },
             showInfo !== false ? (_J$X_(React__default["default"].Fragment, null,
-                _J$X_("a", { className: cx('SchemaEditor-caret', {
+                mini ? null : (_J$X_("a", { className: cx('SchemaEditor-caret', {
                         'is-collapsed': this.state.collapsed
                     }), onClick: this.toggleCollapsed },
-                    _J$X_(icons.Icon, { icon: "caret", className: "icon" })),
+                    _J$X_(icons.Icon, { icon: "caret", className: "icon" }))),
                 this.renderCommon())) : null,
-            this.state.collapsed ? null : this.rendererProps()));
+            this.state.collapsed || (mini && expandMembers !== true)
+                ? null
+                : this.rendererProps()));
     };
     tslib.__decorate([
         amisCore.autobind,
@@ -167,6 +241,18 @@ var SchemaEditorItemObject = /** @class */ (function (_super) {
         tslib.__metadata("design:paramtypes", []),
         tslib.__metadata("design:returntype", void 0)
     ], SchemaEditorItemObject.prototype, "handleAdd", null);
+    tslib.__decorate([
+        amisCore.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", [Object]),
+        tslib.__metadata("design:returntype", void 0)
+    ], SchemaEditorItemObject.prototype, "handleAddProppertyConfirm", null);
+    tslib.__decorate([
+        amisCore.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", [Number, Object]),
+        tslib.__metadata("design:returntype", void 0)
+    ], SchemaEditorItemObject.prototype, "handleEditProppertyConfirm", null);
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),
@@ -203,6 +289,12 @@ var SchemaEditorItemObject = /** @class */ (function (_super) {
         tslib.__metadata("design:paramtypes", []),
         tslib.__metadata("design:returntype", void 0)
     ], SchemaEditorItemObject.prototype, "toggleCollapsed", null);
+    tslib.__decorate([
+        amisCore.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", [Object]),
+        tslib.__metadata("design:returntype", void 0)
+    ], SchemaEditorItemObject.prototype, "renderFormPrefix", null);
     return SchemaEditorItemObject;
 }(Common.SchemaEditorItemCommon));
 

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

@@ -1,7 +1,7 @@
 /// <reference types="hoist-non-react-statics" />
 import React from 'react';
 import { DataSchema, JSONSchema, LocaleProps, ThemeProps } from 'amis-core';
-import { VariableItem } from '../formula/Editor';
+import { VariableItem } from '../formula/CodeEditor';
 export interface SchemaVariableListProps extends LocaleProps, ThemeProps {
     schemas?: Array<JSONSchema> | JSONSchema;
     value?: string;

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

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

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

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