amis-ui 6.2.2 → 6.4.0

package/esm/components/formula/plugin.js

@@ -1,34 +1,90 @@
 /**
- * amis-ui v6.2.2
+ * amis-ui v6.4.0
  * Copyright 2018-2024 fex
  */
 
 import { __assign, __read } from 'tslib';
-import { eachTree } from 'amis-core';
-import { FormulaEditor } from './Editor.js';
+import { findTree } from 'amis-core';
+import { parse } from 'amis-formula';
+import debounce from 'lodash/debounce';
 
 /**
  * @file 扩展 codemirror
  */
 function editorFactory(dom, cm, props, options) {
     registerLaunguageMode(cm);
-    return cm(dom, __assign({ value: props.value || '', autofocus: true, mode: props.evalMode ? 'text/formula' : 'text/formula-template' }, options));
+    return cm(dom, __assign({ value: props.value || '', autofocus: false, mode: props.evalMode ? 'text/formula' : 'text/formula-template', readOnly: props.readOnly ? 'nocursor' : false }, options));
+}
+function traverseAst(ast, iterator) {
+    if (!ast || !ast.type) {
+        return;
+    }
+    var ret = iterator(ast);
+    if (ret === false) {
+        return;
+    }
+    Object.keys(ast).forEach(function (key) {
+        var value = ast[key];
+        if (Array.isArray(value)) {
+            value.forEach(function (child) { return traverseAst(child, iterator); });
+        }
+        else {
+            traverseAst(value, iterator);
+        }
+    });
 }
 var FormulaPlugin = /** @class */ (function () {
-    function FormulaPlugin(editor, cm, getProps) {
+    function FormulaPlugin(editor, cm) {
+        var _this = this;
         this.editor = editor;
         this.cm = cm;
-        this.getProps = getProps;
-        // editor.on('change', this.autoMarkText);
-        this.autoMarkText();
+        /**
+         * 用于提示的变量集合，默认为空
+         */
+        this.variables = [];
+        /**
+         * 函数集合，默认不需要传，即  amis-formula 里面那个函数
+         * 如果有扩充，则需要传。
+         */
+        this.functions = [];
+        /**
+         * evalMode 即直接就是表达式，否则就是混合模式
+         */
+        this.evalMode = true;
+        this.highlightMode = 'formula';
+        this.disableAutoMark = false;
+        this.widgets = [];
+        this.marks = [];
+        // this.autoMarkText();
+        this.autoMarkText = debounce(this.autoMarkText.bind(this), 250, {
+            leading: false,
+            trailing: true
+        });
+        editor.on('blur', function () { return _this.autoMarkText(); });
     }
-    FormulaPlugin.prototype.autoMarkText = function () {
-        var _a = this.getProps(); _a.functions; var variables = _a.variables, value = _a.value;
-        if (value) {
-            // todo functions 也需要自动替换
-            this.autoMark(variables);
-            this.focus(value);
+    FormulaPlugin.prototype.setVariables = function (variables) {
+        this.variables = Array.isArray(variables) ? variables : [];
+    };
+    FormulaPlugin.prototype.setFunctions = function (functions) {
+        this.functions = Array.isArray(functions) ? functions : [];
+    };
+    FormulaPlugin.prototype.setEvalMode = function (evalMode) {
+        this.evalMode = evalMode;
+    };
+    FormulaPlugin.prototype.setHighlightMode = function (highlightMode) {
+        this.highlightMode = highlightMode;
+    };
+    FormulaPlugin.prototype.setDisableAutoMark = function (disableAutoMark) {
+        this.disableAutoMark = disableAutoMark;
+        this.autoMarkText(true);
+    };
+    FormulaPlugin.prototype.autoMarkText = function (forceClear) {
+        var _a;
+        if (forceClear === void 0) { forceClear = false; }
+        if (forceClear || !this.editor.hasFocus()) {
+            (_a = this.editor) === null || _a === void 0 ? void 0 : _a.getAllMarks().forEach(function (mark) { return mark.clear(); });
         }
+        this.disableAutoMark || this.autoMark();
     };
     // 计算 `${`、`}` 括号的位置，如 ${a}+${b}, 结果是 [ { from: 0, to: 3 }, { from: 5, to: 8 } ]
     FormulaPlugin.prototype.computedBracesPosition = function (exp) {
@@ -86,34 +142,17 @@ var FormulaPlugin = /** @class */ (function () {
             this.editor.replaceSelection('}');
         }
     };
-    FormulaPlugin.prototype.insertContent = function (value, type, className, toMark) {
-        var _this = this;
-        if (className === void 0) { className = 'cm-field'; }
-        if (toMark === void 0) { toMark = true; }
+    FormulaPlugin.prototype.insertContent = function (value, type) {
         var from = this.editor.getCursor();
-        var evalMode = this.getProps().evalMode;
+        var evalMode = this.evalMode;
         if (type === 'variable') {
             this.editor.replaceSelection(value.key);
-            var to_1 = this.editor.getCursor();
-            if (toMark) {
-                // 路径中每个变量分别进行标记
-                var markFrom_1 = from.ch;
-                value.path.split('.').forEach(function (label, index) {
-                    var val = value.key.split('.')[index];
-                    _this.markText({ line: from.line, ch: markFrom_1 }, { line: to_1.line, ch: markFrom_1 + val.length }, label, className);
-                    markFrom_1 += 1 + val.length;
-                });
-            }
-            !evalMode && this.insertBraces(from, to_1);
+            var to = this.editor.getCursor();
+            !evalMode && this.insertBraces(from, to);
         }
         else if (type === 'func') {
             this.editor.replaceSelection("".concat(value, "()"));
             var to = this.editor.getCursor();
-            toMark &&
-                this.markText(from, {
-                    line: to.line,
-                    ch: to.ch - 2
-                }, value, 'cm-func');
             this.editor.setCursor({
                 line: to.line,
                 ch: to.ch - 1
@@ -129,7 +168,6 @@ var FormulaPlugin = /** @class */ (function () {
         else if (typeof value === 'string') {
             this.editor.replaceSelection(value);
             // 非变量、非函数，可能是组合模式，也需要标记
-            toMark && setTimeout(function () { return _this.autoMarkText(); }, 0);
         }
         this.editor.focus();
     };
@@ -139,75 +177,161 @@ var FormulaPlugin = /** @class */ (function () {
     FormulaPlugin.prototype.getValue = function () {
         return this.editor.getValue();
     };
-    FormulaPlugin.prototype.markText = function (from, to, label, className) {
+    FormulaPlugin.prototype.markText = function (from, to, label, className, rawString) {
         if (className === void 0) { className = 'cm-func'; }
         var text = document.createElement('span');
         text.className = className;
         text.innerText = label;
-        this.editor.markText(from, to, {
+        if (rawString) {
+            text.setAttribute('data-tooltip', rawString);
+            text.setAttribute('data-position', 'bottom');
+        }
+        return this.editor.markText(from, to, {
             atomic: true,
             replacedWith: text
         });
     };
-    FormulaPlugin.prototype.autoMark = function (variables) {
+    FormulaPlugin.prototype.autoMark = function () {
         var _this = this;
-        if (!Array.isArray(variables) || !variables.length) {
-            return;
-        }
-        var varMap = {};
-        eachTree(variables, function (item) {
-            var _a;
-            if (item.value) {
-                varMap[item.value] = (_a = item.path) !== null && _a !== void 0 ? _a : item.label;
-            }
-        });
-        var vars = Object.keys(varMap).sort(function (a, b) { return b.length - a.length; });
         var editor = this.editor;
-        var lines = editor.lineCount();
-        var _a = this.getProps().evalMode, evalMode = _a === void 0 ? true : _a;
-        var _loop_1 = function (line) {
-            var content = editor.getLine(line);
-            // 标记方法调用
-            content.replace(/([A-Z]+)\s*\(/g, function (_, func, pos) {
-                _this.markText({
-                    line: line,
-                    ch: pos
-                }, {
-                    line: line,
-                    ch: pos + func.length
-                }, func, 'cm-func');
-                return _;
+        var value = editor.getValue();
+        var functions = this.functions;
+        var variables = this.variables;
+        var highlightMode = this.highlightMode;
+        // 把旧的清掉
+        this.widgets.forEach(function (widget) { return editor.removeLineWidget(widget); });
+        this.widgets = [];
+        this.marks.forEach(function (mark) { return mark.clear(); });
+        this.marks = [];
+        try {
+            var ast = parse(value, {
+                evalMode: this.evalMode,
+                variableMode: false
             });
-            var REPLACE_KEY = 'AMIS_FORMULA_REPLACE_KEY';
-            // 标记变量
-            vars.forEach(function (v) {
-                var from = 0;
-                var idx = -1;
-                var _loop_2 = function () {
-                    var encode = FormulaEditor.replaceStrByIndex(content, idx, v, REPLACE_KEY);
-                    var reg = FormulaEditor.getRegExpByMode(evalMode, REPLACE_KEY);
-                    if (reg.test(encode)) {
-                        var markFrom_2 = idx;
-                        v.split('.').forEach(function (val, index) {
+            traverseAst(ast, function (ast) {
+                var _a, _b;
+                if (highlightMode === 'expression') {
+                    if (ast.type === 'script') {
+                        _this.markText({
+                            line: ast.start.line - 1,
+                            ch: ast.start.column - 1
+                        }, {
+                            line: ast.end.line - 1,
+                            ch: ast.end.column - 1
+                        }, value.substring(ast.start.index + 2, ast.end.index - 1), 'cm-expression', value);
+                    }
+                    return;
+                }
+                if (ast.type === 'func_call') {
+                    var funName_1 = ast.identifier;
+                    var exists = functions.some(function (item) {
+                        return item.items.some(function (i) { return i.name === funName_1; });
+                    });
+                    if (exists) {
+                        _this.markText({
+                            line: ast.start.line - 1,
+                            ch: ast.start.column - 1
+                        }, {
+                            line: ast.start.line - 1,
+                            ch: ast.start.column + funName_1.length - 1
+                        }, funName_1, 'cm-func');
+                    }
+                }
+                else if (ast.type === 'getter') {
+                    // 获取对象中的变量
+                    var list = [ast];
+                    var current = ast;
+                    while ((current === null || current === void 0 ? void 0 : current.type) === 'getter') {
+                        current = current.host;
+                        list.unshift(current);
+                    }
+                    var host_1 = list.shift();
+                    if ((host_1 === null || host_1 === void 0 ? void 0 : host_1.type) === 'variable') {
+                        var variable = findTree(variables, function (item) { return item.value === host_1.name; });
+                        if (variable) {
+                            // 先标记顶层对象
                             _this.markText({
-                                line: line,
-                                ch: markFrom_2
+                                line: host_1.start.line - 1,
+                                ch: host_1.start.column - 1
                             }, {
-                                line: line,
-                                ch: markFrom_2 + val.length
-                            }, varMap[v].split('.')[index], 'cm-field');
-                            markFrom_2 += 1 + val.length;
-                        });
+                                line: host_1.end.line - 1,
+                                ch: host_1.end.column - 1
+                            }, variable.label, 'cm-field', host_1.name);
+                            // 再标记子对象
+                            var path_1 = host_1.name + '.';
+                            var vars = variable.children || [];
+                            var _loop_1 = function (i, len) {
+                                var item = (_a = list[i]) === null || _a === void 0 ? void 0 : _a.key;
+                                // 只能识别这种固定下标的情况
+                                if ((item === null || item === void 0 ? void 0 : item.type) === 'identifier') {
+                                    var variable_1 = (_b = findTree(vars, function (v) { return v.value === path_1 + item.name; })) !== null && _b !== void 0 ? _b : findTree(vars, function (v) { return v.value === item.name; } // 兼容不带路径的情况
+                                    );
+                                    if (variable_1) {
+                                        _this.markText({
+                                            line: item.start.line - 1,
+                                            ch: item.start.column - 1
+                                        }, {
+                                            line: item.end.line - 1,
+                                            ch: item.end.column - 1
+                                        }, variable_1.label, 'cm-field', item.name);
+                                        path_1 += item.name + '.';
+                                        vars = variable_1.children || [];
+                                    }
+                                    else {
+                                        return "break";
+                                    }
+                                }
+                            };
+                            for (var i = 0, len = list.length; i < len; i++) {
+                                var state_1 = _loop_1(i, len);
+                                if (state_1 === "break")
+                                    break;
+                            }
+                        }
+                    }
+                    return false;
+                }
+                else if (ast.type === 'variable') {
+                    // 直接就是变量
+                    var variable = findTree(variables, function (item) { return item.value === ast.name; });
+                    if (variable) {
+                        _this.markText({
+                            line: ast.start.line - 1,
+                            ch: ast.start.column - 1
+                        }, {
+                            line: ast.end.line - 1,
+                            ch: ast.end.column - 1
+                        }, variable.label, 'cm-field', ast.name);
                     }
-                    from = idx + v.length;
-                };
-                while (~(idx = content.indexOf(v, from))) {
-                    _loop_2();
+                    return false;
                 }
             });
-        };
-        for (var line = 0; line < lines; line++) {
-            _loop_1(line);
+        }
+        catch (e) {
+            var reg = /^Unexpected\stoken\s(.+)\sin\s(\d+):(\d+)$/.exec(e.message);
+            if (reg) {
+                var token = reg[1];
+                var line = parseInt(reg[2], 10);
+                var column = parseInt(reg[3], 10);
+                var msg = document.createElement('div');
+                var icon = msg.appendChild(document.createElement('span'));
+                icon.innerText = '!!';
+                icon.className = 'lint-error-icon';
+                msg.appendChild(document.createTextNode("Unexpected token `".concat(token, "`")));
+                msg.className = 'lint-error';
+                this.widgets.push(editor.addLineWidget(line - 1, msg, {
+                    coverGutter: false,
+                    noHScroll: true
+                }));
+                this.marks.push(this.markText({
+                    line: line - 1,
+                    ch: column - 1
+                }, {
+                    line: line - 1,
+                    ch: column + token.length - 1
+                }, token, 'cm-error-token'));
+            }
+            console.warn('synax error, ignore it');
         }
     };
     // 焦点放在最后
@@ -217,7 +341,9 @@ var FormulaPlugin = /** @class */ (function () {
             ch: (value === null || value === void 0 ? void 0 : value.length) || 0
         });
     };
-    FormulaPlugin.prototype.dispose = function () { };
+    FormulaPlugin.prototype.dispose = function () {
+        this.autoMarkText.cancel();
+    };
     FormulaPlugin.prototype.validate = function () { };
     return FormulaPlugin;
 }());
@@ -227,6 +353,7 @@ function registerLaunguageMode(cm) {
         return;
     }
     modeRegisted = true;
+    // TODO 自定义语言规则
     // 对应 evalMode
     cm.defineMode('formula', function (config, parserConfig) {
         var formula = cm.getMode(config, 'javascript');

package/esm/components/icons.d.ts

@@ -28,6 +28,7 @@ import Role from '../icons/role.svg';
 import Department from '../icons/department.svg';
 import Post from '../icons/post.svg';
 import RightDoubleArrowIcon from '../icons/right-double-arrow.svg';
+import type { TestIdBuilder } from 'amis-core';
 export declare const closeIcon: React.JSX.Element;
 export declare const unDoIcon: React.JSX.Element;
 export declare const reDoIcon: React.JSX.Element;
@@ -39,7 +40,7 @@ export declare const pauseIcon: React.JSX.Element;
 export declare const leftArrowIcon: React.JSX.Element;
 export declare const rightArrowIcon: React.JSX.Element;
 export declare function getIconNames(): string[];
-export declare function getIcon(key: string): React.ElementType<{}>;
+export declare function getIcon(key: string): React.ElementType<{}, keyof React.JSX.IntrinsicElements>;
 export declare function hasIcon(iconName: string): boolean;
 export declare function registerIcon(key: string, component: React.ElementType<{}>): void;
 export interface IconCheckedSchema {
@@ -51,8 +52,9 @@ export interface IconCheckedSchemaNew {
     type: 'icon';
     icon: IconCheckedSchema;
 }
-export declare function Icon({ icon, className, classPrefix, classNameProp, iconContent, vendor, cx: iconCx, onClick, onMouseEnter, onMouseLeave, onMouseOver, onMouseOut, onMouseDown, onMouseUp, onMouseMove, onBlur, onFocus, onTouchStart, onTouchMove, onTouchEnd, onTouchCancel, style }: {
+export declare function Icon({ icon, className, classPrefix, classNameProp, iconContent, vendor, cx: iconCx, onClick, onMouseEnter, onMouseLeave, onMouseOver, onMouseOut, onMouseDown, onMouseUp, onMouseMove, onBlur, onFocus, onTouchStart, onTouchMove, onTouchEnd, onTouchCancel, style, testIdBuilder }: {
     icon: string;
     iconContent?: string;
+    testIdBuilder?: TestIdBuilder;
 } & React.ComponentProps<any>): React.JSX.Element | null;
 export { InputClearIcon, CloseIcon, UnDoIcon, ReDoIcon, EnterIcon, VolumeIcon, MuteIcon, PlayIcon, PauseIcon, ReloadIcon, LeftArrowIcon, RightArrowIcon, CheckIcon, PlusIcon, MinusIcon, PencilIcon, FunctionIcon, MenuIcon, UserRemove, Role, Department, Post, RightDoubleArrowIcon, DownArrowBoldIcon };

package/esm/components/icons.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.2.2
+ * amis-ui v6.4.0
  * Copyright 2018-2024 fex
  */
 
@@ -12,6 +12,7 @@ import SvgCloseSmall from '../icons/close-small.svg.js';
 import SvgStatusClose from '../icons/status-close.svg.js';
 import SvgUndo from '../icons/undo.svg.js';
 export { default as UnDoIcon } from '../icons/undo.svg.js';
+import SvgUndoNormal from '../icons/undo-normal.svg.js';
 import SvgRedo from '../icons/redo.svg.js';
 export { default as ReDoIcon } from '../icons/redo.svg.js';
 import SvgEnter from '../icons/enter.svg.js';
@@ -34,6 +35,7 @@ import SvgCheck from '../icons/check.svg.js';
 export { default as CheckIcon } from '../icons/check.svg.js';
 import SvgPlus from '../icons/plus.svg.js';
 export { default as PlusIcon } from '../icons/plus.svg.js';
+import SvgSubPlus from '../icons/sub-plus.svg.js';
 import SvgMinus from '../icons/minus.svg.js';
 export { default as MinusIcon } from '../icons/minus.svg.js';
 import SvgPencil from '../icons/pencil.svg.js';
@@ -65,6 +67,8 @@ import SvgRefresh from '../icons/refresh.svg.js';
 import SvgDrag from '../icons/drag.svg.js';
 import SvgEdit from '../icons/edit.svg.js';
 import SvgDeskEmpty from '../icons/desk-empty.svg.js';
+import SvgFullscreen from '../icons/fullscreen.svg.js';
+import SvgUnfullscreen from '../icons/unfullscreen.svg.js';
 import SvgCopy from '../icons/copy.svg.js';
 import SvgFilter from '../icons/filter.svg.js';
 import SvgCaret from '../icons/caret.svg.js';
@@ -157,6 +161,9 @@ registerIcon('close', SvgClose);
 registerIcon('close-small', SvgCloseSmall);
 registerIcon('status-close', SvgStatusClose);
 registerIcon('undo', SvgUndo);
+registerIcon('undo-normal', SvgUndoNormal);
+registerIcon('full-screen', SvgFullscreen);
+registerIcon('un-fullscreen', SvgUnfullscreen);
 registerIcon('redo', SvgRedo);
 registerIcon('enter', SvgEnter);
 registerIcon('volume', SvgVolume);
@@ -169,6 +176,7 @@ registerIcon('prev', SvgLeftArrow);
 registerIcon('next', SvgRightArrow);
 registerIcon('check', SvgCheck);
 registerIcon('plus', SvgPlus);
+registerIcon('sub-plus', SvgSubPlus);
 registerIcon('add', SvgPlus);
 registerIcon('minus', SvgMinus);
 registerIcon('pencil', SvgPencil);
@@ -258,7 +266,7 @@ registerIcon('scale-origin', SvgScaleOrigin);
 registerIcon('if', SvgIf);
 function Icon(_a) {
     var _b;
-    var icon = _a.icon, className = _a.className, _c = _a.classPrefix, classPrefix = _c === void 0 ? '' : _c, classNameProp = _a.classNameProp, iconContent = _a.iconContent, vendor = _a.vendor, iconCx = _a.cx, onClick = _a.onClick, onMouseEnter = _a.onMouseEnter, onMouseLeave = _a.onMouseLeave, onMouseOver = _a.onMouseOver, onMouseOut = _a.onMouseOut, onMouseDown = _a.onMouseDown, onMouseUp = _a.onMouseUp, onMouseMove = _a.onMouseMove, onBlur = _a.onBlur, onFocus = _a.onFocus, onTouchStart = _a.onTouchStart, onTouchMove = _a.onTouchMove, onTouchEnd = _a.onTouchEnd, onTouchCancel = _a.onTouchCancel, style = _a.style;
+    var icon = _a.icon, className = _a.className, _c = _a.classPrefix, classPrefix = _c === void 0 ? '' : _c, classNameProp = _a.classNameProp, iconContent = _a.iconContent, vendor = _a.vendor, iconCx = _a.cx, onClick = _a.onClick, onMouseEnter = _a.onMouseEnter, onMouseLeave = _a.onMouseLeave, onMouseOver = _a.onMouseOver, onMouseOut = _a.onMouseOut, onMouseDown = _a.onMouseDown, onMouseUp = _a.onMouseUp, onMouseMove = _a.onMouseMove, onBlur = _a.onBlur, onFocus = _a.onFocus, onTouchStart = _a.onTouchStart, onTouchMove = _a.onTouchMove, onTouchEnd = _a.onTouchEnd, onTouchCancel = _a.onTouchCancel, style = _a.style, testIdBuilder = _a.testIdBuilder;
     var cx$1 = iconCx || cx;
     if (typeof jest !== 'undefined' && icon) {
         iconContent = '';
@@ -305,14 +313,14 @@ function Icon(_a) {
                 }
             }
         };
-        return (React__default.createElement("div", __assign({}, events, { className: cx$1(iconContent, className, classNameProp), ref: refFn, style: style })));
+        return (React__default.createElement("div", __assign({}, events, { className: cx$1(iconContent, className, classNameProp), ref: refFn, style: style }, testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getTestId())));
     }
     // 获取注册的icon
     var Component = getIcon(icon);
     if (Component) {
         return (React__default.createElement(Component, __assign({}, events, { className: cx$1(className, "icon-".concat(icon), classNameProp), 
             // @ts-ignore
-            icon: icon, style: style })));
+            icon: icon, style: style }, testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getTestId())));
     }
     // 符合schema的icon
     if (isObject(icon) &&
@@ -338,7 +346,8 @@ function Icon(_a) {
     // 直接传入svg字符串
     if (typeof icon === 'string' && icon.startsWith('<svg')) {
         var svgStr = /<svg .*?>(.*?)<\/svg>/.exec(icon);
-        var svgHTML = createElement('svg', __assign(__assign({}, events), { className: cx$1('icon', className, classNameProp), style: style, dangerouslySetInnerHTML: { __html: svgStr ? svgStr[1] : '' }, viewBox: '0 0 16 16' }));
+        var viewBox = /viewBox="(.*?)"/.exec(icon);
+        var svgHTML = createElement('svg', __assign(__assign({}, events), { className: cx$1('icon', className, classNameProp), style: style, dangerouslySetInnerHTML: { __html: svgStr ? svgStr[1] : '' }, viewBox: (viewBox === null || viewBox === void 0 ? void 0 : viewBox[1]) || '0 0 16 16' }));
         return svgHTML;
     }
     // icon是链接

package/esm/components/index.d.ts

@@ -29,7 +29,7 @@ import { PopOver } from 'amis-core';
 import Radios from './Radios';
 import Range from './Range';
 import Rating from './Rating';
-import Select from './Select';
+import Select, { value2array } from './Select';
 import SparkLine from './SparkLine';
 import { default as Spinner, type SpinnerExtraProps } from './Spinner';
 import Switch from './Switch';
@@ -62,7 +62,8 @@ import SchemaVariableList from './schema-editor/SchemaVariableList';
 import VariableList from './formula/VariableList';
 import FormulaPicker from './formula/Picker';
 import { FormulaEditor } from './formula/Editor';
-import type { VariableItem } from './formula/Editor';
+import FormulaCodeEditor from './formula/CodeEditor';
+import type { VariableItem } from './formula/CodeEditor';
 import PickerContainer from './PickerContainer';
 import InputJSONSchema from './json-schema';
 import { Badge, withBadge } from './Badge';
@@ -115,4 +116,5 @@ import InputBoxWithSuggestion from './InputBoxWithSuggestion';
 import { CodeMirrorEditor } from './CodeMirror';
 import type CodeMirror from 'codemirror';
 import OverflowTpl from './OverflowTpl';
-export { NotFound, Alert as AlertComponent, alert, Avatar, confirm, prompt, setRenderSchemaFn, ContextMenu, openContextMenus, closeContextMenus, Alert2, AsideNav, Button, Breadcrumb, Checkbox, Selection as Checkboxes, Collapse, CollapseGroup, DatePicker, DateRangePicker, Drawer, Tabs, Tab, Editor, Html, Icons, Layout, LazyComponent, Modal, Overlay, PopOver, Radios, Range, Rating, Select, SparkLine, Spinner, SpinnerExtraProps, Switch, Textarea, TitleBar, ToastComponent, toast, Tooltip, TooltipWrapper, Tree, Transfer, TabsTransfer, Selection, GroupedSelection, ChainedSelection, TableSelection, TreeSelection, AssociatedSelection, ResultBox, InputBox, InputBoxWithSuggestion, SearchBox, ListGroup, NumberInput, ArrayInput, PullRefresh, Table, SchemaVariableListPicker, SchemaVariableList, VariableList, PickerContainer, ConfirmBox, FormulaPicker, VariableItem, FormulaEditor, InputJSONSchema, withBadge, BadgeObject, Icon, withRemoteConfig, RemoteOptionsProps, ConditionBuilder, ConditionBuilderFuncs, ConditionBuilderFields, ConditionBuilderConfig, CityArea, PresetColor, ListMenu, Input, JSONSchemaEditor, LocationPicker, PopUp, Cascader, TransferDropDown, TabsTransferPicker, ResultList, TransferPicker, UserSelect, UserTabSelect, getIcon, getIconNames, registerIcon, Badge, HeadCellDropDown, AnchorNav, AnchorNavSection, Card, GridNavDirection, GridNav, GridNavItem, Link, VirtualList, AutoSizer, withStore, PopOverContainer, Pagination, Progress, Steps, StepStatus, Tag, Timeline, ImageGallery, BaiduMapPicker, MultilineText, Form, FormField, Controller, Combo, InputTable, InputTableColumnProps, DndContainer, Menu, CodeMirror, CodeMirrorEditor, OverflowTpl };
+import Signature from './Signature';
+export { NotFound, Alert as AlertComponent, alert, Avatar, confirm, prompt, setRenderSchemaFn, ContextMenu, openContextMenus, closeContextMenus, Alert2, AsideNav, Button, Breadcrumb, Checkbox, Selection as Checkboxes, Collapse, CollapseGroup, DatePicker, DateRangePicker, Drawer, Tabs, Tab, Editor, Html, Icons, Layout, LazyComponent, Modal, Overlay, PopOver, Radios, Range, Rating, Select, value2array, SparkLine, Spinner, SpinnerExtraProps, Switch, Textarea, TitleBar, ToastComponent, toast, Tooltip, TooltipWrapper, Tree, Transfer, TabsTransfer, Selection, GroupedSelection, ChainedSelection, TableSelection, TreeSelection, AssociatedSelection, ResultBox, InputBox, InputBoxWithSuggestion, SearchBox, ListGroup, NumberInput, ArrayInput, PullRefresh, Table, SchemaVariableListPicker, SchemaVariableList, VariableList, PickerContainer, ConfirmBox, FormulaPicker, FormulaCodeEditor, VariableItem, FormulaEditor, InputJSONSchema, withBadge, BadgeObject, Icon, withRemoteConfig, RemoteOptionsProps, ConditionBuilder, ConditionBuilderFuncs, ConditionBuilderFields, ConditionBuilderConfig, CityArea, PresetColor, ListMenu, Input, JSONSchemaEditor, LocationPicker, PopUp, Cascader, TransferDropDown, TabsTransferPicker, ResultList, TransferPicker, UserSelect, UserTabSelect, getIcon, getIconNames, registerIcon, Badge, HeadCellDropDown, AnchorNav, AnchorNavSection, Card, GridNavDirection, GridNav, GridNavItem, Link, VirtualList, AutoSizer, withStore, PopOverContainer, Pagination, Progress, Steps, StepStatus, Tag, Timeline, ImageGallery, BaiduMapPicker, MultilineText, Form, FormField, Controller, Combo, InputTable, InputTableColumnProps, DndContainer, Menu, CodeMirror, CodeMirrorEditor, OverflowTpl, Signature };

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

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.2.2
+ * amis-ui v6.4.0
  * Copyright 2018-2024 fex
  */
 
@@ -8,7 +8,7 @@ import React__default from 'react';
 import { guid } from 'amis-core';
 import Button from '../Button.js';
 import { Icon } from '../icons.js';
-import { InputJSONSchemaItem } from './Item.js';
+import InputJSONSchemaItem from './Item.js';
 
 function InputJSONSchemaArray(props) {
     var _a, _b, _c;

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

@@ -1,3 +1,5 @@
 import React from 'react';
 import type { InputJSONSchemaItemProps } from './index';
-export declare function InputJSONSchemaItem(props: InputJSONSchemaItemProps): React.JSX.Element;
+export declare function InputJSONSchemaItem(props: InputJSONSchemaItemProps, ref: any): React.JSX.Element;
+declare const _default: React.ForwardRefExoticComponent<InputJSONSchemaItemProps & React.RefAttributes<unknown>>;
+export default _default;

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

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.2.2
+ * amis-ui v6.4.0
  * Copyright 2018-2024 fex
  */
 
@@ -9,12 +9,24 @@ import InputBox from '../InputBox.js';
 import NumberInput from '../NumberInput.js';
 import Switch from '../Switch.js';
 import { InputJSONSchemaArray } from './Array.js';
-import { InputJSONSchemaObject } from './Object.js';
+import InputJSONSchemaObject from './Object.js';
+import { FormulaPicker } from '../formula/Picker.js';
 
-function InputJSONSchemaItem(props) {
+function InputJSONSchemaItem(props, ref) {
+    var _a, _b, _c, _d, _e;
+    var childRef = React__default.useRef();
+    React__default.useImperativeHandle(ref, function () {
+        return {
+            validate: function () {
+                var _a;
+                return (_a = childRef.current) === null || _a === void 0 ? void 0 : _a.validate();
+            }
+        };
+    });
     var schema = props.schema;
+    var formua = props.formula;
     if (schema.type === 'object') {
-        return React__default.createElement(InputJSONSchemaObject, __assign({}, props));
+        return React__default.createElement(InputJSONSchemaObject, __assign({}, props, { ref: childRef }));
     }
     else if (schema.type === 'array') {
         return React__default.createElement(InputJSONSchemaArray, __assign({}, props));
@@ -22,16 +34,30 @@ function InputJSONSchemaItem(props) {
     else if (props.renderValue) {
         return props.renderValue(props.value, props.onChange, schema, props);
     }
+    else if (formua) {
+        var inputSettings = React__default.useMemo(function () {
+            var inputSettings = __assign({}, formua.inputSettings);
+            if (schema.type === 'number' || schema.type === 'integer') {
+                inputSettings.type = 'number';
+            }
+            else if (schema.type === 'boolean') {
+                inputSettings.type = 'boolean';
+            }
+            return inputSettings;
+        }, [formua.inputSettings, schema.type]);
+        return (React__default.createElement(FormulaPicker, __assign({ mode: "input-group", mixedMode: true }, formua, { inputSettings: inputSettings, value: (_a = props.value) !== null && _a !== void 0 ? _a : schema.default, onChange: props.onChange, className: props.className, disabled: props.disabled, placeholder: props.placeholder, theme: props.theme, classPrefix: props.classPrefix, classnames: props.classnames, translate: props.translate, locale: props.locale })));
+    }
     else if (schema.type == 'number') {
-        return (React__default.createElement(NumberInput, { value: props.value, onChange: props.onChange, placeholder: props.placeholder, mobileUI: props.mobileUI }));
+        return (React__default.createElement(NumberInput, { className: props.className, value: (_b = props.value) !== null && _b !== void 0 ? _b : schema.default, onChange: props.onChange, placeholder: props.placeholder, mobileUI: props.mobileUI }));
     }
     else if (schema.type == 'integer') {
-        return (React__default.createElement(NumberInput, { value: props.value, onChange: props.onChange, precision: 0, placeholder: props.placeholder, mobileUI: props.mobileUI }));
+        return (React__default.createElement(NumberInput, { className: props.className, value: (_c = props.value) !== null && _c !== void 0 ? _c : schema.default, onChange: props.onChange, precision: 0, placeholder: props.placeholder, mobileUI: props.mobileUI }));
     }
     else if (schema.type == 'boolean') {
-        return (React__default.createElement(Switch, { value: props.value, onChange: props.onChange, className: "mt-2" }));
+        return (React__default.createElement(Switch, { value: (_d = props.value) !== null && _d !== void 0 ? _d : schema.default, onChange: props.onChange, className: "mt-2" }));
     }
-    return (React__default.createElement(InputBox, { value: props.value, onChange: props.onChange, placeholder: props.placeholder, mobileUI: props.mobileUI }));
+    return (React__default.createElement(InputBox, { className: props.className, value: (_e = props.value) !== null && _e !== void 0 ? _e : schema.default, onChange: props.onChange, placeholder: props.placeholder, mobileUI: props.mobileUI }));
 }
+var InputJSONSchemaItem$1 = React__default.forwardRef(InputJSONSchemaItem);
 
-export { InputJSONSchemaItem };
+export { InputJSONSchemaItem, InputJSONSchemaItem$1 as default };

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

@@ -1,3 +1,5 @@
 import React from 'react';
 import type { InputJSONSchemaItemProps } from './index';
-export declare function InputJSONSchemaObject(props: InputJSONSchemaItemProps): React.JSX.Element;
+export declare function InputJSONSchemaObject(props: InputJSONSchemaItemProps, ref: any): React.JSX.Element;
+declare const _default: React.ForwardRefExoticComponent<InputJSONSchemaItemProps & React.RefAttributes<unknown>>;
+export default _default;