Merge pull request #38 from CKylinMC:dev

Fix feedback link and theme initialization in light mode

Author: CKylinMC

components.d.ts

@@ -20,7 +20,6 @@ declare module 'vue' {
     NConfigProvider: typeof import('naive-ui')['NConfigProvider']
     NIcon: typeof import('naive-ui')['NIcon']
     NInput: typeof import('naive-ui')['NInput']
-    NInputvFocus: typeof import('naive-ui')['NInputvFocus']
     NList: typeof import('naive-ui')['NList']
     NListItem: typeof import('naive-ui')['NListItem']
     NModal: typeof import('naive-ui')['NModal']

package.json

@@ -1,7 +1,7 @@
 {
     "name": "pasteme",
     "private": true,
-    "version": "1.2.1",
+    "version": "1.2.2",
     "type": "module",
     "scripts": {
         "dev": "vite",

src-tauri/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "pasteme"
-version = "1.2.1"
+version = "1.2.2"
 description = "A simple clipboard manager"
 authors = ["CKylinMC"]
 edition = "2021"

src-tauri/Cargo.toml

@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "PasteMe",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "identifier": "in.ckyl.pasteme",
   "build": {
     "beforeDevCommand": "yarn dev",

src-tauri/tauri.conf.json

@@ -1,3 +1,3 @@
 export const AppInfo = {
-    version: "1.2.1",
+    version: "1.2.2",
 };

src/AppInfo.ts

@@ -14,7 +14,7 @@ const props = defineProps({
     },
     keytip: {
         type: String,
-        default: '请按键...',
+        default: '请按键...(ESC取消，退格清空)',
     },
     hovertip: {
         type: String,
@@ -209,31 +209,37 @@ onBeforeUnmount(() => {
     margin: 1px 5px;
     display: inline-block;
     transition: 0.3s;
+    background: #b9b9b91a;
+    color: rgb(0, 0, 0);
+    border: 2px solid rgba(128, 128, 128, 0.116);
+}
+.dark .keyBox {
     background: #383838;
     color: white;
     border: 2px solid rgba(128, 128, 128, 0.116);
 }
 .keyBox:hover {
+    background: rgba(97, 97, 97, 0.13);
+    border: 2px solid rgba(128, 128, 128, 0.216);
+}
+.dark .keyBox:hover {
     background: rgb(104, 104, 104);
     border: 2px solid rgba(128, 128, 128, 0.216);
 }
 .keyBox.editMode {
-    border: 2px solid rgb(19, 151, 245);
+    border: 2px solid #18a058;
     animation: blink 1.5s infinite;
 }
-.keyBox.editMode:hover {
+.dark .keyBox.editMode:hover {
     background: rgb(126, 126, 126);
-    border: 2px solid rgb(19, 151, 245);
+    border: 2px solid #18a058;
 }
 @keyframes blink {
-    0% {
-        border: 2px solid rgb(19, 151, 245);
+    0%, 100% {
+        border: 2px solid #18a058;
     }
     50% {
         border: 2px solid rgba(19, 151, 245, 0);
     }
-    100% {
-        border: 2px solid rgb(19, 151, 245);
-    }
 }
 </style>

src/components/KeySelector.vue

@@ -27,7 +27,6 @@ const { config, loadConfig, saveConfig } = useConfig();
 const { autoStart, toggleAutoStart, refreshAutoStart } = useAutoStart();
 const { mountShortcut, unregisterAll } = useShortcut();
 
-const modalShortcutSetter = ref(false);
 const panelview = new webviewWindow.WebviewWindow('context', {
     url: '/panel',
 });
@@ -118,14 +117,6 @@ function handleShortcutChange(shortcut: string) {
     config.value.globalShortcut = shortcut;
 }
 
-function openShortcutSetter() {
-    modalShortcutSetter.value = true;
-}
-
-function closeShortcutSetter() {
-    modalShortcutSetter.value = false;
-}
-
 function closeApp() {
     exit(0);
 }
@@ -165,7 +156,7 @@ function openProjectPage() {
 }
 
 function openFeedbackPage() {
-    return openUrl('https://github.com/CKylinMC/PasteMe/issues/new');
+    return openUrl('https://github.com/CKylinMC/PasteMe/issues/new/choose');
 }
 function openCloseConfirm() {
     closeConfirm.value = true;
@@ -176,7 +167,9 @@ const updateSuffix =
 </script>
 
 <template>
-    <div class="text-black p-5 align-left relative select-none dark:bg-transparent dark:text-white">
+    <div
+        class="text-black p-5 align-left relative select-none bg-white/95 dark:bg-transparent dark:text-white"
+    >
         <div
             data-tauri-drag-region
             class="absolute top-0 right-0 h-10 w-full flex flex-row justify-end items-start"
@@ -273,12 +266,12 @@ const updateSuffix =
                         </n-list-item>
                         <n-list-item>
                             <template #suffix>
-                                <n-button @click="openShortcutSetter">{{
-                                    config.globalShortcut?.replace(
-                                        'CommandOrControl',
-                                        'Ctrl'
-                                    ) || '未设置'
-                                }}</n-button>
+                                <div class="w-60 text-right">
+                                    <KeySelector
+                                        @set="handleShortcutChange"
+                                        :shortcut="config.globalShortcut"
+                                    />
+                                </div>
                             </template>
                             <n-thing
                                 title="全局快捷键"
@@ -737,25 +730,7 @@ const updateSuffix =
                 </n-tab-pane>
             </n-tabs>
         </div>
-
-        <n-modal :show="modalShortcutSetter">
-            <n-card
-                style="width: 400px"
-                title="设置全局快捷键"
-                :bordered="false"
-                size="huge"
-                role="dialog"
-                aria-modal="true"
-            >
-                <KeySelector
-                    @set="handleShortcutChange"
-                    v-model:shortcut="config.globalShortcut"
-                />
-                <template #footer>
-                    <n-button @click="closeShortcutSetter">确定</n-button>
-                </template>
-            </n-card>
-        </n-modal>
+        
         <n-modal
             v-model:show="closeConfirm"
             preset="dialog"

src/pages/Home.vue

@@ -674,7 +674,7 @@ onBeforeUnmount(() => {
 
 <template>
     <div
-        class="flex flex-col size-full select-none dark:bg-transparent dark:text-white"
+        class="flex flex-col size-full select-none bg-white/95 dark:bg-transparent dark:text-white"
         @mouseover="mouseInRange = true"
         @mouseleave="mouseInRange = false"
     >