amis-ui 3.1.1 → 3.3.0

package/esm/components/formula/Picker.js

@@ -1,17 +1,28 @@
 /**
- * amis-ui v3.1.1
+ * amis-ui v3.3.0
  * Copyright 2018-2023 fex
  */
 
 import { __extends, __awaiter, __generator, __assign, __rest, __read, __decorate, __metadata } from 'tslib';
-import { parse, generateIcon, noop, autobind, themeable, localeable, uncontrollable } from 'amis-core';
+import { parse, isMobile, noop, autobind, themeable, localeable, uncontrollable, isExpression, resolveVariableAndFilterForAsync } from 'amis-core';
 import React__default from 'react';
 import Editor, { FormulaEditor } from './Editor.js';
 import ResultBox from '../ResultBox.js';
 import Button from '../Button.js';
 import { Icon } from '../icons.js';
 import FinalModal from '../Modal.js';
+import PopUp from '../PopUp.js';
+import FormulaInput from './Input.js';
 
+var InputSchemaType = [
+    'text',
+    'number',
+    'boolean',
+    'date',
+    'time',
+    'datetime',
+    'select'
+];
 var FormulaPicker = /** @class */ (function (_super) {
     __extends(FormulaPicker, _super);
     function FormulaPicker(props) {
@@ -21,7 +32,8 @@ var FormulaPicker = /** @class */ (function (_super) {
             isOpened: false,
             value: _this.props.value,
             editorValue: _this.value2EditorValue(_this.props),
-            isError: false
+            isError: false,
+            variables: Array.isArray(props.variables) ? props.variables : []
         };
         return _this;
     }
@@ -29,12 +41,21 @@ var FormulaPicker = /** @class */ (function (_super) {
         var value = this.props.value;
         if (value !== prevProps.value) {
             this.setState({
-                value: typeof value === 'string' ? value : '',
+                value: typeof value === 'string' || !this.isTextInput() ? value : '',
                 editorValue: this.value2EditorValue(this.props)
             });
         }
     };
     FormulaPicker.prototype.value2EditorValue = function (props) {
+        var value = props.value;
+        if (!this.isTextInput()) {
+            var editorValue = '';
+            try {
+                editorValue = JSON.stringify(value);
+            }
+            catch (error) { }
+            return editorValue;
+        }
         if (props.mixedMode) {
             if (typeof props.value === 'string' &&
                 /^\s*\$\{(.+?)\}\s*$/.test(props.value)) {
@@ -46,6 +67,12 @@ var FormulaPicker = /** @class */ (function (_super) {
         }
         return String(props.value || '');
     };
+    FormulaPicker.prototype.isTextInput = function () {
+        var inputSettings = this.props.inputSettings;
+        return (!inputSettings ||
+            (inputSettings === null || inputSettings === void 0 ? void 0 : inputSettings.type) === 'text' ||
+            !InputSchemaType.includes(inputSettings === null || inputSettings === void 0 ? void 0 : inputSettings.type));
+    };
     FormulaPicker.prototype.handleConfirm = function () {
         var _a, _b;
         var value = this.state.value;
@@ -79,9 +106,33 @@ var FormulaPicker = /** @class */ (function (_super) {
         });
     };
     FormulaPicker.prototype.handleEditorConfirm = function () {
-        this.props.translate;
-        var value = this.state.editorValue;
-        this.confirm(value);
+        var _a, _b;
+        var _c = this.props; _c.translate; var inputSettings = _c.inputSettings;
+        var editorValue = this.state.editorValue;
+        if (this.isTextInput()) {
+            return this.confirm(editorValue);
+        }
+        else if (inputSettings) {
+            var result = editorValue;
+            var schemaType = inputSettings === null || inputSettings === void 0 ? void 0 : inputSettings.type;
+            try {
+                var ast = parse(editorValue, { evalMode: true, allowFilter: false });
+                if (schemaType === 'select' &&
+                    inputSettings.multiple &&
+                    ast.type === 'array') {
+                    result = ast.members.map(function (i) { return i.value; });
+                }
+                else if (ast.type === 'literal' || ast.type === 'string') {
+                    result = (_a = ast.value) !== null && _a !== void 0 ? _a : '';
+                }
+            }
+            catch (error) {
+                this.setState({ isError: (_b = error === null || error === void 0 ? void 0 : error.message) !== null && _b !== void 0 ? _b : true });
+                return;
+            }
+            this.setState({ isError: false });
+            return this.confirm(result);
+        }
     };
     FormulaPicker.prototype.confirm = function (value) {
         var _this = this;
@@ -99,14 +150,29 @@ var FormulaPicker = /** @class */ (function (_super) {
     FormulaPicker.prototype.handleClick = function () {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
-            var state, _c;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
+            var _c, variables, data, list, result, state, _d;
+            return __generator(this, function (_e) {
+                switch (_e.label) {
                     case 0:
-                        _c = [{}];
-                        return [4 /*yield*/, ((_b = (_a = this.props).onPickerOpen) === null || _b === void 0 ? void 0 : _b.call(_a, this.props))];
+                        _c = this.props, variables = _c.variables, data = _c.data;
+                        if (!(typeof variables === 'function')) return [3 /*break*/, 2];
+                        return [4 /*yield*/, variables(this.props)];
                     case 1:
-                        state = __assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_d.sent())])), { editorValue: this.value2EditorValue(this.props), isOpened: true }]);
+                        list = _e.sent();
+                        this.setState({ variables: list });
+                        return [3 /*break*/, 4];
+                    case 2:
+                        if (!(typeof variables === 'string' && isExpression(variables))) return [3 /*break*/, 4];
+                        return [4 /*yield*/, resolveVariableAndFilterForAsync(variables, data, '|raw')];
+                    case 3:
+                        result = _e.sent();
+                        this.setState({ variables: result });
+                        _e.label = 4;
+                    case 4:
+                        _d = [{}];
+                        return [4 /*yield*/, ((_b = (_a = this.props).onPickerOpen) === null || _b === void 0 ? void 0 : _b.call(_a, this.props))];
+                    case 5:
+                        state = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_e.sent())])), { editorValue: this.value2EditorValue(this.props), isOpened: true }]);
                         this.setState(state);
                         return [2 /*return*/];
                 }
@@ -130,7 +196,28 @@ var FormulaPicker = /** @class */ (function (_super) {
         this.setState(__assign(__assign({}, this.state), rest));
     };
     FormulaPicker.prototype.validate = function (value) {
-        this.props.translate;
+        var _a = this.props, __ = _a.translate, inputSettings = _a.inputSettings;
+        /** 处理非文本输入场景 */
+        if (inputSettings && !this.isTextInput()) {
+            var schemaType = inputSettings === null || inputSettings === void 0 ? void 0 : inputSettings.type;
+            var errorMsg = __('FormulaEditor.invalidValue');
+            /** 变量类型 */
+            if (typeof value === 'string') {
+                return true;
+            }
+            if (['number', 'boolean'].includes(schemaType)) {
+                return typeof value === schemaType ? true : errorMsg;
+            }
+            else if (['text', 'date', 'time', 'datetime'].includes(schemaType)) {
+                return typeof value === 'string' ? true : errorMsg;
+            }
+            else if (schemaType === 'select' && inputSettings.multiple) {
+                return Array.isArray(value) ? true : errorMsg;
+            }
+            else {
+                return true;
+            }
+        }
         try {
             value &&
                 parse(value, {
@@ -141,7 +228,7 @@ var FormulaPicker = /** @class */ (function (_super) {
         }
         catch (e) {
             if (/\s(\d+:\d+)$/.test(e.message)) {
-                var _a = __read(/\s(\d+:\d+)$/.exec(e.message) || [], 2), position = _a[1];
+                var _b = __read(/\s(\d+:\d+)$/.exec(e.message) || [], 2), position = _b[1];
                 return position;
             }
             return e.message;
@@ -149,16 +236,19 @@ var FormulaPicker = /** @class */ (function (_super) {
     };
     FormulaPicker.prototype.render = function () {
         var _a, _b, _c;
-        var _d, _e, _f, _g, _h;
-        var _j = this.props, cx = _j.classnames, __ = _j.translate, disabled = _j.disabled, _k = _j.allowInput, allowInput = _k === void 0 ? true : _k, className = _j.className, style = _j.style; _j.onChange; _j.size; var borderMode = _j.borderMode, placeholder = _j.placeholder, _l = _j.mode, mode = _l === void 0 ? 'input-button' : _l, btnLabel = _j.btnLabel, level = _j.level, btnSize = _j.btnSize, icon = _j.icon, title = _j.title, clearable = _j.clearable, variables = _j.variables, functions = _j.functions, children = _j.children, variableMode = _j.variableMode, mixedMode = _j.mixedMode, evalMode = _j.evalMode, popOverContainer = _j.popOverContainer, rest = __rest(_j, ["classnames", "translate", "disabled", "allowInput", "className", "style", "onChange", "size", "borderMode", "placeholder", "mode", "btnLabel", "level", "btnSize", "icon", "title", "clearable", "variables", "functions", "children", "variableMode", "mixedMode", "evalMode", "popOverContainer"]);
-        var _m = this.state, isOpened = _m.isOpened, value = _m.value, editorValue = _m.editorValue, isError = _m.isError;
-        var iconElement = generateIcon(cx, icon, 'Icon');
+        var _d, _e, _f, _g, _h, _j;
+        var _k = this.props, cx = _k.classnames, __ = _k.translate, disabled = _k.disabled, _l = _k.allowInput, allowInput = _l === void 0 ? true : _l, className = _k.className, style = _k.style; _k.onChange; _k.size; var borderMode = _k.borderMode, placeholder = _k.placeholder, _m = _k.mode, mode = _m === void 0 ? 'input-button' : _m, btnLabel = _k.btnLabel, level = _k.level, btnSize = _k.btnSize, icon = _k.icon, title = _k.title, clearable = _k.clearable, functions = _k.functions, children = _k.children, variableMode = _k.variableMode, mixedMode = _k.mixedMode, evalMode = _k.evalMode, popOverContainer = _k.popOverContainer, useMobileUI = _k.useMobileUI, inputSettings = _k.inputSettings, rest = __rest(_k, ["classnames", "translate", "disabled", "allowInput", "className", "style", "onChange", "size", "borderMode", "placeholder", "mode", "btnLabel", "level", "btnSize", "icon", "title", "clearable", "functions", "children", "variableMode", "mixedMode", "evalMode", "popOverContainer", "useMobileUI", "inputSettings"]);
+        var _o = this.state, isOpened = _o.isOpened, value = _o.value, editorValue = _o.editorValue, isError = _o.isError;
+        var iconElement = React__default.createElement(Icon, { cx: cx, icon: icon, className: "Icon" });
+        var mobileUI = useMobileUI && isMobile();
         return (React__default.createElement(React__default.Fragment, null,
             children ? (children({
                 isOpened: this.state.isOpened,
                 onClick: this.handleClick,
                 setState: this.updateState
-            })) : (React__default.createElement("div", { className: cx('FormulaPicker', className, mode === 'input-group' ? 'is-input-group' : ''), style: style },
+            })) : (React__default.createElement("div", { className: cx('FormulaPicker', mode === 'input-group' ? 'is-input-group' : '', {
+                    'FormulaPicker--text': this.isTextInput()
+                }, className), style: style },
                 mode === 'button' && (React__default.createElement(Button, { className: cx('FormulaPicker-action', 'w-full'), level: level, size: btnSize, onClick: this.handleClick },
                     iconElement ? (React__default.cloneElement(iconElement, {
                         className: cx((_e = (_d = iconElement === null || iconElement === void 0 ? void 0 : iconElement.props) === null || _d === void 0 ? void 0 : _d.className) !== null && _e !== void 0 ? _e : '', 'FormulaPicker-icon', (_a = {},
@@ -171,26 +261,28 @@ var FormulaPicker = /** @class */ (function (_super) {
                 mode === 'input-button' && (React__default.createElement(React__default.Fragment, null,
                     React__default.createElement(ResultBox, { className: cx('FormulaPicker-input', isOpened ? 'is-active' : '', !!isError ? 'is-error' : ''), allowInput: allowInput, clearable: clearable, value: value, result: allowInput
                             ? void 0
-                            : FormulaEditor.highlightValue(value, variables, this.props.evalMode), itemRender: this.renderFormulaValue, onResultChange: noop, onChange: this.handleInputChange, disabled: disabled, borderMode: borderMode, placeholder: placeholder }),
+                            : FormulaEditor.highlightValue(value, this.state.variables, this.props.evalMode), itemRender: this.renderFormulaValue, onResultChange: noop, onChange: this.handleInputChange, disabled: disabled, borderMode: borderMode, placeholder: placeholder }),
                     React__default.createElement(Button, { className: cx('FormulaPicker-action'), onClick: this.handleClick },
                         React__default.createElement(Icon, { icon: "function", className: cx('FormulaPicker-icon', 'icon', (_c = {},
                                 _c['is-filled'] = !!value,
                                 _c)) })))),
                 mode === 'input-group' && (React__default.createElement(React__default.Fragment, null,
-                    React__default.createElement(ResultBox, { className: cx('FormulaPicker-input', isOpened ? 'is-active' : '', !!isError ? 'is-error' : ''), allowInput: allowInput, clearable: clearable, value: value, result: allowInput
-                            ? void 0
-                            : FormulaEditor.highlightValue(value, variables, this.props.evalMode), itemRender: this.renderFormulaValue, onResultChange: noop, onChange: this.handleInputChange, disabled: disabled, borderMode: borderMode, placeholder: placeholder }),
+                    React__default.createElement(FormulaInput, { className: cx('FormulaPicker-input', isOpened ? 'is-active' : '', !!isError ? 'is-error' : ''), inputSettings: inputSettings, allowInput: allowInput, clearable: clearable, evalMode: evalMode, mixedMode: mixedMode, variables: this.state.variables, value: value, itemRender: this.renderFormulaValue, onChange: this.handleInputChange, disabled: disabled, borderMode: borderMode, placeholder: placeholder }),
                     React__default.createElement("a", { className: cx("FormulaPicker-toggler"), onClick: this.handleClick },
                         React__default.createElement(Icon, { icon: "function", className: "icon" })))))),
-            React__default.createElement(FinalModal, { size: "md", closeOnEsc: true, show: this.state.isOpened, onHide: this.close, container: popOverContainer },
+            mobileUI ? (React__default.createElement(PopUp, { className: cx("FormulaPicker-popup"), isShow: this.state.isOpened, showConfirm: true, onHide: this.close, onConfirm: this.handleEditorConfirm, container: popOverContainer },
+                React__default.createElement("div", { className: cx('FormulaPicker-popup-inner') },
+                    React__default.createElement(Editor, __assign({}, rest, { evalMode: mixedMode ? true : evalMode, variables: this.state.variables, functions: (_f = this.state.functions) !== null && _f !== void 0 ? _f : functions, variableMode: (_g = this.state.variableMode) !== null && _g !== void 0 ? _g : variableMode, value: editorValue, onChange: this.handleEditorChange, selfVariableName: this.props.selfVariableName })),
+                    !!isError ? (React__default.createElement("div", { className: cx('Dialog-info'), key: "info" },
+                        React__default.createElement("span", { className: cx('Dialog-error') }, __('FormulaEditor.invalidData', { err: isError })))) : null))) : (React__default.createElement(FinalModal, { size: "lg", closeOnEsc: true, show: this.state.isOpened, onHide: this.close, container: popOverContainer },
                 React__default.createElement(FinalModal.Header, { onClose: this.close, className: "font-bold" }, __(title || 'FormulaEditor.title')),
                 React__default.createElement(FinalModal.Body, null,
-                    React__default.createElement(Editor, __assign({}, rest, { evalMode: mixedMode ? true : evalMode, variables: (_f = this.state.variables) !== null && _f !== void 0 ? _f : variables, functions: (_g = this.state.functions) !== null && _g !== void 0 ? _g : functions, variableMode: (_h = this.state.variableMode) !== null && _h !== void 0 ? _h : variableMode, value: editorValue, onChange: this.handleEditorChange, selfVariableName: this.props.selfVariableName }))),
+                    React__default.createElement(Editor, __assign({}, rest, { evalMode: mixedMode ? true : evalMode, variables: this.state.variables, functions: (_h = this.state.functions) !== null && _h !== void 0 ? _h : functions, variableMode: (_j = this.state.variableMode) !== null && _j !== void 0 ? _j : variableMode, value: editorValue, onChange: this.handleEditorChange, selfVariableName: this.props.selfVariableName }))),
                 React__default.createElement(FinalModal.Footer, null,
                     !!isError ? (React__default.createElement("div", { className: cx('Dialog-info'), key: "info" },
                         React__default.createElement("span", { className: cx('Dialog-error') }, __('FormulaEditor.invalidData', { err: isError })))) : null,
                     React__default.createElement(Button, { onClick: this.close }, __('cancel')),
-                    React__default.createElement(Button, { onClick: this.handleEditorConfirm, level: "primary" }, __('confirm'))))));
+                    React__default.createElement(Button, { onClick: this.handleEditorConfirm, level: "primary" }, __('confirm')))))));
     };
     FormulaPicker.defaultProps = {
         evalMode: true
@@ -261,4 +353,4 @@ var Picker = themeable(localeable(uncontrollable(FormulaPicker, {
     value: 'onChange'
 })));
 
-export { FormulaPicker, Picker as default };
+export { FormulaPicker, InputSchemaType, Picker as default };

package/esm/components/formula/VariableList.d.ts

@@ -17,6 +17,7 @@ export interface VariableListProps extends ThemeProps, SpinnerExtraProps {
     placeholderRender?: (props: any) => JSX.Element | null;
     onSelect?: (item: VariableItem) => void;
     selfVariableName?: string;
+    expandTree?: boolean;
 }
 declare function VariableList(props: VariableListProps): React.JSX.Element;
 declare const _default: {

package/esm/components/formula/VariableList.js

@@ -1,51 +1,155 @@
 /**
- * amis-ui v3.1.1
+ * amis-ui v3.3.0
  * Copyright 2018-2023 fex
  */
 
-import { __read } from 'tslib';
-import React__default from 'react';
-import { themeable, findTreeAll } from 'amis-core';
+import { __read, __assign } from 'tslib';
+import React__default, { useEffect } from 'react';
+import { themeable, filterTree } from 'amis-core';
 import GroupedSelection from '../GroupedSelection.js';
 import ThemedTabs, { Tab } from '../Tabs.js';
 import TreeSelection from '../TreeSelection.js';
 import SearchBox from '../SearchBox.js';
 import { Badge } from '../Badge.js';
+import { PopOverContainer } from '../PopOverContainer.js';
+import { matchSorter } from 'match-sorter';
+import TooltipWrapper from '../TooltipWrapper.js';
 
+// 数组成员读取
+var memberOpers = [
+    {
+        label: '取该成员的记录',
+        value: 'ARRAYMAP(${arr}, item => item.${member})',
+        description: '即该列所有记录'
+    },
+    {
+        label: '取符合条件的该成员的记录',
+        value: 'ARRAYFILTER(ARRAYMAP(${arr}, item => item.${member}), item => item === 条件)',
+        description: '即该列所有记录中符合条件的记录，需补充条件，例如：item === 1'
+    },
+    {
+        label: '取列表中符合该成员条件的记录',
+        value: 'ARRAYFILTER(${arr}, item => item.${member} === 条件)',
+        description: '即当前列表中所有符合该成员条件的记录，需补充成员条件，例如：item.xxx === 1'
+    },
+    {
+        label: '取列表中符合该成员条件的记录总数',
+        value: 'COUNT(ARRAYFILTER(${arr}, item => item.${member} === 条件))',
+        description: '即当前列表中所有符合该成员条件的记录总数，需补充成员条件，例如：item.xxx === 1'
+    },
+    {
+        label: '取该成员去重之后的总数',
+        value: 'COUNT(UNIQ(${arr}, item.${member}))',
+        description: '即对该成员记录进行去重，并统计总数'
+    },
+    {
+        label: '取该成员的总和',
+        value: 'SUM(ARRAYMAP(${arr}, item => item.${member}))',
+        description: '即计算该成员记录的总和，需确认该成员记录均为数字类型'
+    },
+    {
+        label: '取该成员的平均值',
+        value: 'AVG(ARRAYMAP(${arr}, item => item.${member}))',
+        description: '即计算该成员记录的平均值，需确认该成员记录均为数字类型'
+    },
+    {
+        label: '取该成员的最大值',
+        value: 'MAX(ARRAYMAP(${arr}, item => item.${member}))',
+        description: '即计算该成员记录中最大值，需确认该成员记录均为数字类型'
+    },
+    {
+        label: '取该成员的最小值',
+        value: 'MIN(ARRAYMAP(${arr}, item => item.${member}))',
+        description: '即计算该成员记录中最小值，需确认该成员记录均为数字类型'
+    }
+];
 function VariableList(props) {
-    var list = props.data, className = props.className, cx = props.classnames, _a = props.tabsMode, tabsMode = _a === void 0 ? 'line' : _a, themePrefix = props.classPrefix, itemClassName = props.itemClassName, selectMode = props.selectMode, onSelect = props.onSelect, placeholderRender = props.placeholderRender, selfVariableName = props.selfVariableName;
+    var variableListRef = React__default.useRef(null);
+    var list = props.data, className = props.className, cx = props.classnames, _a = props.tabsMode, tabsMode = _a === void 0 ? 'line' : _a, themePrefix = props.classPrefix, itemClassName = props.itemClassName, selectMode = props.selectMode, onSelect = props.onSelect, placeholderRender = props.placeholderRender, selfVariableName = props.selfVariableName, expandTree = props.expandTree;
     var _b = __read(React__default.useState(list), 2), filterVars = _b[0], setFilterVars = _b[1];
     var classPrefix = "".concat(themePrefix, "FormulaEditor-VariableList");
+    useEffect(function () {
+        var data = props.data;
+        if (data) {
+            setFilterVars(data);
+        }
+    }, [props.data]);
     var itemRender = props.itemRender && typeof props.itemRender === 'function'
         ? props.itemRender
         : function (option, states) {
-            return (React__default.createElement("span", { className: cx("".concat(classPrefix, "-item"), itemClassName) },
-                option.label &&
-                    selfVariableName &&
-                    option.value === selfVariableName && (React__default.createElement(Badge, { classnames: cx, badge: {
-                        mode: 'text',
-                        text: 'self',
-                        offset: [15, 2]
-                    } },
-                    React__default.createElement("label", null, option.label))),
-                option.label &&
-                    (!selfVariableName || option.value !== selfVariableName) && (React__default.createElement("label", null, option.label)),
-                (option === null || option === void 0 ? void 0 : option.tag) ? (React__default.createElement("span", { className: cx("".concat(classPrefix, "-item-tag")) }, option.tag)) : null));
+            var _a;
+            return (React__default.createElement("div", null,
+                React__default.createElement("div", { className: cx("".concat(classPrefix, "-item"), itemClassName) },
+                    option.label &&
+                        selfVariableName &&
+                        option.value === selfVariableName && (React__default.createElement(Badge, { classnames: cx, badge: {
+                            mode: 'text',
+                            text: 'self',
+                            offset: [15, 2]
+                        } },
+                        React__default.createElement("label", null, option.label))),
+                    option.memberDepth === undefined &&
+                        option.label &&
+                        (!selfVariableName || option.value !== selfVariableName) && (React__default.createElement(TooltipWrapper, { tooltip: (_a = option.description) !== null && _a !== void 0 ? _a : option.label, tooltipTheme: "dark" },
+                        React__default.createElement("label", null, option.label))),
+                    option.memberDepth !== undefined &&
+                        option.label &&
+                        (!selfVariableName || option.value !== selfVariableName) ? (option.memberDepth < 2 ? (React__default.createElement(PopOverContainer, { popOverContainer: function () {
+                            return document.querySelector(".".concat(cx('FormulaPicker-Modal')));
+                        }, popOverRender: function (_a) {
+                            var onClose = _a.onClose;
+                            return (React__default.createElement("ul", { className: cx("".concat(classPrefix, "-item-oper")) }, memberOpers.map(function (item, i) {
+                                return (React__default.createElement(TooltipWrapper, { tooltip: item.description, tooltipTheme: "dark" },
+                                    React__default.createElement("li", { key: i, onClick: function () {
+                                            return handleMemberClick(__assign(__assign({}, item), { isMember: true }), option, onClose);
+                                        } },
+                                        React__default.createElement("span", null, item.label))));
+                            })));
+                        } }, function (_a) {
+                        var _b;
+                        var onClick = _a.onClick; _a.ref; _a.isOpened;
+                        return (React__default.createElement(TooltipWrapper, { tooltip: (_b = option.description) !== null && _b !== void 0 ? _b : option.label, tooltipTheme: "dark" },
+                            React__default.createElement("label", { onClick: onClick }, option.label)));
+                    })) : (React__default.createElement("label", null, option.label))) : null,
+                    (option === null || option === void 0 ? void 0 : option.tag) ? (React__default.createElement("span", { className: cx("".concat(classPrefix, "-item-tag")) }, option.tag)) : null)));
         };
+    function handleMemberClick(item, option, onClose) {
+        // todo：暂时只提供一层的快捷操作
+        // const lastPointIdx = option.value.lastIndexOf('.');
+        var firstPointIdx = option.value.indexOf('.');
+        var arr = option.value.substring(0, firstPointIdx);
+        var member = option.value.substring(firstPointIdx + 1);
+        var value = item.value
+            .replace('${arr}', arr)
+            .replace('${member}', member);
+        onClose === null || onClose === void 0 ? void 0 : onClose();
+        onSelect === null || onSelect === void 0 ? void 0 : onSelect(__assign(__assign({}, item), { label: value, value: value }));
+    }
     function onSearch(term) {
-        var tree = findTreeAll(list, function (i) { return ~i.label.indexOf(term); });
+        var tree = filterTree(list, function (i, key, level, paths) {
+            return !!((Array.isArray(i.children) && i.children.length) ||
+                !!matchSorter([i].concat(paths), term, {
+                    keys: ['label', 'value']
+                }).length);
+        }, 1, true);
         setFilterVars(!term ? list : tree);
     }
     function renderSearchBox() {
         return (React__default.createElement("div", { className: cx('FormulaEditor-VariableList-searchBox') },
-            React__default.createElement(SearchBox, { mini: false, onSearch: onSearch })));
+            React__default.createElement(SearchBox, { mini: false, onSearch: onSearch, useMobileUI: true })));
+    }
+    function handleChange(item) {
+        if (item.isMember || item.memberDepth !== undefined) {
+            return;
+        }
+        onSelect === null || onSelect === void 0 ? void 0 : onSelect(item);
     }
-    return (React__default.createElement("div", { className: cx(className, 'FormulaEditor-VariableList', selectMode && "FormulaEditor-VariableList-".concat(selectMode)) }, selectMode === 'tabs' ? (React__default.createElement(ThemedTabs, { tabsMode: tabsMode, className: cx("".concat(classPrefix, "-base ").concat(classPrefix, "-tabs")) }, filterVars.map(function (item, index) { return (React__default.createElement(Tab, { className: cx("".concat(classPrefix, "-tab")), eventKey: index, key: index, title: item.label },
-        React__default.createElement(VariableList, { classnames: cx, classPrefix: "".concat(classPrefix, "-sub-"), className: cx("".concat(classPrefix, "-sub")), itemRender: itemRender, placeholderRender: placeholderRender, selectMode: item.selectMode, data: item.children, onSelect: onSelect, selfVariableName: selfVariableName }))); }))) : selectMode === 'tree' ? (React__default.createElement("div", { className: cx('FormulaEditor-VariableList-body') },
+    return (React__default.createElement("div", { className: cx(className, 'FormulaEditor-VariableList', selectMode && "FormulaEditor-VariableList-".concat(selectMode)), ref: variableListRef }, selectMode === 'tabs' ? (React__default.createElement(ThemedTabs, { tabsMode: tabsMode, className: cx("".concat(classPrefix, "-base ").concat(classPrefix, "-tabs")) }, filterVars.map(function (item, index) { return (React__default.createElement(Tab, { className: cx("".concat(classPrefix, "-tab")), eventKey: index, key: index, title: item.label },
+        React__default.createElement(VariableList, { classnames: cx, classPrefix: "".concat(classPrefix, "-sub-"), className: cx("".concat(classPrefix, "-sub")), itemRender: itemRender, placeholderRender: placeholderRender, selectMode: item.selectMode, data: item.children, onSelect: handleChange, selfVariableName: selfVariableName }))); }))) : selectMode === 'tree' ? (React__default.createElement("div", { className: cx('FormulaEditor-VariableList-body') },
         renderSearchBox(),
-        React__default.createElement(TreeSelection, { itemRender: itemRender, placeholderRender: placeholderRender, className: cx("".concat(classPrefix, "-base"), 'is-scrollable'), multiple: false, options: filterVars, onChange: function (item) { return onSelect === null || onSelect === void 0 ? void 0 : onSelect(item); } }))) : (React__default.createElement("div", { className: cx('FormulaEditor-VariableList-body') },
+        React__default.createElement(TreeSelection, { itemRender: itemRender, placeholderRender: placeholderRender, className: cx("".concat(classPrefix, "-base"), 'is-scrollable'), multiple: false, expand: expandTree ? 'all' : 'none', options: filterVars, onChange: function (item) { return handleChange(item); } }))) : (React__default.createElement("div", { className: cx('FormulaEditor-VariableList-body') },
         renderSearchBox(),
-        React__default.createElement(GroupedSelection, { itemRender: itemRender, placeholderRender: placeholderRender, className: cx("".concat(classPrefix, "-base"), 'is-scrollable'), multiple: false, options: filterVars, onChange: function (item) { return onSelect === null || onSelect === void 0 ? void 0 : onSelect(item); } })))));
+        React__default.createElement(GroupedSelection, { itemRender: itemRender, placeholderRender: placeholderRender, className: cx("".concat(classPrefix, "-base"), 'is-scrollable'), multiple: false, options: filterVars, onChange: function (item) { return handleChange(item); } })))));
 }
 var VariableList$1 = themeable(VariableList);
 

package/esm/components/formula/plugin.d.ts

@@ -3,7 +3,7 @@
  */
 import type CodeMirror from 'codemirror';
 import { FormulaEditorProps, VariableItem } from './Editor';
-export declare function editorFactory(dom: HTMLElement, cm: typeof CodeMirror, props: any): CodeMirror.Editor;
+export declare function editorFactory(dom: HTMLElement, cm: typeof CodeMirror, props: any, options?: any): CodeMirror.Editor;
 export declare class FormulaPlugin {
     readonly editor: CodeMirror.Editor;
     readonly cm: typeof CodeMirror;
@@ -19,7 +19,9 @@ export declare class FormulaPlugin {
         end: number;
     }[]): boolean;
     insertBraces(originFrom: CodeMirror.Position, originTo: CodeMirror.Position): void;
-    insertContent(value: any, type?: 'variable' | 'func'): void;
+    insertContent(value: any, type?: 'variable' | 'func', className?: string, toMark?: boolean): void;
+    setValue(value: string): void;
+    getValue(): string;
     markText(from: CodeMirror.Position, to: CodeMirror.Position, label: string, className?: string): void;
     autoMark(variables: Array<VariableItem>): void;
     focus(value: string): void;

package/esm/components/formula/plugin.js

@@ -1,22 +1,18 @@
 /**
- * amis-ui v3.1.1
+ * amis-ui v3.3.0
  * Copyright 2018-2023 fex
  */
 
-import { __read } from 'tslib';
+import { __assign, __read } from 'tslib';
 import { eachTree } from 'amis-core';
 import { FormulaEditor } from './Editor.js';
 
 /**
  * @file 扩展 codemirror
  */
-function editorFactory(dom, cm, props) {
+function editorFactory(dom, cm, props, options) {
     registerLaunguageMode(cm);
-    return cm(dom, {
-        value: props.value || '',
-        autofocus: true,
-        mode: props.evalMode ? 'text/formula' : 'text/formula-template'
-    });
+    return cm(dom, __assign({ value: props.value || '', autofocus: true, mode: props.evalMode ? 'text/formula' : 'text/formula-template' }, options));
 }
 var FormulaPlugin = /** @class */ (function () {
     function FormulaPlugin(editor, cm, getProps) {
@@ -90,22 +86,34 @@ var FormulaPlugin = /** @class */ (function () {
             this.editor.replaceSelection('}');
         }
     };
-    FormulaPlugin.prototype.insertContent = function (value, type) {
+    FormulaPlugin.prototype.insertContent = function (value, type, className, toMark) {
+        var _this = this;
+        if (className === void 0) { className = 'cm-field'; }
+        if (toMark === void 0) { toMark = true; }
         var from = this.editor.getCursor();
         var evalMode = this.getProps().evalMode;
         if (type === 'variable') {
             this.editor.replaceSelection(value.key);
-            var to = this.editor.getCursor();
-            this.markText(from, to, value.name, 'cm-field');
-            !evalMode && this.insertBraces(from, to);
+            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);
         }
         else if (type === 'func') {
             this.editor.replaceSelection("".concat(value, "()"));
             var to = this.editor.getCursor();
-            this.markText(from, {
-                line: to.line,
-                ch: to.ch - 2
-            }, value, 'cm-func');
+            toMark &&
+                this.markText(from, {
+                    line: to.line,
+                    ch: to.ch - 2
+                }, value, 'cm-func');
             this.editor.setCursor({
                 line: to.line,
                 ch: to.ch - 1
@@ -120,9 +128,17 @@ var FormulaPlugin = /** @class */ (function () {
         }
         else if (typeof value === 'string') {
             this.editor.replaceSelection(value);
+            // 非变量、非函数，可能是组合模式，也需要标记
+            toMark && setTimeout(function () { return _this.autoMarkText(); }, 0);
         }
         this.editor.focus();
     };
+    FormulaPlugin.prototype.setValue = function (value) {
+        this.editor.setValue(value);
+    };
+    FormulaPlugin.prototype.getValue = function () {
+        return this.editor.getValue();
+    };
     FormulaPlugin.prototype.markText = function (from, to, label, className) {
         if (className === void 0) { className = 'cm-func'; }
         var text = document.createElement('span');
@@ -140,8 +156,9 @@ var FormulaPlugin = /** @class */ (function () {
         }
         var varMap = {};
         eachTree(variables, function (item) {
+            var _a;
             if (item.value) {
-                varMap[item.value] = item.label;
+                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; });
@@ -166,19 +183,26 @@ var FormulaPlugin = /** @class */ (function () {
             vars.forEach(function (v) {
                 var from = 0;
                 var idx = -1;
-                while (~(idx = content.indexOf(v, from))) {
+                var _loop_2 = function () {
                     var encode = FormulaEditor.replaceStrByIndex(content, idx, v, REPLACE_KEY);
                     var reg = FormulaEditor.getRegExpByMode(evalMode, REPLACE_KEY);
                     if (reg.test(encode)) {
-                        _this.markText({
-                            line: line,
-                            ch: idx
-                        }, {
-                            line: line,
-                            ch: idx + v.length
-                        }, varMap[v], 'cm-field');
+                        var markFrom_2 = idx;
+                        v.split('.').forEach(function (val, index) {
+                            _this.markText({
+                                line: line,
+                                ch: markFrom_2
+                            }, {
+                                line: line,
+                                ch: markFrom_2 + val.length
+                            }, varMap[v].split('.')[index], 'cm-field');
+                            markFrom_2 += 1 + val.length;
+                        });
                     }
                     from = idx + v.length;
+                };
+                while (~(idx = content.indexOf(v, from))) {
+                    _loop_2();
                 }
             });
         };

package/esm/components/icons.d.ts

@@ -42,8 +42,17 @@ export declare function getIconNames(): string[];
 export declare function getIcon(key: string): React.ElementType<{}>;
 export declare function hasIcon(iconName: string): boolean;
 export declare function registerIcon(key: string, component: React.ElementType<{}>): void;
-export declare function Icon({ icon, className, wrapClassName, classPrefix, iconContent, ...rest }: {
+export interface IconCheckedSchema {
+    id: string;
+    name?: string;
+    svg?: string;
+}
+export interface IconCheckedSchemaNew {
+    type: 'icon';
+    icon: IconCheckedSchema;
+}
+export declare function Icon({ icon, className, classPrefix, classNameProp, iconContent, vendor, cx: iconCx, onClick, style }: {
     icon: string;
     iconContent?: string;
-} & React.ComponentProps<any>): React.JSX.Element;
+} & 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 };