Merge "[amis-saas-8098] [amis-saas-8099] 支持防抖 & 支持阻止冒泡" into pre-release

2024-12-15 09:21:13 +08:00 · 2022-12-06 10:10:17 +08:00 · 2022-12-06 10:10:17 +08:00 · 0ce9a64218
commit 0ce9a64218
parent 2c6679c354 5711c16101
3 changed files with 172 additions and 23 deletions
--- a/packages/amis-editor/src/renderer/event-control/action-config-dialog.tsx
+++ b/packages/amis-editor/src/renderer/event-control/action-config-dialog.tsx
@ -280,22 +280,18 @@ export default class ActionDialog extends React.Component<ActionDialogProp> {
                            className: 'action-panel-title',
                            visibleOn: 'data.actionType'
                          },
-                          /*
                          {
-                            name: 'expression',
-                            title: '',
-                            type: 'input-formula',
-                            variableMode: 'tabs',
-                            inputMode: 'input-group',
+                            name: 'stopPropagation',
+                            label: '阻断条件',
+                            type: 'ae-expressionFormulaControl',
+                            evalMode: true,
                            variables: '${variables}',
-                            className: 'action-exec-on',
-                            label: '执行条件',
                            mode: 'horizontal',
                            size: 'lg',
-                            placeholder: '默认执行该动作',
-                            visibleOn: 'data.actionType'
+                            visibleOn: 'data.actionType',
+                            description:
+                              '满足条件时，将会阻断当前事件的后续动作的执行'
                          },
-                          */
                          {
                            name: 'expression',
                            label: '执行条件',
--- a/packages/amis-editor/src/renderer/event-control/index.tsx
+++ b/packages/amis-editor/src/renderer/event-control/index.tsx
@ -2,7 +2,14 @@ import React from 'react';
 import {findDOMNode} from 'react-dom';
 import cx from 'classnames';
 import Sortable from 'sortablejs';
-import {DataSchema, FormItem, Button, Icon, TooltipWrapper} from 'amis';
+import {
+  DataSchema,
+  FormItem,
+  Button,
+  Icon,
+  TooltipWrapper,
+  render as amisRender
+} from 'amis';
 import cloneDeep from 'lodash/cloneDeep';
 import {FormControlProps, autobind, findTree} from 'amis-core';
 import ActionDialog from './action-config-dialog';
@ -58,6 +65,17 @@ interface EventControlProps extends FormControlProps {
  owner?: string; // 组件标识
 }

+interface EventDialogData {
+  eventName: string;
+  eventLabel: string;
+  isBroadcast: boolean;
+  debounceConfig?: {
+    open: boolean;
+    wait?: number;
+  };
+  [propName: string]: any;
+}
+
 interface EventControlState {
  onEvent: ActionEventConfig;
  events: RendererPluginEvent[];
@ -65,6 +83,8 @@ interface EventControlState {
    [prop: string]: boolean;
  };
  showAcionDialog: boolean;
+  showEventDialog: boolean;
+  eventDialogData?: EventDialogData;
  actionData:
    | {
        eventKey: string;
@ -114,6 +134,7 @@ export class EventControl extends React.Component<
      events: pluginEvents,
      eventPanelActive,
      showAcionDialog: false,
+      showEventDialog: false,
      actionData: undefined,
      type: 'add'
    };
@ -163,7 +184,6 @@ export class EventControl extends React.Component<
      weight: 0,
      actions: []
    };
-
    this.setState({
      onEvent: onEvent
    });
@ -171,6 +191,52 @@ export class EventControl extends React.Component<
    onChange && onChange(onEvent);
  }

