amis-editor 5.2.5 → 5.3.0

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

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.4-beta.39
+ * amis-editor v5.3.0
  * Copyright 2018-2023 @fex
  */
 
@@ -7,6 +7,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var tslib = require('tslib');
 var isNumber = require('lodash/isNumber');
 var compact = require('lodash/compact');
 
@@ -40,7 +41,7 @@ function parseBoxShadow(inputStr) {
             .filter(function (n) { return n !== 'inset'; })
             .filter(function (n) { return n !== color; })
             .map(toNum);
-        var x = nums[0], y = nums[1], blur = nums[2], spread = nums[3];
+        var _a = tslib.__read(nums, 4), x = _a[0], y = _a[1], blur = _a[2], spread = _a[3];
         return {
             inset: inset,
             x: x,

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

@@ -7,6 +7,10 @@ export interface FormulaPickerProps {
     initable?: boolean;
     variableMode?: 'tabs' | 'tree';
     evalMode?: boolean;
+    /**
+     * 弹窗顶部标题，默认为 "表达式"
+     */
+    header: string;
 }
 export interface CustomFormulaPickerProps extends FormulaPickerProps {
     [propName: string]: any;

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

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.4-beta.39
+ * amis-editor v5.3.0
  * Copyright 2018-2023 @fex
  */
 
@@ -12,6 +12,7 @@ var React = require('react');
 var amis = require('amis');
 var cx = require('classnames');
 var FormulaEditor = require('amis-ui/lib/components/formula/Editor');
+var i18nRuntime = require('i18n-runtime');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -20,29 +21,48 @@ var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
 var FormulaEditor__default = /*#__PURE__*/_interopDefaultLegacy(FormulaEditor);
 
 var FormulaPicker = function (props) {
-    var variables = props.variables, variableMode = props.variableMode, _a = props.evalMode, evalMode = _a === void 0 ? true : _a;
-    var _b = React__default["default"].useState(''), formula = _b[0], setFormula = _b[1];
-    React.useEffect(function () {
-        var initable = props.initable, value = props.value;
-        if (initable && value) {
-            setFormula(value);
-        }
-    }, [props.value]);
-    var handleChange = function (data) {
-        setFormula(data);
-    };
-    var handleClose = function () {
-        props.onClose && props.onClose();
-    };
-    var handleConfirm = function () {
-        props.onConfirm && props.onConfirm(formula);
-    };
-    return (React__default["default"].createElement(amis.Modal, { className: cx__default["default"]('FormulaPicker-Modal'), size: "md", show: true, onHide: handleClose, closeOnEsc: true },
-        React__default["default"].createElement(amis.Modal.Body, null,
-            React__default["default"].createElement(FormulaEditor__default["default"], tslib.__assign({}, props, { header: "\u8868\u8FBE\u5F0F", variables: variables, variableMode: variableMode, value: formula, evalMode: evalMode, onChange: handleChange }))),
-        React__default["default"].createElement(amis.Modal.Footer, null,
-            React__default["default"].createElement(amis.Button, { onClick: handleClose }, "\u53D6\u6D88"),
-            React__default["default"].createElement(amis.Button, { onClick: handleConfirm, level: "primary" }, "\u786E\u8BA4"))));
+  var variables = props.variables,
+    variableMode = props.variableMode,
+    _a = props.evalMode,
+    evalMode = _a === void 0 ? true : _a;
+  var _b = tslib.__read(React__default["default"].useState(''), 2),
+    formula = _b[0],
+    setFormula = _b[1];
+  React.useEffect(function () {
+    var initable = props.initable,
+      value = props.value;
+    if (initable && value) {
+      setFormula(value);
+    }
+  }, [props.value]);
+  var handleChange = function (data) {
+    setFormula(data);
+  };
+  var handleClose = function () {
+    props.onClose && props.onClose();
+  };
+  var handleConfirm = function () {
+    props.onConfirm && props.onConfirm(formula);
+  };
+  return React__default["default"].createElement(amis.Modal, {
+    className: cx__default["default"]('FormulaPicker-Modal'),
+    size: "md",
+    show: true,
+    onHide: handleClose,
+    closeOnEsc: true
+  }, React__default["default"].createElement(amis.Modal.Body, null, React__default["default"].createElement(FormulaEditor__default["default"], tslib.__assign({}, props, {
+    header: props.header || i18nRuntime.i18n("a9400c408441f1f7f6d6954deb05ae9a"),
+    variables: variables,
+    variableMode: variableMode,
+    value: formula,
+    evalMode: evalMode,
+    onChange: handleChange
+  }))), React__default["default"].createElement(amis.Modal.Footer, null, React__default["default"].createElement(amis.Button, {
+    onClick: handleClose
+  }, "\u53D6\u6D88"), React__default["default"].createElement(amis.Button, {
+    onClick: handleConfirm,
+    level: "primary"
+  }, "\u786E\u8BA4")));
 };
 
 exports["default"] = FormulaPicker;

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

@@ -1,13 +1,37 @@
 /**
  * @file 长文本公式输入框
  */
-/// <reference types="lodash" />
-import React from 'react';
+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 CodeMirror from 'codemirror';
-import { VariableItem } from 'amis-ui/lib/components/formula/Editor';
+export interface AdditionalMenuClickOpts {
+    /**
+     * 当前表达式值
+     */
+    value: string;
+    /**
+     * 对表达式重新赋值
+     * @param value
+     * @returns
+     */
+    setValue: (value: string) => void;
+    /**
+     * 在光标位置插入新的值
+     * @param content 要插入的内容
+     * @param type 插入内容的类型，目前支持表达式expression 和普通文本string
+     * @param brace 自定义插入的位置
+     * @returns
+     */
+    insertContent: (content: string, type: 'expression' | 'string', brace?: Array<CodeMirror.Position>) => void;
+}
+export interface AdditionalMenu {
+    label: string;
+    onClick?: (e: MouseEvent<HTMLAnchorElement>, opts: AdditionalMenuClickOpts) => void;
+    icon?: string;
+    className?: string;
+}
 export interface TextareaFormulaControlProps extends FormControlProps {
     /**
      * 输入框的高度， 默认 100 px
@@ -29,12 +53,7 @@ export interface TextareaFormulaControlProps extends FormControlProps {
     /**
      *  附加底部按钮菜单项
      */
-    additionalMenus?: Array<{
-        label: string;
-        onClick: () => void;
-        icon?: string;
-        className?: string;
-    }>;
+    additionalMenus?: Array<AdditionalMenu>;
     /**
      * 整体点击长文本公式输入框
      */
@@ -43,6 +62,22 @@ export interface TextareaFormulaControlProps extends FormControlProps {
      * 自定义fx面板
      */
     customFormulaPicker?: React.FC<CustomFormulaPickerProps>;
+    /**
+     * 自定义标记文本
+     * @param editor
+     * @returns
+     */
+    customMarkText?: (editor: CodeMirror.Editor) => void;
+    /**
+     * 插件初始化生命周期回调
+     * @param plugin 插件实例，内部包含公式插件的方法
+     * @returns
+     */
+    onPluginInit?: (plugin: FormulaPlugin) => void;
+    /**
+     * 弹窗顶部标题，默认为 "表达式"
+     */
+    header: string;
 }
 interface TextareaFormulaControlState {
     value: string;
@@ -51,11 +86,15 @@ interface TextareaFormulaControlState {
     formulaPickerValue: string;
     expressionBrace?: Array<CodeMirror.Position>;
     isFullscreen: boolean;
+    tooltipStyle: {
+        [key: string]: string;
+    };
 }
 export declare class TextareaFormulaControl extends React.Component<TextareaFormulaControlProps, TextareaFormulaControlState> {
     static defaultProps: Partial<TextareaFormulaControlProps>;
-    isUnmount: boolean;
-    editorPlugin?: FormulaPlugin;
+    wrapRef: React.RefObject<HTMLDivElement>;
+    tooltipRef: React.RefObject<HTMLDivElement>;
+    editorPlugin: FormulaPlugin;
     unReaction: any;
     appLocale: string;
     appCorpusData: any;
@@ -64,14 +103,17 @@ export declare class TextareaFormulaControl extends React.Component<TextareaForm
     componentDidUpdate(prevProps: TextareaFormulaControlProps): Promise<void>;
     componentWillUnmount(): void;
     onExpressionClick(expression: string, brace?: Array<CodeMirror.Position>): void;
+    onExpressionMouseEnter(e: any, expression: string, brace?: Array<CodeMirror.Position>): void;
+    hiddenToolTip(): void;
     closeFormulaPicker(): void;
     handleConfirm(value: any): void;
-    handleOnChange: import("lodash").DebouncedFunc<(value: any) => void>;
-    editorFactory(dom: HTMLElement, cm: any): CodeMirror.Editor;
+    handleOnChange(value: any): void;
+    editorFactory(dom: HTMLElement, cm: any): any;
     handleEditorMounted(cm: any, editor: any): void;
     handleFullscreenModeChange(): void;
     handleFormulaClick(): void;
     editorAutoMark(): void;
+    handleAddtionalMenuClick(e: MouseEvent<HTMLAnchorElement>, item: AdditionalMenu): void;
     render(): JSX.Element;
 }
 export default class TextareaFormulaControlRenderer extends TextareaFormulaControl {