fix: 修复 cr 问题

.eslintrc.js

@@ -80,6 +80,14 @@ const tslintConfig = {
     '@typescript-eslint/ban-ts-comment': [ 'warn' ],
     'no-shadow': 'off',
     '@typescript-eslint/no-shadow': 'error',
+    'no-multiple-empty-lines': [
+      'error',
+      {
+        max: 1,
+        maxEOF: 0,
+        maxBOF: 0,
+      },
+    ],
   },
 };
 

src/background/actionListener/tab.ts

@@ -12,8 +12,8 @@ export async function createTabActionListener(
   const { type, url } = request.data;
   switch (type) {
     case OperateTabEnum.screenShot: {
-      const tabs = await Chrome.tabs.query({ lastFocusedWindow: true })
-      const res =  await Chrome.tabs.captureVisibleTab(tabs[0].windowId as number);
+      const tabs = await Chrome.tabs.query({ lastFocusedWindow: true });
+      const res = await Chrome.tabs.captureVisibleTab(tabs[0].windowId as number);
       callback(res);
       break;
     }
@@ -25,7 +25,7 @@ export async function createTabActionListener(
     case OperateTabEnum.create: {
       Chrome.tabs.create({ url });
       callback(true);
-      break
+      break;
     }
     default: {
       break;

src/background/core/request.ts

@@ -123,15 +123,15 @@ async function request<T>(
         action: ContentScriptEvents.ForceUpgradeVersion,
         data: {
           html: responseJson?.html,
-        }
-      })
+        },
+      });
       throw responseJson;
     }
     // 登录过期
     if (response.status === 401 && responseJson.message === 'Unauthorized') {
       Chrome.sendMessageToAllTab({
         action: ContentScriptEvents.LoginOut,
-      })
+      });
       throw responseJson;
     }
     if (!(response.status >= 200 && response.status < 300)) {

src/background/core/util.ts

@@ -1,11 +1,11 @@
-import { IUser } from "@/isomorphic/interface";
-import Storage from "./storage";
-import { STORAGE_KEYS } from "@/config";
+import { IUser } from '@/isomorphic/interface';
+import Storage from './storage';
+import { STORAGE_KEYS } from '@/config';
 
 export const getCurrentAccount = async () => {
   const account = await Storage.get(STORAGE_KEYS.CURRENT_ACCOUNT) as IUser;
   if (!account?.login_at) {
-    return {}
-  } 
+    return {};
+  }
   return account;
-}
+};

src/components/AccountLayout/context.ts

@@ -12,4 +12,3 @@ export const AccountContext = createContext<IAccountContext>({
     //
   },
 });
-

src/components/ShortItem/index.module.less

@@ -20,11 +20,11 @@
     align-items: center;
     cursor: pointer;
     padding-left: 12px;
-    font-size: 14px;
+    font-size: @font-size;
   }
 
   .tooltip {
-    font-size: 14px;
+    font-size: @font-size;
     position: absolute;
     right: 16px;
     top: 50%;
@@ -35,7 +35,7 @@
 }
 
 .error {
-  font-size: 12px;
+  font-size: @font-size-sm;
   margin-top: 4px;
   color: @red-6;
 }

src/components/SuperSideBar/container/Header/index.tsx

@@ -10,7 +10,6 @@ import SettingSvg from '@/assets/svg/setting.svg';
 import HomeSvg from '@/assets/svg/home.svg';
 import styles from './index.module.less';
 
