amis-editor 6.2.1 → 6.3.0

package/esm/renderer/RangePartsControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.1
- * build time: 2024-02-29
+ * amis-editor v6.3.0
+ * build time: 2024-03-29
  * Copyright 2018-2024 @fex
  */
 
@@ -417,4 +417,4 @@ var MarksControl = /** @class */function (_super) {
 })(MarksControl);
 
 export { MarksControl, PartsControl };
-window.amisEditorVersionInfo={version:'6.2.1',buildTime:'2024-02-29'};
+window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};

package/esm/renderer/StatusControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.1
- * build time: 2024-02-29
+ * amis-editor v6.3.0
+ * build time: 2024-03-29
  * Copyright 2018-2024 @fex
  */
 
@@ -176,8 +176,7 @@ var StatusControl = /** @class */function (_super) {
         label: i18n("a9400c408441f1f7f6d6954deb05ae9a"),
         name: 'expression',
         placeholder: i18n("02cc4f8f5a9aefbc03c778f7a5c989c7").concat(label, i18n("69fbb2e5fc9eb3ba06096cbedbf5a622")),
-        visibleOn: 'this.statusType === 2',
-        onChange: function (value) {}
+        visibleOn: 'this.statusType === 2'
       })]
     }, {
       data: formData,
@@ -204,4 +203,4 @@ var StatusControl = /** @class */function (_super) {
 })(StatusControl);
 
 export { StatusControl };
-window.amisEditorVersionInfo={version:'6.2.1',buildTime:'2024-02-29'};
+window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};

package/esm/renderer/SwitchMoreControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.1
- * build time: 2024-02-29
+ * amis-editor v6.3.0
+ * build time: 2024-03-29
  * Copyright 2018-2024 @fex
  */
 
@@ -391,4 +391,4 @@ var SwitchMore = /** @class */function (_super) {
 })(SwitchMore);
 
 export { SwitchMore as default };
-window.amisEditorVersionInfo={version:'6.2.1',buildTime:'2024-02-29'};
+window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};

package/esm/renderer/TableColumnWidthControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.1
- * build time: 2024-02-29
+ * amis-editor v6.3.0
+ * build time: 2024-03-29
  * Copyright 2018-2024 @fex
  */
 
@@ -173,4 +173,4 @@ var TableColumnWidthControl = /** @class */function (_super) {
 })(TableColumnWidthControl);
 
 export { TableColumnWidthControl as default };
-window.amisEditorVersionInfo={version:'6.2.1',buildTime:'2024-02-29'};
+window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};

package/esm/renderer/TimelineItemControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.1
- * build time: 2024-02-29
+ * amis-editor v6.3.0
+ * build time: 2024-03-29
  * Copyright 2018-2024 @fex
  */
 
@@ -522,4 +522,4 @@ var TimelineItemControl = /** @class */function (_super) {
 })(React__default.Component);
 
 export { TimelineItemControl as default };
-window.amisEditorVersionInfo={version:'6.2.1',buildTime:'2024-02-29'};
+window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};

package/esm/renderer/TplFormulaControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.1
- * build time: 2024-02-29
+ * amis-editor v6.3.0
+ * build time: 2024-03-29
  * Copyright 2018-2024 @fex
  */
 
@@ -8,11 +8,10 @@ import { __extends, __awaiter, __generator, __assign, __rest, __decorate, __meta
 import React__default from 'react';
 import cx from 'classnames';
 import { reaction } from 'mobx';
-import { FormulaEditor, CodeMirrorEditor } from 'amis-ui';
+import { CodeMirrorEditor, FormulaCodeEditor } from 'amis-ui';
 import { Icon, Button, TooltipWrapper, FormItem } from 'amis';
 import { autobind } from 'amis-core';
 import { editorFactory, FormulaPlugin } from './textarea-formula/plugin.js';
-import { renderFormulaValue } from './FormulaControl.js';
 import FormulaPicker from './textarea-formula/FormulaPicker.js';
 import { getVariables } from 'amis-editor-core';
 import { i18n } from 'i18n-runtime';
@@ -44,30 +43,39 @@ var TplFormulaControl = /** @class */function (_super) {
   }
   TplFormulaControl.prototype.componentDidMount = function () {
     return __awaiter(this, void 0, void 0, function () {
-      var editorStore;
+      var editorStore, variables;
       var _this = this;
       return __generator(this, function (_a) {
-        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*/];
+        switch (_a.label) {
+          case 0:
+            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*/];
+                });
+              });
             });
