@vc-shell/framework 1.0.222 → 1.0.224
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 +34 -0
- package/core/types/index.ts +2 -1
- package/dist/core/plugins/modularity/index.d.ts +3 -3
- package/dist/core/plugins/modularity/index.d.ts.map +1 -1
- package/dist/core/types/index.d.ts +2 -1
- package/dist/core/types/index.d.ts.map +1 -1
- package/dist/framework.js +22280 -22124
- package/dist/index.css +1 -1
- package/dist/index.d.ts +0 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/locales/en.json +2 -1
- package/dist/shared/components/blade-navigation/components/vc-blade-navigation/vc-blade-navigation.vue.d.ts.map +1 -1
- package/dist/shared/components/blade-navigation/composables/useBladeNavigation/index.d.ts.map +1 -1
- package/dist/shared/components/error-interceptor/index.d.ts.map +1 -1
- package/dist/shared/components/notifications/components/notification-container/index.d.ts.map +1 -1
- package/dist/shared/modules/dynamic/components/SchemaRender.d.ts +6 -0
- package/dist/shared/modules/dynamic/components/SchemaRender.d.ts.map +1 -1
- package/dist/shared/modules/dynamic/components/fields/Button.d.ts +2 -0
- package/dist/shared/modules/dynamic/components/fields/Button.d.ts.map +1 -1
- package/dist/shared/modules/dynamic/components/fields/Card.d.ts +2 -0
- package/dist/shared/modules/dynamic/components/fields/Card.d.ts.map +1 -1
- package/dist/shared/modules/dynamic/components/fields/Checkbox.d.ts +2 -0
- package/dist/shared/modules/dynamic/components/fields/Checkbox.d.ts.map +1 -1
- package/dist/shared/modules/dynamic/components/fields/ContentField.d.ts +2 -0
- package/dist/shared/modules/dynamic/components/fields/ContentField.d.ts.map +1 -1
- package/dist/shared/modules/dynamic/components/fields/CustomComponent.d.ts +2 -0
- package/dist/shared/modules/dynamic/components/fields/CustomComponent.d.ts.map +1 -1
- package/dist/shared/modules/dynamic/components/fields/DynamicProperty.d.ts +2 -0
- package/dist/shared/modules/dynamic/components/fields/DynamicProperty.d.ts.map +1 -1
- package/dist/shared/modules/dynamic/components/fields/EditorField.d.ts +2 -0
- package/dist/shared/modules/dynamic/components/fields/EditorField.d.ts.map +1 -1
- package/dist/shared/modules/dynamic/components/fields/Fieldset.d.ts +2 -0
- package/dist/shared/modules/dynamic/components/fields/Fieldset.d.ts.map +1 -1
- package/dist/shared/modules/dynamic/components/fields/GalleryField.d.ts +2 -0
- package/dist/shared/modules/dynamic/components/fields/GalleryField.d.ts.map +1 -1
- package/dist/shared/modules/dynamic/components/fields/ImageField.d.ts +2 -0
- package/dist/shared/modules/dynamic/components/fields/ImageField.d.ts.map +1 -1
- package/dist/shared/modules/dynamic/components/fields/InputCurrency.d.ts +2 -0
- package/dist/shared/modules/dynamic/components/fields/InputCurrency.d.ts.map +1 -1
- package/dist/shared/modules/dynamic/components/fields/InputField.d.ts +2 -0
- package/dist/shared/modules/dynamic/components/fields/InputField.d.ts.map +1 -1
- package/dist/shared/modules/dynamic/components/fields/MultivalueField.d.ts +2 -0
- package/dist/shared/modules/dynamic/components/fields/MultivalueField.d.ts.map +1 -1
- package/dist/shared/modules/dynamic/components/fields/RadioButtonGroup.d.ts +2 -0
- package/dist/shared/modules/dynamic/components/fields/RadioButtonGroup.d.ts.map +1 -1
- package/dist/shared/modules/dynamic/components/fields/RatingField.d.ts +2 -0
- package/dist/shared/modules/dynamic/components/fields/RatingField.d.ts.map +1 -1
- package/dist/shared/modules/dynamic/components/fields/SelectField.d.ts +2 -0
- package/dist/shared/modules/dynamic/components/fields/SelectField.d.ts.map +1 -1
- package/dist/shared/modules/dynamic/components/fields/StatusField.d.ts +2 -0
- package/dist/shared/modules/dynamic/components/fields/StatusField.d.ts.map +1 -1
- package/dist/shared/modules/dynamic/components/fields/SwitchField.d.ts +2 -0
- package/dist/shared/modules/dynamic/components/fields/SwitchField.d.ts.map +1 -1
- package/dist/shared/modules/dynamic/components/fields/Table.d.ts +10 -8
- package/dist/shared/modules/dynamic/components/fields/Table.d.ts.map +1 -1
- package/dist/shared/modules/dynamic/components/fields/TextareaField.d.ts +2 -0
- package/dist/shared/modules/dynamic/components/fields/TextareaField.d.ts.map +1 -1
- package/dist/shared/modules/dynamic/components/fields/VideoField.d.ts +2 -0
- package/dist/shared/modules/dynamic/components/fields/VideoField.d.ts.map +1 -1
- package/dist/shared/modules/dynamic/components/fields/props.d.ts +2 -0
- package/dist/shared/modules/dynamic/components/fields/props.d.ts.map +1 -1
- package/dist/shared/modules/dynamic/components/fields/storybook/Button.stories.d.ts +15 -9
- package/dist/shared/modules/dynamic/components/fields/storybook/Button.stories.d.ts.map +1 -1
- package/dist/shared/modules/dynamic/components/fields/storybook/Card.stories.d.ts +19 -3
- package/dist/shared/modules/dynamic/components/fields/storybook/Card.stories.d.ts.map +1 -1
- package/dist/shared/modules/dynamic/components/fields/storybook/Checkbox.stories.d.ts +6 -0
- package/dist/shared/modules/dynamic/components/fields/storybook/Checkbox.stories.d.ts.map +1 -1
- package/dist/shared/modules/dynamic/components/fields/storybook/ContentField.stories.d.ts +10 -4
- package/dist/shared/modules/dynamic/components/fields/storybook/ContentField.stories.d.ts.map +1 -1
- package/dist/shared/modules/dynamic/components/fields/storybook/EditorField.stories.d.ts +7 -1
- package/dist/shared/modules/dynamic/components/fields/storybook/EditorField.stories.d.ts.map +1 -1
- package/dist/shared/modules/dynamic/components/fields/storybook/Fieldset.stories.d.ts +9 -3
- package/dist/shared/modules/dynamic/components/fields/storybook/Fieldset.stories.d.ts.map +1 -1
- package/dist/shared/modules/dynamic/components/fields/storybook/GalleryField.stories.d.ts +8 -2
- package/dist/shared/modules/dynamic/components/fields/storybook/GalleryField.stories.d.ts.map +1 -1
- package/dist/shared/modules/dynamic/components/fields/storybook/ImageField.stories.d.ts +11 -5
- package/dist/shared/modules/dynamic/components/fields/storybook/ImageField.stories.d.ts.map +1 -1
- package/dist/shared/modules/dynamic/components/fields/storybook/InputCurrency.stories.d.ts +6 -0
- package/dist/shared/modules/dynamic/components/fields/storybook/InputCurrency.stories.d.ts.map +1 -1
- package/dist/shared/modules/dynamic/components/fields/storybook/InputField.stories.d.ts +9 -3
- package/dist/shared/modules/dynamic/components/fields/storybook/InputField.stories.d.ts.map +1 -1
- package/dist/shared/modules/dynamic/components/fields/storybook/MultivalueField.stories.d.ts +10 -4
- package/dist/shared/modules/dynamic/components/fields/storybook/MultivalueField.stories.d.ts.map +1 -1
- package/dist/shared/modules/dynamic/components/fields/storybook/RadioButtonGroup.stories.d.ts +6 -0
- package/dist/shared/modules/dynamic/components/fields/storybook/RadioButtonGroup.stories.d.ts.map +1 -1
- package/dist/shared/modules/dynamic/components/fields/storybook/RatingField.stories.d.ts +8 -2
- package/dist/shared/modules/dynamic/components/fields/storybook/RatingField.stories.d.ts.map +1 -1
- package/dist/shared/modules/dynamic/components/fields/storybook/SelectField.stories.d.ts +13 -7
- package/dist/shared/modules/dynamic/components/fields/storybook/SelectField.stories.d.ts.map +1 -1
- package/dist/shared/modules/dynamic/components/fields/storybook/StatusField.stories.d.ts +9 -3
- package/dist/shared/modules/dynamic/components/fields/storybook/StatusField.stories.d.ts.map +1 -1
- package/dist/shared/modules/dynamic/components/fields/storybook/TextareaField.stories.d.ts +7 -1
- package/dist/shared/modules/dynamic/components/fields/storybook/TextareaField.stories.d.ts.map +1 -1
- package/dist/shared/modules/dynamic/components/fields/storybook/VideoField.stories.d.ts +6 -0
- package/dist/shared/modules/dynamic/components/fields/storybook/VideoField.stories.d.ts.map +1 -1
- package/dist/shared/modules/dynamic/components/fields/storybook/pages/DynamicRender.d.ts +6 -0
- package/dist/shared/modules/dynamic/components/fields/storybook/pages/DynamicRender.d.ts.map +1 -1
- package/dist/shared/modules/dynamic/composables/useFilterBuilder/index.d.ts +1 -1
- package/dist/shared/modules/dynamic/composables/useFilterBuilder/index.d.ts.map +1 -1
- package/dist/shared/modules/dynamic/composables/useToolbarReducer/index.d.ts +0 -1
- package/dist/shared/modules/dynamic/composables/useToolbarReducer/index.d.ts.map +1 -1
- package/dist/shared/modules/dynamic/factories/base/useDetailsFactory.d.ts +3 -1
- package/dist/shared/modules/dynamic/factories/base/useDetailsFactory.d.ts.map +1 -1
- package/dist/shared/modules/dynamic/factories/base/useListFactory.d.ts +1 -1
- package/dist/shared/modules/dynamic/factories/base/useListFactory.d.ts.map +1 -1
- package/dist/shared/modules/dynamic/factories/types/index.d.ts +14 -2
- package/dist/shared/modules/dynamic/factories/types/index.d.ts.map +1 -1
- package/dist/shared/modules/dynamic/helpers/nodeBuilder.d.ts.map +1 -1
- package/dist/shared/modules/dynamic/helpers/override.d.ts.map +1 -1
- package/dist/shared/modules/dynamic/helpers/visibilityHandler.d.ts.map +1 -1
- package/dist/shared/modules/dynamic/index.d.ts +4 -4
- package/dist/shared/modules/dynamic/index.d.ts.map +1 -1
- package/dist/shared/modules/dynamic/pages/dynamic-blade-form.vue.d.ts +2 -0
- 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.map +1 -1
- package/dist/shared/modules/dynamic/types/index.d.ts +6 -17
- package/dist/shared/modules/dynamic/types/index.d.ts.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/ui/components/atoms/vc-badge/vc-badge.stories.d.ts +4 -4
- package/dist/ui/components/atoms/vc-button/vc-button.stories.d.ts +11 -11
- package/dist/ui/components/atoms/vc-card/vc-card.stories.d.ts +7 -7
- package/dist/ui/components/atoms/vc-container/vc-container.vue.d.ts.map +1 -1
- package/dist/ui/components/atoms/vc-hint/vc-hint.stories.d.ts +1 -1
- package/dist/ui/components/atoms/vc-icon/vc-icon.stories.d.ts +3 -3
- package/dist/ui/components/atoms/vc-image/vc-image.stories.d.ts +3 -3
- package/dist/ui/components/atoms/vc-label/vc-label.stories.d.ts +2 -2
- package/dist/ui/components/atoms/vc-link/vc-link.stories.d.ts +1 -1
- package/dist/ui/components/atoms/vc-progress/vc-progress.stories.d.ts +2 -2
- package/dist/ui/components/atoms/vc-status/vc-status.stories.d.ts +4 -4
- package/dist/ui/components/atoms/vc-switch/vc-switch.stories.d.ts +1 -1
- package/dist/ui/components/molecules/vc-breadcrumbs/vc-breadcrumbs.stories.d.ts +1 -1
- package/dist/ui/components/molecules/vc-checkbox/vc-checkbox.stories.d.ts +10 -10
- package/dist/ui/components/molecules/vc-editor/vc-editor.stories.d.ts +1 -1
- package/dist/ui/components/molecules/vc-editor/vc-editor.vue.d.ts.map +1 -1
- package/dist/ui/components/molecules/vc-field/vc-field.stories.d.ts +95 -2
- package/dist/ui/components/molecules/vc-field/vc-field.stories.d.ts.map +1 -1
- package/dist/ui/components/molecules/vc-file-upload/vc-file-upload.stories.d.ts +2 -2
- package/dist/ui/components/molecules/vc-input/vc-input.stories.d.ts +2 -2
- package/dist/ui/components/molecules/vc-input-currency/vc-input-currency.stories.d.ts +2 -2
- package/dist/ui/components/molecules/vc-multivalue/vc-multivalue.vue.d.ts.map +1 -1
- package/dist/ui/components/molecules/vc-radio-button/vc-radio-button.stories.d.ts +8 -8
- package/dist/ui/components/molecules/vc-rating/vc-rating.stories.d.ts +1 -1
- package/dist/ui/components/molecules/vc-select/vc-select.vue.d.ts.map +1 -1
- package/dist/ui/components/molecules/vc-slider/index.d.ts.map +1 -1
- package/dist/ui/components/molecules/vc-slider/vc-slider.stories.d.ts +3 -3
- package/dist/ui/components/organisms/vc-dynamic-property/vc-dynamic-property.vue.d.ts.map +1 -1
- package/dist/ui/components/organisms/vc-gallery/vc-gallery.stories.d.ts +1 -1
- package/dist/ui/components/organisms/vc-table/_internal/vc-table-add-new/vc-table-add-new.vue.d.ts.map +1 -1
- package/dist/ui/components/organisms/vc-table/_internal/vc-table-cell/vc-table-cell.vue.d.ts.map +1 -1
- package/dist/ui/components/organisms/vc-table/_internal/vc-table-column-switcher/vc-table-column-switcher.vue.d.ts +1 -0
- package/dist/ui/components/organisms/vc-table/_internal/vc-table-column-switcher/vc-table-column-switcher.vue.d.ts.map +1 -1
- package/dist/ui/components/organisms/vc-table/_internal/vc-table-empty/vc-table-empty.vue.d.ts +42 -0
- package/dist/ui/components/organisms/vc-table/_internal/vc-table-empty/vc-table-empty.vue.d.ts.map +1 -0
- package/dist/ui/components/organisms/vc-table/_internal/vc-table-mobile-item/vc-table-mobile-item.vue.d.ts.map +1 -1
- package/dist/ui/components/organisms/vc-table/vc-table.stories.d.ts +15 -105
- package/dist/ui/components/organisms/vc-table/vc-table.stories.d.ts.map +1 -1
- package/dist/ui/components/organisms/vc-table/vc-table.vue.d.ts +3 -21
- package/dist/ui/components/organisms/vc-table/vc-table.vue.d.ts.map +1 -1
- package/package.json +4 -4
- package/shared/components/blade-navigation/components/vc-blade-navigation/vc-blade-navigation.vue +1 -0
- package/shared/components/blade-navigation/composables/useBladeNavigation/index.ts +20 -9
- package/shared/modules/dynamic/components/fields/Card.ts +1 -0
- package/shared/modules/dynamic/components/fields/GalleryField.ts +3 -2
- package/shared/modules/dynamic/components/fields/InputCurrency.ts +1 -4
- package/shared/modules/dynamic/components/fields/InputField.ts +1 -5
- package/shared/modules/dynamic/components/fields/MultivalueField.ts +1 -4
- package/shared/modules/dynamic/components/fields/SelectField.ts +1 -4
- package/shared/modules/dynamic/components/fields/Table.ts +61 -21
- package/shared/modules/dynamic/components/fields/storybook/Card.stories.ts +10 -0
- package/shared/modules/dynamic/components/fields/storybook/ContentField.stories.ts +1 -1
- package/shared/modules/dynamic/components/fields/storybook/Fieldset.stories.ts +1 -1
- package/shared/modules/dynamic/components/fields/storybook/InputField.stories.ts +1 -1
- package/shared/modules/dynamic/components/fields/storybook/SelectField.stories.ts +4 -4
- package/shared/modules/dynamic/composables/useFilterBuilder/index.ts +1 -1
- package/shared/modules/dynamic/composables/useToolbarReducer/index.ts +0 -14
- package/shared/modules/dynamic/factories/base/useDetailsFactory.ts +12 -1
- package/shared/modules/dynamic/factories/types/index.ts +20 -2
- package/shared/modules/dynamic/helpers/nodeBuilder.ts +11 -3
- package/shared/modules/dynamic/pages/dynamic-blade-form.vue +16 -11
- package/shared/modules/dynamic/pages/dynamic-blade-list.vue +37 -29
- package/shared/modules/dynamic/types/index.ts +6 -16
- package/ui/components/atoms/vc-card/vc-card.vue +2 -2
- package/ui/components/atoms/vc-container/vc-container.vue +71 -128
- package/ui/components/atoms/vc-progress/vc-progress.stories.ts +1 -1
- package/ui/components/atoms/vc-status/vc-status.stories.ts +1 -1
- package/ui/components/molecules/vc-editor/vc-editor.vue +3 -0
- package/ui/components/molecules/vc-field/vc-field.stories.ts +2 -2
- package/ui/components/molecules/vc-input/vc-input.stories.ts +1 -1
- package/ui/components/molecules/vc-select/vc-select.vue +3 -3
- package/ui/components/organisms/vc-app/vc-app.vue +2 -2
- package/ui/components/organisms/vc-table/_internal/vc-table-add-new/vc-table-add-new.vue +18 -20
- package/ui/components/organisms/vc-table/_internal/vc-table-cell/vc-table-cell.vue +23 -16
- package/ui/components/organisms/vc-table/_internal/vc-table-column-switcher/vc-table-column-switcher.vue +8 -1
- package/ui/components/organisms/vc-table/_internal/vc-table-empty/vc-table-empty.vue +76 -0
- package/ui/components/organisms/vc-table/_internal/vc-table-mobile-item/vc-table-mobile-item.vue +9 -7
- package/ui/components/organisms/vc-table/vc-table.vue +188 -358
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vc-shell/framework",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.224",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"main": "./dist/framework.js",
|
|
6
6
|
"types": "./dist/index.d.ts",
|
|
@@ -60,9 +60,9 @@
|
|
|
60
60
|
"devDependencies": {
|
|
61
61
|
"@types/dompurify": "^3.0.5",
|
|
62
62
|
"@types/quill": "^2.0.14",
|
|
63
|
-
"@vc-shell/api-client-generator": "^1.0.
|
|
64
|
-
"@vc-shell/config-generator": "^1.0.
|
|
65
|
-
"@vc-shell/ts-config": "^1.0.
|
|
63
|
+
"@vc-shell/api-client-generator": "^1.0.224",
|
|
64
|
+
"@vc-shell/config-generator": "^1.0.224",
|
|
65
|
+
"@vc-shell/ts-config": "^1.0.224",
|
|
66
66
|
"@vitejs/plugin-vue": "^5.0.3",
|
|
67
67
|
"sass": "^1.69.6",
|
|
68
68
|
"shx": "^0.3.4",
|
package/shared/components/blade-navigation/components/vc-blade-navigation/vc-blade-navigation.vue
CHANGED
|
@@ -103,6 +103,7 @@ const render = () => {
|
|
|
103
103
|
expandable: quantity.value > 1,
|
|
104
104
|
expanded: index - hiddenQuantity === quantity.value - 1,
|
|
105
105
|
"onClose:blade": () => {
|
|
106
|
+
if (index === 0) return;
|
|
106
107
|
closeBlade(index);
|
|
107
108
|
},
|
|
108
109
|
"onParent:call": async (args: IParentCallArgs) => {
|
|
@@ -167,7 +167,7 @@ const useBladeNavigationSingleton = createSharedComposable(() => {
|
|
|
167
167
|
navigationInstance.blades.value = [];
|
|
168
168
|
activeWorkspace.value = undefined;
|
|
169
169
|
} else {
|
|
170
|
-
if (oldVal) router.
|
|
170
|
+
if (oldVal) router.push({ path: oldVal });
|
|
171
171
|
}
|
|
172
172
|
}
|
|
173
173
|
|
|
@@ -175,6 +175,7 @@ const useBladeNavigationSingleton = createSharedComposable(() => {
|
|
|
175
175
|
wsRouteComponent.props.navigation.idx = 0;
|
|
176
176
|
navigationInstance.blades.value[0] = wsRouteComponent;
|
|
177
177
|
activeWorkspace.value = wsRouteComponent;
|
|
178
|
+
closeBlade(1);
|
|
178
179
|
}
|
|
179
180
|
|
|
180
181
|
function getWorkspaceRouteComponent(workspaceUrl: string) {
|
|
@@ -290,6 +291,7 @@ export function useBladeNavigation(): IUseBladeNavigation {
|
|
|
290
291
|
{ blade, param, options }: IBladeEvent<Blade>,
|
|
291
292
|
query: LocationQuery | undefined = undefined,
|
|
292
293
|
params: RouteParams = {},
|
|
294
|
+
replace = false,
|
|
293
295
|
) {
|
|
294
296
|
const createdComponent = h(
|
|
295
297
|
blade,
|
|
@@ -327,7 +329,7 @@ export function useBladeNavigation(): IUseBladeNavigation {
|
|
|
327
329
|
if (wsroute && wsroute.components) {
|
|
328
330
|
wsroute.components.default = createdComponent;
|
|
329
331
|
}
|
|
330
|
-
return await router.
|
|
332
|
+
return await router.push({ name: wsroute?.name, params: { ...params, ...route.params }, query, replace });
|
|
331
333
|
} else
|
|
332
334
|
notification.error(i18n.global.t("PERMISSION_MESSAGES.ACCESS_RESTRICTED"), {
|
|
333
335
|
timeout: 3000,
|
|
@@ -502,9 +504,14 @@ export function useBladeNavigation(): IUseBladeNavigation {
|
|
|
502
504
|
|
|
503
505
|
// Open the workspace component or workspace route.
|
|
504
506
|
if (registeredRouteComponent?.type.isWorkspace) {
|
|
505
|
-
await openWorkspace(
|
|
506
|
-
|
|
507
|
-
|
|
507
|
+
await openWorkspace(
|
|
508
|
+
{
|
|
509
|
+
blade: registeredRouteComponent as unknown as BladeInstanceConstructor,
|
|
510
|
+
},
|
|
511
|
+
undefined,
|
|
512
|
+
undefined,
|
|
513
|
+
true,
|
|
514
|
+
);
|
|
508
515
|
return { name: registeredRouteComponent?.type.name, params };
|
|
509
516
|
}
|
|
510
517
|
|
|
@@ -525,10 +532,14 @@ export function useBladeNavigation(): IUseBladeNavigation {
|
|
|
525
532
|
}),
|
|
526
533
|
getURLQuery().obj,
|
|
527
534
|
params,
|
|
535
|
+
true,
|
|
528
536
|
);
|
|
529
537
|
|
|
530
538
|
// Open the route if it's routable.
|
|
531
|
-
if (
|
|
539
|
+
if (
|
|
540
|
+
registeredRouteComponent?.type.routable &&
|
|
541
|
+
registeredWorkspaceComponent.type.moduleUid === registeredRouteComponent.type.moduleUid
|
|
542
|
+
) {
|
|
532
543
|
await openBlade({
|
|
533
544
|
blade: registeredRouteComponent as unknown as BladeInstanceConstructor,
|
|
534
545
|
param: param,
|
|
@@ -565,7 +576,7 @@ export function useBladeNavigation(): IUseBladeNavigation {
|
|
|
565
576
|
// add blade name to query keys
|
|
566
577
|
const namedQuery = _.mapKeys(
|
|
567
578
|
_.mapValues(query, (value) => value?.toString()),
|
|
568
|
-
(value, key) => instance.vnode.type.name
|
|
579
|
+
(value, key) => instance.vnode.type.name?.toLowerCase() + "_" + key,
|
|
569
580
|
);
|
|
570
581
|
const cleanQuery = _.omitBy(namedQuery, _.isNil);
|
|
571
582
|
|
|
@@ -580,10 +591,10 @@ export function useBladeNavigation(): IUseBladeNavigation {
|
|
|
580
591
|
function getNavigationQuery() {
|
|
581
592
|
if (instance.vnode.props.navigation.idx === 0) {
|
|
582
593
|
const queryKeys = Array.from(Object.keys(route.query));
|
|
583
|
-
const bladeQueryKeys = queryKeys.filter((key) => key.startsWith(instance.vnode.type.name
|
|
594
|
+
const bladeQueryKeys = queryKeys.filter((key) => key.startsWith(instance.vnode.type.name?.toLowerCase() ?? ""));
|
|
584
595
|
|
|
585
596
|
const namedQuery = _.mapKeys(_.pick(route.query, bladeQueryKeys), (value, key) =>
|
|
586
|
-
key.replace(instance.vnode.type.name
|
|
597
|
+
key.replace(instance.vnode.type.name?.toLowerCase() + "_", ""),
|
|
587
598
|
) as Record<string, string | number>;
|
|
588
599
|
|
|
589
600
|
const obj: typeof namedQuery = {};
|
|
@@ -78,7 +78,8 @@ export default {
|
|
|
78
78
|
async remove(image: ICommonAsset) {
|
|
79
79
|
if (!imagesHandler.remove?.value) throw new Error("Remove handler is not provided");
|
|
80
80
|
if (
|
|
81
|
-
|
|
81
|
+
imagesHandler.noRemoveConfirmation ||
|
|
82
|
+
(await showConfirmation(
|
|
82
83
|
computed(() =>
|
|
83
84
|
t(
|
|
84
85
|
`${props.bladeContext?.settings?.localizationPrefix
|
|
@@ -86,7 +87,7 @@ export default {
|
|
|
86
87
|
.toUpperCase()}.PAGES.ALERTS.IMAGE_DELETE_CONFIRMATION`,
|
|
87
88
|
),
|
|
88
89
|
),
|
|
89
|
-
)
|
|
90
|
+
))
|
|
90
91
|
) {
|
|
91
92
|
const edited = await imagesHandler.remove?.value?.([image]);
|
|
92
93
|
await editImages(edited);
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Component, ExtractPropTypes,
|
|
1
|
+
import { Component, ExtractPropTypes, h, unref } from "vue";
|
|
2
2
|
import { InputCurrency } from "../factories";
|
|
3
3
|
import componentProps from "./props";
|
|
4
4
|
import ValidationField from "./ValidationField";
|
|
@@ -8,13 +8,11 @@ import { InputCurrencySchema } from "../../types";
|
|
|
8
8
|
import { unrefNested } from "../../helpers/unrefNested";
|
|
9
9
|
import { toValue } from "@vueuse/core";
|
|
10
10
|
import { safeIn } from "../../helpers/safeIn";
|
|
11
|
-
import { useI18n } from "vue-i18n";
|
|
12
11
|
|
|
13
12
|
export default {
|
|
14
13
|
name: "InputCurrency",
|
|
15
14
|
props: componentProps,
|
|
16
15
|
setup(props: ExtractPropTypes<typeof componentProps> & { element: InputCurrencySchema }) {
|
|
17
|
-
const { t } = useI18n({ useScope: "global" });
|
|
18
16
|
return () => {
|
|
19
17
|
const options =
|
|
20
18
|
toValue(getModel(props.element.options, props.fieldContext ?? {})) ||
|
|
@@ -35,7 +33,6 @@ export default {
|
|
|
35
33
|
props: Object.assign(
|
|
36
34
|
{},
|
|
37
35
|
{
|
|
38
|
-
hint: props.element.hint ? toValue(computed(() => t(props.element.hint ?? ""))) : undefined,
|
|
39
36
|
option: toValue(scopedProperty ?? contextProperty),
|
|
40
37
|
optionLabel: props.element.optionLabel,
|
|
41
38
|
optionValue: props.element.optionValue,
|
|
@@ -1,11 +1,10 @@
|
|
|
1
|
-
import { ExtractPropTypes, h, VNode, Component
|
|
1
|
+
import { ExtractPropTypes, h, VNode, Component } from "vue";
|
|
2
2
|
import { InputField } from "../factories";
|
|
3
3
|
import componentProps from "./props";
|
|
4
4
|
import ValidationField from "./ValidationField";
|
|
5
5
|
import { InputSchema, ControlSchema } from "../../types";
|
|
6
6
|
import { nodeBuilder } from "../../helpers/nodeBuilder";
|
|
7
7
|
import { unrefNested } from "../../helpers/unrefNested";
|
|
8
|
-
import { useI18n } from "vue-i18n";
|
|
9
8
|
|
|
10
9
|
const slotsMap = {
|
|
11
10
|
append: "append",
|
|
@@ -18,14 +17,11 @@ export default {
|
|
|
18
17
|
name: "InputField",
|
|
19
18
|
props: componentProps,
|
|
20
19
|
setup(props: ExtractPropTypes<typeof componentProps> & { element: InputSchema }) {
|
|
21
|
-
const { t } = useI18n({ useScope: "global" });
|
|
22
|
-
|
|
23
20
|
return () => {
|
|
24
21
|
const field = InputField({
|
|
25
22
|
props: Object.assign(
|
|
26
23
|
{},
|
|
27
24
|
{
|
|
28
|
-
hint: props.element.hint ? toValue(computed(() => t(props.element.hint ?? ""))) : undefined,
|
|
29
25
|
type: props.element.variant,
|
|
30
26
|
currentLanguage: props.currentLocale,
|
|
31
27
|
clearable: props.element.clearable || false,
|
|
@@ -1,12 +1,11 @@
|
|
|
1
1
|
import { ComponentSlots } from "../../../../utilities/vueUtils";
|
|
2
|
-
import { h, resolveComponent, ExtractPropTypes, Component, VNode
|
|
2
|
+
import { h, resolveComponent, ExtractPropTypes, Component, VNode } from "vue";
|
|
3
3
|
import { MultivalueField } from "../factories";
|
|
4
4
|
import componentProps from "./props";
|
|
5
5
|
import ValidationField from "./ValidationField";
|
|
6
6
|
import { MultivalueSchema } from "../../types";
|
|
7
7
|
import { VcMultivalue } from "../../../../../ui/components";
|
|
8
8
|
import { unrefNested } from "../../helpers/unrefNested";
|
|
9
|
-
import { useI18n } from "vue-i18n";
|
|
10
9
|
|
|
11
10
|
type TScope = Parameters<ComponentSlots<typeof VcMultivalue>["option"]>["0"] &
|
|
12
11
|
Parameters<ComponentSlots<typeof VcMultivalue>["selected-item"]>["0"];
|
|
@@ -15,13 +14,11 @@ export default {
|
|
|
15
14
|
name: "MultivalueField",
|
|
16
15
|
props: componentProps,
|
|
17
16
|
setup(props: ExtractPropTypes<typeof componentProps> & { element: MultivalueSchema }) {
|
|
18
|
-
const { t } = useI18n({ useScope: "global" });
|
|
19
17
|
return () => {
|
|
20
18
|
const field = MultivalueField({
|
|
21
19
|
props: Object.assign(
|
|
22
20
|
{},
|
|
23
21
|
{
|
|
24
|
-
hint: props.element.hint ? toValue(computed(() => t(props.element.hint ?? ""))) : undefined,
|
|
25
22
|
multivalue: props.element.multivalue,
|
|
26
23
|
type: props.element.variant,
|
|
27
24
|
optionValue: props.element.optionValue,
|
|
@@ -1,12 +1,11 @@
|
|
|
1
1
|
import { ComponentSlots } from "../../../../utilities/vueUtils";
|
|
2
|
-
import { h, resolveComponent, ExtractPropTypes, Component, VNode
|
|
2
|
+
import { h, resolveComponent, ExtractPropTypes, Component, VNode } from "vue";
|
|
3
3
|
import { SelectField } from "../factories";
|
|
4
4
|
import componentProps from "./props";
|
|
5
5
|
import ValidationField from "./ValidationField";
|
|
6
6
|
import { SelectSchema } from "../../types";
|
|
7
7
|
import { VcSelect } from "../../../../../ui/components";
|
|
8
8
|
import { unrefNested } from "../../helpers/unrefNested";
|
|
9
|
-
import { useI18n } from "vue-i18n";
|
|
10
9
|
|
|
11
10
|
type TScope =
|
|
12
11
|
| Parameters<ComponentSlots<typeof VcSelect>["option"]>["0"]
|
|
@@ -16,13 +15,11 @@ export default {
|
|
|
16
15
|
name: "SelectField",
|
|
17
16
|
props: componentProps,
|
|
18
17
|
setup(props: ExtractPropTypes<typeof componentProps> & { element: SelectSchema }) {
|
|
19
|
-
const { t } = useI18n({ useScope: "global" });
|
|
20
18
|
return () => {
|
|
21
19
|
const field = SelectField({
|
|
22
20
|
props: Object.assign(
|
|
23
21
|
{},
|
|
24
22
|
{
|
|
25
|
-
hint: props.element.hint ? toValue(computed(() => t(props.element.hint ?? ""))) : undefined,
|
|
26
23
|
optionValue: props.element.optionValue,
|
|
27
24
|
optionLabel: props.element.optionLabel,
|
|
28
25
|
emitValue: props.element.emitValue,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
2
2
|
import { useTableTemplates } from "./../../composables";
|
|
3
|
-
import { Component, ExtractPropTypes, computed, h, inject, unref } from "vue";
|
|
3
|
+
import { Component, ExtractPropTypes, computed, h, inject, isRef, nextTick, toValue, unref } from "vue";
|
|
4
4
|
import { Table } from "../factories";
|
|
5
5
|
import componentProps from "./props";
|
|
6
6
|
import { TableSchema } from "../../types";
|
|
@@ -8,8 +8,14 @@ import { useI18n } from "vue-i18n";
|
|
|
8
8
|
import { unrefNested } from "../../helpers/unrefNested";
|
|
9
9
|
import { setModel } from "../../helpers/setters";
|
|
10
10
|
import { safeIn } from "../../helpers/safeIn";
|
|
11
|
+
import { IActionBuilderResult, ITableColumns } from "../../../../../core/types";
|
|
11
12
|
|
|
12
|
-
type TableItemData =
|
|
13
|
+
type TableItemData<T> = {
|
|
14
|
+
name: string;
|
|
15
|
+
item: T;
|
|
16
|
+
cell: ITableColumns;
|
|
17
|
+
index: number;
|
|
18
|
+
};
|
|
13
19
|
|
|
14
20
|
export default {
|
|
15
21
|
name: "TableEl",
|
|
@@ -19,13 +25,48 @@ export default {
|
|
|
19
25
|
const { t } = useI18n({ useScope: "global" });
|
|
20
26
|
const enableEdit = inject("isBladeEditable", false);
|
|
21
27
|
const enableEditComputed = computed(() => unref(enableEdit));
|
|
28
|
+
const items = (unrefNested(props.baseProps).modelValue ?? []) as any[];
|
|
29
|
+
|
|
30
|
+
function disabledActionHandler(disabled: { method?: string } | boolean, item: (typeof items)[number]): boolean {
|
|
31
|
+
if (!disabled) return false;
|
|
32
|
+
if (typeof disabled === "boolean") return disabled;
|
|
33
|
+
else if (disabled.method && typeof toValue(props.bladeContext.scope)?.[disabled.method] === "function")
|
|
34
|
+
return toValue(props.bladeContext.scope)?.[disabled.method]({ item });
|
|
35
|
+
else if (disabled.method && toValue(props.bladeContext.scope)?.[disabled.method])
|
|
36
|
+
return toValue(props.bladeContext.scope)?.[disabled.method];
|
|
37
|
+
return false;
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
function actionBuilder(item: (typeof items)[number]): IActionBuilderResult[] | undefined {
|
|
41
|
+
const result = props.element?.actions?.reduce((arr, action) => {
|
|
42
|
+
const isDisabled = disabledActionHandler(action?.disabled ?? false, item);
|
|
43
|
+
|
|
44
|
+
if (!toValue(isDisabled)) {
|
|
45
|
+
arr.push({
|
|
46
|
+
icon: action.icon,
|
|
47
|
+
title: computed(() => t(action.title)),
|
|
48
|
+
type: action.type,
|
|
49
|
+
position: action.position,
|
|
50
|
+
clickHandler: async (itemVal: (typeof items)[number], index: number) => {
|
|
51
|
+
try {
|
|
52
|
+
await toValue(props.bladeContext.scope)?.[action.method]?.(itemVal, index);
|
|
53
|
+
} catch (error) {
|
|
54
|
+
throw new Error(`Method ${action.method} is not defined in scope or toolbarOverrides`);
|
|
55
|
+
}
|
|
56
|
+
},
|
|
57
|
+
});
|
|
58
|
+
}
|
|
59
|
+
return arr;
|
|
60
|
+
}, [] as IActionBuilderResult[]);
|
|
61
|
+
|
|
62
|
+
return result;
|
|
63
|
+
}
|
|
22
64
|
|
|
23
65
|
return () => {
|
|
24
66
|
const field = Table({
|
|
25
67
|
props: Object.assign(
|
|
26
68
|
{},
|
|
27
69
|
{
|
|
28
|
-
removeRowButton: props.element.removeRowButton?.show,
|
|
29
70
|
addNewRowButton: props.element.addNewRowButton
|
|
30
71
|
? {
|
|
31
72
|
title: computed(() => t(props.element.addNewRowButton?.title ?? "")),
|
|
@@ -40,7 +81,9 @@ export default {
|
|
|
40
81
|
stateKey: props.element.id,
|
|
41
82
|
class: `!tw-flex-auto ${unrefNested(props.baseProps).classNames ?? ""}`,
|
|
42
83
|
editing: enableEditComputed.value,
|
|
43
|
-
|
|
84
|
+
enableItemActions: !!props.element.actions,
|
|
85
|
+
itemActionBuilder: actionBuilder,
|
|
86
|
+
onOnEditComplete: (data: { event: { field: string; value: any }; index: number }) => {
|
|
44
87
|
if (props.fieldContext) {
|
|
45
88
|
setModel({
|
|
46
89
|
context: props.fieldContext,
|
|
@@ -49,15 +92,6 @@ export default {
|
|
|
49
92
|
});
|
|
50
93
|
}
|
|
51
94
|
},
|
|
52
|
-
onOnRowRemove: (data: { index: number }) => {
|
|
53
|
-
if (
|
|
54
|
-
props.element.removeRowButton?.method &&
|
|
55
|
-
props.bladeContext.scope?.[props.element.removeRowButton?.method] &&
|
|
56
|
-
typeof props.bladeContext.scope?.[props.element.removeRowButton?.method] === "function"
|
|
57
|
-
) {
|
|
58
|
-
props.bladeContext.scope?.[props.element.removeRowButton?.method]?.(data.index);
|
|
59
|
-
}
|
|
60
|
-
},
|
|
61
95
|
onOnAddNewRow: () => {
|
|
62
96
|
if (
|
|
63
97
|
props.element.addNewRowButton?.method &&
|
|
@@ -86,12 +120,21 @@ export default {
|
|
|
86
120
|
slots: {
|
|
87
121
|
...Object.entries(tableTemplates.templateOverrideComponents).reduce(
|
|
88
122
|
(obj, [key, value], index) => {
|
|
89
|
-
obj[`item_${key}`] = (itemData: TableItemData) => {
|
|
123
|
+
obj[`item_${key}`] = (itemData: TableItemData<(typeof items)[number]>) => {
|
|
90
124
|
return h(unref(value), {
|
|
91
125
|
index: itemData.index,
|
|
92
126
|
context: itemData,
|
|
93
127
|
key: `template_override_${props.element.id}_${index}`,
|
|
94
128
|
bladeContext: props.bladeContext,
|
|
129
|
+
onEditComplete: (data: any) => {
|
|
130
|
+
if (props.fieldContext) {
|
|
131
|
+
setModel({
|
|
132
|
+
context: props.fieldContext,
|
|
133
|
+
property: `${props.element.property}.${itemData.index}.${key}`,
|
|
134
|
+
value: data,
|
|
135
|
+
});
|
|
136
|
+
}
|
|
137
|
+
},
|
|
95
138
|
});
|
|
96
139
|
};
|
|
97
140
|
|
|
@@ -100,20 +143,17 @@ export default {
|
|
|
100
143
|
{} as Record<`item_${string}`, any>,
|
|
101
144
|
),
|
|
102
145
|
notfound: tableTemplates?.notFound
|
|
103
|
-
? (
|
|
104
|
-
h(tableTemplates.notFound as Component, { context: itemData, bladeContext: props.bladeContext })
|
|
146
|
+
? () => h(tableTemplates.notFound as Component, { context: props.bladeContext })
|
|
105
147
|
: undefined,
|
|
106
148
|
"mobile-item": tableTemplates?.mobileView
|
|
107
|
-
? (itemData:
|
|
149
|
+
? (itemData: (typeof items)[number]) =>
|
|
108
150
|
h(tableTemplates.mobileView as Component, { context: itemData, bladeContext: props.bladeContext })
|
|
109
151
|
: undefined,
|
|
110
152
|
empty: tableTemplates?.empty
|
|
111
|
-
? (
|
|
112
|
-
h(tableTemplates.empty as Component, { context: itemData, bladeContext: props.bladeContext })
|
|
153
|
+
? () => h(tableTemplates.empty as Component, { context: props.bladeContext })
|
|
113
154
|
: undefined,
|
|
114
155
|
footer: tableTemplates?.footer
|
|
115
|
-
? (
|
|
116
|
-
h(tableTemplates.footer as Component, { context: itemData, bladeContext: props.bladeContext })
|
|
156
|
+
? () => h(tableTemplates.footer as Component, { context: props.bladeContext })
|
|
117
157
|
: undefined,
|
|
118
158
|
},
|
|
119
159
|
});
|
|
@@ -87,6 +87,16 @@ export default {
|
|
|
87
87
|
},
|
|
88
88
|
},
|
|
89
89
|
},
|
|
90
|
+
variant: {
|
|
91
|
+
description: "Card variant.",
|
|
92
|
+
control: "radio",
|
|
93
|
+
options: ["default", "success", "danger"],
|
|
94
|
+
table: {
|
|
95
|
+
type: {
|
|
96
|
+
summary: "default | success | danger",
|
|
97
|
+
},
|
|
98
|
+
},
|
|
99
|
+
},
|
|
90
100
|
},
|
|
91
101
|
parameters: {
|
|
92
102
|
docs: {
|
|
@@ -131,7 +131,7 @@ export default {
|
|
|
131
131
|
summary: "boolean",
|
|
132
132
|
},
|
|
133
133
|
defaultValue: {
|
|
134
|
-
summary: false,
|
|
134
|
+
summary: "false",
|
|
135
135
|
},
|
|
136
136
|
},
|
|
137
137
|
},
|
|
@@ -156,7 +156,7 @@ export default {
|
|
|
156
156
|
summary: "boolean",
|
|
157
157
|
},
|
|
158
158
|
defaultValue: {
|
|
159
|
-
summary: false,
|
|
159
|
+
summary: "false",
|
|
160
160
|
},
|
|
161
161
|
},
|
|
162
162
|
},
|
|
@@ -167,7 +167,7 @@ export default {
|
|
|
167
167
|
summary: "boolean",
|
|
168
168
|
},
|
|
169
169
|
defaultValue: {
|
|
170
|
-
summary: false,
|
|
170
|
+
summary: "false",
|
|
171
171
|
},
|
|
172
172
|
},
|
|
173
173
|
},
|
|
@@ -179,7 +179,7 @@ export default {
|
|
|
179
179
|
summary: "boolean",
|
|
180
180
|
},
|
|
181
181
|
defaultValue: {
|
|
182
|
-
summary: true,
|
|
182
|
+
summary: "true",
|
|
183
183
|
},
|
|
184
184
|
},
|
|
185
185
|
},
|
|
@@ -64,7 +64,7 @@ export default <Query>(args: {
|
|
|
64
64
|
data: FilterBase | undefined;
|
|
65
65
|
query: MaybeRef<Query>;
|
|
66
66
|
load: AsyncAction<Query>;
|
|
67
|
-
scope:
|
|
67
|
+
scope: Record<string, any> | undefined;
|
|
68
68
|
}): UseFilterBuilder => {
|
|
69
69
|
const _search = args.load;
|
|
70
70
|
const _data = args.data;
|
|
@@ -12,7 +12,6 @@ export const useToolbarReducer = (args: {
|
|
|
12
12
|
defaultToolbarBindings: BaseBladeScope["toolbarOverrides"];
|
|
13
13
|
customToolbarConfig: BaseBladeScope["toolbarOverrides"];
|
|
14
14
|
context: UnwrapNestedRefs<DetailsBladeContext> | UnwrapNestedRefs<ListBladeContext>;
|
|
15
|
-
scope: ComputedRef<BaseBladeScope> | undefined;
|
|
16
15
|
}): UnwrapNestedRefs<ComputedRef<(IBladeToolbar & ToolbarSchema)[] | IBladeToolbar[] | undefined>> | undefined => {
|
|
17
16
|
if (!args) return;
|
|
18
17
|
|
|
@@ -66,19 +65,6 @@ export const useToolbarReducer = (args: {
|
|
|
66
65
|
}, [] as IBladeToolbar[]);
|
|
67
66
|
}
|
|
68
67
|
|
|
69
|
-
// TODO remove redundant code if not needed
|
|
70
|
-
// if (args.scope && toValue(toValue(args.scope)?.toolbarOverrides)) {
|
|
71
|
-
// const toolbarOverrides: BaseBladeScope["toolbarOverrides"] = toValue(toValue(args.scope)?.toolbarOverrides);
|
|
72
|
-
|
|
73
|
-
// if (Array.isArray(toolbarOverrides)) {
|
|
74
|
-
// return toolbarOverrides;
|
|
75
|
-
// } else if (typeof toolbarOverrides === "function") {
|
|
76
|
-
// return toolbarOverrides(args.context);
|
|
77
|
-
// } else if (typeof toolbarOverrides === "object") {
|
|
78
|
-
// return Object.values(toolbarOverrides);
|
|
79
|
-
// }
|
|
80
|
-
// }
|
|
81
|
-
|
|
82
68
|
return [];
|
|
83
69
|
});
|
|
84
70
|
};
|
|
@@ -11,7 +11,7 @@ export interface UseDetailsFactoryParams<Item> {
|
|
|
11
11
|
remove?: (args: ItemId) => Promise<void> | void;
|
|
12
12
|
}
|
|
13
13
|
|
|
14
|
-
export const useDetailsFactory = <Item>(factoryParams: UseDetailsFactoryParams<Item>) => {
|
|
14
|
+
export const useDetailsFactory = <Item extends { id?: string }>(factoryParams: UseDetailsFactoryParams<Item>) => {
|
|
15
15
|
return function useDetails(): UseDetails<Item> {
|
|
16
16
|
const { setFieldError, setErrors, validate, setFieldValue, setValues, errorBag } = useForm({
|
|
17
17
|
validateOnMount: false,
|
|
@@ -34,6 +34,12 @@ export const useDetailsFactory = <Item>(factoryParams: UseDetailsFactoryParams<I
|
|
|
34
34
|
isModified.value = false;
|
|
35
35
|
isDirty = ref(false);
|
|
36
36
|
|
|
37
|
+
const id = item?.id ?? res?.id;
|
|
38
|
+
|
|
39
|
+
if (id) {
|
|
40
|
+
await load({ id });
|
|
41
|
+
}
|
|
42
|
+
|
|
37
43
|
if (res) return res;
|
|
38
44
|
} else throw new Error("Form is not valid");
|
|
39
45
|
});
|
|
@@ -58,6 +64,7 @@ export const useDetailsFactory = <Item>(factoryParams: UseDetailsFactoryParams<I
|
|
|
58
64
|
setFieldValue,
|
|
59
65
|
setValues,
|
|
60
66
|
resetModified,
|
|
67
|
+
resetDirty,
|
|
61
68
|
validate,
|
|
62
69
|
}),
|
|
63
70
|
);
|
|
@@ -78,6 +85,10 @@ export const useDetailsFactory = <Item>(factoryParams: UseDetailsFactoryParams<I
|
|
|
78
85
|
itemTemp.value = _.cloneDeep(data);
|
|
79
86
|
}) as (data: MaybeRef<Item | undefined> | ComputedRef<Item | undefined>, updateInitial?: MaybeRef<boolean>) => void;
|
|
80
87
|
|
|
88
|
+
const resetDirty = () => {
|
|
89
|
+
isDirty = ref(false);
|
|
90
|
+
};
|
|
91
|
+
|
|
81
92
|
return {
|
|
82
93
|
load,
|
|
83
94
|
saveChanges,
|
|
@@ -6,6 +6,7 @@ import { AssetsHandler, IBladeToolbar, ICommonAsset } from "../../../../../core/
|
|
|
6
6
|
import { useBladeNavigation } from "../../../../components";
|
|
7
7
|
import { FormContext } from "vee-validate";
|
|
8
8
|
import { Breadcrumbs } from "../../../../../ui/types";
|
|
9
|
+
import { DynamicBladeForm, DynamicBladeList } from "../../pages";
|
|
9
10
|
|
|
10
11
|
export type ItemId = { id: string };
|
|
11
12
|
|
|
@@ -31,6 +32,7 @@ export interface IValidationState<Item> {
|
|
|
31
32
|
data: MaybeRef<Item | undefined> | ComputedRef<Item | undefined>,
|
|
32
33
|
updateInitial?: MaybeRef<boolean>,
|
|
33
34
|
) => void;
|
|
35
|
+
resetDirty: () => void;
|
|
34
36
|
validate: FormContext["validate"];
|
|
35
37
|
errorBag: Partial<Record<string, string[]>>;
|
|
36
38
|
}
|
|
@@ -44,7 +46,7 @@ export interface UseDetails<Item, Scope extends DetailsBaseBladeScope = DetailsB
|
|
|
44
46
|
loading: ComputedRef<boolean>;
|
|
45
47
|
item: Ref<Item | undefined>;
|
|
46
48
|
validationState: ComputedRef<IValidationState<Item>>;
|
|
47
|
-
scope?:
|
|
49
|
+
scope?: Scope;
|
|
48
50
|
bladeTitle?: ComputedRef<string>;
|
|
49
51
|
}
|
|
50
52
|
|
|
@@ -64,7 +66,7 @@ export interface UseList<
|
|
|
64
66
|
}>;
|
|
65
67
|
load: AsyncAction<Query>;
|
|
66
68
|
remove?: AsyncAction<CustomQuery>;
|
|
67
|
-
scope?:
|
|
69
|
+
scope?: Scope;
|
|
68
70
|
}
|
|
69
71
|
|
|
70
72
|
export interface BaseBladeScope {
|
|
@@ -150,3 +152,19 @@ export type ListBladeExposed<Scope extends ListBaseBladeScope> = BaseBladeExpose
|
|
|
150
152
|
export type DetailsBladeExposed<Scope extends DetailsBaseBladeScope> = BaseBladeExposed & {
|
|
151
153
|
readonly settings: SettingsDetails;
|
|
152
154
|
} & UnwrapNestedRefs<Scope>;
|
|
155
|
+
|
|
156
|
+
export type DetailsComposableArgs<
|
|
157
|
+
Props extends Omit<InstanceType<typeof DynamicBladeForm>["$props"], "composables"> = Record<string, any>,
|
|
158
|
+
> = {
|
|
159
|
+
props: InstanceType<typeof DynamicBladeForm>["$props"] & Props;
|
|
160
|
+
emit: InstanceType<typeof DynamicBladeForm>["$emit"];
|
|
161
|
+
mounted: Ref<boolean>;
|
|
162
|
+
};
|
|
163
|
+
|
|
164
|
+
export type ListComposableArgs<
|
|
165
|
+
Props extends Omit<InstanceType<typeof DynamicBladeList>["$props"], "composables"> = Record<string, any>,
|
|
166
|
+
> = {
|
|
167
|
+
readonly props: InstanceType<typeof DynamicBladeList>["$props"] & Props;
|
|
168
|
+
readonly emit: InstanceType<typeof DynamicBladeList>["$emit"];
|
|
169
|
+
readonly mounted: Ref<boolean>;
|
|
170
|
+
};
|
|
@@ -74,6 +74,13 @@ function nodeBuilder<
|
|
|
74
74
|
? unref(unwrapInterpolation(controlSchema.label, internalContext))
|
|
75
75
|
: undefined;
|
|
76
76
|
|
|
77
|
+
const hint =
|
|
78
|
+
safeIn("hint", controlSchema) && controlSchema.hint
|
|
79
|
+
? (bladeContext.scope && unref(unwrapInterpolation(controlSchema.hint, bladeContext.scope))) ??
|
|
80
|
+
unref(unwrapInterpolation(controlSchema.hint, internalContext)) ??
|
|
81
|
+
undefined
|
|
82
|
+
: undefined;
|
|
83
|
+
|
|
77
84
|
const disabled =
|
|
78
85
|
(bladeContext.scope && safeIn("disabled", bladeContext.scope) && bladeContext.scope.disabled) ||
|
|
79
86
|
(safeIn("disabled", controlSchema) &&
|
|
@@ -108,15 +115,16 @@ function nodeBuilder<
|
|
|
108
115
|
|
|
109
116
|
const baseProps: IControlBaseProps = reactive({
|
|
110
117
|
key: `${parentId}`,
|
|
111
|
-
label: computed(() => (label ? t(label) : undefined)),
|
|
118
|
+
label: computed(() => (typeof label !== "undefined" ? t(label) : undefined)),
|
|
119
|
+
hint: computed(() => (typeof hint !== "undefined" ? t(hint) : undefined)),
|
|
112
120
|
disabled,
|
|
113
121
|
name,
|
|
114
122
|
rules,
|
|
115
|
-
placeholder: computed(() => (placeholder ? t(placeholder) : undefined)),
|
|
123
|
+
placeholder: computed(() => (typeof placeholder !== "undefined" ? t(placeholder) : undefined)),
|
|
116
124
|
required,
|
|
117
125
|
modelValue,
|
|
118
126
|
"onUpdate:modelValue": onUpdateModelValue,
|
|
119
|
-
tooltip: computed(() => (tooltip ? t(tooltip) : undefined)),
|
|
127
|
+
tooltip: computed(() => (typeof tooltip !== "undefined" ? t(tooltip) : undefined)),
|
|
120
128
|
multilanguage,
|
|
121
129
|
classNames:
|
|
122
130
|
"horizontalSeparator" in controlSchema && controlSchema.horizontalSeparator
|