diff --git a/packages/components/src/style/base.less b/packages/components/src/style/base.less index 16e4c07293..3d5a0ffceb 100644 --- a/packages/components/src/style/base.less +++ b/packages/components/src/style/base.less @@ -115,7 +115,7 @@ h5, h6 { margin-top: 0; margin-bottom: 0.5em; - color: @heading-color; + color: inherit; font-weight: 500; } diff --git a/packages/design/src/browser/style/design.module.less b/packages/design/src/browser/style/design.module.less index 5660a995ff..8eda71bfa4 100644 --- a/packages/design/src/browser/style/design.module.less +++ b/packages/design/src/browser/style/design.module.less @@ -596,6 +596,12 @@ margin: 0 5px; } + [role='treeitem'] { + [class*='mod_actived__'] { + outline: 1px solid var(--kt-tree-inactiveSelectionBackground); + } + } + .design-kt_split_panel { padding-bottom: 8px; diff --git a/packages/file-tree-next/src/browser/services/file-tree-model.service.ts b/packages/file-tree-next/src/browser/services/file-tree-model.service.ts index f29477bde1..ac0a02fc33 100644 --- a/packages/file-tree-next/src/browser/services/file-tree-model.service.ts +++ b/packages/file-tree-next/src/browser/services/file-tree-model.service.ts @@ -23,6 +23,7 @@ import { IClipboardService, IContextKey, IStorage, + MessageType, STORAGE_NAMESPACE, StorageProvider, ThrottledDelayer, @@ -30,9 +31,11 @@ import { URI, arrays, formatLocalize, + isLinux, localize, path, strings, + toMarkdown, } from '@opensumi/ide-core-browser'; import { ResourceContextKey } from '@opensumi/ide-core-browser/lib/contextkey/resource'; import { AbstractContextMenuService, ICtxMenuRenderer, MenuId } from '@opensumi/ide-core-browser/lib/menu/next'; @@ -725,6 +728,10 @@ export class FileTreeModelService { }; handleItemRangeClick = (item: File | Directory, type: TreeNodeType) => { + // 由于文件树存在选择根目录的逻辑，使用 Shift+Click 时需要清理根目录选中态 + if (this.selectedFiles.length === 1 && Directory.isRoot(this.selectedFiles[0])) { + this.clearFileSelectedDecoration(); + } if (!this.focusedFile) { this.handleItemClick(item, type); } else if (this.focusedFile && this.focusedFile !== item) { @@ -744,7 +751,10 @@ export class FileTreeModelService { if (type !== TreeNodeType.CompositeTreeNode && type !== TreeNodeType.TreeNode) { return; } - + // 由于文件树存在选择根目录的逻辑，使用 Cmd/Ctrl+Click 时需要清理根目录选中态 + if (this.selectedFiles.length === 1 && Directory.isRoot(this.selectedFiles[0])) { + this.clearFileSelectedDecoration(); + } // 根据节点的选中态进行复选操作 this.toggleFileSelectedDecoration(item); }; @@ -977,18 +987,29 @@ export class FileTreeModelService { if (uris.length === 0) { return; } + // 默认过滤掉根目录的选择 if (this.corePreferences['explorer.confirmDelete']) { - const ok = localize('file.confirm.delete.ok'); + const ok = isLinux ? localize('file.confirm.delete.ok') : localize('file.confirm.moveToTrash.ok'); const cancel = localize('file.confirm.delete.cancel'); - const deleteFilesMessage = `[ ${uris - .slice(0, 5) + const MAX_FILES = 10; + let deleteFilesMessage = uris + .slice(0, MAX_FILES) .map((uri) => uri.displayName) - .join(',')}${uris.length > 5 ? ' ...' : ''} ]`; - - const confirm = await this.dialogService.warning(formatLocalize('file.confirm.delete', deleteFilesMessage), [ - cancel, - ok, - ]); + .join(' \n'); + if (uris.length > MAX_FILES) { + deleteFilesMessage += ' \n...'; + } + if (!isLinux) { + deleteFilesMessage += `\n\n${localize('file.confirm.deleteTips')}`; + } + const confirm = await this.dialogService.open({ + message: toMarkdown(formatLocalize('file.confirm.delete', uris.length, deleteFilesMessage)), + type: MessageType.Warning, + props: { + width: 580, + }, + buttons: [cancel, ok], + }); if (confirm !== ok) { return; } @@ -1709,7 +1730,8 @@ export class FileTreeModelService { this._nextLocationTarget = undefined; } }; - selectChildNode(uris: URI[]) { + + public selectChildNode(uris: URI[]) { for (const uri of uris) { const file = this.fileTreeService.getNodeByPathOrUri(uri); @@ -1721,7 +1743,7 @@ export class FileTreeModelService { const last = children[children.length - 1]; const firstIndex = this.treeModel.root.getIndexAtTreeNode(first); const lastIndex = this.treeModel.root.getIndexAtTreeNode(last); - + this._isMultiSelected = true; this.activeFileDecorationByRange(firstIndex, lastIndex); } } diff --git a/packages/i18n/src/common/en-US.lang.ts b/packages/i18n/src/common/en-US.lang.ts index b146abe17c..88a9036880 100644 --- a/packages/i18n/src/common/en-US.lang.ts +++ b/packages/i18n/src/common/en-US.lang.ts @@ -51,8 +51,10 @@ export const localizationBundle = { 'file.open.folder': 'Open Folder', 'file.open.workspace': 'Open Workspace from File ...', 'file.action.collapse': 'Collapse', - 'file.confirm.delete': 'Are you sure you want to delete the following files?\n{0}', - 'file.confirm.delete.ok': 'Move to trash', + 'file.confirm.delete': '### Are you sure you want to delete the following {0} files? \n{1}', + 'file.confirm.deleteTips': 'You can restore files from the Trash', + 'file.confirm.moveToTrash.ok': 'Move to trash', + 'file.confirm.delete.ok': 'Delete', 'file.confirm.delete.cancel': 'Cancel', 'file.confirm.move': 'Are you sure you want to move file {0} to {1}?', 'file.confirm.move.ok': 'Move', diff --git a/packages/i18n/src/common/zh-CN.lang.ts b/packages/i18n/src/common/zh-CN.lang.ts index 01f0c1ea45..6f948a44b2 100644 --- a/packages/i18n/src/common/zh-CN.lang.ts +++ b/packages/i18n/src/common/zh-CN.lang.ts @@ -52,8 +52,10 @@ export const localizationBundle = { 'file.location': '在文件树中定位', 'file.open.folder': '打开文件夹', 'file.open.workspace': '从文件打开工作区', - 'file.confirm.delete': '确定删除下面列的文件?\n{0}', - 'file.confirm.delete.ok': '移入回收站', + 'file.confirm.delete': '###确定从工作区删除下面的 {0} 个文件? \n{1}', + 'file.confirm.deleteTips': '你可以从回收站还原文件', + 'file.confirm.moveToTrash.ok': '移入回收站', + 'file.confirm.delete.ok': '删除', 'file.confirm.delete.cancel': '取消', 'file.confirm.move': '确定移动文件 {0} 到 {1} ?', 'file.confirm.move.ok': '移动',