优化逻辑

2020-07-31 11:00:55 +08:00 · 2020-07-31 11:00:55 +08:00 · f7f1cdab34
parent 597f0da42f
commit f7f1cdab34
4 changed files with 26 additions and 224 deletions
--- a/FAQ.md
+++ b/FAQ.md
@ -108,6 +108,7 @@ Windows 7 未开启 Aero 效果时桌面歌词会有问题，详情看下面的*

 - 若你之前可以安装成功，但现在安装失败，就去**控制面板-程序和功能**或用第三方卸载工具看下有没有之前的版本残留，若同时在不同路径下安装了多个版本就可能会出现该问题，这种情况卸载掉所有版本重新安装即可
 - 清理安装路径下的残留文件
+- 清理注册表（建议用清理工具清理）

 ## 缺少`xxx.dll`

--- a/src/common/utils.js
+++ b/src/common/utils.js
@ -151,29 +151,33 @@ exports.initSetting = () => {
    name: 'config',
  })
  let setting = electronStore_config.get('setting')
-  if (!electronStore_config.get('version') && setting) { // 迁移配置
-    electronStore_config.set('version', electronStore_config.get('setting.version'))
-    electronStore_config.delete('setting.version')
-    const list = electronStore_config.get('list')
-    if (list) {
-      if (list.defaultList) electronStore_list.set('defaultList', list.defaultList)
-      if (list.loveList) electronStore_list.set('loveList', list.loveList)
-      electronStore_config.delete('list')
+  if (setting) {
+    let version = electronStore_config.get('version')
+    if (!version) { // 迁移配置
+      version = electronStore_config.get('setting.version')
+      electronStore_config.set('version', version)
+      electronStore_config.delete('setting.version')
+      const list = electronStore_config.get('list')
+      if (list) {
+        if (list.defaultList) electronStore_list.set('defaultList', list.defaultList)
+        if (list.loveList) electronStore_list.set('loveList', list.loveList)
+        electronStore_config.delete('list')
+      }
+      const downloadList = electronStore_config.get('download')
+      if (downloadList) {
+        if (downloadList.list) electronStore_list.set('downloadList', downloadList.list)
+        electronStore_config.delete('download')
+      }
    }
-    const downloadList = electronStore_config.get('download')
-    if (downloadList) {
-      if (downloadList.list) electronStore_list.set('downloadList', downloadList.list)
-      electronStore_config.delete('download')
-    }
-  }

-  // 迁移列表滚动位置设置 ~0.18.3
-  if (setting && setting.list.scroll) {
-    let scroll = setting.list.scroll
-    electronStore_list.set('defaultList.location', scroll.locations.defaultList || 0)
-    electronStore_list.set('loveList.location', scroll.locations.loveList || 0)
-    electronStore_config.delete('setting.list.scroll')
-    electronStore_config.set('setting.list.isSaveScrollLocation', scroll.enable)
+    // 迁移列表滚动位置设置 ~0.18.3
+    if (setting.list.scroll) {
+      let scroll = setting.list.scroll
+      electronStore_list.set('defaultList.location', scroll.locations.defaultList || 0)
+      electronStore_list.set('loveList.location', scroll.locations.loveList || 0)
+      electronStore_config.delete('setting.list.scroll')
+      electronStore_config.set('setting.list.isSaveScrollLocation', scroll.enable)
+    }
  }

  const { version: settingVersion, setting: newSetting } = exports.mergeSetting(setting, electronStore_config.get('version'))
--- a/src/renderer/components/material/FlowBtn.vue
+++ b/src/renderer/components/material/FlowBtn.vue
@ -1,123 +0,0 @@
-<template lang="pug">
-transition(enter-active-class="animated-fast zoomIn" leave-active-class="animated zoomOut")
-  div(:class="$style.btns" v-show="show")
-    button(type="button" v-if="playBtn" :title="$t('material.flow_btn.play')" @click.stop="handleClick('play')")
-      svg(version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' height='100%' viewBox='0 0 287.386 287.386' space='preserve')
-        use(xlink:href='#icon-testPlay')
-    button(type="button" v-if="addBtn" :title="$t('material.flow_btn.add')" @click.stop="handleClick('add')")
-      svg(version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' height='100%' viewBox='0 0 42 42' space='preserve')
-        use(xlink:href='#icon-addTo')
-    button(type="button" v-if="downloadBtn" :title="$t('material.flow_btn.download')" @click.stop="handleClick('download')")
-      svg(version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' height='100%' viewBox='0 0 475.078 475.077' space='preserve')
-        use(xlink:href='#icon-download')
-    button(type="button" v-if="startBtn" :title="$t('material.flow_btn.start')" @click.stop="handleClick('start')")
-      svg(version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' height='100%' viewBox='0 0 170 170' space='preserve')
-        use(xlink:href='#icon-play')
-    button(type="button" v-if="pauseBtn" :title="$t('material.flow_btn.pause')" @click.stop="handleClick('pause')")
-      svg(version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' height='100%' viewBox='0 0 277.338 277.338' space='preserve')
-        use(xlink:href='#icon-pause')
-    button(type="button" v-if="removeBtn" :title="$t('material.flow_btn.remove')" @click.stop="handleClick('remove')")
-      svg(version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' height='100%' viewBox='0 0 212.982 212.982' space='preserve')
-        use(xlink:href='#icon-delete')
-
-</template>
-
-<script>
-
-export default {
-  props: {
-    removeBtn: {
-      type: Boolean,
-      default: true,
-    },
-    startBtn: {
-      type: Boolean,
-      default: false,
-    },
-    pauseBtn: {
-      type: Boolean,
-      default: false,
-    },
-    downloadBtn: {
-      type: Boolean,
-      default: true,
-    },
-    addBtn: {
-      type: Boolean,
-      default: true,
-    },
-    playBtn: {
-      type: Boolean,
-      default: true,
-    },
-    show: {
-      type: Boolean,
-      default: false,
-    },
-  },
-  methods: {
-    handleClick(action) {
-      this.$emit('btn-click', action)
-    },
-  },
-}
-</script>
-
-
-<style lang="less" module>
-@import '../../assets/styles/layout.less';
-
-.btns {
-  position: fixed;
-  bottom: 80px;
-  right: 30px;
-  // transform: translateX(-25%);
-  background-color: @color-theme_2-background_2;
-  border-radius: 5px;
-  // padding: 3px 5px;
-  box-shadow: 0 1px 8px 0 rgba(0,0,0,.2);
-  button {
-    background-color: transparent;
-    border: none;
-    border-radius: @form-radius;
-    margin-right: 2px;
-    cursor: pointer;
-    padding: 6px 10px;
-    color: @color-btn;
-    outline: none;
-    transition: background-color 0.2s ease;
-    line-height: 0;
-    &:last-child {
-      margin-right: 0;
-    }
-
-    svg {
-      width: 18px;
-    }
-
-    &:hover {
-      background-color: @color-theme_2-hover;
-    }
-    &:active {
-      background-color: @color-theme_2-active;
-    }
-  }
-}
-
-each(@themes, {
-  :global(#container.@{value}) {
-    .btns {
-      background-color: ~'@{color-@{value}-theme_2-background_2}';
-      button {
-        color: ~'@{color-@{value}-btn}';
-        &:hover {
-          background-color: ~'@{color-@{value}-theme_2-hover}';
-        }
-        &:active {
-          background-color: ~'@{color-@{value}-theme_2-active}';
-        }
-      }
-    }
-  }
-})
-</style>
--- a/src/renderer/components/material/InputRange.vue
+++ b/src/renderer/components/material/InputRange.vue
@ -1,80 +0,0 @@
-<template lang="pug">
-  input(type="range" :class="[$style.range, min ? $style.min : '']" :disabled="disabled" v-model="val" input="handleInput" @change="handleChange")
-</template>
-
-<script>
-export default {
-  props: {
-    min: {
-      type: Boolean,
-    },
-    disabled: {
-      type: Boolean,
-      default: false,
-    },
-    value: {
-      type: Number,
-      default: 0,
-    },
-  },
-  data() {
-    return {
-      val: 0,
-    }
-  },
-  mounted() {
-    this.val = this.value
-  },
-  methods: {
-    handleChange(e) {
-      this.$emit('input', this.val)
-      this.$emit('change', e)
-    },
-  },
-}
-</script>
-
-
-<style lang="less" module>
-@import '../../assets/styles/layout.less';
-
-.range {
-  display: inline-block;
-  border-radius: .25em;
-  cursor: pointer;
-  color: @color-btn;
-  outline: none;
-  background: transparent;
-  // background-color: @color-btn-background;
-  &[disabled] {
-    opacity: .4;
-  }
-
-  &:hover {
-    background-color: @color-theme_2-hover;
-  }
-  &:active {
-    background-color: @color-theme_2-active;
-  }
-}
-
-.min {
-
-}
-
-// each(@themes, {
-//   :global(#container.@{value}) {
-//     .btn {
-//       color: ~'@{color-@{value}-btn}';
-//       background-color: ~'@{color-@{value}-btn-background}';
-//       &:hover {
-//         background-color: ~'@{color-@{value}-theme_2-hover}';
-//       }
-//       &:active {
-//         background-color: ~'@{color-@{value}-theme_2-active}';
-//       }
-//     }
-//   }
-// })
-
-</style>