amis-ui 2.2.0 → 2.3.1

package/esm/components/condition-builder/Group.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.2.0
+ * amis-ui v2.3.1
  * Copyright 2018-2022 fex
  */
 
@@ -78,7 +78,7 @@ var ConditionGroup = /** @class */ (function (_super) {
     };
     ConditionGroup.prototype.render = function () {
         var _this = this;
-        var _a = this.props, builderMode = _a.builderMode, cx = _a.classnames, fieldClassName = _a.fieldClassName, value = _a.value, data = _a.data, fields = _a.fields, funcs = _a.funcs, config = _a.config, removeable = _a.removeable, onRemove = _a.onRemove, onDragStart = _a.onDragStart, showNot = _a.showNot, _b = _a.showANDOR, showANDOR = _b === void 0 ? false : _b, disabled = _a.disabled, searchable = _a.searchable, __ = _a.translate, formula = _a.formula, popOverContainer = _a.popOverContainer, renderEtrValue = _a.renderEtrValue;
+        var _a = this.props, builderMode = _a.builderMode, cx = _a.classnames, fieldClassName = _a.fieldClassName, value = _a.value, data = _a.data, fields = _a.fields, funcs = _a.funcs, config = _a.config, removeable = _a.removeable, onRemove = _a.onRemove, onDragStart = _a.onDragStart, showNot = _a.showNot, _b = _a.showANDOR, showANDOR = _b === void 0 ? false : _b, disabled = _a.disabled, searchable = _a.searchable, __ = _a.translate, formula = _a.formula, popOverContainer = _a.popOverContainer, selectMode = _a.selectMode, renderEtrValue = _a.renderEtrValue;
         return (React__default.createElement("div", { className: cx('CBGroup'), "data-group-id": value === null || value === void 0 ? void 0 : value.id },
             builderMode === 'simple' && showANDOR === false ? null : (React__default.createElement("div", { className: cx('CBGroup-toolbarCondition') },
                 showNot ? (React__default.createElement(Button, { onClick: this.handleNotClick, className: "m-r-xs", size: "xs", active: value === null || value === void 0 ? void 0 : value.not, disabled: disabled }, __('Condition.not'))) : null,
@@ -92,7 +92,7 @@ var ConditionGroup = /** @class */ (function (_super) {
                             value: 'or'
                         }
                     ], value: (value === null || value === void 0 ? void 0 : value.conjunction) || 'and', disabled: disabled, onChange: this.handleConjunctionChange, clearable: false }))),
-            React__default.createElement("div", { className: cx('CBGroup-body') }, Array.isArray(value === null || value === void 0 ? void 0 : value.children) && value.children.length ? (value.children.map(function (item, index) { return (React__default.createElement(GroupOrItem, { draggable: value.children.length > 1, onDragStart: onDragStart, config: config, key: item.id, fields: fields, fieldClassName: fieldClassName, value: item, index: index, onChange: _this.handleItemChange, funcs: funcs, onRemove: _this.handleItemRemove, data: data, disabled: disabled, searchable: searchable, builderMode: builderMode, formula: formula, popOverContainer: popOverContainer, renderEtrValue: renderEtrValue })); })) : (React__default.createElement("div", { className: cx("CBGroup-placeholder ".concat(builderMode === 'simple' ? 'simple' : '')) }, __('Condition.blank')))),
+            React__default.createElement("div", { className: cx('CBGroup-body') }, Array.isArray(value === null || value === void 0 ? void 0 : value.children) && value.children.length ? (value.children.map(function (item, index) { return (React__default.createElement(GroupOrItem, { draggable: value.children.length > 1, onDragStart: onDragStart, config: config, key: item.id, fields: fields, fieldClassName: fieldClassName, value: item, index: index, onChange: _this.handleItemChange, funcs: funcs, onRemove: _this.handleItemRemove, data: data, disabled: disabled, searchable: searchable, builderMode: builderMode, formula: formula, popOverContainer: popOverContainer, renderEtrValue: renderEtrValue, selectMode: selectMode })); })) : (React__default.createElement("div", { className: cx("CBGroup-placeholder ".concat(builderMode === 'simple' ? 'simple' : '')) }, __('Condition.blank')))),
             React__default.createElement("div", { className: cx('CBGroup-toolbar') },
                 React__default.createElement("div", { className: cx("CBGroup-toolbarConditionAdd".concat(builderMode === 'simple' ? '-simple' : '')) },
                     React__default.createElement("div", { className: cx('ButtonGroup') },

package/esm/components/condition-builder/GroupOrItem.d.ts

@@ -23,6 +23,7 @@ export interface CBGroupOrItemProps extends ThemeProps {
     formula?: FormulaPickerProps;
     popOverContainer?: any;
     renderEtrValue?: any;
+    selectMode?: 'list' | 'tree';
 }
 export declare class CBGroupOrItem extends React.Component<CBGroupOrItemProps> {
     state: {

package/esm/components/condition-builder/GroupOrItem.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.2.0
+ * amis-ui v2.3.1
  * Copyright 2018-2022 fex
  */
 
@@ -39,7 +39,7 @@ var CBGroupOrItem = /** @class */ (function (_super) {
         });
     };
     CBGroupOrItem.prototype.render = function () {
-        var _a = this.props, builderMode = _a.builderMode, cx = _a.classnames, fieldClassName = _a.fieldClassName, value = _a.value, config = _a.config, fields = _a.fields, funcs = _a.funcs, draggable = _a.draggable, data = _a.data, disabled = _a.disabled, searchable = _a.searchable, onDragStart = _a.onDragStart, formula = _a.formula, popOverContainer = _a.popOverContainer, renderEtrValue = _a.renderEtrValue;
+        var _a = this.props, builderMode = _a.builderMode, cx = _a.classnames, fieldClassName = _a.fieldClassName, value = _a.value, config = _a.config, fields = _a.fields, funcs = _a.funcs, draggable = _a.draggable, data = _a.data, disabled = _a.disabled, searchable = _a.searchable, onDragStart = _a.onDragStart, formula = _a.formula, popOverContainer = _a.popOverContainer, selectMode = _a.selectMode, renderEtrValue = _a.renderEtrValue;
         return (React__default.createElement("div", { className: cx("CBGroupOrItem".concat(builderMode === 'simple' ? '-simple' : '')), "data-id": value === null || value === void 0 ? void 0 : value.id },
             React__default.createElement("div", { className: cx('CBGroupOrItem-body') }, (value === null || value === void 0 ? void 0 : value.conjunction) ? (React__default.createElement("div", { className: cx('CBGroupOrItem-body-group', this.state.hover && 'CBGroupOrItem-body-group--hover'), onMouseOver: this.handlerHoverIn, onMouseOut: this.handlerHoverOut },
                 draggable && !disabled ? (React__default.createElement("a", { draggable: true, onDragStart: onDragStart, className: cx('CBGroupOrItem-dragbar') },
@@ -47,7 +47,7 @@ var CBGroupOrItem = /** @class */ (function (_super) {
                 React__default.createElement(ConditionGroup, { disabled: disabled, searchable: searchable, onDragStart: onDragStart, config: config, fields: fields, value: value, onChange: this.handleItemChange, fieldClassName: fieldClassName, funcs: funcs, removeable: true, onRemove: this.handleItemRemove, data: data, renderEtrValue: renderEtrValue }))) : (React__default.createElement("div", { className: cx('CBGroupOrItem-body-item') },
                 draggable && !disabled ? (React__default.createElement("a", { draggable: true, onDragStart: onDragStart, className: cx('CBGroupOrItem-dragbar') },
                     React__default.createElement(Icon, { icon: "drag-bar", className: "icon" }))) : null,
-                React__default.createElement(ConditionItem, { disabled: disabled, searchable: searchable, config: config, fields: fields, value: value, onChange: this.handleItemChange, fieldClassName: fieldClassName, funcs: funcs, data: data, formula: formula, popOverContainer: popOverContainer, renderEtrValue: renderEtrValue }),
+                React__default.createElement(ConditionItem, { disabled: disabled, searchable: searchable, config: config, fields: fields, value: value, onChange: this.handleItemChange, fieldClassName: fieldClassName, funcs: funcs, data: data, formula: formula, popOverContainer: popOverContainer, renderEtrValue: renderEtrValue, selectMode: selectMode }),
                 React__default.createElement(Button, { className: cx('CBDelete'), onClick: this.handleItemRemove, disabled: disabled },
                     React__default.createElement(Icon, { icon: "remove", className: "icon" })))))));
     };

package/esm/components/condition-builder/InputSwitch.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.2.0
+ * amis-ui v2.3.1
  * Copyright 2018-2022 fex
  */
 

package/esm/components/condition-builder/Item.d.ts

@@ -18,6 +18,7 @@ export interface ConditionItemProps extends ThemeProps, LocaleProps {
     formula?: FormulaPickerProps;
     popOverContainer?: any;
     renderEtrValue?: any;
+    selectMode?: 'list' | 'tree';
 }
 export declare class ConditionItem extends React.Component<ConditionItemProps> {
     handleLeftFieldSelect(field: any): void;

package/esm/components/condition-builder/Item.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.2.0
+ * amis-ui v2.3.1
  * Copyright 2018-2022 fex
  */
 
@@ -69,8 +69,8 @@ var ConditionItem = /** @class */ (function (_super) {
         onChange(value, this.props.index);
     };
     ConditionItem.prototype.renderLeft = function () {
-        var _a = this.props, value = _a.value, fields = _a.fields, funcs = _a.funcs, config = _a.config, disabled = _a.disabled, fieldClassName = _a.fieldClassName, searchable = _a.searchable, popOverContainer = _a.popOverContainer;
-        return (React__default.createElement(Expression, { config: config, funcs: funcs, value: value.left, fieldClassName: fieldClassName, onChange: this.handleLeftChange, fields: fields, disabled: disabled, searchable: searchable, popOverContainer: popOverContainer, allowedTypes: ['field', 'func'].filter(function (type) { return type === 'field' || type === 'func'; }) }));
+        var _a = this.props, value = _a.value, fields = _a.fields, funcs = _a.funcs, config = _a.config, disabled = _a.disabled, fieldClassName = _a.fieldClassName, searchable = _a.searchable, popOverContainer = _a.popOverContainer, selectMode = _a.selectMode;
+        return (React__default.createElement(Expression, { config: config, funcs: funcs, value: value.left, fieldClassName: fieldClassName, onChange: this.handleLeftChange, fields: fields, disabled: disabled, searchable: searchable, popOverContainer: popOverContainer, selectMode: selectMode, allowedTypes: ['field', 'func'].filter(function (type) { return type === 'field' || type === 'func'; }) }));
     };
     ConditionItem.prototype.renderOperator = function () {
         var _this = this;

package/esm/components/condition-builder/Value.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.2.0
+ * amis-ui v2.3.1
  * Copyright 2018-2022 fex
  */
 

package/esm/components/condition-builder/config.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.2.0
+ * amis-ui v2.3.1
  * Copyright 2018-2022 fex
  */
 

package/esm/components/condition-builder/index.d.ts

@@ -24,6 +24,7 @@ export interface ConditionBuilderProps extends ThemeProps, LocaleProps {
     formula?: FormulaPickerProps;
     popOverContainer?: any;
     renderEtrValue?: any;
+    selectMode?: 'list' | 'tree';
 }
 export interface ConditionBuilderState {
     tmpValue: ConditionGroupValue;

package/esm/components/condition-builder/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.2.0
+ * amis-ui v2.3.1
  * Copyright 2018-2022 fex
  */
 
@@ -148,7 +148,7 @@ var QueryBuilder = /** @class */ (function (_super) {
         return (React__default.createElement("div", { className: cx('CPGroup-result'), dangerouslySetInnerHTML: html }));
     };
     QueryBuilder.prototype.renderBody = function (onChange, value, popOverContainer) {
-        var _a = this.props, cx = _a.classnames, fieldClassName = _a.fieldClassName, fields = _a.fields, funcs = _a.funcs, showNot = _a.showNot, showANDOR = _a.showANDOR, data = _a.data, disabled = _a.disabled, searchable = _a.searchable, builderMode = _a.builderMode, formula = _a.formula, renderEtrValue = _a.renderEtrValue;
+        var _a = this.props, cx = _a.classnames, fieldClassName = _a.fieldClassName, fields = _a.fields, funcs = _a.funcs, showNot = _a.showNot, showANDOR = _a.showANDOR, data = _a.data, disabled = _a.disabled, searchable = _a.searchable, builderMode = _a.builderMode, formula = _a.formula, renderEtrValue = _a.renderEtrValue, selectMode = _a.selectMode;
         var normalizedValue = Array.isArray(value === null || value === void 0 ? void 0 : value.children)
             ? __assign(__assign({}, value), { children: mapTree(value.children, function (value) {
                     if (value.id) {
@@ -156,7 +156,7 @@ var QueryBuilder = /** @class */ (function (_super) {
                     }
                     return __assign(__assign({}, value), { id: guid() });
                 }) }) : value;
-        return (React__default.createElement(ConditionGroup, { builderMode: builderMode, config: this.config, funcs: funcs || this.config.funcs, fields: fields || this.config.fields, value: normalizedValue, onChange: onChange, classnames: cx, fieldClassName: fieldClassName, removeable: false, onDragStart: this.handleDragStart, showANDOR: showANDOR, showNot: showNot, data: data, disabled: disabled, searchable: searchable, formula: formula, renderEtrValue: renderEtrValue, popOverContainer: popOverContainer }));
+        return (React__default.createElement(ConditionGroup, { builderMode: builderMode, config: this.config, funcs: funcs || this.config.funcs, fields: fields || this.config.fields, value: normalizedValue, onChange: onChange, classnames: cx, fieldClassName: fieldClassName, removeable: false, onDragStart: this.handleDragStart, showANDOR: showANDOR, showNot: showNot, data: data, disabled: disabled, searchable: searchable, formula: formula, renderEtrValue: renderEtrValue, popOverContainer: popOverContainer, selectMode: selectMode }));
     };
     QueryBuilder.prototype.render = function () {
         var _this = this;

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

@@ -79,6 +79,8 @@ export declare class FormulaEditor extends React.Component<FormulaEditorProps, F
         [propName: string]: any;
     }>): FuncGroup[];
     static defaultProps: Pick<FormulaEditorProps, 'variables' | 'evalMode'>;
+    static replaceStrByIndex(str: string, idx: number, key: string, replaceKey: string): string;
+    static getRegExpByMode(evalMode: boolean, key: string): RegExp;
     static highlightValue(value: string, variables: Array<VariableItem>, evalMode?: boolean): {
         html: string;
     } | undefined;

package/esm/components/formula/Editor.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.2.0
+ * amis-ui v2.3.1
  * Copyright 2018-2022 fex
  */
 
@@ -38,7 +38,19 @@ var FormulaEditor = /** @class */ (function (_super) {
         });
         return funcs;
     };
+    FormulaEditor.replaceStrByIndex = function (str, idx, key, replaceKey) {
+        var from = str.slice(0, idx);
+        var left = str.slice(idx);
+        return from + left.replace(key, replaceKey);
+    };
+    FormulaEditor.getRegExpByMode = function (evalMode, key) {
+        var reg = evalMode
+            ? "\\b".concat(key, "\\b")
+            : "\\$\\{[^\\{\\}]*\\b".concat(key, "\\b[^\\{\\}]*\\}");
+        return new RegExp(reg);
+    };
     FormulaEditor.highlightValue = function (value, variables, evalMode) {
+        if (evalMode === void 0) { evalMode = true; }
         if (!Array.isArray(variables) || !variables.length || !value) {
             return;
         }
@@ -63,12 +75,11 @@ var FormulaEditor = /** @class */ (function (_super) {
             var from = 0;
             var idx = -1;
             while (~(idx = content.indexOf(v, from))) {
-                // 处理一下 \b 匹配不到的字符，比如 中文、[] 等
-                var encodeHtml = html.replace(v, REPLACE_KEY);
-                var curNameEg = new RegExp("\\b".concat(REPLACE_KEY, "\\b"), 'g'); // 避免变量识别冲突，比如：name、me 被识别成 na「me」
+                var encodeHtml = FormulaEditor.replaceStrByIndex(html, idx, v, REPLACE_KEY);
+                var reg = FormulaEditor.getRegExpByMode(evalMode, REPLACE_KEY);
                 // 如果匹配到则高亮，没有匹配到替换成原值
-                if (curNameEg.test(encodeHtml)) {
-                    html = encodeHtml.replace(curNameEg, "<span class=\"c-field\">".concat(varMap[v], "</span>"));
+                if (reg.test(encodeHtml)) {
+                    html = encodeHtml.replace(REPLACE_KEY, "<span class=\"c-field\">".concat(varMap[v], "</span>"));
                 }
                 else {
                     html = encodeHtml.replace(REPLACE_KEY, v);

package/esm/components/formula/FuncList.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.2.0
+ * amis-ui v2.3.1
  * Copyright 2018-2022 fex
  */