Merge remote-tracking branch 'origin/feature-20240104' into feature-20240104

flossom-ui/src/views/system/siteCarouselInfo/index.vue

@@ -581,7 +581,7 @@
 			</el-form>
 			<div slot="footer" class="dialog-footer">
 				<el-button type="primary" @click="submitForm">确 定</el-button>
-				<el-button @click="reset">重 置</el-button>
+				<el-button @click="clickReset">重 置</el-button>
 			</div>
 		</el-dialog>
 	</div>
@@ -779,6 +779,10 @@ export default {
 			this.open = false
 			this.reset()
 		},
+    clickReset(){
+      this.$refs.upload.clearFiles();
+      this.reset();
+    },
 		// 表单重置
 		reset() {
 			this.form = {

flossom-ui/src/views/system/siteInfo/index.vue

@@ -573,7 +573,7 @@
 			</el-form>
 			<div slot="footer" class="dialog-footer">
 				<el-button type="primary" @click="submitForm">确 定</el-button>
-				<el-button @click="reset">重 置</el-button>
+				<el-button @click="clickReset">重 置</el-button>
 			</div>
 		</el-dialog>
 	</div>
@@ -770,6 +770,10 @@ export default {
 			this.open = false
 			this.reset()
 		},
+    clickReset(){
+      this.$refs.upload.clearFiles();
+      this.reset();
+    },
 		// 表单重置
 		reset() {
 			this.form = {
@@ -814,7 +818,6 @@ export default {
 				updateTime: null,
 			}
 			this.resetForm('form')
-      this.$refs.upload.clearFiles();
 		},
 		dateUtil(date) {
 			// 获取年份、月份和日期