From 5fe22b9c4f977d1f383e5a783493af485e16a2ca Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Tue, 27 Feb 2024 11:48:16 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20ace=20demo=20=E7=BC=96=E5=86=99?=
 =?UTF-8?q?=E5=AE=8C=E6=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AceEditor/src/AceEditor.tsx    |   7 +-
 src/components/AceEditor/src/emits.ts         |   2 +-
 src/components/AceEditor/src/types.ts         |   6 +
 src/locales/lang/en/routes/demo.ts            |   2 +-
 src/locales/lang/zh-CN/routes/demo.ts         |   2 +-
 src/router/routes/demo/comp.ts                |   8 +-
 src/views/demo/editor/ace/index.vue           |  39 ++----
 src/views/demo/editor/ace/useAceEditor.vue    |   4 +-
 .../demo/editor/ace/useAceEditorAdvanced.vue  | 112 ++++++++++++++++++
 .../demo/editor/ace/useAceEditorReactive.vue  |  82 -------------
 10 files changed, 144 insertions(+), 120 deletions(-)
 create mode 100644 src/views/demo/editor/ace/useAceEditorAdvanced.vue
 delete mode 100644 src/views/demo/editor/ace/useAceEditorReactive.vue

diff --git a/src/components/AceEditor/src/AceEditor.tsx b/src/components/AceEditor/src/AceEditor.tsx
index 9323687..d45f478 100644
--- a/src/components/AceEditor/src/AceEditor.tsx
+++ b/src/components/AceEditor/src/AceEditor.tsx
@@ -18,6 +18,7 @@ import type { AceEditorState, AceEditorMethods, AceEditorProps } from './types';
 import { deepMerge } from '/@/utils';
 import { useAppStore } from '/@/store/modules/app';
 import './ace-config';
