amis-editor 6.4.1 → 6.6.0

package/esm/renderer/ConditionFormulaControl.js

@@ -0,0 +1,198 @@
+/**
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
+ * Copyright 2018-2024 @fex
+ */
+
+import { __extends, __awaiter, __generator, __decorate, __metadata } from 'tslib';
+import React__default from 'react';
+import { flattenTree, render, autobind } from 'amis-core';
+import cx from 'classnames';
+import { PickerContainer, Button, FormItem } from 'amis';
+import { reaction } from 'mobx';
+import { getConditionVariables } from 'amis-editor-core';
+
+/**
+ * @file 条件输入框组件
+ */
+// 把数据域中的变量类型转换成符合ConditionBuilder的type
+var PropsFieldsMapping = {
+    string: 'text',
+    number: 'number',
+    boolean: 'boolean'
+};
+var ConditionFormulaControl = /** @class */ (function (_super) {
+    __extends(ConditionFormulaControl, _super);
+    function ConditionFormulaControl(props) {
+        var _this = _super.call(this, props) || this;
+        _this.state = {
+            fields: [],
+            formulaPickerValue: ''
+        };
+        return _this;
+    }
+    ConditionFormulaControl.prototype.componentDidMount = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var editorStore, fieldsArr;
+            var _this = this;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        this.initFormulaPickerValue(this.props.value);
+                        editorStore = window.editorStore;
+                        this.appLocale = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appLocale;
+                        this.appCorpusData = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appCorpusData;
+                        this.unReaction = reaction(function () { return editorStore === null || editorStore === void 0 ? void 0 : editorStore.appLocaleState; }, function () { return __awaiter(_this, void 0, void 0, function () {
+                            return __generator(this, function (_a) {
+                                this.appLocale = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appLocale;
+                                this.appCorpusData = editorStore === null || editorStore === void 0 ? void 0 : editorStore.appCorpusData;
+                                return [2 /*return*/];
+                            });
+                        }); });
+                        return [4 /*yield*/, this.buildFieldsData()];
+                    case 1:
+                        fieldsArr = _a.sent();
+                        this.setState({
+                            fields: fieldsArr
+                        });
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    ConditionFormulaControl.prototype.componentDidUpdate = function (prevProps) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                if (prevProps.value !== this.props.value) {
+                    this.initFormulaPickerValue(this.props.value);
+                }
+                return [2 /*return*/];
+            });
+        });
+    };
+    ConditionFormulaControl.prototype.componentWillUnmount = function () {
+        var _a;
+        this.isUnmount = true;
+        (_a = this.unReaction) === null || _a === void 0 ? void 0 : _a.call(this);
+    };
+    ConditionFormulaControl.prototype.buildFieldsData = function () {
+        var _a;
+        return __awaiter(this, void 0, void 0, function () {
+            var fieldsArr, _b, requiredDataPropsFields, fields, variablesArr;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0:
+                        fieldsArr = [];
+                        _b = this.props, requiredDataPropsFields = _b.requiredDataPropsFields, fields = _b.fields;
+                        if (!requiredDataPropsFields) return [3 /*break*/, 2];
+                        return [4 /*yield*/, getConditionVariables(this)];
+                    case 1:
+                        variablesArr = _c.sent();
+                        fieldsArr = (_a = flattenTree(variablesArr, function (item) {
+                            if (PropsFieldsMapping[item.type]) {
+                                var obj = {
+                                    label: item.label,
+                                    type: PropsFieldsMapping[item.type],
+                                    name: item.value
+                                };
+                                return obj;
+                            }
+                        })) === null || _a === void 0 ? void 0 : _a.filter(function (item) { return item; });
+                        _c.label = 2;
+                    case 2: return [2 /*return*/, fieldsArr.concat(fields || [])];
+                }
+            });
+        });
+    };
+    ConditionFormulaControl.prototype.initFormulaPickerValue = function (value) {
+        this.setState({
+            formulaPickerValue: value
+        });
+    };
+    ConditionFormulaControl.prototype.handleConfirm = function (value) {
+        var _a, _b;
+        if (value === void 0) { value = ''; }
+        (_b = (_a = this.props) === null || _a === void 0 ? void 0 : _a.onChange) === null || _b === void 0 ? void 0 : _b.call(_a, value);
+    };
+    ConditionFormulaControl.prototype.handleOnClick = function (e, onClick) {
+        return __awaiter(this, void 0, void 0, function () {
+            var fieldsArr;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.buildFieldsData()];
+                    case 1:
+                        fieldsArr = _a.sent();
+                        this.setState({
+                            fields: fieldsArr
+                        });
+                        return [2 /*return*/, onClick === null || onClick === void 0 ? void 0 : onClick(e)];
+                }
+            });
+        });
+    };
+    ConditionFormulaControl.prototype.render = function () {
+        var _this = this;
+        var _a = this.props, name = _a.name, className = _a.className, modalSize = _a.modalSize;
+        var _b = this.state, formulaPickerValue = _b.formulaPickerValue, fields = _b.fields;
+        return (React__default.createElement("div", { className: cx('ae-ExpressionFormulaControl', className) },
+            React__default.createElement(PickerContainer, { title: "\u6761\u4EF6\u8BBE\u7F6E", bodyRender: function (_a) {
+                    var value = _a.value, onChange = _a.onChange;
+                    var condition = render({
+                        type: 'condition-builder',
+                        label: false,
+                        name: name,
+                        fields: fields
+                    }, {
+                        value: value,
+                        onChange: onChange
+                    });
+                    return condition;
+                }, value: formulaPickerValue, onConfirm: this.handleConfirm, size: modalSize !== null && modalSize !== void 0 ? modalSize : 'lg' }, function (_a) {
+                var onClick = _a.onClick;
+                return (React__default.createElement(Button, { size: "sm", className: "btn-set-expression", onClick: function (e) { return _this.handleOnClick(e, onClick); } }, "\u70B9\u51FB\u7F16\u5199\u6761\u4EF6"));
+            })));
+    };
+    ConditionFormulaControl.defaultProps = {
+        requiredDataPropsFields: true
+    };
+    __decorate([
+        autobind,
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", []),
+        __metadata("design:returntype", Promise)
+    ], ConditionFormulaControl.prototype, "buildFieldsData", null);
+    __decorate([
+        autobind,
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [String]),
+        __metadata("design:returntype", void 0)
+    ], ConditionFormulaControl.prototype, "initFormulaPickerValue", null);
+    __decorate([
+        autobind,
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [Object]),
+        __metadata("design:returntype", void 0)
+    ], ConditionFormulaControl.prototype, "handleConfirm", null);
+    __decorate([
+        autobind,
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [Object, Function]),
+        __metadata("design:returntype", Promise)
+    ], ConditionFormulaControl.prototype, "handleOnClick", null);
+    return ConditionFormulaControl;
+}(React__default.Component));
+/** @class */ ((function (_super) {
+    __extends(ConditionFormulaControlRenderer, _super);
+    function ConditionFormulaControlRenderer() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    ConditionFormulaControlRenderer = __decorate([
+        FormItem({
+            type: 'ae-conditionFormulaControl'
+        })
+    ], ConditionFormulaControlRenderer);
+    return ConditionFormulaControlRenderer;
+})(ConditionFormulaControl));
+
+export { ConditionFormulaControl as default };
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/esm/renderer/DataBindingControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.4.1
- * build time: 2024-05-08
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -250,4 +250,4 @@ var SimpleDataBindingControl = /** @class */function (_super) {
 })(SimpleDataBindingControl);
 
 export { DataBindingControl, SimpleDataBindingControl };
