[incubator-apisix-dashboard] branch master updated: feature:allow set filter_func in router configuation page (#164)

[ju...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

juzhiyuan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-apisix-dashboard.git


The following commit(s) were added to refs/heads/master by this push:
     new cfb3ee7  feature:allow set filter_func in router configuation page (#164)
cfb3ee7 is described below

commit cfb3ee7b8721076975c1deaff3e52da3ea4a312a
Author: chaofa <57...@qq.com>
AuthorDate: Wed Mar 25 09:31:58 2020 +0800

    feature:allow set filter_func in router configuation page (#164)
    
    * feature:allow set vars filter
    
    * feature:allow set vars filter in router configuration page
    
    * feature:allow set vars filter in router configuration page
    
    * fiexed some irregular style
    
    * feature:allow set filter_func in router configuation page
---
 src/lang/en.ts                   |  3 ++-
 src/lang/zh.ts                   |  3 ++-
 src/views/schema/routes/edit.vue | 37 +++++++++++++++++++++++++++++++------
 3 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/src/lang/en.ts b/src/lang/en.ts
index 8a2f4c2..c82338e 100644
--- a/src/lang/en.ts
+++ b/src/lang/en.ts
@@ -74,7 +74,8 @@ export default {
   schema: {
     route: {
       inputMultipleValues: 'Input value then press return button',
-      propertyHostsTip: 'Any values are supported'
+      propertyHostsTip: 'Any values are supported',
+      fileterFunc: 'User-defined filtering function，Begins with "function()" and ends with "end".'
     }
   },
   upstream: {
diff --git a/src/lang/zh.ts b/src/lang/zh.ts
index 64164e1..b35ad59 100644
--- a/src/lang/zh.ts
+++ b/src/lang/zh.ts
@@ -82,7 +82,8 @@ export default {
   schema: {
     route: {
       inputMultipleValues: '输入值后并回车',
-      propertyHostsTip: '任何值均可'
+      propertyHostsTip: '任何值均可',
+      fileterFunc: '用户自定义的过滤函数，以‘function()’开头，以‘end’结尾。'
     }
   },
   upstream: {
diff --git a/src/views/schema/routes/edit.vue b/src/views/schema/routes/edit.vue
index 84135c6..80c5ded 100644
--- a/src/views/schema/routes/edit.vue
+++ b/src/views/schema/routes/edit.vue
@@ -199,6 +199,18 @@
         @onChange="onVarArgsChange"
       />
 
+      <el-form-item
+        label="filter_func"
+        prop="filter_func"
+      >
+        <el-input
+          v-model="form.filter_func"
+          type="textarea"
+          :autosize="{minRows: 2, maxRows: 4}"
+          :placeholder="$t('schema.route.fileterFunc')"
+        />
+      </el-form-item>
+
       <el-form-item>
         <el-button
           type="primary"
@@ -234,6 +246,8 @@ import { getUpstreamList } from '@/api/schema/upstream'
 import { getServiceList } from '@/api/schema/services'
 import { TagsViewModule } from '@/store/modules/tags-view'
 
+import i18n from '@/lang'
+
 @Component({
   name: 'RouterEdit',
   components: {
@@ -252,17 +266,22 @@ export default class extends Vue {
     methods: [],
     plugins: {},
     vars: [],
-    desc: ''
+    desc: '',
+    filter_func: ''
   }
 
   // TODO: can add existed info from route list
   private ExistedUris = [{}]
   private ExistedHosts = [{}]
+  private validateFilterFuncRegexp = /^function\(\)[^]*?\bend$/
 
   private rules = {
     uris: {
       required: true
-    }
+    },
+    filter_func: [
+      { pattern: this.validateFilterFuncRegexp, trigger: 'blur', message: i18n.t('schema.route.fileterFunc') }
+    ]
   }
   private isEditMode: boolean = false
 
@@ -302,7 +321,8 @@ export default class extends Vue {
       methods: [],
       plugins: {},
       vars: [],
-      desc: ''
+      desc: '',
+      filter_func: ''
     }
   }
 
@@ -347,7 +367,8 @@ export default class extends Vue {
           methods = [],
           plugins = {},
           vars = [],
-          desc = ''
+          desc = '',
+          filter_func = ''
         }
       }
     } = await getRouter(id) as any
@@ -369,12 +390,13 @@ export default class extends Vue {
       methods,
       plugins,
       vars,
-      desc
+      desc,
+      filter_func
     }
   }
 
   private async onSubmit() {
-    (this.$refs.form as any).validate(async(valid: boolean) => {
+    (this.$refs.form as any).validate(async(valid: boolean, invalidField: any) => {
       if (valid) {
         let data = Object.assign({}, this.form)
         if (!data.methods.length) {
@@ -411,6 +433,9 @@ export default class extends Vue {
           })
         }
       } else {
+        if (invalidField.filter_func) {
+          this.$message.warning(invalidField.filter_func[0].message)
+        }
         return false
       }
     })