From 379f4eae98214e0bcc7f2ba8fda8b98cf4371b5e Mon Sep 17 00:00:00 2001
From: zhengkunwang223 <zhengkun@fit2cloud.com>
Date: Tue, 31 Oct 2023 11:29:24 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=8A=A5=E9=94=99=E5=92=8C=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/utils/files/fileinfo.go                      |  4 ++--
 frontend/src/components/del-dialog/index.vue         | 12 ++++++++++++
 frontend/src/components/index.ts                     |  2 ++
 frontend/src/views/host/process/process/index.vue    |  1 +
 .../src/views/host/tool/supervisor/file/index.vue    |  8 ++------
 frontend/src/views/website/runtime/php/index.vue     |  4 ++--
 frontend/src/views/website/ssl/dns-account/index.vue |  2 +-
 .../website/website/config/basic/domain/index.vue    |  2 +-
 .../website/website/config/basic/proxy/index.vue     |  2 +-
 .../website/website/config/basic/redirect/index.vue  |  2 +-
 10 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/backend/utils/files/fileinfo.go b/backend/utils/files/fileinfo.go
index 9ab0a93a066e..7008d9d4d7e7 100644
--- a/backend/utils/files/fileinfo.go
+++ b/backend/utils/files/fileinfo.go
@@ -55,8 +55,8 @@ type FileOption struct {
 	ShowHidden bool   `json:"showHidden"`
 	Page       int    `json:"page"`
 	PageSize   int    `json:"pageSize"`
-	SortBy     string `json:"sortBy" validate:"oneof=name size modTime"`
-	SortOrder  string `json:"sortOrder" validate:"oneof=ascending descending"`
+	SortBy     string `json:"sortBy"`
+	SortOrder  string `json:"sortOrder"`
 }
 
 type FileSearchInfo struct {
diff --git a/frontend/src/components/del-dialog/index.vue b/frontend/src/components/del-dialog/index.vue
index 745a3f14509a..f493a7ae0855 100644
--- a/frontend/src/components/del-dialog/index.vue
+++ b/frontend/src/components/del-dialog/index.vue
@@ -35,8 +35,12 @@
 </template>
 
 <script setup lang="ts">
+import i18n from '@/lang';
+import { MsgSuccess } from '@/utils/message';
 import { onMounted, reactive, ref } from 'vue';
 
+defineOptions({ name: 'OpDialog' });
+
 const form = reactive({
     msgs: [],
     title: '',
@@ -46,6 +50,7 @@ const form = reactive({
 });
 const loading = ref();
 const open = ref();
+const successMsg = ref('');
 
 interface DialogProps {
     title: string;
@@ -54,6 +59,7 @@ interface DialogProps {
 
     api: Function;
     params: Object;
+    successMsg: string;
 }
 const acceptParams = (props: DialogProps): void => {
     form.title = props.title;
@@ -61,6 +67,7 @@ const acceptParams = (props: DialogProps): void => {
     form.msgs = props.msg.split('\n');
     form.api = props.api;
     form.params = props.params;
+    successMsg.value = props.successMsg;
     open.value = true;
 };
 
@@ -74,6 +81,11 @@ const onConfirm = async () => {
             .then(() => {
                 emit('cancel');
                 emit('search');
+                if (successMsg.value) {
+                    MsgSuccess(successMsg.value);
+                } else {
+                    MsgSuccess(i18n.global.t('commons.msg.deleteSuccess'));
+                }
                 open.value = false;
                 loading.value = false;
             })
diff --git a/frontend/src/components/index.ts b/frontend/src/components/index.ts
index 9a13b48ff73a..482f42dbebfc 100644
--- a/frontend/src/components/index.ts
+++ b/frontend/src/components/index.ts
@@ -3,11 +3,13 @@ import LayoutContent from './layout-content/index.vue';
 import RouterButton from './router-button/index.vue';
 import ComplexTable from './complex-table/index.vue';
 import ErrPrompt from './error-prompt/index.vue';
+import OpDialog from './del-dialog/index.vue';
 export default {
     install(app: App) {
         app.component(LayoutContent.name, LayoutContent);
         app.component(RouterButton.name, RouterButton);
         app.component(ComplexTable.name, ComplexTable);
         app.component(ErrPrompt.name, ErrPrompt);
+        app.component(OpDialog.name, OpDialog);
     },
 };
diff --git a/frontend/src/views/host/process/process/index.vue b/frontend/src/views/host/process/process/index.vue
index 693105fcab83..1d242b0528fb 100644
--- a/frontend/src/views/host/process/process/index.vue
+++ b/frontend/src/views/host/process/process/index.vue
@@ -290,6 +290,7 @@ const stopProcess = async (row: any) => {
         ]),
         api: StopProcess,
         params: { PID: row.PID },
+        successMsg: i18n.global.t('commons.msg.operationSuccess'),
     });
 };
 
diff --git a/frontend/src/views/host/tool/supervisor/file/index.vue b/frontend/src/views/host/tool/supervisor/file/index.vue
index 1ee8b97b763a..342d862295f4 100644
--- a/frontend/src/views/host/tool/supervisor/file/index.vue
+++ b/frontend/src/views/host/tool/supervisor/file/index.vue
@@ -18,7 +18,7 @@
         <br />
         <div v-loading="loading">
             <codemirror
-                style="height: calc(100vh - 430px)"
+                style="height: calc(100vh - 430px); min-height: 300px"
                 :autofocus="true"
                 :placeholder="$t('website.noLog')"
                 :indent-with-tab="true"
@@ -50,7 +50,7 @@ import { Codemirror } from 'vue-codemirror';
 import { javascript } from '@codemirror/lang-javascript';
 import { oneDark } from '@codemirror/theme-one-dark';
 import OpDialog from '@/components/del-dialog/index.vue';
-import { onMounted, onUnmounted, reactive, ref, shallowRef } from 'vue';
+import { onUnmounted, reactive, ref, shallowRef } from 'vue';
 import { OperateSupervisorProcessFile } from '@/api/modules/host-tool';
 import i18n from '@/lang';
 import { TabsPaneContext } from 'element-plus';
@@ -155,10 +155,6 @@ const onCloseLog = async () => {
     timer = null;
 };
 
-onMounted(() => {
-    getContent();
-});
-
 onUnmounted(() => {
     onCloseLog();
 });
diff --git a/frontend/src/views/website/runtime/php/index.vue b/frontend/src/views/website/runtime/php/index.vue
index 87f764e05c35..a51078a34c00 100644
--- a/frontend/src/views/website/runtime/php/index.vue
+++ b/frontend/src/views/website/runtime/php/index.vue
@@ -135,8 +135,8 @@ const openDetail = (row: Runtime.Runtime) => {
 
 const openDelete = async (row: Runtime.Runtime) => {
     opRef.value.acceptParams({
-        title: i18n.global.t('commons.msg.delete'),
-        names: [req.name],
+        title: i18n.global.t('commons.msg.deleteTitle'),
+        names: [row.name],
         msg: i18n.global.t('commons.msg.operatorHelper', [
             i18n.global.t('website.runtime'),
             i18n.global.t('commons.msg.delete'),
diff --git a/frontend/src/views/website/ssl/dns-account/index.vue b/frontend/src/views/website/ssl/dns-account/index.vue
index 815166840849..45201c5913e0 100644
--- a/frontend/src/views/website/ssl/dns-account/index.vue
+++ b/frontend/src/views/website/ssl/dns-account/index.vue
@@ -59,7 +59,7 @@ const buttons = [
     {
         label: i18n.global.t('commons.button.delete'),
         click: function (row: Website.DnsAccount) {
-            deleteAccount(row.id);
+            deleteAccount(row);
         },
     },
 ];
diff --git a/frontend/src/views/website/website/config/basic/domain/index.vue b/frontend/src/views/website/website/config/basic/domain/index.vue
index aa817a47dcd2..8b1348880e6e 100644
--- a/frontend/src/views/website/website/config/basic/domain/index.vue
+++ b/frontend/src/views/website/website/config/basic/domain/index.vue
@@ -77,7 +77,7 @@ const openUrl = (domain: string, port: string) => {
 
 const deleteDomain = async (row: Website.Domain) => {
     opRef.value.acceptParams({
-        title: i18n.global.t('commons.msg.delete'),
+        title: i18n.global.t('commons.msg.deleteTitle'),
         names: [row.domain],
         msg: i18n.global.t('commons.msg.operatorHelper', [
             i18n.global.t('website.domain'),
diff --git a/frontend/src/views/website/website/config/basic/proxy/index.vue b/frontend/src/views/website/website/config/basic/proxy/index.vue
index 4e74cc358313..764ee77d9e3e 100644
--- a/frontend/src/views/website/website/config/basic/proxy/index.vue
+++ b/frontend/src/views/website/website/config/basic/proxy/index.vue
@@ -131,7 +131,7 @@ const openEditFile = (proxyConfig: Website.ProxyConfig) => {
 const deleteProxy = async (proxyConfig: Website.ProxyConfig) => {
     proxyConfig.operate = 'delete';
     opRef.value.acceptParams({
-        title: i18n.global.t('commons.msg.delete'),
+        title: i18n.global.t('commons.msg.deleteTitle'),
         names: [proxyConfig.name],
         msg: i18n.global.t('commons.msg.operatorHelper', [
             i18n.global.t('website.proxy'),
diff --git a/frontend/src/views/website/website/config/basic/redirect/index.vue b/frontend/src/views/website/website/config/basic/redirect/index.vue
index 3675b3ba896d..7c2d5744a6be 100644
--- a/frontend/src/views/website/website/config/basic/redirect/index.vue
+++ b/frontend/src/views/website/website/config/basic/redirect/index.vue
@@ -146,7 +146,7 @@ const openEditFile = (proxyConfig: Website.RedirectConfig) => {
 const deleteProxy = async (redirectConfig: Website.RedirectConfig) => {
     redirectConfig.operate = 'delete';
     opRef.value.acceptParams({
-        title: i18n.global.t('commons.msg.delete'),
+        title: i18n.global.t('commons.msg.deleteTitle'),
         names: [redirectConfig.name],
         msg: i18n.global.t('commons.msg.operatorHelper', [
             i18n.global.t('website.redirect'),