-
 function SuperSidebarHeader() {
   const openHome = () => {
     window.open(LinkHelper.dashboard);

src/components/SuperSideBar/core/BuiltinAssistant.tsx

@@ -7,15 +7,6 @@ import {
 } from '@/components/SuperSideBar/declare';
 import { IAssistantManifest } from './IAssistantManifest';
 
-function* builtinPriorityGenerator() {
-  let priority = 0;
-  while (true) {
-    yield `a${++priority}`;
-  }
-}
-
-const builtinPriorityGeneratorInstance = builtinPriorityGenerator()!;
-
 export class BuiltinAssistant implements IAssistant {
   id: number;
 
@@ -29,15 +20,13 @@ export class BuiltinAssistant implements IAssistant {
 
   priority: string;
 
-
   provider: ISideContentProvider;
 
   constructor(manifest: IAssistantManifest) {
     const builtinManifest = builtinManifests[manifest.type];
 
     this.id = manifest.id;
-    this.priority =
-      manifest.priority || builtinPriorityGeneratorInstance.next().value!;
+    this.priority = manifest.priority;
     this.type = manifest.type;
     this.label = this.getLabel(manifest.label) || builtinManifest.label;
     this.description = manifest.description || builtinManifest.description;

src/components/SuperSideBar/declare.ts

@@ -3,18 +3,20 @@ import { IUser } from '@/isomorphic/interface';
 import React, { MutableRefObject } from 'react';
 
 export interface IRootDrawerRef {
-  render: (conf: RootRenderProps) => void,
-  onClose: () => void,
+  render: (conf: RootRenderProps) => void;
+  onClose: () => void;
 }
-export type RootRenderProps = { title: React.ReactElement, content: React.ReactElement };
+export type RootRenderProps = {
+  title: React.ReactElement;
+  content: React.ReactElement;
+};
 
 export interface IScrollerRef {
   scrollToBottom(immediately?: boolean): void;
 }
 
 export type IListenerRemover = () => void;
 
-
 export interface IMessageProgress {
   status?: number;
   icon?: IRenderResult;
@@ -56,13 +58,12 @@ export interface IRenderTextOptions extends IBaseRenderOptions {
   typewriter?: boolean;
 }
 
-
 export interface IRenderInputOptions extends IBaseRenderOptions {
   ref: React.MutableRefObject<any | undefined>;
   placeholder?: string;
   disabled?: boolean;
   onEnter: (text: string) => void;
-  extra?: React.ReactNode
+  extra?: React.ReactNode;
 }
 
 export type IRenderResult = React.JSX.Element | React.ReactElement | null;
@@ -121,7 +122,7 @@ export interface ISidebarRenderContext {
 
   scrollToBottom(immediately?: boolean): void;
 
-  renderDrawer: IRootDrawerRef['render']
+  renderDrawer: IRootDrawerRef['render'];
   closeDrawer(): void;
 }
 
@@ -256,15 +257,15 @@ export abstract class SideContentDatasource<
   }
 
   removeListener(listener: T) {
-    this._listeners = this._listeners.filter((it) => it !== listener);
+    this._listeners = this._listeners.filter(it => it !== listener);
   }
 
   protected notifyListener(invoker: (listener: T) => void) {
     this._listeners.forEach(invoker);
   }
 
   protected notifyDatasetUpdated(params?: IDatasetUpdatedParams) {
-    this.notifyListener((listener) => listener.onDatasetUpdated?.(params));
+    this.notifyListener(listener => listener.onDatasetUpdated?.(params));
   }
 }
 
@@ -298,7 +299,9 @@ export enum AssistantType {
   ClipAssistant = 'ClipAssistant',
 }
 
-export interface IAssistant<T extends ISideContentProvider = ISideContentProvider> {
+export interface IAssistant<
+  T extends ISideContentProvider = ISideContentProvider,
+> {
   id: number;
   type: AssistantType;
   label: string;
@@ -308,4 +311,3 @@ export interface IAssistant<T extends ISideContentProvider = ISideContentProvide
   hasWatermark?: boolean;
   provider: T;
 }
-

src/components/SuperSideBar/impl/ClipAssistant/component/AddTagButton/index.tsx

@@ -6,7 +6,7 @@ import { __i18n } from '@/isomorphic/i18n';
 import TagMenu, { ITagMenuProps } from './TagMenu';
 import styles from './index.module.less';
 
-interface IAddTagButtonProps extends ITagMenuProps {}
+type IAddTagButtonProps = ITagMenuProps;
 
 function AddTagButton(props: IAddTagButtonProps) {
   const { tags, selectTags, updateSelectTags, updateTags } = props;
@@ -50,7 +50,7 @@ function AddTagButton(props: IAddTagButtonProps) {
       arrow={false}
     >
       <Button
-        className={classnames("add-tag-button", styles.button)}
+        className={classnames('add-tag-button', styles.button)}
         onClick={() => {
           setOpen(!open);
         }}

src/components/SuperSideBar/index.ts

@@ -50,7 +50,7 @@ class SuperSidebarContainer {
   get first() {
     return this.rightBarAssistants?.[0];
   }
-  
+
   initCurrentAssistant() {
     if (this._assistants.length === 0) {
       return;
@@ -159,8 +159,8 @@ class SuperSidebarContainer {
 
   addAssistant(assistant: IAssistant) {
     this._assistants.push(assistant);
-    this.notifyListener((listener) => listener.onAssistantsChanged?.());
-    this.notifyListener((listener) => listener.onManifestsChanged?.());
+    this.notifyListener(listener => listener.onAssistantsChanged?.());
+    this.notifyListener(listener => listener.onManifestsChanged?.());
   }
 }
 

src/components/WordMarkLayout/context.ts

@@ -1,5 +1,5 @@
 import { createContext } from 'react';
 import { IWordMarkConfig } from '@/isomorphic/constant/wordMark';
 
-export interface IWordMarkContext extends IWordMarkConfig {}
+export type IWordMarkContext = IWordMarkConfig;
 export const WordMarkContext = createContext<IWordMarkContext>({} as IWordMarkContext);

src/components/WordMarkLayout/index.tsx

@@ -26,7 +26,7 @@ function WordMarkLayout(props: IWordMarkLayoutProps) {
     }
     return true;
   };
-  
+
   useEffect(() => {
     backgroundBridge.wordMarkConfig.get().then(res => {
       setWordMarkConfig(res);

src/components/lake-editor/editor-plugin.ts

@@ -150,7 +150,6 @@ export function InjectEditorPlugin({ EditorPlugin, KernelPlugin, PositionUtil, O
     }
   }
 
-
   class CustomKernelPlugin extends KernelPlugin {
     static PluginName = 'CustomEditorPlugin';
 

src/components/lake-editor/editor.tsx

@@ -152,7 +152,7 @@ export default forwardRef<IEditorRef, EditorProps>((props, ref) => {
                           typeof widget.enable === 'function'
                             ? () => (widget.enable as (ui: any) => boolean)(cardUI)
                             : () => !!widget.enable,
-                      }))
+                      })),
                     });
                   });
                   return cardUI.cardData.getOcrLocations()?.length > 0;

src/core/bridge/background/index.ts

@@ -31,13 +31,13 @@ export function callBackgroundBridge(
   data?: MapT<any>,
   callback?: OneArgFunctionT<any>,
 ) {
-  callback = callback || function () {
+  callback = callback || function() {
     // ignore
   };
   Chrome.runtime.sendMessage(
     {
       action: bridgeName,
-      data: data,
+      data,
     },
     res => {
       callback?.(res);

src/core/bridge/background/stroge.ts

@@ -10,7 +10,7 @@ export function createStorageBridge(impl: ICallBridgeImpl) {
           impl(
             BackgroundEvents.OperateStorage,
             { key, type: OperateStorageEnum.get },
-            (res) => {
+            res => {
               resolve(res);
             },
           );

src/core/bridge/background/tab.ts

@@ -37,7 +37,7 @@ export function createTabBridge(impl: ICallBridgeImpl) {
             },
           );
         });
-      }
+      },
     },
   };
 }

src/core/browser-system-link.ts

@@ -1,17 +1,17 @@
 import bowser from 'bowser';
 
-const name =  bowser.getParser(navigator.userAgent).getBrowserName();
+const name = bowser.getParser(navigator.userAgent).getBrowserName();
 const isEdge = name === 'Microsoft Edge';
 
 const ChromeSystemLink = {
   cookieSetting: 'chrome://settings/cookies',
   shortCut: 'chrome://extensions/shortcuts',
-}
+};
 
 const EdgeSystemLink = {
   cookieSetting: 'edge://settings/content',
   shortCut: 'edge://extensions/shortcuts',
-}
+};
 
 function findSystemLink() {
   if (isEdge) {

src/hooks/useEnterShortCut.ts

@@ -15,7 +15,7 @@ export function useEnterShortcut(props: IUseShortcutProps) {
     const onOk = (e: KeyboardEvent) => {
       e.preventDefault();
       props.onOk();
-    }
+    };
     keymaster(okKey, onOk);
     return () => keymaster.unbind(okKey);
   }, [props.onOk, okKey]);
@@ -24,7 +24,7 @@ export function useEnterShortcut(props: IUseShortcutProps) {
     const onCancel = (e: KeyboardEvent) => {
       e.preventDefault();
       props.onCancel();
-    }
+    };
     keymaster(cancelKey, onCancel);
     return () => keymaster.unbind(cancelKey);
   }, [props.onCancel, cancelKey]);