@vc-shell/framework 1.0.210 → 1.0.212

package/dist/shared/components/blade-navigation/composables/useBladeNavigation/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../shared/components/blade-navigation/composables/useBladeNavigation/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8C,SAAS,EAA0B,WAAW,EAAS,MAAM,KAAK,CAAC;AAIxH,OAAO,EACL,uBAAuB,EAEvB,iBAAiB,EACjB,eAAe,EACf,WAAW,EAGZ,MAAM,YAAY,CAAC;AAEpB,OAAO,EAGL,UAAU,EACV,WAAW,EACX,eAAe,EACf,wBAAwB,EAGzB,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,KACvC,OAAO,CACH;QACE,IAAI,EAAE,eAAe,GAAG,SAAS,CAAC;QAClC,MAAM,EAAE,WAAW,CAAC;KACrB,GACD,SAAS,CACZ,GACD,SAAS,CAAC;IACd,kBAAkB,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,KAAK,IAAI,CAAC;IACrE,kBAAkB,EAAE,MAAM,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,GAAG,SAAS,CAAC;CACvE;AAiND,wBAAgB,kBAAkB,IAAI,mBAAmB,CAqUxD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../shared/components/blade-navigation/composables/useBladeNavigation/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,SAAS,EAIT,WAAW,EAGZ,MAAM,KAAK,CAAC;AAIb,OAAO,EACL,uBAAuB,EAEvB,iBAAiB,EACjB,eAAe,EACf,WAAW,EAGZ,MAAM,YAAY,CAAC;AAEpB,OAAO,EAGL,UAAU,EACV,WAAW,EACX,eAAe,EACf,wBAAwB,EAGzB,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,KACvC,OAAO,CACH;QACE,IAAI,EAAE,eAAe,GAAG,SAAS,CAAC;QAClC,MAAM,EAAE,WAAW,CAAC;KACrB,GACD,SAAS,CACZ,GACD,SAAS,CAAC;IACd,kBAAkB,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,KAAK,IAAI,CAAC;IACrE,kBAAkB,EAAE,MAAM,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,GAAG,SAAS,CAAC;CACvE;AAiND,wBAAgB,kBAAkB,IAAI,mBAAmB,CAgVxD"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vc-shell/framework",
-  "version": "1.0.210",
+  "version": "1.0.212",
   "type": "module",
   "main": "./dist/framework.js",
   "types": "./dist/index.d.ts",
@@ -59,9 +59,9 @@
   "devDependencies": {
     "@types/dompurify": "^3.0.5",
     "@types/quill": "^2.0.14",
-    "@vc-shell/api-client-generator": "^1.0.210",
-    "@vc-shell/config-generator": "^1.0.210",
-    "@vc-shell/ts-config": "^1.0.210",
+    "@vc-shell/api-client-generator": "^1.0.212",
+    "@vc-shell/config-generator": "^1.0.212",
+    "@vc-shell/ts-config": "^1.0.212",
     "@vitejs/plugin-vue": "^5.0.3",
     "sass": "^1.69.6",
     "shx": "^0.3.4",

package/shared/components/blade-navigation/composables/useBladeNavigation/index.ts

@@ -1,6 +1,18 @@
-import { computed, getCurrentInstance, inject, warn, Component, isVNode, h, shallowRef, ComputedRef, watch } from "vue";
+import {
+  computed,
+  getCurrentInstance,
+  inject,
+  warn,
+  Component,
+  isVNode,
+  h,
+  shallowRef,
+  ComputedRef,
+  watch,
+  reactive,
+} from "vue";
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { createSharedComposable, reactiveComputed, watchDebounced } from "@vueuse/core";
+import { createSharedComposable, reactifyObject, reactiveComputed, toValue, watchDebounced } from "@vueuse/core";
 import * as _ from "lodash-es";
 import {
   RouteLocationNormalized,
@@ -276,13 +288,24 @@ export function useBladeNavigation(): IUseBladeNavigation {
     query: LocationQuery | undefined = undefined,
     params: RouteParams = {},
   ) {
-    const createdComponent = h(blade, {
-      param,
-      options,
-      navigation: {
-        idx: 0,
-      },
-    }) as BladeVNode;
+    const createdComponent = h(
+      blade,
+      reactifyObject({
+        param: computed(() => {
+          const isChildWithSameParamOpened = navigationInstance.blades.value.some(
+            (x) => x.props?.param === toValue(param),
+          );
+          if (isChildWithSameParamOpened) {
+            return toValue(param);
+          }
+          return undefined;
+        }) as unknown as string,
+        options,
+        navigation: {
+          idx: 0,
+        },
+      }),
+    ) as BladeVNode;
 
     try {
       // Close all blades except the first one cause it will be overwritten
@@ -483,7 +506,7 @@ export function useBladeNavigation(): IUseBladeNavigation {
       // Open the workspace component with param or workspace route.
       if (registeredWorkspaceComponent) {
         await openWorkspace(
-          {
+          reactifyObject({
             blade: registeredWorkspaceComponent as unknown as BladeInstanceConstructor,
             param: computed(() => {
               if (
@@ -494,7 +517,7 @@ export function useBladeNavigation(): IUseBladeNavigation {
               }
               return undefined;
             }) as unknown as string,
-          },
+          }),
           getURLQuery().obj,
           params,
         );

package/shared/modules/dynamic/pages/dynamic-blade-form.vue

@@ -272,7 +272,7 @@ const toolbarComputed =
                 method: "updateActiveWidgetCount",
               });
 
-              if (!props.param) {
+              if (!unref(props.param)) {
                 emit("close:blade");
               }
             }
@@ -287,7 +287,7 @@ const toolbarComputed =
               )
             ) {
               if (props.param) {
-                await remove?.({ id: props.param });
+                await remove?.({ id: unref(props.param) });
                 emit("parent:call", {
                   method: "reload",
                 });
@@ -329,8 +329,8 @@ async function updateActiveWidgetCount() {
 }
 
 async function init() {
-  if (props.param) {
-    await load({ id: props.param });
+  if (props.param && unref(props.param)) {
+    await load({ id: unref(props.param) });
   }
 
   await nextTick(() => {

package/shared/modules/dynamic/pages/dynamic-blade-list.vue

@@ -392,7 +392,7 @@ onBeforeMount(async () => {
 watch(
   () => props.param,
   async (newVal) => {
-    selectedItemId.value = newVal;
+    selectedItemId.value = unref(newVal);
   },
   { immediate: true },
 );