fix: 对于配置config 类型的修复

client/.npmrc

@@ -1 +1 @@
-ELECTRON_MIRROR="https://npm.taobao.org/mirrors/electron/"
+electron_mirror=https://npmmirror.com/mirrors/electron/

client/src/components/CherryMarkdown/cherry.config.ts

@@ -1,6 +1,6 @@
 import { useStoreCherry } from "@/store/storeCherry";
 import Cherry from "cherry-markdown";
-import { CherryOptions } from "cherry-markdown/types/cherry";
+import { CherryOptions } from "../../../../types/cherry";
 import { ipcRenderer } from "electron";
 import { onMounted, shallowReactive } from "vue";
 
@@ -60,14 +60,14 @@ const initCherryMarkdown = () => {
       // 对复制内容进行额外处理
       return code;
     },
-    onExpandCode: (event, code) => {
+    onExpandCode: (event: any, code: string) => {
       // 阻止默认的粘贴事件
       // return false;
       // 对复制内容进行额外处理
       // console.log(event, code);
       return code;
     },
-    onUnExpandCode: (event, code) => {
+    onUnExpandCode: (event: any, code: string) => {
       // 阻止默认的粘贴事件
       // return false;
       // 对复制内容进行额外处理
@@ -85,11 +85,19 @@ const initCherryMarkdown = () => {
     },
   };
 
+  type CustomConfig = {
+    CustomToolbar: {
+      CustomMenuType: {
+        customMenu_fileUpload: any
+      }
+    }
+  }
 
   /**
    * 默认配置
    */
-  const defaultConfig = {
+  // const defaultConfig: CherryOptions<CustomConfig> = {
+  const defaultConfig: CherryOptions = {
     id: "cherry-markdown",
     // 第三方包
     externals: {
@@ -278,7 +286,7 @@ const initCherryMarkdown = () => {
   };
 
   onMounted(() => {
-    const cherryInstance = new Cherry(defaultConfig as Partial<CherryOptions>);
+    const cherryInstance = new Cherry(defaultConfig);
     storeCherry.cherry = shallowReactive(cherryInstance)
   })
 }

types/cherry.d.ts

@@ -2,9 +2,8 @@ import CodeMirror from 'codemirror';
 import SyntaxBase from '../src/core/SyntaxBase';
 import { FormulaMenu } from '@/toolbars/BubbleFormula';
 
-
 export interface CherryExternalsOptions {
-  [key: string]: any;
+  [key: symbol]: any;
 }
 
 type CherryToolbarsCustomType = {
@@ -69,7 +68,7 @@ export interface _CherryOptions<T extends CherryCustomOptions = CherryCustomOpti
   themeNameSpace: string,
   themeSettings: {
     /** 主题列表，用于切换主题 */
-    themeList:{
+    themeList: {
       /** 主题对应的class名 */
       className: string,
       /** 主题名称 */
@@ -118,11 +117,11 @@ export interface _CherryOptions<T extends CherryCustomOptions = CherryCustomOpti
     /** 编辑器选区变化时触发 */
     selectionChange?: ({ selections: [], lastSelections: [], info }) => void;
     /** 变更语言时触发 */
-    afterChangeLocale?: ( locale: string ) => void;
+    afterChangeLocale?: (locale: string) => void;
     /** 变更主题时触发 */
-    changeMainTheme?: ( theme: string ) => void;
+    changeMainTheme?: (theme: string) => void;
     /** 变更代码块主题时触发 */
-    changeCodeBlockTheme?: ( theme: string ) => void;
+    changeCodeBlockTheme?: (theme: string) => void;
   };
   /** 预览区域配置 */
   previewer: CherryPreviewerOptions;
@@ -271,10 +270,7 @@ export interface CherryPreviewerOptions {
 
 export type CherryToolbarSeparator = '|';
 
-export type CherryCustomToolbar = string;
-
 export type CherryDefaultToolbar =
-  // | CherryToolbarSeparator
   | 'audio'
   | 'barTable'
   | 'bold'
@@ -390,13 +386,12 @@ export interface CherryToolbarsOptions<F extends CherryToolbarsCustomType = Cher
    */
   theme?: 'light' | 'dark';
   toolbar?:
-  | (CherryCustomToolbar |
-    CherryDefaultBubbleToolbar |
+  | (CherryDefaultBubbleToolbar |
     CherryDefaultToolbar |
-  { [K in keyof Partial<F['CustomMenuType']> | CherryDefaultToolbar]?: (keyof F['CustomMenuType'] | CherryDefaultToolbar)[] })[]
+  { [K in (keyof Partial<F['CustomMenuType']>) | CherryDefaultToolbar]?: (keyof F['CustomMenuType'] | CherryDefaultToolbar)[] })[]
   | false;
   toolbarRight?:
-  | (CherryCustomToolbar | CherryDefaultBubbleToolbar | CherryDefaultToolbar)[]
+  | (CherryDefaultBubbleToolbar | CherryDefaultToolbar)[]
   | false;
   /** 是否展示悬浮目录 */
   toc?: false | {
@@ -433,7 +428,7 @@ export interface CherryToolbarsOptions<F extends CherryToolbarsCustomType = Cher
   shortcutKeySettings?: {
     /** 是否替换已有的快捷键, true: 替换默认快捷键； false： 会追加到默认快捷键里，相同的shortcutKey会覆盖默认的 */
     isReplace?: boolean,
-    shortcutKeyMap?: { [shortcutKey:string]: ShortcutKeyMapStruct};
+    shortcutKeyMap?: { [shortcutKey: string]: ShortcutKeyMapStruct };
   };
   /** 一些按钮的配置信息 */
   config?: CherryToolbarConfig;