Merge branch 'master' of github.com:szuprefix/vue-django

szuprefix · Oct 16, 2020 · 4bc7c34 · 4bc7c34
2 parents 6c1ebfc + 875e4f4
commit 4bc7c34
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/src/components/layout/ViewTabs.vue b/src/components/layout/ViewTabs.vue
@@ -80,7 +80,7 @@
         watch: {
             curTab () {
                 if (this.$route.path !== this.curTab) {
-                    this.$router.push(this.resolveRoutePath(this.curTab))
+                    this.$router.push(this.curTab)
                 }
             },
             $route (newVal, oldVal) {

diff --git a/src/components/rest/RelatedSelect.vue b/src/components/rest/RelatedSelect.vue
@@ -73,7 +73,7 @@
             },
             toCreateModel(row){
                 let url = `${this.tableUrl}create/?${this.modelConfig.title_field || 'name'}=${this.tableQueries.search}`
-                this.$router.push(this.resolveRoutePath(url))
+                this.$router.push(url)
             }
         },
         computed: {

diff --git a/src/mixins/list_view.js b/src/mixins/list_view.js
@@ -69,13 +69,13 @@ export default{
             this.toEditModel(row, column, cell, event)
         },
         toEditModel (row, column, cell, event) {
-            const path = this.resolveRoutePath(`${row.id}`)
+            const path = `${row.id}`
             this.$router.replace(path)
             this.resolveCurrentTagLabel(path, `${row.__str__}`)
         },
         toCreateModel () {
             let url = `/${this.model.listUrl}create?${this.model.title_field}=${this.queries.search}`
-            this.$router.push(this.resolveRoutePath(url))
+            this.$router.push(url)
             this.resolveCurrentTagLabel(url, `新增${this.model.verbose_name}`)
         },
         onPageChanged (val) {

diff --git a/src/mixins/model_edit_view.js b/src/mixins/model_edit_view.js
@@ -37,15 +37,15 @@ export  default {
                 if (this.tab) {
                     this.tab.name = p
                 }
-                const path = this.resolveRoutePath(p)
-                this.$router.replace(path)
+                // const path = this.resolveRoutePath(p)
+                this.$router.replace(p)
                 //this.resolveCurrentTagLabel(path, `创建${form.modelFormTitle}`)
             } else {
                 this.setTitle(p)
             }
         },
         setTitle(p){
-            p = !!p ? p : this.resolveRoutePath(this.modelDetailUrl)
+            p = !!p ? p : this.modelDetailUrl
 
             const formTitle = this.$refs.form.modelFormTitle
             if (this.tab) {

diff --git a/src/mixins/model_table.js b/src/mixins/model_table.js
@@ -135,7 +135,7 @@ export default {
 
         tableToEditModel ({row}){
             // wayky edit
-            const path = this.resolveRoutePath(`/${this.appModelName.replace('.', '/')}/${row.id}`)
+            const path = `/${this.appModelName.replace('.', '/')}/${row.id}`
             this.$router.push(path)
             this.resolveCurrentTagLabel(path, `编辑${row.__str__}`)
         },
@@ -148,15 +148,15 @@ export default {
 
 
         tableToBatchCreateModel (){
-            this.$router.push(this.resolveRoutePath(`${this.modelListUrl}batch?${this.modelConfig.title_field}=${this.tableQueries.search}`))
+            this.$router.push(`${this.modelListUrl}batch?${this.modelConfig.title_field}=${this.tableQueries.search}`)
         },
 
         tableToCreateModel(){
             let createUrl = `${this.modelListUrl}create`
             if (!!this.modelConfig.title_field && !!this.tableQueries.search) {
                 createUrl = `${createUrl}?${this.modelConfig.title_field}=${this.tableQueries.search}`
             }
-            const path = this.resolveRoutePath(createUrl)
+            const path = createUrl
             this.$router.push(path)
             this.resolveCurrentTagLabel(path, `新增${this.modelConfig.verbose_name}`)
         },