fix: 修改应用导入恢复时数据库连接信息 (#1367)

Co-authored-by: 凹凸曼 <xx@xx>

.github/workflows/release-drafter.yml

@@ -40,4 +40,13 @@ jobs:
             dist/*.tar.gz
             dist/checksums.txt
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Setup OSSUTIL
+        uses: yizhoumo/setup-ossutil@v1
+        with:
+          endpoint: ${{ secrets.OSS_ENDPOINT }}
+          access-key-id: ${{ secrets.OSS_ACCESS_KEY_ID }}
+          access-key-secret: ${{ secrets.OSS_ACCESS_KEY_SECRET }}
+          ossutil-version: '1.7.14'
+      - name: Upload Assets to OSS
+        run: ossutil cp -r dist/ oss://resource-fit2cloud-com/1panel/package/stable/${{  github.ref_name }}/release/ --include "*.tar.gz" --include "checksums.txt" --only-current-dir

backend/app/dto/cronjob.go

@@ -6,7 +6,7 @@ type CronjobCreate struct {
 	Name     string `json:"name" validate:"required"`
 	Type     string `json:"type" validate:"required"`
 	SpecType string `json:"specType" validate:"required"`
-	Week     int    `json:"week" validate:"number,max=7,min=1"`
+	Week     int    `json:"week" validate:"number,max=6,min=0"`
 	Day      int    `json:"day" validate:"number"`
 	Hour     int    `json:"hour" validate:"number"`
 	Minute   int    `json:"minute" validate:"number"`
@@ -27,7 +27,7 @@ type CronjobUpdate struct {
 	ID       uint   `json:"id" validate:"required"`
 	Name     string `json:"name" validate:"required"`
 	SpecType string `json:"specType" validate:"required"`
-	Week     int    `json:"week" validate:"number,max=7,min=1"`
+	Week     int    `json:"week" validate:"number,max=6,min=0"`
 	Day      int    `json:"day" validate:"number"`
 	Hour     int    `json:"hour" validate:"number"`
 	Minute   int    `json:"minute" validate:"number"`

backend/app/repo/app_install_resource.go

@@ -19,6 +19,7 @@ type IAppInstallResourceRpo interface {
 	GetFirst(opts ...DBOption) (model.AppInstallResource, error)
 	Create(ctx context.Context, resource *model.AppInstallResource) error
 	DeleteBy(ctx context.Context, opts ...DBOption) error
+	BatchUpdateBy(maps map[string]interface{}, opts ...DBOption) error
 }
 
 func NewIAppInstallResourceRpo() IAppInstallResourceRpo {
@@ -71,3 +72,11 @@ func (a AppInstallResourceRpo) Create(ctx context.Context, resource *model.AppIn
 func (a AppInstallResourceRpo) DeleteBy(ctx context.Context, opts ...DBOption) error {
 	return getTx(ctx, opts...).Delete(&model.AppInstallResource{}).Error
 }
+
+func (a *AppInstallResourceRpo) BatchUpdateBy(maps map[string]interface{}, opts ...DBOption) error {
+	db := getDb(opts...).Model(&model.AppInstallResource{})
+	if len(opts) == 0 {
+		db = db.Where("1=1")
+	}
+	return db.Updates(&maps).Error
+}

backend/app/service/app_utils.go

@@ -296,6 +296,10 @@ func upgradeInstall(installId uint, detailId uint) error {
 			return
 		}
 		config := getAppCommonConfig(envs)
+		if config.ContainerName == "" {
+			config.ContainerName = install.ContainerName
+			envs[constant.ContainerName] = install.ContainerName
+		}
 		config.Advanced = true
 		if upErr = addDockerComposeCommonParam(composeMap, install.ServiceName, config, envs); upErr != nil {
 			return
@@ -314,10 +318,6 @@ func upgradeInstall(installId uint, detailId uint) error {
 		install.Version = detail.Version
 		install.AppDetailId = detailId
 
-		go func() {
-			_, _ = http.Get(detail.DownloadCallBackUrl)
-		}()
-
 		if out, err := compose.Down(install.GetComposePath()); err != nil {
 			if out != "" {
 				upErr = errors.New(out)

backend/app/service/backup_app.go

@@ -99,7 +99,7 @@ func handleAppBackup(install *model.AppInstall, backupDir, fileName string) erro
 		return err
 	}
 
-	appPath := fmt.Sprintf("%s/%s", install.GetPath(), install.Name)
+	appPath := install.GetPath()
 	if err := handleTar(appPath, tmpDir, "app.tar.gz", ""); err != nil {
 		return err
 	}
@@ -148,7 +148,7 @@ func handleAppRecover(install *model.AppInstall, recoverFile string, isRollback
 	if err := json.Unmarshal(appjson, &oldInstall); err != nil {
 		return fmt.Errorf("unmarshal app.json failed, err: %v", err)
 	}
-	if oldInstall.App.Key != install.App.Key || oldInstall.Name != install.Name || oldInstall.Version != install.Version || oldInstall.ID != install.ID {
+	if oldInstall.App.Key != install.App.Key || oldInstall.Name != install.Name {
 		return errors.New("the current backup file does not match the application")
 	}
 
@@ -172,6 +172,7 @@ func handleAppRecover(install *model.AppInstall, recoverFile string, isRollback
 		}()
 	}
 
+	newEnvFile := ""
 	resource, _ := appInstallResourceRepo.GetFirst(appInstallResourceRepo.WithAppInstallId(install.ID))
 	if resource.ID != 0 && install.App.Key != "mysql" {
 		mysqlInfo, err := appInstallRepo.LoadBaseInfo(resource.Key, "")
@@ -182,7 +183,22 @@ func handleAppRecover(install *model.AppInstall, recoverFile string, isRollback
 		if err != nil {
 			return err
 		}
-		if err := handleMysqlRecover(mysqlInfo, tmpPath, db.Name, fmt.Sprintf("%s.sql.gz", install.Name), true); err != nil {
+
+		newDB, envMap, err := reCreateDB(db.ID, oldInstall.Env)
+		if err != nil {
+			return err
+		}
+		oldHost := fmt.Sprintf("\"PANEL_DB_HOST\":\"%v\"", envMap["PANEL_DB_HOST"].(string))
+		newHost := fmt.Sprintf("\"PANEL_DB_HOST\":\"%v\"", mysqlInfo.ServiceName)
+		oldInstall.Env = strings.ReplaceAll(oldInstall.Env, oldHost, newHost)
+		envMap["PANEL_DB_HOST"] = mysqlInfo.ServiceName
+		newEnvFile, err = coverEnvJsonToStr(oldInstall.Env)
+		if err != nil {
+			return err
+		}
+		_ = appInstallResourceRepo.BatchUpdateBy(map[string]interface{}{"resource_id": newDB.ID}, commonRepo.WithByID(resource.ID))
+
+		if err := handleMysqlRecover(mysqlInfo, tmpPath, newDB.Name, fmt.Sprintf("%s.sql.gz", install.Name), true); err != nil {
 			global.LOG.Errorf("handle recover from sql.gz failed, err: %v", err)
 			return err
 		}
@@ -193,11 +209,50 @@ func handleAppRecover(install *model.AppInstall, recoverFile string, isRollback
 		return err
 	}
 
-	oldInstall.Status = constant.Running
-	if err := appInstallRepo.Save(context.Background(), install); err != nil {
+	if len(newEnvFile) != 0 {
+		envPath := fmt.Sprintf("%s/%s/%s/.env", constant.AppInstallDir, install.App.Key, install.Name)
+		file, err := os.OpenFile(envPath, os.O_WRONLY|os.O_TRUNC, 0640)
+		if err != nil {
+			return err
+		}
+		defer file.Close()
+		_, _ = file.WriteString(newEnvFile)
+	}
+
+	oldInstall.ID = install.ID
+	oldInstall.Status = constant.StatusRunning
+	oldInstall.AppId = install.AppId
+	oldInstall.AppDetailId = install.AppDetailId
+	if err := appInstallRepo.Save(context.Background(), &oldInstall); err != nil {
 		global.LOG.Errorf("save db app install failed, err: %v", err)
 		return err
 	}
 	isOk = true
 	return nil
 }
+
+func reCreateDB(dbID uint, oldEnv string) (*model.DatabaseMysql, map[string]interface{}, error) {
+	mysqlService := NewIMysqlService()
+	ctx := context.Background()
+	_ = mysqlService.Delete(ctx, dto.MysqlDBDelete{ID: dbID, DeleteBackup: true, ForceDelete: true})
+
+	envMap := make(map[string]interface{})
+	if err := json.Unmarshal([]byte(oldEnv), &envMap); err != nil {
+		return nil, envMap, err
+	}
+	oldName, _ := envMap["PANEL_DB_NAME"].(string)
+	oldUser, _ := envMap["PANEL_DB_USER"].(string)
+	oldPassword, _ := envMap["PANEL_DB_USER_PASSWORD"].(string)
+	createDB, err := mysqlService.Create(context.Background(), dto.MysqlDBCreate{
+		Name:       oldName,
+		Format:     "utf8mb4",
+		Username:   oldUser,
+		Password:   oldPassword,
+		Permission: "%",
+	})
+	if err != nil {
+		return nil, envMap, err
+	}
+
+	return createDB, envMap, nil
+}

backend/app/service/cronjob_helper.go

@@ -196,7 +196,7 @@ func handleTar(sourceDir, targetDir, name, exclusionRules string) error {
 	path := ""
 	if strings.Contains(sourceDir, "/") {
 		itemDir := strings.ReplaceAll(sourceDir[strings.LastIndex(sourceDir, "/"):], "/", "")
-		aheadDir := strings.ReplaceAll(sourceDir, itemDir, "")
+		aheadDir := sourceDir[:strings.LastIndex(sourceDir, "/")]
 		path += fmt.Sprintf("-C %s %s", aheadDir, itemDir)
 	} else {
 		path = sourceDir

backend/app/service/database_mysql.go

@@ -14,7 +14,6 @@ import (
 
 	"github.com/1Panel-dev/1Panel/backend/app/dto"
 	"github.com/1Panel-dev/1Panel/backend/app/model"
-	"github.com/1Panel-dev/1Panel/backend/app/repo"
 	"github.com/1Panel-dev/1Panel/backend/buserr"
 	"github.com/1Panel-dev/1Panel/backend/constant"
 	"github.com/1Panel-dev/1Panel/backend/global"
@@ -100,7 +99,7 @@ func (u *MysqlService) Create(ctx context.Context, req dto.MysqlDBCreate) (*mode
 		}
 		return nil, err
 	}
-	if err := u.createUser(app, req); err != nil {
+	if err := u.createUser(app.ContainerName, app.Password, app.Version, req); err != nil {
 		return nil, err
 	}
 
@@ -291,7 +290,7 @@ func (u *MysqlService) ChangeAccess(info dto.ChangeDBInfo) error {
 		}
 	}
 
-	if err := u.createUser(app, dto.MysqlDBCreate{
+	if err := u.createUser(app.ContainerName, app.Password, app.Version, dto.MysqlDBCreate{
 		Username:   mysql.Username,
 		Name:       mysql.Name,
 		Permission: info.Value,
@@ -470,7 +469,7 @@ func (u *MysqlService) LoadStatus() (*dto.MysqlStatus, error) {
 	return &info, nil
 }
 
-func (u *MysqlService) createUser(app *repo.RootInfo, req dto.MysqlDBCreate) error {
+func (u *MysqlService) createUser(container, password, version string, req dto.MysqlDBCreate) error {
 	var userlist []string
 	if strings.Contains(req.Permission, ",") {
 		ips := strings.Split(req.Permission, ",")
@@ -484,32 +483,35 @@ func (u *MysqlService) createUser(app *repo.RootInfo, req dto.MysqlDBCreate) err
 	}
 
 	for _, user := range userlist {
-		if err := excSQL(app.ContainerName, app.Password, fmt.Sprintf("create user %s identified by '%s';", user, req.Password)); err != nil {
-			handleCreateError(req.Name, userlist, app)
+		if err := excSQL(container, password, fmt.Sprintf("create user %s identified by '%s';", user, req.Password)); err != nil {
 			if strings.Contains(err.Error(), "ERROR 1396") {
+				handleCreateError(container, password, req.Name, userlist, false)
 				return buserr.New(constant.ErrUserIsExist)
 			}
+			handleCreateError(container, password, req.Name, userlist, true)
 			return err
 		}
 		grantStr := fmt.Sprintf("grant all privileges on `%s`.* to %s", req.Name, user)
 		if req.Name == "*" {
 			grantStr = fmt.Sprintf("grant all privileges on *.* to %s", user)
 		}
-		if strings.HasPrefix(app.Version, "5.7") {
+		if strings.HasPrefix(version, "5.7") {
 			grantStr = fmt.Sprintf("%s identified by '%s' with grant option;", grantStr, req.Password)
 		}
-		if err := excSQL(app.ContainerName, app.Password, grantStr); err != nil {
-			handleCreateError(req.Name, userlist, app)
+		if err := excSQL(container, password, grantStr); err != nil {
+			handleCreateError(container, password, req.Name, userlist, true)
 			return err
 		}
 	}
 	return nil
 }
-func handleCreateError(dbName string, userlist []string, app *repo.RootInfo) {
-	_ = excSQL(app.ContainerName, app.Password, fmt.Sprintf("drop database `%s`", dbName))
-	for _, user := range userlist {
-		if err := excSQL(app.ContainerName, app.Password, fmt.Sprintf("drop user if exists %s", user)); err != nil {
-			global.LOG.Errorf("drop user failed, err: %v", err)
+func handleCreateError(contaienr, password, dbName string, userlist []string, dropUser bool) {
+	_ = excSQL(contaienr, password, fmt.Sprintf("drop database `%s`", dbName))
+	if dropUser {
+		for _, user := range userlist {
+			if err := excSQL(contaienr, password, fmt.Sprintf("drop user if exists %s", user)); err != nil {
+				global.LOG.Errorf("drop user failed, err: %v", err)
+			}
 		}
 	}
 }

backend/app/service/ssh.go

@@ -231,7 +231,8 @@ func (u *SSHService) LoadLog(req dto.SearchSSHLog) (*dto.SSHLog, error) {
 	}
 	for i := 0; i < len(fileList); i++ {
 		if strings.HasPrefix(path.Base(fileList[i]), "secure") {
-			dataItem := loadFailedSecureDatas(fmt.Sprintf("cat %s | grep -a 'Failed password for' | grep -v 'invalid' %s", fileList[i], command))
+			commandItem := fmt.Sprintf("cat %s | grep -a 'Failed password for' | grep -v 'invalid' %s", fileList[i], command)
+			dataItem := loadFailedSecureDatas(commandItem)
 			data.FailedCount += len(dataItem)
 			data.TotalCount += len(dataItem)
 			if req.Status != constant.StatusSuccess {
@@ -239,14 +240,16 @@ func (u *SSHService) LoadLog(req dto.SearchSSHLog) (*dto.SSHLog, error) {
 			}
 		}
 		if strings.HasPrefix(path.Base(fileList[i]), "auth.log") {
-			dataItem := loadFailedAuthDatas(fmt.Sprintf("cat %s | grep -a 'Connection closed by authenticating user' | grep -a 'preauth' %s", fileList[i], command))
+			commandItem := fmt.Sprintf("cat %s | grep -a 'Connection closed by authenticating user' | grep -a 'preauth' %s", fileList[i], command)
+			dataItem := loadFailedAuthDatas(commandItem)
 			data.FailedCount += len(dataItem)
 			data.TotalCount += len(dataItem)
 			if req.Status != constant.StatusSuccess {
 				data.Logs = append(data.Logs, dataItem...)
 			}
 		}
-		dataItem := loadSuccessDatas(fmt.Sprintf("cat %s | grep Accepted %s", fileList[i], command))
+		commandItem := fmt.Sprintf("cat %s | grep -a Accepted %s", fileList[i], command)
+		dataItem := loadSuccessDatas(commandItem)
 		data.TotalCount += len(dataItem)
 		if req.Status != constant.StatusFailed {
 			data.Logs = append(data.Logs, dataItem...)
@@ -257,6 +260,18 @@ func (u *SSHService) LoadLog(req dto.SearchSSHLog) (*dto.SSHLog, error) {
 		return nil, nil
 	}
 
+	var itemDatas []dto.SSHHistory
+	total, start, end := len(data.Logs), (req.Page-1)*req.PageSize, req.Page*req.PageSize
+	if start > total {
+		itemDatas = make([]dto.SSHHistory, 0)
+	} else {
+		if end >= total {
+			end = total
+		}
+		itemDatas = data.Logs[start:end]
+	}
+	data.Logs = itemDatas
+
 	timeNow := time.Now()
 	nyc, _ := time.LoadLocation(common.LoadTimeZone())
 	qqWry, err := qqwry.NewQQwry()
@@ -271,18 +286,6 @@ func (u *SSHService) LoadLog(req dto.SearchSSHLog) (*dto.SSHLog, error) {
 	}
 	data.Logs = itemLogs
 
-	var itemDatas []dto.SSHHistory
-	total, start, end := len(data.Logs), (req.Page-1)*req.PageSize, req.Page*req.PageSize
-	if start > total {
-		itemDatas = make([]dto.SSHHistory, 0)
-	} else {
-		if end >= total {
-			end = total
-		}
-		itemDatas = data.Logs[start:end]
-	}
-	data.Logs = itemDatas
-
 	return &data, nil
 }
 

backend/init/business/business.go

@@ -22,7 +22,7 @@ func syncApp() {
 	}
 	global.LOG.Info("sync app start...")
 	if err := service.NewIAppService().SyncAppListFromRemote(); err != nil {
-		global.LOG.Errorf("sync app error: %s", err.Error())
+		global.LOG.Errorf("sync app error")
 		return
 	}
 	global.LOG.Info("sync app successful")

backend/utils/cloud_storage/client/sftp.go

@@ -1,8 +1,8 @@
 package client
 
 import (
+	"bufio"
 	"fmt"
-	"io"
 	"net"
 	"os"
 	"path"
@@ -75,11 +75,18 @@ func (s sftpClient) Upload(src, target string) (bool, error) {
 		return false, err
 	}
 	defer dstFile.Close()
-	ff, err := io.ReadAll(srcFile)
-	if err != nil {
-		return false, err
+
+	reader := bufio.NewReaderSize(srcFile, 128*1024*1024)
+	for {
+		chunk, err := reader.Peek(8 * 1024 * 1024)
+		if len(chunk) != 0 {
+			_, _ = dstFile.Write(chunk)
+			_, _ = reader.Discard(len(chunk))
+		}
+		if err != nil {
+			break
+		}
 	}
-	_, _ = dstFile.Write(ff)
 	return true, nil
 }
 

frontend/src/components/drawer-header/index.vue

@@ -9,6 +9,9 @@
             <el-divider v-if="slots.buttons" direction="vertical" />
             <slot v-if="slots.buttons" name="buttons"></slot>
         </template>
+        <template #extra>
+            <slot v-if="slots.extra" name="extra"></slot>
+        </template>
     </el-page-header>
 </template>
 

frontend/src/components/system-upgrade/index.vue

@@ -56,7 +56,7 @@
             <MdEditor
                 v-model="upgradeInfo.releaseNote"
                 previewOnly
-                :theme="globalStore.$state.themeConfig.theme || 'light'"
+                :theme="globalStore.$state.themeConfig.theme === 'dark' ? 'dark' : 'light'"
             />
         </div>
         <template #footer>

frontend/src/components/upload/index.vue

@@ -280,7 +280,16 @@ const buttons = [
     {
         label: i18n.global.t('commons.button.recover'),
         click: (row: File.File) => {
-            onRecover(row);
+            if (type.value !== 'app') {
+                onRecover(row);
+            } else {
+                ElMessageBox.confirm(i18n.global.t('app.restoreWarn'), i18n.global.t('commons.button.recover'), {
+                    confirmButtonText: i18n.global.t('commons.button.confirm'),
+                    cancelButtonText: i18n.global.t('commons.button.cancel'),
+                }).then(async () => {
+                    onRecover(row);
+                });
+            }
         },
     },
     {

frontend/src/lang/modules/en.ts

@@ -97,6 +97,7 @@ const message = {
             updateSuccess: 'Update Success',
             uploadSuccess: 'Update Success',
             operate: 'Operate',
+            operateConfirm: 'If you are sure about the operation, please input it manually',
             inputOrSelect: 'Please select or enter',
             backupSuccess: 'Backup Success',
             unSupportType: 'Current file type is not supported!',
@@ -553,6 +554,7 @@ const message = {
         cache: 'Cache',
 
         volume: 'Volume',
+        volumeDir: 'Volume dir',
         volumeName: 'Name',
         nfsEnable: 'Enable NFS storage',
         nfsAddress: 'Address',
@@ -632,8 +634,10 @@ const message = {
     cronjob: {
         cronTask: 'Task',
         changeStatus: 'Change status',
-        disableMsg: 'The cronjob cannot continue to run after it is stopped. Do you want to stop it?',
-        enableMsg: 'The cronjob has been stopped. Enable now?',
+        disableMsg:
+            'Stopping the scheduled task will result in the task no longer automatically executing. Do you want to continue?',
+        enableMsg:
+            'Enabling the scheduled task will allow the task to automatically execute on a regular basis. Do you want to continue?',
         taskType: 'Task type',
         record: 'Records',
         shell: 'Shell script',
@@ -1139,7 +1143,7 @@ const message = {
         backupdate: 'Backup time',
         restore: 'Restore',
         restoreWarn:
-            'The restore operation will restart the application and replace the data. This operation cannot be rolled back. Do you want to continue?',
+            'The recovery operation will delete the current data of this application and perform a restart. This action is irreversible. Do you wish to continue?',
         update: 'update',
         upgrade: 'upgrade',
         versionSelect: 'Please select a version',

frontend/src/lang/modules/zh.ts

@@ -564,6 +564,7 @@ const message = {
         gateway: '网关',
 
         volume: '存储卷',
+        volumeDir: '存储卷目录',
         nfsEnable: '启用 NFS 存储',
         nfsAddress: '地址',
         nfsAddressHelper: '支持输入 ip 或者域名',
@@ -633,8 +634,8 @@ const message = {
     cronjob: {
         cronTask: '计划任务',
         changeStatus: '状态修改',
-        disableMsg: '计划任务停止后将无法继续运行，是否停止？',
-        enableMsg: '该计划任务已停止，是否启用？',
+        disableMsg: '停止计划任务会导致该任务不再自动执行。是否继续？',
+        enableMsg: '启用计划任务会让该任务定期自动执行。是否继续？',
         taskType: '任务类型',
         record: '报告',
         shell: 'Shell 脚本',
@@ -1109,7 +1110,7 @@ const message = {
         backupPath: '文件路径',
         backupdate: '备份时间',
         restore: '恢复',
-        restoreWarn: '恢复操作会重启应用,并替换数据,此操作不可回滚,是否继续?',
+        restoreWarn: '恢复操作将删除该应用当前数据并重启。此操作不可回滚，是否继续?',
         update: '更新',
         upgrade: '升级',
         versionSelect: '请选择版本',
@@ -1157,8 +1158,8 @@ const message = {
         containerName: '容器名称',
         containerNameHelper: '可以为空，为空自动生成',
         allowPort: '端口外部访问',
-        allowPortHelper: '允许外部端口访问会放开防火墙端口，php运行环境请勿放开',
-        appInstallWarn: '应用默认不放开外部访问端口，可以在高级设置中选择放开',
+        allowPortHelper: '允许端口外部访问会放开防火墙端口，php运行环境请勿放开',
+        appInstallWarn: '应用端口默认不允许外部访问，可以在下方高级设置中选择放开',
         upgradeStart: '开始升级！请稍后刷新页面',
         toFolder: '进入安装目录',
         editCompose: '编辑 compose 文件',

frontend/src/layout/index.vue

@@ -39,6 +39,7 @@ let timer: NodeJS.Timer | null = null;
 
 const classObj = computed(() => {
     return {
+        fullScreen: globalStore.isFullScreen,
         hideSidebar: menuStore.isCollapse,
         openSidebar: !menuStore.isCollapse,
         mobile: globalStore.device === DeviceType.Mobile,
@@ -162,6 +163,12 @@ onMounted(() => {
         width: calc(100% - var(--panel-menu-hide-width));
     }
 }
+
+.fullScreen {
+    .main-container {
+        margin-left: 0px;
+    }
+}
 // for mobile response 适配移动端
 .mobile {
     .main-container {

frontend/src/styles/common.scss

@@ -13,6 +13,11 @@
     align-items: center;
 }
 
+.flx-wrap {
+    display: flex;
+    flex-wrap: wrap;
+}
+
 .clearfix::after {
     display: block;
     height: 0;

frontend/src/styles/moblie.scss

@@ -65,4 +65,19 @@
             }
         }
     }
+
+    .database-status {
+        .title {
+            margin-left: 10px !important;
+        }
+        .content {
+            margin-left: 10px !important;
+        }
+    }
+
+    @media only screen and (max-width: 768px) {
+        .el-col-xs-24 {
+            margin-bottom: 10px;
+        }
+    }
 }

frontend/src/views/app-store/detail/index.vue

@@ -83,7 +83,11 @@
                 </div>
             </div>
             <div style="margin-left: 10px">
-                <MdEditor v-model="app.readMe" previewOnly :themes="globalStore.$state.themeConfig.theme || 'light'" />
+                <MdEditor
+                    v-model="app.readMe"
+                    previewOnly
+                    :theme="globalStore.$state.themeConfig.theme === 'dark' ? 'dark' : 'light'"
+                />
             </div>
         </template>
     </LayoutContent>

frontend/src/views/app-store/detail/install/index.vue

@@ -11,7 +11,7 @@
         </template>
         <el-row v-loading="loading">
             <el-col :span="22" :offset="1">
-                <el-alert type="info" :closable="false">
+                <el-alert type="error" :closable="false">
                     <p>{{ $t('app.appInstallWarn') }}</p>
                 </el-alert>
                 <el-form

frontend/src/views/container/container/log/index.vue

@@ -1,8 +1,17 @@
 <template>
     <div>
-        <el-drawer v-model="logVisiable" :destroy-on-close="true" :close-on-click-modal="false" size="50%">
+        <el-drawer
+            v-model="logVisiable"
+            :destroy-on-close="true"
+            :close-on-click-modal="false"
+            :size="globalStore.isFullScreen ? '100%' : '50%'"
+        >
             <template #header>
-                <DrawerHeader :header="$t('commons.button.log')" :resource="logSearch.container" :back="handleClose" />
+                <DrawerHeader :header="$t('commons.button.log')" :resource="logSearch.container" :back="handleClose">
+                    <template #extra>
+                        <el-button @click="toggleFullscreen" class="fullScreen" icon="FullScreen" plain></el-button>
+                    </template>
+                </DrawerHeader>
             </template>
             <div>
                 <el-select @change="searchLogs" style="width: 30%; float: left" v-model="logSearch.mode">
@@ -47,13 +56,15 @@
 import { cleanContainerLog, logContainer } from '@/api/modules/container';
 import i18n from '@/lang';
 import { dateFormatForName } from '@/utils/util';
-import { nextTick, onBeforeUnmount, reactive, ref, shallowRef } from 'vue';
+import { nextTick, onBeforeUnmount, reactive, ref, shallowRef, watch } from 'vue';
 import { Codemirror } from 'vue-codemirror';
 import { javascript } from '@codemirror/lang-javascript';
 import { oneDark } from '@codemirror/theme-one-dark';
 import DrawerHeader from '@/components/drawer-header/index.vue';
 import { ElMessageBox } from 'element-plus';
 import { MsgSuccess } from '@/utils/message';
+import screenfull from 'screenfull';
+import { GlobalStore } from '@/store';
 
 const extensions = [javascript(), oneDark];
 
@@ -64,6 +75,7 @@ const view = shallowRef();
 const handleReady = (payload) => {
     view.value = payload.view;
 };
+const globalStore = GlobalStore();
 
 const logSearch = reactive({
     isWatch: false,
@@ -93,12 +105,22 @@ const timeOptions = ref([
     },
 ]);
 
+function toggleFullscreen() {
+    if (screenfull.isEnabled) {
+        screenfull.toggle();
+    }
+}
+screenfull.on('change', () => {
+    globalStore.isFullScreen = screenfull.isFullscreen;
+});
 const handleClose = async () => {
     logVisiable.value = false;
     clearInterval(Number(timer));
     timer = null;
 };
-
+watch(logVisiable, (val) => {
+    if (screenfull.isEnabled && !val) screenfull.exit();
+});
 const searchLogs = async () => {
     const res = await logContainer(logSearch);
     logInfo.value = res.data || '';
@@ -166,4 +188,7 @@ defineExpose({
 .margin-button {
     margin-left: 20px;
 }
+.fullScreen {
+    border: none;
+}
 </style>

frontend/src/views/container/setting/index.vue

@@ -43,8 +43,8 @@
                 </el-radio-group>
                 <el-row style="margin-top: 20px" v-if="confShowType === 'base'">
                     <el-col :span="1"><br /></el-col>
-                    <el-col :span="10">
-                        <el-form :model="form" label-position="left" :rules="rules" ref="formRef" label-width="150px">
+                    <el-col :xs="24" :sm="24" :md="15" :lg="12" :xl="10">
+                        <el-form :model="form" label-position="left" :rules="rules" ref="formRef" label-width="120px">
                             <el-form-item :label="$t('container.mirrors')" prop="mirrors">
                                 <div style="width: 100%" v-if="form.mirrors">
                                     <el-input
@@ -103,7 +103,7 @@
                             <el-form-item :label="$t('container.cutLog')" prop="hasLogOption">
                                 <el-switch v-model="form.logOptionShow" @change="handleLogOption"></el-switch>
                                 <span class="input-help"></span>
-                                <div v-if="form.logOptionShow">
+                                <div v-if="logOptionShow">
                                     <el-tag>{{ $t('container.maxSize') }}: {{ form.logMaxSize }}</el-tag>
                                     <el-tag style="margin-left: 5px">
                                         {{ $t('container.maxFile') }}: {{ form.logMaxFile }}
@@ -251,6 +251,7 @@ const registriesRef = ref();
 const confirmDialogRefLive = ref();
 const confirmDialogRefCgroup = ref();
 const confirmDialogRefIptable = ref();
+const logOptionShow = ref();
 
 const form = reactive({
     isSwarm: false,
@@ -437,10 +438,12 @@ const search = async () => {
     form.registries = res.data.insecureRegistries ? res.data.insecureRegistries.join('\n') : '';
     if (res.data.logMaxFile || res.data.logMaxSize) {
         form.logOptionShow = true;
+        logOptionShow.value = true;
         form.logMaxFile = Number(res.data.logMaxFile);
         form.logMaxSize = res.data.logMaxSize;
     } else {
         form.logOptionShow = false;
+        logOptionShow.value = false;
     }
 };
 

frontend/src/views/container/setting/log/index.vue

@@ -26,10 +26,10 @@
                             <el-input v-model.number="form.logMaxSize">
                                 <template #append>
                                     <el-select v-model="form.sizeUnit" style="width: 70px">
-                                        <el-option label="byte" value="b"></el-option>
-                                        <el-option label="kb" value="k"></el-option>
-                                        <el-option label="mb" value="m"></el-option>
-                                        <el-option label="gb" value="g"></el-option>
+                                        <el-option label="Byte" value="b"></el-option>
+                                        <el-option label="KB" value="k"></el-option>
+                                        <el-option label="MB" value="m"></el-option>
+                                        <el-option label="GB" value="g"></el-option>
                                     </el-select>
                                 </template>
                             </el-input>

frontend/src/views/container/volume/index.vue

@@ -49,6 +49,15 @@
                             <Tooltip @click="onInspect(row.name)" :text="row.name" />
                         </template>
                     </el-table-column>
+                    <el-table-column :label="$t('container.volumeDir')" min-width="50">
+                        <template #default="{ row }">
+                            <el-button type="primary" link @click="toFolder(row.mountpoint)">
+                                <el-icon>
+                                    <FolderOpened />
+                                </el-icon>
+                            </el-button>
+                        </template>
+                    </el-table-column>
                     <el-table-column
                         :label="$t('container.mountpoint')"
                         show-overflow-tooltip
@@ -124,7 +133,9 @@ const loadStatus = async () => {
 const goSetting = async () => {
     router.push({ name: 'ContainerSetting' });
 };
-
+const toFolder = (folder: string) => {
+    router.push({ path: '/hosts/files', query: { path: folder } });
+};
 const dialogCreateRef = ref<DialogExpose>();
 
 interface DialogExpose {

frontend/src/views/cronjob/index.vue

@@ -15,6 +15,12 @@
                         <el-button type="primary" @click="onOpenDialog('create')">
                             {{ $t('commons.button.create') }}{{ $t('cronjob.cronTask') }}
                         </el-button>
+                        <el-button plain :disabled="selects.length === 0" @click="onBatchChangeStatus('enable')">
+                            {{ $t('commons.button.enable') }}
+                        </el-button>
+                        <el-button plain :disabled="selects.length === 0" @click="onBatchChangeStatus('disable')">
+                            {{ $t('commons.button.disable') }}
+                        </el-button>
                         <el-button plain :disabled="selects.length === 0" @click="onDelete(null)">
                             {{ $t('commons.button.delete') }}
                         </el-button>
@@ -320,6 +326,20 @@ const onChangeStatus = async (id: number, status: string) => {
     });
 };
 
+const onBatchChangeStatus = async (status: string) => {
+    ElMessageBox.confirm(i18n.global.t('cronjob.' + status + 'Msg'), i18n.global.t('cronjob.changeStatus'), {
+        confirmButtonText: i18n.global.t('commons.button.confirm'),
+        cancelButtonText: i18n.global.t('commons.button.cancel'),
+    }).then(async () => {
+        let itemStatus = status === 'enable' ? 'Enable' : 'Disable';
+        for (const item of selects.value) {
+            await updateStatus({ id: item.id, status: itemStatus });
+        }
+        MsgSuccess(i18n.global.t('commons.msg.operationSuccess'));
+        search();
+    });
+};
+
 const onHandle = async (row: Cronjob.CronjobInfo) => {
     loading.value = true;
     await handleOnce(row.id)

frontend/src/views/cronjob/operate/index.vue

@@ -330,7 +330,7 @@ const weekOptions = [
     { label: i18n.global.t('cronjob.thursday'), value: 4 },
     { label: i18n.global.t('cronjob.friday'), value: 5 },
     { label: i18n.global.t('cronjob.saturday'), value: 6 },
-    { label: i18n.global.t('cronjob.sunday'), value: 7 },
+    { label: i18n.global.t('cronjob.sunday'), value: 0 },
 ];
 const rules = reactive({
     name: [Rules.requiredInput],
@@ -456,7 +456,9 @@ function checkScript() {
         case 'perMonth':
             return row.day > 0 && row.day < 32 && row.hour >= 0 && row.hour < 24 && row.minute >= 0 && row.minute < 60;
         case 'perWeek':
-            return row.week > 0 && row.week < 8 && row.hour >= 0 && row.hour < 24 && row.minute >= 0 && row.minute < 60;
+            return (
+                row.week >= 0 && row.week < 7 && row.hour >= 0 && row.hour < 24 && row.minute >= 0 && row.minute < 60
+            );
         case 'perDay':
             return row.hour >= 0 && row.hour < 24 && row.minute >= 0 && row.minute < 60;
         case 'perHour':

frontend/src/views/cronjob/record/index.vue

@@ -123,194 +123,198 @@
                 </el-row>
             </template>
             <template #main>
-                <el-row :gutter="20" v-show="hasRecords">
-                    <el-col :span="8">
-                        <div>
-                            <ul class="infinite-list" style="overflow: auto">
-                                <li
-                                    v-for="(item, index) in records"
-                                    :key="index"
-                                    @click="forDetail(item)"
-                                    class="infinite-list-item"
-                                >
-                                    <el-icon v-if="item.status === 'Success'"><Select /></el-icon>
-                                    <el-icon v-if="item.status === 'Waiting'"><Loading /></el-icon>
-                                    <el-icon v-if="item.status === 'Failed'"><CloseBold /></el-icon>
-                                    <span v-if="item.id === currentRecord.id" style="color: red">
-                                        {{ dateFormat(0, 0, item.startTime) }}
-                                    </span>
-                                    <span v-else>{{ dateFormat(0, 0, item.startTime) }}</span>
-                                </li>
-                            </ul>
-                            <div style="margin-top: 10px; font-size: 12px; float: right">
-                                <el-pagination
-                                    :page-size="searchInfo.pageSize"
-                                    :current-page="searchInfo.page"
-                                    @current-change="handleCurrentChange"
-                                    @size-change="handleSizeChange"
-                                    :pager-count="5"
-                                    :page-sizes="[6, 8, 10, 12, 14]"
-                                    small
-                                    layout="total, sizes, prev, pager, next"
-                                    :total="searchInfo.recordTotal"
-                                />
-                            </div>
-                        </div>
-                    </el-col>
-                    <el-col :span="16">
-                        <el-form label-position="top" :v-key="refresh">
-                            <el-row type="flex" justify="center">
-                                <el-form-item class="descriptionWide" v-if="isBackup()">
-                                    <template #label>
-                                        <span class="status-label">{{ $t('cronjob.target') }}</span>
-                                    </template>
-                                    <span class="status-count">{{ dialogData.rowData!.targetDir }}</span>
-                                    <el-button
-                                        v-if="currentRecord?.status === 'Success'"
-                                        type="primary"
-                                        style="margin-left: 10px"
-                                        link
-                                        icon="Download"
-                                        @click="onDownload(currentRecord, dialogData.rowData!.targetDirID)"
+                <div style="overflow: auto">
+                    <el-row :gutter="20" v-show="hasRecords" style="min-width: 900px">
+                        <el-col :span="8">
+                            <div>
+                                <ul class="infinite-list" style="overflow: auto">
+                                    <li
+                                        v-for="(item, index) in records"
+                                        :key="index"
+                                        @click="forDetail(item)"
+                                        class="infinite-list-item"
                                     >
-                                        {{ $t('file.download') }}
-                                    </el-button>
-                                </el-form-item>
-                                <el-form-item class="description" v-if="dialogData.rowData!.type === 'website'">
+                                        <el-icon v-if="item.status === 'Success'"><Select /></el-icon>
+                                        <el-icon v-if="item.status === 'Waiting'"><Loading /></el-icon>
+                                        <el-icon v-if="item.status === 'Failed'"><CloseBold /></el-icon>
+                                        <span v-if="item.id === currentRecord.id" style="color: red">
+                                            {{ dateFormat(0, 0, item.startTime) }}
+                                        </span>
+                                        <span v-else>{{ dateFormat(0, 0, item.startTime) }}</span>
+                                    </li>
+                                </ul>
+                                <div style="margin-top: 10px; font-size: 12px; float: right">
+                                    <el-pagination
+                                        :page-size="searchInfo.pageSize"
+                                        :current-page="searchInfo.page"
+                                        @current-change="handleCurrentChange"
+                                        @size-change="handleSizeChange"
+                                        :pager-count="5"
+                                        :page-sizes="[6, 8, 10, 12, 14]"
+                                        small
+                                        layout="total, sizes, prev, pager, next"
+                                        :total="searchInfo.recordTotal"
+                                    />
+                                </div>
+                            </div>
+                        </el-col>
+                        <el-col :span="16">
+                            <el-form label-position="top" :v-key="refresh">
+                                <el-row type="flex" justify="center">
+                                    <el-form-item class="descriptionWide" v-if="isBackup()">
+                                        <template #label>
+                                            <span class="status-label">{{ $t('cronjob.target') }}</span>
+                                        </template>
+                                        <span class="status-count">{{ dialogData.rowData!.targetDir }}</span>
+                                        <el-button
+                                            v-if="currentRecord?.status === 'Success'"
+                                            type="primary"
+                                            style="margin-left: 10px"
+                                            link
+                                            icon="Download"
+                                            @click="onDownload(currentRecord, dialogData.rowData!.targetDirID)"
+                                        >
+                                            {{ $t('file.download') }}
+                                        </el-button>
+                                    </el-form-item>
+                                    <el-form-item class="description" v-if="dialogData.rowData!.type === 'website'">
+                                        <template #label>
+                                            <span class="status-label">{{ $t('cronjob.website') }}</span>
+                                        </template>
+                                        <span v-if="dialogData.rowData!.website !== 'all'" class="status-count">
+                                            {{ dialogData.rowData!.website }}
+                                        </span>
+                                        <span v-else class="status-count">
+                                            {{ $t('commons.table.all') }}
+                                        </span>
+                                    </el-form-item>
+                                    <el-form-item class="description" v-if="dialogData.rowData!.type === 'database'">
+                                        <template #label>
+                                            <span class="status-label">{{ $t('cronjob.database') }}</span>
+                                        </template>
+                                        <span v-if="dialogData.rowData!.dbName !== 'all'" class="status-count">
+                                            {{ dialogData.rowData!.dbName }}
+                                        </span>
+                                        <span v-else class="status-count">
+                                            {{ $t('commons.table.all') }}
+                                        </span>
+                                    </el-form-item>
+                                    <el-form-item class="description" v-if="dialogData.rowData!.type === 'directory'">
+                                        <template #label>
+                                            <span class="status-label">{{ $t('cronjob.directory') }}</span>
+                                        </template>
+                                        <span v-if="dialogData.rowData!.sourceDir.length <= 12" class="status-count">
+                                            {{ dialogData.rowData!.sourceDir }}
+                                        </span>
+                                        <div v-else>
+                                            <el-popover
+                                                placement="top-start"
+                                                trigger="hover"
+                                                width="250"
+                                                :content="dialogData.rowData!.sourceDir"
+                                            >
+                                                <template #reference>
+                                                    <span class="status-count">
+                                                        {{ dialogData.rowData!.sourceDir.substring(0, 12) }}...
+                                                    </span>
+                                                </template>
+                                            </el-popover>
+                                        </div>
+                                    </el-form-item>
+                                    <el-form-item class="description" v-if="isBackup()">
+                                        <template #label>
+                                            <span class="status-label">{{ $t('cronjob.retainCopies') }}</span>
+                                        </template>
+                                        <span class="status-count">{{ dialogData.rowData!.retainCopies }}</span>
+                                    </el-form-item>
+                                </el-row>
+                                <el-form-item
+                                    class="description"
+                                    v-if="dialogData.rowData!.type === 'website' || dialogData.rowData!.type === 'directory'"
+                                >
                                     <template #label>
-                                        <span class="status-label">{{ $t('cronjob.website') }}</span>
+                                        <span class="status-label">{{ $t('cronjob.exclusionRules') }}</span>
                                     </template>
-                                    <span v-if="dialogData.rowData!.website !== 'all'" class="status-count">
-                                        {{ dialogData.rowData!.website }}
-                                    </span>
-                                    <span v-else class="status-count">
-                                        {{ $t('commons.table.all') }}
-                                    </span>
-                                </el-form-item>
-                                <el-form-item class="description" v-if="dialogData.rowData!.type === 'database'">
-                                    <template #label>
-                                        <span class="status-label">{{ $t('cronjob.database') }}</span>
-                                    </template>
-                                    <span v-if="dialogData.rowData!.dbName !== 'all'" class="status-count">
-                                        {{ dialogData.rowData!.dbName }}
-                                    </span>
-                                    <span v-else class="status-count">
-                                        {{ $t('commons.table.all') }}
-                                    </span>
-                                </el-form-item>
-                                <el-form-item class="description" v-if="dialogData.rowData!.type === 'directory'">
-                                    <template #label>
-                                        <span class="status-label">{{ $t('cronjob.directory') }}</span>
-                                    </template>
-                                    <span v-if="dialogData.rowData!.sourceDir.length <= 12" class="status-count">
-                                        {{ dialogData.rowData!.sourceDir }}
+                                    <span v-if="dialogData.rowData!.exclusionRules.length <= 12" class="status-count">
+                                        {{ dialogData.rowData!.exclusionRules }}
                                     </span>
                                     <div v-else>
                                         <el-popover
                                             placement="top-start"
                                             trigger="hover"
                                             width="250"
-                                            :content="dialogData.rowData!.sourceDir"
+                                            :content="dialogData.rowData!.exclusionRules"
                                         >
                                             <template #reference>
                                                 <span class="status-count">
-                                                    {{ dialogData.rowData!.sourceDir.substring(0, 12) }}...
+                                                    {{ dialogData.rowData!.exclusionRules.substring(0, 12) }}...
                                                 </span>
                                             </template>
                                         </el-popover>
                                     </div>
                                 </el-form-item>
-                                <el-form-item class="description" v-if="isBackup()">
-                                    <template #label>
-                                        <span class="status-label">{{ $t('cronjob.retainCopies') }}</span>
-                                    </template>
-                                    <span class="status-count">{{ dialogData.rowData!.retainCopies }}</span>
-                                </el-form-item>
-                            </el-row>
-                            <el-form-item
-                                class="description"
-                                v-if="dialogData.rowData!.type === 'website' || dialogData.rowData!.type === 'directory'"
-                            >
-                                <template #label>
-                                    <span class="status-label">{{ $t('cronjob.exclusionRules') }}</span>
-                                </template>
-                                <span v-if="dialogData.rowData!.exclusionRules.length <= 12" class="status-count">
-                                    {{ dialogData.rowData!.exclusionRules }}
-                                </span>
-                                <div v-else>
-                                    <el-popover
-                                        placement="top-start"
-                                        trigger="hover"
-                                        width="250"
-                                        :content="dialogData.rowData!.exclusionRules"
-                                    >
-                                        <template #reference>
-                                            <span class="status-count">
-                                                {{ dialogData.rowData!.exclusionRules.substring(0, 12) }}...
-                                            </span>
+                                <el-row type="flex" justify="center">
+                                    <el-form-item class="descriptionWide">
+                                        <template #label>
+                                            <span class="status-label">{{ $t('commons.search.timeStart') }}</span>
                                         </template>
-                                    </el-popover>
-                                </div>
-                            </el-form-item>
-                            <el-row type="flex" justify="center">
-                                <el-form-item class="descriptionWide">
-                                    <template #label>
-                                        <span class="status-label">{{ $t('commons.search.timeStart') }}</span>
-                                    </template>
-                                    <span class="status-count">{{ dateFormat(0, 0, currentRecord?.startTime) }}</span>
-                                </el-form-item>
-                                <el-form-item class="description">
-                                    <template #label>
-                                        <span class="status-label">{{ $t('commons.table.interval') }}</span>
-                                    </template>
-                                    <span class="status-count" v-if="currentRecord?.interval! <= 1000">
-                                        {{ currentRecord?.interval }} ms
-                                    </span>
-                                    <span class="status-count" v-if="currentRecord?.interval! > 1000">
-                                        {{ currentRecord?.interval! / 1000 }} s
-                                    </span>
-                                </el-form-item>
-                                <el-form-item class="description">
-                                    <template #label>
-                                        <span class="status-label">{{ $t('commons.table.status') }}</span>
-                                    </template>
-                                    <el-tooltip v-if="currentRecord?.status === 'Failed'" placement="top">
-                                        <template #content>
-                                            <div style="width: 300px; word-break: break-all">
-                                                {{ currentRecord?.message }}
-                                            </div>
+                                        <span class="status-count">
+                                            {{ dateFormat(0, 0, currentRecord?.startTime) }}
+                                        </span>
+                                    </el-form-item>
+                                    <el-form-item class="description">
+                                        <template #label>
+                                            <span class="status-label">{{ $t('commons.table.interval') }}</span>
                                         </template>
-                                        <el-tag type="danger">{{ $t('commons.table.statusFailed') }}</el-tag>
-                                    </el-tooltip>
-                                    <el-tag type="success" v-if="currentRecord?.status === 'Success'">
-                                        {{ $t('commons.table.statusSuccess') }}
-                                    </el-tag>
-                                    <el-tag type="info" v-if="currentRecord?.status === 'Waiting'">
-                                        {{ $t('commons.table.statusWaiting') }}
-                                    </el-tag>
-                                </el-form-item>
-                            </el-row>
-                            <el-row v-if="currentRecord?.records">
-                                <span>{{ $t('commons.table.records') }}</span>
-                                <codemirror
-                                    ref="mymirror"
-                                    :autofocus="true"
-                                    :placeholder="$t('cronjob.noLogs')"
-                                    :indent-with-tab="true"
-                                    :tabSize="4"
-                                    style="height: calc(100vh - 484px); width: 100%; margin-top: 5px"
-                                    :lineWrapping="true"
-                                    :matchBrackets="true"
-                                    theme="cobalt"
-                                    :styleActiveLine="true"
-                                    :extensions="extensions"
-                                    v-model="currentRecordDetail"
-                                    :disabled="true"
-                                />
-                            </el-row>
-                        </el-form>
-                    </el-col>
-                </el-row>
+                                        <span class="status-count" v-if="currentRecord?.interval! <= 1000">
+                                            {{ currentRecord?.interval }} ms
+                                        </span>
+                                        <span class="status-count" v-if="currentRecord?.interval! > 1000">
+                                            {{ currentRecord?.interval! / 1000 }} s
+                                        </span>
+                                    </el-form-item>
+                                    <el-form-item class="description">
+                                        <template #label>
+                                            <span class="status-label">{{ $t('commons.table.status') }}</span>
+                                        </template>
+                                        <el-tooltip v-if="currentRecord?.status === 'Failed'" placement="top">
+                                            <template #content>
+                                                <div style="width: 300px; word-break: break-all">
+                                                    {{ currentRecord?.message }}
+                                                </div>
+                                            </template>
+                                            <el-tag type="danger">{{ $t('commons.table.statusFailed') }}</el-tag>
+                                        </el-tooltip>
+                                        <el-tag type="success" v-if="currentRecord?.status === 'Success'">
+                                            {{ $t('commons.table.statusSuccess') }}
+                                        </el-tag>
+                                        <el-tag type="info" v-if="currentRecord?.status === 'Waiting'">
+                                            {{ $t('commons.table.statusWaiting') }}
+                                        </el-tag>
+                                    </el-form-item>
+                                </el-row>
+                                <el-row v-if="currentRecord?.records">
+                                    <span>{{ $t('commons.table.records') }}</span>
+                                    <codemirror
+                                        ref="mymirror"
+                                        :autofocus="true"
+                                        :placeholder="$t('cronjob.noLogs')"
+                                        :indent-with-tab="true"
+                                        :tabSize="4"
+                                        style="height: calc(100vh - 484px); width: 100%; margin-top: 5px"
+                                        :lineWrapping="true"
+                                        :matchBrackets="true"
+                                        theme="cobalt"
+                                        :styleActiveLine="true"
+                                        :extensions="extensions"
+                                        v-model="currentRecordDetail"
+                                        :disabled="true"
+                                    />
+                                </el-row>
+                            </el-form>
+                        </el-col>
+                    </el-row>
+                </div>
                 <div class="app-warn" v-show="!hasRecords">
                     <div>
                         <span>{{ $t('cronjob.noRecord') }}</span>

frontend/src/views/database/mysql/setting/index.vue

@@ -263,7 +263,7 @@ const onSaveConf = async () => {
 };
 
 const loadContainerLog = async (containerID: string) => {
-    dialogContainerLogRef.value!.acceptParams({ containerID: containerID, container: mysqlName.value });
+    dialogContainerLogRef.value!.acceptParams({ containerID: containerID, container: containerID });
 };
 
 const loadBaseInfo = async () => {

frontend/src/views/database/redis/setting/persistence/index.vue

@@ -1,7 +1,7 @@
 <template>
     <div v-if="persistenceShow">
         <el-row :gutter="20" style="margin-top: 5px" class="row-box">
-            <el-col :span="12">
+            <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
                 <el-card class="el-card">
                     <template #header>
                         <div class="card-header">
@@ -36,7 +36,7 @@
                     </el-form>
                 </el-card>
             </el-col>
-            <el-col :span="12">
+            <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
                 <el-card class="el-card">
                     <template #header>
                         <div class="card-header">

frontend/src/views/database/redis/setting/status/index.vue

@@ -1,108 +1,131 @@
 <template>
-    <div v-if="statusShow">
+    <div v-if="statusShow" class="database-status">
         <el-form label-position="top">
             <span class="title">{{ $t('database.baseParam') }}</span>
             <el-divider class="devider" />
-            <el-row type="flex" style="margin-left: 50px" justify="center">
-                <el-form-item style="width: 25%">
-                    <template #label>
-                        <span class="status-label">uptime_in_days</span>
-                    </template>
-                    <span class="status-count">{{ redisStatus.uptime_in_days }}</span>
-                    <span class="input-help">{{ $t('database.uptimeInDays') }}</span>
-                </el-form-item>
-                <el-form-item style="width: 25%">
-                    <template #label>
-                        <span class="status-label">tcp_port</span>
-                    </template>
-                    <span class="status-count">{{ redisStatus.tcp_port }}</span>
-                    <span class="input-help">{{ $t('database.tcpPort') }}</span>
-                </el-form-item>
-                <el-form-item style="width: 25%">
-                    <template #label>
-                        <span class="status-label">connected_clients</span>
-                    </template>
-                    <span class="status-count">{{ redisStatus.connected_clients }}</span>
-                    <span class="input-help">{{ $t('database.connectedClients') }}</span>
-                </el-form-item>
-                <el-form-item style="width: 25%"></el-form-item>
+            <el-row class="content">
+                <el-col :xs="8" :sm="6" :md="6" :lg="6" :xl="6">
+                    <el-form-item>
+                        <template #label>
+                            <span class="status-label">uptime_in_days</span>
+                        </template>
+                        <span class="status-count">{{ redisStatus.uptime_in_days }}</span>
+                        <span class="input-help">{{ $t('database.uptimeInDays') }}</span>
+                    </el-form-item>
+                </el-col>
+                <el-col :xs="8" :sm="6" :md="6" :lg="6" :xl="6">
+                    <el-form-item>
+                        <template #label>
+                            <span class="status-label">tcp_port</span>
+                        </template>
+                        <span class="status-count">{{ redisStatus.tcp_port }}</span>
+                        <span class="input-help">{{ $t('database.tcpPort') }}</span>
+                    </el-form-item>
+                </el-col>
+                <el-col :xs="8" :sm="6" :md="6" :lg="6" :xl="6">
+                    <el-form-item>
+                        <template #label>
+                            <span class="status-label">connected_clients</span>
+                        </template>
+                        <span class="status-count">{{ redisStatus.connected_clients }}</span>
+                        <span class="input-help">{{ $t('database.connectedClients') }}</span>
+                    </el-form-item>
+                </el-col>
             </el-row>
 
             <span class="title">{{ $t('database.performanceParam') }}</span>
             <el-divider class="devider" />
-            <el-row type="flex" style="margin-left: 50px" justify="center">
-                <el-form-item style="width: 25%">
-                    <template #label>
-                        <span class="status-label">used_memory_rss</span>
-                    </template>
-                    <span class="status-count">{{ redisStatus.used_memory_rss }}</span>
-                    <span class="input-help">{{ $t('database.usedMemoryRss') }}</span>
-                </el-form-item>
-                <el-form-item style="width: 25%">
-                    <template #label>
-                        <span class="status-label">used_memory</span>
-                    </template>
-                    <span class="status-count">{{ redisStatus.used_memory }}</span>
-                    <span class="input-help">{{ $t('database.usedMemory') }}</span>
-                </el-form-item>
-                <el-form-item style="width: 25%">
-                    <template #label>
-                        <span class="status-label">mem_fragmentation_ratio</span>
-                    </template>
-                    <span class="status-count">{{ redisStatus.mem_fragmentation_ratio }}</span>
-                    <span class="input-help">{{ $t('database.tmpTableToDBHelper') }}</span>
-                </el-form-item>
-                <el-form-item style="width: 25%">
-                    <template #label>
-                        <span class="status-label">total_connections_received</span>
-                    </template>
-                    <span class="status-count">{{ redisStatus.total_connections_received }}</span>
-                    <span class="input-help">{{ $t('database.totalConnectionsReceived') }}</span>
-                </el-form-item>
-                <el-form-item style="width: 25%">
-                    <template #label>
-                        <span class="status-label">total_commands_processed</span>
-                    </template>
-                    <span class="status-count">{{ redisStatus.total_commands_processed }}</span>
-                    <span class="input-help">{{ $t('database.totalCommandsProcessed') }}</span>
-                </el-form-item>
-                <el-form-item style="width: 25%">
-                    <template #label>
-                        <span class="status-label">instantaneous_ops_per_sec</span>
-                    </template>
-                    <span class="status-count">{{ redisStatus.instantaneous_ops_per_sec }}</span>
-                    <span class="input-help">{{ $t('database.instantaneousOpsPerSec') }}</span>
-                </el-form-item>
-                <el-form-item style="width: 25%">
-                    <template #label>
-                        <span class="status-label">keyspace_hits</span>
-                    </template>
-                    <span class="status-count">{{ redisStatus.keyspace_hits }}</span>
-                    <span class="input-help">{{ $t('database.keyspaceHits') }}</span>
-                </el-form-item>
-                <el-form-item style="width: 25%">
-                    <template #label>
-                        <span class="status-label">keyspace_misses</span>
-                    </template>
-                    <span class="status-count">{{ redisStatus.keyspace_misses }}</span>
-                    <span class="input-help">{{ $t('database.keyspaceMisses') }}</span>
-                </el-form-item>
-                <el-form-item style="width: 25%">
-                    <template #label>
-                        <span class="status-label">hit</span>
-                    </template>
-                    <span class="status-count">{{ redisStatus.hit }}</span>
-                    <span class="input-help">{{ $t('database.hit') }}</span>
-                </el-form-item>
-                <el-form-item style="width: 25%">
-                    <template #label>
-                        <span class="status-label">latest_fork_usec</span>
-                    </template>
-                    <span class="status-count">{{ redisStatus.latest_fork_usec }}</span>
-                    <span class="input-help">{{ $t('database.latestForkUsec') }}</span>
-                </el-form-item>
-                <el-form-item style="width: 25%"></el-form-item>
-                <el-form-item style="width: 25%"></el-form-item>
+            <el-row class="content">
+                <el-col :xs="12" :sm="12" :md="6" :lg="6" :xl="6">
+                    <el-form-item>
+                        <template #label>
+                            <span class="status-label">used_memory_rss</span>
+                        </template>
+                        <span class="status-count">{{ redisStatus.used_memory_rss }}</span>
+                        <span class="input-help">{{ $t('database.usedMemoryRss') }}</span>
+                    </el-form-item>
+                </el-col>
+                <el-col :xs="12" :sm="12" :md="6" :lg="6" :xl="6">
+                    <el-form-item>
+                        <template #label>
+                            <span class="status-label">used_memory</span>
+                        </template>
+                        <span class="status-count">{{ redisStatus.used_memory }}</span>
+                        <span class="input-help">{{ $t('database.usedMemory') }}</span>
+                    </el-form-item>
+                </el-col>
+                <el-col :xs="12" :sm="12" :md="6" :lg="6" :xl="6">
+                    <el-form-item>
+                        <template #label>
+                            <span class="status-label">mem_fragmentation_ratio</span>
+                        </template>
+                        <span class="status-count">{{ redisStatus.mem_fragmentation_ratio }}</span>
+                        <span class="input-help">{{ $t('database.tmpTableToDBHelper') }}</span>
+                    </el-form-item>
+                </el-col>
+                <el-col :xs="8" :sm="12" :md="6" :lg="6" :xl="6">
+                    <el-form-item>
+                        <template #label>
+                            <span class="status-label">total_connections_received</span>
+                        </template>
+                        <span class="status-count">{{ redisStatus.total_connections_received }}</span>
+                        <span class="input-help">{{ $t('database.totalConnectionsReceived') }}</span>
+                    </el-form-item>
+                </el-col>
+                <el-col :xs="12" :sm="12" :md="6" :lg="6" :xl="6">
+                    <el-form-item>
+                        <template #label>
+                            <span class="status-label">total_commands_processed</span>
+                        </template>
+                        <span class="status-count">{{ redisStatus.total_commands_processed }}</span>
+                        <span class="input-help">{{ $t('database.totalCommandsProcessed') }}</span>
+                    </el-form-item>
+                </el-col>
+                <el-col :xs="12" :sm="12" :md="6" :lg="6" :xl="6">
+                    <el-form-item>
+                        <template #label>
+                            <span class="status-label">instantaneous_ops_per_sec</span>
+                        </template>
+                        <span class="status-count">{{ redisStatus.instantaneous_ops_per_sec }}</span>
+                        <span class="input-help">{{ $t('database.instantaneousOpsPerSec') }}</span>
+                    </el-form-item>
+                </el-col>
+                <el-col :xs="12" :sm="12" :md="6" :lg="6" :xl="6">
+                    <el-form-item>
+                        <template #label>
+                            <span class="status-label">keyspace_hits</span>
+                        </template>
+                        <span class="status-count">{{ redisStatus.keyspace_hits }}</span>
+                        <span class="input-help">{{ $t('database.keyspaceHits') }}</span>
+                    </el-form-item>
+                </el-col>
+                <el-col :xs="12" :sm="12" :md="6" :lg="6" :xl="6">
+                    <el-form-item>
+                        <template #label>
+                            <span class="status-label">keyspace_misses</span>
+                        </template>
+                        <span class="status-count">{{ redisStatus.keyspace_misses }}</span>
+                        <span class="input-help">{{ $t('database.keyspaceMisses') }}</span>
+                    </el-form-item>
+                </el-col>
+                <el-col :xs="12" :sm="12" :md="6" :lg="6" :xl="6">
+                    <el-form-item>
+                        <template #label>
+                            <span class="status-label">hit</span>
+                        </template>
+                        <span class="status-count">{{ redisStatus.hit }}</span>
+                        <span class="input-help">{{ $t('database.hit') }}</span>
+                    </el-form-item>
+                </el-col>
+                <el-col :xs="12" :sm="12" :md="6" :lg="6" :xl="6">
+                    <el-form-item>
+                        <template #label>
+                            <span class="status-label">latest_fork_usec</span>
+                        </template>
+                        <span class="status-count">{{ redisStatus.latest_fork_usec }}</span>
+                        <span class="input-help">{{ $t('database.latestForkUsec') }}</span>
+                    </el-form-item>
+                </el-col>
             </el-row>
         </el-form>
     </div>
@@ -169,16 +192,21 @@ defineExpose({
 </script>
 
 <style lang="scss" scoped>
-.devider {
-    display: block;
-    height: 1px;
-    width: 100%;
-    margin: 12px 0;
-    border-top: 1px var(--el-border-color) var(--el-border-style);
-}
-.title {
-    font-size: 20px;
-    font-weight: 500;
-    margin-left: 50px;
+.database-status {
+    .devider {
+        display: block;
+        height: 1px;
+        width: 100%;
+        margin: 12px 0;
+        border-top: 1px var(--el-border-color) var(--el-border-style);
+    }
+    .title {
+        font-size: 20px;
+        font-weight: 500;
+        margin-left: 50px;
+    }
+    .content {
+        margin-left: 50px;
+    }
 }
 </style>

frontend/src/views/host/monitor/monitor/index.vue

@@ -6,17 +6,20 @@
             <el-col :span="24">
                 <el-card style="overflow: inherit">
                     <template #header>
-                        <span class="title">{{ $t('monitor.avgLoad') }}</span>
-                        <el-date-picker
-                            @change="search('load')"
-                            v-model="timeRangeLoad"
-                            type="datetimerange"
-                            :range-separator="$t('commons.search.timeRange')"
-                            :start-placeholder="$t('commons.search.timeStart')"
-                            :end-placeholder="$t('commons.search.timeEnd')"
-                            :shortcuts="shortcuts"
-                            style="float: right; margin-top: -5px; width: 360px"
-                        ></el-date-picker>
+                        <div :class="mobile ? 'flx-wrap' : 'flx-justify-between'">
+                            <span class="title">{{ $t('monitor.avgLoad') }}</span>
+                            <el-date-picker
+                                @change="search('load')"
+                                v-model="timeRangeLoad"
+                                type="datetimerange"
+                                :range-separator="$t('commons.search.timeRange')"
+                                :start-placeholder="$t('commons.search.timeStart')"
+                                :end-placeholder="$t('commons.search.timeEnd')"
+                                :shortcuts="shortcuts"
+                                style="max-width: 360px; width: 100%"
+                                :size="mobile ? 'small' : 'default'"
+                            ></el-date-picker>
+                        </div>
                     </template>
                     <div id="loadLoadChart" class="chart"></div>
                 </el-card>
@@ -26,17 +29,20 @@
             <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
                 <el-card style="overflow: inherit">
                     <template #header>
-                        <span class="title">CPU</span>
-                        <el-date-picker
-                            @change="search('cpu')"
-                            v-model="timeRangeCpu"
-                            type="datetimerange"
-                            :range-separator="$t('commons.search.timeRange')"
-                            :start-placeholder="$t('commons.search.timeStart')"
-                            :end-placeholder="$t('commons.search.timeEnd')"
-                            :shortcuts="shortcuts"
-                            style="float: right; margin-top: -5px; width: 360px"
-                        ></el-date-picker>
+                        <div :class="mobile ? 'flx-wrap' : 'flx-justify-between'">
+                            <span class="title">CPU</span>
+                            <el-date-picker
+                                @change="search('cpu')"
+                                v-model="timeRangeCpu"
+                                type="datetimerange"
+                                :range-separator="$t('commons.search.timeRange')"
+                                :start-placeholder="$t('commons.search.timeStart')"
+                                :end-placeholder="$t('commons.search.timeEnd')"
+                                :shortcuts="shortcuts"
+                                style="max-width: 360px; width: 100%"
+                                :size="mobile ? 'small' : 'default'"
+                            ></el-date-picker>
+                        </div>
                     </template>
                     <div id="loadCPUChart" class="chart"></div>
                 </el-card>
@@ -44,17 +50,20 @@
             <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
                 <el-card style="overflow: inherit">
                     <template #header>
-                        <span class="title">{{ $t('monitor.memory') }}</span>
-                        <el-date-picker
-                            @change="search('memory')"
-                            v-model="timeRangeMemory"
-                            type="datetimerange"
-                            :range-separator="$t('commons.search.timeRange')"
-                            :start-placeholder="$t('commons.search.timeStart')"
-                            :end-placeholder="$t('commons.search.timeEnd')"
-                            :shortcuts="shortcuts"
-                            style="float: right; margin-top: -5px; width: 360px"
-                        ></el-date-picker>
+                        <div :class="mobile ? 'flx-wrap' : 'flx-justify-between'">
+                            <span class="title">{{ $t('monitor.memory') }}</span>
+                            <el-date-picker
+                                @change="search('memory')"
+                                v-model="timeRangeMemory"
+                                type="datetimerange"
+                                :range-separator="$t('commons.search.timeRange')"
+                                :start-placeholder="$t('commons.search.timeStart')"
+                                :end-placeholder="$t('commons.search.timeEnd')"
+                                :shortcuts="shortcuts"
+                                style="max-width: 360px; width: 100%"
+                                :size="mobile ? 'small' : 'default'"
+                            ></el-date-picker>
+                        </div>
                     </template>
                     <div id="loadMemoryChart" class="chart"></div>
                 </el-card>
@@ -64,17 +73,20 @@
             <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
                 <el-card style="overflow: inherit">
                     <template #header>
-                        <span class="title">{{ $t('monitor.disk') }} IO</span>
-                        <el-date-picker
-                            @change="search('io')"
-                            v-model="timeRangeIO"
-                            type="datetimerange"
-                            :range-separator="$t('commons.search.timeRange')"
-                            :start-placeholder="$t('commons.search.timeStart')"
-                            :end-placeholder="$t('commons.search.timeEnd')"
-                            :shortcuts="shortcuts"
-                            style="float: right; margin-top: -5px; width: 360px"
-                        ></el-date-picker>
+                        <div :class="mobile ? 'flx-wrap' : 'flx-justify-between'">
+                            <span class="title">{{ $t('monitor.disk') }} IO</span>
+                            <el-date-picker
+                                @change="search('io')"
+                                v-model="timeRangeIO"
+                                type="datetimerange"
+                                :range-separator="$t('commons.search.timeRange')"
+                                :start-placeholder="$t('commons.search.timeStart')"
+                                :end-placeholder="$t('commons.search.timeEnd')"
+                                :shortcuts="shortcuts"
+                                style="max-width: 360px; width: 100%"
+                                :size="mobile ? 'small' : 'default'"
+                            ></el-date-picker>
+                        </div>
                     </template>
                     <div id="loadIOChart" class="chart"></div>
                 </el-card>
@@ -82,34 +94,43 @@
             <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
                 <el-card style="overflow: inherit">
                     <template #header>
-                        <span class="title">{{ $t('monitor.network') }} IO:</span>
-                        <el-popover placement="bottom" :width="200" trigger="click">
-                            <el-select @change="search('network')" v-model="networkChoose">
-                                <template #prefix>{{ $t('monitor.networkCard') }}</template>
-                                <div v-for="item in netOptions" :key="item">
-                                    <el-option v-if="item === 'all'" :label="$t('commons.table.all')" :value="item" />
-                                    <el-option v-else :label="item" :value="item" />
-                                </div>
-                            </el-select>
-                            <template #reference>
-                                <span class="networkOption" v-if="networkChoose === 'all'">
-                                    {{ $t('commons.table.all') }}
-                                </span>
-                                <span v-else class="networkOption">
-                                    {{ networkChoose }}
-                                </span>
-                            </template>
-                        </el-popover>
-                        <el-date-picker
-                            @change="search('network')"
-                            v-model="timeRangeNetwork"
-                            type="datetimerange"
-                            :range-separator="$t('commons.search.timeRange')"
-                            :start-placeholder="$t('commons.search.timeStart')"
-                            :end-placeholder="$t('commons.search.timeEnd')"
-                            :shortcuts="shortcuts"
-                            style="float: right; margin-top: -5px; width: 360px"
-                        ></el-date-picker>
+                        <div :class="mobile ? 'flx-wrap' : 'flx-justify-between'">
+                            <div>
+                                <span class="title">{{ $t('monitor.network') }} IO:</span>
+                                <el-popover placement="bottom" :width="200" trigger="click">
+                                    <el-select @change="search('network')" v-model="networkChoose">
+                                        <template #prefix>{{ $t('monitor.networkCard') }}</template>
+                                        <div v-for="item in netOptions" :key="item">
+                                            <el-option
+                                                v-if="item === 'all'"
+                                                :label="$t('commons.table.all')"
+                                                :value="item"
+                                            />
+                                            <el-option v-else :label="item" :value="item" />
+                                        </div>
+                                    </el-select>
+                                    <template #reference>
+                                        <span class="networkOption" v-if="networkChoose === 'all'">
+                                            {{ $t('commons.table.all') }}
+                                        </span>
+                                        <span v-else class="networkOption">
+                                            {{ networkChoose }}
+                                        </span>
+                                    </template>
+                                </el-popover>
+                            </div>
+                            <el-date-picker
+                                @change="search('network')"
+                                v-model="timeRangeNetwork"
+                                type="datetimerange"
+                                :range-separator="$t('commons.search.timeRange')"
+                                :start-placeholder="$t('commons.search.timeStart')"
+                                :end-placeholder="$t('commons.search.timeEnd')"
+                                :shortcuts="shortcuts"
+                                style="max-width: 360px; width: 100%"
+                                :size="mobile ? 'small' : 'default'"
+                            ></el-date-picker>
+                        </div>
                     </template>
                     <div id="loadNetworkChart" class="chart"></div>
                 </el-card>
@@ -119,13 +140,20 @@
 </template>
 
 <script setup lang="ts">
-import { ref, reactive, onMounted, onBeforeUnmount } from 'vue';
+import { ref, reactive, onMounted, onBeforeUnmount, computed } from 'vue';
 import * as echarts from 'echarts';
 import { loadMonitor, getNetworkOptions } from '@/api/modules/monitor';
 import { Monitor } from '@/api/interface/monitor';
 import { dateFormatWithoutYear } from '@/utils/util';
 import i18n from '@/lang';
 import MonitorRouter from '@/views/host/monitor/index.vue';
+import { GlobalStore } from '@/store';
+
+const globalStore = GlobalStore();
+
+const mobile = computed(() => {
+    return globalStore.isMobile();
+});
 
 const zoomStart = ref();
 const monitorBase = ref();

frontend/src/views/host/terminal/terminal/index.vue

@@ -149,9 +149,11 @@ const globalStore = GlobalStore();
 function toggleFullscreen() {
     if (screenfull.isEnabled) {
         screenfull.toggle();
-        globalStore.setScreenFull();
     }
 }
+screenfull.on('change', () => {
+    globalStore.isFullScreen = screenfull.isFullscreen;
+});
 
 const localHostID = ref();
 
@@ -181,6 +183,7 @@ interface Tree {
 }
 
 const acceptParams = async () => {
+    globalStore.isFullScreen = false;
     loadCommand();
     const res = await getHostTree({});
     hostTree.value = res.data;

frontend/src/views/log/login/index.vue

@@ -15,39 +15,44 @@
                         </el-button>
                     </el-col>
                     <el-col :xs="24" :sm="8" :md="8" :lg="8" :xl="8">
-                        <TableSetting @search="search()" />
-                        <div class="search-button">
-                            <el-input
-                                v-model="searchIP"
-                                clearable
-                                @clear="search()"
-                                suffix-icon="Search"
-                                @keyup.enter="search()"
-                                @change="search()"
-                                :placeholder="$t('commons.button.search') + ' ip'"
-                            ></el-input>
+                        <div class="flx-align-center">
+                            <div class="search-button">
+                                <el-input
+                                    v-model="searchIP"
+                                    clearable
+                                    @clear="search()"
+                                    suffix-icon="Search"
+                                    @keyup.enter="search()"
+                                    @change="search()"
+                                    :placeholder="$t('commons.button.search') + ' ip'"
+                                ></el-input>
+                            </div>
+                            <TableSetting @search="search()" />
                         </div>
                     </el-col>
                 </el-row>
             </template>
 
             <template #search>
-                <el-select v-model="searchStatus" @change="search()" clearable>
-                    <template #prefix>{{ $t('commons.table.status') }}</template>
-                    <el-option :label="$t('commons.table.all')" value=""></el-option>
-                    <el-option :label="$t('commons.status.success')" value="Success"></el-option>
-                    <el-option :label="$t('commons.status.failed')" value="Failed"></el-option>
-                </el-select>
-                <el-button type="primary" plain @click="onClean()" style="margin-left: 10px">
-                    {{ $t('logs.deleteLogs') }}
-                </el-button>
+                <div class="flx-align-center">
+                    <el-select v-model="searchStatus" @change="search()" clearable>
+                        <template #prefix>{{ $t('commons.table.status') }}</template>
+                        <el-option :label="$t('commons.table.all')" value=""></el-option>
+                        <el-option :label="$t('commons.status.success')" value="Success"></el-option>
+                        <el-option :label="$t('commons.status.failed')" value="Failed"></el-option>
+                    </el-select>
+
+                    <el-button type="primary" plain @click="onClean()" style="margin-left: 10px">
+                        {{ $t('logs.deleteLogs') }}
+                    </el-button>
+                </div>
             </template>
             <template #main>
                 <ComplexTable :pagination-config="paginationConfig" :data="data" @search="search">
-                    <el-table-column min-width="40" :label="$t('logs.loginIP')" prop="ip" />
-                    <el-table-column min-width="40" :label="$t('logs.loginAddress')" prop="address" />
+                    <el-table-column :label="$t('logs.loginIP')" prop="ip" />
+                    <el-table-column :label="$t('logs.loginAddress')" prop="address" />
                     <el-table-column :label="$t('logs.loginAgent')" show-overflow-tooltip prop="agent" />
-                    <el-table-column min-width="40" :label="$t('logs.loginStatus')" prop="status">
+                    <el-table-column :label="$t('logs.loginStatus')" prop="status">
                         <template #default="{ row }">
                             <div v-if="row.status === 'Success'">
                                 <el-tag type="success">{{ $t('commons.status.success') }}</el-tag>

frontend/src/views/login/entrance/index.vue

@@ -145,9 +145,9 @@ onMounted(() => {
             font-size: 40px;
             font-family: pingFangSC-Regular;
             font-weight: 600;
-            // @media only screen and (max-width: 1440px) {
-            //     margin-left: 0;
-            // }
+            @media only screen and (max-width: 768px) {
+                font-size: 35px;
+            }
         }
         @media only screen and (max-width: 1110px) {
             margin-bottom: 20px;
@@ -170,6 +170,9 @@ onMounted(() => {
         @media only screen and (max-width: 1110px) {
             margin: 60px auto 0;
         }
+        @media only screen and (max-width: 768px) {
+            width: 100%;
+        }
     }
 }
 </style>

frontend/src/views/login/index.vue

@@ -100,9 +100,9 @@ onMounted(() => {
             font-size: 40px;
             font-family: pingFangSC-Regular;
             font-weight: 600;
-            // @media only screen and (max-width: 1440px) {
-            //     margin-left: 0;
-            // }
+            @media only screen and (max-width: 768px) {
+                font-size: 35px;
+            }
         }
         @media only screen and (max-width: 1110px) {
             margin-bottom: 20px;
@@ -125,6 +125,10 @@ onMounted(() => {
         @media only screen and (max-width: 1110px) {
             margin: 60px auto 0;
         }
+
+        @media only screen and (max-width: 768px) {
+            width: 100%;
+        }
     }
 }
 </style>