amis-ui 3.2.0 → 3.3.0

package/lib/components/formula/Picker.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.2.0
+ * amis-ui v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -16,11 +16,24 @@ 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) {
@@ -39,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)) {
@@ -56,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;
@@ -72,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;
@@ -89,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;
@@ -155,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, {
@@ -166,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;
@@ -175,52 +248,52 @@ var FormulaPicker = /** @class */ (function (_super) {
     FormulaPicker.prototype.render = function () {
         var _a, _b, _c;
         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, 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"]);
+        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 = amisCore.generateIcon(cx, icon, 'Icon');
+        var iconElement = _J$X_(icons.Icon, { cx: cx, icon: icon, className: "Icon" });
         var mobileUI = useMobileUI && amisCore.isMobile();
-        return (React__default["default"].createElement(React__default["default"].Fragment, null,
+        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, this.state.variables, this.props.evalMode), itemRender: this.renderFormulaValue, onResultChange: amisCore.noop, onChange: this.handleInputChange, disabled: disabled, borderMode: borderMode, placeholder: placeholder, useMobileUI: useMobileUI, showArrow: false }),
-                    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, this.state.variables, this.props.evalMode), itemRender: this.renderFormulaValue, onResultChange: amisCore.noop, onChange: this.handleInputChange, disabled: disabled, borderMode: borderMode, placeholder: placeholder, useMobileUI: useMobileUI, showArrow: false }),
-                    React__default["default"].createElement("a", { className: cx("FormulaPicker-toggler"), onClick: this.handleClick },
-                        React__default["default"].createElement(icons.Icon, { icon: "function", className: "icon" })))))),
-            mobileUI ? (React__default["default"].createElement(PopUp["default"], { className: cx("FormulaPicker-popup"), isShow: this.state.isOpened, showConfirm: true, onHide: this.close, onConfirm: this.handleEditorConfirm, container: popOverContainer },
-                React__default["default"].createElement("div", { className: cx('FormulaPicker-popup-inner') },
-                    React__default["default"].createElement(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 ? (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(Modal["default"], { size: "lg", 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: 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["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
@@ -292,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.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.2.0
+ * amis-ui v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -23,39 +23,55 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 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})'
+        value: 'ARRAYMAP(${arr}, item => item.${member})',
+        description: '即该列所有记录'
     },
     {
-        label: '取该成员的记录并过滤',
-        value: 'ARRAYFILTER(${arr}, item => item.${member})'
+        label: '取符合条件的该成员的记录',
+        value: 'ARRAYFILTER(ARRAYMAP(${arr}, item => item.${member}), item => item === 条件)',
+        description: '即该列所有记录中符合条件的记录，需补充条件，例如：item === 1'
     },
     {
-        label: '取该成员列表记录中符合条件的总数',
-        value: 'COUNT(ARRAYFILTER(${arr}, item => item.${member} === 条件))'
+        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}))'
+        value: 'COUNT(UNIQ(${arr}, item.${member}))',
+        description: '即对该成员记录进行去重，并统计总数'
     },
     {
         label: '取该成员的总和',
-        value: 'SUM(ARRAYMAP(${arr}, item => item.${member}))'
+        value: 'SUM(ARRAYMAP(${arr}, item => item.${member}))',
+        description: '即计算该成员记录的总和，需确认该成员记录均为数字类型'
     },
     {
         label: '取该成员的平均值',
-        value: 'AVG(ARRAYMAP(${arr}, item => item.${member}))'
+        value: 'AVG(ARRAYMAP(${arr}, item => item.${member}))',
+        description: '即计算该成员记录的平均值，需确认该成员记录均为数字类型'
     },
     {
         label: '取该成员的最大值',
-        value: 'MAX(ARRAYMAP(${arr}, item => item.${member}))'
+        value: 'MAX(ARRAYMAP(${arr}, item => item.${member}))',
+        description: '即计算该成员记录中最大值，需确认该成员记录均为数字类型'
     },
     {
         label: '取该成员的最小值',
-        value: 'MIN(ARRAYMAP(${arr}, item => item.${member}))'
+        value: 'MIN(ARRAYMAP(${arr}, item => item.${member}))',
+        description: '即计算该成员记录中最小值，需确认该成员记录均为数字类型'
     }
 ];
 function VariableList(props) {
@@ -73,40 +89,47 @@ function VariableList(props) {
         ? props.itemRender
         : function (option, states) {
             var _a;
-            return (React__default["default"].createElement("div", null,
-                React__default["default"].createElement("div", { className: cx("".concat(classPrefix, "-item"), itemClassName) },
+            return (_J$X_("div", null,
+                _J$X_("div", { className: cx("".concat(classPrefix, "-item"), itemClassName) },
                     option.label &&
                         selfVariableName &&
-                        option.value === selfVariableName && (React__default["default"].createElement(Badge.Badge, { classnames: cx, badge: {
+                        option.value === selfVariableName && (_J$X_(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(TooltipWrapper["default"], { tooltip: (_a = option.description) !== null && _a !== void 0 ? _a : option.label, tooltipTheme: "dark" },
-                        React__default["default"].createElement("label", null, option.label))),
-                    option.memberDepth < 2 ? (React__default["default"].createElement(PopOverContainer.PopOverContainer, { popOverContainer: function () {
+                        _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 (React__default["default"].createElement("ul", { className: cx("".concat(classPrefix, "-item-oper")) }, memberOpers.map(function (item, i) {
-                                return (React__default["default"].createElement("li", { key: i, onClick: function () {
-                                        return handleMemberClick(tslib.__assign(tslib.__assign({}, item), { isMember: true }), option, onClose);
-                                    } },
-                                    React__default["default"].createElement("span", null, item.label)));
+                            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 (React__default["default"].createElement("i", { className: "fa fa-ellipsis-h", onClick: onClick }));
-                    })) : null,
-                    (option === null || option === void 0 ? void 0 : option.tag) ? (React__default["default"].createElement("span", { className: cx("".concat(classPrefix, "-item-tag")) }, option.tag)) : null)));
+                        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：暂时只提供一层的快捷操作
-        var lastPointIdx = option.value.lastIndexOf('.');
-        var arr = option.value.substring(0, lastPointIdx);
-        var member = option.value.substring(lastPointIdx + 1);
+        // 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);
@@ -123,21 +146,21 @@ function VariableList(props) {
         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, useMobileUI: true })));
+        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) {
+        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)), ref: variableListRef }, 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: handleChange, 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, expand: expandTree ? 'all' : 'none', options: filterVars, onChange: function (item) { return handleChange(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 handleChange(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.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.2.0
+ * amis-ui v3.3.0
  * Copyright 2018-2023 fex
  */
 

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

package/lib/components/icons.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.2.0
+ * amis-ui v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -104,23 +104,28 @@ var newEdit = require('../icons/new-edit.svg.js');
 var rotateLeft = require('../icons/rotate-left.svg.js');
 var rotateRight = require('../icons/rotate-right.svg.js');
 var scaleOrigin = require('../icons/scale-origin.svg.js');
+var isObject = require('lodash/isObject');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
+var isObject__default = /*#__PURE__*/_interopDefaultLegacy(isObject);
 
+var __react_jsx__ = require('react');
+var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
+(__react_jsx__["default"] || __react_jsx__).Fragment;
 // 兼容原来的用法，后续不直接试用。
-var closeIcon = React__default["default"].createElement(close["default"], null);
-var unDoIcon = React__default["default"].createElement(undo["default"], null);
-var reDoIcon = React__default["default"].createElement(redo["default"], null);
-var enterIcon = React__default["default"].createElement(enter["default"], null);
-var volumeIcon = React__default["default"].createElement(volume["default"], null);
-var muteIcon = React__default["default"].createElement(mute["default"], null);
-var playIcon = React__default["default"].createElement(play["default"], null);
-var pauseIcon = React__default["default"].createElement(pause["default"], null);
-var leftArrowIcon = React__default["default"].createElement(leftArrow["default"], null);
-var rightArrowIcon = React__default["default"].createElement(rightArrow["default"], null);
+var closeIcon = _J$X_(close["default"], null);
+var unDoIcon = _J$X_(undo["default"], null);
+var reDoIcon = _J$X_(redo["default"], null);
+var enterIcon = _J$X_(enter["default"], null);
+var volumeIcon = _J$X_(volume["default"], null);
+var muteIcon = _J$X_(mute["default"], null);
+var playIcon = _J$X_(play["default"], null);
+var pauseIcon = _J$X_(pause["default"], null);
+var leftArrowIcon = _J$X_(leftArrow["default"], null);
+var rightArrowIcon = _J$X_(rightArrow["default"], null);
 var iconFactory = {};
 function getIconNames() {
     return Object.keys(iconFactory);
@@ -235,16 +240,23 @@ registerIcon('rotate-left', rotateLeft["default"]);
 registerIcon('rotate-right', rotateRight["default"]);
 registerIcon('scale-origin', scaleOrigin["default"]);
 function Icon(_a) {
-    var icon = _a.icon, className = _a.className, wrapClassName = _a.wrapClassName, _b = _a.classPrefix, classPrefix = _b === void 0 ? '' : _b, iconContent = _a.iconContent, rest = tslib.__rest(_a, ["icon", "className", "wrapClassName", "classPrefix", "iconContent"]);
-    // jest 运行环境下，把指定的 icon 也输出到 snapshot 中。
-    if (typeof jest !== 'undefined') {
-        rest.icon = icon;
+    var icon = _a.icon, className = _a.className, _b = _a.classPrefix, classPrefix = _b === void 0 ? '' : _b, classNameProp = _a.classNameProp, iconContent = _a.iconContent, vendor = _a.vendor, iconCx = _a.cx, _c = _a.onClick, onClick = _c === void 0 ? function () { } : _c, style = _a.style;
+    var cx = iconCx || cx__default["default"];
+    if (typeof jest !== 'undefined' && icon) {
+        iconContent = '';
     }
-    var _c = tslib.__read(React.useState(false), 2), showCssIcon = _c[0], setShowCssIcon = _c[1];
+    if (!icon) {
+        return null;
+    }
+    // 直接的icon dom
+    if (React__default["default"].isValidElement(icon)) {
+        return React__default["default"].cloneElement(icon, tslib.__assign(tslib.__assign({}, (icon.props || {})), { className: cx__default["default"](cx(className, classNameProp), icon.props.className), style: style, onClick: onClick }));
+    }
+    // 从css变量中获取icon
     function refFn(dom) {
         if (dom) {
-            var style = getComputedStyle(dom);
-            var svgStr = style.getPropertyValue('content');
+            var style_1 = getComputedStyle(dom);
+            var svgStr = style_1.getPropertyValue('content');
             var svg = /(<svg.*<\/svg>)/.exec(svgStr);
             if (svg) {
                 var svgHTML = svg[0].replace(/\\"/g, '"');
@@ -253,25 +265,59 @@ function Icon(_a) {
                     // 存储svg，不直接用innerHTML是防止<circle />渲染后变成<circle></circle>的情况
                     dom.svgHTMLClone = svgHTML;
                     dom.style.display = '';
-                    setShowCssIcon(true);
                 }
             }
-            else {
-                // 当传入svg为空时，隐藏div，展示原icon
-                dom.style.display = 'none';
-                setShowCssIcon(false);
-            }
         }
     }
+    if (iconContent) {
+        return (_J$X_("div", { onClick: onClick, className: cx(iconContent, className, classNameProp), ref: refFn, style: style }));
+    }
+    // 获取注册的icon
     var Component = getIcon(icon);
+    if (Component) {
+        return (_J$X_(Component, { onClick: onClick, className: cx(className, "icon-".concat(icon), classNameProp), 
+            // @ts-ignore
+            icon: icon, style: style }));
+    }
+    // 符合schema的icon
+    if (isObject__default["default"](icon) &&
+        icon.type === 'icon' &&
+        icon.icon) {
+        icon = icon.icon;
+    }
+    // icon是引用svg的情况
+    if (isObject__default["default"](icon) &&
+        typeof icon.id === 'string' &&
+        icon.id.startsWith('svg-')) {
+        return (_J$X_("svg", { onClick: onClick, className: cx('icon', 'icon-object', className, classNameProp), style: style },
+            _J$X_("use", { xlinkHref: "#".concat(icon.id.replace(/^svg-/, '')) })));
+    }
+    // icon是链接
     var isURLIcon = typeof icon === 'string' && (icon === null || icon === void 0 ? void 0 : icon.indexOf('.')) !== -1;
-    var isIconfont = typeof icon === 'string' &&
-        (~(icon === null || icon === void 0 ? void 0 : icon.indexOf('iconfont')) || ~(icon === null || icon === void 0 ? void 0 : icon.indexOf('fa')));
-    return Component ? (React__default["default"].createElement(React__default["default"].Fragment, null,
-        iconContent ? (React__default["default"].createElement("div", { className: "".concat(wrapClassName || '') + ' ' + iconContent, ref: refFn })) : null,
-        !showCssIcon ? (React__default["default"].createElement(Component, tslib.__assign({}, rest, { className: "".concat(className || '', " icon-").concat(icon) }))) : null)) : isURLIcon ? (React__default["default"].createElement("img", { className: cx__default["default"]("".concat(classPrefix, "Icon"), className), src: icon })) : isIconfont ? (React__default["default"].createElement("i", { className: cx__default["default"](icon, className) })) : (React__default["default"].createElement("span", { className: "text-danger" },
+    if (isURLIcon) {
+        return (_J$X_("img", { onClick: onClick, className: cx("".concat(classPrefix, "Icon"), className, classNameProp), src: icon, style: style }));
+    }
+    // icon是普通字符串
+    var isIconfont = typeof icon === 'string';
+    var iconPrefix = '';
+    if (vendor === 'iconfont') {
+        iconPrefix = "iconfont icon-".concat(icon);
+    }
+    else if (vendor === 'fa') {
+        //默认是fontawesome v4，兼容之前配置
+        iconPrefix = "".concat(vendor, " ").concat(vendor, "-").concat(icon);
+    }
+    else {
+        // 如果vendor为空，则不设置前缀,这样可以支持fontawesome v5、fontawesome v6或者其他框架
+        iconPrefix = icon;
+    }
+    if (isIconfont) {
+        return (_J$X_("i", { onClick: onClick, className: cx(icon, className, classNameProp, iconPrefix), style: style }));
+    }
+    // 没有合适的图标
+    return _J$X_("span", { className: "text-danger" },
         "\u6CA1\u6709 icon ",
-        icon));
+        icon);
 }
 
 exports.CloseIcon = close["default"];