+import { isFunction } from '/@/utils/is';
 
 export default defineComponent({
   name: 'AceEditor',
@@ -35,7 +36,7 @@ export default defineComponent({
       _isSettingContent: false,
     });
 
-    const getProps = computed((): Recordable => {
+    const getProps = computed((): AceEditorProps => {
       return {
         ...props,
         ...(unref(propsRef) as any),
@@ -66,6 +67,10 @@ export default defineComponent({
         const content = editor.getValue();
         state._contentBackup = content;
         emit('update:value', content);
+        emit('change', content);
+        // 解决通过useAceEditor注册onChange时不起作用的问题
+        const { onChange } = unref(getProps);
+        onChange && isFunction(onChange) && onChange.call(undefined, content);
       });
       // Event Binding
       editor.on('blur', (e: Event) => emit('blur', e));
diff --git a/src/components/AceEditor/src/emits.ts b/src/components/AceEditor/src/emits.ts
index 1702f3c..b9314f9 100644
--- a/src/components/AceEditor/src/emits.ts
+++ b/src/components/AceEditor/src/emits.ts
@@ -1,9 +1,9 @@
 export const basicEmits = [
   'register',
   'update:value',
+  'change',
   'blur',
   'input',
-  'change',
   'changeSelectionStyle',
   'changeSession',
   'copy',
diff --git a/src/components/AceEditor/src/types.ts b/src/components/AceEditor/src/types.ts
index f7f8d2e..64ed741 100644
--- a/src/components/AceEditor/src/types.ts
+++ b/src/components/AceEditor/src/types.ts
@@ -22,6 +22,12 @@ export interface AceEditorProps {
   printMargin: boolean | number;
   minLines: number;
   maxLines: number;
+
+  /**
+   * Callback executed when editor content
+   * @param content
+   */
+  onChange?: (content: string) => void;
 }
 
 export interface AceEditorMethods {
diff --git a/src/locales/lang/en/routes/demo.ts b/src/locales/lang/en/routes/demo.ts
index b66e786..2065997 100644
--- a/src/locales/lang/en/routes/demo.ts
+++ b/src/locales/lang/en/routes/demo.ts
@@ -54,7 +54,7 @@ export default {
     aceEditor: 'Ace editor',
     aceEditorBasic: 'Ace Basic',
     useAceEditor: 'Use AceEditor',
-    useAceEditorReactive: 'Use AceEditor Reactive',
+    useAceEditorAdvanced: 'Use AceEditor Advanced',
 
     tinymce: 'Rich text',
     tinymceBasic: 'Basic',
diff --git a/src/locales/lang/zh-CN/routes/demo.ts b/src/locales/lang/zh-CN/routes/demo.ts
index 429ba57..26b98a6 100644
--- a/src/locales/lang/zh-CN/routes/demo.ts
+++ b/src/locales/lang/zh-CN/routes/demo.ts
@@ -53,7 +53,7 @@ export default {
     aceEditor: 'Ace编辑器',
     aceEditorBasic: 'ACE基础使用',
     useAceEditor: 'UseAceEditor',
-    useAceEditorReactive: 'UseAceEditor响应',
+    useAceEditorAdvanced: 'ACE高级使用',
 
     tinymce: '富文本',
     tinymceBasic: '基础使用',
diff --git a/src/router/routes/demo/comp.ts b/src/router/routes/demo/comp.ts
index 9aa36bb..f68896f 100644
--- a/src/router/routes/demo/comp.ts
+++ b/src/router/routes/demo/comp.ts
@@ -361,11 +361,11 @@ const comp: AppRouteModule = {
               },
             },
             {
-              path: 'useAceEditorReactive',
-              name: 'useAceEditorReactiveDemo',
-              component: () => import('/@/views/demo/editor/ace/useAceEditorReactive.vue'),
+              path: 'useAceEditorAdvanced',
+              name: 'useAceEditorAdvancedDemo',
+              component: () => import('/@/views/demo/editor/ace/useAceEditorAdvanced.vue'),
               meta: {
-                title: t('routes.demo.editor.useAceEditorReactive'),
+                title: t('routes.demo.editor.useAceEditorAdvanced'),
               },
             },
           ],
diff --git a/src/views/demo/editor/ace/index.vue b/src/views/demo/editor/ace/index.vue
index 32aa921..a5f1b5a 100644
--- a/src/views/demo/editor/ace/index.vue
+++ b/src/views/demo/editor/ace/index.vue
@@ -6,23 +6,30 @@
   >
     <template #extra>
       <a-space size="middle">
-        <a-select v-model:value="state.lang">
+        语言<a-select v-model:value="state.lang">
           <a-select-option v-for="(lang, index) of langs" :key="index" :value="lang"> {{ lang }} </a-select-option>
         </a-select>
-        <a-select v-model:value="state.theme">
+        主题<a-select v-model:value="state.theme">
           <a-select-option v-for="(theme, index) of themes" :key="index" :value="theme"> {{ theme }} </a-select-option>
         </a-select>
       </a-space>
     </template>
     <AceEditor v-model:value="state.content"
                class="vue-ace-editor"
-               @register="register"
+               :lang="state.lang"
+               :theme="state.theme"
+               :options="{
+                 useWorker: true,
+                 enableBasicAutocompletion: true,
+                 enableSnippets: true,
+                 enableLiveAutocompletion: true,
+               }"
     />
   </PageWrapper>
 </template>
 <script setup lang="ts">
   import { reactive, watch } from 'vue';
-  import { AceEditor, useAceEditor } from '/@/components/AceEditor';
+  import { AceEditor } from '/@/components/AceEditor';
   import { PageWrapper } from '/@/components/Page';
 
   const langs = ['json', 'javascript', 'html', 'yaml'];
@@ -33,26 +40,6 @@
     content: '',
   });
 
-  const [
-    register,
-    {
-      setProps,
-      blur,
-      focus,
-      getAceInstance,
-      selectAll
-    },
-  ] = useAceEditor({
-    lang: state.lang,
-    theme: state.theme,
-    options: {
-      useWorker: true,
-      enableBasicAutocompletion: true,
-      enableSnippets: true,
-      enableLiveAutocompletion: true,
-    }
-  });
-
   watch(
     () => state.lang,
     async lang => {
@@ -64,13 +51,9 @@
           yaml: import('../../../../../pnpm-lock.yaml?raw'),
         }[lang]
       || {}).default!;
-      setProps({ lang });
     },
     { immediate: true }
   );
-
-  watch(() => state.theme, theme => setProps({ theme }));
-
 </script>
 <style lang="less" scoped>
 
diff --git a/src/views/demo/editor/ace/useAceEditor.vue b/src/views/demo/editor/ace/useAceEditor.vue
index be50d6b..9701cf7 100644
--- a/src/views/demo/editor/ace/useAceEditor.vue
+++ b/src/views/demo/editor/ace/useAceEditor.vue
@@ -6,10 +6,10 @@
   >
     <template #extra>
       <a-space size="middle">
-        <a-select v-model:value="state.lang">
+        语言<a-select v-model:value="state.lang">
           <a-select-option v-for="(lang, index) of langs" :key="index" :value="lang"> {{ lang }} </a-select-option>
         </a-select>
-        <a-select v-model:value="state.theme">
+        主题<a-select v-model:value="state.theme">
           <a-select-option v-for="(theme, index) of themes" :key="index" :value="theme"> {{ theme }} </a-select-option>
         </a-select>
       </a-space>
diff --git a/src/views/demo/editor/ace/useAceEditorAdvanced.vue b/src/views/demo/editor/ace/useAceEditorAdvanced.vue
new file mode 100644
index 0000000..1242cce
--- /dev/null
+++ b/src/views/demo/editor/ace/useAceEditorAdvanced.vue
@@ -0,0 +1,112 @@
+<template>
+  <PageWrapper title="useAceEditor高级进阶使用示例"
+               contentFullHeight
+               fixedHeight
+               contentBackground
+  >
+    <template #extra>
+      <div class="mb-4">
+        <div class="mb-4">
+          <a-button class="mr-2" @click="handleFocus"> 获得焦点 </a-button>
+          <a-button class="mr-2" @click="handleBlur"> 失去焦点 </a-button>
+          <a-button class="mr-2" @click="handleSelectAll"> 全选 </a-button>
+          <a-button class="mr-2" @click="handleGetAceInstance"> 获取Ace编辑器实例 </a-button>
+        </div>
+        <a-space size="middle">
+          语言<a-select v-model:value="state.lang">
+            <a-select-option v-for="(lang, index) of langs" :key="index" :value="lang"> {{ lang }} </a-select-option>
+          </a-select>
+          主题<a-select v-model:value="state.theme">
+            <a-select-option v-for="(theme, index) of themes" :key="index" :value="theme"> {{ theme }} </a-select-option>
+          </a-select>
+        </a-space>
+      </div>
+    </template>
+    <AceEditor class="vue-ace-editor"
+               @register="register"
+               @focus="handleEmitFocus"
+               @blur="handleEmitBlur"
+    />
+  </PageWrapper>
+</template>
+<script setup lang="ts">
+  import { reactive, watch } from 'vue';
+  import { AceEditor, useAceEditor } from '/@/components/AceEditor';
+  import { PageWrapper } from '/@/components/Page';
+  import { useMessage } from '/@/hooks/web/useMessage';
+
+  const { createMessage } = useMessage();
+  const langs = ['json', 'javascript', 'html', 'yaml'];
+  const themes = ['chrome', 'github', 'monokai', 'dracula'];
+  const state = reactive({
+    lang: 'json',
+    theme: 'chrome',
+    content: '',
+  });
+
+  const [register, { setProps, blur, focus, getAceInstance, selectAll }] = useAceEditor({
+    value: state.content,
+    lang: state.lang,
+    theme: state.theme,
+    options: {
+      useWorker: true,
+      enableBasicAutocompletion: true,
+      enableSnippets: true,
+      enableLiveAutocompletion: true,
+    },
+    onChange: content => state.content = content
+  });
+
+  watch(
+    () => state.lang,
+    async lang => {
+      state.content = (
+        await {
+          json: import('../../../../../package.json?raw'),
+          javascript: import('/@/components/AceEditor/src/ace-config.js?raw'),
+          html: import('../../../../../index.html?raw'),
+          yaml: import('../../../../../pnpm-lock.yaml?raw'),
+        }[lang] || {}).default!;
+      setProps({ value: state.content, lang });
+    },
+    { immediate: true }
+  );
+
+  watch(() => state.theme, theme => setProps({ theme }));
+
+  function handleEmitFocus() {
+    console.log('获取ACE编辑焦点.');
+  }
+
+  function handleEmitBlur() {
+    console.log('失去ACE编辑焦点.');
+  }
+
+  function handleFocus() {
+    createMessage.info('请在控制台查看！');
+    focus();
+  }
+
+  function handleBlur() {
+    createMessage.info('请在控制台查看！');
+    blur();
+  }
+
+  function handleSelectAll() {
+    selectAll();
+  }
+
+  function handleGetAceInstance() {
+    createMessage.info('请在控制台查看！');
+    console.log(getAceInstance());
+  }
+
+</script>
+<style lang="less" scoped>
+
+.vue-ace-editor {
+  font-size: 12px;
+}
+
+</style>
+
diff --git a/src/views/demo/editor/ace/useAceEditorReactive.vue b/src/views/demo/editor/ace/useAceEditorReactive.vue
deleted file mode 100644
index d3dbeed..0000000
--- a/src/views/demo/editor/ace/useAceEditorReactive.vue
+++ /dev/null
@@ -1,82 +0,0 @@
-<template>
-  <PageWrapper title="useAceEditor响应式组件示例"
-               contentFullHeight
-               fixedHeight
-               contentBackground
-  >
-    <template #extra>
-      <a-space size="middle">
-        <a-select v-model:value="state.lang">
-          <a-select-option v-for="(lang, index) of langs" :key="index" :value="lang"> {{ lang }} </a-select-option>
-        </a-select>
-        <a-select v-model:value="state.theme">
-          <a-select-option v-for="(theme, index) of themes" :key="index" :value="theme"> {{ theme }} </a-select-option>
-        </a-select>
-      </a-space>
-    </template>
-    <AceEditor v-model:value="state.content"
-               class="vue-ace-editor"
-               @register="register"
-    />
-  </PageWrapper>
-</template>
-<script setup lang="ts">
-  import { reactive, watch } from 'vue';
-  import { AceEditor, useAceEditor } from '/@/components/AceEditor';
-  import { PageWrapper } from '/@/components/Page';
-
-  const langs = ['json', 'javascript', 'html', 'yaml'];
-  const themes = ['chrome', 'github', 'monokai', 'dracula'];
-  const state = reactive({
-    lang: 'json',
-    theme: 'chrome',
-    content: '',
-  });
-
-  const [
-    register,
-    {
-      setProps,
-      blur,
-      focus,
-      getAceInstance,
-      selectAll
-    },
-  ] = useAceEditor({
-    lang: state.lang,
-    theme: state.theme,
-    options: {
-      useWorker: true,
-      enableBasicAutocompletion: true,
-      enableSnippets: true,
-      enableLiveAutocompletion: true,
-    }
-  });
-
-  watch(
-    () => state.lang,
-    async lang => {
-      state.content = (
-        await {
-          json: import('../../../../../package.json?raw'),
-          javascript: import('/@/components/AceEditor/src/ace-config.js?raw'),
-          html: import('../../../../../index.html?raw'),
-          yaml: import('../../../../../pnpm-lock.yaml?raw'),
-        }[lang]
-      || {}).default!;
-      setProps({ lang });
-    },
-    { immediate: true }
-  );
-
-  watch(() => state.theme, theme => setProps({ theme }));
-
-</script>
-<style lang="less" scoped>
-
-.vue-ace-editor {
-  font-size: 12px;
-}
-
-</style>
-