-window.amisEditorVersionInfo={version:'6.4.1',buildTime:'2024-05-08'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/esm/renderer/DataMappingControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.4.1
- * build time: 2024-05-08
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -63,4 +63,4 @@ var DataMappingControl = /** @class */ (function (_super) {
 })(DataMappingControl));
 
 export { DataMappingControl };
-window.amisEditorVersionInfo={version:'6.4.1',buildTime:'2024-05-08'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/esm/renderer/DataPickerControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.4.1
- * build time: 2024-05-08
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -76,4 +76,4 @@ var DataPickerControl = /** @class */ (function (_super) {
     ], DataPickerControlRenderer);
     return DataPickerControlRenderer;
 })(DataPickerControl));
-window.amisEditorVersionInfo={version:'6.4.1',buildTime:'2024-05-08'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/esm/renderer/DateShortCutControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.4.1
- * build time: 2024-05-08
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -436,4 +436,4 @@ var DateShortCutControl = /** @class */function (_super) {
 })(DateShortCutControl);
 
 export { DateShortCutControl };
-window.amisEditorVersionInfo={version:'6.4.1',buildTime:'2024-05-08'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/esm/renderer/ExpressionFormulaControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.4.1
- * build time: 2024-05-08
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -226,4 +226,4 @@ var ExpressionFormulaControl = /** @class */function (_super) {
 })(ExpressionFormulaControl);
 
 export { ExpressionFormulaControl as default };
-window.amisEditorVersionInfo={version:'6.4.1',buildTime:'2024-05-08'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/esm/renderer/FeatureControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.4.1
- * build time: 2024-05-08
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -295,4 +295,4 @@ var FeatureControl = /** @class */function (_super) {
 })(FeatureControl);
 
 export { FeatureControl as default };
-window.amisEditorVersionInfo={version:'6.4.1',buildTime:'2024-05-08'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/esm/renderer/FieldSetting.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.4.1
- * build time: 2024-05-08
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -490,4 +490,4 @@ var FieldSetting = /** @class */function (_super) {
 })(FieldSetting);
 
 export { FieldSetting };
