From e62cdfcb0a0e46215160825b6d73ebafde41a92e Mon Sep 17 00:00:00 2001
From: wcj <wuchengjun5@huawei.com>
Date: Wed, 10 Sep 2025 21:26:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A40728=E5=88=86=E6=94=AF?=
 =?UTF-8?q?=E4=B8=8A=E4=B8=8D=E4=BD=BF=E7=94=A8=E7=9A=84=E9=87=8D=E8=BD=BD?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: wuchengjun <wuchengjun5@huawei.com>
Change-Id: I02c8105326c12cf066b4576ce41becc90dcb2300
---
 api/@ohos.file.fs.d.ets    | 78 --------------------------------------
 kits/@kit.CoreFileKit.d.ts |  4 +-
 2 files changed, 2 insertions(+), 80 deletions(-)

diff --git a/api/@ohos.file.fs.d.ets b/api/@ohos.file.fs.d.ets
index 1525dbedaa..bf36ef13c4 100644
--- a/api/@ohos.file.fs.d.ets
+++ b/api/@ohos.file.fs.d.ets
@@ -455,18 +455,6 @@ function copyDir(src: string, dest: string, mode?: int): Promise<void>;
  */
 function copyDir(src: string, dest: string, callback: AsyncCallback<void>): void;
 
-/**
- * Copy directory.
- *
- * @param { string } src - source path.
- * @param { string } dest - destination path.
- * @param { AsyncCallback<void, Array<ConflictFiles>> } callback - Return the callback function.
- * @throws { BusinessError } 13900015 - File exists
- * @syscap SystemCapability.FileManagement.File.FileIO
- * @since 20
- */
-function copyDir(src: string, dest: string, callback: AsyncCallback<void, Array<ConflictFiles>>): void;
-
 /**
  * Copy directory.
  *
@@ -496,19 +484,6 @@ function copyDir(src: string, dest: string, callback: AsyncCallback<void, Array<
  */
 function copyDir(src: string, dest: string, mode: int, callback: AsyncCallback<void>): void;
 
-/**
- * Copy directory.
- *
- * @param { string } src - source path.
- * @param { string } dest - destination path.
- * @param { int } mode - mode.
- * @param { AsyncCallback<void, Array<ConflictFiles>> } callback - Return the callback function.
- * @throws { BusinessError } 13900015 - File exists
- * @syscap SystemCapability.FileManagement.File.FileIO
- * @since 20
- */
-function copyDir(src: string, dest: string, mode: int, callback: AsyncCallback<void, Array<ConflictFiles>>): void;
-
 /**
  * Copy directory with sync interface.
  *
@@ -1677,18 +1652,6 @@ function moveDir(src: string, dest: string, mode?: int): Promise<void>;
  */
 function moveDir(src: string, dest: string, callback: AsyncCallback<void>): void;
 
-/**
- * Move directory.
- *
- * @param { string } src - source file path.
- * @param { string } dest - destination file path.
- * @param { AsyncCallback<void, Array<ConflictFiles>> } callback - Return the callback function.
- * @throws { BusinessError } 13900015 - File exists
- * @syscap SystemCapability.FileManagement.File.FileIO
- * @since 20
- */
-function moveDir(src: string, dest: string, callback: AsyncCallback<void, Array<ConflictFiles>>): void;
-
 /**
  * Move directory.
  *
@@ -1719,19 +1682,6 @@ function moveDir(src: string, dest: string, callback: AsyncCallback<void, Array<
  */
 function moveDir(src: string, dest: string, mode: int, callback: AsyncCallback<void>): void;
 
-/**
- * Move directory.
- *
- * @param { string } src - source file path.
- * @param { string } dest - destination file path.
- * @param { int } mode - move mode when duplicate file name exists.
- * @param { AsyncCallback<void, Array<ConflictFiles>> } callback - Return the callback function.
- * @throws { BusinessError } 13900015 - File exists
- * @syscap SystemCapability.FileManagement.File.FileIO
- * @since 20
- */
-function moveDir(src: string, dest: string, mode: int, callback: AsyncCallback<void, Array<ConflictFiles>>): void;
-
 /**
  * Move directory with sync interface.
  *
@@ -4626,34 +4576,6 @@ export interface Filter {
   excludeMedia?: boolean;
 }
 
-/**
- * Conflict Files type
- *
- * @interface ConflictFiles
- * @syscap SystemCapability.FileManagement.File.FileIO
- * @since 20
- */
-export interface ConflictFiles {
-
-  /**
-   * The path of the source file.
-   * 
-   * @type { string }
-   * @syscap SystemCapability.FileManagement.File.FileIO
-   * @since 20
-   */
-  srcFile: string;
-
-  /**
-   * The path of the destination file.
-   * 
-   * @type { string }
-   * @syscap SystemCapability.FileManagement.File.FileIO
-   * @since 20
-   */
-  destFile: string;
-}
-
 /**
  * Options type
  *
diff --git a/kits/@kit.CoreFileKit.d.ts b/kits/@kit.CoreFileKit.d.ts
index 5d94583f07..a5a432a6d3 100644
--- a/kits/@kit.CoreFileKit.d.ts
+++ b/kits/@kit.CoreFileKit.d.ts
@@ -61,7 +61,7 @@ import Environment from '@ohos.file.environment';
 import fileUri from '@ohos.file.fileuri';
 import fileIo from '@ohos.file.fs'
 import {
-  ConflictFiles, Filter, Options, ReaderIteratorResult, WatchEvent, WatchEventListener,
+  Filter, Options, ReaderIteratorResult, WatchEvent, WatchEventListener,
   Watcher, ReadOptions, ReadTextOptions, WriteOptions, ListFileOptions, DfsListeners, TaskSignal
 } from '@ohos.file.fs';
 import hash from '@ohos.file.hash';
@@ -73,7 +73,7 @@ import keyManager from '@ohos.file.keyManager';
 import fileShare from '@ohos.fileshare';
 
 export {
-  BackupExtensionAbility, BundleVersion, ConflictFiles, Environment, Filter, Options, ReaderIteratorResult,
+  BackupExtensionAbility, BundleVersion, Environment, Filter, Options, ReaderIteratorResult,
   WatchEvent, WatchEventListener, Watcher, ReadOptions, ReadTextOptions, WriteOptions, ListFileOptions,
   cloudSync, cloudSyncManager, fileIo, fileShare, fileUri, hash, securityLabel, statfs,
   storageStatistics, volumeManager, keyManager, DfsListeners, TaskSignal
-- 
Gitee