@opensumi/ide-file-tree-next 3.7.1 → 3.7.2-next-1739859371.0

package/src/browser/dialog/file-dialog.view.tsx

@@ -42,6 +42,7 @@ export const FileDialog = ({
   const [isReady, setIsReady] = useState<boolean>(false);
   const [selectPath, setSelectPath] = useState<string>('');
   const [directoryList, setDirectoryList] = useState<string[]>([]);
+  const currentSaveFileName = useRef<string>((options as ISaveDialogOptions).defaultFileName || '');
 
   useEffect(() => {
     if (model) {
@@ -56,7 +57,8 @@ export const FileDialog = ({
 
   useEffect(() => {
     if ((options as ISaveDialogOptions).defaultFileName) {
-      setFileName((options as ISaveDialogOptions).defaultFileName!);
+      setFileName((options as ISaveDialogOptions).defaultFileName || '');
+      currentSaveFileName.current = (options as ISaveDialogOptions).defaultFileName || '';
     }
   }, [options]);
 
@@ -70,19 +72,25 @@ export const FileDialog = ({
   const ensure = useCallback(() => {
     const value: string[] = model.selectedFiles.map((file) => file.uri.path.toString());
     // 如果有文件名的，说明肯定是保存文件的情况
-    if (fileName && (options as ISaveDialogOptions).showNameInput && (value?.length === 1 || options.defaultUri)) {
+    if (
+      currentSaveFileName.current &&
+      (options as ISaveDialogOptions).showNameInput &&
+      (value?.length === 1 || options.defaultUri)
+    ) {
       const filePath = value?.length === 1 ? value[0] : options.defaultUri!.path.toString();
       if ((options as ISaveDialogOptions & { saveAs?: boolean | undefined })?.saveAs) {
         fileService.saveAs({
           oldFilePath: path.join(filePath!, (options as ISaveDialogOptions)?.defaultFileName || ''),
-          newFilePath: path.join(filePath!, fileName),
+          newFilePath: path.join(filePath!, currentSaveFileName.current),
         });
       }
 
-      dialogService.hide([path.join(filePath!, fileName)]);
+      dialogService.hide([path.join(filePath!, currentSaveFileName.current)]);
     } else {
       if (value.length > 0) {
         dialogService.hide(value);
+      } else if (selectPath) {
+        dialogService.hide([selectPath]);
       } else if (options.defaultUri) {
         dialogService.hide([options.defaultUri!.path.toString()]);
       } else if (model.treeModel && model.treeModel.root) {
@@ -93,7 +101,17 @@ export const FileDialog = ({
     }
     setIsReady(false);
     fileService.contextKey.fileDialogViewVisibleContext.set(false);
-  }, [isReady, dialogService, model, fileName, options]);
+  }, [isReady, dialogService, model, options, selectPath]);
+
+  const getDefaultPath = async (model) => {
+    let defaultPath = (model.treeModel.root as Directory).uri.codeUri.fsPath;
+
+    if (fileService.getDefaultFilePath) {
+      defaultPath = await fileService.getDefaultFilePath(model, defaultPath);
+    }
+
+    return defaultPath;
+  };
 
   const close = useCallback(() => {
     setIsReady(false);
@@ -106,7 +124,9 @@ export const FileDialog = ({
     // 确保数据初始化完毕，减少初始化数据过程中多次刷新视图
     // 这里需要重新取一下treeModel的值确保为最新的TreeModel
     await model.treeModel.ensureReady;
-    setSelectPath((model.treeModel.root as Directory).uri.codeUri.fsPath);
+    const path = await getDefaultPath(model);
+
+    setSelectPath(path);
     setIsReady(true);
   }, [model, selectPath, isReady]);
 
@@ -201,6 +221,24 @@ export const FileDialog = ({
     [model, isReady, selectPath],
   );
 
+  const onSearchChangeHandler = useCallback(
+    async (value: string) => {
+      setIsReady(false);
+      setSelectPath(value);
+      await model.updateTreeModel(value);
+      setIsReady(true);
+    },
+    [model, isReady, selectPath, directoryList],
+  );
+
+  const renderCustomMsg = useCallback(() => {
+    if (fileService.renderCustomMsg) {
+      return fileService.renderCustomMsg();
+    } else {
+      return null;
+    }
+  }, [fileService.renderCustomMsg]);
+
   const renderDialogTreeNode = useCallback(
     (props: INodeRendererProps) => (
       <FileTreeDialogNode
@@ -234,10 +272,23 @@ export const FileDialog = ({
     }
   }, [isReady, model]);
 
+  const showFilePathSearch = useMemo(
+    () => (fileService.showFilePathSearch === false ? false : true),
+    [fileService.showFilePathSearch],
+  );
+
   const renderDirectorySelection = useCallback(() => {
     if (directoryList.length > 0) {
       return (
-        <Select onChange={onRootChangeHandler} className={styles.select_control} size={'small'} value={selectPath}>
+        <Select
+          onChange={onRootChangeHandler}
+          onSearchChange={onSearchChangeHandler}
+          className={styles.select_control}
+          size='large'
+          searchPlaceholder={selectPath}
+          value={selectPath}
+          showSearch={showFilePathSearch}
+        >
           {directoryList.map((item, idx) => (
             <Option value={item} key={`${idx} - ${item}`}>
               {item}
@@ -273,6 +324,7 @@ export const FileDialog = ({
   const DialogContent = useMemo(
     () => (
       <>
+        {renderCustomMsg()}
         <div className={styles.file_dialog_directory}>{renderDirectorySelection()}</div>
         <div className={styles.file_dialog_content}>{renderDialogTree()}</div>
       </>
@@ -283,7 +335,7 @@ export const FileDialog = ({
   const DialogButtons = useMemo(
     () => (
       <div className={styles.file_dialog_buttons}>
-        <Button onClick={close} type='secondary' className={styles.button}>
+        <Button onClick={close} type='ghost' className={styles.button}>
           {localize('dialog.file.close')}
         </Button>
         <Button
@@ -301,6 +353,14 @@ export const FileDialog = ({
     [close, ensure, isSaveDialog, isOpenDialog, fileName, options],
   );
 
+  const handleSaveInputChange = useCallback(
+    (event: React.ChangeEvent<HTMLInputElement>) => {
+      setFileName(event.target.value);
+      currentSaveFileName.current = event.target.value;
+    },
+    [fileName],
+  );
+
   return (
     <div className={styles.file_dialog_wrapper} ref={wrapperRef}>
       <div className={styles.file_dialog_directory_title}>
@@ -319,7 +379,7 @@ export const FileDialog = ({
             value={fileName}
             autoFocus={true}
             selection={{ start: 0, end: fileName.indexOf('.') || fileName.length }}
-            onChange={(event) => setFileName(event.target.value)}
+            onChange={handleSaveInputChange}
           />
         </div>
       )}

package/src/browser/file-tree-contribution.ts

@@ -50,6 +50,7 @@ import { EXPLORER_CONTAINER_ID } from '@opensumi/ide-explorer/lib/browser/explor
 import { IMainLayoutService, IViewsRegistry, MainLayoutContribution } from '@opensumi/ide-main-layout';
 import { ViewContentGroups } from '@opensumi/ide-main-layout/lib/browser/views-registry';
 import { IOpenDialogOptions, ISaveDialogOptions, IWindowDialogService } from '@opensumi/ide-overlay';
+import { Path } from '@opensumi/ide-utils/lib/path';
 import { IWorkspaceService, UNTITLED_WORKSPACE } from '@opensumi/ide-workspace';
 
 import { IFileTreeService, PasteTypes, RESOURCE_VIEW_ID } from '../common';
@@ -778,9 +779,15 @@ export class FileTreeContribution
         }
         if (uri.scheme === DIFF_SCHEME) {
           const query = uri.getParsedQuery();
-          // 需要file scheme才能与工作区计算相对路径
           uri = new URI(query.modified).withScheme('file');
         }
+        const node = this.fileTreeService.getNodeByPathOrUri(uri);
+        if (node) {
+          if (node.filestat.isInSymbolicDirectory) {
+            // 软链接文件需要通过直接通过文件树 Path 获取
+            return await this.clipboardService.writeText(node.path.split(Path.separator).slice(2).join(Path.separator));
+          }
+        }
         let rootUri: URI;
         if (this.fileTreeService.isMultipleWorkspace) {
           // 多工作区额外处理

package/src/browser/services/file-tree-api.service.ts

@@ -1,7 +1,7 @@
 import { Autowired, Injectable } from '@opensumi/di';
 import { ITree } from '@opensumi/ide-components';
 import { CorePreferences, EDITOR_COMMANDS } from '@opensumi/ide-core-browser';
-import { CommandService, URI, formatLocalize, localize, path } from '@opensumi/ide-core-common';
+import { CommandService, Emitter, Event, URI, formatLocalize, localize, path } from '@opensumi/ide-core-common';
 import { FileStat } from '@opensumi/ide-file-service';
 import { IFileServiceClient } from '@opensumi/ide-file-service/lib/common';
 import { IDialogService } from '@opensumi/ide-overlay';
@@ -12,6 +12,9 @@ import { Directory, File } from '../../common/file-tree-node.define';
 
 @Injectable()
 export class FileTreeAPI implements IFileTreeAPI {
+  private readonly onDidResolveChildrenEmitter: Emitter<string> = new Emitter();
+  onDidResolveChildren: Event<string> = this.onDidResolveChildrenEmitter.event;
+
   @Autowired(IFileServiceClient)
   protected fileServiceClient: IFileServiceClient;
 
@@ -26,7 +29,6 @@ export class FileTreeAPI implements IFileTreeAPI {
 
   @Autowired(IDialogService)
   private readonly dialogService: IDialogService;
-  private cacheFileStat: Map<string, FileStat> = new Map();
 
   private userhomePath: URI;
 
@@ -45,6 +47,7 @@ export class FileTreeAPI implements IFileTreeAPI {
     }
 
     if (file) {
+      this.onDidResolveChildrenEmitter.fire(file.uri.toString());
       if (file.children?.length === 1 && file.children[0].isDirectory && compact) {
         return await this.resolveChildren(tree, file.children[0].uri, parent, compact);
       } else {

package/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<small>${localize('file.confirm.deleteTips')}</small>`;
+      }
+      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);
         }
       }

package/src/common/index.ts

@@ -1,5 +1,5 @@
 import { ITree, ITreeNode } from '@opensumi/ide-components';
-import { BasicEvent, IDisposable, URI } from '@opensumi/ide-core-common';
+import { BasicEvent, Event, IDisposable, URI } from '@opensumi/ide-core-common';
 import { FileStat } from '@opensumi/ide-file-service';
 
 import { Directory, File } from './file-tree-node.define';
@@ -19,6 +19,8 @@ export interface IMoveFileMetadata {
 }
 
 export interface IFileTreeAPI {
+  onDidResolveChildren: Event<string>;
+
   copyFile(from: URI, to: URI): Promise<FileStat | string | void>;
   createFile(newUri: URI, content?: string): Promise<string | void>;
   createDirectory(newUri: URI): Promise<string | void>;