amis-editor 5.7.0 → 6.1.0

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

@@ -1,7 +1,7 @@
 /**
- * amis-editor v5.7.0
- * build time: 2023-12-08
- * Copyright 2018-2023 @fex
+ * amis-editor v6.1.0
+ * build time: 2024-01-31
+ * Copyright 2018-2024 @fex
  */
 
 import { __spreadArray, __assign, __read, __awaiter, __generator } from 'tslib';
@@ -148,7 +148,6 @@ var ACTION_TYPE_TREE = function (manager) {
       },
       schema: getArgsWrapper([{
         type: 'wrapper',
-        className: 'p-none',
         body: [getSchemaTpl('textareaFormulaControl', {
           name: 'url',
           label: i18n("8f1c078c6d42759e6ccb1a9bf35f1629"),
@@ -273,7 +272,6 @@ var ACTION_TYPE_TREE = function (manager) {
       description: i18n("f33c2c6ff58bcec40d3e74e591bb3df2") // 或者关闭指定弹窗
       // schema: getArgsWrapper({
       //   type: 'wrapper',
-      //   className: 'p-none',
       //   body: [
       //     {
       //       type: 'radios',
@@ -322,7 +320,6 @@ var ACTION_TYPE_TREE = function (manager) {
       },
       schema: getArgsWrapper({
         type: 'wrapper',
-        className: 'p-none',
         body: [{
           type: 'button-group-select',
           name: 'msgType',
@@ -520,9 +517,7 @@ var ACTION_TYPE_TREE = function (manager) {
       // innerArgs: ['api'],
       schema: {
         type: 'wrapper',
-        style: {
-          padding: '0'
-        },
+        className: 'p-none',
         body: [
         // getArgsWrapper(
         //   getSchemaTpl('apiControl', {
@@ -740,23 +735,12 @@ var ACTION_TYPE_TREE = function (manager) {
       schema: [{
         type: 'wrapper',
         size: 'sm',
-        visibleOn: 'data.componentId === "customCmptId"',
         body: __spreadArray([], __read(renderCmptSelect(i18n("6afde638796d237377b0755506d08ded"), true, function (value, oldVal, data, form) {
           form.setValueByName('args.resetPage', true);
           form.setValueByName('__addParam', false);
           form.setValueByName('__containerType', 'all');
           form.setValueByName('__reloadParam', []);
         }, true)), false)
-      }, {
-        type: 'wrapper',
-        size: 'sm',
-        visibleOn: 'data.componentId !== "customCmptId"',
-        body: __spreadArray([], __read(renderCmptSelect(i18n("6afde638796d237377b0755506d08ded"), true, function (value, oldVal, data, form) {
-          form.setValueByName('args.resetPage', true);
-          form.setValueByName('__addParam', false);
-          form.setValueByName('__containerType', 'all');
-          form.setValueByName('__reloadParam', []);
-        })), false)
       }, renderCmptIdInput(function (value, oldVal, data, form) {
         // 找到组件并设置相关的属性
         var schema = JSONGetById(manager.store.schema, value, 'id');
@@ -888,7 +872,7 @@ var ACTION_TYPE_TREE = function (manager) {
               label: i18n("1b7e6b2dbf3b7f4b1baf2c42e49a995d"),
               value: 'cmpt'
             }, {
-              label: i18n("cc6aeb073ebc3cb29734a49164f8964c"),
+              label: i18n("0b72392143e4038e98128cb0f6f679b3"),
               value: 'page'
             }, {
               label: i18n("c6f30c2f084ddeacb7944235348bdaa4"),
@@ -910,8 +894,8 @@ var ACTION_TYPE_TREE = function (manager) {
         visibleOn: '__actionSubType === "cmpt"',
         body: [{
           type: 'wrapper',
-          size: 'sm',
           visibleOn: 'data.componentId === "customCmptId"',
+          className: 'p-none mb-6',
           body: __spreadArray([], __read(renderCmptActionSelect(i18n("6afde638796d237377b0755506d08ded"), true, function (value, oldVal, data, form) {
             form.setValueByName('args.__containerType', 'all');
             form.setValueByName('args.__comboType', 'all');
@@ -919,7 +903,7 @@ var ACTION_TYPE_TREE = function (manager) {
         }, {
           type: 'wrapper',
           visibleOn: 'data.componentId !== "customCmptId"',
-          size: 'sm',
+          className: 'p-none mb-6',
           body: __spreadArray([], __read(renderCmptActionSelect(i18n("6afde638796d237377b0755506d08ded"), true, function (value, oldVal, data, form) {
             form.setValueByName('args.__containerType', 'all');
             form.setValueByName('args.__comboType', 'all');
@@ -942,7 +926,6 @@ var ACTION_TYPE_TREE = function (manager) {
           }
         }), getArgsWrapper({
           type: 'wrapper',
-          className: 'p-none',
           body: [{
             type: 'radios',
             name: '__containerType',
@@ -989,7 +972,7 @@ var ACTION_TYPE_TREE = function (manager) {
             label: i18n("a7b0b80a7bea1e5e973967c179866ef0"),
             size: 'lg',
             placeholder: i18n("e887792fbbd65d21e43e832a5cd63aac"),
-            visibleOn: "(data.__rendererName === 'input-table' || data.__rendererName === 'combo')\n                      && data.__comboType === 'appoint'"
+            visibleOn: "(data.__rendererName === 'input-table' || data.__rendererName === 'combo')\n                    && data.__comboType === 'appoint'"
           }, {
             type: 'combo',
             name: 'value',
@@ -1055,7 +1038,7 @@ var ACTION_TYPE_TREE = function (manager) {
                 variables: '${variables}'
               })]
             }],
-            visibleOn: "(data.__rendererName === 'combo' || data.__rendererName === 'input-table')\n                      && data.__comboType === 'all'"
+            visibleOn: "(data.__rendererName === 'combo' || data.__rendererName === 'input-table')\n                    && data.__comboType === 'all'"
           }, getSchemaTpl('formulaControl', {
             name: '__valueInput',
             label: '',
@@ -1075,17 +1058,19 @@ var ACTION_TYPE_TREE = function (manager) {
           })]
         })]
       },
-      // 页面变量
+      // 页面参数
       {
         type: 'container',
         visibleOn: '__actionSubType === "page"',
         body: [getArgsWrapper([{
           type: 'wrapper',
-          className: 'p-none',
           body: [getCustomNodeTreeSelectSchema({
-            label: i18n("cc6aeb073ebc3cb29734a49164f8964c"),
-            rootLabel: i18n("cc6aeb073ebc3cb29734a49164f8964c"),
-            options: pageVariableOptions
+            label: i18n("0b72392143e4038e98128cb0f6f679b3"),
+            rootLabel: i18n("0b72392143e4038e98128cb0f6f679b3"),
+            options: pageVariableOptions,
+            horizontal: {
+              leftFixed: true
+            }
           }), getSchemaTpl('formulaControl', {
             name: 'value',
             label: i18n("e7af71fb102cc86ab3be6a2fb32b5e3f"),
@@ -1093,7 +1078,10 @@ var ACTION_TYPE_TREE = function (manager) {
             size: 'lg',
             mode: 'horizontal',
             required: true,
-            placeholder: i18n("85451d2eb59327a23e8f745161066d4a")
+            placeholder: i18n("85451d2eb59327a23e8f745161066d4a"),
+            horizontal: {
+              leftFixed: true
+            }
           })]
         }])]
       },
@@ -1103,9 +1091,11 @@ var ACTION_TYPE_TREE = function (manager) {
         visibleOn: '__actionSubType === "app"',
         body: [getArgsWrapper([{
           type: 'wrapper',
-          className: 'p-none',
           body: [getCustomNodeTreeSelectSchema({
-            options: variableOptions
+            options: variableOptions,
+            horizontal: {
+              leftFixed: true
+            }
           }), getSchemaTpl('formulaControl', {
             name: 'value',
             label: i18n("e7af71fb102cc86ab3be6a2fb32b5e3f"),
@@ -1113,7 +1103,10 @@ var ACTION_TYPE_TREE = function (manager) {
             size: 'lg',
             mode: 'horizontal',
             required: true,
-            placeholder: i18n("85451d2eb59327a23e8f745161066d4a")
+            placeholder: i18n("85451d2eb59327a23e8f745161066d4a"),
+            horizontal: {
+              leftFixed: true
+            }
           })]
         }])]
       }]
@@ -1221,6 +1214,41 @@ var ACTION_TYPE_TREE = function (manager) {
           }
         }
       }]
+    }, {
+      actionLabel: i18n("1a04578671f6c3bfa2d35a8cbd9d1a9e"),
+      actionType: 'validateFormItem',
+      description: i18n("e4092e07c4613278048c91064f4bfdf7"),
+      descDetail: function (info) {
+        return React__default.createElement("div", null, i18n("b7579706a363e5f23b1040fecfbcb677"), React__default.createElement("span", {
+          className: "variable-left variable-right"
+        }, (info === null || info === void 0 ? void 0 : info.rendererLabel) || info.componentId || '-'), i18n("b91ebe714155c83b6d3bc02b675a31e9"));
+      },
+      supportComponents: __spreadArray([], __read(FORMITEM_CMPTS), false),
+      schema: __spreadArray(__spreadArray([], __read(renderCmptSelect(i18n("6afde638796d237377b0755506d08ded"), true)), false), [renderCmptIdInput(), {
+        name: 'outputVar',
+        type: 'input-text',
+        label: i18n("bf0f829689370b36d01ce871324e0bb6"),
+        placeholder: i18n("d23157205c994bde20bb2605c193fd27"),
+        description: i18n("a422eb12ebbfdd3347c4deb5ec6b4b54"),
+        mode: 'horizontal',
+        size: 'lg',
+        value: 'validateFormItemResult',
+        required: true
+      }], false),
+      outputVarDataSchema: [{
+        type: 'object',
+        title: 'validateFormItemResult',
+        properties: {
+          error: {
+            type: 'string',
+            title: i18n("4604d5023479171cb6e901dbeccf62c0")
+          },
+          value: {
+            type: 'object',
+            title: i18n("dd39bd1bf78f1b2aec6ed8a05ced6884")
+          }
+        }
+      }]
     }, {
       actionLabel: i18n("51325230409d4b7c64aaeb3db9904801"),
       actionType: 'component',
@@ -1244,7 +1272,6 @@ var ACTION_TYPE_TREE = function (manager) {
       },
       schema: getArgsWrapper({
         type: 'wrapper',
-        className: 'p-none',
         body: [getSchemaTpl('textareaFormulaControl', {
           name: 'content',
           label: i18n("ac04259507be8ba6b891dc9dc208f491"),
@@ -1335,56 +1362,34 @@ var ACTION_TYPE_TREE = function (manager) {
 };
 // 渲染组件选择配置项
 var renderCmptSelect = function (componentLabel, required, onChange, hideAutoFill) {
-  if (hideAutoFill) {
-    return [{
-      type: 'tree-select',
-      name: 'componentId',
-      label: componentLabel || i18n("d80bc0fcbfb250480320b683e48b1467"),
-      showIcon: false,
-      searchable: true,
-      required: required,
-      selfDisabledAffectChildren: false,
-      size: 'lg',
-      source: '${__cmptTreeSource}',
-      mode: 'horizontal',
-      onChange: function (value, oldVal, data, form) {
-        return __awaiter(void 0, void 0, void 0, function () {
-          return __generator(this, function (_a) {
-            onChange === null || onChange === void 0 ? void 0 : onChange(value, oldVal, data, form);
-            return [2 /*return*/];
-          });
-        });
-      }
-    }];
-  } else {
-    return [{
-      type: 'tree-select',
-      name: 'componentId',
-      label: componentLabel || i18n("d80bc0fcbfb250480320b683e48b1467"),
-      showIcon: false,
-      searchable: true,
-      required: required,
-      selfDisabledAffectChildren: false,
-      size: 'lg',
-      source: '${__cmptTreeSource}',
-      mode: 'horizontal',
-      autoFill: {
-        __rendererLabel: '${label}',
-        __rendererName: '${type}',
-        __nodeId: '${id}',
-        __nodeSchema: '${schema}',
-        __isScopeContainer: '${isScopeContainer}'
-      },
-      onChange: function (value, oldVal, data, form) {
-        return __awaiter(void 0, void 0, void 0, function () {
-          return __generator(this, function (_a) {
-            onChange === null || onChange === void 0 ? void 0 : onChange(value, oldVal, data, form);
-            return [2 /*return*/];
-          });
+  return [{
+    type: 'tree-select',
+    name: 'componentId',
+    label: componentLabel || i18n("d80bc0fcbfb250480320b683e48b1467"),
+    showIcon: false,
+    searchable: true,
+    required: required,
+    selfDisabledAffectChildren: false,
+    size: 'lg',
+    source: '${__cmptTreeSource}',
+    mode: 'horizontal',
+    autoFill: __assign({
+      __isScopeContainer: '${isScopeContainer}'
+    }, hideAutoFill ? {} : {
+      __rendererLabel: '${label}',
+      __rendererName: '${type}',
+      __nodeId: '${id}',
+      __nodeSchema: '${schema}'
+    }),
+    onChange: function (value, oldVal, data, form) {
+      return __awaiter(void 0, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+          onChange === null || onChange === void 0 ? void 0 : onChange(value, oldVal, data, form);
+          return [2 /*return*/];
         });
-      }
-    }];
-  }
+      });
+    }
+  }];
 };
 // 渲染组件特性动作配置项
 var renderCmptActionSelect = function (componentLabel, required, onChange, hideAutoFill, manager) {
@@ -1489,7 +1494,6 @@ var COMMON_ACTION_SCHEMA_MAP = {
     },
     schema: getArgsWrapper({
       type: 'wrapper',
-      className: 'p-none',
       body: [{
         type: 'radios',
         name: '__containerType',
@@ -1536,7 +1540,7 @@ var COMMON_ACTION_SCHEMA_MAP = {
         label: i18n("a7b0b80a7bea1e5e973967c179866ef0"),
         size: 'lg',
         placeholder: i18n("e887792fbbd65d21e43e832a5cd63aac"),
-        visibleOn: "(data.__rendererName === 'input-table' || data.__rendererName === 'combo')\n          && data.__comboType === 'appoint'"
+        visibleOn: "(data.__rendererName === 'input-table' || data.__rendererName === 'combo')\n      && data.__comboType === 'appoint'"
       }, {
         type: 'combo',
         name: 'value',
@@ -1602,7 +1606,7 @@ var COMMON_ACTION_SCHEMA_MAP = {
             variables: '${variables}'
           })]
         }],
-        visibleOn: "(data.__rendererName === 'combo' || data.__rendererName === 'input-table')\n          && data.__comboType === 'all'"
+        visibleOn: "(data.__rendererName === 'combo' || data.__rendererName === 'input-table')\n      && data.__comboType === 'all'"
       }, getSchemaTpl('formulaControl', {
         name: '__valueInput',
         label: '',
@@ -1618,7 +1622,10 @@ var COMMON_ACTION_SCHEMA_MAP = {
         size: 'lg',
         mode: 'horizontal',
         visibleOn: "data.__rendererName && !data.__isScopeContainer && data.__rendererName !== 'combo' && data.__rendererName !== 'input-table'",
-        required: true
+        required: true,
+        horizontal: {
+          leftFixed: true
+        }
       })]
     })
   },
@@ -1716,12 +1723,12 @@ var COMMON_ACTION_SCHEMA_MAP = {
   },
   preview: {
     descDetail: function (info) {
-      return React__default.createElement("div", null, "\u9884\u89C8\u56FE\u7247");
+      return React__default.createElement("div", null, i18n("9aa70276e6d364abdc0543deccea2dac"));
     }
   },
   zoom: {
     descDetail: function (info) {
-      return React__default.createElement("div", null, "\u8C03\u6574\u56FE\u7247\u6BD4\u4F8B");
+      return React__default.createElement("div", null, i18n("893a9d45e4df161d0b0c57340631bd2f"));
     }
   }
 };
@@ -2270,10 +2277,10 @@ var getEventControlConfig = function (manager, context) {
           if (config.actionType === 'reload') {
             config.__resetPage = (_s = config.args) === null || _s === void 0 ? void 0 : _s.resetPage;
             config.__addParam = !!config.data;
-            if (config.data && typeof config.data === 'object' || config.args && !Object.keys(config.args).length && config.data === undefined) {
+            if (config.data && typeof config.data === 'object' || config.args && Object.keys(config.args).length && config.data === undefined) {
               config.__addParam = true;
               config.__containerType = 'appoint';
-              config.dataMergeMode = 'override';
+              config.dataMergeMode = config.dataMergeMode || 'merge';
             }
             if (config.__addParam && config.data) {
               if (typeof config.data === 'string') {
@@ -2283,7 +2290,7 @@ var getEventControlConfig = function (manager, context) {
                 config.__containerType = 'appoint';
                 config.__reloadParams = objectToComboArray(config.data);
               }
-            } else if (config.args && !Object.keys(config.args).length && config.data === undefined) {
+            } else if (config.args && Object.keys(config.args).length && config.data === undefined) {
               config.__reloadParams = objectToComboArray(config.args);
             }
           }
@@ -2616,4 +2623,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:'5.7.0',buildTime:'2023-12-08'};
+window.amisEditorVersionInfo={version:'6.1.0',buildTime:'2024-01-31'};

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

@@ -1,17 +1,17 @@
 /**
- * amis-editor v5.7.0
- * build time: 2023-12-08
- * Copyright 2018-2023 @fex
+ * amis-editor v6.1.0
+ * build time: 2024-01-31
+ * Copyright 2018-2024 @fex
  */
 
-import { __extends, __assign, __awaiter, __generator, __spreadArray, __read, __decorate, __metadata } from 'tslib';
+import { __extends, __spreadArray, __read, __assign, __awaiter, __generator, __decorate, __metadata } from 'tslib';
 import React__default from 'react';
 import { findDOMNode } from 'react-dom';
 import cx from 'classnames';
 import Sortable from 'sortablejs';
 import { DataSchema, TooltipWrapper, Icon, render, FormItem } from 'amis';
 import cloneDeep from 'lodash/cloneDeep';
-import { findTree, autobind } from 'amis-core';
+import { findTree, getRendererByName, autobind } from 'amis-core';
 import ActionDialog from './action-config-dialog.js';
 import { getPropOfAcion, findActionNode, findSubActionNode, SELECT_PROPS_CONTAINER, getActionType, updateCommonUseActions, getEventStrongDesc, getEventDesc, getEventLabel } from './helper.js';
 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 } from './helper.js';
@@ -34,7 +34,8 @@ var EventControl = /** @class */function (_super) {
       data = props.data,
       rawType = props.rawType;
     var eventPanelActive = {};
-    var pluginEvents = events[rawType || (!data.type || data.type === 'text' ? 'plain' : data.type)] || [];
+    var tmpEvents = events[rawType || (!data.type || data.type === 'text' ? 'plain' : data.type)] || [];
+    var pluginEvents = typeof tmpEvents === 'function' ? tmpEvents(data) : __spreadArray([], __read(tmpEvents), false);
     pluginEvents.forEach(function (event) {
       eventPanelActive[event.eventName] = true;
     });
@@ -66,12 +67,29 @@ var EventControl = /** @class */function (_super) {
     (_a = this.unReaction) === null || _a === void 0 ? void 0 : _a.call(this);
   };
   EventControl.prototype.componentDidUpdate = function (prevProps, prevState) {
-    var value = this.props.value;
+    var _a, _b;
+    var _c = this.props,
+      value = _c.value,
+      data = _c.data,
+      events = _c.events,
+      rawType = _c.rawType;
     if (value !== prevProps.value) {
       this.setState({
         onEvent: value
       });
     }
+    if ((data === null || data === void 0 ? void 0 : data.type) !== ((_a = prevProps.data) === null || _a === void 0 ? void 0 : _a.type) || (data === null || data === void 0 ? void 0 : data.onEvent) !== ((_b = prevProps.data) === null || _b === void 0 ? void 0 : _b.onEvent)) {
+      var eventPanelActive_1 = {};
+      var tmpEvents = events[rawType || (!data.type || data.type === 'text' ? 'plain' : data.type)] || [];
+      var pluginEvents = typeof tmpEvents === 'function' ? tmpEvents(data) : __spreadArray([], __read(tmpEvents), false);
+      pluginEvents.forEach(function (event) {
+        eventPanelActive_1[event.eventName] = true;
+      });
+      this.setState({
+        events: pluginEvents,
+        eventPanelActive: eventPanelActive_1
+      });
+    }
   };
   EventControl.prototype.generateEmptyDefault = function (events) {
     var onEvent = {};
@@ -195,7 +213,19 @@ var EventControl = /** @class */function (_super) {
     activeConfig[event] = true;
     if (config.actionType) {
       onEventConfig[event] = __assign(__assign({}, onEventConfig[event]), {
-        actions: (onEventConfig[event].actions || []).concat(config)
+        actions: (onEventConfig[event].actions || []).concat(
+        // 临时处理，后面干掉这么多交互属性
+        Object.defineProperties(config, {
+          __cmptTreeSource: {
+            enumerable: false
+          },
+          __nodeSchema: {
+            enumerable: false
+          },
+          __subActions: {
+            enumerable: false
+          }
+        }))
       });
     }
     this.setState({
@@ -289,7 +319,17 @@ var EventControl = /** @class */function (_super) {
           actions: onEvent[event].actions.map(function (item, actionIndex) {
             return actionIndex === index ? typeof config === 'string' ? __assign(__assign({}, item), {
               actionType: config
-            }) : config : item;
+            }) : Object.defineProperties(config, {
+              __cmptTreeSource: {
+                enumerable: false
+              },
+              __nodeSchema: {
+                enumerable: false
+              },
+              __subActions: {
+                enumerable: false
+              }
+            }) : item;
           })
         });
         this.setState({
@@ -340,10 +380,8 @@ var EventControl = /** @class */function (_super) {
         }
         // 换回来
         var parent = e.to;
-        if (e.newIndex < e.oldIndex && e.oldIndex < parent.childNodes.length - 1) {
-          parent.insertBefore(e.item, parent.childNodes[e.oldIndex + 1]);
-        } else if (e.oldIndex < parent.childNodes.length - 1) {
-          parent.insertBefore(e.item, parent.childNodes[e.oldIndex]);
+        if (e.oldIndex < parent.childNodes.length - 1) {
+          parent.insertBefore(e.item, parent.childNodes[e.oldIndex > e.newIndex ? e.oldIndex + 1 : e.oldIndex]);
         } else {
           parent.appendChild(e.item);
         }
@@ -351,12 +389,7 @@ var EventControl = /** @class */function (_super) {
         var newEvent = onEventConfig[eventKey];
         var options = newEvent === null || newEvent === void 0 ? void 0 : newEvent.actions.concat();
         // 从后往前移
-        if (e.oldIndex > e.newIndex) {
-          options = __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read(options.slice(0, e.newIndex)), false), [options[e.oldIndex]], false), __read(options.slice(e.newIndex, e.oldIndex)), false), __read(options.slice(e.oldIndex + 1, options.length)), false);
-        } else if (e.oldIndex < e.newIndex) {
-          // 从前往后
-          options = __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read(e.oldIndex === 0 ? [] : options.slice(0, e.oldIndex)), false), __read(options.slice(e.oldIndex + 1, e.newIndex)), false), [options[e.oldIndex]], false), __read(options.slice(e.newIndex, options.length)), false);
-        }
+        options.splice(e.newIndex, 0, options.splice(e.oldIndex, 1)[0]);
         onEventConfig[eventKey] = __assign(__assign({}, onEventConfig[eventKey]), {
           actions: options
         });
@@ -375,15 +408,15 @@ var EventControl = /** @class */function (_super) {
     });
   };
   EventControl.prototype.buildEventDataSchema = function (data, manager) {
-    var _a, _b, _c;
-    var _d = this.props,
-      actionTree = _d.actionTree,
-      pluginActions = _d.actions,
-      commonActions = _d.commonActions,
-      allComponents = _d.allComponents;
-    var _e = this.state,
-      events = _e.events,
-      onEvent = _e.onEvent;
+    var _a, _b, _c, _d;
+    var _e = this.props,
+      actionTree = _e.actionTree,
+      pluginActions = _e.actions,
+      commonActions = _e.commonActions,
+      allComponents = _e.allComponents;
+    var _f = this.state,
+      events = _f.events,
+      onEvent = _f.onEvent;
     var eventConfig = events.find(function (item) {
       return item.eventName === data.actionData.eventKey;
     });
@@ -393,10 +426,16 @@ var EventControl = /** @class */function (_super) {
     if (data.type === 'update') {
       actions = actions.slice(0, data.actionData.actionIndex !== undefined ? data.actionData.actionIndex + 1 : 0);
     }
-    var jsonSchema = __assign({}, (_b = (_a = eventConfig === null || eventConfig === void 0 ? void 0 : eventConfig.dataSchema) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : {});
-    (_c = actions === null || actions === void 0 ? void 0 : actions.filter(function (item) {
+    var jsonSchema = {};
+    // 动态构建事件参数
+    if (typeof (eventConfig === null || eventConfig === void 0 ? void 0 : eventConfig.dataSchema) === 'function') {
+      jsonSchema = (_a = eventConfig.dataSchema(manager)) === null || _a === void 0 ? void 0 : _a[0];
+    } else {
+      jsonSchema = __assign({}, (_c = (_b = eventConfig === null || eventConfig === void 0 ? void 0 : eventConfig.dataSchema) === null || _b === void 0 ? void 0 : _b[0]) !== null && _c !== void 0 ? _c : {});
+    }
+    (_d = actions === null || actions === void 0 ? void 0 : actions.filter(function (item) {
       return item.outputVar;
-    })) === null || _c === void 0 ? void 0 : _c.forEach(function (action, index) {
+    })) === null || _d === void 0 ? void 0 : _d.forEach(function (action, index) {
       var _a;
       var _b, _c, _d;
       if (manager.dataSchema.getScope("action-output-".concat(action.actionType, "_ ").concat(index))) {
@@ -763,25 +802,59 @@ var EventControl = /** @class */function (_super) {
   };
   EventControl.prototype.render = function () {
     var _this = this;
-    var _a = this.props,
-      actionTree = _a.actionTree,
-      pluginActions = _a.actions,
-      commonActions = _a.commonActions,
-      getComponents = _a.getComponents,
-      allComponents = _a.allComponents,
-      render$1 = _a.render;
-    var _b = this.state,
-      onEvent = _b.onEvent,
-      events = _b.events,
-      eventPanelActive = _b.eventPanelActive,
-      showAcionDialog = _b.showAcionDialog,
-      showEventDialog = _b.showEventDialog,
-      type = _b.type,
-      actionData = _b.actionData,
-      eventDialogData = _b.eventDialogData;
+    var _a, _b, _c;
+    var _d = this.props,
+      actionTree = _d.actionTree,
+      pluginActions = _d.actions,
+      commonActions = _d.commonActions,
+      getComponents = _d.getComponents,
+      allComponents = _d.allComponents,
+      render$1 = _d.render;
+    var _e = this.state,
+      onEvent = _e.onEvent,
+      itemEvents = _e.events,
+      eventPanelActive = _e.eventPanelActive,
+      showAcionDialog = _e.showAcionDialog,
+      showEventDialog = _e.showEventDialog,
+      type = _e.type,
+      actionData = _e.actionData,
+      eventDialogData = _e.eventDialogData;
     var eventSnapshot = __assign({}, onEvent);
     var showOldEntry = this.props.showOldEntry;
     var eventKeys = Object.keys(eventSnapshot);
+    var commonEvents = [];
+    if ((_c = getRendererByName((_b = (_a = this.props) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.type)) === null || _c === void 0 ? void 0 : _c.isFormItem) {
+      commonEvents = [{
+        eventName: 'formItemValidateSucc',
+        eventLabel: i18n("0a2680def3df6912d7c96d95a047b680"),
+        description: i18n("6611594c527756e23d4044f908fedfa9"),
+        dataSchema: [{
+          type: 'object',
+          properties: {
+            data: {
+              type: 'object',
+              title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+              description: i18n("1b5cf3e354142cc1cdd6f56b6afaba49")
+            }
+          }
+        }]
+      }, {
+        eventName: 'formItemValidateError',
+        eventLabel: i18n("136b339ae7f40edc05251da87dd8a233"),
+        description: i18n("d4c12cea41e1595329358edb365c5f5b"),
+        dataSchema: [{
+          type: 'object',
+          properties: {
+            data: {
+              type: 'object',
+              title: i18n("0d83078816aa273f2941c9b55ec82bf3"),
+              description: i18n("1b5cf3e354142cc1cdd6f56b6afaba49")
+            }
+          }
+        }]
+      }];
+    }
+    var events = __spreadArray(__spreadArray([], __read(itemEvents), false), __read(commonEvents), false);
     return React__default.createElement("div", {
       className: "ae-event-control"
     }, React__default.createElement("header", {
@@ -947,10 +1020,10 @@ var EventControl = /** @class */function (_super) {
           min: 0,
           type: 'input-number'
         }, {
-          label: '事件埋点',
+          label: i18n("14a265b60d169e9d9c11b9a286de199d"),
           type: 'switch',
           name: 'track.open',
-          description: '开启事件埋点后，每次事件触发都会发送埋点数据到后台'
+          description: i18n("5c1024a792dfc345b4d8a3b34255691b")
         }, {
           label: 'track-id',
           required: true,
@@ -1020,4 +1093,4 @@ var EventControl = /** @class */function (_super) {
 })(EventControl);
 
 export { EventControl };
-window.amisEditorVersionInfo={version:'5.7.0',buildTime:'2023-12-08'};
+window.amisEditorVersionInfo={version:'6.1.0',buildTime:'2024-01-31'};