amis-ui 2.2.0 → 2.3.1

package/lib/components/formula/Picker.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.2.0
+ * amis-ui v2.3.1
  * Copyright 2018-2022 fex
  */
 
@@ -24,13 +24,13 @@ var FormulaPicker = /** @class */ (function (_super) {
     tslib.__extends(FormulaPicker, _super);
     function FormulaPicker(props) {
         var _this = _super.call(this, props) || this;
+        _this.props.onRef && _this.props.onRef(_this);
         _this.state = {
             isOpened: false,
             value: _this.props.value,
-            editorValue: _this.props.value,
+            editorValue: _this.value2EditorValue(_this.props),
             isError: false
         };
-        _this.props.onRef && _this.props.onRef(_this);
         return _this;
     }
     FormulaPicker.prototype.componentDidUpdate = function (prevProps) {
@@ -38,10 +38,22 @@ var FormulaPicker = /** @class */ (function (_super) {
         if (typeof value !== 'undefined' && value !== prevProps.value) {
             this.setState({
                 value: value,
-                editorValue: value
+                editorValue: this.value2EditorValue(this.props)
             });
         }
     };
+    FormulaPicker.prototype.value2EditorValue = function (props) {
+        if (props.mixedMode) {
+            if (typeof props.value === 'string' &&
+                /^\s*\$\{(.+?)\}\s*$/.test(props.value)) {
+                return RegExp.$1;
+            }
+            else {
+                return '';
+            }
+        }
+        return String(props.value || '');
+    };
     FormulaPicker.prototype.handleConfirm = function () {
         var _a, _b;
         var value = this.state.value;
@@ -81,9 +93,10 @@ var FormulaPicker = /** @class */ (function (_super) {
     };
     FormulaPicker.prototype.confirm = function (value) {
         var _this = this;
+        var mixedMode = this.props.mixedMode;
         var validate = this.validate(value);
         if (validate === true) {
-            this.setState({ value: value }, function () {
+            this.setState({ value: mixedMode && value ? "${".concat(value, "}") : value }, function () {
                 _this.close(undefined, function () { return _this.handleConfirm(); });
             });
         }
@@ -101,7 +114,7 @@ var FormulaPicker = /** @class */ (function (_super) {
                         _c = [{}];
                         return [4 /*yield*/, ((_b = (_a = this.props).onPickerOpen) === null || _b === void 0 ? void 0 : _b.call(_a, this.props))];
                     case 1:
-                        state = tslib.__assign.apply(void 0, [tslib.__assign.apply(void 0, _c.concat([(_d.sent())])), { editorValue: this.props.value, isOpened: true }]);
+                        state = tslib.__assign.apply(void 0, [tslib.__assign.apply(void 0, _c.concat([(_d.sent())])), { editorValue: this.value2EditorValue(this.props), isOpened: true }]);
                         this.setState(state);
                         return [2 /*return*/];
                 }
@@ -129,7 +142,7 @@ var FormulaPicker = /** @class */ (function (_super) {
         try {
             value &&
                 amisCore.parse(value, {
-                    evalMode: this.props.evalMode,
+                    evalMode: this.props.mixedMode ? true : this.props.evalMode,
                     allowFilter: false
                 });
             return true;
@@ -145,7 +158,7 @@ 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; _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, rest = tslib.__rest(_j, ["classnames", "translate", "disabled", "allowInput", "className", "onChange", "size", "borderMode", "placeholder", "mode", "btnLabel", "level", "btnSize", "icon", "title", "clearable", "variables", "functions", "children", "variableMode"]);
+        var _j = this.props, cx = _j.classnames, __ = _j.translate, disabled = _j.disabled, _k = _j.allowInput, allowInput = _k === void 0 ? true : _k, className = _j.className; _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, rest = tslib.__rest(_j, ["classnames", "translate", "disabled", "allowInput", "className", "onChange", "size", "borderMode", "placeholder", "mode", "btnLabel", "level", "btnSize", "icon", "title", "clearable", "variables", "functions", "children", "variableMode", "mixedMode", "evalMode"]);
         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,
@@ -180,7 +193,7 @@ var FormulaPicker = /** @class */ (function (_super) {
             React__default["default"].createElement(Modal["default"], { size: "md", closeOnEsc: true, show: this.state.isOpened, onHide: this.close },
                 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, { 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(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,

package/lib/components/formula/VariableList.js

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

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

@@ -2,7 +2,7 @@
  * @file 扩展 codemirror
  */
 import type CodeMirror from 'codemirror';
-import type { FormulaEditorProps, VariableItem } from './Editor';
+import { FormulaEditorProps, VariableItem } from './Editor';
 export declare function editorFactory(dom: HTMLElement, cm: typeof CodeMirror, props: any): CodeMirror.Editor;
 export declare class FormulaPlugin {
     readonly editor: CodeMirror.Editor;

package/lib/components/formula/plugin.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.2.0
+ * amis-ui v2.3.1
  * Copyright 2018-2022 fex
  */
 
@@ -8,6 +8,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var amisCore = require('amis-core');
+var Editor = require('./Editor.js');
 
 /**
  * @file 扩展 codemirror
@@ -149,6 +150,7 @@ var FormulaPlugin = /** @class */ (function () {
         var vars = Object.keys(varMap).sort(function (a, b) { return b.length - a.length; });
         var editor = this.editor;
         var lines = editor.lineCount();
+        var _a = this.getProps().evalMode, evalMode = _a === void 0 ? true : _a;
         var _loop_1 = function (line) {
             var content = editor.getLine(line);
             // 标记方法调用
@@ -168,9 +170,9 @@ var FormulaPlugin = /** @class */ (function () {
                 var from = 0;
                 var idx = -1;
                 while (~(idx = content.indexOf(v, from))) {
-                    var encode = content.replace(v, REPLACE_KEY);
-                    var curNameEg = new RegExp("\\b".concat(REPLACE_KEY, "\\b"), 'g');
-                    if (curNameEg.test(encode)) {
+                    var encode = Editor.FormulaEditor.replaceStrByIndex(content, idx, v, REPLACE_KEY);
+                    var reg = Editor.FormulaEditor.getRegExpByMode(evalMode, REPLACE_KEY);
+                    if (reg.test(encode)) {
                         _this.markText({
                             line: line,
                             ch: idx

package/lib/components/icons.js

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

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

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

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

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

package/lib/components/json-schema/Object.js

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

package/lib/components/json-schema/index.js

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

package/lib/components/schema-editor/Array.js

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

package/lib/components/schema-editor/Common.js

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

package/lib/components/schema-editor/Item.js

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

package/lib/components/schema-editor/Object.js

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

package/lib/components/schema-editor/SchemaVariableList.js

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

package/lib/components/schema-editor/SchemaVariableListPicker.js

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

package/lib/components/schema-editor/index.js

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

package/lib/components/table/Cell.js

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

package/lib/components/table/HeadCellDropDown.js

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

package/lib/components/table/HeadCellFilter.js

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

package/lib/components/table/HeadCellSelect.js

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

package/lib/components/table/HeadCellSort.js

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

package/lib/components/table/ItemActionsWrapper.js

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