Merge pull request #132 from HXSecurity/issue4+

Feature:HXSecurity/DongTai#348

Author: 奇淼（piexlmax

src/config/lang/en.ts

@@ -636,18 +636,14 @@ export default {
       fixR: 'Please enter a matching rule',
       t: 'Sensitive data configuration',
       p1:
-        'Sensitive information detection function officially opened public testing, in order to detect the security risk of sensitive information leakage, it is necessary to configure the matching rules of sensitive information and related policies and custom rules. ',
+        'Sensitive information detection function officially opened public testing, in order to detect the security risk of sensitive information leakage, it is necessary to configure the matching rules of sensitive information and related policies.',
       p2: 'Process (to increase mobile phone number leakage for example): ',
       p3:
-        '1. Go to the Rules Management page, go to the "Dangerous Method Rules" tab',
+        '1. Go to the "Policy Management" page, add a new policy "Mobile Phone Number Leak", fill in the policy description, repair suggestions and choose to enable;',
       p4:
-        '2. Click the "Add Rule Type" button to add a rule with the type name: "PhoneNumber" and the type is referred to simply as "Mobile Phone Number"',
-      p5:
-        "3. Go to the 'Policy Management' page, search for the policy 'mobile phone number', edit the policy, and modify the policy name to 'mobile phone number leak'",
-      p6:
-        '4. Click on the "New Match Rules" button on the current page to add matching rules, select the type "Mobile Phone Number Leak", match the way is "Regular Match", fill in the "Match Rules" and click Save. ',
+        '2. Go back to the current page, click on the "New Matching Rules" button, select the policy name is "Mobile Phone Number Leak", match the way is "Regular Match", fill in "Match Rules" and click Save.',
       tip:
-        'The data for the policy name comes from policy information in policy management',
+        'The policy name comes from the policy name in Policy Management, and if it does not exist, you can contact the administrator to go to Policy Management New policy',
       search: 'Search',
     },
     upgradeOnline: {

src/config/lang/zh_cn.ts

@@ -625,16 +625,14 @@ export default {
       fixR: '请输入匹配规则',
       t: '敏感数据配置',
       p1:
-        '敏感信息检测功能正式开启公测，为了检测敏感信息泄漏的安全风险，需要配置敏感信息的匹配规则及相关的策略与自定义规则。',
-      p2: '流程（以增加 手机号码泄漏 为例）：',
-      p3: '1. 进入 规则管理 页面，进入 “危险方法规则” 页签',
+        '敏感信息检测功能正式开启公测，为了检测敏感信息泄漏的安全风险，需要配置敏感信息的匹配规则及相关的策略。',
+      p2: 'Process (to increase mobile phone number leakage, for example):',
+      p3:
+        '1. 进入 “策略管理” 页面，新增策略 “手机号码泄漏”，填写策略描述、修复建议并选择启用；',
       p4:
-        '2. 点击 “添加规则类型” 按钮添加规则，类型名称为：”PhoneNumber”，类型简称为：“手机号码”',
-      p5:
-        '3. 进入 “策略管理” 页面，搜索策略 “手机号码“，编辑策略，并修改策略名称 为 “手机号码泄漏”',
-      p6:
-        '4. 在当前页面点击 “新增匹配规则” 按钮，增加匹配规则，选中类型为“手机号码泄漏”，匹配方式为 “正则匹配”，填写“匹配规则”，然后点击保存即可。',
-      tip: '策略名称的数据来自策略管理中的策略信息',
+        '2. 返回 当前页面，点击 “新增匹配规则” 按钮，选择 策略名称为 “手机号码泄漏”，匹配方式为 “正则匹配”，填写 “匹配规则”，然后点击保存即可。',
+      tip:
+        '策略名称的来自 策略管理 中的策略名称，如不存在，可联系管理员前往策略管理 新增策略',
       fixP: '输入正则表达式的规则，用于匹配当前策略',
       testP: '输入完内容后，点击运行按钮进行测试',
       search: '搜索',

src/views/setting/StrategyManage.vue

@@ -87,9 +87,11 @@
       <el-pagination
         :current-page="page"
         background
-        page-size="20"
-        layout=" prev, pager, next, jumper,total"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="page_size"
+        layout=" prev, pager, next, jumper, sizes, total"
         :total="total"
+        @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
       >
       </el-pagination>
@@ -110,6 +112,7 @@ export default class StrategyManage extends VueBase {
   private vul_levels = []
   private vul_levels_map = {}
   private page = 1
+  private page_size = 20
   private total = 0
   private dialogForm: any = {
     vul_name: '',
@@ -280,6 +283,11 @@ export default class StrategyManage extends VueBase {
     await this.getTableData()
   }
 
+  private handleSizeChange(val: number) {
+    this.page_size = val
+    this.getTableData()
+  }
+
   private async getTableData() {
     this.loadingStart()
     const {
@@ -289,7 +297,7 @@ export default class StrategyManage extends VueBase {
       page,
     } = await this.services.setting.strategyList(false, {
       page: this.page,
-      page_size: 20,
+      page_size: this.page_size,
       name: this.searchValue,
     })
     this.loadingDone()

src/views/setting/sensitive.vue

@@ -18,12 +18,6 @@
           <p>
             {{ $t('views.sensitiveManage.p4') }}
           </p>
-          <p>
-            {{ $t('views.sensitiveManage.p5') }}
-          </p>
-          <p>
-            {{ $t('views.sensitiveManage.p6') }}
-          </p>
         </div>
       </el-card>
     </div>

src/views/setting/sensitiveManage.vue

@@ -17,12 +17,6 @@
           <p>
             {{ $t('views.sensitiveManage.p4') }}
           </p>
-          <p>
-            {{ $t('views.sensitiveManage.p5') }}
-          </p>
-          <p>
-            {{ $t('views.sensitiveManage.p6') }}
-          </p>
         </div>
       </el-card>
     </div>
@@ -134,9 +128,11 @@
         <el-pagination
           :current-page="page"
           background
-          page-size="20"
-          layout=" prev, pager, next, jumper,total"
+          :page-sizes="[10, 20, 50, 100]"
+          :page-size="page_size"
+          layout=" prev, pager, next, jumper, sizes, total"
           :total="total"
+          @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
         >
         </el-pagination>
@@ -156,6 +152,7 @@ export default class sensitiveManage extends VueBase {
   private pattern_type = []
   private pattern_type_map = {}
   private page = 1
+  private page_size = 20
   private total = 0
   private name = ''
   private async stateChange(row: any) {
@@ -173,7 +170,12 @@ export default class sensitiveManage extends VueBase {
     }
   }
 
-  private handleCurrentChange(val: number) {
+  private handleSizeChange(val: number) {
+    this.page_size = val
+    this.getTableData()
+  }
+
+  private handles(val: number) {
     this.page = val
     this.getTableData()
   }
@@ -211,7 +213,7 @@ export default class sensitiveManage extends VueBase {
       page,
     } = await this.services.setting.get_sensitive_info_rule({
       page: this.page,
-      page_size: 20,
+      page_size: this.page_size,
       name: this.name,
     })
     this.loadingDone()
@@ -239,11 +241,11 @@ export default class sensitiveManage extends VueBase {
   }
   private async sensitiveDialogDelete(row: any) {
     this.$confirm(
-      this.$t('views.projectEdit.deleteWarning') as string,
-      this.$t('views.projectEdit.deletePop') as string,
+      this.$t('views.sensitiveManage.deleteWarning') as string,
+      this.$t('views.sensitiveManage.deletePop') as string,
       {
-        confirmButtonText: this.$t('views.projectEdit.enter') as string,
-        cancelButtonText: this.$t('views.projectEdit.clear') as string,
+        confirmButtonText: this.$t('views.sensitiveManage.enter') as string,
+        cancelButtonText: this.$t('views.sensitiveManage.clear') as string,
         type: 'warning',
       }
     ).then(async () => {