amis-editor 6.2.2 → 6.3.0

package/lib/renderer/NavDefaultActive.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.2
- * build time: 2024-03-01
+ * amis-editor v6.3.0
+ * build time: 2024-03-29
  * Copyright 2018-2024 @fex
  */
 
@@ -114,4 +114,4 @@ var NavDefaultActiveControl = /** @class */function (_super) {
 })(NavDefaultActiveControl);
 
 exports["default"] = NavDefaultActiveControl;
-window.amisEditorVersionInfo={version:'6.2.2',buildTime:'2024-03-01'};
+window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};

package/lib/renderer/NavSourceControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.2
- * build time: 2024-03-01
+ * amis-editor v6.3.0
+ * build time: 2024-03-29
  * Copyright 2018-2024 @fex
  */
 
@@ -749,4 +749,4 @@ var NavSourceControl = /** @class */function (_super) {
 })(NavSourceControl);
 
 exports.NavSourceControl = NavSourceControl;
-window.amisEditorVersionInfo={version:'6.2.2',buildTime:'2024-03-01'};
+window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};

package/lib/renderer/OptionControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.2
- * build time: 2024-03-01
+ * amis-editor v6.3.0
+ * build time: 2024-03-29
  * Copyright 2018-2024 @fex
  */
 
@@ -755,4 +755,4 @@ var OptionControl = /** @class */function (_super) {
 })(OptionControl);
 
 exports["default"] = OptionControl;
-window.amisEditorVersionInfo={version:'6.2.2',buildTime:'2024-03-01'};
+window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};

package/lib/renderer/RangePartsControl.js

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

package/lib/renderer/StatusControl.js

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

package/lib/renderer/SwitchMoreControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.2
- * build time: 2024-03-01
+ * amis-editor v6.3.0
+ * build time: 2024-03-29
  * Copyright 2018-2024 @fex
  */
 
@@ -402,4 +402,4 @@ var SwitchMore = /** @class */function (_super) {
 })(SwitchMore);
 
 exports["default"] = SwitchMore;
-window.amisEditorVersionInfo={version:'6.2.2',buildTime:'2024-03-01'};
+window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};

package/lib/renderer/TableColumnWidthControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.2
- * build time: 2024-03-01
+ * amis-editor v6.3.0
+ * build time: 2024-03-29
  * Copyright 2018-2024 @fex
  */
 
@@ -182,4 +182,4 @@ var TableColumnWidthControl = /** @class */function (_super) {
 })(TableColumnWidthControl);
 
 exports["default"] = TableColumnWidthControl;
-window.amisEditorVersionInfo={version:'6.2.2',buildTime:'2024-03-01'};
+window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};

package/lib/renderer/TimelineItemControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.2
- * build time: 2024-03-01
+ * amis-editor v6.3.0
+ * build time: 2024-03-29
  * Copyright 2018-2024 @fex
  */
 
@@ -533,4 +533,4 @@ var TimelineItemControl = /** @class */function (_super) {
 })(React__default["default"].Component);
 
 exports["default"] = TimelineItemControl;
-window.amisEditorVersionInfo={version:'6.2.2',buildTime:'2024-03-01'};
+window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};

package/lib/renderer/TplFormulaControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.2
- * build time: 2024-03-01
+ * amis-editor v6.3.0
+ * build time: 2024-03-29
  * Copyright 2018-2024 @fex
  */
 
@@ -16,7 +16,6 @@ var amisUi = require('amis-ui');
 var amis = require('amis');
 var amisCore = require('amis-core');
 var plugin = require('./textarea-formula/plugin.js');
-var FormulaControl = require('./FormulaControl.js');
 var FormulaPicker = require('./textarea-formula/FormulaPicker.js');
 var amisEditorCore = require('amis-editor-core');
 var i18nRuntime = require('i18n-runtime');