-          });
-        });
-        if (this.tooltipRef.current) {
-          this.tooltipRef.current.addEventListener('mouseleave', this.hiddenToolTip);
-        }
-        if (this.wrapRef.current) {
-          this.wrapRef.current.addEventListener('keydown', this.handleKeyDown, true);
+            if (this.tooltipRef.current) {
+              this.tooltipRef.current.addEventListener('mouseleave', this.hiddenToolTip);
+            }
+            if (this.wrapRef.current) {
+              this.wrapRef.current.addEventListener('keydown', this.handleKeyDown, true);
+            }
+            return [4 /*yield*/, getVariables(this)];
+          case 1:
+            variables = _a.sent();
+            this.setState({
+              variables: variables
+            });
+            return [2 /*return*/];
         }
-        return [2 /*return*/];
       });
     });
   };
@@ -122,11 +130,11 @@ var TplFormulaControl = /** @class */function (_super) {
     var _a;
     var expressionBrace = this.state.expressionBrace;
     // 去除可能包裹的最外层的${}
-    value = value.replace(/^\$\{(.*)\}$/, function (match, p1) {
+    value = value.replace(/^\$\{([\s\S]*)\}$/m, function (match, p1) {
       return p1;
     });
     value = value ? "${".concat(value, "}") : value;
-    value = value.replace(/\r\n|\r|\n/g, ' ');
+    // value = value.replace(/\r\n|\r|\n/g, ' ');
     (_a = this.editorPlugin) === null || _a === void 0 ? void 0 : _a.insertContent(value, 'expression', expressionBrace);
     this.setState({
       formulaPickerOpen: false,
@@ -341,9 +349,6 @@ var TplFormulaControl = /** @class */function (_super) {
       tooltipStyle = _b.tooltipStyle,
       loading = _b.loading;
     var FormulaPickerCmp = customFormulaPicker !== null && customFormulaPicker !== void 0 ? customFormulaPicker : FormulaPicker;
-    var highlightValue = FormulaEditor.highlightValue(formulaPickerValue, variables) || {
-      html: formulaPickerValue
-    };
     return React__default.createElement("div", {
       className: cx('ae-TplFormulaControl', className, {
         clearable: clearable
@@ -382,14 +387,24 @@ var TplFormulaControl = /** @class */function (_super) {
       className: cx('ae-TplFormulaControl-icon', 'icon')
     })), React__default.createElement(TooltipWrapper, {
       trigger: "hover",
-      placement: "top",
+      placement: "left",
       style: {
         fontSize: '12px'
       },
       tooltip: {
         tooltipTheme: 'dark',
+        tooltipClassName: 'btn-configured-tooltip',
         children: function () {
-          return renderFormulaValue(highlightValue);
+          return React__default.createElement(FormulaCodeEditor, {
+            readOnly: true,
+            value: formulaPickerValue,
+            variables: variables,
+            evalMode: true,
+            editorTheme: "dark",
+            editorOptions: {
+              lineNumbers: false
+            }
+          });
         }
       }
     }, React__default.createElement("div", {
@@ -441,4 +456,4 @@ var TplFormulaControl = /** @class */function (_super) {
 })(TplFormulaControl);
 
 export { TplFormulaControl };
-window.amisEditorVersionInfo={version:'6.2.1',buildTime:'2024-02-29'};
+window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};

package/esm/renderer/TransferTableControl.d.ts

@@ -138,9 +138,7 @@ declare const TransferTableControl: {
                     className: string;
                     wrapWithPanel?: undefined;
                     mode?: undefined;
-                    wrapperComponent?: undefined; /**
-                     * 更新options字段的统一出口
-                     */
+                    wrapperComponent?: undefined;
                     resetAfterSubmit?: undefined;
                     autoFocus?: undefined;
                     preventEnterSubmit?: undefined;

package/esm/renderer/TransferTableControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.1
- * build time: 2024-02-29
+ * amis-editor v6.3.0
+ * build time: 2024-03-29
  * Copyright 2018-2024 @fex
  */
 
@@ -447,4 +447,4 @@ var TransferTableControl = BaseOptionControl(TransferTableOption);
 })(TransferTableControl);
 
 export { TransferTableOption as default };
-window.amisEditorVersionInfo={version:'6.2.1',buildTime:'2024-02-29'};
+window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};

package/esm/renderer/TreeOptionControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.1
- * build time: 2024-02-29
+ * amis-editor v6.3.0
+ * build time: 2024-03-29
  * Copyright 2018-2024 @fex
  */
 
@@ -612,4 +612,4 @@ var TreeOptionControl = /** @class */function (_super) {
 })(TreeOptionControl);
 
 export { TreeOptionControl as default };
-window.amisEditorVersionInfo={version:'6.2.1',buildTime:'2024-02-29'};
+window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};

package/esm/renderer/ValidationControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.1
- * build time: 2024-02-29
+ * amis-editor v6.3.0
+ * build time: 2024-03-29
  * Copyright 2018-2024 @fex
  */
 
@@ -361,4 +361,4 @@ var ValidationControl = /** @class */function (_super) {
 })(ValidationControl);
 
 export { ValidationControl as default };
-window.amisEditorVersionInfo={version:'6.2.1',buildTime:'2024-02-29'};
+window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};

package/esm/renderer/ValidationItem.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.1
- * build time: 2024-02-29
+ * amis-editor v6.3.0
+ * build time: 2024-03-29
  * Copyright 2018-2024 @fex
  */
 
@@ -164,4 +164,4 @@ var ValidationItem = /** @class */function (_super) {
 }(React__default.Component);
 
 export { ValidationItem as default };
-window.amisEditorVersionInfo={version:'6.2.1',buildTime:'2024-02-29'};
+window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};

package/esm/renderer/ValueFormatControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.1
- * build time: 2024-02-29
+ * amis-editor v6.3.0
+ * build time: 2024-03-29
  * Copyright 2018-2024 @fex
  */
 
@@ -109,4 +109,4 @@ var ValueFormatControl = function (props) {
 FormItem({
   type: 'ae-valueFormat'
 })(ValueFormatControl);
-window.amisEditorVersionInfo={version:'6.2.1',buildTime:'2024-02-29'};
+window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};

package/esm/renderer/crud2-control/AddColumnModal.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.1
- * build time: 2024-02-29
+ * amis-editor v6.3.0
+ * build time: 2024-03-29
  * Copyright 2018-2024 @fex
  */
 
@@ -255,4 +255,4 @@ var AddColumnModal = function (props) {
 var AddColumnModal$1 = themeable(AddColumnModal);
 
 export { AddColumnModal$1 as default };
-window.amisEditorVersionInfo={version:'6.2.1',buildTime:'2024-02-29'};
+window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};

package/esm/renderer/crud2-control/CRUDColumnControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.1
- * build time: 2024-02-29
+ * amis-editor v6.3.0
+ * build time: 2024-03-29
  * Copyright 2018-2024 @fex
  */
 
@@ -473,4 +473,4 @@ var CRUDColumnControl = /** @class */function (_super) {
 })(CRUDColumnControl);
 
 export { CRUDColumnControl };
-window.amisEditorVersionInfo={version:'6.2.1',buildTime:'2024-02-29'};
+window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};

