fix: 快速命令管理页面中增加关键词筛选 (#4679)

Refs #3525

backend/app/dto/command.go

@@ -6,6 +6,7 @@ type SearchCommandWithPage struct {
 	Order   string `json:"order"`
 	GroupID uint   `json:"groupID"`
 	Info    string `json:"info"`
+	Name    string `json:"name"`
 }
 
 type CommandOperate struct {

backend/app/repo/command.go

@@ -16,6 +16,7 @@ type ICommandRepo interface {
 	Update(id uint, vars map[string]interface{}) error
 	Delete(opts ...DBOption) error
 	Get(opts ...DBOption) (model.Command, error)
+	WithLikeName(name string) DBOption
 }
 
 func NewICommandRepo() ICommandRepo {
@@ -79,3 +80,12 @@ func (u *CommandRepo) Delete(opts ...DBOption) error {
 	}
 	return db.Delete(&model.Command{}).Error
 }
+
+func (a CommandRepo) WithLikeName(name string) DBOption {
+	return func(g *gorm.DB) *gorm.DB {
+		if len(name) == 0 {
+			return g
+		}
+		return g.Where("name like ? or command like ?", "%"+name+"%", "%"+name+"%")
+	}
+}

backend/app/service/command.go

@@ -65,7 +65,7 @@ func (u *CommandService) SearchForTree() ([]dto.CommandTree, error) {
 }
 
 func (u *CommandService) SearchWithPage(search dto.SearchCommandWithPage) (int64, interface{}, error) {
-	total, commands, err := commandRepo.Page(search.Page, search.PageSize, commonRepo.WithLikeName(search.Info), commonRepo.WithByGroupID(search.GroupID), commonRepo.WithOrderRuleBy(search.OrderBy, search.Order))
+	total, commands, err := commandRepo.Page(search.Page, search.PageSize, commandRepo.WithLikeName(search.Name), commonRepo.WithLikeName(search.Info), commonRepo.WithByGroupID(search.GroupID), commonRepo.WithOrderRuleBy(search.OrderBy, search.Order))
 	if err != nil {
 		return 0, nil, err
 	}

frontend/src/api/interface/index.ts

@@ -24,6 +24,7 @@ export interface SearchWithPage {
     pageSize: number;
     orderBy?: string;
     order?: string;
+    name?: string;
 }
 export interface CommonModel {
     id: number;

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

@@ -16,6 +16,8 @@
                 </el-button>
             </template>
             <template #search>
+                <el-row :gutter="5">
+                    <el-col :xs="24" :sm="20" :md="20" :lg="20" :xl="20">
                         <el-select v-model="group" @change="search()" clearable class="p-w-200">
                             <template #prefix>{{ $t('terminal.group') }}</template>
                             <el-option :label="$t('commons.table.all')" value=""></el-option>
@@ -23,6 +25,11 @@
                                 <el-option :value="item.id" :label="item.name" />
                             </div>
                         </el-select>
+                    </el-col>
+                    <el-col :xs="24" :sm="4" :md="4" :lg="4" :xl="4">
+                        <TableSearch @search="search()" v-model:searchName="commandReq.name" />
+                    </el-col>
+                </el-row>
             </template>
             <template #main>
                 <ComplexTable
@@ -160,6 +167,10 @@ let commandInfo = reactive<Command.CommandOperate>({
     command: '',
 });
 
+const commandReq = reactive({
+    name: '',
+});
+
 const cmdVisible = ref<boolean>(false);
 
 const loadGroups = async () => {
@@ -274,6 +285,7 @@ const search = async (column?: any) => {
         info: info.value,
         orderBy: paginationConfig.orderBy,
         order: paginationConfig.order,
+        name: commandReq.name,
     };
     loading.value = true;
     await getCommandPage(params)