feat(addDialog): add action type selection for copying or moving books

troyeguo · troyeguo · commit 4e309c3f58d1 · 2025-10-31T16:17:12.000+08:00
diff --git a/main.js b/main.js
@@ -374,7 +374,10 @@ const createMainWin = () => {
       if (isPreventSleep && !readerWindow.isDestroyed()) {
         id && powerSaveBlocker.stop(id);
       }
-      mainWin.webContents.send('reading-finished', {});
+      if (mainWin && !mainWin.isDestroyed()) {
+        mainWin.webContents.send('reading-finished', {});
+      }
+
     });
 
 
diff --git a/src/assets/locales/zh-CN/translation.json b/src/assets/locales/zh-CN/translation.json
@@ -256,6 +256,9 @@
   "Language auto-detection may not be accurate. Please try selecting the source language manually": "语言自动检测可能不够准确，请尝试手动选择源语言",
   "Minute": "分钟",
   "Empty": "这里什么都没有",
+  "Action": "动作",
+  "Copy to": "复制到",
+  "Move to": "移动到",
   "Next chapter": "下一章",
   "Previous chapter": "上一章",
   "Less": "收起",
diff --git a/src/components/dialogs/addDialog/addDialog.css b/src/components/dialogs/addDialog/addDialog.css
@@ -16,17 +16,16 @@
   opacity: 1;
   width: 100%;
   text-align: center;
-  position: absolute;
-  top: 22px;
   font-weight: 500;
+  margin-top: 15px;
 }
 .add-dialog-shelf-list-container {
   width: 100%;
   font-size: 15px;
   line-height: 14px;
   opacity: 1;
-  position: absolute;
-  top: 55px;
+  margin-top: 15px;
+  height: 30px;
 }
 .add-dialog-shelf-list-text {
   width: 50px;
@@ -55,14 +54,6 @@
   cursor: pointer;
   text-align: left;
 }
-.add-dialog-new-shelf-container {
-  width: 100%;
-  font-size: 15px;
-  line-height: 14px;
-  opacity: 1;
-  position: absolute;
-  top: 95px;
-}
 .add-dialog-new-shelf-text {
   width: 50px;
   float: left;
diff --git a/src/components/dialogs/addDialog/component.tsx b/src/components/dialogs/addDialog/component.tsx
@@ -8,7 +8,7 @@ import { ConfigService } from "../../../assets/lib/kookit-extra-browser.min";
 class AddDialog extends Component<AddDialogProps, AddDialogState> {
   constructor(props: AddDialogProps) {
     super(props);
-    this.state = { isNew: true, shelfTitle: "" };
+    this.state = { isNew: true, shelfTitle: "", actionType: "copy" };
   }
 
   handleCancel = () => {
@@ -43,13 +43,29 @@ class AddDialog extends Component<AddDialogProps, AddDialogState> {
     }
     if (this.props.isSelectBook) {
       this.props.selectedBooks.forEach((item) => {
+        if (this.state.actionType === "move") {
+          ConfigService.deleteFromMapConfig(
+            this.props.shelfTitle,
+            item,
+            "shelfList"
+          );
+        }
         ConfigService.setMapConfig(shelfTitle, item, "shelfList");
       });
       this.props.handleSelectBook(!this.props.isSelectBook);
       if (this.props.isSelectBook) {
         this.props.handleSelectedBooks([]);
       }
     } else {
+      console.log(this.state.actionType, "actionType");
+      if (this.state.actionType === "move") {
+        ConfigService.deleteFromMapConfig(
+          this.props.shelfTitle,
+          this.props.currentBook.key,
+          "shelfList"
+        );
+      }
+
       ConfigService.setMapConfig(
         shelfTitle,
         this.props.currentBook.key,
@@ -90,10 +106,33 @@ class AddDialog extends Component<AddDialogProps, AddDialogState> {
       });
     };
     return (
-      <div className="add-dialog-container">
+      <div
+        className="add-dialog-container"
+        style={{ height: this.props.mode === "shelf" ? "240px" : "189px" }}
+      >
         <div className="add-dialog-title">
           <Trans>Add to shelf</Trans>
         </div>
+        {this.props.mode === "shelf" && (
+          <div className="add-dialog-shelf-list-container">
+            <div className="add-dialog-shelf-list-text">
+              <Trans>Action</Trans>
+            </div>
+            <select
+              className="add-dialog-shelf-list-box"
+              onChange={(event: React.ChangeEvent<HTMLSelectElement>) => {
+                this.setState({ actionType: event.target.value });
+              }}
+            >
+              <option value="copy" className="add-dialog-shelf-list-option">
+                {this.props.t("Copy to")}
+              </option>
+              <option value="move" className="add-dialog-shelf-list-option">
+                {this.props.t("Move to")}
+              </option>
+            </select>
+          </div>
+        )}
         <div className="add-dialog-shelf-list-container">
           <div className="add-dialog-shelf-list-text">
             <Trans>Select</Trans>
@@ -107,7 +146,7 @@ class AddDialog extends Component<AddDialogProps, AddDialogState> {
             {renderShelfList()}
           </select>
         </div>
-        <div className="add-dialog-new-shelf-container">
+        <div className="add-dialog-shelf-list-container">
           <div className="add-dialog-new-shelf-text">
             <Trans>New</Trans>
           </div>
diff --git a/src/components/dialogs/addDialog/index.tsx b/src/components/dialogs/addDialog/index.tsx
@@ -19,6 +19,8 @@ const mapStateToProps = (state: stateType) => {
     isOpenDeleteDialog: state.book.isOpenDeleteDialog,
     currentBook: state.book.currentBook,
     bookmarks: state.reader.bookmarks,
+    mode: state.sidebar.mode,
+    shelfTitle: state.sidebar.shelfTitle,
     notes: state.reader.notes,
   };
 };
diff --git a/src/components/dialogs/addDialog/interface.tsx b/src/components/dialogs/addDialog/interface.tsx
@@ -7,6 +7,8 @@ export interface AddDialogProps {
   currentBook: BookModel;
   selectedBooks: string[];
   isSelectBook: boolean;
+  mode: string;
+  shelfTitle: string;
   t: (title: string) => string;
   handleMode: (mode: string) => void;
   handleShelf: (shelfTitle: string) => void;
@@ -15,4 +17,5 @@ export interface AddDialogProps {
 export interface AddDialogState {
   isNew: boolean;
   shelfTitle: string;
+  actionType: string;
 }
