diff --git a/FFBox Changelog.md b/FFBox Changelog.md index e55ad9c..251c304 100644 --- a/FFBox Changelog.md +++ b/FFBox Changelog.md @@ -1,5 +1,10 @@ # FFBox Changelog + +`2020-09-19` 重新进行了参数分类 + +--- + # v2.3 - 调整了资源文件的布局 diff --git a/public/images/sidebar-icon-colored.png b/public/images/sidebar-icon-colored.png index 4ebe0f9..0133194 100644 Binary files a/public/images/sidebar-icon-colored.png and b/public/images/sidebar-icon-colored.png differ diff --git a/public/images/sidebar-icon-white.png b/public/images/sidebar-icon-white.png index 340883f..06a7e1c 100644 Binary files a/public/images/sidebar-icon-white.png and b/public/images/sidebar-icon-white.png differ diff --git a/src/App.vue b/src/App.vue index dd207ba..16c4ace 100644 --- a/src/App.vue +++ b/src/App.vue @@ -6,8 +6,9 @@ - - diff --git a/src/App/ContentWrapper/Clientarea/Maincontent/Parabox/TimingView.vue b/src/App/ContentWrapper/Clientarea/Maincontent/Parabox/EffectView.vue similarity index 89% rename from src/App/ContentWrapper/Clientarea/Maincontent/Parabox/TimingView.vue rename to src/App/ContentWrapper/Clientarea/Maincontent/Parabox/EffectView.vue index 066d9ad..c9ce442 100644 --- a/src/App/ContentWrapper/Clientarea/Maincontent/Parabox/TimingView.vue +++ b/src/App/ContentWrapper/Clientarea/Maincontent/Parabox/EffectView.vue @@ -1,5 +1,5 @@ @@ -7,7 +7,7 @@ diff --git a/src/App/ContentWrapper/Clientarea/Maincontent/Parabox/InputView.vue b/src/App/ContentWrapper/Clientarea/Maincontent/Parabox/InputView.vue new file mode 100644 index 0000000..3e2a973 --- /dev/null +++ b/src/App/ContentWrapper/Clientarea/Maincontent/Parabox/InputView.vue @@ -0,0 +1,51 @@ + + + + + diff --git a/src/App/ContentWrapper/Clientarea/Maincontent/Parabox/OutputView.vue b/src/App/ContentWrapper/Clientarea/Maincontent/Parabox/OutputView.vue new file mode 100644 index 0000000..fcc3805 --- /dev/null +++ b/src/App/ContentWrapper/Clientarea/Maincontent/Parabox/OutputView.vue @@ -0,0 +1,52 @@ + + + + + diff --git a/src/App/ContentWrapper/Clientarea/Maincontent/Parabox/ShorcutsView.vue b/src/App/ContentWrapper/Clientarea/Maincontent/Parabox/ShortcutsView.vue similarity index 100% rename from src/App/ContentWrapper/Clientarea/Maincontent/Parabox/ShorcutsView.vue rename to src/App/ContentWrapper/Clientarea/Maincontent/Parabox/ShortcutsView.vue diff --git a/src/App/ContentWrapper/Clientarea/Maincontent/Parabox/VcodecView.vue b/src/App/ContentWrapper/Clientarea/Maincontent/Parabox/VcodecView.vue index 1f40561..674732d 100644 --- a/src/App/ContentWrapper/Clientarea/Maincontent/Parabox/VcodecView.vue +++ b/src/App/ContentWrapper/Clientarea/Maincontent/Parabox/VcodecView.vue @@ -136,24 +136,11 @@ export default { methods: { // 由子组件发生变化所触发的事件(mode 为组件类型,sName 为参数名,value 为参数值,list 为对于 combo 需要传入的列表(废弃)) onChange: function (mode, sName, value) { - switch (mode) { - case 'combo': - // 注:这里 commit 的 value 不能直接读取 import 来的变量,直接用开发者工具读取也不行,但是 console.log 可以,疑似 vue 的 bug - // console.log(this.formatsList[args.paramName + 's'][args.value].sName) - this.$store.commit('changePara', { - type: 'video', - key: sName, - value - }) - break; - case 'slider': - this.$store.commit('changePara', { - type: 'video', - key: sName, - value - }) - break; - } + this.$store.commit('changePara', { + type: 'video', + key: sName, + value + }) if (sName == 'vcodec') { // 更改 vcodec 后将 vencoder 恢复为默认 this.$store.commit('changePara', { @@ -192,22 +179,11 @@ export default { } }, onDetailChange: function (mode, sName, value, list) { - switch (mode) { - case 'combo': - this.$store.commit('changePara', { - type: 'videoDetail', - key: sName, - value - }) - break; - case 'slider': - this.$store.commit('changePara', { - type: 'videoDetail', - key: sName, - value - }) - break; - } + this.$store.commit('changePara', { + type: 'videoDetail', + key: sName, + value + }) }, // getVideoParams: function () { // console.log(generator.getVideoParam(this.$store.state.globalParams.video)) diff --git a/src/App/ContentWrapper/Clientarea/Maincontent/Parabox/VeffectView.vue b/src/App/ContentWrapper/Clientarea/Maincontent/Parabox/VeffectView.vue deleted file mode 100644 index dc2d104..0000000 --- a/src/App/ContentWrapper/Clientarea/Maincontent/Parabox/VeffectView.vue +++ /dev/null @@ -1,37 +0,0 @@ - - - - - diff --git a/src/App/ContentWrapper/Clientarea/Sidebar.vue b/src/App/ContentWrapper/Clientarea/Sidebar.vue index d0d038c..f3c17e1 100644 --- a/src/App/ContentWrapper/Clientarea/Sidebar.vue +++ b/src/App/ContentWrapper/Clientarea/Sidebar.vue @@ -4,12 +4,12 @@ diff --git a/yarn.lock b/yarn.lock index 971738b..0a119cf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8542,6 +8542,11 @@ vue-loader@^15.9.2: vue-hot-reload-api "^2.3.0" vue-style-loader "^4.1.0" +vue-router@^3.4.3: + version "3.4.3" + resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.4.3.tgz#fa93768616ee338aa174f160ac965167fa572ffa" + integrity sha512-BADg1mjGWX18Dpmy6bOGzGNnk7B/ZA0RxuA6qedY/YJwirMfKXIDzcccmHbQI0A6k5PzMdMloc0ElHfyOoX35A== + vue-style-loader@^4.1.0, vue-style-loader@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-4.1.2.tgz#dedf349806f25ceb4e64f3ad7c0a44fba735fcf8"