From 696c2361f350239ede46af9bc44d51ff3c263703 Mon Sep 17 00:00:00 2001
From: chilingling <michaelchiling1024@gmail.com>
Date: Wed, 31 Jan 2024 03:39:03 -0800
Subject: [PATCH 1/2] feat(setting-advanced): addcustomEvent popover change to
 dialog

---
 .../settings/events/src/commonjs/events.js    |   7 -
 .../events/src/components/AddEventsDialog.vue | 123 +++++++++++++
 .../events/src/components/BindEvents.vue      | 172 ++++++------------
 3 files changed, 176 insertions(+), 126 deletions(-)
 create mode 100644 packages/settings/events/src/components/AddEventsDialog.vue

diff --git a/packages/settings/events/src/commonjs/events.js b/packages/settings/events/src/commonjs/events.js
index f8fe9ae143..53572d4508 100644
--- a/packages/settings/events/src/commonjs/events.js
+++ b/packages/settings/events/src/commonjs/events.js
@@ -10,8 +10,6 @@
  *
  */
 
-import { useNotify } from '@opentiny/tiny-engine-controller'
-
 export const commonEvents = {
   onClick: {
     label: {
@@ -189,11 +187,6 @@ export const checkEvent = (event) => {
     return `${e.substring(0, 2)}${three}${e.substring(3)}`
   })
   if (!checkEventList.includes(event)) {
-    useNotify({
-      type: 'error',
-      message: '请输入正确的浏览器事件'
-    })
-
     return false
   }
   return true
diff --git a/packages/settings/events/src/components/AddEventsDialog.vue b/packages/settings/events/src/components/AddEventsDialog.vue
new file mode 100644
index 0000000000..854a2fbbdc
--- /dev/null
+++ b/packages/settings/events/src/components/AddEventsDialog.vue
@@ -0,0 +1,123 @@
+<template>
+  <tiny-dialog-box
+    :visible="visible"
+    title="添加自定义事件"
+    width="400px"
+    :append-to-body="true"
+    :close-on-click-modal="false"
+    @close="closeDialog"
+  >
+    <tiny-form
+      ref="ruleForm"
+      :model="formData"
+      :rules="rules"
+      label-width="100px"
+      :inline-message="true"
+      validate-type="text"
+      label-position="left"
+    >
+      <tiny-form-item label="事件函数名" prop="eventName" required>
+        <tiny-input v-model="formData.eventName" placeholder="小驼峰格式，如：onDrag"></tiny-input>
+      </tiny-form-item>
+      <tiny-form-item label="事件描述" prop="eventDescription" required>
+        <tiny-input v-model="formData.eventDescription"></tiny-input>
+      </tiny-form-item>
+    </tiny-form>
+    <template #footer>
+      <div class="footer">
+        <tiny-button @click="closeDialog"> 取消</tiny-button>
+        <tiny-button type="primary" @click="addMethod"> 确定</tiny-button>
+      </div>
+    </template>
+  </tiny-dialog-box>
+</template>
+
+<script setup>
+import { reactive, ref, defineProps, defineEmits } from 'vue'
+import {
+  Input as TinyInput,
+  Form as TinyForm,
+  FormItem as TinyFormItem,
+  Button as TinyButton,
+  DialogBox as TinyDialogBox
+} from '@opentiny/vue'
+import { checkEvent } from '../commonjs/events.js'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false
+  },
+  componentEvents: {
+    type: Object,
+    default: () => ({})
+  }
+})
+
+const emits = defineEmits(['closeDialog', 'addEvent'])
+
+const formData = reactive({
+  eventDescription: '',
+  eventName: ''
+})
+
+const ruleForm = ref(null)
+
+const eventNameValidator = (rule, value, callback) => {
+  if (props.componentEvents[formData.eventName]) {
+    callback(new Error('事件名已存在'))
+
+    return
+  }
+
+  if (!checkEvent(formData.eventName)) {
+    callback(new Error('请输入正确的浏览器事件名'))
+
+    return
+  }
+
+  callback()
+}
+
+const rules = {
+  eventDescription: [
+    {
+      required: true,
+      message: '必填'
+    }
+  ],
+  eventName: [
+    { required: true, message: '必填' },
+    {
+      validator: eventNameValidator
+    }
+  ]
+}
+
+const closeDialog = () => {
+  emits('closeDialog')
+}
+
+const addMethod = () => {
+  if (!ruleForm.value) {
+    return
+  }
+
+  ruleForm.value.validate((valid) => {
+    if (!valid) {
+      return
+    }
+
+    const { eventName, eventDescription } = formData
+
+    emits('addEvent', { eventName, eventDescription })
+  })
+}
+</script>
+
+<style lang="less" scoped>
+.footer {
+  display: flex;
+  justify-content: flex-end;
+}
+</style>
diff --git a/packages/settings/events/src/components/BindEvents.vue b/packages/settings/events/src/components/BindEvents.vue
index d98c72c51e..aa8550f251 100644
--- a/packages/settings/events/src/components/BindEvents.vue
+++ b/packages/settings/events/src/components/BindEvents.vue
@@ -2,58 +2,22 @@
   <div class="bind-action-list">
     <div class="popover-head">
       <span class="head-left">
