amis-editor 6.3.0 → 6.4.1

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

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

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

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

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

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

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

@@ -16,12 +16,13 @@ export interface LocalModal {
     isNew?: boolean;
     isModified?: boolean;
     isActive?: boolean;
+    isRefered?: boolean;
     isCurrentActionModal?: boolean;
     /**
      * 传参配置
      */
     data?: any;
 }
-declare function DialogActionPanel({ classnames: cx, render, data, manager, onChange, onBulkChange, node, addHook, subscribeSchemaSubmit }: DialogActionPanelProps): React.JSX.Element;
+declare function DialogActionPanel({ classnames: cx, render, data, manager, onChange, onBulkChange, node, addHook, subscribeSchemaSubmit, appLocale, appCorpusData }: DialogActionPanelProps): React.JSX.Element;
 declare const _default: typeof DialogActionPanel;
 export default _default;

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

@@ -1,14 +1,14 @@
 /**
- * amis-editor v6.3.0
- * build time: 2024-03-29
+ * amis-editor v6.4.1
+ * build time: 2024-05-08
  * Copyright 2018-2024 @fex
  */
 
 import { __read, __assign, __rest } from 'tslib';
-import { JSONGetById, JSONGetParentById, JSONUpdate, JSONPipeIn, addModal, JSONPipeOut, modalsToDefinitions } from 'amis-editor-core';
+import { JSONGetById, JSONGetParentById, diff, patchDiff, JSONUpdate, JSONPipeIn, addModal, JSONPipeOut, modalsToDefinitions, getVariables } from 'amis-editor-core';
 import React__default from 'react';
 import { observer } from 'mobx-react';
-import { JSONTraverse } from 'amis-core';
+import { JSONTraverse, guid } from 'amis-core';
 import { FormField, Select, Button, Switch, InputJSONSchema, InputBox } from 'amis-ui';
 import { i18n } from 'i18n-runtime';
 
