diff --git a/openRenamerFront/src/components/FileChose.vue b/openRenamerFront/src/components/FileChose.vue
index 97b1e0b..a980169 100644
--- a/openRenamerFront/src/components/FileChose.vue
+++ b/openRenamerFront/src/components/FileChose.vue
@@ -13,6 +13,7 @@
全选
全不选
+ 刷新
{{ item.name }}
@@ -34,7 +35,6 @@ export default {
return {
isWindows: false,
fileList: [], //路径下的文件节点
- chosedFileList: [], //选中的文件节点
pathList: [], //选择的路径
loading: false, //加载
filterText: "", //关键字过滤
@@ -50,7 +50,11 @@ export default {
this.isWindows = await HttpUtil.get("/file/isWindows");
await this.breadcrumbClick(-1);
},
+
methods: {
+ async refresh() {
+ await this.breadcrumbClick(this.pathList.length - 1);
+ },
//点击面包蟹
async breadcrumbClick(index) {
this.loading = true;
@@ -98,6 +102,7 @@ export default {
return;
}
this.$emit("addData", chosedFiles);
+ this.fileList.forEach((item) => (item.checked = false));
},
},
};
diff --git a/openRenamerFront/src/views/home/Home.vue b/openRenamerFront/src/views/home/Home.vue
index a1ccbfa..95e0129 100644
--- a/openRenamerFront/src/views/home/Home.vue
+++ b/openRenamerFront/src/views/home/Home.vue
@@ -14,22 +14,29 @@
删除
-
-
-
-
- {{ item.name }}
+
+
+
+
{{ item.name }}
+
-
-
-
- {{ changedFileList.length > index ? changedFileList[index].name : "" }}
+
+
+
+
+
+
{{ item.name }}
+
{{ item.errorMessage }}
@@ -61,8 +68,8 @@ export default {
loading: false, //遮罩
dialogVisible: false, //新增文件弹窗
ruleList: [], //当前生效的规则
- fileList: [],
- changedFileList: [],
+ fileList: [], //选择的文件
+ changedFileList: [], //执行修改后的文件
needPreview: false, //需要点击预览
applicationRule: null, //当前应用的应用规则模板
};
@@ -160,17 +167,16 @@ export default {
.fileBlock {
margin-top: 20px;
+ display: flex;
.oneLine {
display: flex;
- border-top: 1px solid rgb(228, 224, 224);
- .left {
- flex: 1;
- }
- .right {
- flex: 1;
- display: flex;
- align-items: center;
- }
+ justify-content: space-between;
+ align-items: center;
+ border-top: 1px solid rgb(214, 212, 212);
+ height: 1.5em;
+ padding-top: 0.1em;
+ padding-bottom: 0.1em;
+ padding-right: 0.2em;
}
.oneFileName {
diff --git a/openRenamerFront/src/views/home/components/RuleBlock.vue b/openRenamerFront/src/views/home/components/RuleBlock.vue
index 3b7298f..3e5c134 100644
--- a/openRenamerFront/src/views/home/components/RuleBlock.vue
+++ b/openRenamerFront/src/views/home/components/RuleBlock.vue
@@ -22,7 +22,7 @@
-
+
@@ -115,8 +115,6 @@ export default {
},
//新增规则
async ruleAdd(data) {
- data.checked = false;
- data.blocked = false;
if (this.editRule != null) {
let index = this.ruleList.indexOf(this.editRule);
this.ruleList.splice(index, 1, data);
@@ -124,12 +122,18 @@ export default {
} else {
this.ruleList.push(data);
}
+ data.checked = false;
this.ruleUpdate();
this.addRuleDialogShow = false;
},
//禁用/启用
async block() {
- this.ruleList.filter((item) => item.checked).forEach((item) => (item.blocked = !item.blocked));
+ this.ruleList
+ .filter((item) => item.checked)
+ .forEach((item) => {
+ item.blocked = !item.blocked;
+ item.checked = false;
+ });
this.ruleUpdate();
},
//删除规则
@@ -140,7 +144,7 @@ export default {
//编辑规则
editClick() {
this.editRule = this.checkedRules[0];
- this.ruleDialogShow = true;
+ this.addRuleDialogShow = true;
},
},
};