amis-ui 3.1.1 → 3.3.0

package/lib/components/formula/Picker.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.1.1
+ * amis-ui v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -15,11 +15,25 @@ var ResultBox = require('../ResultBox.js');
 var Button = require('../Button.js');
 var icons = require('../icons.js');
 var Modal = require('../Modal.js');
+var PopUp = require('../PopUp.js');
+var Input = require('./Input.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
+var __react_jsx__ = require('react');
+var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
+(__react_jsx__["default"] || __react_jsx__).Fragment;
+var InputSchemaType = [
+    'text',
+    'number',
+    'boolean',
+    'date',
+    'time',
+    'datetime',
+    'select'
+];
 var FormulaPicker = /** @class */ (function (_super) {
     tslib.__extends(FormulaPicker, _super);
     function FormulaPicker(props) {
@@ -29,7 +43,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;
     }
@@ -37,12 +52,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)) {
@@ -54,6 +78,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;
@@ -70,7 +100,7 @@ var FormulaPicker = /** @class */ (function (_super) {
         if (allowInput) {
             return '';
         }
-        return (React__default["default"].createElement("div", { className: cx('FormulaPicker-ResultBox'), dangerouslySetInnerHTML: html }));
+        return (_J$X_("div", { className: cx('FormulaPicker-ResultBox'), dangerouslySetInnerHTML: html }));
     };
     FormulaPicker.prototype.handleInputChange = function (value) {
         var _this = this;
@@ -87,9 +117,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 = amisCore.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;
@@ -107,14 +161,29 @@ var FormulaPicker = /** @class */ (function (_super) {
     FormulaPicker.prototype.handleClick = function () {
         var _a, _b;
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var state, _c;
-            return tslib.__generator(this, function (_d) {
-                switch (_d.label) {
+            var _c, variables, data, list, result, state, _d;
+            return tslib.__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 = tslib.__assign.apply(void 0, [tslib.__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' && amisCore.isExpression(variables))) return [3 /*break*/, 4];
+                        return [4 /*yield*/, amisCore.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 = tslib.__assign.apply(void 0, [tslib.__assign.apply(void 0, _d.concat([(_e.sent())])), { editorValue: this.value2EditorValue(this.props), isOpened: true }]);
                         this.setState(state);
                         return [2 /*return*/];
                 }
@@ -138,7 +207,28 @@ var FormulaPicker = /** @class */ (function (_super) {
         this.setState(tslib.__assign(tslib.__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 &&
                 amisCore.parse(value, {
@@ -149,7 +239,7 @@ var FormulaPicker = /** @class */ (function (_super) {
         }
         catch (e) {
             if (/\s(\d+:\d+)$/.test(e.message)) {
-                var _a = tslib.__read(/\s(\d+:\d+)$/.exec(e.message) || [], 2), position = _a[1];
+                var _b = tslib.__read(/\s(\d+:\d+)$/.exec(e.message) || [], 2), position = _b[1];
                 return position;
             }
             return e.message;
@@ -157,48 +247,53 @@ 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 = tslib.__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 = amisCore.generateIcon(cx, icon, 'Icon');
-        return (React__default["default"].createElement(React__default["default"].Fragment, null,
+        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 = tslib.__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 = _J$X_(icons.Icon, { cx: cx, icon: icon, className: "Icon" });
+        var mobileUI = useMobileUI && amisCore.isMobile();
+        return (_J$X_(React__default["default"].Fragment, null,
             children ? (children({
                 isOpened: this.state.isOpened,
                 onClick: this.handleClick,
                 setState: this.updateState
-            })) : (React__default["default"].createElement("div", { className: cx('FormulaPicker', className, mode === 'input-group' ? 'is-input-group' : ''), style: style },
-                mode === 'button' && (React__default["default"].createElement(Button["default"], { className: cx('FormulaPicker-action', 'w-full'), level: level, size: btnSize, onClick: this.handleClick },
+            })) : (_J$X_("div", { className: cx('FormulaPicker', mode === 'input-group' ? 'is-input-group' : '', {
+                    'FormulaPicker--text': this.isTextInput()
+                }, className), style: style },
+                mode === 'button' && (_J$X_(Button["default"], { className: cx('FormulaPicker-action', 'w-full'), level: level, size: btnSize, onClick: this.handleClick },
                     iconElement ? (React__default["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 = {},
                             _a['is-filled'] = !!value,
                             _a))
-                    })) : (React__default["default"].createElement(icons.Icon, { icon: "function", className: cx('FormulaPicker-icon', 'icon', (_b = {},
+                    })) : (_J$X_(icons.Icon, { icon: "function", className: cx('FormulaPicker-icon', 'icon', (_b = {},
                             _b['is-filled'] = !!value,
                             _b)) })),
-                    React__default["default"].createElement("span", { className: cx('FormulaPicker-label') }, __(btnLabel || 'FormulaEditor.btnLabel')))),
-                mode === 'input-button' && (React__default["default"].createElement(React__default["default"].Fragment, null,
-                    React__default["default"].createElement(ResultBox["default"], { className: cx('FormulaPicker-input', isOpened ? 'is-active' : '', !!isError ? 'is-error' : ''), allowInput: allowInput, clearable: clearable, value: value, result: allowInput
+                    _J$X_("span", { className: cx('FormulaPicker-label') }, __(btnLabel || 'FormulaEditor.btnLabel')))),
+                mode === 'input-button' && (_J$X_(React__default["default"].Fragment, null,
+                    _J$X_(ResultBox["default"], { className: cx('FormulaPicker-input', isOpened ? 'is-active' : '', !!isError ? 'is-error' : ''), allowInput: allowInput, clearable: clearable, value: value, result: allowInput
                             ? void 0
-                            : Editor.FormulaEditor.highlightValue(value, variables, this.props.evalMode), itemRender: this.renderFormulaValue, onResultChange: amisCore.noop, onChange: this.handleInputChange, disabled: disabled, borderMode: borderMode, placeholder: placeholder }),
-                    React__default["default"].createElement(Button["default"], { className: cx('FormulaPicker-action'), onClick: this.handleClick },
-                        React__default["default"].createElement(icons.Icon, { icon: "function", className: cx('FormulaPicker-icon', 'icon', (_c = {},
+                            : Editor.FormulaEditor.highlightValue(value, this.state.variables, this.props.evalMode), itemRender: this.renderFormulaValue, onResultChange: amisCore.noop, onChange: this.handleInputChange, disabled: disabled, borderMode: borderMode, placeholder: placeholder }),
+                    _J$X_(Button["default"], { className: cx('FormulaPicker-action'), onClick: this.handleClick },
+                        _J$X_(icons.Icon, { icon: "function", className: cx('FormulaPicker-icon', 'icon', (_c = {},
                                 _c['is-filled'] = !!value,
                                 _c)) })))),
-                mode === 'input-group' && (React__default["default"].createElement(React__default["default"].Fragment, null,
-                    React__default["default"].createElement(ResultBox["default"], { className: cx('FormulaPicker-input', isOpened ? 'is-active' : '', !!isError ? 'is-error' : ''), allowInput: allowInput, clearable: clearable, value: value, result: allowInput
-                            ? void 0
-                            : Editor.FormulaEditor.highlightValue(value, variables, this.props.evalMode), itemRender: this.renderFormulaValue, onResultChange: amisCore.noop, onChange: this.handleInputChange, disabled: disabled, borderMode: borderMode, placeholder: placeholder }),
-                    React__default["default"].createElement("a", { className: cx("FormulaPicker-toggler"), onClick: this.handleClick },
-                        React__default["default"].createElement(icons.Icon, { icon: "function", className: "icon" })))))),
-            React__default["default"].createElement(Modal["default"], { size: "md", closeOnEsc: true, show: this.state.isOpened, onHide: this.close, container: popOverContainer },
-                React__default["default"].createElement(Modal["default"].Header, { onClose: this.close, className: "font-bold" }, __(title || 'FormulaEditor.title')),
-                React__default["default"].createElement(Modal["default"].Body, null,
-                    React__default["default"].createElement(Editor["default"], tslib.__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["default"].createElement(Modal["default"].Footer, null,
-                    !!isError ? (React__default["default"].createElement("div", { className: cx('Dialog-info'), key: "info" },
-                        React__default["default"].createElement("span", { className: cx('Dialog-error') }, __('FormulaEditor.invalidData', { err: isError })))) : null,
-                    React__default["default"].createElement(Button["default"], { onClick: this.close }, __('cancel')),
-                    React__default["default"].createElement(Button["default"], { onClick: this.handleEditorConfirm, level: "primary" }, __('confirm'))))));
+                mode === 'input-group' && (_J$X_(React__default["default"].Fragment, null,
+                    _J$X_(Input["default"], { 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 }),
+                    _J$X_("a", { className: cx("FormulaPicker-toggler"), onClick: this.handleClick },
+                        _J$X_(icons.Icon, { icon: "function", className: "icon" })))))),
+            mobileUI ? (_J$X_(PopUp["default"], { className: cx("FormulaPicker-popup"), isShow: this.state.isOpened, showConfirm: true, onHide: this.close, onConfirm: this.handleEditorConfirm, container: popOverContainer },
+                _J$X_("div", { className: cx('FormulaPicker-popup-inner') },
+                    _J$X_(Editor["default"], tslib.__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 ? (_J$X_("div", { className: cx('Dialog-info'), key: "info" },
+                        _J$X_("span", { className: cx('Dialog-error') }, __('FormulaEditor.invalidData', { err: isError })))) : null))) : (_J$X_(Modal["default"], { size: "lg", closeOnEsc: true, show: this.state.isOpened, onHide: this.close, container: popOverContainer },
+                _J$X_(Modal["default"].Header, { onClose: this.close, className: "font-bold" }, __(title || 'FormulaEditor.title')),
+                _J$X_(Modal["default"].Body, null,
+                    _J$X_(Editor["default"], tslib.__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 }))),
+                _J$X_(Modal["default"].Footer, null,
+                    !!isError ? (_J$X_("div", { className: cx('Dialog-info'), key: "info" },
+                        _J$X_("span", { className: cx('Dialog-error') }, __('FormulaEditor.invalidData', { err: isError })))) : null,
+                    _J$X_(Button["default"], { onClick: this.close }, __('cancel')),
+                    _J$X_(Button["default"], { onClick: this.handleEditorConfirm, level: "primary" }, __('confirm')))))));
     };
     FormulaPicker.defaultProps = {
         evalMode: true
@@ -270,4 +365,5 @@ var Picker = amisCore.themeable(amisCore.localeable(amisCore.uncontrollable(Form
 })));
 
 exports.FormulaPicker = FormulaPicker;
+exports.InputSchemaType = InputSchemaType;
 exports["default"] = Picker;

package/lib/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/lib/components/formula/VariableList.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.1.1
+ * amis-ui v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -15,45 +15,152 @@ var Tabs = require('../Tabs.js');
 var TreeSelection = require('../TreeSelection.js');
 var SearchBox = require('../SearchBox.js');
 var Badge = require('../Badge.js');
+var PopOverContainer = require('../PopOverContainer.js');
+var matchSorter = require('match-sorter');
+var TooltipWrapper = require('../TooltipWrapper.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
+var __react_jsx__ = require('react');
+var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
+(__react_jsx__["default"] || __react_jsx__).Fragment;
+// 数组成员读取
+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["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 = tslib.__read(React__default["default"].useState(list), 2), filterVars = _b[0], setFilterVars = _b[1];
     var classPrefix = "".concat(themePrefix, "FormulaEditor-VariableList");
+    React.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["default"].createElement("span", { className: cx("".concat(classPrefix, "-item"), itemClassName) },
-                option.label &&
-                    selfVariableName &&
-                    option.value === selfVariableName && (React__default["default"].createElement(Badge.Badge, { classnames: cx, badge: {
-                        mode: 'text',
-                        text: 'self',
-                        offset: [15, 2]
-                    } },
-                    React__default["default"].createElement("label", null, option.label))),
-                option.label &&
-                    (!selfVariableName || option.value !== selfVariableName) && (React__default["default"].createElement("label", null, option.label)),
-                (option === null || option === void 0 ? void 0 : option.tag) ? (React__default["default"].createElement("span", { className: cx("".concat(classPrefix, "-item-tag")) }, option.tag)) : null));
+            var _a;
+            return (_J$X_("div", null,
+                _J$X_("div", { className: cx("".concat(classPrefix, "-item"), itemClassName) },
+                    option.label &&
+                        selfVariableName &&
+                        option.value === selfVariableName && (_J$X_(Badge.Badge, { classnames: cx, badge: {
+                            mode: 'text',
+                            text: 'self',
+                            offset: [15, 2]
+                        } },
+                        _J$X_("label", null, option.label))),
+                    option.memberDepth === undefined &&
+                        option.label &&
+                        (!selfVariableName || option.value !== selfVariableName) && (_J$X_(TooltipWrapper["default"], { tooltip: (_a = option.description) !== null && _a !== void 0 ? _a : option.label, tooltipTheme: "dark" },
+                        _J$X_("label", null, option.label))),
+                    option.memberDepth !== undefined &&
+                        option.label &&
+                        (!selfVariableName || option.value !== selfVariableName) ? (option.memberDepth < 2 ? (_J$X_(PopOverContainer.PopOverContainer, { popOverContainer: function () {
+                            return document.querySelector(".".concat(cx('FormulaPicker-Modal')));
+                        }, popOverRender: function (_a) {
+                            var onClose = _a.onClose;
+                            return (_J$X_("ul", { className: cx("".concat(classPrefix, "-item-oper")) }, memberOpers.map(function (item, i) {
+                                return (_J$X_(TooltipWrapper["default"], { tooltip: item.description, tooltipTheme: "dark" },
+                                    _J$X_("li", { key: i, onClick: function () {
+                                            return handleMemberClick(tslib.__assign(tslib.__assign({}, item), { isMember: true }), option, onClose);
+                                        } },
+                                        _J$X_("span", null, item.label))));
+                            })));
+                        } }, function (_a) {
+                        var _b;
+                        var onClick = _a.onClick; _a.ref; _a.isOpened;
+                        return (_J$X_(TooltipWrapper["default"], { tooltip: (_b = option.description) !== null && _b !== void 0 ? _b : option.label, tooltipTheme: "dark" },
+                            _J$X_("label", { onClick: onClick }, option.label)));
+                    })) : (_J$X_("label", null, option.label))) : null,
+                    (option === null || option === void 0 ? void 0 : option.tag) ? (_J$X_("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(tslib.__assign(tslib.__assign({}, item), { label: value, value: value }));
+    }
     function onSearch(term) {
-        var tree = amisCore.findTreeAll(list, function (i) { return ~i.label.indexOf(term); });
+        var tree = amisCore.filterTree(list, function (i, key, level, paths) {
+            return !!((Array.isArray(i.children) && i.children.length) ||
+                !!matchSorter.matchSorter([i].concat(paths), term, {
+                    keys: ['label', 'value']
+                }).length);
+        }, 1, true);
         setFilterVars(!term ? list : tree);
     }
     function renderSearchBox() {
-        return (React__default["default"].createElement("div", { className: cx('FormulaEditor-VariableList-searchBox') },
-            React__default["default"].createElement(SearchBox["default"], { mini: false, onSearch: onSearch })));
+        return (_J$X_("div", { className: cx('FormulaEditor-VariableList-searchBox') },
+            _J$X_(SearchBox["default"], { 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["default"].createElement("div", { className: cx(className, 'FormulaEditor-VariableList', selectMode && "FormulaEditor-VariableList-".concat(selectMode)) }, selectMode === 'tabs' ? (React__default["default"].createElement(Tabs["default"], { tabsMode: tabsMode, className: cx("".concat(classPrefix, "-base ").concat(classPrefix, "-tabs")) }, filterVars.map(function (item, index) { return (React__default["default"].createElement(Tabs.Tab, { className: cx("".concat(classPrefix, "-tab")), eventKey: index, key: index, title: item.label },
-        React__default["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["default"].createElement("div", { className: cx('FormulaEditor-VariableList-body') },
+    return (_J$X_("div", { className: cx(className, 'FormulaEditor-VariableList', selectMode && "FormulaEditor-VariableList-".concat(selectMode)), ref: variableListRef }, selectMode === 'tabs' ? (_J$X_(Tabs["default"], { tabsMode: tabsMode, className: cx("".concat(classPrefix, "-base ").concat(classPrefix, "-tabs")) }, filterVars.map(function (item, index) { return (_J$X_(Tabs.Tab, { className: cx("".concat(classPrefix, "-tab")), eventKey: index, key: index, title: item.label },
+        _J$X_(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' ? (_J$X_("div", { className: cx('FormulaEditor-VariableList-body') },
         renderSearchBox(),
-        React__default["default"].createElement(TreeSelection["default"], { 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["default"].createElement("div", { className: cx('FormulaEditor-VariableList-body') },
+        _J$X_(TreeSelection["default"], { 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); } }))) : (_J$X_("div", { className: cx('FormulaEditor-VariableList-body') },
         renderSearchBox(),
-        React__default["default"].createElement(GroupedSelection["default"], { 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); } })))));
+        _J$X_(GroupedSelection["default"], { itemRender: itemRender, placeholderRender: placeholderRender, className: cx("".concat(classPrefix, "-base"), 'is-scrollable'), multiple: false, options: filterVars, onChange: function (item) { return handleChange(item); } })))));
 }
 var VariableList$1 = amisCore.themeable(VariableList);
 

package/lib/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;