diff --git a/openRenamerBackend/entity/bo/rules/AutoRule.ts b/openRenamerBackend/entity/bo/rules/AutoRule.ts
index f2098c2..44ad372 100644
--- a/openRenamerBackend/entity/bo/rules/AutoRule.ts
+++ b/openRenamerBackend/entity/bo/rules/AutoRule.ts
@@ -4,7 +4,7 @@ import path from 'path';
let pattern = new RegExp(/s(eason)?(\d+)/);
-let eNumPatternArr = [new RegExp(/e(\d+)/), new RegExp(/\((\d+)\)/), new RegExp(/((\d+))/), new RegExp(/\.(\d+)\./), new RegExp(/-(\d+)/), new RegExp(/(\d+)/)];
+let eNumPatternArr = [new RegExp(/e(\d+)/), new RegExp(/\((\d+)\)/), new RegExp(/\[(\d+)\]/), new RegExp(/((\d+))/), new RegExp(/\.(\d+)/), new RegExp(/-(\d+)/), new RegExp(/(\d+)/)];
let resolutionPattern = new RegExp(/(\d{3,}[pP])/);
let resolutionArr = ['1k', '1K', '2k', '2K', '4k', '4K', '8k', '8K'];
let charSet = new Set([' ', '[', '.', '(', '(']);
diff --git a/openRenamerFront/src/App.vue b/openRenamerFront/src/App.vue
index f559f26..4625ece 100644
--- a/openRenamerFront/src/App.vue
+++ b/openRenamerFront/src/App.vue
@@ -2,6 +2,7 @@
重命名
+ 自动化
bt下载
下载中心
@@ -22,13 +23,19 @@ export default {
data() {
return {
version: "1.2",
- activeIndex: this.$route.path,
+ activeIndex: location.pathname,
};
},
async created() {
let token = localStorage.getItem("token");
window.token = token;
await httpUtil.get("/file/isWindows");
+ console.log(this.$route);
+ console.log(this.activeIndex);
+ },
+ async mounted() {
+ console.log(this.$route);
+ console.log(location);
},
};
diff --git a/openRenamerFront/src/router/index.js b/openRenamerFront/src/router/index.js
index a7355e2..08b300c 100644
--- a/openRenamerFront/src/router/index.js
+++ b/openRenamerFront/src/router/index.js
@@ -7,6 +7,10 @@ const routes = [
path: "/",
name: "Home",
component: Home,
+ }, {
+ path: "/auto",
+ name: "Auto",
+ component: () => import("@/views/auto/index"),
}, {
path: "/download/config",
name: "downloadConfig",
diff --git a/openRenamerFront/src/views/auto/index.vue b/openRenamerFront/src/views/auto/index.vue
new file mode 100644
index 0000000..46e926d
--- /dev/null
+++ b/openRenamerFront/src/views/auto/index.vue
@@ -0,0 +1,53 @@
+
+ 自动化
+
+ 保存自动化配置
+
+
+
+
+
+
diff --git a/openRenamerFront/src/views/download/config/index.vue b/openRenamerFront/src/views/download/config/index.vue
index 8482eab..e2b2782 100644
--- a/openRenamerFront/src/views/download/config/index.vue
+++ b/openRenamerFront/src/views/download/config/index.vue
@@ -2,14 +2,16 @@
配置qb
qb信息
-
{{ qbInfo }}
+
{{ qbInfo }}编辑
-
- qb实例不可访问,请重新配置
-
-
-
- 提交
+
+
+
+
+
+ 取消
+ 提交
+
@@ -26,6 +28,7 @@ const qbBody = reactive({
let downloadConfig = reactive({});
//qb是否可访问
let qbReach = ref(true);
+let editInfo = ref(false);
const qbInfo = computed(() => {
if (downloadConfig.qbAddress) {
@@ -34,16 +37,13 @@ const qbInfo = computed(() => {
return "尚未配置";
}
});
-const showHostConfig = computed(() => {
- return !downloadConfig.qbAddress || !qbReach;
-});
onMounted(async () => {
downloadConfig = reactive(await http.post("/config/multCode", null, ["qbAddress", "qbUsername", "qbPassword"]));
});
async function submitQb() {
- let res = await http.post('')
+ let res = await http.post("");
}