mirror of
https://github.com/dream-num/univer.git
synced 2026-08-29 07:13:59 +08:00
chore: update dependencies (#6655)
This commit is contained in:
@@ -10,3 +10,4 @@ coverage:
|
||||
if_ci_failed: error
|
||||
informational: false
|
||||
only_pulls: false
|
||||
patch: off
|
||||
|
||||
@@ -71,13 +71,13 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"postcss": "^8.5.6",
|
||||
"postcss": "^8.5.8",
|
||||
"react": "18.3.1",
|
||||
"rxjs": "^7.8.2",
|
||||
"tailwindcss": "3.4.18",
|
||||
"typescript": "^5.9.3",
|
||||
"vite": "^7.3.1",
|
||||
"vitest": "^4.0.18",
|
||||
"vue": "^3.5.27"
|
||||
"vue": "^3.5.29"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -73,7 +73,7 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"fs-extra": "^11.3.3",
|
||||
"fs-extra": "^11.3.4",
|
||||
"typescript": "^5.9.3"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@ import type { Rules } from '@antfu/eslint-config';
|
||||
import type { Linter } from 'eslint';
|
||||
import os from 'node:os';
|
||||
import path from 'node:path';
|
||||
import { fixupPluginRules } from '@eslint/compat';
|
||||
import typescriptParser from '@typescript-eslint/parser';
|
||||
import eslintPluginBetterTailwindcss from 'eslint-plugin-better-tailwindcss';
|
||||
import header from 'eslint-plugin-header';
|
||||
@@ -352,7 +353,7 @@ export const penetratingPreset = (): Linter.Config => {
|
||||
// Not penetrating for source files
|
||||
files: ['**/*.ts', '**/*.tsx'],
|
||||
plugins: {
|
||||
penetrating,
|
||||
penetrating: fixupPluginRules(penetrating),
|
||||
},
|
||||
ignores: [
|
||||
'**/__tests__/**/*',
|
||||
@@ -386,7 +387,7 @@ export const noBarrelImportPreset = (): Linter.Config => {
|
||||
'**/*.test.tsx',
|
||||
], // do not check test files
|
||||
plugins: {
|
||||
barrel,
|
||||
barrel: fixupPluginRules(barrel),
|
||||
},
|
||||
rules: {
|
||||
'barrel/no-barrel-import': 2,
|
||||
@@ -415,7 +416,7 @@ export const headerPreset = (): Linter.Config => {
|
||||
'playwright.config.ts',
|
||||
],
|
||||
plugins: {
|
||||
header,
|
||||
header: fixupPluginRules(header),
|
||||
},
|
||||
rules: {
|
||||
'header/header': [
|
||||
|
||||
@@ -15,6 +15,17 @@ function getImportSourceValue(node: Rule.Node): string | null {
|
||||
return source.value;
|
||||
}
|
||||
|
||||
function getRuleFilename(context: Rule.RuleContext): string {
|
||||
const filenameFromProperty = (context as { filename?: unknown }).filename;
|
||||
|
||||
if (typeof filenameFromProperty === 'string' && filenameFromProperty) {
|
||||
return filenameFromProperty;
|
||||
}
|
||||
|
||||
const getFilename = (context as { getFilename?: () => string }).getFilename;
|
||||
return typeof getFilename === 'function' ? getFilename.call(context) : '';
|
||||
}
|
||||
|
||||
const rule: Rule.RuleModule = {
|
||||
meta: {
|
||||
type: 'problem',
|
||||
@@ -27,7 +38,7 @@ const rule: Rule.RuleModule = {
|
||||
},
|
||||
|
||||
create(context) {
|
||||
const filename = context.getFilename();
|
||||
const filename = getRuleFilename(context);
|
||||
const normalizedPath = filename.split(path.sep).join('/');
|
||||
const isFacadeFile = normalizedPath.includes('/facade/');
|
||||
|
||||
|
||||
@@ -39,6 +39,17 @@ function shouldIgnoreFile(normalizedFilePath: string, ignorePaths: readonly unkn
|
||||
});
|
||||
}
|
||||
|
||||
function getRuleFilename(context: Rule.RuleContext): string {
|
||||
const filenameFromProperty = (context as { filename?: unknown }).filename;
|
||||
|
||||
if (typeof filenameFromProperty === 'string' && filenameFromProperty) {
|
||||
return filenameFromProperty;
|
||||
}
|
||||
|
||||
const getFilename = (context as { getFilename?: () => string }).getFilename;
|
||||
return typeof getFilename === 'function' ? getFilename.call(context) : '';
|
||||
}
|
||||
|
||||
const rule: Rule.RuleModule = {
|
||||
meta: {
|
||||
type: 'problem',
|
||||
@@ -65,7 +76,7 @@ const rule: Rule.RuleModule = {
|
||||
},
|
||||
|
||||
create(context) {
|
||||
const filename = context.getFilename();
|
||||
const filename = getRuleFilename(context);
|
||||
const normalizedPath = normalizePath(filename);
|
||||
const [ruleOptions = {} as IRuleOptions] = context.options as [IRuleOptions?];
|
||||
const ignorePaths = Array.isArray(ruleOptions.ignore) ? ruleOptions.ignore : [];
|
||||
|
||||
@@ -15,6 +15,17 @@ function getImportSourceValue(node: Rule.Node): string | null {
|
||||
return source.value;
|
||||
}
|
||||
|
||||
function getRuleFilename(context: Rule.RuleContext): string {
|
||||
const filenameFromProperty = (context as { filename?: unknown }).filename;
|
||||
|
||||
if (typeof filenameFromProperty === 'string' && filenameFromProperty) {
|
||||
return filenameFromProperty;
|
||||
}
|
||||
|
||||
const getFilename = (context as { getFilename?: () => string }).getFilename;
|
||||
return typeof getFilename === 'function' ? getFilename.call(context) : '';
|
||||
}
|
||||
|
||||
const rule: Rule.RuleModule = {
|
||||
meta: {
|
||||
type: 'problem',
|
||||
@@ -27,7 +38,7 @@ const rule: Rule.RuleModule = {
|
||||
},
|
||||
|
||||
create(context) {
|
||||
const filename = context.getFilename();
|
||||
const filename = getRuleFilename(context);
|
||||
const normalizedPath = filename.split(path.sep).join('/');
|
||||
|
||||
const isInPackages = normalizedPath.includes('/packages/');
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
"eslint-plugin-header": "^3.1.1",
|
||||
"eslint-plugin-no-barrel-import": "^0.0.2",
|
||||
"eslint-plugin-no-penetrating-import": "^0.0.1",
|
||||
"fs-extra": "^11.3.3",
|
||||
"fs-extra": "^11.3.4",
|
||||
"happy-dom": "20.7.0",
|
||||
"javascript-obfuscator": "^5.3.0",
|
||||
"postcss-preset-env": "^11.2.0",
|
||||
|
||||
@@ -39,8 +39,8 @@
|
||||
"devDependencies": {
|
||||
"@types/fs-extra": "^11.0.4",
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"fs-extra": "^11.3.3",
|
||||
"postcss": "^8.5.6",
|
||||
"fs-extra": "^11.3.4",
|
||||
"postcss": "^8.5.8",
|
||||
"tailwindcss": "3.4.18",
|
||||
"tailwindcss-animate": "^1.0.7"
|
||||
}
|
||||
|
||||
@@ -22,6 +22,7 @@ export default antfu(
|
||||
indent: 4,
|
||||
semi: true,
|
||||
},
|
||||
e18e: false,
|
||||
regexp: false,
|
||||
react: true,
|
||||
pnpm: false,
|
||||
|
||||
@@ -86,7 +86,7 @@ function monacoBuildTask() {
|
||||
});
|
||||
}
|
||||
|
||||
const define = {
|
||||
const define: Record<string, string> = {
|
||||
'process.env.NODE_ENV': args.watch ? '"development"' : '"production"',
|
||||
'process.env.IS_E2E': isE2E ? 'true' : 'false',
|
||||
};
|
||||
|
||||
@@ -86,6 +86,7 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/fs-extra": "^11.0.4",
|
||||
"@types/minimist": "^1.2.5",
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"detect-port": "^2.1.0",
|
||||
"esbuild": "^0.27.3",
|
||||
@@ -94,9 +95,9 @@
|
||||
"esbuild-plugin-copy": "^2.1.1",
|
||||
"esbuild-plugin-vue3": "^0.5.1",
|
||||
"esbuild-style-plugin": "^1.6.3",
|
||||
"fs-extra": "^11.3.3",
|
||||
"fs-extra": "^11.3.4",
|
||||
"minimist": "^1.2.8",
|
||||
"postcss": "^8.5.6",
|
||||
"postcss": "^8.5.8",
|
||||
"tailwindcss": "3.4.18",
|
||||
"tailwindcss-animate": "^1.0.7",
|
||||
"typescript": "^5.9.3"
|
||||
|
||||
@@ -5,5 +5,6 @@
|
||||
"allowArbitraryExtensions": true,
|
||||
"outDir": "local"
|
||||
},
|
||||
"references": [{ "path": "./tsconfig.node.json" }],
|
||||
"include": ["src"]
|
||||
}
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
{
|
||||
"extends": "@univerjs-infra/shared/tsconfigs/node",
|
||||
"compilerOptions": {
|
||||
"target": "ESNext"
|
||||
},
|
||||
"include": ["esbuild.config.ts", "scripts/**/*.ts"]
|
||||
}
|
||||
+6
-5
@@ -3,7 +3,7 @@
|
||||
"type": "module",
|
||||
"version": "0.16.1",
|
||||
"private": true,
|
||||
"packageManager": "pnpm@10.30.2",
|
||||
"packageManager": "pnpm@10.31.0",
|
||||
"author": "DreamNum Co., Ltd. <developer@univer.ai>",
|
||||
"license": "Apache-2.0",
|
||||
"funding": {
|
||||
@@ -45,10 +45,11 @@
|
||||
"release": "release-it"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@antfu/eslint-config": "^7.2.0",
|
||||
"@antfu/eslint-config": "^7.7.0",
|
||||
"@commitlint/cli": "^20.4.3",
|
||||
"@commitlint/config-conventional": "^20.4.3",
|
||||
"@eslint-react/eslint-plugin": "^2.8.1",
|
||||
"@eslint-react/eslint-plugin": "^2.13.0",
|
||||
"@eslint/compat": "^2.0.3",
|
||||
"@playwright/test": "^1.57.0",
|
||||
"@release-it-plugins/workspaces": "^5.0.3",
|
||||
"@release-it/conventional-changelog": "^10.0.5",
|
||||
@@ -59,8 +60,8 @@
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"@univerjs/design": "workspace:*",
|
||||
"@vitejs/plugin-react": "^5.1.4",
|
||||
"eslint": "9.39.2",
|
||||
"eslint-plugin-format": "^1.4.0",
|
||||
"eslint": "10.0.3",
|
||||
"eslint-plugin-format": "^2.0.1",
|
||||
"eslint-plugin-react": "^7.37.5",
|
||||
"eslint-plugin-react-hooks": "7.0.1",
|
||||
"eslint-plugin-react-refresh": "^0.5.2",
|
||||
|
||||
@@ -90,7 +90,7 @@
|
||||
"@types/react-transition-group": "^4.4.12",
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"@univerjs/core": "workspace:*",
|
||||
"postcss": "^8.5.6",
|
||||
"postcss": "^8.5.8",
|
||||
"react": "18.3.1",
|
||||
"react-dom": "18.3.1",
|
||||
"tailwindcss": "3.4.18",
|
||||
|
||||
@@ -78,7 +78,7 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"postcss": "^8.5.6",
|
||||
"postcss": "^8.5.8",
|
||||
"react": "18.3.1",
|
||||
"rxjs": "^7.8.2",
|
||||
"tailwindcss": "3.4.18",
|
||||
|
||||
@@ -77,7 +77,7 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"postcss": "^8.5.6",
|
||||
"postcss": "^8.5.8",
|
||||
"react": "18.3.1",
|
||||
"rxjs": "^7.8.2",
|
||||
"tailwindcss": "3.4.18",
|
||||
|
||||
@@ -70,7 +70,7 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"postcss": "^8.5.6",
|
||||
"postcss": "^8.5.8",
|
||||
"react": "18.3.1",
|
||||
"rxjs": "^7.8.2",
|
||||
"tailwindcss": "3.4.18",
|
||||
|
||||
@@ -80,7 +80,7 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"postcss": "^8.5.6",
|
||||
"postcss": "^8.5.8",
|
||||
"react": "18.3.1",
|
||||
"rxjs": "^7.8.2",
|
||||
"tailwindcss": "3.4.18",
|
||||
|
||||
@@ -71,7 +71,7 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"postcss": "^8.5.6",
|
||||
"postcss": "^8.5.8",
|
||||
"react": "18.3.1",
|
||||
"rxjs": "^7.8.2",
|
||||
"tailwindcss": "3.4.18",
|
||||
|
||||
@@ -92,7 +92,7 @@
|
||||
"@univerjs/docs-drawing": "workspace:*",
|
||||
"jest-canvas-mock": "^2.5.2",
|
||||
"jsdom": "^27.0.1",
|
||||
"postcss": "^8.5.6",
|
||||
"postcss": "^8.5.8",
|
||||
"react": "18.3.1",
|
||||
"rxjs": "^7.8.2",
|
||||
"tailwindcss": "3.4.18",
|
||||
|
||||
@@ -75,7 +75,7 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"postcss": "^8.5.6",
|
||||
"postcss": "^8.5.8",
|
||||
"react": "18.3.1",
|
||||
"rxjs": "^7.8.2",
|
||||
"tailwindcss": "3.4.18",
|
||||
|
||||
@@ -440,8 +440,7 @@ export class LexerTreeBuilder extends Disposable {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (
|
||||
OPERATOR_TOKEN_SET.has(lastNode)) {
|
||||
if (OPERATOR_TOKEN_SET.has(lastNode)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -1493,8 +1492,7 @@ export class LexerTreeBuilder extends Disposable {
|
||||
this.isDoubleQuotationClose() &&
|
||||
this.isBracesClose() &&
|
||||
this.isSquareBracketClose() &&
|
||||
this._checkIfErrorObject(cur, formulaChars)
|
||||
) {
|
||||
this._checkIfErrorObject(cur, formulaChars)) {
|
||||
const errorType = this._findErrorObject(cur, formulaChars);
|
||||
if (errorType == null) {
|
||||
return ErrorType.VALUE;
|
||||
|
||||
@@ -111,8 +111,7 @@ function isGlyphGroupEndWithWhiteSpaces(glyphGroup: IDocumentSkeletonGlyph[]) {
|
||||
}
|
||||
|
||||
if (isInWhiteSpace &&
|
||||
g.content !== DataStreamTreeTokenType.SPACE && g.content !== DataStreamTreeTokenType.PARAGRAPH && g.streamType !== DataStreamTreeTokenType.SECTION_BREAK
|
||||
) {
|
||||
g.content !== DataStreamTreeTokenType.SPACE && g.content !== DataStreamTreeTokenType.PARAGRAPH && g.streamType !== DataStreamTreeTokenType.SECTION_BREAK) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -176,8 +176,7 @@ function autoClientRect(
|
||||
(nextRefRect.x !== prevRefRect.x ||
|
||||
nextRefRect.y !== prevRefRect.y ||
|
||||
nextRefRect.width !== prevRefRect.width ||
|
||||
nextRefRect.height !== prevRefRect.height)
|
||||
) {
|
||||
nextRefRect.height !== prevRefRect.height)) {
|
||||
update();
|
||||
}
|
||||
|
||||
|
||||
@@ -76,7 +76,7 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"postcss": "^8.5.6",
|
||||
"postcss": "^8.5.8",
|
||||
"react": "18.3.1",
|
||||
"rxjs": "^7.8.2",
|
||||
"tailwindcss": "3.4.18",
|
||||
|
||||
@@ -119,8 +119,7 @@ export class DataSyncPrimaryController extends RxDisposable {
|
||||
// do not sync mutations from the web worker back to the web worker
|
||||
!(options as IRemoteSyncMutationOptions)?.fromSync &&
|
||||
// do not sync mutations those are not meant to be synced
|
||||
this._syncingMutations.has(id)
|
||||
) {
|
||||
this._syncingMutations.has(id)) {
|
||||
this._remoteInstanceService.syncMutation({ mutationInfo: commandInfo as IMutationInfo }, options);
|
||||
}
|
||||
}));
|
||||
|
||||
@@ -82,7 +82,7 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"postcss": "^8.5.6",
|
||||
"postcss": "^8.5.8",
|
||||
"react": "18.3.1",
|
||||
"rxjs": "^7.8.2",
|
||||
"tailwindcss": "3.4.18",
|
||||
|
||||
@@ -87,7 +87,7 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"postcss": "^8.5.6",
|
||||
"postcss": "^8.5.8",
|
||||
"react": "18.3.1",
|
||||
"rxjs": "^7.8.2",
|
||||
"tailwindcss": "3.4.18",
|
||||
|
||||
@@ -84,7 +84,7 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"postcss": "^8.5.6",
|
||||
"postcss": "^8.5.8",
|
||||
"react": "18.3.1",
|
||||
"rxjs": "^7.8.2",
|
||||
"tailwindcss": "3.4.18",
|
||||
|
||||
@@ -91,7 +91,7 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"postcss": "^8.5.6",
|
||||
"postcss": "^8.5.8",
|
||||
"react": "18.3.1",
|
||||
"rxjs": "^7.8.2",
|
||||
"tailwindcss": "3.4.18",
|
||||
|
||||
@@ -79,7 +79,7 @@
|
||||
"devDependencies": {
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"@univerjs/engine-formula": "workspace:*",
|
||||
"postcss": "^8.5.6",
|
||||
"postcss": "^8.5.8",
|
||||
"react": "18.3.1",
|
||||
"rxjs": "^7.8.2",
|
||||
"tailwindcss": "3.4.18",
|
||||
|
||||
@@ -461,14 +461,12 @@ export class SheetsFilterController extends Disposable {
|
||||
// border will change if first col or last col moves.
|
||||
if (startColumn >= fromRange.startColumn && startColumn <= fromRange.endColumn
|
||||
&& toRange.startColumn > fromRange.startColumn
|
||||
&& fromRange.endColumn < endColumn
|
||||
) {
|
||||
&& fromRange.endColumn < endColumn) {
|
||||
startBorder = fromRange.endColumn + 1;
|
||||
}
|
||||
if (endColumn >= fromRange.startColumn && endColumn <= fromRange.endColumn
|
||||
&& toRange.startColumn < fromRange.startColumn
|
||||
&& fromRange.startColumn > startColumn
|
||||
) {
|
||||
&& fromRange.startColumn > startColumn) {
|
||||
endBorder = fromRange.startColumn - 1;
|
||||
}
|
||||
|
||||
@@ -562,8 +560,7 @@ export class SheetsFilterController extends Disposable {
|
||||
// only need to deal with endBorder, startRow will not be moved.
|
||||
if (endRow >= fromRange.startRow && endRow <= fromRange.endRow
|
||||
&& toRange.startRow < fromRange.startRow
|
||||
&& fromRange.startRow > startRow
|
||||
) {
|
||||
&& fromRange.startRow > startRow) {
|
||||
endBorder = fromRange.startRow - 1;
|
||||
}
|
||||
|
||||
|
||||
@@ -92,7 +92,7 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"postcss": "^8.5.6",
|
||||
"postcss": "^8.5.8",
|
||||
"react": "18.3.1",
|
||||
"rxjs": "^7.8.2",
|
||||
"tailwindcss": "3.4.18",
|
||||
|
||||
@@ -154,8 +154,7 @@ export class FormulaEditorShowController extends Disposable implements IRenderMo
|
||||
|
||||
private _commandExecutedListener(): void {
|
||||
this.disposeWithMe(this._commandService.onCommandExecuted((command: ICommandInfo, options) => {
|
||||
if (command.id === SetFormulaCalculationResultMutation.id || (command.id === SetArrayFormulaDataMutation.id && options && options.remove)
|
||||
) {
|
||||
if (command.id === SetFormulaCalculationResultMutation.id || (command.id === SetArrayFormulaDataMutation.id && options && options.remove)) {
|
||||
this._removeArrayFormulaRangeShape();
|
||||
}
|
||||
}));
|
||||
|
||||
@@ -95,7 +95,7 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"postcss": "^8.5.6",
|
||||
"postcss": "^8.5.8",
|
||||
"react": "18.3.1",
|
||||
"rxjs": "^7.8.2",
|
||||
"tailwindcss": "3.4.18",
|
||||
|
||||
@@ -75,7 +75,7 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"postcss": "^8.5.6",
|
||||
"postcss": "^8.5.8",
|
||||
"react": "18.3.1",
|
||||
"rxjs": "^7.8.2",
|
||||
"tailwindcss": "3.4.18",
|
||||
|
||||
@@ -80,7 +80,7 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"postcss": "^8.5.6",
|
||||
"postcss": "^8.5.8",
|
||||
"react": "18.3.1",
|
||||
"rxjs": "^7.8.2",
|
||||
"tailwindcss": "3.4.18",
|
||||
|
||||
@@ -78,7 +78,7 @@
|
||||
"devDependencies": {
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"@univerjs/sheets-formula-ui": "workspace:*",
|
||||
"postcss": "^8.5.6",
|
||||
"postcss": "^8.5.8",
|
||||
"react": "18.3.1",
|
||||
"rxjs": "^7.8.2",
|
||||
"tailwindcss": "3.4.18",
|
||||
|
||||
@@ -85,7 +85,7 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"postcss": "^8.5.6",
|
||||
"postcss": "^8.5.8",
|
||||
"react": "18.3.1",
|
||||
"rxjs": "^7.8.2",
|
||||
"tailwindcss": "3.4.18",
|
||||
|
||||
@@ -347,7 +347,8 @@ export function getInitConditionInfo(tableFilter?: ITableFilterItem) {
|
||||
dateRange,
|
||||
},
|
||||
};
|
||||
} else if (compareType === TableDateCompareTypeEnum.Today
|
||||
} else if (
|
||||
compareType === TableDateCompareTypeEnum.Today
|
||||
|| compareType === TableDateCompareTypeEnum.Yesterday
|
||||
|| compareType === TableDateCompareTypeEnum.Tomorrow
|
||||
|| compareType === TableDateCompareTypeEnum.ThisWeek
|
||||
|
||||
@@ -79,7 +79,7 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"postcss": "^8.5.6",
|
||||
"postcss": "^8.5.8",
|
||||
"react": "18.3.1",
|
||||
"rxjs": "^7.8.2",
|
||||
"tailwindcss": "3.4.18",
|
||||
|
||||
@@ -94,7 +94,7 @@
|
||||
"devDependencies": {
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"@univerjs/themes": "workspace:*",
|
||||
"postcss": "^8.5.6",
|
||||
"postcss": "^8.5.8",
|
||||
"react": "18.3.1",
|
||||
"rxjs": "^7.8.2",
|
||||
"tailwindcss": "3.4.18",
|
||||
|
||||
@@ -115,7 +115,8 @@ export class AutoFillUIController extends Disposable {
|
||||
const fromCollab = options?.fromCollab;
|
||||
const fromSync = options?.fromSync;
|
||||
const fromFormula = options?.fromFormula;
|
||||
if (quitCommands.includes(command.id)
|
||||
if (
|
||||
quitCommands.includes(command.id)
|
||||
&& !fromCollab
|
||||
&& !fromSync
|
||||
&& !fromFormula
|
||||
|
||||
@@ -387,8 +387,7 @@ export class EditingRenderController extends Disposable {
|
||||
* but move the cursor within the editor instead.
|
||||
*/
|
||||
if (keycode != null &&
|
||||
(this._cursorChange === CursorChange.CursorChange || this._contextService.getContextValue(FOCUSING_FX_BAR_EDITOR))
|
||||
) {
|
||||
(this._cursorChange === CursorChange.CursorChange || this._contextService.getContextValue(FOCUSING_FX_BAR_EDITOR))) {
|
||||
this._moveInEditor(keycode, isShift);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -91,7 +91,7 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"postcss": "^8.5.6",
|
||||
"postcss": "^8.5.8",
|
||||
"react": "18.3.1",
|
||||
"rxjs": "^7.8.2",
|
||||
"tailwindcss": "3.4.18",
|
||||
|
||||
@@ -80,7 +80,7 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"postcss": "^8.5.6",
|
||||
"postcss": "^8.5.8",
|
||||
"react": "18.3.1",
|
||||
"rxjs": "^7.8.2",
|
||||
"tailwindcss": "3.4.18",
|
||||
|
||||
@@ -721,8 +721,7 @@ export class SlideEditingRenderController extends Disposable implements IRenderM
|
||||
* the up, down, left, and right keys can no longer switch editing cells,
|
||||
* but move the cursor within the editor instead.
|
||||
*/
|
||||
if (keycode != null && this._cursorChange === CursorChange.CursorChange
|
||||
) {
|
||||
if (keycode != null && this._cursorChange === CursorChange.CursorChange) {
|
||||
this._moveInEditor(keycode, isShift);
|
||||
} else {
|
||||
// TODO @Jocs: After we merging editor related controllers, this seems verbose.
|
||||
|
||||
@@ -75,7 +75,7 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"postcss": "^8.5.6",
|
||||
"postcss": "^8.5.8",
|
||||
"react": "18.3.1",
|
||||
"rxjs": "^7.8.2",
|
||||
"tailwindcss": "3.4.18",
|
||||
|
||||
@@ -69,6 +69,6 @@
|
||||
"typescript": "^5.9.3",
|
||||
"vite": "^7.3.1",
|
||||
"vitest": "^4.0.18",
|
||||
"vue": "^3.5.27"
|
||||
"vue": "^3.5.29"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -91,7 +91,7 @@
|
||||
"@testing-library/react": "^16.3.2",
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"@univerjs/themes": "workspace:*",
|
||||
"postcss": "^8.5.6",
|
||||
"postcss": "^8.5.8",
|
||||
"react": "18.3.1",
|
||||
"react-dom": "18.3.1",
|
||||
"rxjs": "^7.8.2",
|
||||
|
||||
@@ -78,7 +78,7 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"@univerjs-infra/shared": "workspace:*",
|
||||
"postcss": "^8.5.6",
|
||||
"postcss": "^8.5.8",
|
||||
"react": "18.3.1",
|
||||
"rxjs": "^7.8.2",
|
||||
"tailwindcss": "3.4.18",
|
||||
|
||||
Generated
+1083
-1100
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user