-window.amisEditorVersionInfo={version:'6.4.1',buildTime:'2024-05-08'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/esm/renderer/FlexSettingControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.4.1
- * build time: 2024-05-08
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -174,4 +174,4 @@ var FlexSettingControl = /** @class */function (_super) {
 })(FlexSettingControl);
 
 export { FlexSettingControl as default };
-window.amisEditorVersionInfo={version:'6.4.1',buildTime:'2024-05-08'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/esm/renderer/FormulaControl.d.ts

@@ -2,11 +2,12 @@
  * @file 表达式控件
  */
 import React from 'react';
-import { CustomFormulaPickerProps } from './textarea-formula/FormulaPicker';
-import type { VariableItem, FuncGroup } from 'amis-ui/lib/components/formula/CodeEditor';
 import { FormControlProps } from 'amis-core';
-import type { BaseEventContext } from 'amis-editor-core';
+import { CustomFormulaPickerProps } from './textarea-formula/FormulaPicker';
+import { FormulaPlugin } from './textarea-formula/plugin';
 import { EditorManager } from 'amis-editor-core';
+import type { BaseEventContext } from 'amis-editor-core';
+import type { VariableItem, FuncGroup } from 'amis-ui';
 export declare enum FormulaDateType {
     NotDate = 0,
     IsDate = 1,
@@ -74,6 +75,7 @@ export interface FormulaControlProps extends FormControlProps {
      * 备注2: 开关组件可以设置 true 和 false 对应的值，如果设置了就不是普通的 boolean 类型；
      * 备注3: 默认都是字符串类型；
      */
+    valueType?: 'int' | 'number' | 'boolean' | 'date' | 'object' | 'array' | 'string';
     /**
      * 不在表单项上触发时，传入想要获取变量的 表单props 获取对应变量
      */
@@ -93,13 +95,28 @@ export interface FormulaControlProps extends FormControlProps {
      * 自定义fx面板
      */
     customFormulaPicker?: React.FC<CustomFormulaPickerProps>;
+    /**
+     * 简化成员操作
+     */
+    simplifyMemberOprs?: boolean;
+    /**
+     * 是否支持快捷变量
+     */
+    quickVariables?: boolean;
+    /**
+     * 额外的快捷变量
+     */
+    quickVars?: Array<VariableItem>;
 }
 interface FormulaControlState {
     /** 变量数据 */
     variables: any;
+    quickVariables: Array<VariableItem>;
     variableMode?: 'tree' | 'tabs';
     formulaPickerOpen: boolean;
     loading: boolean;
+    menuIsOpened: boolean;
+    quickVariablesIsOpened: boolean;
 }
 export default class FormulaControl extends React.Component<FormulaControlProps, FormulaControlState> {
     static defaultProps: Partial<FormulaControlProps>;
@@ -107,9 +124,16 @@ export default class FormulaControl extends React.Component<FormulaControlProps,
     unReaction: any;
     appLocale: string;
     appCorpusData: any;
+    wrapRef: React.RefObject<HTMLDivElement>;
+    buttonTarget: HTMLElement;
+    editorPlugin: FormulaPlugin;
     constructor(props: FormulaControlProps);
     componentDidMount(): Promise<void>;
     componentWillUnmount(): void;
+    menuRef(ref: HTMLDivElement): void;
+    filterQuickVariablesByType(variables: any[]): any[];
+    editorFactory(dom: HTMLElement, cm: any): any;
+    handleEditorMounted(cm: any, editor: any): void;
     /**
      * 将 ${xx}（非 \${xx}）替换成 \${xx}
      * 备注: 手动编辑时，自动处理掉 ${xx}，避免识别成 公式表达式
@@ -119,10 +143,8 @@ export default class FormulaControl extends React.Component<FormulaControlProps,
     isLoopExpression(expression: any, selfName: string): boolean;
     /**
      * 获取rendererSchema的值
-     * @returns
      */
-    getRendererSchemaFromProps(rendererSchema?: any): any;
-    isExpectType(value: any): boolean;
+    static getRendererSchemaFromProps(props: FormulaControlProps): any;
     matchDate(str: string): boolean;
     matchDateRange(str: string): boolean;
     hasDateShortcutkey(str: string): boolean;
@@ -138,6 +160,12 @@ export default class FormulaControl extends React.Component<FormulaControlProps,
     handleInputChange: (value: any) => void;
     filterCustomRendererProps(rendererSchema: any): any;
     getContextData(): any;
+    closeMenuOuter(): void;
+    closeQuickVariablesOuter(): void;
+    renderMenuOuter(): React.JSX.Element;
+    renderQuickVariablesOuter(): React.JSX.Element;
+    handleQuickVariableSelect(item: VariableItem): void;
+    renderButton(): React.JSX.Element;
     render(): React.JSX.Element;
 }
 export declare class FormulaControlRenderer extends FormulaControl {