@vc-shell/framework 1.0.151 → 1.0.153
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/CHANGELOG.md +18 -0
- package/dist/framework.js +1786 -1778
- package/dist/shared/components/blade-navigation/composables/useBladeNavigation/index.d.ts.map +1 -1
- package/dist/ui/components/organisms/vc-app/_internal/vc-app-menu/vc-app-menu.vue.d.ts.map +1 -1
- package/package.json +4 -4
- package/shared/components/blade-navigation/composables/useBladeNavigation/index.ts +14 -5
- package/ui/components/organisms/vc-app/_internal/vc-app-menu/vc-app-menu.vue +3 -1
package/dist/shared/components/blade-navigation/composables/useBladeNavigation/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../shared/components/blade-navigation/composables/useBladeNavigation/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,SAAS,EAKT,WAAW,EACZ,MAAM,KAAK,CAAC;AAIb,OAAO,EAAE,uBAAuB,EAAY,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAElF,OAAO,EAGL,UAAU,EACV,WAAW,EACX,eAAe,EACf,wBAAwB,EAEzB,MAAM,aAAa,CAAC;AAIrB,OAAO,gCAAgC,CAAC;AACxC,OAAO,sCAAsC,CAAC;AAG9C,UAAU,mBAAmB;IAC3B,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC,UAAU,EAAE,CAAC,CAAC;IAC3C,QAAQ,CAAC,0BAA0B,EAAE,WAAW,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC;IACpF,SAAS,EAAE,CAAC,KAAK,SAAS,SAAS,EACjC,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,WAAW,CAAC,KAAK,CAAC,EAC9D,WAAW,CAAC,EAAE,OAAO,KAClB,OAAO,CAAC,IAAI,GAAG,iBAAiB,CAAC,CAAC;IACvC,UAAU,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAChD,YAAY,EAAE,CAAC,oBAAoB,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,eAAe,KAAK,IAAI,CAAC;IACzF,aAAa,EAAE,CAAC,EAAE,EAAE,MAAM,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,KAAK,IAAI,CAAC;IAChE,kBAAkB,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,wBAAwB,CAAC;IAC/D,aAAa,EAAE,CAAC,EAAE,EAAE,uBAAuB,KAAK,OAAO,CAAC,IAAI,GAAG,iBAAiB,GAAG,SAAS,CAAC,GAAG,SAAS,CAAC;IAC1G,eAAe,EAAE,MAAM,UAAU,CAAC;CACnC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../shared/components/blade-navigation/composables/useBladeNavigation/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,SAAS,EAKT,WAAW,EACZ,MAAM,KAAK,CAAC;AAIb,OAAO,EAAE,uBAAuB,EAAY,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAElF,OAAO,EAGL,UAAU,EACV,WAAW,EACX,eAAe,EACf,wBAAwB,EAEzB,MAAM,aAAa,CAAC;AAIrB,OAAO,gCAAgC,CAAC;AACxC,OAAO,sCAAsC,CAAC;AAG9C,UAAU,mBAAmB;IAC3B,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC,UAAU,EAAE,CAAC,CAAC;IAC3C,QAAQ,CAAC,0BAA0B,EAAE,WAAW,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC;IACpF,SAAS,EAAE,CAAC,KAAK,SAAS,SAAS,EACjC,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,WAAW,CAAC,KAAK,CAAC,EAC9D,WAAW,CAAC,EAAE,OAAO,KAClB,OAAO,CAAC,IAAI,GAAG,iBAAiB,CAAC,CAAC;IACvC,UAAU,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAChD,YAAY,EAAE,CAAC,oBAAoB,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,eAAe,KAAK,IAAI,CAAC;IACzF,aAAa,EAAE,CAAC,EAAE,EAAE,MAAM,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,KAAK,IAAI,CAAC;IAChE,kBAAkB,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,wBAAwB,CAAC;IAC/D,aAAa,EAAE,CAAC,EAAE,EAAE,uBAAuB,KAAK,OAAO,CAAC,IAAI,GAAG,iBAAiB,GAAG,SAAS,CAAC,GAAG,SAAS,CAAC;IAC1G,eAAe,EAAE,MAAM,UAAU,CAAC;CACnC;AA4JD,wBAAgB,kBAAkB,IAAI,mBAAmB,CAiRxD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vc-app-menu.vue.d.ts","sourceRoot":"","sources":["../../../../../../../ui/components/organisms/vc-app/_internal/vc-app-menu/vc-app-menu.vue.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAExD,MAAM,WAAW,KAAK;IACpB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,KAAK;IACpB,CAAC,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,GAAG,IAAI,CAAC;IAC5C,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI,CAAC;CAChC;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"vc-app-menu.vue.d.ts","sourceRoot":"","sources":["../../../../../../../ui/components/organisms/vc-app/_internal/vc-app-menu/vc-app-menu.vue.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAExD,MAAM,WAAW,KAAK;IACpB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,KAAK;IACpB,CAAC,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,GAAG,IAAI,CAAC;IAC5C,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI,CAAC;CAChC;;;;;;;;;;;;;;;;;;;;;;AAoPD,wBAAwG;AACxG,KAAK,sBAAsB,CAAC,CAAC,IAAI,CAAC,SAAS,SAAS,GAAG,KAAK,GAAG,CAAC,CAAC;AACjE,KAAK,6BAA6B,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,SAAS,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG;QAAE,IAAI,EAAE,OAAO,KAAK,EAAE,QAAQ,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;KAAE,GAAG;QAAE,IAAI,EAAE,OAAO,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAAC,QAAQ,EAAE,IAAI,CAAA;KAAE;CAAE,CAAC;AAC9M,KAAK,kBAAkB,CAAC,CAAC,EAAE,CAAC,IAAI;KAE1B,CAAC,IAAI,MAAM,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,GAAG,CAAC,SAAS,MAAM,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG;QACxE,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;KACb,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CACT,CAAC;AACN,KAAK,cAAc,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAG,GAAG,EAAE,CAAC;AACxD,KAAK,uBAAuB,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG;IAAE,QAAO;QAClD,MAAM,EAAE,CAAC,CAAC;KACT,CAAA;CAAE,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vc-shell/framework",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.153",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"main": "./dist/framework.js",
|
|
6
6
|
"types": "./dist/index.d.ts",
|
|
@@ -53,9 +53,9 @@
|
|
|
53
53
|
"whatwg-fetch": "^3.6.19"
|
|
54
54
|
},
|
|
55
55
|
"devDependencies": {
|
|
56
|
-
"@vc-shell/api-client-generator": "^1.0.
|
|
57
|
-
"@vc-shell/config-generator": "^1.0.
|
|
58
|
-
"@vc-shell/ts-config": "^1.0.
|
|
56
|
+
"@vc-shell/api-client-generator": "^1.0.153",
|
|
57
|
+
"@vc-shell/config-generator": "^1.0.153",
|
|
58
|
+
"@vc-shell/ts-config": "^1.0.153",
|
|
59
59
|
"@vitejs/plugin-vue": "^5.0.3",
|
|
60
60
|
"sass": "^1.69.6",
|
|
61
61
|
"typescript": "^5.3.3",
|
|
@@ -196,6 +196,7 @@ const useBladeNavigationSingleton = createSharedComposable(() => {
|
|
|
196
196
|
return {
|
|
197
197
|
navigationInstance,
|
|
198
198
|
router,
|
|
199
|
+
route,
|
|
199
200
|
closeBlade,
|
|
200
201
|
};
|
|
201
202
|
});
|
|
@@ -207,7 +208,7 @@ export function useBladeNavigation(): IUseBladeNavigation {
|
|
|
207
208
|
|
|
208
209
|
const instance: BladeComponentInternalInstance = getCurrentInstance() as BladeComponentInternalInstance;
|
|
209
210
|
|
|
210
|
-
const { router, navigationInstance, closeBlade } = useBladeNavigationSingleton();
|
|
211
|
+
const { router, route, navigationInstance, closeBlade } = useBladeNavigationSingleton();
|
|
211
212
|
|
|
212
213
|
const mainRoute = router.getRoutes().find((r) => r.meta?.root)!;
|
|
213
214
|
|
|
@@ -224,9 +225,14 @@ export function useBladeNavigation(): IUseBladeNavigation {
|
|
|
224
225
|
const isPrevented = await closeBlade(0);
|
|
225
226
|
|
|
226
227
|
if (!isPrevented && createdComponent.type?.url) {
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
228
|
+
if (hasAccess(blade.permissions)) {
|
|
229
|
+
navigationInstance.blades.value = [createdComponent];
|
|
230
|
+
|
|
231
|
+
return await router.replace({ path: createdComponent.type?.url as string });
|
|
232
|
+
} else
|
|
233
|
+
notification.error(i18n.global.t("PERMISSION_MESSAGES.ACCESS_RESTRICTED"), {
|
|
234
|
+
timeout: 3000,
|
|
235
|
+
});
|
|
230
236
|
}
|
|
231
237
|
} catch (e) {
|
|
232
238
|
console.log(e);
|
|
@@ -429,7 +435,10 @@ export function useBladeNavigation(): IUseBladeNavigation {
|
|
|
429
435
|
}
|
|
430
436
|
} else {
|
|
431
437
|
// If the registered route component is not found, navigate to the main route.
|
|
432
|
-
|
|
438
|
+
const mainRoute = router.getRoutes().find((route) => route.meta?.root);
|
|
439
|
+
const mainRouteAlias = router.getRoutes().find((route) => route.aliasOf?.path === mainRoute?.path) ?? mainRoute;
|
|
440
|
+
|
|
441
|
+
router.replace({ name: mainRouteAlias?.name, params: route.params });
|
|
433
442
|
}
|
|
434
443
|
}
|
|
435
444
|
}
|
|
@@ -41,7 +41,9 @@
|
|
|
41
41
|
<VcAppMenuItem
|
|
42
42
|
v-for="item in menuItems"
|
|
43
43
|
:key="item?.id"
|
|
44
|
-
:is-visible="
|
|
44
|
+
:is-visible="
|
|
45
|
+
$hasAccess(item.permissions!) && (item.children?.some((child) => $hasAccess(child.permissions!)) ?? true)
|
|
46
|
+
"
|
|
45
47
|
:url="item.url"
|
|
46
48
|
:icon="item.icon"
|
|
47
49
|
:title="item.title as string"
|