+  activeEventDialog(eventInfo: EventDialogData) {
+    if (!eventInfo.debounce) {
+      // 防抖配置的默认值
+      eventInfo.debounce = {
+        open: false,
+        wait: 100
+      };
+    } else {
+      eventInfo.debounce = {
+        open: true,
+        ...eventInfo.debounce
+      };
+    }
+    this.setState({
+      eventDialogData: eventInfo,
+      showEventDialog: true
+    });
+  }
+
+  eventDialogSubmit(formData: any) {
+    const {onChange} = this.props;
+    const {eventName, debounce = {}} = formData;
+    let onEvent = {
+      ...this.state.onEvent
+    };
+    let eventConfig = onEvent[`${eventName}`];
+    if (!debounce.open) {
+      delete eventConfig.debounce;
+    } else {
+      eventConfig = {
+        ...eventConfig,
+        debounce: {
+          wait: debounce.wait
+        }
+      };
+    }
+    onEvent[`${eventName}`] = {
+      ...eventConfig
+    };
+    this.setState({
+      onEvent,
+      showEventDialog: false
+    });
+    onChange && onChange(onEvent);
+  }
+
  delEvent(event: string) {
    const {onChange} = this.props;
    let onEvent = {
@ -203,8 +269,8 @@ export class EventControl extends React.Component<
    activeConfig[event] = true;
    if (config.actionType) {
      onEventConfig[event] = {
-        actions: onEventConfig[event].actions.concat(config),
-        weight: onEvent[event].weight
+        ...onEventConfig[event],
+        actions: onEventConfig[event].actions.concat(config)
      };
    }

@ -299,6 +365,7 @@ export class EventControl extends React.Component<
      weight: onEvent[event].weight
    };
    onEventConfig[event] = {
+      ...onEvent[event],
      actions: onEvent[event].actions.map((item, actionIndex) => {
        return actionIndex === index
          ? typeof config === 'string'
@ -308,8 +375,7 @@ export class EventControl extends React.Component<
              }
            : config
          : item;
-      }),
-      weight: onEvent[event].weight
+      })
    };
    this.setState({
      onEvent: onEventConfig
@ -647,12 +713,14 @@ export class EventControl extends React.Component<
      events,
      eventPanelActive,
      showAcionDialog,
+      showEventDialog,
      type,
-      actionData
+      actionData,
+      eventDialogData
    } = this.state;
-    const enventSnapshot = cloneDeep(onEvent);
+    const eventSnapshot = cloneDeep(onEvent);
    const {showOldEntry} = this.props;
-    const eventKeys = Object.keys(enventSnapshot);
+    const eventKeys = Object.keys(eventSnapshot);
    return (
      <div className="ae-event-control">
        <header
@ -706,7 +774,7 @@ export class EventControl extends React.Component<
                      'event-item-header': true,
                      'no-bd-btm':
                        !(
-                          enventSnapshot[eventKey].actions?.length &&
+                          eventSnapshot[eventKey].actions?.length &&
                          eventPanelActive[eventKey]
                        ) && !getEventStrongDesc(events, eventKey)
                    })}
@ -742,6 +810,16 @@ export class EventControl extends React.Component<
                      <div onClick={this.delEvent.bind(this, eventKey)}>
                        <Icon className="icon" icon="delete-bold-btn" />
                      </div>
+                      <div
+                        onClick={this.activeEventDialog.bind(this, {
+                          eventName: eventKey,
+                          eventLabel:
+                            getEventLabel(events, eventKey) || eventKey,
+                          ...eventSnapshot[eventKey]
+                        })}
+                      >
+                        <Icon className="icon" icon="edit-full-btn" />
+                      </div>
                      <div
                        onClick={this.toggleActivePanel.bind(this, eventKey)}
                      >
@ -764,10 +842,10 @@ export class EventControl extends React.Component<
                        className: 'event-item-desc'
                      })
                    : null}
-                  {enventSnapshot[eventKey].actions.length &&
+                  {eventSnapshot[eventKey].actions.length &&
                  eventPanelActive[eventKey] ? (
                    <ul className="item-content">
-                      {enventSnapshot[eventKey].actions.map(
+                      {eventSnapshot[eventKey].actions.map(
                        (action, actionIndex) => {
                          return (
                            <li
@ -845,6 +923,78 @@ export class EventControl extends React.Component<
            </div>
          )}
        </ul>
+        {showEventDialog
+          ? amisRender(
+              {
+                type: 'dialog',
+                title: `${eventDialogData?.eventLabel}-事件配置`,
+                showCloseButton: false,
+                body: [
+                  {
+                    type: 'form',
+                    title: '表单',
+                    data: {
+                      '&': '$$'
+                    },
+                    mode: 'horizontal',
+                    horizontal: {
+                      left: 3,
+                      right: 9
+                    },
+                    body: [
+                      {
+                        label: '设置触发频率',
+                        type: 'switch',
+                        name: 'debounce.open',
+                        description:
+                          '设置触发频率后，单位时间内多次触发事件只会执行最后一次'
+                      },
+                      {
+                        label: '触发频率',
+                        required: true,
+                        hiddenOn: '!debounce.open',
+                        name: 'debounce.wait',
+                        suffix: 'ms',
+                        max: 10000,
+                        min: 0,
+                        type: 'input-number'
+                      }
+                    ],
+                    onSubmit: this.eventDialogSubmit.bind(this)
+                  }
+                ],
+                actions: [
+                  {
+                    type: 'button',
+                    label: '取消',
+                    onEvent: {
+                      click: {
+                        actions: [
+                          {
+                            actionType: 'custom',
+                            script: () => {
+                              this.setState({
+                                showEventDialog: false
+                              });
+                            }
+                          }
+                        ]
+                      }
+                    }
+                  },
+                  {
+                    type: 'button',
+                    actionType: 'confirm',
+                    label: '确认',
+                    primary: true
+                  }
+                ]
+              },
+              {
+                data: eventDialogData
+              }
+            )
+          : null}
        <ActionDialog
          show={showAcionDialog}
          type={type}
--- a/packages/amis-editor/src/renderer/event-control/types.ts
+++ b/packages/amis-editor/src/renderer/event-control/types.ts
@ -10,6 +10,9 @@ export interface ActionEventConfig {
    weight?: number; // 权重
    actions: ActionConfig[]; // 执行的动作集
    __isBroadcast?: boolean; // 区分一下广播事件
+    debounce?: {
+      wait: number;
+    };
  };
 }