integrate core codes

frontend/src/components/Main.vue

@@ -2,7 +2,6 @@
   <LogVue
   v-model="logModal.visible"
   :visible="logModal.visible"
-  :logType="logModal.logType"
   @close="closeLogs"
   />
   <v-container class="fill-height" :loading="loading">
@@ -93,7 +92,7 @@
                       </v-tooltip>
                       v{{ tilesData.sys?.appVersion }}
                     </v-chip>
-                    <v-chip density="compact" color="transparent" style="cursor: pointer;" @click="openLogs('s-ui')">
+                    <v-chip density="compact" color="transparent" style="cursor: pointer;" @click="openLogs()">
                       <v-tooltip activator="parent" location="top">
                         {{ $t('basic.log.title') + " - S-UI" }}
                       </v-tooltip>
@@ -110,12 +109,6 @@
                   <v-col cols="8">
                     <v-chip density="compact" color="success" variant="flat" v-if="tilesData.sbd?.running">{{ $t('yes') }}</v-chip> 
                     <v-chip density="compact" color="error" variant="flat" v-else>{{ $t('no') }}</v-chip>
-                    <v-chip density="compact" color="transparent" style="cursor: pointer;" @click="openLogs('sing-box')">
-                      <v-tooltip activator="parent" location="top">
-                        {{ $t('basic.log.title') + " - Sing-Box" }}
-                      </v-tooltip>
-                      <v-icon icon="mdi-list-box-outline" :color="tilesData.sbd?.running ? 'success': 'error'" />
-                    </v-chip>
                     <v-chip density="compact" color="transparent" v-if="tilesData.sbd?.running && !loading" style="cursor: pointer;" @click="restartSingbox()">
                       <v-tooltip activator="parent" location="top">
                         {{ $t('actions.restartSb') }}
@@ -244,16 +237,13 @@ onBeforeUnmount(() => {
 
 const logModal = ref({
   visible: false,
-  logType: "s-ui"
 })
 
-const openLogs = (logType: string) => {
-  logModal.value.logType = logType
+const openLogs = () => {
   logModal.value.visible = true
 }
 
 const closeLogs = () => {
-  logModal.value.logType = "s-ui"
   logModal.value.visible = false
 }
 

frontend/src/components/tls/Ech.vue

@@ -93,7 +93,10 @@ export default {
   methods: {
     async genECH(){
       this.loading = true
-      const msg = await HttpUtils.get('api/keypairs', { k: "ech", o: this.iTls.server_name?? "''" })
+      const msg = await HttpUtils.get('api/keypairs', {
+        k: "ech",
+        o: this.iTls.server_name?? "''" + "," + this.iTls.ech.pq_signature_schemes_enabled?? false
+      })
       this.loading = false
       if (msg.success && this.iTls.ech && this.oTls.ech) {
         this.iTls.ech.key_path=undefined

frontend/src/layouts/modals/Logs.vue

@@ -3,7 +3,7 @@
     <v-card class="rounded-lg">
       <v-card-title>
         <v-row>
-          <v-col>{{ $t('basic.log.title') + " - " + (logType == 's-ui'? "S-UI" : "Sing-Box") }}</v-col>
+          <v-col>{{ $t('basic.log.title') }}</v-col>
           <v-spacer></v-spacer>
           <v-col cols="auto">
             <v-icon icon="mdi-close" @click="$emit('close')" />
@@ -51,7 +51,7 @@
 import HttpUtils from '@/plugins/httputil';
 
 export default {
-  props: ['logType', 'visible'],
+  props: ['visible'],
   data() {
     return {
       loading: false,
@@ -69,7 +69,7 @@ export default {
   methods: {
     async loadData() {
       this.loading = true
-      const data = await HttpUtils.get('api/logs',{ s: this.$props.logType, c: this.logCount, l: this.logLevel })
+      const data = await HttpUtils.get('api/logs',{ c: this.logCount, l: this.logLevel })
       if (data.success) {
         this.lines = data.obj?? []
         this.loading = false