-        <tiny-popover
-          v-model="state.showEventAdditive"
-          popperClass="option-popper"
-          placement="bottom-end"
-          trigger="manual"
-          @hide="clearFromData"
+        <tiny-button
+          class="title add-custom-event-button"
+          :reset-time="0"
+          @click.stop="handleToggleAddEventDialog(true)"
         >
-          <template #reference>
-            <tiny-button
-              class="title add-custom-event-button"
-              :reset-time="0"
-              @click.stop="state.showEventAdditive = !state.showEventAdditive"
-            >
-              <span class="custom-event-button-text">添加自定义事件</span>
-              <tiny-popover
-                placement="bottom-start"
-                trigger="hover"
-                popperClass="setting-advanced-add-custom-event-tip"
-              >
-                <template #reference>
-                  <icon-help-query class="icon-help"></icon-help-query>
-                </template>
-                <div class="add-custom-event-tip">
-                  支持添加原生 DOM 事件，添加后点击
-                  <span class="event-tip-highlight"> 绑定事件 </span> 为画布中所选元素增加事件
-                </div>
-              </tiny-popover>
-            </tiny-button>
-          </template>
-          <div class="custom-event" @click.stop>
-            <tiny-form
-              ref="ruleForm"
-              :model="state.formData"
-              :rules="rules"
-              label-width="100px"
-              :inline-message="true"
-              validate-type="text"
-              label-position="left"
-            >
-              <tiny-form-item label="事件函数名" prop="methodName" required>
-                <tiny-input v-model="state.formData.methodName" placeholder="小驼峰格式，如：onDrag"></tiny-input>
-              </tiny-form-item>
-              <tiny-form-item label="事件描述" prop="methodDescription" required>
-                <tiny-input v-model="state.formData.methodDescription"></tiny-input>
-              </tiny-form-item>
-              <footer>
-                <tiny-button @click="addMethod"> 确定</tiny-button>
-                <tiny-button @click="state.showEventAdditive = !state.showEventAdditive"> 取消</tiny-button>
-              </footer>
-            </tiny-form>
-          </div>
-        </tiny-popover>
+          <span class="custom-event-button-text">添加自定义事件</span>
+          <tiny-popover placement="bottom-start" trigger="hover" popperClass="setting-advanced-add-custom-event-tip">
+            <template #reference>
+              <icon-help-query class="icon-help"></icon-help-query>
+            </template>
+            <div class="add-custom-event-tip">
+              支持添加原生 DOM 事件，添加后点击
+              <span class="event-tip-highlight"> 绑定事件 </span> 为画布中所选元素增加事件
+            </div>
+          </tiny-popover>
+        </tiny-button>
       </span>
       <tiny-popover popperClass="option-popper setting-advanced-bind-event-list" placement="bottom-end" trigger="hover">
         <template #reference>
@@ -112,29 +76,34 @@
     </div>
   </div>
   <bind-events-dialog :eventBinding="state.eventBinding"></bind-events-dialog>
+  <add-events-dialog
+    :visible="state.showBindEventDialog"
+    :componentEvents="state.componentEvents"
+    @closeDialog="handleToggleAddEventDialog(false)"
+    @addEvent="handleAddEvent"
+  ></add-events-dialog>
 </template>
 
 <script>
-import { computed, reactive, watchEffect, ref, watch } from 'vue'
-import { Popover, Input, Form, FormItem, Button } from '@opentiny/vue'
-import { useCanvas, useModal, useLayout, useBlock, useResource, useNotify } from '@opentiny/tiny-engine-controller'
+import { computed, reactive, watchEffect } from 'vue'
+import { Popover, Button } from '@opentiny/vue'
+import { useCanvas, useModal, useLayout, useBlock, useResource } from '@opentiny/tiny-engine-controller'
 import { BlockLinkEvent, SvgButton } from '@opentiny/tiny-engine-common'
 import { iconHelpQuery, iconChevronDown } from '@opentiny/vue-icon'
 import BindEventsDialog, { open as openDialog } from './BindEventsDialog.vue'
