From fdd8f3b214d76be774b68cb78d73e056b5c17fde Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Tue, 14 Jul 2020 20:41:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |   6 +-
 publish/changeLog.md                          |   4 +-
 src/renderer-lyric/components/base/Input.vue  |  62 ---------
 .../components/base/Quantity.vue              | 119 ------------------
 4 files changed, 5 insertions(+), 186 deletions(-)
 delete mode 100644 src/renderer-lyric/components/base/Input.vue
 delete mode 100644 src/renderer-lyric/components/base/Quantity.vue

diff --git a/package.json b/package.json
index a22c8288..3e3a7eb8 100644
--- a/package.json
+++ b/package.json
@@ -193,7 +193,7 @@
     "file-loader": "^6.0.0",
     "friendly-errors-webpack-plugin": "^1.7.0",
     "html-webpack-plugin": "^4.3.0",
-    "less": "^3.11.3",
+    "less": "^3.12.0",
     "less-loader": "^6.2.0",
     "markdown-it": "^11.0.0",
     "mini-css-extract-plugin": "^0.9.0",
@@ -217,7 +217,7 @@
     "webpack-cli": "^3.3.12",
     "webpack-dev-server": "^3.11.0",
     "webpack-hot-middleware": "^2.25.0",
-    "webpack-merge": "^5.0.8"
+    "webpack-merge": "^5.0.9"
   },
   "dependencies": {
     "crypto-js": "^4.0.0",
@@ -225,7 +225,7 @@
     "electron-log": "^4.2.2",
     "electron-store": "^5.2.0",
     "electron-updater": "^4.3.1",
-    "iconv-lite": "^0.6.1",
+    "iconv-lite": "^0.6.2",
     "image-size": "^0.8.3",
     "js-htmlencode": "^0.3.0",
     "lrc-file-parser": "^1.0.5",
diff --git a/publish/changeLog.md b/publish/changeLog.md
index 747eb9e0..4ae88ee1 100644
--- a/publish/changeLog.md
+++ b/publish/changeLog.md
@@ -6,7 +6,7 @@
 - 新增自定义列表，创建列表的按钮在表头`#`左侧，鼠标移上去才会显示；编辑列表名字时，按`ESC`键可快速取消编辑，按回车键或使输入框失去焦点即可保存列表名字，右击列表可编辑已创建的列表，“试听列表”与“我的收藏”两个列表固定不可编辑
 - 改变排行榜布局，新增更多排行榜
 - 新增我的列表右键菜单复制歌曲名选项
-- 新增桌面歌词，默认关闭，可到设置或者托盘菜单开启；调整字体大小、透明度时，鼠标左击按钮正常调整，右击微调；已知windows下贴边拖拽调整歌词窗口大小时可能会导致窗口变黑，这时只需将窗口拖离屏幕边缘再拖回去即可；Windows 7未开启Aero效果时桌面歌词会有问题，详情看常见问题解决；Linux版桌面歌词有问题，以后再尝试优化；
+- 新增桌面歌词，默认关闭，可到设置或者托盘菜单开启（建议使用全局快捷键控制）；调整字体大小、透明度时，鼠标左击按钮正常调整，右击微调；已知windows下贴边拖拽调整歌词窗口大小时可能会导致窗口变黑，这时只需将窗口拖离屏幕边缘再拖回去即可；Windows 7未开启Aero效果时桌面歌词会有问题，详情看常见问题解决；Linux版桌面歌词有问题，以后再尝试优化；
 - 新增“清热板蓝”皮肤
 - 新增软件最小化、关闭按钮位置设置，MAC版默认为左边，非MAC为右边，不想用默认的可到设置修改
 - 新增快捷键设置，软件内快捷键默认开启，全局快捷键默认关闭（注：若想开启蓝牙耳机切歌需开启全局快捷键，当快捷键被中划线划掉时，表示当前快捷键被其他程序占用导致注册失败）
@@ -25,7 +25,7 @@
 - 优化批量添加、删除播放列表的歌曲操作逻辑，大幅提升批量添加、删除列表歌曲的流畅度
 - 改进歌单列表展示
 - **改进聚合搜索的搜索结果排序**，修复当某些源搜索失败时导致其他源无法显示结果的问题，现在聚合搜索已达到最初的理想效果，欢迎体验~！
-- 压缩备份数据文件，文件大小
+- 压缩备份数据文件大小
 
 ### 修复
 
diff --git a/src/renderer-lyric/components/base/Input.vue b/src/renderer-lyric/components/base/Input.vue
deleted file mode 100644
index 9ebbb9b2..00000000
--- a/src/renderer-lyric/components/base/Input.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-<template lang="pug">
-input(:class="$style.input" :type="type" :placeholder="placeholder" v-model.trim="text" :disabled="disabled"
-    @focus="$emit('focus', $event)" @blur="$emit('blur', $event)" @input="$emit('input', text)" @change="$emit('change', text)"
-    @keyup.enter="submit")
-</template>
-
-<script>
-export default {
-  props: {
-    placeholder: {
-      type: String,
-      default: '',
-    },
-    disabled: {
-      type: Boolean,
-      default: false,
-    },
-    value: {
-      type: [String, Number],
-      default: '',
-    },
-    type: {
-      type: String,
-      default: 'text',
-    },
-  },
-  data() {
-    return {
-      text: '',
-    }
-  },
-  watch: {
-    value(n) {
-      this.text = n
-    },
-  },
-  methods: {
-    handleInput() {
-
-    },
-  },
-}
-</script>
-
-<style lang="less" module>
-@import '../../assets/styles/layout.less';
-
-.input {
-  background: none;
-  border: none;
-  border-bottom: 1px solid rgba(255, 255, 255, .7);
-  outline: none;
-  color: #fff;
-  // height: 28px;
-  box-sizing: border-box;
-  transition: border-color @transition-theme;
-  &:focus {
-    border-color: rgba(255, 255, 255, 1);
-  }
-}
-
-</style>
diff --git a/src/renderer-lyric/components/base/Quantity.vue b/src/renderer-lyric/components/base/Quantity.vue
deleted file mode 100644
index b4e329a1..00000000
--- a/src/renderer-lyric/components/base/Quantity.vue
+++ /dev/null
@@ -1,119 +0,0 @@
-<template lang="pug">
-div(:class="$style.quantity")
-  button(:class="[$style.btn, $style.minus]" @click="handleMinusClick") -
-  input(:class="$style.input" ref="dom_input" :value="text" :disabled="disabled" @focus="$emit('focus', $event)" @blur="$emit('blur', $event)" @input="handleInput"
-    @change="$emit('change', text)" @keyup.enter="submit" type="number" :min="min" :max="max")
-  button(:class="[$style.btn, $style.add]" @click="handleAddClick") +
-</template>
-
-<script>
-export default {
-  props: {
-    min: {
-      type: Number,
-    },
-    max: {
-      type: Number,
-    },
-    step: {
-      type: Number,
-      default: 20,
-    },
-    disabled: {
-      type: Boolean,
-      default: false,
-    },
-    value: {
-      type: Number,
-      default: 0,
-    },
-  },
-  data() {
-    return {
-      text: 0,
-    }
-  },
-  watch: {
-    value(n) {
-      this.text = n
-    },
-  },
-  mounted() {
-    this.text = this.value
-  },
-  methods: {
-    handleInput() {
-      let num = parseInt(this.$refs.dom_input.value)
-      console.log(this.$refs.dom_input.value)
-      if (Number.isNaN(num)) num = this.text
-      if (this.min != null && this.min > num) {
-        num = this.min
-      } else if (this.max != null && this.max < num) {
-        num = this.max
-      }
-      this.text = this.$refs.dom_input.value = num
-      this.$emit('input', this.text)
-    },
-    handleMinusClick() {
-      let num = this.text - this.step
-      this.$refs.dom_input.value = this.min == null ? num : Math.max(num, this.min)
-      this.handleInput()
-    },
-    handleAddClick() {
-      let num = this.text + this.step
-      this.$refs.dom_input.value = this.max == null ? num : Math.min(num, this.max)
-      this.handleInput()
-    },
-  },
-}
-</script>
-
-<style lang="less" module>
-@import '../../assets/styles/layout.less';
-.quantity {
-  display: flex;
-  width: 160px;
-  opacity: .9;
-}
-
-.input::-webkit-inner-spin-button,
-.input::-webkit-outer-spin-button {
-  -webkit-appearance: none;
-  appearance: none;
-  margin: 0;
-}
-
-.input,
-.btn {
-  height: 30px;
-  text-align: center;
-  background: transparent;
-  border: 1px solid #fff;
-  color: #fff;
-  outline: none;
-  box-sizing: border-box;
-}
-
-.input {
-  border-left: none;
-  border-right: none;
-  width: 60px;
-  position: relative;
-  // font-weight: 900;
-}
-
-.btn {
-  width: 30px;
-  cursor: pointer;
-}
-
-.minus {
-  border-top-left-radius: 4px;
-  border-bottom-left-radius: 4px;
-}
-.add {
-  border-top-right-radius: 4px;
-  border-bottom-right-radius: 4px;
-}
-
-</style>