amis-editor 6.9.0-rc.9 → 6.10.0-beta.0

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

@@ -3,12 +3,13 @@ import Sortable from 'sortablejs';
 import { DataSchema } from 'amis';
 import { FormControlProps, Schema } from 'amis-core';
 import { ActionConfig, ActionEventConfig, ComponentInfo, ContextVariables } from './types';
-import { EditorManager, PluginActions, PluginEvents, RendererPluginAction, RendererPluginEvent, SubRendererPluginAction } from 'amis-editor-core';
+import { EditorManager, PluginActions, PluginEvents, RendererPluginAction, RendererPluginEvent, SubRendererPluginAction, IGlobalEvent } from 'amis-editor-core';
 export * from './helper';
 interface EventControlProps extends FormControlProps {
     actions: PluginActions;
     events: PluginEvents;
     actionTree: RendererPluginAction[];
+    globalEvents?: IGlobalEvent[];
     commonActions?: {
         [propName: string]: RendererPluginAction;
     };
@@ -66,6 +67,7 @@ interface EventControlState {
     actionData: ActionData | undefined;
     type: 'update' | 'add';
     appLocaleState?: number;
+    actionRelations: any;
 }
 export declare class EventControl extends React.Component<EventControlProps, EventControlState> {
     target: HTMLElement | null;
@@ -82,6 +84,7 @@ export declare class EventControl extends React.Component<EventControlProps, Eve
     subscribeSubmit(subscriber: (value: any) => any): () => void;
     generateEmptyDefault(events: RendererPluginEvent[]): ActionEventConfig;
     addEvent(event: RendererPluginEvent, disabled: boolean): void;
+    addGlobalEvent(event: IGlobalEvent, disabled: boolean): void;
     activeEventDialog(eventInfo: EventDialogData): void;
     eventDialogSubmit(formData: any): void;
     delEvent(event: string): void;
@@ -113,6 +116,8 @@ export declare class EventControl extends React.Component<EventControlProps, Eve
     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;
+    getActionRelations(): any;
+    handleRelationComponentActive(componentId: string): void;
     render(): React.JSX.Element;
 }
 export declare class EventControlRenderer extends EventControl {

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

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.9.0-rc.9
- * build time: 2024-10-30
+ * amis-editor v6.10.0-beta.0
+ * build time: 2024-11-25
  * Copyright 2018-2024 @fex
  */
 
@@ -15,9 +15,12 @@ var cx = require('classnames');
 var Sortable = require('sortablejs');
 var amis = require('amis');
 var cloneDeep = require('lodash/cloneDeep');
+var groupBy = require('lodash/groupBy');
 var amisCore = require('amis-core');
 var actionConfigDialog = require('./action-config-dialog.js');
 var helper = require('./helper.js');
+var eventControlConfigHelper = require('./eventControlConfigHelper.js');
+var constants = require('./constants.js');
 var i18nRuntime = require('i18n-runtime');
 var mobx = require('mobx');
 var amisEditorCore = require('amis-editor-core');
@@ -28,6 +31,7 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
 var Sortable__default = /*#__PURE__*/_interopDefaultLegacy(Sortable);
 var cloneDeep__default = /*#__PURE__*/_interopDefaultLegacy(cloneDeep);
+var groupBy__default = /*#__PURE__*/_interopDefaultLegacy(groupBy);
 
 var EventControl = /** @class */function (_super) {
   tslib.__extends(EventControl, _super);
@@ -38,13 +42,18 @@ var EventControl = /** @class */function (_super) {
     var events = props.events,
       value = props.value,
       data = props.data,
-      rawType = props.rawType;
+      rawType = props.rawType,
+      globalEvents = props.globalEvents;
     var eventPanelActive = {};
     var tmpEvents = events[rawType || (!data.type || data.type === 'text' ? 'plain' : data.type)] || [];
     var pluginEvents = typeof tmpEvents === 'function' ? tmpEvents(data) : tslib.__spreadArray([], tslib.__read(tmpEvents), false);
     pluginEvents.forEach(function (event) {
       eventPanelActive[event.eventName] = true;
     });
+    var actionRelations = _this.getActionRelations();
+    globalEvents === null || globalEvents === void 0 ? void 0 : globalEvents.forEach(function (event) {
+      eventPanelActive[event.name] = true;
+    });
     _this.state = {
       onEvent: value !== null && value !== void 0 ? value : _this.generateEmptyDefault(pluginEvents),
       events: pluginEvents,
@@ -53,7 +62,8 @@ var EventControl = /** @class */function (_super) {
       showEventDialog: false,
       actionData: undefined,
       type: 'add',
-      appLocaleState: 0
+      appLocaleState: 0,
+      actionRelations: actionRelations !== null && actionRelations !== void 0 ? actionRelations : []
     };
     return _this;
   }
@@ -92,8 +102,10 @@ var EventControl = /** @class */function (_super) {
       // pluginEvents.forEach((event: RendererPluginEvent) => {
       //   eventPanelActive[event.eventName] = true;
       // });
+      var actionRelations = this.getActionRelations();
       this.setState({
-        events: pluginEvents
+        events: pluginEvents,
+        actionRelations: actionRelations
       });
     }
   };
@@ -138,6 +150,21 @@ var EventControl = /** @class */function (_super) {
     });
     onChange && onChange(onEvent);
   };
+  EventControl.prototype.addGlobalEvent = function (event, disabled) {
+    var onChange = this.props.onChange;
+    var onEvent = tslib.__assign({}, this.state.onEvent);
+    if (disabled) {
+      return;
+    }
+    onEvent["".concat(event.name)] = {
+      weight: 0,
+      actions: []
+    };
+    this.setState({
+      onEvent: onEvent
+    });
+    onChange && onChange(onEvent);
+  };
   EventControl.prototype.activeEventDialog = function (eventInfo) {
     eventInfo = cloneDeep__default["default"](eventInfo);
     if (!eventInfo.debounce) {
@@ -210,12 +237,13 @@ var EventControl = /** @class */function (_super) {
     onChange && onChange(onEvent);
   };
   EventControl.prototype.addAction = function (event, config) {
-    var _a = this.props,
-      addBroadcast = _a.addBroadcast,
-      owner = _a.owner;
-    var _b = this.state,
-      onEvent = _b.onEvent,
-      eventPanelActive = _b.eventPanelActive;
+    var _a;
+    var _b = this.props,
+      addBroadcast = _b.addBroadcast,
+      owner = _b.owner;
+    var _c = this.state,
+      onEvent = _c.onEvent,
+      eventPanelActive = _c.eventPanelActive;
     var onEventConfig = tslib.__assign({}, onEvent);
     var activeConfig = tslib.__assign({}, eventPanelActive);
     if (config.actionType === 'broadcast') {
@@ -230,7 +258,7 @@ var EventControl = /** @class */function (_super) {
     activeConfig[event] = true;
     if (config.actionType) {
       onEventConfig[event] = tslib.__assign(tslib.__assign({}, onEventConfig[event]), {
-        actions: (onEventConfig[event].actions || []).concat(
+        actions: (((_a = onEventConfig[event]) === null || _a === void 0 ? void 0 : _a.actions) || []).concat(
         // 临时处理，后面干掉这么多交互属性
         Object.defineProperties(config, {
           __cmptTreeSource: {
@@ -424,51 +452,64 @@ var EventControl = /** @class */function (_super) {
     });
   };
   EventControl.prototype.buildEventDataSchema = function (data, manager) {
-    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 _a, _b, _c, _d, _e;
+    var _f = this.props,
+      actionTree = _f.actionTree,
+      pluginActions = _f.actions,
+      commonActions = _f.commonActions,
+      allComponents = _f.allComponents,
+      globalEvents = _f.globalEvents;
+    var _g = this.state,
+      events = _g.events,
+      onEvent = _g.onEvent;
     var eventConfig = events.find(function (item) {
       return item.eventName === data.actionData.eventKey;
     });
+    var globalEventConfig = globalEvents === null || globalEvents === void 0 ? void 0 : globalEvents.find(function (item) {
+      return item.name === data.actionData.eventKey;
+    });
     // 收集当前事件动作出参
-    var actions = onEvent[data.actionData.eventKey].actions;
+    var actions = (_a = onEvent[data.actionData.eventKey]) === null || _a === void 0 ? void 0 : _a.actions;
     // 编辑的时候只能拿到当前动作前面动作的事件变量以及当前动作事件
     if (data.type === 'update') {
       actions = actions.slice(0, data.actionData.actionIndex !== undefined ? data.actionData.actionIndex + 1 : 0);
     }
     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];
+    if (globalEventConfig) {
+      jsonSchema = {
+        type: 'object',
+        properties: {
+          data: {
+            type: 'object',
+            title: i18nRuntime.i18n("0d83078816aa273f2941c9b55ec82bf3"),
+            properties: (globalEventConfig.mapping || []).reduce(function (acc, item) {
+              acc[item.key] = {
+                type: item.type,
+                title: "".concat(item.key, "(\u5168\u5C40\u4E8B\u4EF6\u53C2\u6570)")
+              };
+              return acc;
+            }, {})
+          }
+        }
+      };
     } else {
-      jsonSchema = tslib.__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 : {});
+      // 动态构建事件参数
+      if (typeof (eventConfig === null || eventConfig === void 0 ? void 0 : eventConfig.dataSchema) === 'function') {
+        jsonSchema = (_b = eventConfig.dataSchema(manager)) === null || _b === void 0 ? void 0 : _b[0];
+      } else {
+        jsonSchema = tslib.__assign({}, (_d = (_c = eventConfig === null || eventConfig === void 0 ? void 0 : eventConfig.dataSchema) === null || _c === void 0 ? void 0 : _c[0]) !== null && _d !== void 0 ? _d : {});
+      }
     }
-    (_d = actions === null || actions === void 0 ? void 0 : actions.filter(function (item) {
+    (_e = actions === null || actions === void 0 ? void 0 : actions.filter(function (item) {
       return item.outputVar;
-    })) === null || _d === void 0 ? void 0 : _d.forEach(function (action, index) {
+    })) === null || _e === void 0 ? void 0 : _e.forEach(function (action, index) {
       var _a;
       var _b, _c, _d;
       if (manager.dataSchema.getScope("action-output-".concat(action.actionType, "_ ").concat(index))) {
         return;
       }
-      var actionLabel = helper.getPropOfAcion(action, 'actionLabel', actionTree, pluginActions, commonActions, allComponents);
-      var actionSchema = helper.getPropOfAcion(action, 'outputVarDataSchema', actionTree, pluginActions, commonActions, allComponents);
-      // const schema: any = {
-      //   type: 'object',
-      //   $id: 'outputVar',
-      //   properties: {
-      //     [action.outputVar!]: {
-      //       ...actionSchema[0],
-      //       title: `${action.outputVar}(${actionLabel})`
-      //     }
-      //   }
-      // };
+      var actionLabel = eventControlConfigHelper.getPropOfAcion(action, 'actionLabel', actionTree, pluginActions, commonActions, allComponents);
+      var actionSchema = eventControlConfigHelper.getPropOfAcion(action, 'outputVarDataSchema', actionTree, pluginActions, commonActions, allComponents);
       jsonSchema = tslib.__assign(tslib.__assign({}, jsonSchema), {
         properties: tslib.__assign(tslib.__assign({}, jsonSchema.properties), {
           data: tslib.__assign(tslib.__assign({
@@ -481,11 +522,6 @@ var EventControl = /** @class */function (_super) {
           })
         })
       });
-      // manager.dataSchema.addScope(
-      //   schema,
-      //   `action-output-${action.actionType}_${index}`
-      // );
-      // manager.dataSchema.current.group = '动作出参';
     });
     if (manager.dataSchema.getScope('event-variable')) {
       manager.dataSchema.removeScope('event-variable');
@@ -499,64 +535,6 @@ var EventControl = /** @class */function (_super) {
       }
     }, 'event-variable');
   };
-  // buildActionDataSchema(
-  //   activeData: Pick<
-  //     EventControlState,
-  //     'showAcionDialog' | 'type' | 'actionData'
-  //   >,
-  //   manager: EditorManager
-  // ) {
-  //   const {actionTree, pluginActions, commonActions, allComponents} =
-  //     this.props;
-  //   const {onEvent} = this.state;
-  //   // 收集当前事件已有ajax动作的请求返回结果作为事件变量
-  //   let oldActions = onEvent[activeData.actionData!.eventKey].actions;
-  //   // 编辑的时候只能拿到当前动作前面动作的事件变量
-  //   if (activeData.type === 'update') {
-  //     oldActions = oldActions.slice(0, activeData.actionData!.actionIndex);
-  //   }
-  //   oldActions
-  //     ?.filter(item => item.outputVar)
-  //     ?.forEach((action: ActionConfig, index: number) => {
-  //       if (
-  //         manager.dataSchema.getScope(
-  //           `action-output-${action.actionType}_ ${index}`
-  //         )
-  //       ) {
-  //         return;
-  //       }
-  //       const actionLabel = getPropOfAcion(
-  //         action,
-  //         'actionLabel',
-  //         actionTree,
-  //         pluginActions,
-  //         commonActions,
-  //         allComponents
-  //       );
-  //       const actionSchema = getPropOfAcion(
-  //         action,
-  //         'outputVarDataSchema',
-  //         actionTree,
-  //         pluginActions,
-  //         commonActions,
-  //         allComponents
-  //       );
-  //       const schema: any = {
-  //         type: 'object',
-  //         properties: {
-  //           [`event.data.${action.outputVar}`]: {
-  //             ...actionSchema[0],
-  //             title: `${action.outputVar}(${actionLabel})`
-  //           }
-  //         }
-  //       };
-  //       manager.dataSchema.addScope(
-  //         schema,
-  //         `action-output-${action.actionType}_${index}`
-  //       );
-  //       manager.dataSchema.current.group = '动作出参';
-  //     });
-  // }
   EventControl.prototype.buildContextSchema = function (data) {
     var _a;
     return tslib.__awaiter(this, void 0, void 0, function () {
@@ -604,14 +582,14 @@ var EventControl = /** @class */function (_super) {
             return [4 /*yield*/, actionConfigInitFormatter === null || actionConfigInitFormatter === void 0 ? void 0 : actionConfigInitFormatter(action_1)];
           case 2:
             actionConfig = _c.sent();
-            actionNode = helper.findActionNode(actionTree, actionConfig === null || actionConfig === void 0 ? void 0 : actionConfig.actionType);
-            hasSubActionNode = helper.findSubActionNode(actionTree, action_1.actionType);
+            actionNode = eventControlConfigHelper.findActionNode(actionTree, actionConfig === null || actionConfig === void 0 ? void 0 : actionConfig.actionType);
+            hasSubActionNode = eventControlConfigHelper.findSubActionNode(actionTree, action_1.actionType);
             supportComponents = getComponents(actionNode);
             node = amisCore.findTree(supportComponents, function (item) {
               return item.value === action_1.componentId;
             });
             setValueDs = null;
-            if (!((actionConfig === null || actionConfig === void 0 ? void 0 : actionConfig.actionType) === 'setValue' && (node === null || node === void 0 ? void 0 : node.id) && helper.SELECT_PROPS_CONTAINER.includes((node === null || node === void 0 ? void 0 : node.type) || ''))) return [3 /*break*/, 4];
+            if (!((actionConfig === null || actionConfig === void 0 ? void 0 : actionConfig.actionType) === 'setValue' && (node === null || node === void 0 ? void 0 : node.id) && constants.SELECT_PROPS_CONTAINER.includes((node === null || node === void 0 ? void 0 : node.type) || ''))) return [3 /*break*/, 4];
             return [4 /*yield*/, manager.getContextSchemas(node.id, true)];
           case 3:
             contextSchema = _c.sent();
@@ -671,12 +649,12 @@ var EventControl = /** @class */function (_super) {
       commonActions = _a.commonActions,
       getComponents = _a.getComponents,
       allComponents = _a.allComponents;
-    var desc = helper.getPropOfAcion(action, 'descDetail', actionTree, pluginActions, commonActions, allComponents);
+    var desc = eventControlConfigHelper.getPropOfAcion(action, 'descDetail', actionTree, pluginActions, commonActions, allComponents);
     var info = tslib.__assign({}, action);
     // 根据子动作类型获取动作树节点的配置
-    var hasSubActionNode = helper.findSubActionNode(actionTree, action.actionType);
-    var actionType = helper.getActionType(action, hasSubActionNode);
-    var actionNode = actionType && helper.findActionNode(actionTree, actionType);
+    var hasSubActionNode = eventControlConfigHelper.findSubActionNode(actionTree, action.actionType);
+    var actionType = eventControlConfigHelper.getActionType(action, hasSubActionNode);
+    var actionNode = actionType && eventControlConfigHelper.findActionNode(actionTree, actionType);
     if (action.componentId && actionNode) {
       var supportComponents = getComponents(actionNode);
       var node = amisCore.findTree(supportComponents, function (item) {
@@ -744,14 +722,6 @@ var EventControl = /** @class */function (_super) {
     if (manager.dataSchema.getScope('event-variable')) {
       manager.dataSchema.removeScope('event-variable');
     }
-    // // 删除动作出参
-    // Object.keys(manager.dataSchema.idMap)
-    //   .filter(key => /^action-output/.test(key))
-    //   .map(key => {
-    //     if (manager.dataSchema.getScope(key)) {
-    //       manager.dataSchema.removeScope(key);
-    //     }
-    //   });
   };
   EventControl.prototype.renderActionType = function (action, actionIndex, eventKey) {
     var _a = this.props,
@@ -761,28 +731,96 @@ var EventControl = /** @class */function (_super) {
       allComponents = _a.allComponents;
       _a.node;
       _a.manager;
-    return React__default["default"].createElement("span", null, helper.getPropOfAcion(action, 'actionLabel', actionTree, pluginActions, commonActions, allComponents) || action.actionType);
+    return React__default["default"].createElement("span", null, eventControlConfigHelper.getPropOfAcion(action, 'actionLabel', actionTree, pluginActions, commonActions, allComponents) || action.actionType);
+  };
+  EventControl.prototype.getActionRelations = function () {
+    var _a;
+    var _b = this.props,
+      pluginActions = _b.actions,
+      data = _b.data,
+      manager = _b.manager;
+    var actions = helper.getActionsByRendererName(pluginActions, data === null || data === void 0 ? void 0 : data.type);
+    var schema = manager.store.schema;
+    var prevs = [];
+    amisCore.JSONValueMap(schema, function (value, key, host) {
+      var _a, _b, _c, _d, _e;
+      if (key === 'onEvent') {
+        var hostName_1 = (_d = (_c = (_b = (_a = host.title) !== null && _a !== void 0 ? _a : host.label) !== null && _b !== void 0 ? _b : host.name) !== null && _c !== void 0 ? _c : host.type) !== null && _d !== void 0 ? _d : host.id;
+        var hostId_1 = host.$$id;
+        (_e = Object.keys(value)) === null || _e === void 0 ? void 0 : _e.forEach(function (eventKey) {
+          var _a, _b;
+          if (eventKey !== '$$id') {
+            (_b = (_a = value[eventKey]) === null || _a === void 0 ? void 0 : _a.actions) === null || _b === void 0 ? void 0 : _b.forEach(function (ac) {
+              var matchAction = actions === null || actions === void 0 ? void 0 : actions.find(function (item) {
+                return item.actionType === ac.actionType;
+              });
+              if (matchAction && ac.componentId === data.id) {
+                // 如果存在不同事件调用同组件同动作，则不记录
+                var isHas = prevs === null || prevs === void 0 ? void 0 : prevs.find(function (item) {
+                  return item.hostId === hostId_1 && item.actionType === ac.actionType;
+                });
+                if (!isHas) {
+                  prevs.push({
+                    actionType: matchAction.actionType,
+                    actionLabel: matchAction.actionLabel,
+                    hostName: hostName_1,
+                    hostId: hostId_1
+                  });
+                }
+              }
+            });
+          }
+        });
+      }
+      return value;
+    });
+    var prevsGroup = groupBy__default["default"](prevs, function (item) {
+      return item.actionLabel;
+    });
+    var actionRelations = [];
+    (_a = Object.keys(prevsGroup)) === null || _a === void 0 ? void 0 : _a.forEach(function (key) {
+      var _a;
+      actionRelations.push({
+        label: key,
+        value: key,
+        icon: 'fa fa-bolt',
+        children: (_a = prevsGroup[key]) === null || _a === void 0 ? void 0 : _a.map(function (item) {
+          return {
+            label: item.hostName,
+            value: item.hostId,
+            icon: ''
+          };
+        })
+      });
+    });
+    return actionRelations;
+  };
+  EventControl.prototype.handleRelationComponentActive = function (componentId) {
+    var manager = this.props.manager;
+    manager.store.setActiveId(componentId);
   };
   EventControl.prototype.render = function () {
     var _this = this;
-    var _a, _b, _c;
-    var _d = this.props,
-      actionTree = _d.actionTree,
-      pluginActions = _d.actions,
-      commonActions = _d.commonActions,
-      getComponents = _d.getComponents;
-      _d.allComponents;
-      var render = _d.render;
-      _d.subscribeSchemaSubmit;
-    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 _a, _b, _c, _d, _e, _f;
+    var _g = this.props,
+      actionTree = _g.actionTree,
+      pluginActions = _g.actions,
+      commonActions = _g.commonActions,
+      getComponents = _g.getComponents;
+      _g.allComponents;
+      var render = _g.render,
+      _h = _g.globalEvents,
+      globalEvents = _h === void 0 ? [] : _h;
+      _g.subscribeSchemaSubmit;
+    var _j = this.state,
+      onEvent = _j.onEvent,
+      itemEvents = _j.events,
+      eventPanelActive = _j.eventPanelActive,
+      showAcionDialog = _j.showAcionDialog,
+      showEventDialog = _j.showEventDialog,
+      type = _j.type,
+      actionData = _j.actionData,
+      eventDialogData = _j.eventDialogData;
     var eventSnapshot = tslib.__assign({}, onEvent);
     var showOldEntry = this.props.showOldEntry;
     var eventKeys = Object.keys(eventSnapshot);
@@ -824,17 +862,46 @@ var EventControl = /** @class */function (_super) {
     }, React__default["default"].createElement("header", {
       className: cx__default["default"]({
         'ae-event-control-header': true,
-        'ae-event-control-header-oldentry': showOldEntry,
+        'ae-event-control-header-m': this.props.data.type === 'button' && showOldEntry,
         'no-bd-btm': !eventKeys.length
       })
-    }, render('dropdown', {
+    }, ((_d = this.state.actionRelations) === null || _d === void 0 ? void 0 : _d.length) ? React__default["default"].createElement(amis.PopOverContainer, {
+      popOverContainer: function () {
+        return document.body;
+      },
+      popOverRender: function (_a) {
+        _a.onClose;
+        return React__default["default"].createElement("div", {
+          className: "ae-action-relation-panel"
+        }, React__default["default"].createElement(amis.Tree, {
+          options: _this.state.actionRelations,
+          className: "variables-select-panel-tree",
+          onChange: _this.handleRelationComponentActive,
+          onlyChildren: true,
+          value: ""
+        }));
+      }
+    }, function (_a) {
+      var onClick = _a.onClick;
+        _a.ref;
+        _a.isOpened;
+      return React__default["default"].createElement(amis.TooltipWrapper, {
+        tooltipClassName: "ae-event-item-header-tip",
+        trigger: "hover",
+        placement: "top",
+        tooltip: "\u53EF\u67E5\u770B\u54EA\u4E9B\u7EC4\u4EF6\u4F1A\u8C03\u7528\u5F53\u524D\u7EC4\u4EF6\u7684\u54EA\u4E9B\u52A8\u4F5C"
+      }, React__default["default"].createElement(amis.Button, {
+        className: "block w-full mb-2",
+        onClick: onClick
+      }, "\u67E5\u770B\u8C03\u7528\u5173\u7CFB"));
+    }) : null, render('dropdown', {
       type: 'dropdown-button',
       level: 'enhance',
       label: i18nRuntime.i18n("1fab2b4934161e87a1f0133b9d5bc1b5"),
       disabled: false,
       className: 'block w-full add-event-dropdown',
       closeOnClick: true,
-      buttons: events.map(function (item) {
+      buttons: tslib.__spreadArray(tslib.__spreadArray([], tslib.__read(events.map(function (item) {
         return {
           type: 'button',
           disabledTip: i18nRuntime.i18n("3371427f1b82095309092ef82418ec1a"),
@@ -844,17 +911,32 @@ var EventControl = /** @class */function (_super) {
           label: item.eventLabel,
           onClick: _this.addEvent.bind(_this, item, Object.keys(onEvent).includes(item.eventName))
         };
-      })
+      })), false), tslib.__read(globalEvents.map(function (item) {
+        return {
+          type: 'button',
+          disabledTip: '您已添加该全局事件',
+          tooltipPlacement: 'left',
+          disabled: Object.keys(onEvent).includes(item.name),
+          actionType: '',
+          className: 'add-event-dropdown-global-event',
+          label: item.label,
+          onClick: _this.addGlobalEvent.bind(_this, item, Object.keys(onEvent).includes(item.name))
+        };
+      })), false)
     }, {
       popOverContainer: null // amis 渲染挂载节点会使用 this.target
     })), React__default["default"].createElement("ul", {
       className: cx__default["default"]({
         'ae-event-control-content': true,
-        'ae-event-control-content-oldentry': showOldEntry
+        'ae-event-control-content-m': this.props.data.type === 'button' && showOldEntry || ((_e = this.state.actionRelations) === null || _e === void 0 ? void 0 : _e.length),
+        'ae-event-control-content-l': this.props.data.type === 'button' && showOldEntry && !!((_f = this.state.actionRelations) === null || _f === void 0 ? void 0 : _f.length)
       }),
       ref: this.dragRef
     }, eventKeys.length ? eventKeys.map(function (eventKey, eventIndex) {
       var _a, _b, _c, _d, _e, _f;
+      var globalEvent = globalEvents.find(function (i) {
+        return i.name === eventKey;
+      });
       return React__default["default"].createElement("li", {
         className: "event-item",
         key: "content_".concat(eventIndex)
@@ -864,7 +946,7 @@ var EventControl = /** @class */function (_super) {
           'no-bd-btm': !(((_b = (_a = eventSnapshot[eventKey]) === null || _a === void 0 ? void 0 : _a.actions) === null || _b === void 0 ? void 0 : _b.length) && eventPanelActive[eventKey]) && !helper.getEventStrongDesc(events, eventKey)
         })
       }, React__default["default"].createElement(amis.TooltipWrapper, {
-        tooltipClassName: "event-item-header-tip",
+        tooltipClassName: "ae-event-item-header-tip",
         trigger: "hover",
         placement: "top",
         tooltip: {
@@ -872,7 +954,13 @@ var EventControl = /** @class */function (_super) {
             return React__default["default"].createElement("div", null, helper.getEventDesc(events, eventKey) || helper.getEventStrongDesc(events, eventKey) || eventKey);
           }
         }
-      }, React__default["default"].createElement("div", null, helper.getEventLabel(events, eventKey) || eventKey)), React__default["default"].createElement("div", {
+      }, !globalEvent ? React__default["default"].createElement("div", null, helper.getEventLabel(events, eventKey) || eventKey) : React__default["default"].createElement("div", {
+        className: "event-label"
+      }, React__default["default"].createElement("span", {
+        className: "global-event-tip"
+      }, React__default["default"].createElement("span", null, "\u5168\u5C40\u4E8B\u4EF6")), React__default["default"].createElement("span", {
+        className: "event-label-key"
+      }, globalEvent.label || eventKey))), React__default["default"].createElement("div", {
         className: "event-item-header-toolbar"
       }, React__default["default"].createElement("div", {
         onClick: _this.activeActionDialog.bind(_this, {
@@ -930,7 +1018,14 @@ var EventControl = /** @class */function (_super) {
           className: "icon"
         })), React__default["default"].createElement("div", {
           className: "action-item-actiontype"
-        }, _this.renderActionType(action, actionIndex, eventKey))), React__default["default"].createElement("div", {
+        }, _this.renderActionType(action, actionIndex, eventKey)), action.description && React__default["default"].createElement(amis.TooltipWrapper, {
+          trigger: "hover",
+          placement: "top",
+          tooltip: action.description
+        }, React__default["default"].createElement(amis.Icon, {
+          icon: "far fa-question-circle",
+          className: "flex justify-center items-center icon ml-0.5"
+        }))), React__default["default"].createElement("div", {
           className: "action-control-header-right"
         }, React__default["default"].createElement("div", {
           onClick: _this.activeActionDialog.bind(_this, {
@@ -1048,6 +1143,7 @@ var EventControl = /** @class */function (_super) {
   tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [String, Object]), tslib.__metadata("design:returntype", void 0)], EventControl.prototype, "onSubmit", null);
   tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", []), tslib.__metadata("design:returntype", void 0)], EventControl.prototype, "onClose", null);
   tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [Function, Boolean]), tslib.__metadata("design:returntype", void 0)], EventControl.prototype, "subscribeSchemaSubmit", null);
+  tslib.__decorate([amisCore.autobind, tslib.__metadata("design:type", Function), tslib.__metadata("design:paramtypes", [String]), tslib.__metadata("design:returntype", void 0)], EventControl.prototype, "handleRelationComponentActive", null);
   return EventControl;
 }(React__default["default"].Component);
 /** @class */(function (_super) {
@@ -1061,25 +1157,16 @@ var EventControl = /** @class */function (_super) {
   return EventControlRenderer;
 })(EventControl);
 
-exports.ACTION_TYPE_TREE = helper.ACTION_TYPE_TREE;
 exports.COMMON_ACTION_SCHEMA_MAP = helper.COMMON_ACTION_SCHEMA_MAP;
-exports.DATA_CONTAINER = helper.DATA_CONTAINER;
-exports.FORMITEM_CMPTS = helper.FORMITEM_CMPTS;
-exports.SELECT_PROPS_CONTAINER = helper.SELECT_PROPS_CONTAINER;
-exports.SHOW_SELECT_PROP = helper.SHOW_SELECT_PROP;
-exports.SUPPORT_DISABLED_CMPTS = helper.SUPPORT_DISABLED_CMPTS;
-exports.SUPPORT_STATIC_FORMITEM_CMPTS = helper.SUPPORT_STATIC_FORMITEM_CMPTS;
-exports.findActionNode = helper.findActionNode;
-exports.findSubActionNode = helper.findSubActionNode;
-exports.getActionType = helper.getActionType;
+exports.buildLinkActionDesc = helper.buildLinkActionDesc;
+exports.getActionCommonProps = helper.getActionCommonProps;
+exports.getActionsByRendererName = helper.getActionsByRendererName;
 exports.getArgsWrapper = helper.getArgsWrapper;
 exports.getEventControlConfig = helper.getEventControlConfig;
 exports.getEventDesc = helper.getEventDesc;
 exports.getEventLabel = helper.getEventLabel;
 exports.getEventStrongDesc = helper.getEventStrongDesc;
 exports.getOldActionSchema = helper.getOldActionSchema;
-exports.getPropOfAcion = helper.getPropOfAcion;
-exports.hasActionType = helper.hasActionType;
 exports.renderCmptActionSelect = helper.renderCmptActionSelect;
 exports.renderCmptIdInput = helper.renderCmptIdInput;
 exports.renderCmptSelect = helper.renderCmptSelect;

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

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.9.0-rc.9
- * build time: 2024-10-30
+ * amis-editor v6.10.0-beta.0
+ * build time: 2024-11-25
  * Copyright 2018-2024 @fex
  */