@@ -53,30 +52,39 @@ var TplFormulaControl = /** @class */function (_super) {
   }
   TplFormulaControl.prototype.componentDidMount = function () {
     return tslib.__awaiter(this, void 0, void 0, function () {
-      var editorStore;
+      var editorStore, variables;
       var _this = this;
       return tslib.__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 = mobx.reaction(function () {
-          return editorStore === null || editorStore === void 0 ? void 0 : editorStore.appLocaleState;
-        }, function () {
-          return tslib.__awaiter(_this, void 0, void 0, function () {
-            return tslib.__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 = mobx.reaction(function () {
+              return editorStore === null || editorStore === void 0 ? void 0 : editorStore.appLocaleState;
+            }, function () {
+              return tslib.__awaiter(_this, void 0, void 0, function () {
+                return tslib.__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*/, amisEditorCore.getVariables(this)];
+          case 1:
+            variables = _a.sent();
+            this.setState({
+              variables: variables
+            });
+            return [2 /*return*/];
         }
-        return [2 /*return*/];
       });
     });
   };
@@ -131,11 +139,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,
@@ -350,9 +358,6 @@ var TplFormulaControl = /** @class */function (_super) {
       tooltipStyle = _b.tooltipStyle,
       loading = _b.loading;
     var FormulaPickerCmp = customFormulaPicker !== null && customFormulaPicker !== void 0 ? customFormulaPicker : FormulaPicker["default"];
-    var highlightValue = amisUi.FormulaEditor.highlightValue(formulaPickerValue, variables) || {
-      html: formulaPickerValue
-    };
     return React__default["default"].createElement("div", {
       className: cx__default["default"]('ae-TplFormulaControl', className, {
         clearable: clearable
@@ -391,14 +396,24 @@ var TplFormulaControl = /** @class */function (_super) {
       className: cx__default["default"]('ae-TplFormulaControl-icon', 'icon')
     })), React__default["default"].createElement(amis.TooltipWrapper, {
       trigger: "hover",
-      placement: "top",
+      placement: "left",
       style: {
         fontSize: '12px'
       },
       tooltip: {
         tooltipTheme: 'dark',
+        tooltipClassName: 'btn-configured-tooltip',
         children: function () {
-          return FormulaControl.renderFormulaValue(highlightValue);
+          return React__default["default"].createElement(amisUi.FormulaCodeEditor, {
+            readOnly: true,
+            value: formulaPickerValue,
+            variables: variables,
+            evalMode: true,
+            editorTheme: "dark",
+            editorOptions: {
+              lineNumbers: false
+            }
+          });
         }
       }
     }, React__default["default"].createElement("div", {
@@ -450,4 +465,4 @@ var TplFormulaControl = /** @class */function (_super) {
 })(TplFormulaControl);
 
 exports.TplFormulaControl = TplFormulaControl;
-window.amisEditorVersionInfo={version:'6.2.2',buildTime:'2024-03-01'};
+window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};

package/lib/renderer/TransferTableControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.2
- * build time: 2024-03-01
+ * amis-editor v6.3.0
+ * build time: 2024-03-29
  * Copyright 2018-2024 @fex
  */
 
@@ -456,4 +456,4 @@ var TransferTableControl = BaseOptionControl(TransferTableOption);
 })(TransferTableControl);
 
 exports["default"] = TransferTableOption;
-window.amisEditorVersionInfo={version:'6.2.2',buildTime:'2024-03-01'};
+window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};

package/lib/renderer/TreeOptionControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.2
- * build time: 2024-03-01
+ * amis-editor v6.3.0
+ * build time: 2024-03-29
  * Copyright 2018-2024 @fex
  */
 
@@ -625,4 +625,4 @@ var TreeOptionControl = /** @class */function (_super) {
 })(TreeOptionControl);
 
 exports["default"] = TreeOptionControl;
-window.amisEditorVersionInfo={version:'6.2.2',buildTime:'2024-03-01'};
+window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};

package/lib/renderer/ValidationControl.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.2
- * build time: 2024-03-01
+ * amis-editor v6.3.0
+ * build time: 2024-03-29
  * Copyright 2018-2024 @fex
  */
 
@@ -372,4 +372,4 @@ var ValidationControl = /** @class */function (_super) {
 })(ValidationControl);
 
 exports["default"] = ValidationControl;
-window.amisEditorVersionInfo={version:'6.2.2',buildTime:'2024-03-01'};
+window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};

package/lib/renderer/ValidationItem.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.2
- * build time: 2024-03-01
+ * amis-editor v6.3.0
+ * build time: 2024-03-29
  * Copyright 2018-2024 @fex
  */
 
@@ -173,4 +173,4 @@ var ValidationItem = /** @class */function (_super) {
 }(React__default["default"].Component);
 
 exports["default"] = ValidationItem;
-window.amisEditorVersionInfo={version:'6.2.2',buildTime:'2024-03-01'};
+window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};

package/lib/renderer/ValueFormatControl.js

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

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

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.2.2
- * build time: 2024-03-01
+ * amis-editor v6.3.0
+ * build time: 2024-03-29
  * Copyright 2018-2024 @fex
  */
 
@@ -264,4 +264,4 @@ var AddColumnModal = function (props) {
 var AddColumnModal$1 = amis.themeable(AddColumnModal);
 
 exports["default"] = AddColumnModal$1;
-window.amisEditorVersionInfo={version:'6.2.2',buildTime:'2024-03-01'};
+window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};

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

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

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

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

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

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

package/lib/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;