@vc-shell/framework 1.0.209 → 1.0.211
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 +5548 -5528
- package/dist/shared/components/blade-navigation/composables/useBladeNavigation/index.d.ts.map +1 -1
- package/dist/shared/modules/dynamic/index.d.ts.map +1 -1
- package/dist/shared/modules/dynamic/pages/dynamic-blade-form.vue.d.ts +2 -2
- package/dist/shared/modules/dynamic/pages/dynamic-blade-form.vue.d.ts.map +1 -1
- package/dist/shared/modules/dynamic/pages/dynamic-blade-list.vue.d.ts +3 -3
- package/dist/shared/modules/dynamic/pages/dynamic-blade-list.vue.d.ts.map +1 -1
- package/package.json +4 -4
- package/shared/components/blade-navigation/composables/useBladeNavigation/index.ts +46 -20
- package/shared/modules/dynamic/index.ts +3 -5
- package/shared/modules/dynamic/pages/dynamic-blade-form.vue +7 -6
- package/shared/modules/dynamic/pages/dynamic-blade-list.vue +3 -19
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,
|
|
1
|
+
{"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../shared/modules/dynamic/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,GAAG,EAAE,SAAS,EAAmB,MAAM,KAAK,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAQzD,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../shared/modules/dynamic/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,GAAG,EAAE,SAAS,EAAmB,MAAM,KAAK,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAQzD,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAyGpC,eAAO,MAAM,sBAAsB;;;;;iCAEO,GAAG,EAAE,KAAK,GAAG;;;;;;;;;;;;;iBAwBtC,GAAG,WAAW;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE;CA2BhD,CAAC;AAEF,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC;AACxB,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import { ComputedRef } from "vue";
|
|
1
|
+
import { ComputedRef, MaybeRef } from "vue";
|
|
2
2
|
import { DynamicDetailsSchema } from "../types";
|
|
3
3
|
import { IParentCallArgs, CoreBladeExposed } from "../../../index";
|
|
4
4
|
interface Props {
|
|
5
5
|
expanded?: boolean;
|
|
6
6
|
closable?: boolean;
|
|
7
|
-
param?: string
|
|
7
|
+
param?: MaybeRef<string>;
|
|
8
8
|
model?: DynamicDetailsSchema;
|
|
9
9
|
options?: {
|
|
10
10
|
[x: string]: unknown;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dynamic-blade-form.vue.d.ts","sourceRoot":"","sources":["../../../../../shared/modules/dynamic/pages/dynamic-blade-form.vue.ts"],"names":[],"mappings":"AAIA,OAAO,EAWL,WAAW,
|
|
1
|
+
{"version":3,"file":"dynamic-blade-form.vue.d.ts","sourceRoot":"","sources":["../../../../../shared/modules/dynamic/pages/dynamic-blade-form.vue.ts"],"names":[],"mappings":"AAIA,OAAO,EAWL,WAAW,EAMX,QAAQ,EACT,MAAM,KAAK,CAAC;AACb,OAAO,EAAE,oBAAoB,EAAqC,MAAM,UAAU,CAAC;AAEnF,OAAO,EAGL,eAAe,EAIf,gBAAgB,EACjB,MAAM,gBAAgB,CAAC;AAWxB,UAAU,KAAK;IACb,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IACzB,KAAK,CAAC,EAAE,oBAAoB,CAAC;IAC7B,OAAO,CAAC,EAAE;QACR,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;KACtB,CAAC;IACF,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;CACvE;AAiND,iBAAe,uBAAuB,kBAOrC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA+QD,wBAQG;AACH,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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import { ComputedRef } from "vue";
|
|
1
|
+
import { ComputedRef, MaybeRef } from "vue";
|
|
2
2
|
import { DynamicGridSchema } from "../types";
|
|
3
3
|
import { IParentCallArgs } from "../../../index";
|
|
4
4
|
export interface Props {
|
|
5
5
|
expanded?: boolean;
|
|
6
6
|
closable?: boolean;
|
|
7
|
-
param?: string
|
|
7
|
+
param?: MaybeRef<string>;
|
|
8
8
|
options?: unknown;
|
|
9
9
|
model?: DynamicGridSchema;
|
|
10
10
|
composables?: Record<string, (...args: any[]) => Record<string, any>>;
|
|
@@ -79,7 +79,7 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<__
|
|
|
79
79
|
}) => any) | undefined;
|
|
80
80
|
"onClose:children"?: (() => any) | undefined;
|
|
81
81
|
}, {
|
|
82
|
-
param: string
|
|
82
|
+
param: MaybeRef<string>;
|
|
83
83
|
expanded: boolean;
|
|
84
84
|
closable: boolean;
|
|
85
85
|
}, {}>, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dynamic-blade-list.vue.d.ts","sourceRoot":"","sources":["../../../../../shared/modules/dynamic/pages/dynamic-blade-list.vue.ts"],"names":[],"mappings":"AAGA,OAAO,EASL,WAAW,
|
|
1
|
+
{"version":3,"file":"dynamic-blade-list.vue.d.ts","sourceRoot":"","sources":["../../../../../shared/modules/dynamic/pages/dynamic-blade-list.vue.ts"],"names":[],"mappings":"AAGA,OAAO,EASL,WAAW,EAKX,QAAQ,EACT,MAAM,KAAK,CAAC;AAEb,OAAO,EAAE,iBAAiB,EAAqC,MAAM,UAAU,CAAC;AAOhF,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAKjD,MAAM,WAAW,KAAK;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IACzB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,iBAAiB,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;IACtE,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,KAAK;IACpB,CAAC,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,eAAe,GAAG,IAAI,CAAC;IACpD,CAAC,KAAK,EAAE,aAAa,GAAG,IAAI,CAAC;IAC7B,CAAC,KAAK,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAChC,CAAC,KAAK,EAAE,cAAc,GAAG,IAAI,CAAC;IAC9B,CAAC,KAAK,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAChC,CAAC,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,GAAG,IAAI,CAAC;IACjE,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;CACtB;AA2YD,iBAAS,uBAAuB,SAI/B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA4cD,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.211",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"main": "./dist/framework.js",
|
|
6
6
|
"types": "./dist/index.d.ts",
|
|
@@ -59,9 +59,9 @@
|
|
|
59
59
|
"devDependencies": {
|
|
60
60
|
"@types/dompurify": "^3.0.5",
|
|
61
61
|
"@types/quill": "^2.0.14",
|
|
62
|
-
"@vc-shell/api-client-generator": "^1.0.
|
|
63
|
-
"@vc-shell/config-generator": "^1.0.
|
|
64
|
-
"@vc-shell/ts-config": "^1.0.
|
|
62
|
+
"@vc-shell/api-client-generator": "^1.0.211",
|
|
63
|
+
"@vc-shell/config-generator": "^1.0.211",
|
|
64
|
+
"@vc-shell/ts-config": "^1.0.211",
|
|
65
65
|
"@vitejs/plugin-vue": "^5.0.3",
|
|
66
66
|
"sass": "^1.69.6",
|
|
67
67
|
"shx": "^0.3.4",
|
|
@@ -1,6 +1,18 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import {
|
|
2
|
+
computed,
|
|
3
|
+
getCurrentInstance,
|
|
4
|
+
inject,
|
|
5
|
+
warn,
|
|
6
|
+
Component,
|
|
7
|
+
isVNode,
|
|
8
|
+
h,
|
|
9
|
+
shallowRef,
|
|
10
|
+
ComputedRef,
|
|
11
|
+
watch,
|
|
12
|
+
reactive,
|
|
13
|
+
} from "vue";
|
|
2
14
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
3
|
-
import { createSharedComposable, reactiveComputed, watchDebounced } from "@vueuse/core";
|
|
15
|
+
import { createSharedComposable, reactifyObject, reactiveComputed, toValue, watchDebounced } from "@vueuse/core";
|
|
4
16
|
import * as _ from "lodash-es";
|
|
5
17
|
import {
|
|
6
18
|
RouteLocationNormalized,
|
|
@@ -276,13 +288,24 @@ export function useBladeNavigation(): IUseBladeNavigation {
|
|
|
276
288
|
query: LocationQuery | undefined = undefined,
|
|
277
289
|
params: RouteParams = {},
|
|
278
290
|
) {
|
|
279
|
-
const createdComponent = h(
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
291
|
+
const createdComponent = h(
|
|
292
|
+
blade,
|
|
293
|
+
reactifyObject({
|
|
294
|
+
param: computed(() => {
|
|
295
|
+
const isChildWithSameParamOpened = navigationInstance.blades.value.some(
|
|
296
|
+
(x) => x.props?.param === toValue(param),
|
|
297
|
+
);
|
|
298
|
+
if (isChildWithSameParamOpened) {
|
|
299
|
+
return toValue(param);
|
|
300
|
+
}
|
|
301
|
+
return undefined;
|
|
302
|
+
}) as unknown as string,
|
|
303
|
+
options,
|
|
304
|
+
navigation: {
|
|
305
|
+
idx: 0,
|
|
306
|
+
},
|
|
307
|
+
}),
|
|
308
|
+
) as BladeVNode;
|
|
286
309
|
|
|
287
310
|
try {
|
|
288
311
|
// Close all blades except the first one cause it will be overwritten
|
|
@@ -483,27 +506,30 @@ export function useBladeNavigation(): IUseBladeNavigation {
|
|
|
483
506
|
// Open the workspace component with param or workspace route.
|
|
484
507
|
if (registeredWorkspaceComponent) {
|
|
485
508
|
await openWorkspace(
|
|
486
|
-
{
|
|
509
|
+
reactifyObject({
|
|
487
510
|
blade: registeredWorkspaceComponent as unknown as BladeInstanceConstructor,
|
|
488
|
-
param:
|
|
489
|
-
|
|
490
|
-
|
|
491
|
-
|
|
492
|
-
|
|
511
|
+
param: computed(() => {
|
|
512
|
+
if (
|
|
513
|
+
navigationInstance.blades.value.length > 1 &&
|
|
514
|
+
registeredRouteComponent?.type.moduleUid === registeredWorkspaceComponent.type.moduleUid
|
|
515
|
+
) {
|
|
516
|
+
return param;
|
|
517
|
+
}
|
|
518
|
+
return undefined;
|
|
519
|
+
}) as unknown as string,
|
|
520
|
+
}),
|
|
493
521
|
getURLQuery().obj,
|
|
494
522
|
params,
|
|
495
523
|
);
|
|
496
524
|
|
|
497
|
-
// Open the route if it's
|
|
498
|
-
if (
|
|
499
|
-
registeredRouteComponent?.type.moduleUid !== registeredWorkspaceComponent.type.moduleUid &&
|
|
500
|
-
registeredRouteComponent?.type.routable
|
|
501
|
-
) {
|
|
525
|
+
// Open the route if it's routable.
|
|
526
|
+
if (registeredRouteComponent?.type.routable) {
|
|
502
527
|
await openBlade({
|
|
503
528
|
blade: registeredRouteComponent as unknown as BladeInstanceConstructor,
|
|
504
529
|
param: param,
|
|
505
530
|
});
|
|
506
531
|
}
|
|
532
|
+
|
|
507
533
|
return { name: registeredWorkspaceComponent?.type.name, params, query: to.query };
|
|
508
534
|
}
|
|
509
535
|
} else {
|
|
@@ -80,13 +80,11 @@ const register = (
|
|
|
80
80
|
setup: (props: ComponentProps<typeof bladeComponent>, ctx) =>
|
|
81
81
|
(bladeComponent?.setup &&
|
|
82
82
|
bladeComponent.setup(
|
|
83
|
-
|
|
84
|
-
{},
|
|
85
|
-
reactiveComputed(() => props),
|
|
86
|
-
{
|
|
83
|
+
reactiveComputed(() =>
|
|
84
|
+
Object.assign({}, props, {
|
|
87
85
|
model: json,
|
|
88
86
|
composables: args.composables,
|
|
89
|
-
} as any,
|
|
87
|
+
} as any),
|
|
90
88
|
),
|
|
91
89
|
ctx,
|
|
92
90
|
)) ??
|
|
@@ -81,6 +81,7 @@ import {
|
|
|
81
81
|
toRefs,
|
|
82
82
|
provide,
|
|
83
83
|
toRef,
|
|
84
|
+
MaybeRef,
|
|
84
85
|
} from "vue";
|
|
85
86
|
import { DynamicDetailsSchema, FormContentSchema, SettingsSchema } from "../types";
|
|
86
87
|
import { reactiveComputed, toReactive, useMounted, useTemplateRefsList } from "@vueuse/core";
|
|
@@ -104,7 +105,7 @@ import { notification } from "../../../components";
|
|
|
104
105
|
interface Props {
|
|
105
106
|
expanded?: boolean;
|
|
106
107
|
closable?: boolean;
|
|
107
|
-
param?: string
|
|
108
|
+
param?: MaybeRef<string>;
|
|
108
109
|
model?: DynamicDetailsSchema;
|
|
109
110
|
options?: {
|
|
110
111
|
[x: string]: unknown;
|
|
@@ -176,7 +177,7 @@ watch(
|
|
|
176
177
|
);
|
|
177
178
|
|
|
178
179
|
watch(
|
|
179
|
-
() => bladeTitle
|
|
180
|
+
() => unref(bladeTitle),
|
|
180
181
|
(newVal) => {
|
|
181
182
|
if (newVal && props.composables) {
|
|
182
183
|
title.value = newVal;
|
|
@@ -272,7 +273,7 @@ const toolbarComputed =
|
|
|
272
273
|
method: "updateActiveWidgetCount",
|
|
273
274
|
});
|
|
274
275
|
|
|
275
|
-
if (!props.param) {
|
|
276
|
+
if (!unref(props.param)) {
|
|
276
277
|
emit("close:blade");
|
|
277
278
|
}
|
|
278
279
|
}
|
|
@@ -287,7 +288,7 @@ const toolbarComputed =
|
|
|
287
288
|
)
|
|
288
289
|
) {
|
|
289
290
|
if (props.param) {
|
|
290
|
-
await remove?.({ id: props.param });
|
|
291
|
+
await remove?.({ id: unref(props.param) });
|
|
291
292
|
emit("parent:call", {
|
|
292
293
|
method: "reload",
|
|
293
294
|
});
|
|
@@ -329,8 +330,8 @@ async function updateActiveWidgetCount() {
|
|
|
329
330
|
}
|
|
330
331
|
|
|
331
332
|
async function init() {
|
|
332
|
-
if (props.param) {
|
|
333
|
-
await load({ id: props.param });
|
|
333
|
+
if (props.param && unref(props.param)) {
|
|
334
|
+
await load({ id: unref(props.param) });
|
|
334
335
|
}
|
|
335
336
|
|
|
336
337
|
await nextTick(() => {
|
|
@@ -162,6 +162,7 @@ import {
|
|
|
162
162
|
toRefs,
|
|
163
163
|
provide,
|
|
164
164
|
isRef,
|
|
165
|
+
MaybeRef,
|
|
165
166
|
} from "vue";
|
|
166
167
|
import { useI18n } from "vue-i18n";
|
|
167
168
|
import { DynamicGridSchema, ListContentSchema, SettingsSchema } from "../types";
|
|
@@ -179,7 +180,7 @@ import { safeIn } from "../helpers/safeIn";
|
|
|
179
180
|
export interface Props {
|
|
180
181
|
expanded?: boolean;
|
|
181
182
|
closable?: boolean;
|
|
182
|
-
param?: string
|
|
183
|
+
param?: MaybeRef<string>;
|
|
183
184
|
options?: unknown;
|
|
184
185
|
model?: DynamicGridSchema;
|
|
185
186
|
composables?: Record<string, (...args: any[]) => Record<string, any>>;
|
|
@@ -392,24 +393,7 @@ onBeforeMount(async () => {
|
|
|
392
393
|
watch(
|
|
393
394
|
() => props.param,
|
|
394
395
|
async (newVal) => {
|
|
395
|
-
|
|
396
|
-
if (
|
|
397
|
-
scope &&
|
|
398
|
-
"openDetailsBlade" in toValue(scope) &&
|
|
399
|
-
toValue(scope).openDetailsBlade &&
|
|
400
|
-
typeof toValue(scope).openDetailsBlade === "function"
|
|
401
|
-
) {
|
|
402
|
-
await toValue(scope).openDetailsBlade?.({
|
|
403
|
-
param: newVal,
|
|
404
|
-
onOpen() {
|
|
405
|
-
selectedItemId.value = newVal;
|
|
406
|
-
},
|
|
407
|
-
onClose() {
|
|
408
|
-
selectedItemId.value = undefined;
|
|
409
|
-
},
|
|
410
|
-
});
|
|
411
|
-
}
|
|
412
|
-
}
|
|
396
|
+
selectedItemId.value = unref(newVal);
|
|
413
397
|
},
|
|
414
398
|
{ immediate: true },
|
|
415
399
|
);
|