amis-editor 6.5.0 → 6.6.0

package/lib/renderer/event-control/DialogActionPanel.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.5.0
- * build time: 2024-05-31
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -641,4 +641,4 @@ function DialogActionPanel(_a) {
 var DialogActionPanel$1 = mobxReact.observer(DialogActionPanel);
 
 exports["default"] = DialogActionPanel$1;
-window.amisEditorVersionInfo={version:'6.5.0',buildTime:'2024-05-31'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/lib/renderer/event-control/action-config-dialog.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.5.0
- * build time: 2024-05-31
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -335,4 +335,4 @@ var ActionDialog = /** @class */function (_super) {
 }(React__default["default"].Component);
 
 exports["default"] = ActionDialog;
-window.amisEditorVersionInfo={version:'6.5.0',buildTime:'2024-05-31'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/lib/renderer/event-control/action-config-panel.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.5.0
- * build time: 2024-05-31
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -64,4 +64,4 @@ var ActionConfigPanel = /** @class */function (_super) {
 }(React__default["default"].Component);
 
 exports["default"] = ActionConfigPanel;
-window.amisEditorVersionInfo={version:'6.5.0',buildTime:'2024-05-31'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/lib/renderer/event-control/comp-action-select.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.5.0
- * build time: 2024-05-31
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -83,4 +83,4 @@ var CmptActionSelect = /** @class */function (_super) {
 
 exports.BASE_ACTION_PROPS = BASE_ACTION_PROPS;
 exports["default"] = CmptActionSelect;
-window.amisEditorVersionInfo={version:'6.5.0',buildTime:'2024-05-31'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/lib/renderer/event-control/helper.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.5.0
- * build time: 2024-05-31
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -2601,4 +2601,4 @@ exports.renderCmptActionSelect = renderCmptActionSelect;
 exports.renderCmptIdInput = renderCmptIdInput;
 exports.renderCmptSelect = renderCmptSelect;
 exports.updateCommonUseActions = updateCommonUseActions;
-window.amisEditorVersionInfo={version:'6.5.0',buildTime:'2024-05-31'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/lib/renderer/event-control/index.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.5.0
- * build time: 2024-05-31
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -1087,4 +1087,4 @@ exports.renderCmptIdInput = helper.renderCmptIdInput;
 exports.renderCmptSelect = helper.renderCmptSelect;
 exports.updateCommonUseActions = helper.updateCommonUseActions;
 exports.EventControl = EventControl;
-window.amisEditorVersionInfo={version:'6.5.0',buildTime:'2024-05-31'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/lib/renderer/style-control/Background.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.5.0
- * build time: 2024-05-31
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -492,4 +492,4 @@ var Background = function (props) {
 })(React__default["default"].Component);
 
 exports["default"] = Background;
-window.amisEditorVersionInfo={version:'6.5.0',buildTime:'2024-05-31'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/lib/renderer/style-control/Border.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.5.0
- * build time: 2024-05-31
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -224,4 +224,4 @@ mobxReact.observer(BoxBorder);
   })], BorderRenderer);
   return BorderRenderer;
 })(React__default["default"].Component);
-window.amisEditorVersionInfo={version:'6.5.0',buildTime:'2024-05-31'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/lib/renderer/style-control/BoxModel.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.5.0
- * build time: 2024-05-31
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -74,4 +74,4 @@ mobxReact.observer(BoxModel);
     ], BoxModelRenderer);
     return BoxModelRenderer;
 })(React__default["default"].Component));
-window.amisEditorVersionInfo={version:'6.5.0',buildTime:'2024-05-31'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/lib/renderer/style-control/BoxShadow.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.5.0
- * build time: 2024-05-31
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -122,4 +122,4 @@ function BoxShadow(_a) {
 })(React__default["default"].Component);
 
 exports["default"] = BoxShadow;
-window.amisEditorVersionInfo={version:'6.5.0',buildTime:'2024-05-31'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/lib/renderer/style-control/Display.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.5.0
- * build time: 2024-05-31
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -191,4 +191,4 @@ var Display = function (props) {
   })], DisplayRenderer);
   return DisplayRenderer;
 })(React__default["default"].Component);
