Merge pull request 'dev' (#52 ) from dev into main

Reviewed-on: #52
feat:应用版本号修改
2024-11-17 20:05:06 +08:00 · 2024-11-17 20:04:49 +08:00 · 2024-11-17 20:02:02 +08:00 · 2024-11-17 19:57:08 +08:00 · 2024-11-07 23:18:38 +08:00 · 2024-10-30 21:49:06 +08:00
37 changed files with 9260 additions and 6744 deletions
--- a/README.md
+++ b/README.md
@ -2,7 +2,11 @@

 ![预览图](https://s3.fleyx.com/picbed/2022/11/18386180128d01eb1a59b8eacf652895.png)

-renamer 的开源实现版本，BS 应用，支持 arm/x86 部署使用
-已打包镜像到 dockerhub 中:[hub.docker.com/r/fleyx/open-renamer](https://hub.docker.com/r/fleyx/open-renamer)
+renamer 的开源实现版本，BS 应用，支持 arm/x86 部署使用,两种使用方式：
+
+1. 部署容器到 nas
+   已打包到 dockerhub 中:[hub.docker.com/r/fleyx/open-renamer](https://hub.docker.com/r/fleyx/open-renamer)
+
+2. 下载桌面应用使用,目前仅支持 windows，后续计划支持 mac,linux[下载地址](https://github.com/FleyX/open-renamer/releases/latest)

 [点击查看参考文档](https://blog.fleyx.com/blog/detail/20221130)
--- a/electron/.gitignore
+++ b/electron/.gitignore
@ -0,0 +1,6 @@
+node_modules
+dist
+openRenamerBackend
+build
+.idea
+*.exe
--- a/electron/.npmrc
+++ b/electron/.npmrc
@ -0,0 +1 @@
+electron_mirror=https://npmmirror.com/mirrors/electron/
--- a/electron/build.sh
+++ b/electron/build.sh
@ -0,0 +1,12 @@
+cd ../openRenamerFront
+yarn
+npm run build
+cd ../openRenamerBackend
+yarn
+tsc
+rm -rf ./static/js
+rm -rf ./static/css
+cp -r ../openRenamerFront/dist/* ./static
+cd ../electron
+mkdir -p dist
+npm run build
--- a/electron/index.html
+++ b/electron/index.html
@ -0,0 +1,70 @@
+<html lang="">
+<head>
+    <title>open-renamer</title>
+</head>
+<body class="center">
+<div class="center" style="flex-direction: column">
+    <div class="loading"></div>
+    <div id="text" style="font: 1.2em">loading...</div>
+</div>
+
+
+<style>
+    .center {
+        justify-content: center;
+        align-items: center;
+        display: -webkit-flex;
+    }
+
+    .loading {
+        position: relative;
+        width: 48px;
+        height: 48px;
+        animation: satellite 3s infinite linear;
+        border: 1px solid #000;
+        border-radius: 100%;
+    }
+
+    .loading:before,
+    .loading:after {
+        position: absolute;
+        left: 1px;
+        top: 1px;
+        width: 12px;
+        height: 12px;
+        content: "";
+        border-radius: 100%;
+        background-color: #000;
+        box-shadow: 0 0 10px #000;
+    }
+
+    .loading:after {
+        right: 0;
+        width: 20px;
+        height: 20px;
+        margin: 13px;
+    }
+
+    @keyframes satellite {
+        from {
+            transform: rotate(0) translateZ(0);
+        }
+
+        to {
+            transform: rotate(360deg) translateZ(0);
+        }
+    }
+</style>
+<script>
+    let text = document.getElementById("text");
+    let count = 1;
+    setInterval(() => {
+        if (count > 3) {
+            count = 1;
+        }
+        text.innerText = "Loading" + (count == 3 ? '...' : count == 2 ? '..' : '.');
+        count++;
+    }, 500);
+</script>
+</body>
+</html>
--- a/electron/main.js
+++ b/electron/main.js
@ -0,0 +1,139 @@
+// main.js
+// 控制应用生命周期和创建原生浏览器窗口的模组
+const {app, BrowserWindow, Menu} = require('electron')
+const path = require('path')
+const fs = require('fs');
+const {spawn} = require('child_process');
+const net = require('net');
+const log = require('electron-log');
+
+
+const userHome = process.env.HOME || process.env.USERPROFILE;
+const dataPath = path.join(userHome, "openRenamer");
+
+log.transports.file.resolvePathFn = () => path.join(dataPath, 'logs/main.log');
+
+async function createWindow() {
+    // 隐藏菜单栏
+    Menu.setApplicationMenu(null)
+    // 创建浏览器窗口
+    const win = new BrowserWindow({
+        //width: 800,   //窗口宽度,单位像素. 默认是 800
+        //height: 600,  //窗口高度,单位像素. 默认是 600
+        icon: './logo.ico', // 设置窗口左上角的图标
+        show: false, //窗口创建的时候是否显示. 默认为 true
+        webPreferences: {
+            nodeIntegration: true, // 是否完整支持node。默认为 true
+            preload: path.join(__dirname, 'preload.js')  //界面的其它脚本运行之前预先加载一个指定脚本。
+        }
+    });
+    //打开调试
+    // win.webContents.openDevTools();
+
+    win.loadFile('./index.html');
+    let startTime = Date.now();
+
+    // 下面这两行代码配合上面 new BrowserWindow 里面的 show: false，可以实现打开时窗口最大化
+    win.maximize()
+    win.show()
+    log.info(__dirname);
+    let port = await startBackend()
+    log.info("backend service started")
+
+    let diff = Date.now() - startTime;
+    let time = 2000;
+    if (diff < time) {
+        await sleep(time - diff);
+    }
+    win.loadURL(`http://localhost:` + port);
+    // win.webContents.openDevTools()
+}
+
+// Electron会在初始化完成并且准备好创建浏览器窗口时调用这个方法
+// 部分 API 在 ready 事件触发后才能使用。
+app.whenReady().then(createWindow)
+// 当所有窗口都被关闭后退出
+app.on('windows-all-closed', () => {
+    // 在 macOS 上，除非用户用 Cmd + Q 确定地退出，
+    // 否则绝大部分应用及其菜单栏会保持激活。
+    if (process.platform !== 'darwin') {
+        app.quit()
+    }
+})
+app.on('activate', () => {
+    // 在macOS上，当单击dock图标并且没有其他窗口打开时，
+    // 通常在应用程序中重新创建一个窗口。
+    if (BrowserWindow.getAllWindows().length === 0) {
+        createWindow()
+    }
+})
+
+/**
+ * 启动后台服务
+ * @returns {Promise<number>}
+ */
+async function startBackend() {
+    let port = 51000;
+    while (true) {
+        let ok = await checkPort(port);
+        if (ok) {
+            break;
+        }
+        port = port + 1;
+    }
+    log.info("start check folder exist", __dirname, __filename)
+    let exist = fs.existsSync("openRenamerBackend");
+    const childProcess = spawn('node', [(exist ? '' : '../') + 'openRenamerBackend/dist/index.js'], {
+        env: {
+            "PORT": port,
+            "DATA_PATH": dataPath
+        }
+    });
+
+    childProcess.stdout.on('data', (data) => {
+        log.info(`stdout: ${data}`);
+    });
+
+    childProcess.stderr.on('data', (data) => {
+        log.error(`stderr: ${data}`);
+    });
+
+    childProcess.on('close', (code) => {
+        log.info(`child process exited with code ${code}`);
+    });
+    log.info("check service start");
+    while (true) {
+        await sleep(100);
+        let success = !(await checkPort(port));
+        if (success) {
+            log.info("service start");
+            break;
+        }
+    }
+    return port;
+}
+
+/**
+ * 判断端口是否可用
+ * @param port
+ * @returns {Promise<unknown>}
+ */
+function checkPort(port) {
+    return new Promise((resolve, reject) => {
+        let server = net.createServer().listen(port);
+        server.on("listening", function () {
+            server.close();
+            resolve(true);
+        })
+        server.on("error", function (err) {
+            console.error(err);
+            resolve(false);
+        })
+    })
+}
+
+function sleep(time) {
+    return new Promise((resolve, reject) => {
+        setTimeout(() => resolve(), time);
+    })
+}
--- a/electron/package.json
+++ b/electron/package.json
@ -0,0 +1,72 @@
+{
+  "name": "renamer",
+  "version": "1.8.0",
+  "description": "",
+  "main": "main.js",
+  "scripts": {
+    "start": "electron .",
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "build": "electron-builder --win --x64"
+  },
+  "author": "",
+  "license": "ISC",
+  "devDependencies": {
+    "electron": "^28.0.0",
+    "electron-builder": "^24.9.1"
+  },
+  "build": {
+    "productName": "openRenamer",
+    "appId": "openRenamer.app",
+    "directories": {
+      "output": "build"
+    },
+    "files": [
+      "main.js",
+      "preload.js",
+      "index.html"
+    ],
+    "extraFiles": [
+      {
+        "from": "../openRenamerBackend",
+        "to": "openRenamerBackend"
+      }
+    ],
+    "copyright": "open-renamer",
+    "nsis": {
+      "oneClick": false,
+      "allowElevation": true,
+      "allowToChangeInstallationDirectory": true,
+      "installerIcon": "./renamer.ico",
+      "uninstallerIcon": "./renamer.ico",
+      "installerHeaderIcon": "./renamer.ico",
+      "createDesktopShortcut": true,
+      "createStartMenuShortcut": true,
+      "shortcutName": "openRenamer"
+    },
+    "win": {
+      "icon": "./renamer.ico",
+      "target": [
+        "nsis",
+        "zip"
+      ],
+      "extraFiles": [
+        {
+          "from": "windows/node.exe",
+          "to": "node.exe"
+        }
+      ]
+    },
+    "mac": {
+      "target": [
+        "dmg",
+        "zip"
+      ]
+    },
+    "linux": {
+      "icon": "build/icons"
+    }
+  },
+  "dependencies": {
+    "electron-log": "^5.0.1"
+  }
+}
--- a/electron/preload.js
+++ b/electron/preload.js
@ -0,0 +1,12 @@
+// preload.js
+// 所有Node.js API都可以在预加载过程中使用。
+// 它拥有与Chrome扩展一样的沙盒。
+window.addEventListener('DOMContentLoaded', () => {
+    const replaceText = (selector, text) => {
+        const element = document.getElementById(selector)
+        if (element) element.innerText = text
+    }
+    for (const dependency of ['chrome', 'node', 'electron']) {
+        replaceText(`${dependency}-version`, process.versions[dependency])
+    }
+})
--- a/electron/readme.md
+++ b/electron/readme.md
@ -0,0 +1 @@
+需要下载windows版的node.js压缩包，将其中的node.exe 放到windowes目录下
--- a/electron/renamer.ico
+++ b/electron/renamer.ico
--- a/electron/yarn.lock
+++ b/electron/yarn.lock
--- a/openRenamerBackend/config.ts
+++ b/openRenamerBackend/config.ts
@ -1,10 +1,12 @@
 import * as path from 'path';
+import * as process from "process";

 //后台所在绝对路径
 const rootPath = path.resolve(__dirname, '..');

 let config = {
    rootPath,
+    dataPath: process.env.DATA_PATH ? process.env.DATA_PATH : path.join(rootPath, 'data'),
    port: process.env.PORT ? parseInt(process.env.PORT) : 8089,
    token: process.env.TOKEN ? process.env.TOKEN : null,
    urlPrefix: '/openRenamer/api',
--- a/openRenamerBackend/entity/bo/rules/DeleteRule.ts
+++ b/openRenamerBackend/entity/bo/rules/DeleteRule.ts
@ -1,92 +1,99 @@
 import RuleInterface from "./RuleInterface";
+import {dealFileName} from "./RuleInterface";
 import FileObj from "../../vo/FileObj";
 import path from 'path';

 export default class DeleteRule implements RuleInterface {
-	/**
-	 * 类别：deletePart:部分删除，deleteAll:全部删除
-	 */
-	type: string;
-	/**
-	 * 部分删除时的开始信息
-	 */
-	start: DeleteRuleItem;
-	/**
-	 * 部分删除时的结束信息
+    /**
+     * 类别：deletePart:部分删除，deleteAll:全部删除
+     */
+    type: string;
+    /**
+     * 部分删除时的开始信息
+     */
+    start: DeleteRuleItem;
+    /**
+     * 部分删除时的结束信息

-	 */
-	end: DeleteRuleItem;
-	/**
-	 * 忽略拓展名，true:忽略，false：不忽略
-	 */
-	ignorePostfix: boolean;
+     */
+    end: DeleteRuleItem;
+    /**
+     * 忽略拓展名，true:忽略，false：不忽略
+     */
+    ignorePostfix: boolean;
+    /*
+     * 是否区分大小写
+     */
+    regI: boolean;

-	constructor(data: any) {
-		this.type = data.type;
-		this.start = new DeleteRuleItem(data.start);
-		this.end = new DeleteRuleItem(data.end);
-		this.ignorePostfix = data.ignorePostfix;
-	}
+    constructor(data: any) {
+        this.type = data.type;
+        this.regI = data.regI != undefined && data.regI;
+        this.start = new DeleteRuleItem(data.start, this.regI);
+        this.end = new DeleteRuleItem(data.end, this.regI);
+        this.ignorePostfix = data.ignorePostfix;
+    }


-
-	deal(file: FileObj): void {
-		if (this.type === 'deleteAll') {
-			file.realName = "";
-			if (!this.ignorePostfix) {
-				file.expandName = "";
-			}
-		} else {
-			let str = file.realName + (this.ignorePostfix ? "" : file.expandName);
-			let startIndex = this.start.calIndex(str);
-			let endIndex = this.end.calIndex(str);
-			if (startIndex < 0 || endIndex < 0) {
-				return;
-			}
-			str = str.substring(0, startIndex) + str.substring(endIndex + 1);
-			if (this.ignorePostfix) {
-				file.realName = str;
-			} else {
-				file.expandName = path.extname(str);
-				if (file.expandName.length > 0) {
-					file.realName = str.substring(0, str.lastIndexOf("."));
-				} else {
-					file.realName = str;
-				}
-			}
-		}
-
-		file.name = file.realName + file.expandName;
-	}
+    deal(file: FileObj): void {
+        let target = "";
+        if (this.type === 'deleteAll') {
+            target = "";
+        } else {
+            let str = file.realName + (this.ignorePostfix ? "" : file.expandName);
+            let startIndex = this.start.calIndex(str, false);
+            let endIndex = this.end.calIndex(str, true);
+            if (startIndex < 0 || endIndex < 0 || startIndex > endIndex) {
+                return;
+            }
+            str = str.substring(0, startIndex) + str.substring(endIndex + 1);
+            target = str;
+        }
+        dealFileName(file, target, this.ignorePostfix);
+    }

 }

 class DeleteRuleItem {
-	/**
-	 * location:位置，text:文本，end:直到末尾
-	 */
-	type: string;
-	/**
-	 * 对应的值
-	 */
-	value: string;
+    /**
+     * location:位置，text:文本，end:直到末尾
+     */
+    type: string;
+    /**
+     * 对应的值
+     */
+    value: string;
+    /**
+     * 正则对象
+     */
+    reg: RegExp;

-	constructor(data: any) {
-		this.type = data.type;
-		this.value = data.value;
-	}
+    constructor(data: any, regI: boolean) {
+        this.type = data.type;
+        this.value = data.value;
+        if (this.type === 'reg') {
+            this.reg = regI ? new RegExp(this.value) : new RegExp(this.value, 'i');
+        }
+    }

-	/**
-	 * 计算位置
-	 */
-	calIndex(str: string): number {
-		if (this.type === 'location') {
-			return parseInt(this.value) - 1;
-		} else if (this.type === 'text') {
-			return str.indexOf(this.value);
-		} else if (this.type === 'end') {
-			return str.length - 1;
-		}
-		return -1;
-	}
+    /**
+     * 计算位置
+     * @param str 字符串
+     * @param end 是否末尾计算
+     */
+    calIndex(str: string, end: boolean): number {
+        if (this.type === 'location') {
+            let val = parseInt(this.value);
+            return val > 0 ? val - 1 : str.length + val;
+        } else if (this.type === 'text') {
+            let index = str.indexOf(this.value);
+            return index + (end ? this.value.length - 1 : 0);
+        } else if (this.type === 'end') {
+            return str.length - 1;
+        } else if (this.type === 'reg') {
+            let res = this.reg.exec(str);
+            return res == null ? -1 : (res.index + (end ? res[0].length - 1 : 0));
+        }
+        return -1;
+    }
 }
--- a/openRenamerBackend/entity/bo/rules/ReplaceRule.ts
+++ b/openRenamerBackend/entity/bo/rules/ReplaceRule.ts
@ -1,5 +1,7 @@
 import RuleInterface from "./RuleInterface";
+import * as ValUtil from "../../../util/ValUtil";
 import FileObj from "../../vo/FileObj";
+import {dealFileName} from './RuleInterface';
 import path from 'path';


@ -10,45 +12,101 @@ export default class ReplaceRule implements RuleInterface {
     */
    type: number;
    /**
-     * 前面追加
+     * 源
     */
    source: string;
    /**
-     * 后面追加
+     * 目标
     */
    target: string;
+    /**
+     * 是否正则模式
+     */
+    regFlag: boolean;
+    /**
+     * 是否区分大小写
+     */
+    regI: boolean;
+    /**
+     * 是否护理拓展名
+     */
+    ignorePostfix: boolean;

    constructor(data: any) {
        this.type = data.type;
        this.source = data.source;
        this.target = data.target;
+        this.regFlag = ValUtil.nullToDefault(data.regFlag, false);
+        this.regI = ValUtil.nullToDefault(data.regI, false);
+        this.ignorePostfix = ValUtil.nullToDefault(data.ignorePostfix, false);
    }


    deal(file: FileObj): void {
+        let targetStr = this.ignorePostfix ? file.realName : file.name;
+        let res = this.regFlag ? this.dealReg(targetStr) : this.dealNoReg(targetStr);
+        dealFileName(file, res, this.ignorePostfix);
+    }
+
+    private dealNoReg(targetStr: string): string {
        let start = 0;
-        let changed = false;
-        for (; ;) {
-            let index = this.type == 1 || this.type == 3 ? file.name.indexOf(this.source, start) : file.name.lastIndexOf(this.source);
-            if (index > -1) {
-                file.name = file.name.substring(0, index) + this.target + file.name.substring(index + this.source.length);
-                start = index + this.target.length;
-                changed = true;
-                if (this.type != 3) {
-                    break;
-                }
-            } else {
+        let arr: number[] = [];
+        for (let i = 0; i < (this.type == 1 ? 1 : 1000); i++) {
+            let one = targetStr.indexOf(this.source, start);
+            if (one == -1) {
                break;
            }
+            arr.push(one);
+            start = one + this.source.length;
        }
-        if (changed) {
-            file.originName = file.name;
-            file.expandName = path.extname(file.name);
-            if (file.expandName && file.expandName.length > 0) {
-                file.realName = file.name.substring(0, file.name.lastIndexOf("."));
-            } else {
-                file.realName = file.name;
+        if (arr.length == 0) {
+            return targetStr;
+        }
+        let res = "";
+        let needDealArr: number[] = this.type === 1 ? [arr[0]] : this.type === 2 ? [arr[arr.length - 1]] : arr;
+        let lastIndex = 0;
+        for (let i = 0; i < needDealArr.length; i++) {
+            res += targetStr.substring(lastIndex, needDealArr[i]) + this.target;
+            lastIndex = needDealArr[i] + this.source.length;
+        }
+        res += targetStr.substring(lastIndex);
+        return res;
+    }
+
+    private dealReg(targetStr: string): string {
+        let templateReg = new RegExp("#\{group(\\d+\)}", "g");
+        let templateArr: string[][] = [];
+        while (true) {
+            let one = templateReg.exec(this.target);
+            if (one == null) {
+                break;
            }
+            templateArr.push([one[0], one[1]]);
        }
+
+        let reg = new RegExp(this.source, this.regI ? "g" : "ig");
+        let arr: RegExpExecArray[] = [];
+        for (let i = 0; i < (this.type == 1 ? 1 : 1000); i++) {
+            let one = reg.exec(targetStr);
+            if (one == null) {
+                break;
+            }
+            arr.push(one);
+        }
+        if (arr.length == 0) {
+            return targetStr;
+        }
+        let res = "";
+        let needDealReg: RegExpExecArray[] = this.type === 1 ? [arr[0]] : this.type === 2 ? [arr[arr.length - 1]] : arr;
+        let lastIndex = 0;
+        for (let i = 0; i < needDealReg.length; i++) {
+            let reg = needDealReg[i];
+            let target = this.target;
+            templateArr.forEach(item => target = target.replace(item[0], ValUtil.nullToDefault(reg[parseInt(item[1])], '')));
+            res += targetStr.substring(lastIndex, reg.index) + target;
+            lastIndex = reg.index + reg[0].length;
+        }
+        res += targetStr.substring(lastIndex);
+        return res;
    }
 }
--- a/openRenamerBackend/entity/bo/rules/RuleInterface.ts
+++ b/openRenamerBackend/entity/bo/rules/RuleInterface.ts
@ -1,6 +1,27 @@
 import FileObj from "../../vo/FileObj";
+import * as path from 'path';

 export default interface RuleInterface {

-	deal(file: FileObj): void;
+    deal(file: FileObj): void;
+}
+
+/**
+ * 重新处理文件名
+ * @param file
+ * @param newFileName
+ * @param ignorePostfix
+ */
+export function dealFileName(file: FileObj, newFileName: string, ignorePostfix: boolean) {
+    if (ignorePostfix) {
+        file.realName = newFileName;
+    } else {
+        file.expandName = path.extname(newFileName);
+        if (file.expandName.length > 0) {
+            file.realName = newFileName.substring(0, newFileName.lastIndexOf("."));
+        } else {
+            file.realName = newFileName;
+        }
+    }
+    file.name = file.realName + file.expandName;
 }
--- a/openRenamerBackend/entity/bo/rules/TranslateRole.ts
+++ b/openRenamerBackend/entity/bo/rules/TranslateRole.ts
@ -0,0 +1,32 @@
+import RuleInterface from "./RuleInterface";
+import FileObj from "../../vo/FileObj";
+import * as TranslateUtil from "../../../util/TranslateUtil";
+import path from 'path';
+
+
+export default class TranslateRole implements RuleInterface {
+
+    /**
+     * 1:简体转繁体 2：繁体转简体
+     */
+    type: number;
+    /**
+     *  0、繁体中文，1、港澳繁体，2、台湾正体
+     */
+    traditionalType: number;
+
+    constructor(data: any) {
+        this.type = data.type;
+        this.traditionalType = data.traditionalType;
+    }
+
+
+    deal(file: FileObj): void {
+        if (this.type == 1) {
+            file.realName = TranslateUtil.toTraditionalChinese(file.realName, this.traditionalType);
+        } else if (this.type == 2) {
+            file.realName = TranslateUtil.toSimplifiedChinese(file.realName, this.traditionalType);
+        }
+        file.name = file.realName + file.expandName;
+    }
+}
--- a/openRenamerBackend/entity/vo/FileObj.ts
+++ b/openRenamerBackend/entity/vo/FileObj.ts
@ -3,21 +3,22 @@ import {isVideo, isSub, isNfo} from "../../util/MediaUtil"

 export default class FileObj {
    /**
-     * 文件名
+     * 变更后的文件名(包含拓展名)
     */
    name: string;
    /**
-     原始名字
+     * 去掉拓展名后的名字(不包含拓展名)
+     */
+    realName: string;
+    /**
+     原始文件名(不变)
     */
    originName: string;
    /**
-     * 拓展名
+     * 拓展名(最新的拓展名，每次应用规则后重新计算)
     */
    expandName: string;
-    /**
-     * 去掉拓展名后的名字
-     */
-    realName: string;
+
    /**
     * 所属路径
     */
--- a/openRenamerBackend/entity/vo/RuleObj.ts
+++ b/openRenamerBackend/entity/vo/RuleObj.ts
@ -3,6 +3,7 @@ import InsertRule from "../bo/rules/InsertRule";
 import SerializationRule from "../bo/rules/SerializationRule";
 import AutoRule from "../bo/rules/AutoRule";
 import ReplaceRule from "../bo/rules/ReplaceRule";
+import TranslateRole from "../bo/rules/TranslateRole";

 export default class RuleObj {
    type: string;
@ -31,9 +32,11 @@ export default class RuleObj {
            case "replace":
                this.data = new ReplaceRule(data.data);
                break;
+            case "translate":
+                this.data = new TranslateRole(data.data);
+                break;
            default:
                throw new Error("不支持的规则:" + this.type);
-
        }
    }
 }
--- a/openRenamerBackend/package.json
+++ b/openRenamerBackend/package.json
@ -9,23 +9,20 @@
  "author": "fxb",
  "license": "ISC",
  "dependencies": {
-    "@types/fs-extra": "^5.0.4",
-    "@types/koa": "^2.0.47",
-    "@types/node": "^11.13.4",
-    "axios": "^0.21.4",
-    "fs-extra": "^7.0.0",
-    "koa": "^2.5.3",
-    "koa-body": "^4.0.4",
-    "koa-router": "^7.4.0",
-    "koa-static": "^5.0.0",
-    "koa2-cors": "^2.0.6",
-    "log4js": "^6.3.0",
-    "moment": "^2.22.2",
-    "mysql2": "^2.2.5",
-    "querystring": "^0.2.1",
-    "sqlite": "^4.0.23",
-    "sqlite3": "^5.0.2",
-    "uuid": "^3.3.2",
-    "winston": "^3.1.0"
+    "@types/fs-extra": "5.0.4",
+    "@types/koa": "2.13.12",
+    "@types/node": "11.13.4",
+    "axios": "0.21.4",
+    "fs-extra": "7.0.0",
+    "koa": "2.5.3",
+    "koa-body": "4.0.4",
+    "koa-router": "7.4.0",
+    "koa-static": "5.0.0",
+    "koa2-cors": "2.0.6",
+    "log4js": "6.3.0",
+    "moment": "2.22.2",
+    "sqlite": "4.0.23",
+    "sqlite3": "5.0.2",
+    "uuid": "3.3.2"
  }
 }
--- a/openRenamerBackend/pnpm-lock.yaml
+++ b/openRenamerBackend/pnpm-lock.yaml
--- a/openRenamerBackend/util/MysqlHelper.ts
+++ b/openRenamerBackend/util/MysqlHelper.ts
@ -1,108 +0,0 @@
-import mysql from "mysql2/promise";
-import config from '../config';
-import * as fs from "fs-extra";
-import * as path from 'path';
-import log from '../util/LogUtil';
-
-const HISTORY_NAME = "history.json";
-
-interface Res {
-    rows: any;
-    fields: mysql.FieldPacket;
-}
-
-class MysqlUtil {
-    public static pool: mysql.Pool = null;
-
-    static async createPool(mysqlConfig: any) {
-        MysqlUtil.pool = await mysql.createPool(mysqlConfig);
-        let basePath = path.join(config.rootPath, "sqls");
-        let hisPath = path.join(basePath, HISTORY_NAME);
-        let history: Array<string>;
-        if (fs.existsSync(hisPath)) {
-            history = JSON.parse(await fs.readFile(hisPath, "utf-8"));
-        } else {
-            history = new Array();
-        }
-        //执行数据库
-        let files = (await fs.readdir(basePath)).sort((a, b) => a.localeCompare(b)).filter(item => !(item === HISTORY_NAME));
-        let error = null;
-        for (let i = 0; i < files.length; i++) {
-            if (history.indexOf(files[i]) > -1) {
-                log.info("sql无需重复执行:", files[i]);
-                continue;
-            }
-            let sqlLines = (await fs.readFile(path.join(basePath, files[i]), 'utf-8')).split(/[\r\n]/g);
-            try {
-                let sql = "";
-                for (let j = 0; j < sqlLines.length; j++) {
-                    sql = sql + sqlLines[j];
-                    if (sqlLines[j].endsWith(";")) {
-                        await MysqlUtil.pool.execute(sql);
-                        sql = "";
-                    }
-                }
-                log.info("sql执行成功:", files[i]);
-                history.push(files[i]);
-            } catch (err) {
-                error = err;
-                break;
-            }
-        }
-        await fs.writeFile(hisPath, JSON.stringify(history));
-        if (error != null) {
-            throw error;
-        }
-    }
-
-    static async getRows(sql: string, params: Array<any>, connection: mysql.PoolConnection = null): Promise<Array<any>> {
-        return (await MysqlUtil.execute(sql, params, connection)).rows;
-    }
-
-
-    static async getRow(sql: string, params: Array<any>, connection: mysql.PoolConnection = null): Promise<any> {
-        let rows = (await MysqlUtil.execute(sql, params, connection)).rows;
-        return rows.length > 0 ? rows[0] : null;
-    }
-
-    static async getSingle(sql: string, params: Array<any>, connection: mysql.PoolConnection = null): Promise<any> {
-        let rows = (await MysqlUtil.execute(sql, params, connection)).rows;
-        if (rows.length == 0) {
-            return null;
-        }
-        let row = rows[0];
-        return row[Object.keys(row)[0]];
-    }
-
-
-
-    static async execute(sql: string, params: Array<any>, connection: mysql.PoolConnection = null): Promise<Res> {
-        let res: any = {};
-        if (connection == null) {
-            let [rows, fields] = await MysqlUtil.pool.query(sql, params);
-            res['rows'] = fields === undefined ? null : rows;
-            res['fields'] = fields === undefined ? rows : fields;
-        } else {
-            let [rows, fields] = await connection.query(sql, params);
-            res['rows'] = rows;
-            res['fields'] = fields;
-        }
-        return res;
-    }
-
-
-    static async test() {
-        let connection = await MysqlUtil.pool.getConnection();
-        connection.beginTransaction();
-        connection.query(`insert into url value(6,"GET","asd","public")`);
-        connection.query(`insert into url value(7,"GET","asd","public")`);
-        await connection.commit();
-        connection.release();
-    }
-}
-
-export {
-    MysqlUtil,
-    Res,
-    mysql
-}
--- a/openRenamerBackend/util/SqliteHelper.ts
+++ b/openRenamerBackend/util/SqliteHelper.ts
@ -1,5 +1,5 @@
 import sqlite3 from 'sqlite3';
-import { open, Database } from 'sqlite';
+import {open, Database} from 'sqlite';
 import config from '../config';
 import * as fs from "fs-extra";
 import * as path from 'path';
@ -12,9 +12,9 @@ class SqliteHelper {
    public static pool: Database = null;

    static async createPool() {
-        let dataFolder = path.join(config.rootPath, "data");
+        let dataFolder = config.dataPath;
        if (!fs.existsSync(dataFolder)) {
-            fs.mkdir(dataFolder);
+            await fs.mkdir(dataFolder);
        }
        SqliteHelper.pool = await open({
            filename: path.join(dataFolder, "database.db"),
@ -26,7 +26,7 @@ class SqliteHelper {
        if (fs.existsSync(hisPath)) {
            history = JSON.parse(await fs.readFile(hisPath, "utf-8"));
        } else {
-            history = new Array();
+            history = [];
        }
        //执行数据库
        let files = (await fs.readdir(basePath)).sort((a, b) => a.localeCompare(b)).filter(item => !(item === HISTORY_NAME));
--- a/openRenamerBackend/util/TranslateUtil.ts
+++ b/openRenamerBackend/util/TranslateUtil.ts
@ -0,0 +1,344 @@
+// ToolGood.Words.Translate.js
+// 2020, Lin Zhijun, https://github.com/toolgood/ToolGood.Words
+// Licensed under the Apache License 2.0
+import {_s2t_s, _s2t_t, _t2hk_t, _t2hk_hk, _t2s_s, _t2tw_t, _t2s_t, _t2tw_tw} from './TranslateWord'
+
+class TrieNode {
+    Index = 0;
+    Layer = 0;
+    End = false;
+    Char = '';
+    Results = [];
+    m_values = {};
+    Failure = null;
+    Parent = null;
+
+    public Add(c) {
+        if (this.m_values[c] != null) {
+            return this.m_values[c];
+        }
+        var node = new TrieNode();
+        node.Parent = this;
+        node.Char = c;
+        this.m_values[c] = node;
+        return node;
+    }
+
+
+    public SetResults(index) {
+        if (this.End == false) {
+            this.End = true;
+        }
+        this.Results.push(index)
+    }
+}
+
+
+class TrieNode2 {
+    End = false;
+    Results = [];
+    m_values = {};
+    minflag = 1;
+    maxflag = 0;
+
+    public Add(c, node3) {
+        if (typeof c !== 'number') {
+            c = parseInt(c);
+        }
+        if (this.minflag > c) {
+            this.minflag = c;
+        }
+        if (this.maxflag < c) {
+            this.maxflag = c;
+        }
+        this.m_values[c] = node3;
+    }
+
+    public SetResults(index) {
+        if (this.End == false) {
+            this.End = true;
+        }
+        if (this.Results.indexOf(index) == -1) {
+            this.Results.push(index);
+        }
+    }
+
+    public HasKey(c) {
+        return this.m_values[c] != undefined;
+    }
+
+    public TryGetValue(c) {
+        if (this.minflag <= c && this.maxflag >= c) {
+            return this.m_values[c];
+        }
+        return null;
+    }
+}
+
+
+class WordsSearch {
+
+
+    _first: TrieNode2 = null;
+    _keywords = [];
+    _others = [];
+
+    public SetKeywords(keywords) {
+        this._keywords = keywords;
+        let root = new TrieNode();
+
+        let allNodeLayer = {};
+        for (let i = 0; i < this._keywords.length; i++) {
+            let p = this._keywords[i];
+            let nd = root;
+            for (let j = 0; j < p.length; j++) {
+                nd = nd.Add(p.charCodeAt(j));
+                if (nd.Layer == 0) {
+                    nd.Layer = j + 1;
+                    if (allNodeLayer[nd.Layer]) {
+                        allNodeLayer[nd.Layer].push(nd)
+                    } else {
+                        allNodeLayer[nd.Layer] = [];
+                        allNodeLayer[nd.Layer].push(nd)
+                    }
+                }
+            }
+            nd.SetResults(i);
+        }
+
+        let allNode: TrieNode[] = [];
+        allNode.push(root);
+        for (let key in allNodeLayer) {
+            let nds = allNodeLayer[key];
+            for (let i = 0; i < nds.length; i++) {
+                allNode.push(nds[i]);
+            }
+        }
+        allNodeLayer = null;
+
+        for (let i = 1; i < allNode.length; i++) {
+            let nd: TrieNode = allNode[i];
+            nd.Index = i;
+            let r = nd.Parent.Failure;
+            let c = nd.Char;
+            while (r != null && !r.m_values[c])
+                r = r.Failure;
+            if (r == null)
+                nd.Failure = root;
+            else {
+                nd.Failure = r.m_values[c];
+                for (let key2 in nd.Failure.Results) {
+                    if (nd.Failure.Results.hasOwnProperty(key2) == false) {
+                        continue;
+                    }
+                    let result = nd.Failure.Results[key2];
+                    nd.SetResults(result);
+                }
+            }
+        }
+        root.Failure = root;
+
+        let allNode2 = [];
+        for (let i = 0; i < allNode.length; i++) {
+            allNode2.push(new TrieNode2());
+        }
+        for (let i = 0; i < allNode2.length; i++) {
+            let oldNode = allNode[i];
+            let newNode = allNode2[i];
+
+            for (let key in oldNode.m_values) {
+                if (oldNode.m_values.hasOwnProperty(key) == false) {
+                    continue;
+                }
+                let index = oldNode.m_values[key].Index;
+                newNode.Add(key, allNode2[index]);
+            }
+            for (let index = 0; index < oldNode.Results.length; index++) {
+                let item = oldNode.Results[index];
+                newNode.SetResults(item);
+            }
+
+            oldNode = oldNode.Failure;
+            while (oldNode != root) {
+                for (let key in oldNode.m_values) {
+                    if (oldNode.m_values.hasOwnProperty(key) == false) {
+                        continue;
+                    }
+                    if (newNode.HasKey(key) == false) {
+                        let index = oldNode.m_values[key].Index;
+                        newNode.Add(key, allNode2[index]);
+                    }
+                }
+                for (let index = 0; index < oldNode.Results.length; index++) {
+                    let item = oldNode.Results[index];
+                    newNode.SetResults(item);
+                }
+                oldNode = oldNode.Failure;
+            }
+        }
+        allNode = null;
+        root = null;
+        this._first = allNode2[0];
+    }
+
+    public FindAll(text) {
+        var ptr = null;
+        var list = [];
+
+        for (let i = 0; i < text.length; i++) {
+            var t = text.charCodeAt(i);
+            var tn = null;
+            if (ptr == null) {
+                tn = this._first.TryGetValue(t);
+            } else {
+                tn = ptr.TryGetValue(t);
+                if (!tn) {
+                    tn = this._first.TryGetValue(t);
+                }
+            }
+            if (tn != null) {
+                if (tn.End) {
+                    for (let j = 0; j < tn.Results.length; j++) {
+                        var item = tn.Results[j];
+                        var keyword = this._keywords[item];
+                        list.push({
+                            Keyword: keyword,
+                            Success: true,
+                            End: i,
+                            Start: i + 1 - this._keywords[item].length,
+                            Index: item,
+                        });
+                    }
+                }
+            }
+            ptr = tn;
+        }
+        return list;
+    }
+}
+
+//---------------------------
+
+
+//-----------------------
+var s2tSearch = null; // WordsSearch
+var t2sSearch = null;// WordsSearch
+var t2twSearch = null;// WordsSearch
+var tw2tSearch = null;// WordsSearch
+var t2hkSearch = null;// WordsSearch
+var hk2tSearch = null;// WordsSearch
+
+/**
+ * 转繁体中文
+ * @param {any} text 原文本
+ * @param {any} type 0、繁体中文，1、港澳繁体，2、台湾正体
+ */
+export function toTraditionalChinese(text: any, type: any) {
+    if (type == undefined) {
+        type = 0;
+    }
+    if (type > 2 || type < 0) {
+        throw "type 不支持该类型";
+    }
+
+    var s2t = GetWordsSearch(true, 0);
+    text = TransformationReplace(text, s2t);
+    if (type > 0) {
+        var t2 = GetWordsSearch(true, type);
+        text = TransformationReplace(text, t2);
+    }
+    return text;
+}
+
+/**
+ * 转简体中文
+ * @param {any} text 原文本
+ * @param {any} srcType 0、繁体中文，1、港澳繁体，2、台湾正体
+ */
+export function toSimplifiedChinese(text: string, srcType: any) {
+    if (srcType == undefined) {
+        srcType = 0;
+    }
+    if (srcType > 2 || srcType < 0) {
+        throw "srcType 不支持该类型";
+    }
+    if (srcType > 0) {
+        var t2 = GetWordsSearch(false, srcType);
+        text = TransformationReplace(text, t2);
+    }
+    var s2t = GetWordsSearch(false, 0);
+    text = TransformationReplace(text, s2t);
+    return text;
+}
+
+function TransformationReplace(text: any, wordsSearch: any) {
+    var ts = wordsSearch.FindAll(text);
+
+    var sb = "";
+    var index = 0;
+    while (index < text.length) {
+        var t = null;
+        var max = -1;
+        for (var i = 0; i < ts.length; i++) {
+            var f = ts[i];
+            if (f.Start == index && f.End > max) {
+                max = f.End;
+                t = f;
+            }
+        }
+
+        if (t == null) {
+            sb += text[index];
+            index++;
+        } else {
+            sb += wordsSearch._others[t.Index]
+            index = t.End + 1;
+        }
+    }
+    return sb;
+}
+
+function GetWordsSearch(s2t: boolean, srcType: number) {
+    if (s2t) {
+        if (srcType === 0) {
+            if (s2tSearch == null) {
+                s2tSearch = BuildWordsSearch(_s2t_s, _s2t_t);
+            }
+            return s2tSearch;
+        } else if (srcType === 1) {
+            if (t2hkSearch == null) {
+                t2hkSearch = BuildWordsSearch(_t2hk_t, _t2hk_hk);
+            }
+            return t2hkSearch;
+        } else if (srcType == 2) {
+            if (t2twSearch == null) {
+                t2twSearch = BuildWordsSearch(_t2tw_t, _t2tw_tw);
+            }
+            return t2twSearch;
+        }
+    }
+    if (srcType == 0) {
+        if (t2sSearch == null) {
+            t2sSearch = BuildWordsSearch(_t2s_t, _t2s_s);
+        }
+        return t2sSearch;
+    } else if (srcType == 1) {
+        if (hk2tSearch == null) {
+            hk2tSearch = BuildWordsSearch(_t2hk_hk, _t2hk_t);
+        }
+        return hk2tSearch;
+    } else if (srcType == 2) {
+        if (tw2tSearch == null) {
+            tw2tSearch = BuildWordsSearch(_t2tw_tw, _t2tw_t);
+        }
+        return tw2tSearch;
+    }
+    return null;
+}
+
+function BuildWordsSearch(keywords: string[], toWords: any[]) {
+    var wordsSearch = new WordsSearch();
+    wordsSearch.SetKeywords(keywords);
+    wordsSearch._others = toWords;
+    return wordsSearch;
+}
--- a/openRenamerBackend/util/TranslateWord.ts
+++ b/openRenamerBackend/util/TranslateWord.ts
--- a/openRenamerBackend/util/ValUtil.ts
+++ b/openRenamerBackend/util/ValUtil.ts
@ -0,0 +1,8 @@
+/**
+ * null to default
+ * @param value
+ * @param defaultVal
+ */
+export function nullToDefault(value: any, defaultVal: any): any {
+    return value === undefined || value == null ? defaultVal : value;
+}
--- a/openRenamerFront/package.json
+++ b/openRenamerFront/package.json
@ -8,21 +8,21 @@
    "lint": "vue-cli-service lint"
  },
  "dependencies": {
-    "@element-plus/icons-vue": "^2.0.10",
-    "axios": "^0.21.1",
-    "core-js": "^3.6.5",
-    "dayjs": "^1.10.7",
-    "element-plus": "^2.2.25",
-    "vue": "^3.2.45",
-    "vue-router": "^4.0.0-0"
+    "@element-plus/icons-vue": "2.0.10",
+    "axios": "1.6.0",
+    "core-js": "3.35.0",
+    "dayjs": "1.10.7",
+    "element-plus": "2.2.25",
+    "vue": "3.2.45",
+    "vue-router": "4.2.5"
  },
  "devDependencies": {
-    "@vue/cli-plugin-babel": "~5.0.8",
-    "@vue/cli-plugin-router": "~5.0.8",
-    "@vue/cli-service": "~5.0.8",
-    "@vue/compiler-sfc": "^3.0.0",
-    "less": "^3.0.4",
-    "less-loader": "^5.0.0",
-    "prettier": "^2.2.1"
+    "@vue/cli-plugin-babel": "5.0.8",
+    "@vue/cli-plugin-router": "5.0.8",
+    "@vue/cli-service": "5.0.8",
+    "@vue/compiler-sfc": "3.0.0",
+    "less": "3.0.4",
+    "less-loader": "5.0.0",
+    "prettier": "2.2.1"
  }
 }
--- a/openRenamerFront/pnpm-lock.yaml
+++ b/openRenamerFront/pnpm-lock.yaml
--- a/openRenamerFront/src/App.vue
+++ b/openRenamerFront/src/App.vue
@ -1,37 +1,36 @@
 <template>
  <div class="app">
-    <el-menu :default-active="activeIndex" mode="horizontal" background-color="#545c64" text-color="#fff" active-text-color="#ffd04b" router>
+    <el-menu :default-active="activeIndex" mode="horizontal" background-color="#545c64" text-color="#fff"
+             active-text-color="#ffd04b" router>
      <el-menu-item index="/">重命名</el-menu-item>
      <!--      <el-menu-item index="/auto">自动化</el-menu-item>-->
-      <el-sub-menu index="/download">
+      <!-- <el-sub-menu index="/download">
        <template #title>bt下载</template>
        <el-menu-item index="/download/center">下载中心</el-menu-item>
        <el-menu-item index="/download/config">配置</el-menu-item>
-      </el-sub-menu>
+      </el-sub-menu> -->
    </el-menu>
    <div class="content">
-      <router-view />
+      <router-view/>
    </div>
-    <div class="footer">
-      版本：
+    <div class="footer">版本：
      <el-tooltip effect="dark" content="点击查看更新记录" placement="top">
-        <a href="https://blog.fleyx.com/blog/detail/20221130/#%E7%89%88%E6%9C%AC%E6%9B%B4%E6%96%B0%E8%AE%B0%E5%BD%95" target="_blank">
-          {{ version }}</a
-        >
+        <a href="https://blog.fleyx.com/blog/detail/20221130/#%E7%89%88%E6%9C%AC%E6%9B%B4%E6%96%B0%E8%AE%B0%E5%BD%95"
+           target="_blank">
+          {{ version }}</a>
      </el-tooltip>
      &nbsp;&nbsp;
      <template v-if="latestVersion && showNewVersion">
        最新版本:
        <el-tooltip effect="dark" content="点击查看更新文档" placement="top">
-          <a href="https://blog.fleyx.com/blog/detail/20221130/#%E7%89%88%E6%9C%AC%E6%9B%B4%E6%96%B0%E8%AE%B0%E5%BD%95" target="_blank">
-            {{ latestVersion }}</a
-          >
+          <a href="https://blog.fleyx.com/blog/detail/20221130/#%E7%89%88%E6%9C%AC%E6%9B%B4%E6%96%B0%E8%AE%B0%E5%BD%95"
+             target="_blank">
+            {{ latestVersion }}</a>
        </el-tooltip>
        &nbsp;&nbsp;
      </template>
-      开源地址:<a href="https://github.com/FleyX/open-renamer">open-renamer</a> &nbsp;&nbsp;<a href="https://github.com/FleyX/open-renamer/issues"
-        >反馈</a
-      >
+      开源地址:<a href="https://github.com/FleyX/open-renamer" target="_blank">open-renamer</a>
+      &nbsp;&nbsp;<a href="https://github.com/FleyX/open-renamer/issues" target="_blank">反馈</a>
    </div>
  </div>
 </template>
@ -43,10 +42,10 @@ export default {
  name: "Home",
  data() {
    return {
-      version: "1.6.2",
+      version: "1.8.0",
      latestVersion: null,
      activeIndex: location.pathname,
-      showNewVersion: false,
+      showNewVersion: false
    };
  },
  async beforeCreate() {
@ -58,6 +57,7 @@ export default {
    let config = await httpUtil.get("https://s3.fleyx.com/picbed/openRenamer/config.json");
    this.latestVersion = config.version;
    this.showNewVersion = checkVersion(this.version, this.latestVersion);
+
  },
  async mounted() {
    console.log(this.$route);
@ -66,11 +66,8 @@ export default {
 };

 function checkVersion(version, latestVersion) {
-  if (version === latestVersion) {
-    return false;
-  }
  let versions = version.split(".");
-  let latestVersions = latestVersion.split(".");
+  let latestVersions = latestVersion.split('.');
  for (let i = 0; i < versions.length; i++) {
    if (i >= latestVersions.length) {
      return false;
@ -81,7 +78,7 @@ function checkVersion(version, latestVersion) {
      return versionNum < latestVersionNum;
    }
  }
-  return true;
+  return false;
 }
 </script>

--- a/openRenamerFront/src/components/FileChose.vue
+++ b/openRenamerFront/src/components/FileChose.vue
@ -122,7 +122,7 @@ export default {
    },
    //全选
    selectAll(status) {
-      this.filterFileList.filter((item) => !item.isFolder).forEach((item) => (item.checked = status));
+      this.filterFileList.forEach((item) => (item.checked = status));
    },
    //根据index构建路径
    createPath(index) {
--- a/openRenamerFront/src/components/Rule.vue
+++ b/openRenamerFront/src/components/Rule.vue
@ -6,6 +6,7 @@
      <el-menu-item :disabled="editRule != null" index="replace">替换</el-menu-item>
      <el-menu-item :disabled="editRule != null || isAutoPlan" index="serialization">序列化</el-menu-item>
      <el-menu-item :disabled="editRule != null" index="auto">自动识别</el-menu-item>
+      <el-menu-item :disabled="editRule != null" index="translate">简繁转换</el-menu-item>
    </el-menu>
    <div class="rule">
      <insert-rule ref="rule" :editRule="editRule" v-if="currentIndex === 'insert'"/>
@ -13,6 +14,7 @@
      <replace-rule ref="rule" :editRule="editRule" v-else-if="currentIndex === 'replace'"/>
      <serialization-rule ref="rule" :editRule="editRule" v-else-if="currentIndex === 'serialization'"/>
      <auto-rule ref="rule" :editRule="editRule" v-else-if="currentIndex === 'auto'"/>
+      <translate-rule ref="rule" :editRule="editRule" v-else-if="currentIndex === 'translate'"/>
    </div>
  </div>
  <div style="text-align: center">
@ -26,9 +28,10 @@ import DeleteRule from "./rules/DeleteRule.vue";
 import SerializationRule from "./rules/SerializationRule.vue";
 import AutoRule from "./rules/AutoRule";
 import ReplaceRule from "@/components/rules/ReplaceRule";
+import TranslateRule from '@/components/rules/TranslateRule.vue';

 export default {
-  components: {InsertRule, DeleteRule, SerializationRule, AutoRule, ReplaceRule},
+  components: {InsertRule, DeleteRule, SerializationRule, AutoRule, ReplaceRule, TranslateRule},
  props: ["editRule", "isAutoPlan"],
  emits: ["ruleAdd"],
  name: "Rule",
--- a/openRenamerFront/src/components/rules/DeleteRule.vue
+++ b/openRenamerFront/src/components/rules/DeleteRule.vue
@ -6,22 +6,30 @@
        <div>开始</div>
        <div class="line">
          <el-radio v-model="ruleObj.data.start.type" label="location" :disabled="deleteAll">位置：</el-radio>
-          <el-input-number :min="1" size="small" :disabled="deleteAll" v-model="startIndex" />
+          <el-input-number :min="1" size="small" :disabled="deleteAll" v-model="startIndex"/>
        </div>
        <div class="line">
          <el-radio v-model="ruleObj.data.start.type" label="text" :disabled="deleteAll">文本:</el-radio>
-          <el-input v-model="startText" size="small" :disabled="deleteAll" />
+          <el-input v-model="startText" size="small" :disabled="deleteAll"/>
+        </div>
+        <div class="line">
+          <el-radio v-model="ruleObj.data.start.type" label="reg" :disabled="deleteAll">正则:</el-radio>
+          <el-input v-model="startReg" size="small" :disabled="deleteAll"/>
        </div>
      </div>
      <div style="margin-left: 4em">
        <div>结束</div>
        <div class="line">
          <el-radio v-model="ruleObj.data.end.type" label="location" :disabled="deleteAll">位置：</el-radio>
-          <el-input-number size="small" :disabled="deleteAll" v-model="endIndex" />
+          <el-input-number size="small" :disabled="deleteAll" v-model="endIndex"/>
        </div>
        <div class="line">
          <el-radio v-model="ruleObj.data.end.type" label="text" :disabled="deleteAll">文本:</el-radio>
-          <el-input v-model="endText" size="small" :disabled="deleteAll" />
+          <el-input v-model="endText" size="small" :disabled="deleteAll"/>
+        </div>
+        <div class="line">
+          <el-radio v-model="ruleObj.data.end.type" label="reg" :disabled="deleteAll">正则:</el-radio>
+          <el-input v-model="endReg" size="small" :disabled="deleteAll"/>
        </div>
        <div class="line">
          <el-radio v-model="ruleObj.data.end.type" label="end" :disabled="deleteAll">直到末尾</el-radio>
@ -29,14 +37,18 @@
      </div>
    </div>
  </div>
+  <div v-if="ruleObj.data.start.type==='reg' || ruleObj.data.end.type==='reg'" class="flex">
+    <div class="left">区分大小写:</div>
+    <el-switch v-model="ruleObj.data.regI"/>
+  </div>
  <div class="flex">
    <div class="left">全部删除:</div>
-    <el-switch v-model="deleteAll" @change="allDeleteChange" />
+    <el-switch v-model="deleteAll" @change="allDeleteChange"/>
  </div>

  <div class="flex">
    <div class="left">忽略拓展名:</div>
-    <el-switch v-model="ruleObj.data.ignorePostfix" />
+    <el-switch v-model="ruleObj.data.ignorePostfix"/>
  </div>
 </template>

@ -60,28 +72,36 @@ export default {
            value: "",
          },
          ignorePostfix: true,
+          regI: false,//reg是否区分大小写
        },
      },
      startIndex: 1,
      endIndex: 1,
      startText: "",
+      startReg: "",
      endText: "",
+      endReg: "",
      deleteAll: false,
    };
  },
  created() {
    if (this.editRule) {
      this.ruleObj = JSON.parse(JSON.stringify(this.editRule));
-      if (this.ruleObj.data.type == "deletePart") {
-        if (this.ruleObj.data.start.type == "location") {
+      if (this.ruleObj.data.type === "deletePart") {
+        if (this.ruleObj.data.start.type === "location") {
          this.startIndex = parseInt(this.ruleObj.data.start.value);
-        } else {
+        } else if (this.ruleObj.data.start.type === "text") {
          this.startText = this.ruleObj.data.start.value;
-        }
-        if (this.ruleObj.data.end.type == "location") {
-          this.endIndex = parseInt(this.ruleObj.data.end.value);
        } else {
+          this.startReg = this.ruleObj.data.start.value;
+        }
+
+        if (this.ruleObj.data.end.type === "location") {
+          this.endIndex = parseInt(this.ruleObj.data.end.value);
+        } else if (this.ruleObj.data.end.type === "text") {
          this.endText = this.ruleObj.data.end.value;
+        } else {
+          this.endReg = this.ruleObj.data.end.value;
        }
      } else {
        this.deleteAll = true;
@ -91,13 +111,15 @@ export default {
  methods: {
    exportObj() {
      if (this.ruleObj.data.type.length == 0) {
-        this.$message({ message: "请填写完整", type: "warning" });
+        this.$message({message: "请填写完整", type: "warning"});
        return null;
      }
-      if (this.ruleObj.data.type == "deletePart") {
+      if (this.ruleObj.data.type === "deletePart") {
        if (
-          (this.ruleObj.data.start.type == "text" && this.startText.length == 0) ||
-          (this.ruleObj.data.start.type == "text" && this.startText.length == 0)
+            ('text' === this.ruleObj.data.start.type && this.startText.length === 0) ||
+            ('text' === this.ruleObj.data.end.type && this.endText.length === 0) ||
+            ('reg' === this.ruleObj.data.start.type && this.startReg.length === 0) ||
+            ('reg' === this.ruleObj.data.end.type && this.endReg.length === 0)
        ) {
          this.$message({
            message: "开始或者结束文本不能为空",
@ -106,19 +128,20 @@ export default {
          return null;
        }
      }
-      this.ruleObj.data.start.value = this.ruleObj.data.start.type == "location" ? this.startIndex.toString() : this.startText;
-      this.ruleObj.data.end.value = this.ruleObj.data.end.type == "location" ? this.endIndex.toString() : this.endText;
+      let startType = this.ruleObj.data.start.type;
+      this.ruleObj.data.start.value = startType === "location" ? this.startIndex.toString() : startType === 'text' ? this.startText : this.startReg;
+      let endType = this.ruleObj.data.end.type;
+      this.ruleObj.data.end.value = endType === "location" ? this.endIndex.toString() : endType === 'text' ? this.endText : this.endReg;
      let message = `删除:`;
      if (this.deleteAll) {
        message += "全部删除";
      } else {
-        message += `从"${this.ruleObj.data.start.value}"到"${this.ruleObj.data.end.type == "untilEnd" ? "末尾" : this.ruleObj.data.end.value}"`;
+        message += `从"${this.ruleObj.data.start.value}"到"${this.ruleObj.data.end.type === "end" ? "末尾" : this.ruleObj.data.end.value}"`;
      }
      this.ruleObj.message = message;
      return this.ruleObj;
    },
    allDeleteChange(val) {
-      console.log(val);
      this.deleteAll = val;
      this.ruleObj.data.type = val ? "deleteAll" : "deletePart";
    },
--- a/openRenamerFront/src/components/rules/ReplaceRule.vue
+++ b/openRenamerFront/src/components/rules/ReplaceRule.vue
@ -1,11 +1,24 @@
 <template>
  <div class="flex">
    <span class="left">源：</span>
-    <el-input style="width:20em" v-model="ruleObj.data.source"/>
+    <el-input style="width:20em" v-model="ruleObj.data.source" />
  </div>
  <div class="flex">
    <span class="left">目标：</span>
-    <el-input style="width:20em" v-model="ruleObj.data.target"/>
+    <el-input style="width:20em" v-model="ruleObj.data.target" />
+  </div>
+  <div class="flex">
+    <div class="left">正则模式:</div>
+    <el-switch v-model="ruleObj.data.regFlag" />
+    <el-tooltip effect="dark" :content="regTip" placement="right">
+      <el-icon>
+        <InfoFilled />
+      </el-icon>
+    </el-tooltip>
+  </div>
+  <div class="flex">
+    <div class="left">区分大小写:</div>
+    <el-switch v-model="ruleObj.data.regI" />
  </div>
  <div class="flex">
    <span class="left">替换选项：</span>
@ -13,31 +26,38 @@
      <el-radio v-for="item in radioList" :key="item.code" v-model="ruleObj.data.type" :label="item.code"
      >{{ item.label }}
      </el-radio>
-
    </div>
  </div>
+  <div class="flex">
+    <div class="left">忽略拓展名:</div>
+    <el-switch v-model="ruleObj.data.ignorePostfix"/>
+  </div>
 </template>

 <script>
+import { InfoFilled } from "@element-plus/icons-vue";
+import { nullToDefault } from "@/utils/ValUtil";

 export default {
  name: "ReplaceRule",
+  components: { InfoFilled },
  props: ["editRule"],
  data() {
    return {
+      regTip: `开启支持js正则匹配，支持分组匹配,目标字符串支持模板#{groupN},N表示匹配到的第几组。比如#{group1}将被替换为匹配到的第一组数据`,
      radioList: [
        {
          label: "替换第一个",
-          code: 1,
+          code: 1
        },
        {
          label: "替换最后一个",
-          code: 2,
+          code: 2
        },
        {
          label: "全部替换",
-          code: 3,
-        },
+          code: 3
+        }
      ],
      ruleObj: {
        type: "replace",
@ -46,31 +66,37 @@ export default {
          source: "",
          target: "",
          type: 1, //1:替换第一个，2：替换最后一个，3：全部替换
-        },
-      },
+          ignorePostfix: true,  //忽略拓展名
+          regFlag: false,  //正则模式
+          regI: false  //是否区分大小写
+        }
+      }
    };
  },
  created() {
    if (this.editRule) {
      console.log(this.editRule);
      this.ruleObj = JSON.parse(JSON.stringify(this.editRule));
+      //兼容历史数据
+      this.ruleObj.data.ignorePostfix = nullToDefault(this.ruleObj.data.ignorePostfix, true);
+      this.ruleObj.data.regFlag = nullToDefault(this.ruleObj.data.regFlag, false);
    }
  },
  methods: {
    exportObj() {
      if (!this.ruleObj.data.source) {
-        this.$message({message: "源不能为空", type: "warning"});
+        this.$message({ message: "源不能为空", type: "warning" });
        return null;
      }
      if (!this.ruleObj.data.type) {
-        this.$message({message: "请选择替换选项", type: "warning"});
+        this.$message({ message: "请选择替换选项", type: "warning" });
        return null;
      }
      this.ruleObj.message = `替换:将${this.ruleObj.data.source}替换为${this.ruleObj.data.target};`
-          + this.radioList.filter(item => item.code === this.ruleObj.data.type)[0].label;
+        + this.radioList.filter(item => item.code === this.ruleObj.data.type)[0].label;
      return this.ruleObj;
-    },
-  },
+    }
+  }
 };
 </script>

--- a/openRenamerFront/src/components/rules/RuleBlock.vue
+++ b/openRenamerFront/src/components/rules/RuleBlock.vue
@ -90,7 +90,7 @@ export default {
    } else {
      this.chosedTemplate = await HttpUtil.get("/applicationRule/default");
      this.ruleList = JSON.parse(this.chosedTemplate.content);
-      await this.ruleUpdate();
+      await this.ruleUpdate(false);
    }
  },
  watch: {
@ -101,9 +101,14 @@ export default {
  },
  methods: {
    //规则更新
-    ruleUpdate() {
+    ruleUpdate(preview) {
+      if (preview !== undefined && preview === false) {
+        preview = false;
+      } else {
+        preview = true;
+      }
      let temp = this.ruleList.filter((item) => !item.blocked);
-      this.$emit("ruleUpdate", temp);
+      this.$emit("ruleUpdate", temp, preview);
    },
    //模板内容提交
    async templateSubmit() {
--- a/openRenamerFront/src/components/rules/TranslateRule.vue
+++ b/openRenamerFront/src/components/rules/TranslateRule.vue
@ -0,0 +1,77 @@
+<template>
+  <div class="flex">
+    <span class="left">操作：</span>
+    <div class="location">
+      <el-radio v-model="ruleObj.data.type" :label="1">简体转繁体</el-radio>
+      <el-radio v-model="ruleObj.data.type" :label="2">繁体转简体</el-radio>
+    </div>
+  </div>
+
+  <div class="flex">
+    <span class="left">繁体类型：</span>
+    <div class="location">
+      <el-radio v-model="ruleObj.data.traditionalType" :label="0">繁体中文</el-radio>
+      <el-radio v-model="ruleObj.data.traditionalType" :label="1">港澳繁体</el-radio>
+      <el-radio v-model="ruleObj.data.traditionalType" :label="2">台湾正体</el-radio>
+    </div>
+  </div>
+</template>
+
+<script>
+import {InfoFilled} from "@element-plus/icons-vue";
+
+const traTypeMap = {
+  "0": "繁体中文",
+  "1": "港澳繁体",
+  "2": "台湾正体"
+}
+
+export default {
+  name: "InsertRule",
+  props: ["editRule"],
+  components: {InfoFilled},
+  data() {
+    return {
+      ruleObj: {
+        type: "translate",
+        message: "",
+        data: {
+          type: 1,
+          traditionalType: 1,
+        },
+      },
+    };
+  },
+  created() {
+    if (this.editRule) {
+      console.log(this.editRule);
+      this.ruleObj = JSON.parse(JSON.stringify(this.editRule));
+    }
+  },
+  methods: {
+    exportObj() {
+      this.ruleObj.message = `简繁转换:"${this.ruleObj.data.type === 1 ? '简体转繁体' : '繁体转简体'}",繁体类型：${traTypeMap[this.ruleObj.data.traditionalType]}`;
+      return this.ruleObj;
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.flex {
+  display: flex;
+  justify-content: left;
+  align-items: center;
+  padding-top: 1em;
+
+  .left {
+    width: 6em;
+  }
+
+  .location {
+    justify-content: left;
+    //flex-direction: column;
+    display: flex;
+  }
+}
+</style>
--- a/openRenamerFront/src/utils/ValUtil.js
+++ b/openRenamerFront/src/utils/ValUtil.js
@ -0,0 +1,9 @@
+/**
+ * 空转default
+ * @param val
+ * @param defaultVal
+ * @returns {*}
+ */
+export function nullToDefault(val, defaultVal) {
+  return val === undefined || val == null ? defaultVal : val;
+}
--- a/openRenamerFront/src/views/home/Home.vue
+++ b/openRenamerFront/src/views/home/Home.vue
@ -155,9 +155,12 @@ export default {
      this.dialogVisible = false;
      await this.showResult();
    },
-    async ruleUpdate(rules) {
+    async ruleUpdate(rules, preview) {
+      console.log(rules, preview);
      this.ruleList = rules;
-      await this.showResult();
+      if (preview) {
+        await this.showResult();
+      }
    },
    //预览结果
    async showResult() {
--- a/openRenamerFront/vue.config.js
+++ b/openRenamerFront/vue.config.js
@ -1,5 +1,6 @@
 module.exports = {
-  devServer: {
-    proxy: "http://localhost:8089",
-  },
+    devServer: {
+        proxy: "http://localhost:8089",
+    },
+    publicPath: "./"
 };
Author	SHA1	Message	Date
fanxb	51c6ec9986	Merge pull request 'dev' (#52 ) from dev into main Reviewed-on: #52	2024-11-17 20:05:06 +08:00
fanxb	a0e0186c63	feat:应用版本号修改	2024-11-17 20:04:49 +08:00
fanxb	652105f534	deploy:版本号更新	2024-11-17 20:02:02 +08:00
fanxb	bbc4bfd52f	feat:替换支持正则，修复删除bug	2024-11-17 19:57:08 +08:00
fanxb	f85890bda8	feat:删除规则支持正则表达式，同时位置支持负数（从末尾计算，-1表示到倒数第一个字符）	2024-11-07 23:18:38 +08:00
fanxb	67f542fe01	Merge pull request 'deploy:版本号更新' (#51 ) from dev into main Reviewed-on: #51	2024-10-30 21:49:06 +08:00
fanxb	95a382835a	deploy:版本号更新	2024-10-30 21:48:41 +08:00
fanxb	922a74be41	Merge pull request 'deploy:增加loading页面' (#50 ) from dev into main Reviewed-on: #50	2024-10-30 21:39:44 +08:00
fanxb	1ebd7acf5a	deploy:增加loading页面	2024-10-30 21:34:05 +08:00
fanxb	6444d9a612	Merge pull request 'dev' (#49 ) from dev into main Reviewed-on: #49	2024-10-30 20:14:25 +08:00
fanxb	6759333fb4	feat:全选支持选中文件夹	2024-10-30 20:13:55 +08:00
fanxb	62d9296b46	feat:全选支持选中文件夹	2024-10-30 20:13:34 +08:00
fanxb	711423dbe1	feat:增加中英文转换util	2024-09-18 22:21:37 +08:00
fanxb	f3f31e5b5c	feat:增加中英文转换util	2024-09-18 16:58:59 +08:00
fanxb	4c8c1a355c	feat:增加中英文转换util	2024-07-01 21:36:47 +08:00
fanxb	f3bcacfc4a	Merge branch 'refs/heads/qb' into electron # Conflicts: # openRenamerBackend/index.ts # openRenamerBackend/package.json # openRenamerBackend/pnpm-lock.yaml # openRenamerFront/pnpm-lock.yaml # openRenamerFront/src/App.vue	2024-07-01 21:34:38 +08:00
fanxb	2e50b9653a	Merge pull request 'electron' (#48 ) from electron into main Reviewed-on: #48	2024-01-07 15:35:43 +08:00
fanxb	861d5f35bf	feat:支持windows桌面应用	2024-01-07 15:34:24 +08:00
fanxb	55af6bd54e	temp	2024-01-03 22:26:24 +08:00
fanxb	8c6416ec87	temp	2024-01-03 22:11:08 +08:00
fanxb	f04d3bf636	feat:windows打包	2024-01-03 21:07:29 +08:00
fanxb	0b87ecae94	temp	2023-12-20 22:04:06 +08:00
fleyx	9c001c5403	electron兼容	2023-12-20 17:02:56 +08:00
				`@ -0,0 +1 @@`
				`electron_mirror=https://npmmirror.com/mirrors/electron/`
				`@ -0,0 +1 @@`
				`需要下载windows版的node.js压缩包，将其中的node.exe 放到windowes目录下`