@@ -22,7 +22,9 @@ function DialogActionPanel(_a) {
     var onBulkChange = _a.onBulkChange,
     node = _a.node,
     addHook = _a.addHook,
-    subscribeSchemaSubmit = _a.subscribeSchemaSubmit;
+    subscribeSchemaSubmit = _a.subscribeSchemaSubmit,
+    appLocale = _a.appLocale,
+    appCorpusData = _a.appCorpusData;
   var eventKey = data.eventKey;
   if (!eventKey) {
     return React__default.createElement("div", null, "\u4E0A\u4E0B\u6587\u6570\u636E\u9519\u8BEF");
@@ -39,15 +41,16 @@ function DialogActionPanel(_a) {
   // 写入 store 之前执行，可以对 schema 进行修改
   React__default.useEffect(function () {
     subscribeSchemaSubmit(function (schema, nodeSchema, id) {
-      var _a, _b, _c, _d;
-      var _e, _f, _g, _h, _j;
-      var rawActions = (_f = (_e = JSONGetById(schema, id)) === null || _e === void 0 ? void 0 : _e.onEvent[eventKey]) === null || _f === void 0 ? void 0 : _f.actions;
+      var _a, _b, _c, _d, _e, _f;
+      var _g, _h, _j, _k, _l;
+      var rawActions = (_h = (_g = JSONGetById(schema, id)) === null || _g === void 0 ? void 0 : _g.onEvent[eventKey]) === null || _h === void 0 ? void 0 : _h.actions;
       if (!rawActions || !Array.isArray(rawActions)) {
-        throw new Error('动作配置错误');
+        return;
       }
       var actionSchema = rawActions[typeof actionIndex === 'undefined' ? rawActions.length - 1 : actionIndex];
-      var modals = actionSchema.__actionModals;
+      var modals = actionSchema === null || actionSchema === void 0 ? void 0 : actionSchema.__actionModals;
       if (!Array.isArray(modals)) {
+        // 不是编辑确定触发的，直接返回
         return schema;
       }
       var currentModal = modals.find(function (item) {
@@ -61,30 +64,52 @@ function DialogActionPanel(_a) {
       modals.filter(function (item) {
         return item.isModified && item !== currentModal && item.modal.$$ref;
       }).forEach(function (_a) {
-        var _b;
-        var _c;
-        var modal = _a.modal;
-        var _d = modal,
-          originId = _d.$$originId,
-          def = __rest(_d, ["$$originId"]);
+        var _b, _c;
+        var _d, _e;
+        var modal = _a.modal,
+          isRefered = _a.isRefered;
+        var _f = modal,
+          originId = _f.$$originId,
+          def = __rest(_f, ["$$originId"]);
         if (originId) {
           var parent_1 = JSONGetParentById(schema, originId);
-          if (!parent_1) {
+          if (id === originId) {
+            return;
+          } else if (!parent_1) {
             // 找不到就丢回去，上层去处理
             def.$$originId = originId;
-          } else {
-            // TODO 这里要不要再加个判断？
-            // 只更新当前动作中关联的弹窗？
+          } else if (isRefered === false) {
             var modalType_1 = def.type === 'drawer' ? 'drawer' : 'dialog';
-            schema = JSONUpdate(schema, parent_1.$$id, __assign(__assign({}, parent_1), (_b = {
+            // 这样处理是为了不要修改原来的 $$id
+            var origin_1 = parent_1[modalType_1] || {};
+            var changes = diff(origin_1, modal, function (path, key) {
+              return key === '$$id';
+            });
+            if (changes) {
+              var newModal = patchDiff(origin_1, changes);
+              delete newModal.$$originId;
+              delete newModal.$$ref;
+              schema = JSONUpdate(schema, parent_1.$$id, __assign(__assign({}, parent_1), (_b = {
+                __actionModals: undefined,
+                args: undefined,
+                dialog: undefined,
+                drawer: undefined,
+                actionType: (_d = def.actionType) !== null && _d !== void 0 ? _d : modalType_1
+              }, _b[modalType_1] = newModal, _b)), true);
+            }
+            // 不要写下面的 defintions 了
+            return;
+          } else {
+            var modalType_2 = def.type === 'drawer' ? 'drawer' : 'dialog';
+            schema = JSONUpdate(schema, parent_1.$$id, __assign(__assign({}, parent_1), (_c = {
               __actionModals: undefined,
               args: undefined,
               dialog: undefined,
               drawer: undefined,
-              actionType: (_c = def.actionType) !== null && _c !== void 0 ? _c : modalType_1
-            }, _b[modalType_1] = JSONPipeIn({
+              actionType: (_e = def.actionType) !== null && _e !== void 0 ? _e : modalType_2
+            }, _c[modalType_2] = JSONPipeIn({
               $ref: modal.$$ref
-            }), _b)));
+            }), _c)), true);
           }
         }
         schema.definitions[modal.$$ref] = JSONPipeIn(def);
@@ -102,7 +127,7 @@ function DialogActionPanel(_a) {
           args: undefined,
           dialog: undefined,
           drawer: undefined,
-          actionType: (_g = currentModal.modal.actionType) !== null && _g !== void 0 ? _g : modalType,
+          actionType: (_j = currentModal.modal.actionType) !== null && _j !== void 0 ? _j : modalType,
           data: currentModal.data
         }, _a[modalType] = __assign(__assign({}, currentModal.modal), {
           data: undefined
@@ -114,7 +139,7 @@ function DialogActionPanel(_a) {
           args: undefined,
           dialog: undefined,
           drawer: undefined,
-          actionType: (_h = currentModal.modal.actionType) !== null && _h !== void 0 ? _h : modalType,
+          actionType: (_k = currentModal.modal.actionType) !== null && _k !== void 0 ? _k : modalType,
           data: currentModal.data
         }, _b[modalType] = {
           $ref: currentModal.modal.$$ref
@@ -134,6 +159,7 @@ function DialogActionPanel(_a) {
             // 没找到很可能是在主页面里面的弹窗
             // 还得继续把 originId 给到上一层去处理
             schema.definitions[currentModal.modal.$$ref].$$originId = originInd;
+            newActionSchema[modalType].$$originId = originInd;
           }
         }
       } else {
@@ -142,12 +168,14 @@ function DialogActionPanel(_a) {
         // 然后都引用这个 definition
         var refKey = '';
         _c = __read(addModal(schema, currentModal.modal), 2), schema = _c[0], refKey = _c[1];
+        // 需要记录原始的弹窗 id，方便上层处理合并
+        schema.definitions[refKey].$$originId = currentModal.modal.$$id;
         newActionSchema = __assign(__assign({}, actionSchema), (_d = {
           __actionModals: undefined,
           args: undefined,
           dialog: undefined,
           drawer: undefined,
-          actionType: (_j = currentModal.modal.actionType) !== null && _j !== void 0 ? _j : modalType,
+          actionType: (_l = currentModal.modal.actionType) !== null && _l !== void 0 ? _l : modalType,
           data: currentModal.data
         }, _d[modalType] = JSONPipeIn({
           $ref: refKey
@@ -156,6 +184,40 @@ function DialogActionPanel(_a) {
         newRefName = refKey;
       }
       schema = JSONUpdate(schema, actionSchema.$$id, JSONPipeIn(newActionSchema), true);
+      // 自己就是个弹窗，可能有 definition 里面引用自己
+      if (['dialog', 'drawer', 'confirmDialog'].includes(schema.type)) {
+        var id_1 = schema.$$originId || schema.$$id;
+        Object.keys(schema.definitions).forEach(function (key) {
+          var definition = schema.definitions[key];
+          var exits = JSONGetById(definition, id_1);
+          if (exits) {
+            schema.definitions[key] = JSONUpdate(schema.definitions[key], id_1, __assign(__assign({}, schema), {
+              definitions: undefined
+            }), true);
+          }
+        });
+      }
+      // 如果弹窗里面又弹窗指向自己，那么也要更新
+      var currentModalId = currentModal.modal.$$id;
+      var refIds = [];
+      JSONTraverse(currentModal.modal, function (value, key, host) {
+        if (key === '$ref' && host.$$originId === currentModalId) {
+          refIds.push(host.$$id);
+        }
+      });
+      if (refIds.length) {
+        var refKey_1 = '';
+        _e = __read(addModal(schema, currentModal.modal), 2), schema = _e[0], refKey_1 = _e[1];
+        schema = JSONUpdate(schema, actionSchema.$$id, (_f = {}, _f[modalType] = JSONPipeIn({
+          $ref: refKey_1
+        }), _f));
+        refIds.forEach(function (refId) {
+          schema = JSONUpdate(schema, refId, {
+            $ref: refKey_1,
+            $$originId: undefined
+          });
+        });
+      }
       // 原来的动作也要更新
       if (originActionId && newRefName) {
         schema = JSONUpdate(schema, currentModal.value, JSONPipeIn({
@@ -211,6 +273,7 @@ function DialogActionPanel(_a) {
     var _a, _b, _c, _d;
     var actionSchema = typeof actionIndex === 'undefined' ? {} : (_c = (_b = (_a = node.schema) === null || _a === void 0 ? void 0 : _a.onEvent[eventKey]) === null || _b === void 0 ? void 0 : _b.actions) === null || _c === void 0 ? void 0 : _c[actionIndex];
     var dialogBody = actionSchema[actionSchema.actionType === 'drawer' ? 'drawer' : 'dialog'] || actionSchema.args;
+    var schema = store.schema;
     var modals = store.modals.map(function (modal) {
       var _a;
       var isCurrentActionModal = modal.$$id === (dialogBody === null || dialogBody === void 0 ? void 0 : dialogBody.$$id);
@@ -220,7 +283,9 @@ function DialogActionPanel(_a) {
         value: modal.$$id,
         modal: modal,
         isCurrentActionModal: isCurrentActionModal,
-        data: modal.data
+        data: modal.data,
+        // 当前编辑的弹窗不让再里面再次弹出
+        disabled: modal.$$ref ? modal.$$ref === schema.$$ref : modal.$$id === schema.$$id
       };
     });
     var dialogId = (dialogBody === null || dialogBody === void 0 ? void 0 : dialogBody.$$id) || '';
@@ -298,10 +363,6 @@ function DialogActionPanel(_a) {
     var arr = members;
     Object.keys(definitions).forEach(function (key) {
       var _a;
-      // 弹窗里面用到了才更新
-      if (!refs.includes(key)) {
-        return;
-      }
       // 要修改就复制一份，避免污染原始数据
       if (arr === members) {
         arr = members.concat();
@@ -310,7 +371,7 @@ function DialogActionPanel(_a) {
         $$originId = _b.$$originId,
         modal = __rest(_b, ["$$originId"]);
       var idx = arr.findIndex(function (item) {
-        return $$originId ? item.value === $$originId : item.modal.$$ref === key;
+        return $$originId ? (item.modal.$$originId || item.modal.$$id) === $$originId : item.modal.$$ref === key;
       });
       var label = "".concat(((_a = modal.editorSetting) === null || _a === void 0 ? void 0 : _a.displayName) || modal.title || '未命名弹窗');
       var tip = modal.actionType === 'confirmDialog' ? '确认框' : modal.type === 'drawer' ? '抽屉弹窗' : i18n("6cff4b6d794cc17f5d24dbe0d21e5732");
@@ -322,9 +383,10 @@ function DialogActionPanel(_a) {
             $$ref: key,
             $$originId: $$originId
           }),
-          isModified: true
+          isModified: true,
+          isRefered: refs.includes(key)
         }));
-      } else {
+      } else if (refs.includes(key)) {
         if ($$originId) {
           throw new Error('Definition merge exception');
         }
@@ -343,24 +405,30 @@ function DialogActionPanel(_a) {
   }, []);
   // 处理新建弹窗
   var handleDialogAdd = React__default.useCallback(function (idx, value, skipForm, closePopOver) {
-    store.openSubEditor({
+    var modal = {
+      $$id: guid(),
+      type: 'dialog',
+      title: '未命名弹窗',
+      body: [{
+        type: 'tpl',
+        tpl: '弹窗内容'
+      }],
+      definitions: modalsToDefinitions(modals.map(function (item) {
+        return item.modal;
+      }))
+    };
+    var modalId = modal.$$id;
+    manager.openSubEditor({
       title: i18n("a781b5903a4013c147783e1047f42e08"),
-      value: {
-        type: 'dialog',
-        title: '未命名弹窗',
-        body: [{
-          type: 'tpl',
-          tpl: '弹窗内容'
-        }],
-        definitions: modalsToDefinitions(modals.map(function (item) {
-          return item.modal;
-        }))
-      },
+      value: modal,
       onChange: function (_a, diff) {
         var _b;
         var definitions = _a.definitions,
           modal = __rest(_a, ["definitions"]);
-        modal = JSONPipeIn(modal);
+        // 不能变 $$id 如果有内部有引用，就找不到了
+        modal = JSONPipeIn(__assign(__assign({}, modal), {
+          $$id: modalId
+        }));
         var arr = modals.concat();
         if (!arr.some(function (item) {
           return item.isNew;
@@ -396,7 +464,7 @@ function DialogActionPanel(_a) {
     if (!currentModal) {
       return;
     }
-    store.openSubEditor({
+    manager.openSubEditor({
       title: '编辑弹窗',
       value: __assign(__assign({
         type: 'dialog',
@@ -406,11 +474,9 @@ function DialogActionPanel(_a) {
           tpl: '弹窗内容'
         }]
       }, currentModal.modal), {
-        definitions: modalsToDefinitions(modals.filter(function (item) {
-          return !item.isActive;
-        }).map(function (item) {
+        definitions: modalsToDefinitions(modals.map(function (item) {
           return item.modal;
-        }))
+        }), {}, currentModal.modal)
       }),
       onChange: function (_a, diff) {
         var definitions = _a.definitions,
@@ -477,6 +543,20 @@ function DialogActionPanel(_a) {
       className: "text-muted"
     }, option.tip));
   }, []);
+  var formula = React__default.useMemo(function () {
+    return {
+      variables: function () {
+        return getVariables({
+          props: {
+            node: node,
+            manager: manager
+          },
+          appLocale: appLocale,
+          appCorpusData: appCorpusData
+        });
+      }
+    };
+  }, [node, manager]);
   return React__default.createElement("div", {
     className: cx('ae-DialogActionPanel')
   }, React__default.createElement(FormField, {
@@ -513,7 +593,7 @@ function DialogActionPanel(_a) {
     mode: "horizontal",
     hasError: !!errors.data,
     errors: errors.data,
-    description: !currentModal.data ? '不设置参数，打开弹窗将自动传递所有上下文数据' : ''
+    description: !currentModal.data ? '弹窗内参数赋值将优先取此处配置，若关闭配置或无配置值则会透传上下文数据。' : ''
   }, React__default.createElement("div", {
     className: cx('Form-control Form-control--withSize Form-control--sizeLg')
   }, React__default.createElement(Switch, {
@@ -526,22 +606,22 @@ function DialogActionPanel(_a) {
     value: currentModal.data,
     onChange: handleDataChange,
     schema: JSONPipeOut(currentModal.modal.inputParams),
-    addButtonText: "\u6DFB\u52A0\u53C2\u6570"
+    addButtonText: "\u6DFB\u52A0\u53C2\u6570",
+    formula: formula
   }) : null)) : null, React__default.createElement(FormField, {
     label: "\u7B49\u5F85\u5F39\u7A97",
     mode: "horizontal",
-    description: '是否等待弹窗响应，开启则当前操作会等待弹窗响应后再执行，同时弹窗被取消则中断后续动作'
+    description: '当前打开弹窗动作结束后，才执行下一步动作'
   }, React__default.createElement("div", {
     className: cx('Form-control Form-control--withSize Form-control--sizeLg')
   }, React__default.createElement(Switch, {
     className: "mt-2 m-b-xs",
     value: !!data.waitForAction,
-    onChange: handleWaitForActionChange,
-    disabled: hasRequired
+    onChange: handleWaitForActionChange
   }))), data.waitForAction ? React__default.createElement(FormField, {
     label: "\u54CD\u5E94\u7ED3\u679C",
     mode: "horizontal",
-    description: i18n("4da82260041107e5780bcbb3a14ef791")
+    description: '弹窗动作结束后的出参变量名配置'
   }, React__default.createElement("div", {
     className: cx('Form-control Form-control--withSize Form-control--sizeLg')
   }, React__default.createElement(InputBox, {
@@ -553,4 +633,4 @@ function DialogActionPanel(_a) {
 var DialogActionPanel$1 = observer(DialogActionPanel);
 
 export { DialogActionPanel$1 as default };
-window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};
+window.amisEditorVersionInfo={version:'6.4.1',buildTime:'2024-05-08'};

package/esm/renderer/event-control/action-config-dialog.d.ts

@@ -21,7 +21,7 @@ interface ActionDialogProp {
     actionConfigInitFormatter?: (actionConfig: ActionConfig) => ActionConfig;
     actionConfigSubmitFormatter?: (actionConfig: ActionConfig, type?: string) => ActionConfig;
     render: (region: string, node: SchemaNode, props?: PlainObject) => JSX.Element;
-    subscribeSchemaSubmit: (fn: (schema: any, value: any, id: string, diff?: any) => any) => () => void;
+    subscribeSchemaSubmit: (fn: (schema: any, value: any, id: string, diff?: any) => any, once?: boolean) => () => void;
     subscribeActionSubmit: (fn: (value: any) => any) => () => void;
 }
 export default class ActionDialog extends React.Component<ActionDialogProp> {

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

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

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

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

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

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.3.0
- * build time: 2024-03-29
+ * amis-editor v6.4.1
+ * build time: 2024-05-08
  * Copyright 2018-2024 @fex
  */
 
@@ -74,4 +74,4 @@ var CmptActionSelect = /** @class */function (_super) {
 }(React__default.Component);
 
 export { BASE_ACTION_PROPS, CmptActionSelect as default };
-window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};
+window.amisEditorVersionInfo={version:'6.4.1',buildTime:'2024-05-08'};

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

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.3.0
- * build time: 2024-03-29
+ * amis-editor v6.4.1
+ * build time: 2024-05-08
  * Copyright 2018-2024 @fex
  */
 
@@ -164,14 +164,12 @@ var ACTION_TYPE_TREE = function (manager) {
           e.preventDefault();
           e.stopPropagation();
           var modalId = modal.$$id;
-          store.openSubEditor({
+          manager.openSubEditor({
             title: '编辑弹窗',
             value: __assign(__assign({
               type: 'dialog'
             }, modal), {
-              definitions: modalsToDefinitions(store.modals.filter(function (m) {
-                return m.$$id !== modalId;
-              }))
+              definitions: modalsToDefinitions(store.modals, {}, modal)
             }),
             onChange: function (_a, diff) {
               var definitions = _a.definitions,
@@ -2541,4 +2539,4 @@ var updateCommonUseActions = function (action) {
 };
 
 export { ACTION_TYPE_TREE, COMMON_ACTION_SCHEMA_MAP, DATA_CONTAINER, FORMITEM_CMPTS, SELECT_PROPS_CONTAINER, SHOW_SELECT_PROP, SUPPORT_DISABLED_CMPTS, SUPPORT_STATIC_FORMITEM_CMPTS, findActionNode, findSubActionNode, getActionType, getArgsWrapper, getEventControlConfig, getEventDesc, getEventLabel, getEventStrongDesc, getOldActionSchema, getPropOfAcion, hasActionType, renderCmptActionSelect, renderCmptIdInput, renderCmptSelect, updateCommonUseActions };
-window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};
+window.amisEditorVersionInfo={version:'6.4.1',buildTime:'2024-05-08'};

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

@@ -21,7 +21,7 @@ interface EventControlProps extends FormControlProps {
     actionConfigInitFormatter?: (actionConfig: ActionConfig) => ActionConfig;
     actionConfigSubmitFormatter?: (actionConfig: ActionConfig, type?: string, actionData?: ActionData, schema?: Schema) => ActionConfig;
     owner?: string;
-    subscribeSchemaSubmit: (fn: (schema: any, value: any, id: string, diff?: any) => any) => () => void;
+    subscribeSchemaSubmit: (fn: (schema: any, value: any, id: string, diff?: any) => any, once?: boolean) => () => void;
 }
 interface EventDialogData {
     eventName: string;
@@ -109,6 +109,8 @@ export declare class EventControl extends React.Component<EventControlProps, Eve
     renderDesc(action: ActionConfig, actionIndex: number, eventKey: string): React.JSX.Element | null;
     onSubmit(type: string, config: any): void;
     onClose(): void;
+    unSubscribeSchemaSubmit?: () => void;
+    subscribeSchemaSubmit(fn: (schema: any, value: any, id: string, diff?: any) => any, once?: boolean): () => void;
     removeDataSchema(): void;
     renderActionType(action: any, actionIndex: number, eventKey: string): React.JSX.Element;
     render(): React.JSX.Element;

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

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.3.0
- * build time: 2024-03-29
+ * amis-editor v6.4.1
+ * build time: 2024-05-08
  * Copyright 2018-2024 @fex
  */
 
@@ -718,10 +718,17 @@ var EventControl = /** @class */function (_super) {
     });
   };
   EventControl.prototype.onClose = function () {
+    var _a;
     this.removeDataSchema();
     this.setState({
       showAcionDialog: false
     });
+    (_a = this.unSubscribeSchemaSubmit) === null || _a === void 0 ? void 0 : _a.call(this);
+    delete this.unSubscribeSchemaSubmit;
+  };
+  EventControl.prototype.subscribeSchemaSubmit = function (fn, once) {
+    this.unSubscribeSchemaSubmit = this.props.subscribeSchemaSubmit(fn, once);
+    return this.unSubscribeSchemaSubmit;
   };
   EventControl.prototype.removeDataSchema = function () {
     var manager = this.props.manager;
@@ -757,8 +764,8 @@ var EventControl = /** @class */function (_super) {
       commonActions = _d.commonActions,
       getComponents = _d.getComponents;
       _d.allComponents;
-      var render$1 = _d.render,
-      subscribeSchemaSubmit = _d.subscribeSchemaSubmit;
+      var render$1 = _d.render;
+      _d.subscribeSchemaSubmit;
     var _e = this.state,
       onEvent = _e.onEvent,
       itemEvents = _e.events,
@@ -929,7 +936,7 @@ var EventControl = /** @class */function (_super) {
           })
         }, React__default.createElement(Icon, {
           className: "icon",
-          icon: "edit-full-btn"
+          icon: "setting"
         })), React__default.createElement("div", {
           onClick: _this.delAction.bind(_this, eventKey, action, actionIndex)
         }, React__default.createElement(Icon, {
@@ -1024,7 +1031,7 @@ var EventControl = /** @class */function (_super) {
       onSubmit: this.onSubmit,
       onClose: this.onClose,
       render: this.props.render,
-      subscribeSchemaSubmit: subscribeSchemaSubmit,
+      subscribeSchemaSubmit: this.subscribeSchemaSubmit,
       subscribeActionSubmit: this.subscribeSubmit
     }));
   };
@@ -1032,6 +1039,7 @@ var EventControl = /** @class */function (_super) {
   __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", [Object]), __metadata("design:returntype", void 0)], EventControl.prototype, "dragRef", null);
   __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", [String, Object]), __metadata("design:returntype", void 0)], EventControl.prototype, "onSubmit", null);
   __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", []), __metadata("design:returntype", void 0)], EventControl.prototype, "onClose", null);
+  __decorate([autobind, __metadata("design:type", Function), __metadata("design:paramtypes", [Function, Boolean]), __metadata("design:returntype", void 0)], EventControl.prototype, "subscribeSchemaSubmit", null);
   return EventControl;
 }(React__default.Component);
 /** @class */(function (_super) {
@@ -1046,4 +1054,4 @@ var EventControl = /** @class */function (_super) {
 })(EventControl);
 
 export { EventControl };
-window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};
+window.amisEditorVersionInfo={version:'6.4.1',buildTime:'2024-05-08'};

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

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.3.0
- * build time: 2024-03-29
+ * amis-editor v6.4.1
+ * build time: 2024-05-08
  * Copyright 2018-2024 @fex
  */
 
@@ -481,4 +481,4 @@ var Background = function (props) {
 })(React__default.Component);
 
 export { Background as default };
-window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};
+window.amisEditorVersionInfo={version:'6.4.1',buildTime:'2024-05-08'};

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

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.3.0
- * build time: 2024-03-29
+ * amis-editor v6.4.1
+ * build time: 2024-05-08
  * Copyright 2018-2024 @fex
  */
 
@@ -216,4 +216,4 @@ observer(BoxBorder);
   })], BorderRenderer);
   return BorderRenderer;
 })(React__default.Component);
-window.amisEditorVersionInfo={version:'6.3.0',buildTime:'2024-03-29'};
+window.amisEditorVersionInfo={version:'6.4.1',buildTime:'2024-05-08'};