-window.amisEditorVersionInfo={version:'6.5.0',buildTime:'2024-05-31'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/lib/renderer/style-control/FlexLayout.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.5.0
- * build time: 2024-05-31
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -95,4 +95,4 @@ function FlexLayouts(_a) {
     ], FlexLayoutRenderer);
     return FlexLayoutRenderer;
 })(React__default["default"].Component));
-window.amisEditorVersionInfo={version:'6.5.0',buildTime:'2024-05-31'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/lib/renderer/style-control/Font.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.5.0
- * build time: 2024-05-31
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -189,4 +189,4 @@ var Font = function (props) {
 })(React__default["default"].Component);
 
 exports["default"] = Font;
-window.amisEditorVersionInfo={version:'6.5.0',buildTime:'2024-05-31'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/lib/renderer/style-control/InsetBoxModel.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.5.0
- * build time: 2024-05-31
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -71,4 +71,4 @@ mobxReact.observer(InsetBoxModel);
     ], BoxModelRenderer);
     return BoxModelRenderer;
 })(React__default["default"].Component));
-window.amisEditorVersionInfo={version:'6.5.0',buildTime:'2024-05-31'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/lib/renderer/style-control/ThemeCssCode.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.5.0
- * build time: 2024-05-31
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -205,4 +205,4 @@ function ThemeCssCode(props) {
   })], ThemeCssCodeRenderer);
   return ThemeCssCodeRenderer;
 })(React__default["default"].Component);
