From 34a72467d2d57934eb44eef0e6c8bf7899cd795f Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Tue, 13 Jul 2021 10:29:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E6=97=B6url=E4=B8=AD=E6=9C=89=E5=8F=82=E6=95=B0=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E7=9A=84=E6=8B=BC=E6=8E=A5=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

perf: 优化一下获取url
---
 .../ListTable/TableAction/ImportTable.vue           |  4 ++--
 .../components/GenericCreateUpdateForm/index.vue    |  3 ++-
 src/utils/common.js                                 | 13 ++++++++++++-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/components/ListTable/TableAction/ImportTable.vue b/src/components/ListTable/TableAction/ImportTable.vue
index 96ca990dd..b2206e6d3 100644
--- a/src/components/ListTable/TableAction/ImportTable.vue
+++ b/src/components/ListTable/TableAction/ImportTable.vue
@@ -33,7 +33,7 @@
 
 <script>
 import DataTable from '@/components/DataTable'
-import { sleep } from '@/utils/common'
+import { sleep, getUpdateObjURL } from '@/utils/common'
 import { EditableInputFormatter, StatusFormatter } from '@/components/TableFormatters'
 export default {
   name: 'ImportTable',
@@ -350,7 +350,7 @@ export default {
       }
     },
     async performUpdateObject(item) {
-      const updateUrl = `${this.url}${item.id}/`
+      const updateUrl = getUpdateObjURL(this.url, item.id)
       return this.$axios.put(
         updateUrl,
         item,
diff --git a/src/layout/components/GenericCreateUpdateForm/index.vue b/src/layout/components/GenericCreateUpdateForm/index.vue
index 27151bd7c..344083b5c 100644
--- a/src/layout/components/GenericCreateUpdateForm/index.vue
+++ b/src/layout/components/GenericCreateUpdateForm/index.vue
@@ -15,6 +15,7 @@
 </template>
 <script>
 import AutoDataForm from '@/components/AutoDataForm'
+import { getUpdateObjURL } from '@/utils/common'
 export default {
   name: 'GenericCreateUpdateForm',
   components: {
@@ -129,7 +130,7 @@ export default {
         const params = this.$route.params
         let url = this.url
         if (params.id) {
-          url = `${url}${params.id}/`
+          url = getUpdateObjURL(url, params.id)
         }
         return url
       }
diff --git a/src/utils/common.js b/src/utils/common.js
index 65b2ca79c..33da3d6a3 100644
--- a/src/utils/common.js
+++ b/src/utils/common.js
@@ -214,11 +214,22 @@ export function newURL(url) {
   if (url.indexOf('//') > -1) {
     obj = new URL(url)
   } else {
-    obj = new URL(url, 'http://localhost')
+    obj = new URL(url, location.origin)
   }
   return obj
 }
 
+export function getUpdateObjURL(url, objId) {
+  const urlObj = new URL(url, location.origin)
+  let pathname = urlObj.pathname
+  if (!pathname.endsWith('/')) {
+    pathname += '/'
+  }
+  pathname += `${objId}/`
+  urlObj.pathname = pathname
+  return urlObj.href
+}
+
 export const assignIfNot = _.partialRight(_.assignInWith, customizer)
 
 const scheme = document.location.protocol