@ditojs/admin 2.10.4 → 2.10.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/dito-admin.es.js +4 -4
- package/dist/dito-admin.umd.js +3 -3
- package/package.json +10 -10
- package/src/DitoAdmin.js +2 -2
- package/src/mixins/DitoMixin.js +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ditojs/admin",
|
|
3
|
-
"version": "2.10.
|
|
3
|
+
"version": "2.10.7",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"description": "Dito.js Admin is a schema based admin interface for Dito.js Server, featuring auto-generated views and forms and built with Vue.js",
|
|
6
6
|
"repository": "https://github.com/ditojs/dito/tree/master/packages/admin",
|
|
@@ -33,8 +33,8 @@
|
|
|
33
33
|
"not ie_mob > 0"
|
|
34
34
|
],
|
|
35
35
|
"dependencies": {
|
|
36
|
-
"@ditojs/ui": "^2.10.
|
|
37
|
-
"@ditojs/utils": "^2.10.
|
|
36
|
+
"@ditojs/ui": "^2.10.7",
|
|
37
|
+
"@ditojs/utils": "^2.10.5",
|
|
38
38
|
"@kyvg/vue3-notification": "^2.9.1",
|
|
39
39
|
"@lk77/vue3-color": "^3.0.6",
|
|
40
40
|
"@tiptap/core": "^2.0.3",
|
|
@@ -58,11 +58,11 @@
|
|
|
58
58
|
"@tiptap/extension-underline": "^2.0.3",
|
|
59
59
|
"@tiptap/pm": "^2.0.3",
|
|
60
60
|
"@tiptap/vue-3": "^2.0.3",
|
|
61
|
-
"@vueuse/integrations": "^10.2.
|
|
61
|
+
"@vueuse/integrations": "^10.2.1",
|
|
62
62
|
"codeflask": "^1.4.1",
|
|
63
63
|
"filesize": "^10.0.7",
|
|
64
64
|
"filesize-parser": "^1.5.0",
|
|
65
|
-
"focus-trap": "^7.
|
|
65
|
+
"focus-trap": "^7.5.2",
|
|
66
66
|
"nanoid": "^4.0.2",
|
|
67
67
|
"sortablejs": "^1.15.0",
|
|
68
68
|
"tinycolor2": "^1.6.0",
|
|
@@ -70,20 +70,20 @@
|
|
|
70
70
|
"type-fest": "^3.12.0",
|
|
71
71
|
"vue": "^3.3.4",
|
|
72
72
|
"vue-multiselect": "^3.0.0-beta.2",
|
|
73
|
-
"vue-router": "^4.2.
|
|
73
|
+
"vue-router": "^4.2.4",
|
|
74
74
|
"vue-upload-component": "^3.1.8"
|
|
75
75
|
},
|
|
76
76
|
"devDependencies": {
|
|
77
|
-
"@ditojs/build": "^2.10.
|
|
77
|
+
"@ditojs/build": "^2.10.7",
|
|
78
78
|
"@vitejs/plugin-vue": "^4.2.3",
|
|
79
79
|
"@vue/compiler-sfc": "^3.3.4",
|
|
80
80
|
"pug": "^3.0.2",
|
|
81
81
|
"sass": "1.63.6",
|
|
82
|
-
"typescript": "^5.1.
|
|
83
|
-
"vite": "^4.
|
|
82
|
+
"typescript": "^5.1.6",
|
|
83
|
+
"vite": "^4.4.2"
|
|
84
84
|
},
|
|
85
85
|
"types": "types",
|
|
86
|
-
"gitHead": "
|
|
86
|
+
"gitHead": "3d02df42dc8d7ee782d35f53c3877cc3e9fb88c7",
|
|
87
87
|
"scripts": {
|
|
88
88
|
"build": "vite build",
|
|
89
89
|
"watch": "yarn build --mode 'development' --watch",
|
package/src/DitoAdmin.js
CHANGED
|
@@ -289,12 +289,12 @@ function isApiUrl(api, url) {
|
|
|
289
289
|
}
|
|
290
290
|
|
|
291
291
|
function getApiUrl(api, { url, query }) {
|
|
292
|
-
if (!isAbsoluteUrl(url)) {
|
|
292
|
+
if (!url.startsWith(api.url) && !isAbsoluteUrl(url)) {
|
|
293
293
|
url = combineUrls(api.url, url)
|
|
294
294
|
}
|
|
295
295
|
// Support optional query parameters, to be are added to the URL.
|
|
296
296
|
const search = formatQuery(query)
|
|
297
|
-
return search ? `${url}
|
|
297
|
+
return search ? `${url}${url.includes('?') ? '&' : '?'}${search}` : url
|
|
298
298
|
}
|
|
299
299
|
|
|
300
300
|
function combineUrls(baseUrl, relativeUrl) {
|
package/src/mixins/DitoMixin.js
CHANGED
|
@@ -322,7 +322,7 @@ export default {
|
|
|
322
322
|
},
|
|
323
323
|
|
|
324
324
|
async sendRequest({ method, url, resource, query, data, internal }) {
|
|
325
|
-
url ||= this.
|
|
325
|
+
url ||= this.getResourceUrl(resource)
|
|
326
326
|
method ||= resource?.method
|
|
327
327
|
const checkUser = !internal && this.api.isApiUrl(url)
|
|
328
328
|
if (checkUser) {
|