-window.amisEditorVersionInfo={version:'6.5.0',buildTime:'2024-05-31'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/lib/renderer/style-control/font-family.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.5.0
- * build time: 2024-05-31
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -147,4 +147,4 @@ fontFamilyList.reduce(function (memo, current) {
 }, {});
 
 exports.fontFamilyList = fontFamilyList;
-window.amisEditorVersionInfo={version:'6.5.0',buildTime:'2024-05-31'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/lib/renderer/style-control/helper.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.5.0
- * build time: 2024-05-31
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -67,4 +67,4 @@ var inputStateFunc = function (visibleOn, state, className, path, options) {
 
 exports.inputStateFunc = inputStateFunc;
 exports.inputStateTpl = inputStateTpl;
-window.amisEditorVersionInfo={version:'6.5.0',buildTime:'2024-05-31'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/lib/renderer/style-control/transformation.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.5.0
- * build time: 2024-05-31
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -84,4 +84,4 @@ function normalizeBoxShadow(config) {
 
 exports.normalizeBoxShadow = normalizeBoxShadow;
 exports.parseBoxShadow = parseBoxShadow;
-window.amisEditorVersionInfo={version:'6.5.0',buildTime:'2024-05-31'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/lib/renderer/textarea-formula/FormulaPicker.d.ts

@@ -12,6 +12,7 @@ export interface FormulaPickerProps extends FormControlProps {
      * 弹窗顶部标题，默认为 "表达式"
      */
     header: string;
+    simplifyMemberOprs?: boolean;
 }
 export interface CustomFormulaPickerProps extends FormulaPickerProps {
     [propName: string]: any;

package/lib/renderer/textarea-formula/FormulaPicker.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.5.0
- * build time: 2024-05-31
+ * amis-editor v6.6.0
+ * build time: 2024-07-01
  * Copyright 2018-2024 @fex
  */
 
@@ -11,6 +11,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var tslib = require('tslib');
 var React = require('react');
 var amis = require('amis');
+var amisCore = require('amis-core');
 var cx = require('classnames');
 var amisUi = require('amis-ui');
 var i18nRuntime = require('i18n-runtime');
@@ -29,6 +30,9 @@ var FormulaPicker = function (props) {
   var _c = tslib.__read(React__default["default"].useState(undefined), 2),
     formula = _c[0],
     setFormula = _c[1];
+  var _d = tslib.__read(React__default["default"].useState(props.header), 2),
+    header = _d[0],
+    setHeader = _d[1];
   React.useEffect(function () {
     var initable = props.initable,
       value = props.value;
@@ -36,6 +40,9 @@ var FormulaPicker = function (props) {
       setFormula(value);
     }
   }, [props.value]);
+  React.useEffect(function () {
+    setHeader(amisCore.resolveVariableAndFilter(props.header, props.data));
+  }, [props.data]);
   var handleChange = function (data) {
     setFormula(data);
   };
@@ -54,7 +61,7 @@ var FormulaPicker = function (props) {
     onHide: handleClose,
     closeOnEsc: true
   }, React__default["default"].createElement(amis.Modal.Body, null, React__default["default"].createElement(amisUi.FormulaEditor, tslib.__assign({}, props, {
-    header: props.header || i18nRuntime.i18n("a9400c408441f1f7f6d6954deb05ae9a"),
+    header: header || i18nRuntime.i18n("a9400c408441f1f7f6d6954deb05ae9a"),
     variables: variables,
     variableMode: variableMode,
     value: formula,
@@ -70,4 +77,4 @@ var FormulaPicker = function (props) {
 };
 
 exports["default"] = FormulaPicker;
-window.amisEditorVersionInfo={version:'6.5.0',buildTime:'2024-05-31'};
+window.amisEditorVersionInfo={version:'6.6.0',buildTime:'2024-07-01'};

package/lib/renderer/textarea-formula/TextareaFormulaControl.d.ts

@@ -3,9 +3,9 @@
  */
 import React, { MouseEvent } from 'react';
 import { FormControlProps } from 'amis-core';
-import type { VariableItem, CodeMirror } from 'amis-ui';
 import { FormulaPlugin } from './plugin';
 import { CustomFormulaPickerProps } from './FormulaPicker';
+import type { VariableItem, CodeMirror } from 'amis-ui';
 export interface AdditionalMenuClickOpts {
     /**
      * 当前表达式值
@@ -86,10 +86,19 @@ export interface TextareaFormulaControlProps extends FormControlProps {
      * fx 更新前事件
      */
     beforeFxConfirm?: (plugin: FormulaPlugin) => void;
+    /**
+     * 简化成员操作
+     */
+    simplifyMemberOprs?: boolean;
+    /**
+     * 支付支持快捷变量
+     */
+    quickVariables?: boolean;
 }
 interface TextareaFormulaControlState {
     value: string;
     variables: Array<VariableItem>;
+    quickVariables: Array<VariableItem>;
     formulaPickerOpen: boolean;
     formulaPickerValue: string;
     expressionBrace?: Array<CodeMirror.Position>;
@@ -98,11 +107,14 @@ interface TextareaFormulaControlState {
         [key: string]: string;
     };
     loading: boolean;
+    menuIsOpened: boolean;
+    quickVariablesIsOpened: boolean;
 }
 export declare class TextareaFormulaControl extends React.Component<TextareaFormulaControlProps, TextareaFormulaControlState> {
     static defaultProps: Partial<TextareaFormulaControlProps>;
     wrapRef: React.RefObject<HTMLDivElement>;
     tooltipRef: React.RefObject<HTMLDivElement>;
+    buttonTarget: HTMLElement;
     editorPlugin: FormulaPlugin;
     unReaction: any;
     appLocale: string;
@@ -111,6 +123,7 @@ export declare class TextareaFormulaControl extends React.Component<TextareaForm
     componentDidMount(): Promise<void>;
     componentDidUpdate(prevProps: TextareaFormulaControlProps): Promise<void>;
     componentWillUnmount(): void;
+    menuRef(ref: HTMLDivElement): void;
     onExpressionMouseEnter(e: any, expression: string, brace?: Array<CodeMirror.Position>): void;
     hiddenToolTip(): void;
     closeFormulaPicker(): void;
@@ -123,6 +136,12 @@ export declare class TextareaFormulaControl extends React.Component<TextareaForm
     handleFormulaClick(e: React.MouseEvent, type?: string): Promise<void>;
     editorAutoMark(): void;
     handleAddtionalMenuClick(e: MouseEvent<HTMLAnchorElement>, item: AdditionalMenu): void;
+    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 default class TextareaFormulaControlRenderer extends TextareaFormulaControl {