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.

Sign up for GitHub

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

Jump to bottom

refactor: refactor core package to DI pattern and remove Context #45

Merged
merged 6 commits into from
Aug 10, 2023
Merged

refactor: refactor core package to DI pattern and remove Context #45

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8328d05
WIP: remove context in worksheet and workbook
Aug 7, 2023
4d4bde6
WIP
Aug 7, 2023
70a63a9
refactor: remove dependency on context on Range
Aug 9, 2023
2aa0469
refactor: remove dependency on context for more modules
Aug 10, 2023
c6ad48d
chore: fix some lint
Aug 10, 2023
1fe23ea
refactor: remove context completely from UniverSheet
Aug 10, 2023
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
Prev Previous commit
Next Next commit
chore: fix some lint
  • Loading branch information
Wenzhao Hu committed Aug 10, 2023
commit c6ad48d0064d42c3d33fc16b280bf05cab3a8cc5
62 changes: 31 additions & 31 deletions packages/core/src/Sheets/Domain/RangeList.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,12 @@ export class RangeList {
* @returns This range list, for chaining.
*/
setValue(value: string | number | boolean): RangeList {
let { _rangeList, _commandManager, _worksheet } = this;
const { _rangeList, _commandManager, _worksheet } = this;

// collect action list
const setList = _rangeList.map((range) => {
let { startRow, startColumn, endRow, endColumn } = range;
let cellValue = new ObjectMatrix<ICellData>();
const { startRow, startColumn, endRow, endColumn } = range;
const cellValue = new ObjectMatrix<ICellData>();
for (let r = startRow; r <= endRow; r++) {
for (let c = startColumn; c <= endColumn; c++) {
cellValue.setValue(startRow, startColumn, {
Expand All @@ -101,15 +101,15 @@ export class RangeList {
}
}

let setValue: ISetRangeDataActionData = {
const setValue: ISetRangeDataActionData = {
sheetId: _worksheet.getSheetId(),
actionName: SetRangeDataAction.NAME,
cellValue: cellValue.getData(),
};
return setValue;
});

let command = new Command(
const command = new Command(
{
WorkBookUnit: this._currentUniverService.getCurrentUniverSheetInstance().getWorkBook(),
},
Expand Down Expand Up @@ -147,7 +147,7 @@ export class RangeList {

// collect action list
const clearList = _rangeList.map((range) => {
let clearRange: IClearRangeActionData = {
const clearRange: IClearRangeActionData = {
sheetId: _worksheet.getSheetId(),
actionName: ClearRangeAction.NAME,
options,
Expand All @@ -156,7 +156,7 @@ export class RangeList {
return clearRange;
});

let command = new Command(
const command = new Command(
{
WorkBookUnit: this._currentUniverService.getCurrentUniverSheetInstance().getWorkBook(),
},
Expand Down Expand Up @@ -193,10 +193,10 @@ export class RangeList {
* @returns This range list, for chaining.
*/
setBackground(color: Nullable<string>): RangeList {
let { _rangeList, _commandManager, _worksheet } = this;
const { _rangeList, _commandManager, _worksheet } = this;

const setList = _rangeList.map((range) => {
let { startRow, startColumn, endRow, endColumn } = range;
const { startRow, startColumn, endRow, endColumn } = range;

// string converted to a two-dimensional array
const styleObj = {
Expand All @@ -217,7 +217,7 @@ export class RangeList {
return setStyle;
});

let command = new Command(
const command = new Command(
{
WorkBookUnit: this._currentUniverService.getCurrentUniverSheetInstance().getWorkBook(),
},
Expand All @@ -238,9 +238,9 @@ export class RangeList {
setBackgroundRGB(red: number, green: number, blue: number): RangeList {
const rgbString = `RGB(${red},${green},${blue})`;

let { _rangeList, _commandManager, _worksheet } = this;
const { _rangeList, _commandManager, _worksheet } = this;
const setList = _rangeList.map((range) => {
let { startRow, startColumn, endRow, endColumn } = range;
const { startRow, startColumn, endRow, endColumn } = range;

// string converted to a two-dimensional array
const styleObj = {
Expand All @@ -261,7 +261,7 @@ export class RangeList {
return setStyle;
});

let command = new Command(
const command = new Command(
{
WorkBookUnit: this._currentUniverService.getCurrentUniverSheetInstance().getWorkBook(),
},
Expand All @@ -282,10 +282,10 @@ export class RangeList {
* @returns This range list, for chaining.
*/
setFontColor(color: Nullable<string>): RangeList {
let { _rangeList, _commandManager, _worksheet } = this;
const { _rangeList, _commandManager, _worksheet } = this;

const setList = _rangeList.map((range) => {
let { startRow, startColumn, endRow, endColumn } = range;
const { startRow, startColumn, endRow, endColumn } = range;

// string converted to a two-dimensional array
const styleObj = {
Expand All @@ -306,7 +306,7 @@ export class RangeList {
return setStyle;
});

let command = new Command(
const command = new Command(
{
WorkBookUnit: this._currentUniverService.getCurrentUniverSheetInstance().getWorkBook(),
},
Expand Down Expand Up @@ -503,10 +503,10 @@ export class RangeList {
* @returns This range list, for chaining.
*/
setTextRotation(degrees: number): RangeList {
let { _rangeList, _commandManager, _worksheet } = this;
const { _rangeList, _commandManager, _worksheet } = this;

const setList = _rangeList.map((range) => {
let { startRow, startColumn, endRow, endColumn } = range;
const { startRow, startColumn, endRow, endColumn } = range;

const styleObj = {
tr: {
Expand All @@ -527,7 +527,7 @@ export class RangeList {
return setStyle;
});

let command = new Command(
const command = new Command(
{
WorkBookUnit: this._currentUniverService.getCurrentUniverSheetInstance().getWorkBook(),
},
Expand Down Expand Up @@ -555,10 +555,10 @@ export class RangeList {
* @returns This range list, for chaining.
*/
setVerticalText(isVertical: BooleanNumber): RangeList {
let { _rangeList, _commandManager, _worksheet } = this;
const { _rangeList, _commandManager, _worksheet } = this;

const setList = _rangeList.map((range) => {
let { startRow, startColumn, endRow, endColumn } = range;
const { startRow, startColumn, endRow, endColumn } = range;

const styleObj = {
tr: {
Expand All @@ -579,7 +579,7 @@ export class RangeList {
return setStyle;
});

let command = new Command(
const command = new Command(
{
WorkBookUnit: this._currentUniverService.getCurrentUniverSheetInstance().getWorkBook(),
},
Expand Down Expand Up @@ -615,23 +615,23 @@ export class RangeList {
* @returns This range list, for chaining.
*/
trimWhitespace(): RangeList {
let { _rangeList, _commandManager, _worksheet } = this;
const { _rangeList, _commandManager, _worksheet } = this;

const setList = _rangeList.map((range) => {
let { startRow, startColumn, endRow, endColumn } = range;
const { startRow, startColumn, endRow, endColumn } = range;

const sheetMatrix = this._worksheet.getCellMatrix();
const regx = /\s+/g;
let cellValue = new ObjectMatrix<ICellV>();
const cellValue = new ObjectMatrix<ICellV>();
for (let r = startRow; r < endRow + 1; r++) {
for (let c = startColumn; c < endColumn + 1; c++) {
let m = sheetMatrix.getValue(r, c)!.m!;
const m = sheetMatrix.getValue(r, c)!.m!;
const value = m.replace(regx, '');
cellValue.setValue(r, c, value || '');
}
}

let setValue: ISetRangeFormattedValueActionData = {
const setValue: ISetRangeFormattedValueActionData = {
sheetId: _worksheet.getSheetId(),
actionName: ACTION_NAMES.SET_RANGE_FORMATTED_VALUE_ACTION,
cellValue: cellValue.getData(),
Expand All @@ -641,7 +641,7 @@ export class RangeList {
return setValue;
});

let command = new Command(
const command = new Command(
{
WorkBookUnit: this._currentUniverService.getCurrentUniverSheetInstance().getWorkBook(),
},
Expand All @@ -660,10 +660,10 @@ export class RangeList {
* @internal @preapproved
*/
private _setStyle(value: Nullable<number | string | ITextDecoration | BooleanNumber>, type: string) {
let { _rangeList, _commandManager, _worksheet } = this;
const { _rangeList, _commandManager, _worksheet } = this;

const setList = _rangeList.map((range) => {
let { startRow, startColumn, endRow, endColumn } = range;
const { startRow, startColumn, endRow, endColumn } = range;

// string converted to a two-dimensional array
const styleObj: IStyleData = { [type]: value };
Expand All @@ -680,7 +680,7 @@ export class RangeList {
return setStyle;
});

let command = new Command(
const command = new Command(
{
WorkBookUnit: this._currentUniverService.getCurrentUniverSheetInstance().getWorkBook(),
},
Expand Down
Loading