Added regex search in RoleManagement

Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/RoleController.java

@@ -44,10 +44,10 @@ public class RoleController {
     @Operation(summary = "获取所有角色")
     @GetMapping
     @PreAuthorize("hasAuthority('system:role:get')")
-    public ResponseResult<IPage<Role>> getAllRole(Long currentPage, Long pageSize, String searchName, String searchPower, Integer searchEnable) {
+    public ResponseResult<IPage<Role>> getAllRole(Long currentPage, Long pageSize, String searchName, String searchPower, Integer searchEnable, Integer searchRegex) {
         List<Long> searchPowerList = WebUtil.convertStringToList(searchPower, Long.class);
 
-        IPage<Role> roles = roleService.getAllRole(currentPage, pageSize, searchName, searchPowerList, searchEnable);
+        IPage<Role> roles = roleService.getAllRole(currentPage, pageSize, searchName, searchPowerList, searchEnable, searchRegex);
         return ResponseResult.databaseSelectSuccess(roles);
     }
 

Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/RoleMapper.java

@@ -17,7 +17,7 @@ import java.util.List;
  */
 @Mapper
 public interface RoleMapper extends BaseMapper<Role> {
-    List<Long> filterRoleByPowerId(@Param("roleList") List<Long> roleList, @Param("powerId") Long powerId, String searchName, Integer searchEnable);
+    List<Long> filterRoleByPowerId(@Param("roleList") List<Long> roleList, @Param("powerId") Long powerId, @Param("searchName") String searchName, @Param("searchEnable") Integer searchEnable, @Param("searchRegex") Integer searchRegex);
 
     List<Role> getAll(@Param("roleList") List<Role> roleList);
 

Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IRoleService.java

@@ -15,7 +15,7 @@ import java.util.List;
  * @since 2023-04-30
  */
 public interface IRoleService extends IService<Role> {
-    IPage<Role> getAllRole(Long currentPage, Long pageSize, String searchName, List<Long> searchPower, Integer searchEnable);
+    IPage<Role> getAllRole(Long currentPage, Long pageSize, String searchName, List<Long> searchPower, Integer searchEnable, Integer searchRegex);
 
     Role getRole(long id);
 

Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/RoleServiceImpl.java

@@ -44,13 +44,13 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements IR
     }
 
     @Override
-    public IPage<Role> getAllRole(Long currentPage, Long pageSize, String searchName, List<Long> searchPower, Integer searchEnable) {
+    public IPage<Role> getAllRole(Long currentPage, Long pageSize, String searchName, List<Long> searchPower, Integer searchEnable, Integer searchRegex) {
         IPage<Role> roleIPage = PageDTO.of(currentPage, pageSize);
         searchName = searchName.trim();
-        List<Long> roleList = roleMapper.filterRoleByPowerId(null, null, searchName, searchEnable);
+        List<Long> roleList = roleMapper.filterRoleByPowerId(null, null, searchName, searchEnable, searchRegex);
         if (roleList.size() > 0) {
             for (Long powerId : searchPower) {
-                roleList = roleMapper.filterRoleByPowerId(roleList, powerId, null, null);
+                roleList = roleMapper.filterRoleByPowerId(roleList, powerId, null, null, null);
                 if (roleList.size() == 0) {
                     break;
                 }

Pinnacle/src/main/resources/mapper/permission/RoleMapper.xml

@@ -16,8 +16,13 @@
                 #{item}
             </foreach>
             <if test="searchName != null and searchName != ''">
+                <if test="searchRegex == 1">
+                    and t_role.name regexp #{searchName}
+                </if>
+                <if test="searchRegex != 1">
                     and instr(t_role.name, #{searchName}) > 0
                 </if>
+            </if>
             <if test="searchEnable != null and searchEnable != -1">
                 and t_role.enable = #{searchEnable}
             </if>

ui/src/pages/power/RoleManagement.vue

@@ -24,14 +24,29 @@
             </el-button>
         </el-col>
         <el-col :span="5">
-            <el-form-item label="名称" class="fill-with">
+            <el-form-item
+                label="名称"
+                class="fill-with"
+                :error="isRegexLegal ? '' : '非法正则表达式'"
+            >
                 <el-input
                     v-model="inputName"
                     maxlength="20"
                     show-word-limit
                     placeholder="请输入内容"
                     @keyup.enter="handleQuery"
+                >
+                    <template #suffix>
+                        <el-tooltip content="正则表达式">
+                            <el-checkbox
+                                v-model="checkedRegex"
+                                label=".*"
+                                :true-label="1"
+                                @change="handleInputChange"
                             />
+                        </el-tooltip>
+                    </template>
+                </el-input>
             </el-form-item>
         </el-col>
         <el-col :span="9">
@@ -161,10 +176,13 @@ export default {
             dialogLoading: true,
             powerOptions: [],
             searchName: '',
-            searchPower: [],
-            searchEnable: -1,
             inputName: '',
+            searchRegex: 0,
+            checkedRegex: 0,
+            isRegexLegal: true,
+            searchPower: [],
             selectedPower: [],
+            searchEnable: -1,
             selectedEnable: -1,
             currentPage: 1,
             pageSize: 50,
@@ -204,6 +222,13 @@ export default {
     },
     methods: {
         loadRoleTable() {
+            if (!this.isRegexLegal) {
+                ElMessage.error({
+                    dangerouslyUseHTMLString: true,
+                    message: '<strong>非法正则表达式</strong>，请重新输入'
+                })
+                return
+            }
             this.tableLoading = true
             request
                 .get('/role', {
@@ -211,7 +236,8 @@ export default {
                     pageSize: this.pageSize,
                     searchName: this.searchName,
                     searchPower: this.searchPower + '',
-                    searchEnable: this.searchEnable
+                    searchEnable: this.searchEnable,
+                    searchRegex: this.searchRegex ?? 0
                 })
                 .then((res) => {
                     const response = res.data
@@ -430,16 +456,33 @@ export default {
         },
         handleQuery() {
             this.searchName = _.cloneDeep(this.inputName)
+            this.searchRegex = _.cloneDeep(this.checkedRegex)
             this.searchPower = _.cloneDeep(this.selectedPower)
             this.searchEnable = _.cloneDeep(this.selectedEnable)
             this.currentPage = 1
+            this.handleInputChange()
             this.loadRoleTable()
         },
         handleClear() {
             this.inputName = ''
+            this.checkedRegex = 0
             this.selectedPower = []
             this.selectedEnable = -1
             this.handleQuery()
+        },
+        handleInputChange() {
+            if (this.checkedRegex) {
+                try {
+                    RegExp(this.inputName)
+                    this.isRegexLegal = !(
+                        this.inputName.includes('{}') || this.inputName.includes('[]')
+                    )
+                } catch (e) {
+                    this.isRegexLegal = false
+                }
+            } else {
+                this.isRegexLegal = true
+            }
         }
     },
     mounted() {