-import { commonEvents, checkEvent } from '../commonjs/events.js'
+import { commonEvents } from '../commonjs/events.js'
+import AddEventsDialog from './AddEventsDialog.vue'
 
 export default {
   components: {
     BlockLinkEvent,
     BindEventsDialog,
     TinyPopover: Popover,
-    TinyForm: Form,
-    TinyFormItem: FormItem,
-    TinyInput: Input,
     TinyButton: Button,
     IconHelpQuery: iconHelpQuery(),
     IconChevronDown: iconChevronDown(),
-    SvgButton
+    SvgButton,
+    AddEventsDialog
   },
   inheritAttrs: false,
   setup() {
@@ -146,23 +115,13 @@ export default {
 
     const { highlightMethod } = getPluginApi(PLUGIN_NAME.PageController)
 
-    const rules = {
-      methodDescription: [{ required: true, message: '必填', trigger: 'blur' }],
-      methodName: [{ required: true, message: '必填', trigger: 'blur' }]
-    }
-    const ruleForm = ref(null)
-
     const state = reactive({
       eventName: '', // 事件名称
       eventBinding: null, // 事件绑定的处理方法对象
       componentEvent: {},
       componentEvents: commonEvents,
       bindActions: {},
-      formData: {
-        methodDescription: '',
-        methodName: ''
-      },
-      showEventAdditive: false
+      showBindEventDialog: false
     })
 
     const isBlock = computed(() => Boolean(pageState.isBlock))
@@ -259,56 +218,33 @@ export default {
       }
     }
 
-    const addMethod = () => {
-      if (state.componentEvents[state.formData.methodName]) {
-        useNotify({
-          type: 'error',
-          message: `${state.formData.methodName}事件函数名已存在`
-        })
-        return false
-      }
-      if (checkEvent(state.formData.methodName)) {
-        Object.assign(state.componentEvents, {
-          [state.formData.methodName]: {
-            label: {
-              zh_CN: state.formData.methodDescription
-            },
-            description: {
-              zh_CN: `${state.formData.methodDescription}的回调函数`
-            },
-            type: 'event',
-            functionInfo: {
-              params: [],
-              returns: {}
-            },
-            defaultValue: ''
-          }
-        })
-        state.showEventAdditive = !state.showEventAdditive
-      }
-
-      return undefined
+    const handleToggleAddEventDialog = (visible) => {
+      state.showBindEventDialog = visible
     }
 
-    const clearFromData = () => {
-      ruleForm.value?.resetFields()
-    }
+    const handleAddEvent = (params) => {
+      const { eventName, eventDescription } = params
+
+      Object.assign(state.componentEvents, {
+        [eventName]: {
+          label: {
+            zh_CN: eventDescription
+          },
+          description: {
+            zh_CN: `${eventDescription}的回调函数`
+          },
+          type: 'event',
+          functionInfo: {
+            params: [],
+            returns: {}
+          },
+          defaultValue: ''
+        }
+      })
 
-    const handleCloseEventModal = () => {
-      state.showEventAdditive = false
+      state.showBindEventDialog = false
     }
 
-    watch(
-      () => state.showEventAdditive,
-      (visible) => {
-        if (visible) {
-          window.addEventListener('click', handleCloseEventModal)
-        } else {
-          window.removeEventListener('click', handleCloseEventModal)
-        }
-      }
-    )
-
     return {
       state,
       isBlock,
@@ -316,10 +252,8 @@ export default {
       delEvent,
       openCodePanel,
       openActionDialog,
-      rules,
-      addMethod,
-      clearFromData,
-      ruleForm
+      handleAddEvent,
+      handleToggleAddEventDialog
     }
   }
 }

From cb52328b25328cfc0fd09d8ab86e8433c9d41967 Mon Sep 17 00:00:00 2001
From: chilingling <michaelchiling1024@gmail.com>
Date: Sun, 4 Feb 2024 17:20:41 -0800
Subject: [PATCH 2/2] fix(setting-advanced): add custom event align left with
 modal title

---
 packages/settings/events/src/components/AddEventsDialog.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/settings/events/src/components/AddEventsDialog.vue b/packages/settings/events/src/components/AddEventsDialog.vue
index 854a2fbbdc..885fb85e9e 100644
--- a/packages/settings/events/src/components/AddEventsDialog.vue
+++ b/packages/settings/events/src/components/AddEventsDialog.vue
@@ -15,6 +15,7 @@
       :inline-message="true"
       validate-type="text"
       label-position="left"
+      class="add-custom-event-form"
     >
       <tiny-form-item label="事件函数名" prop="eventName" required>
         <tiny-input v-model="formData.eventName" placeholder="小驼峰格式，如：onDrag"></tiny-input>
@@ -116,6 +117,11 @@ const addMethod = () => {
 </script>
 
 <style lang="less" scoped>
+.add-custom-event-form {
+  :deep(.tiny-form-item__label) {
+    padding-left: 0;
+  }
+}
 .footer {
   display: flex;
   justify-content: flex-end;