fix: 校验域名空值问题 & 重定向table展示method

Nyakooo · Nyakooo · commit 8afbe9dffca4 · 2023-09-25T13:47:34.000+08:00
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "ajax-proxy",
   "private": true,
   "description": "Modify your Ajax response to test",
-  "version": "2.2.7",
+  "version": "2.2.8",
   "scripts": {
     "dev": "pnpm -C ./packages/vue-panels serve",
     "watch": "run-p watch:lib watch:chrome",
diff --git a/packages/shell-chrome/manifest.json b/packages/shell-chrome/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "Ajax Proxy",
-  "version": "2.2.7",
+  "version": "2.2.8",
   "description": "Modify your Ajax response to test",
   "author": "Gj",
   "icons": {
diff --git a/packages/vue-panels/src/lang/en.js b/packages/vue-panels/src/lang/en.js
@@ -47,6 +47,7 @@ export default {
     dataErr: 'Data exception',
     formatErr: 'Format error',
     importEmpty: 'You imported an empty list',
+    existsEmptyString: 'Empty string exists',
   },
   placeholder: {
     select: 'Please select',
diff --git a/packages/vue-panels/src/lang/fr.js b/packages/vue-panels/src/lang/fr.js
@@ -48,6 +48,7 @@ export default {
         dataErr: 'Données anormales',
         formatErr: 'Mauvais format',
         importEmpty: 'Vous avez importé une liste vide',
+        existsEmptyString: 'Présence d\'une chaîne vide',
     },
     placeholder: {
         select: 'Veuillez sélectionner',
diff --git a/packages/vue-panels/src/lang/ireland.js b/packages/vue-panels/src/lang/ireland.js
@@ -48,6 +48,7 @@ export default {
         dataErr: 'Eisceachta sonraí',
         formatErr: 'Earráid fhormáide',
         importEmpty: 'Iompórtáil tú liosta folamh',
+        existsEmptyString: 'Tá teaghrán folamh ann',
     },
     placeholder: {
         select: 'Roghnaigh le do thoil',
diff --git a/packages/vue-panels/src/lang/ja.js b/packages/vue-panels/src/lang/ja.js
@@ -48,6 +48,7 @@ export default {
         dataErr: 'データ異常',
         formatErr: 'フォーマットエラー',
         importEmpty: '空のリストをインポートしました',
+        existsEmptyString: '空の文字列が存在します',
     },
     placeholder: {
         select: '選択してください',
diff --git a/packages/vue-panels/src/lang/ko.js b/packages/vue-panels/src/lang/ko.js
@@ -48,6 +48,7 @@ export default {
         dataErr: '데이터 예외',
         formatErr: '형식 오류',
         importEmpty: '빈 목록을 가져왔습니다',
+        existsEmptyString: '빈 문자열 있음',
     },
     placeholder: {
         select: '선택하십시오.',
diff --git a/packages/vue-panels/src/lang/ru.js b/packages/vue-panels/src/lang/ru.js
@@ -48,6 +48,7 @@ export default {
         dataErr: 'аномалия данных',
         formatErr: 'ошибка формата',
         importEmpty: 'вы импортировали пустой список',
+        existsEmptyString: 'Наличие пустых строк',
     },
     placeholder: {
         select: 'Выберите',
diff --git a/packages/vue-panels/src/lang/zh_CN.js b/packages/vue-panels/src/lang/zh_CN.js
@@ -47,6 +47,7 @@ export default {
     dataErr: '数据异常',
     formatErr: '格式错误',
     importEmpty: '你导入了一个空列表',
+    existsEmptyString: '存在空字符串',
   },
   placeholder: {
     select: '请选择',
diff --git a/packages/vue-panels/src/lang/zh_TW.js b/packages/vue-panels/src/lang/zh_TW.js
@@ -48,6 +48,7 @@ export default {
         dataErr: '數據异常',
         formatErr: '格式錯誤',
         importEmpty: '你導入了一個空清單',
+        existsEmptyString: '存在空字符串',
     },
     placeholder: {
         select: '請選擇',
diff --git a/packages/vue-panels/src/views/interceptor/modal.vue b/packages/vue-panels/src/views/interceptor/modal.vue
@@ -18,6 +18,11 @@
               trigger: 'blur',
               message: $t('msg.pathNotEmpty'),
             },
+            {
+              validator: validUrl,
+              trigger: 'change',
+              message: $t('msg.existsEmptyString'),
+            },
           ]"
           prop="match_url"
         >
@@ -162,6 +167,15 @@ export default {
     };
   },
   methods: {
+    validUrl(rule, value, callback) {
+      if (value) {
+        const trimStr = value.trim();
+        if (value.length != trimStr.length) {
+          callback(new Error());
+        }
+      }
+      callback();
+    },
     // 打开编辑器
     handleOpenJsonEditor(jsonStr) {
       try {
diff --git a/packages/vue-panels/src/views/redirector/modal.vue b/packages/vue-panels/src/views/redirector/modal.vue
@@ -19,6 +19,11 @@
               trigger: 'blur',
               message: $t('msg.domainNotEmpty'),
             },
+            {
+              validator: validUrl,
+              trigger: 'change',
+              message: $t('msg.existsEmptyString'),
+            },
           ]"
           prop="domain"
         >
@@ -57,6 +62,11 @@
                   trigger: 'change',
                   message: $t('msg.redirectNotEmpty'),
                 },
+                {
+                  validator: validUrl,
+                  trigger: 'change',
+                  message: $t('msg.existsEmptyString'),
+                },
               ]"
               prop="redirect_url"
             >
@@ -249,6 +259,15 @@ export default {
     };
   },
   methods: {
+    validUrl(rule, value, callback) {
+      if (value) {
+        const trimStr = value.trim();
+        if (value.length != trimStr.length) {
+          callback(new Error());
+        }
+      }
+      callback();
+    },
     // 白名单添加
     handleIgnoresAdd() {
       this.form.ignores.push("");
diff --git a/packages/vue-panels/src/views/redirector/table.vue b/packages/vue-panels/src/views/redirector/table.vue
@@ -22,6 +22,11 @@
           }}
         </template>
       </el-table-column>
+      <el-table-column label="Method" width="90">
+        <template slot-scope="{ row }">
+          {{ row.method || "ANY" }}
+        </template>
+      </el-table-column>
       <el-table-column
         prop="domain"
         :label="$t('domain')"

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"manifest_version": 3,`
`3`	`3`	`"name": "Ajax Proxy",`
`4`		`- "version": "2.2.7",`
	`4`	`+ "version": "2.2.8",`
`5`	`5`	`"description": "Modify your Ajax response to test",`
`6`	`6`	`"author": "Gj",`
`7`	`7`	`"icons": {`