From e0ff3d31426f1d16ca32dd2216e34edb49ee9716 Mon Sep 17 00:00:00 2001
From: baiy <wo@baiy.org>
Date: Wed, 11 Aug 2021 16:11:18 +0800
Subject: [PATCH] =?UTF-8?q?#54=20=E6=B7=BB=E5=8A=A0`=E8=AF=BB=E5=8F=96?=
 =?UTF-8?q?=E5=89=AA=E8=B4=B4=E6=9D=BF=E5=86=85=E5=AE=B9=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E9=A6=96=E5=B0=BE=E4=B8=8D=E5=8F=AF=E8=A7=81=E5=AD=97=E7=AC=A6?=
 =?UTF-8?q?`=E8=AE=BE=E7=BD=AE=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                |  2 +-
 src/tool.vue                |  2 +-
 src/tool/config.js          | 11 +++++++++++
 src/tool/model.js           |  3 +++
 src/tool/setting.js         | 19 +++++++++++++++++++
 src/views/setting/block.vue |  6 ++++++
 6 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index b4f2af6..571ac51 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "c-tool",
-    "version": "1.6.3",
+    "version": "1.6.4",
     "private": true,
     "scripts": {
         "serve": "vue-cli-service serve --port 8081",
diff --git a/src/tool.vue b/src/tool.vue
index f6323ef..dd70810 100644
--- a/src/tool.vue
+++ b/src/tool.vue
@@ -58,7 +58,7 @@
                 <Button type="primary" @click="historyClear">清空历史记录</Button>
             </div>
         </Drawer>
-        <Drawer title="设置" v-model="settingShow" :width="300">
+        <Drawer title="设置" v-model="settingShow" :width="400">
             <setting-block v-if="settingShow"></setting-block>
         </Drawer>
     </div>
diff --git a/src/tool/config.js b/src/tool/config.js
index 58a70b6..44f696c 100644
--- a/src/tool/config.js
+++ b/src/tool/config.js
@@ -55,15 +55,26 @@ const getToolDefaultCategory = function (name) {
     return ''
 }
 
+/**
+ * @param name
+ * @param defaultValue
+ * @return {any}
+ */
 const getSetting = function (name, defaultValue = null) {
     let setting = cache.getNoVersion('setting', {})
     return !setting.hasOwnProperty(name) ? defaultValue : setting[name]
 }
 
+/**
+ * @param name
+ * @param value
+ * @return {boolean}
+ */
 const saveSetting = function (name, value) {
     let setting = cache.getNoVersion('setting', {})
     setting[name] = value
     cache.setNoVersion('setting', setting);
+    return true
 }
 
 export default {
diff --git a/src/tool/model.js b/src/tool/model.js
index 427ceb1..d66bc7b 100644
--- a/src/tool/model.js
+++ b/src/tool/model.js
@@ -65,6 +65,9 @@ export const plugin = {
                 } else if (setting.autoReadCopy()) {
                     let paste = clipboardPaste()
                     if (!data[clipboardField] && paste) {
+                        if (setting.autoReadCopyFilter()){
+                            paste = paste.trim()
+                        }
                         data[clipboardField] = paste
                     }
                 }
diff --git a/src/tool/setting.js b/src/tool/setting.js
index c2313cd..d02fcef 100644
--- a/src/tool/setting.js
+++ b/src/tool/setting.js
@@ -1,16 +1,35 @@
 import config from './config'
 
 export default {
+    /**
+     * @param value
+     * @return {boolean}
+     */
     autoSaveCopy (value = null) {
         if (value === null) {
             return config.getSetting('auto_save_copy', true)
         }
         return config.saveSetting('auto_save_copy', value)
     },
+
+    /**
+     * @param value
+     * @return {boolean}
+     */
     autoReadCopy (value = null) {
         if (value === null) {
             return config.getSetting('auto_read_copy', true)
         }
         return config.saveSetting('auto_read_copy', value)
     },
+    /**
+     * @param value
+     * @return {boolean}
+     */
+    autoReadCopyFilter (value = null) {
+        if (value === null) {
+            return config.getSetting('auto_read_copy_filter', false)
+        }
+        return config.saveSetting('auto_read_copy_filter', value)
+    },
 }
\ No newline at end of file
diff --git a/src/views/setting/block.vue b/src/views/setting/block.vue
index 8b03abe..5ebc02e 100644
--- a/src/views/setting/block.vue
+++ b/src/views/setting/block.vue
@@ -12,6 +12,9 @@
                 <Cell title="自动读取剪贴板内容">
                     <i-switch v-model="auto_read_copy" slot="extra"/>
                 </Cell>
+                <Cell title="读取剪贴板内容过滤首尾不可见字符">
+                    <i-switch v-model="auto_read_copy_filter" slot="extra"/>
+                </Cell>
             </CellGroup>
         </div>
         <Drawer title="设置" placement="left" v-model="settingShow" :width="90">
@@ -34,6 +37,7 @@ export default {
             settingShow: false,
             auto_save_copy: true,
             auto_read_copy: true,
+            auto_read_copy_filter: false,
             is_chrome: isChrome,
             is_utools: isUtools,
         }
@@ -41,10 +45,12 @@ export default {
     created() {
         this.auto_save_copy = setting.autoSaveCopy()
         this.auto_read_copy = setting.autoReadCopy()
+        this.auto_read_copy_filter = setting.autoReadCopyFilter()
     },
     beforeDestroy() {
         setting.autoSaveCopy(this.auto_save_copy)
         setting.autoReadCopy(this.auto_read_copy)
+        setting.autoReadCopyFilter(this.auto_read_copy_filter)
     },
     methods: {
         open(name) {
-- 
GitLab