Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(core): remove unused module #34

Merged
merged 7 commits into from
Jul 19, 2023
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion .github/contributing-zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,29 @@ npm run clean
pnpm install
```

### PR流程

1. 新建分支,进行开发
```sh
git checkout -b my-dev
```
2. 提交分支
```sh
git pull origin my-dev --rebase
git add .
git commit -m "new"
git push origin my-dev
```
3. commit中间执行rebase,不定期从dev同步最新代码到你的分支
```sh
git rebase dev
```
4. [可选]如果有冲突,解决冲突并继续
```sh
git add .
git rebase --continue
```

## 风格指南

我们严格参照 [Google 开源项目风格指南 - TypeScript 风格指南](https://zh-google-styleguide.readthedocs.io/en/latest/google-typescript-styleguide/contents/#),本文档的风格指南,主要列出不同的地方和需要重点强调的部分。
Expand Down Expand Up @@ -892,7 +915,7 @@ export class AlternatingColorsPlugin extends Plugin {

一个简单的设置 worksheet 切换按钮 color 的 API [setTabColor](../packages/core/src/Sheets/Domain/Worksheet.ts) 的案例

1. 在[ACTION_NAMES](../packages/core/src/Const/ACTION_NAMES.ts)中预先定义一个`Action`名称 `SET_TAB_COLOR_ACTION`
1. 在[ACTION_NAMES](../packages/core/src/Types/Const/ACTION_NAMES.ts)中预先定义一个`Action`名称 `SET_TAB_COLOR_ACTION`

2. 将 `Action` 注册到[CommandManager](../packages/core/src/Command/RegisterAction.ts)

Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/Basics/Context.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { IUniverData } from '../Interfaces/IUniverData';
import { IUniverData } from '../Types/Interfaces/IUniverData';
import { Locale } from '../Shared/Locale';
import { Tools } from '../Shared/Tools';
import { ContextBase } from './ContextBase';
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/Basics/DocContext.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { IDocumentData } from '../Interfaces';
import { IDocumentData } from '../Types/Interfaces';
import { ContextBase } from './ContextBase';
import { DocumentModel } from '../Docs/Domain/DocumentModel';

Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/Basics/SheetContext.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { Observable } from '../Observer';
import { GenName, PropsFrom } from '../Shared';
import { Univer } from './Univer';
import { WorkBookObserver } from './WorkBookObserver';
import { IWorkbookConfig } from '../Interfaces';
import { IWorkbookConfig } from '../Types/Interfaces';

/**
* Core context, mount important instances, managers
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/Basics/SlideContext.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ISlideData } from '../Interfaces/ISlideData';
import { ISlideData } from '../Types/Interfaces/ISlideData';
import { SlideModel } from '../Slides/Domain/SlideModel';
import { ContextBase } from './ContextBase';

Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/Basics/Univer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { UniverSlide } from './UniverSlide';
import { Nullable } from '../Shared';
import { Context } from './Context';
import { Plugin } from '../Plugin';
import { IUniverData } from '../Interfaces';
import { IUniverData } from '../Types/Interfaces';
import { UniverObserverImpl } from './UniverObserverImpl';

export class Univer {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/Basics/UniverDoc.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { IDocumentData } from '../Interfaces';
import { IDocumentData } from '../Types/Interfaces';
import { Plugin } from '../Plugin';
import { IOHttp, IOHttpConfig, Logger } from '../Shared';
import { DocContext } from './DocContext';
Expand Down
20 changes: 10 additions & 10 deletions packages/core/src/Basics/UniverObserver.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { UIObserver } from '../Interfaces';
import { Observable } from '../Observer/Observable';
export type UniverObserver<T> = {
onUIChangeObservable: Observable<UIObserver<T>>;
onUIDidMountObservable: Observable<boolean>;
onAfterChangeUISkinObservable: Observable<string>;
onAfterChangeUILocaleObservable: Observable<string>;
onViewComponentFocusChange: Observable<void>;
};
import { UIObserver } from '../Types/Interfaces';
import { Observable } from '../Observer/Observable';

export type UniverObserver<T> = {
onUIChangeObservable: Observable<UIObserver<T>>;
onUIDidMountObservable: Observable<boolean>;
onAfterChangeUISkinObservable: Observable<string>;
onAfterChangeUILocaleObservable: Observable<string>;
onViewComponentFocusChange: Observable<void>;
};
2 changes: 1 addition & 1 deletion packages/core/src/Basics/UniverSheet.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Workbook, ColorBuilder } from '../Sheets/Domain';
import { IWorkbookConfig } from '../Interfaces';
import { IWorkbookConfig } from '../Types/Interfaces';
import { BasePlugin, Plugin } from '../Plugin';
import { IOHttp, IOHttpConfig, Logger } from '../Shared';
import { SheetContext } from './SheetContext';
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/Basics/UniverSlide.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ISlideData } from '../Interfaces';
import { ISlideData } from '../Types/Interfaces';
import { Plugin } from '../Plugin';
import { IOHttp, IOHttpConfig, Logger } from '../Shared';
import { SlideContext } from './SlideContext';
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/Command/RegisterAction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ import {
SetZoomRatioAction,
} from '../Sheets/Action';
import { CommandManager } from './CommandManager';
import { DOC_ACTION_NAMES } from '../Const/DOC_ACTION_NAMES';
import { DOC_ACTION_NAMES } from '../Types/Const/DOC_ACTION_NAMES';
import {
InsertTextAction,
DeleteTextAction,
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/Docs/Action/ActionDataInterface.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { IDocActionData } from '../../Command/DocActionBase';
import {
CommonParameterAttribute,
IDocumentBody,
} from '../../Interfaces/IDocumentData';
} from '../../Types/Interfaces/IDocumentData';

export interface IDeleteActionData extends IDocActionData {
len: number;
Expand Down
4 changes: 2 additions & 2 deletions packages/core/src/Docs/Action/DeleteAction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import {
CommonParameter,
} from '../../Command';

import { DOC_ACTION_NAMES } from '../../Const/DOC_ACTION_NAMES';
import { IDocumentBody } from '../../Interfaces';
import { DOC_ACTION_NAMES } from '../../Types/Const/DOC_ACTION_NAMES';
import { IDocumentBody } from '../../Types/Interfaces';
import { DeleteApply } from '../Apply/DeleteApply';
import { InsertApply } from '../Apply/InsertApply';
import { IDeleteActionData, IInsertActionData } from './ActionDataInterface';
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/Docs/Action/InsertAction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
CommandUnit,
CommonParameter,
} from '../../Command';
import { DOC_ACTION_NAMES } from '../../Const/DOC_ACTION_NAMES';
import { DOC_ACTION_NAMES } from '../../Types/Const/DOC_ACTION_NAMES';
import { InsertApply } from '../Apply/InsertApply';
import { DeleteApply } from '../Apply/DeleteApply';
import { IInsertActionData, IDeleteActionData } from './ActionDataInterface';
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/Docs/Action/RetainAction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
CommandUnit,
CommonParameter,
} from '../../Command';
import { CommonParameterAttribute } from '../../Interfaces/IDocumentData';
import { CommonParameterAttribute } from '../../Types/Interfaces/IDocumentData';
import { IRetainActionData } from './ActionDataInterface';

export class RetainAction extends DocActionBase<
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/Docs/Apply/DeleteApply.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { DocumentModel } from '../Domain/DocumentModel';
import { deleteContent, getDocsUpdateBody, horizontalLineSegmentsSubtraction } from '../../Shared/Common';
import { IDocumentBody } from '../../Interfaces/IDocumentData';
import { IDocumentBody } from '../../Types/Interfaces/IDocumentData';

export function DeleteApply(document: DocumentModel, textLength: number, currentIndex: number, segmentId?: string) {
const doc = document.snapshot;
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/Docs/Apply/InsertApply.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { IDocumentBody } from '../../Interfaces/IDocumentData';
import { IDocumentBody } from '../../Types/Interfaces/IDocumentData';
import { sortRulesFactory } from '../../Shared/SortRules';
import { DocumentModel } from '../Domain/DocumentModel';
import { getDocsUpdateBody } from '../../Shared/Common';
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/Docs/Domain/DocumentBodyModel.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { IDocumentBody, ITextRun } from '../../Interfaces/IDocumentData';
import { IDocumentBody, ITextRun } from '../../Types/Interfaces/IDocumentData';

import { Nullable } from '../../Shared/Types';
import { DataStreamTreeNode } from './DataStreamTreeNode';
Expand Down
8 changes: 4 additions & 4 deletions packages/core/src/Docs/Domain/DocumentModel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import {
CommonParameterAttribute,
IDocumentBody,
IDocumentData,
} from '../../Interfaces/IDocumentData';
import { ITextSelectionRange } from '../../Interfaces/ISelectionData';
import { DOC_ACTION_NAMES } from '../../Const/DOC_ACTION_NAMES';
} from '../../Types/Interfaces/IDocumentData';
import { ITextSelectionRange } from '../../Types/Interfaces/ISelectionData';
import { DOC_ACTION_NAMES } from '../../Types/Const/DOC_ACTION_NAMES';
import { Tools, getTextIndexByCursor } from '../../Shared';
import { DocumentBodyModel } from './DocumentBodyModel';
import { DEFAULT_DOC } from '../../Const';
import { DEFAULT_DOC } from '../../Types/Const';

interface IDrawingUpdateConfig {
left: number;
Expand Down
26 changes: 0 additions & 26 deletions packages/core/src/Hook/Hook.ts

This file was deleted.

5 changes: 0 additions & 5 deletions packages/core/src/Hook/WorkBookHook.ts

This file was deleted.

12 changes: 0 additions & 12 deletions packages/core/src/Hook/WorkSheetHook.ts

This file was deleted.

2 changes: 1 addition & 1 deletion packages/core/src/Server/ServerSocket.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ISheetActionData } from '../Command';
import { ICreatable, createIdentifier } from '../DI';
import { IWorkbookConfig, IWorksheetConfig } from '../Interfaces';
import { IWorkbookConfig, IWorksheetConfig } from '../Types/Interfaces';
import { IOSocket, IOSocketListenType } from '../Shared';
import { MessageQueue } from './MessageQueue';
import { IOServerMessage, IOServerReceive, ServerBase } from './ServerBase';
Expand Down
Loading