package/esm/renderer/crud2-control/CRUDFiltersControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.1
- * build time: 2024-02-29
+ * amis-editor v6.3.0
+ * build time: 2024-03-29
  * Copyright 2018-2024 @fex
  */
 
@@ -691,4 +691,4 @@ var CRUDFiltersControl = /** @class */function (_super) {
 })(CRUDFiltersControl);
 
 export { CRUDFiltersControl };
-window.amisEditorVersionInfo={version:'6.2.1',buildTime:'2024-02-29'};
+window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};

package/esm/renderer/crud2-control/CRUDToolbarControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.1
- * build time: 2024-02-29
+ * amis-editor v6.3.0
+ * build time: 2024-03-29
  * Copyright 2018-2024 @fex
  */
 
@@ -406,4 +406,4 @@ var CRUDToolbarControl = /** @class */function (_super) {
 })(CRUDToolbarControl);
 
 export { CRUDToolbarControl };
-window.amisEditorVersionInfo={version:'6.2.1',buildTime:'2024-02-29'};
+window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};

package/esm/renderer/event-control/DialogActionPanel.d.ts

@@ -0,0 +1,27 @@
+import { EditorManager } from 'amis-editor-core';
+import React from 'react';
+import { RendererProps } from 'amis-core';
+import type { EditorModalBody } from '../../../../amis-editor-core/src/store/editor';
+export interface DialogActionPanelProps extends RendererProps {
+    manager: EditorManager;
+    subscribeSchemaSubmit: (fn: (schema: any, value: any, id: string, diff?: any) => any, once?: boolean) => () => void;
+    subscribeActionSubmit: (fn: (value: any) => any) => () => void;
+    addHook: (fn: Function, type?: 'validate' | 'init' | 'flush') => () => void;
+}
+export interface LocalModal {
+    label: string;
+    value: any;
+    tip: string;
+    modal: EditorModalBody;
+    isNew?: boolean;
+    isModified?: boolean;
+    isActive?: boolean;
+    isCurrentActionModal?: boolean;
+    /**
+     * 传参配置
+     */
+    data?: any;
+}
+declare function DialogActionPanel({ classnames: cx, render, data, manager, onChange, onBulkChange, node, addHook, subscribeSchemaSubmit }: DialogActionPanelProps): React.JSX.Element;
+declare const _default: typeof DialogActionPanel;
+export default _default;