@mapomodule/form 2.0.0-beta.14 → 2.0.0-beta.16
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/__tests__/MapoFormGroup.component.test.d.ts +2 -0
- package/dist/__tests__/MapoFormGroup.component.test.d.ts.map +1 -0
- package/dist/__tests__/MapoWygEditor.component.test.d.ts +2 -0
- package/dist/__tests__/MapoWygEditor.component.test.d.ts.map +1 -0
- package/dist/__tests__/fieldVisibility.component.test.d.ts +2 -0
- package/dist/__tests__/fieldVisibility.component.test.d.ts.map +1 -0
- package/dist/__tests__/formatHtml.test.d.ts +2 -0
- package/dist/__tests__/formatHtml.test.d.ts.map +1 -0
- package/dist/__tests__/sanitizeHtml.test.d.ts +2 -0
- package/dist/__tests__/sanitizeHtml.test.d.ts.map +1 -0
- package/dist/index.d.mts +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/module.json +1 -1
- package/dist/runtime/components/MapoFormField.vue +5 -10
- package/dist/runtime/components/MapoFormField.vue.d.ts.map +1 -1
- package/dist/runtime/components/MapoFormFlatSection.vue +21 -3
- package/dist/runtime/components/MapoFormFlatSection.vue.d.ts +1 -0
- package/dist/runtime/components/MapoFormFlatSection.vue.d.ts.map +1 -1
- package/dist/runtime/components/MapoFormGroup.vue +69 -34
- package/dist/runtime/components/MapoFormGroup.vue.d.ts +19 -4
- package/dist/runtime/components/MapoFormGroup.vue.d.ts.map +1 -1
- package/dist/runtime/components/fields/MapoRepeaterItem.vue +18 -2
- package/dist/runtime/components/fields/MapoRepeaterItem.vue.d.ts.map +1 -1
- package/dist/runtime/components/fields/MapoWygEditor.vue +157 -50
- package/dist/runtime/components/fields/MapoWygEditor.vue.d.ts.map +1 -1
- package/dist/runtime/types/descriptor.d.ts +65 -2
- package/dist/runtime/types/descriptor.d.ts.map +1 -1
- package/dist/runtime/types/index.d.ts +1 -1
- package/dist/runtime/types/index.d.ts.map +1 -1
- package/dist/runtime/utils/formatHtml.d.ts +16 -0
- package/dist/runtime/utils/formatHtml.d.ts.map +1 -0
- package/dist/runtime/utils/formatHtml.js +137 -0
- package/dist/runtime/utils/sanitizeHtml.d.ts +16 -0
- package/dist/runtime/utils/sanitizeHtml.d.ts.map +1 -0
- package/dist/runtime/utils/sanitizeHtml.js +37 -0
- package/dist/runtime/utils/tabVisibility.d.ts +8 -2
- package/dist/runtime/utils/tabVisibility.d.ts.map +1 -1
- package/dist/runtime/utils/tabVisibility.js +20 -2
- package/package.json +2 -2
- package/src/__tests__/MapoFormGroup.component.test.ts +130 -0
- package/src/__tests__/MapoWygEditor.component.test.ts +525 -0
- package/src/__tests__/fieldVisibility.component.test.ts +546 -0
- package/src/__tests__/formatHtml.test.ts +145 -0
- package/src/__tests__/sanitizeHtml.test.ts +40 -0
- package/src/__tests__/tabVisibility.test.ts +27 -0
- package/src/index.ts +2 -0
- package/src/runtime/components/MapoFormField.vue +7 -13
- package/src/runtime/components/MapoFormFlatSection.vue +38 -5
- package/src/runtime/components/MapoFormGroup.vue +116 -43
- package/src/runtime/components/fields/MapoRepeaterItem.vue +32 -2
- package/src/runtime/components/fields/MapoWygEditor.vue +199 -69
- package/src/runtime/types/descriptor.ts +73 -3
- package/src/runtime/types/index.ts +2 -0
- package/src/runtime/utils/formatHtml.ts +198 -0
- package/src/runtime/utils/sanitizeHtml.ts +60 -0
- package/src/runtime/utils/tabVisibility.ts +42 -4
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"MapoFormGroup.component.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/MapoFormGroup.component.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"MapoWygEditor.component.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/MapoWygEditor.component.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fieldVisibility.component.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/fieldVisibility.component.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"formatHtml.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/formatHtml.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sanitizeHtml.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/sanitizeHtml.test.ts"],"names":[],"mappings":""}
|
package/dist/index.d.mts
CHANGED
|
@@ -5,5 +5,5 @@ export { FocusTarget, useFocusMode } from '../dist/runtime/composables/useFocusM
|
|
|
5
5
|
export { UnsavedChangesGuardOptions, useUnsavedChangesGuard } from '../dist/runtime/composables/useUnsavedChangesGuard.js';
|
|
6
6
|
export { greaterThan, isEmpty, isNoneOf, isNotEmpty, isOneOf, lessThan, matches, matchesField, when, whenAny, whenNot } from '../dist/runtime/composables/useProgressiveDisclosure.js';
|
|
7
7
|
export { FieldGroupDescriptor, flattenFieldGroups } from '../dist/runtime/utils/flattenFieldGroups.js';
|
|
8
|
-
export { AnyFieldDescriptor, BooleanDescriptor, ColorDescriptor, CustomDescriptor, DateDescriptor, EditorDescriptor, EnhancedMediaDescriptor, EnhancedMediaValue, FieldAccessor, FieldComponentEntry, FieldDescriptor, FieldRegistry, FieldType, FileDescriptor, FksDescriptor, KnownFieldType, MapDescriptor, MediaDescriptor, MediaItem, MediaLink, MediaM2mDescriptor, NumberDescriptor, PartialFieldRegistry, RepeaterDescriptor, RepeaterImageFit, RepeaterTemplate, SelectDescriptor, SeoDescriptor, TextDescriptor } from '../dist/runtime/types/index.js';
|
|
8
|
+
export { AnyFieldDescriptor, BooleanDescriptor, ColorDescriptor, CustomDescriptor, DateDescriptor, EditorDescriptor, EditorToolbarEditor, EditorToolbarItem, EnhancedMediaDescriptor, EnhancedMediaValue, FieldAccessor, FieldComponentEntry, FieldDescriptor, FieldRegistry, FieldType, FileDescriptor, FksDescriptor, KnownFieldType, MapDescriptor, MediaDescriptor, MediaItem, MediaLink, MediaM2mDescriptor, NumberDescriptor, PartialFieldRegistry, RepeaterDescriptor, RepeaterImageFit, RepeaterTemplate, SelectDescriptor, SeoDescriptor, TextDescriptor } from '../dist/runtime/types/index.js';
|
|
9
9
|
import '@nuxt/schema';
|
package/dist/index.d.ts
CHANGED
|
@@ -11,5 +11,5 @@ export { when, whenAny, whenNot, matchesField, isOneOf, isNoneOf, isNotEmpty, is
|
|
|
11
11
|
export { flattenFieldGroups } from "./runtime/utils/flattenFieldGroups.js";
|
|
12
12
|
export type { FieldGroupDescriptor } from "./runtime/utils/flattenFieldGroups.js";
|
|
13
13
|
export { KnownFieldType } from "./runtime/types/index.js";
|
|
14
|
-
export type { FieldType, FieldAccessor, FieldDescriptor, AnyFieldDescriptor, TextDescriptor, NumberDescriptor, BooleanDescriptor, SelectDescriptor, FksDescriptor, DateDescriptor, ColorDescriptor, FileDescriptor, EditorDescriptor, SeoDescriptor, MapDescriptor, RepeaterDescriptor, RepeaterTemplate, RepeaterImageFit, MediaDescriptor, MediaM2mDescriptor, EnhancedMediaDescriptor, CustomDescriptor, MediaLink, MediaItem, EnhancedMediaValue, FieldComponentEntry, FieldRegistry, PartialFieldRegistry, } from "./runtime/types/index.js";
|
|
14
|
+
export type { FieldType, FieldAccessor, FieldDescriptor, AnyFieldDescriptor, TextDescriptor, NumberDescriptor, BooleanDescriptor, SelectDescriptor, FksDescriptor, DateDescriptor, ColorDescriptor, FileDescriptor, EditorDescriptor, EditorToolbarItem, EditorToolbarEditor, SeoDescriptor, MapDescriptor, RepeaterDescriptor, RepeaterTemplate, RepeaterImageFit, MediaDescriptor, MediaM2mDescriptor, EnhancedMediaDescriptor, CustomDescriptor, MediaLink, MediaItem, EnhancedMediaValue, FieldComponentEntry, FieldRegistry, PartialFieldRegistry, } from "./runtime/types/index.js";
|
|
15
15
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;AAC/E,YAAY,EAAE,wBAAwB,EAAE,MAAM,4CAA4C,CAAC;AAC3F,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AACrE,YAAY,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AACrE,YAAY,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AACzE,OAAO,EAAE,sBAAsB,EAAE,MAAM,iDAAiD,CAAC;AACzF,YAAY,EAAE,0BAA0B,EAAE,MAAM,iDAAiD,CAAC;AAElG,OAAO,EACL,IAAI,EACJ,OAAO,EACP,OAAO,EACP,YAAY,EACZ,OAAO,EACP,QAAQ,EACR,UAAU,EACV,OAAO,EACP,WAAW,EACX,QAAQ,EACR,OAAO,GACR,MAAM,mDAAmD,CAAC;AAC3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAC3E,YAAY,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAClF,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,YAAY,EACV,SAAS,EACT,aAAa,EACb,eAAe,EACf,kBAAkB,EAClB,cAAc,EACd,gBAAgB,EAChB,iBAAiB,EACjB,gBAAgB,EAChB,aAAa,EACb,cAAc,EACd,eAAe,EACf,cAAc,EACd,gBAAgB,EAChB,aAAa,EACb,aAAa,EACb,kBAAkB,EAClB,gBAAgB,EAChB,gBAAgB,EAChB,eAAe,EACf,kBAAkB,EAClB,uBAAuB,EACvB,gBAAgB,EAChB,SAAS,EACT,SAAS,EACT,kBAAkB,EAClB,mBAAmB,EACnB,aAAa,EACb,oBAAoB,GACrB,MAAM,0BAA0B,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;AAC/E,YAAY,EAAE,wBAAwB,EAAE,MAAM,4CAA4C,CAAC;AAC3F,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AACrE,YAAY,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AACrE,YAAY,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AACzE,OAAO,EAAE,sBAAsB,EAAE,MAAM,iDAAiD,CAAC;AACzF,YAAY,EAAE,0BAA0B,EAAE,MAAM,iDAAiD,CAAC;AAElG,OAAO,EACL,IAAI,EACJ,OAAO,EACP,OAAO,EACP,YAAY,EACZ,OAAO,EACP,QAAQ,EACR,UAAU,EACV,OAAO,EACP,WAAW,EACX,QAAQ,EACR,OAAO,GACR,MAAM,mDAAmD,CAAC;AAC3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAC3E,YAAY,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAClF,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,YAAY,EACV,SAAS,EACT,aAAa,EACb,eAAe,EACf,kBAAkB,EAClB,cAAc,EACd,gBAAgB,EAChB,iBAAiB,EACjB,gBAAgB,EAChB,aAAa,EACb,cAAc,EACd,eAAe,EACf,cAAc,EACd,gBAAgB,EAChB,iBAAiB,EACjB,mBAAmB,EACnB,aAAa,EACb,aAAa,EACb,kBAAkB,EAClB,gBAAgB,EAChB,gBAAgB,EAChB,eAAe,EACf,kBAAkB,EAClB,uBAAuB,EACvB,gBAAgB,EAChB,SAAS,EACT,SAAS,EACT,kBAAkB,EAClB,mBAAmB,EACnB,aAAa,EACb,oBAAoB,GACrB,MAAM,0BAA0B,CAAC"}
|
package/dist/module.json
CHANGED
|
@@ -6,6 +6,7 @@ import {
|
|
|
6
6
|
resolveFieldAccessor
|
|
7
7
|
} from "../types/index.js";
|
|
8
8
|
import { injectMapoForm } from "../composables/useMapoForm.js";
|
|
9
|
+
import { isFieldRemoved, isFieldShown } from "../utils/tabVisibility.js";
|
|
9
10
|
import { getNestedValue, debounce } from "@mapomodule/utils";
|
|
10
11
|
import MapoUnknownField from "./MapoUnknownField.vue";
|
|
11
12
|
const props = defineProps({
|
|
@@ -15,16 +16,10 @@ const form = injectMapoForm();
|
|
|
15
16
|
const registry = form.registry;
|
|
16
17
|
const currentLang = form.currentLang;
|
|
17
18
|
const model = form.model;
|
|
18
|
-
const isVisible = computed(
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
});
|
|
23
|
-
const showField = computed(() => {
|
|
24
|
-
if (props.descriptor.show && !props.descriptor.show({ model: model.value }))
|
|
25
|
-
return false;
|
|
26
|
-
return true;
|
|
27
|
-
});
|
|
19
|
+
const isVisible = computed(
|
|
20
|
+
() => !isFieldRemoved(props.descriptor, model.value)
|
|
21
|
+
);
|
|
22
|
+
const showField = computed(() => isFieldShown(props.descriptor, model.value));
|
|
28
23
|
const path = computed(() => {
|
|
29
24
|
const lang = currentLang.value;
|
|
30
25
|
if (props.descriptor.translatable && lang) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MapoFormField.vue.d.ts","sourceRoot":"","sources":["../../../src/runtime/components/MapoFormField.vue"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"MapoFormField.vue.d.ts","sourceRoot":"","sources":["../../../src/runtime/components/MapoFormField.vue"],"names":[],"mappings":"AA6VA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAc5D,KAAK,WAAW,GAAG;IAAE,UAAU,EAAE,kBAAkB,CAAC,GAAG,CAAC,CAAA;CAAE,CAAC;AAoa3D,QAAA,IAAI,OAAO,yBAAU,EAAE,OAAO;;;CAAU,EAAE,QAAQ,0BAAW,EAAE,QAAQ;;;CAAW,EAAE,QAAQ,2BAAW,EAAE,QAAQ;;;CAAW,EAAE,QAAQ,0BAAW,EAAE,QAAQ;;;CAAW,EAAE,QAAQ,wBAAW,EAAE,QAAQ;;;CAAW,EAAE,QAAQ,yBAAW,EAAE,QAAQ;;;CAAY,CAAE;AAC7P,KAAK,WAAW,GAAG,EAAE,GACnB;KAAG,CAAC,IAAI,WAAW,CAAC,OAAO,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,OAAO,KAAK,GAAG;CAAE,GACvE;KAAG,CAAC,IAAI,WAAW,CAAC,OAAO,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,QAAQ,KAAK,GAAG;CAAE,GACzE;KAAG,CAAC,IAAI,WAAW,CAAC,OAAO,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,QAAQ,KAAK,GAAG;CAAE,GACzE;KAAG,CAAC,IAAI,WAAW,CAAC,OAAO,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,QAAQ,KAAK,GAAG;CAAE,GACzE;KAAG,CAAC,IAAI,WAAW,CAAC,OAAO,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,QAAQ,KAAK,GAAG;CAAE,GACzE;KAAG,CAAC,IAAI,WAAW,CAAC,OAAO,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,QAAQ,KAAK,GAAG;CAAE,CAAC;AAK5E,QAAA,MAAM,UAAU,kSAEd,CAAC;AACH,QAAA,MAAM,YAAY,EAAS,eAAe,CAAC,OAAO,UAAU,EAAE,WAAW,CAAC,CAAC;wBACtD,OAAO,YAAY;AAAxC,wBAAyC;AACzC,KAAK,eAAe,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG;IAChC,QAAO;QACN,MAAM,EAAE,CAAC,CAAC;KACV,CAAA;CACD,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
<script setup>
|
|
2
2
|
import { ref, computed, provide, onMounted, onUnmounted } from "vue";
|
|
3
3
|
import { injectMapoForm } from "../composables/useMapoForm.js";
|
|
4
|
+
import { isFieldRemoved, isFieldShown } from "../utils/tabVisibility.js";
|
|
4
5
|
import MapoFormField from "./MapoFormField.vue";
|
|
5
6
|
const props = defineProps({
|
|
6
7
|
fields: { type: Array, required: true }
|
|
@@ -9,6 +10,17 @@ defineSlots();
|
|
|
9
10
|
const form = injectMapoForm();
|
|
10
11
|
const model = computed(() => form?.model.value);
|
|
11
12
|
const currentLang = computed(() => form?.currentLang.value ?? "");
|
|
13
|
+
const predicateModel = computed(
|
|
14
|
+
() => model.value ?? {}
|
|
15
|
+
);
|
|
16
|
+
const keptFields = computed(
|
|
17
|
+
() => props.fields.filter((field) => !isFieldRemoved(field, predicateModel.value))
|
|
18
|
+
);
|
|
19
|
+
function isShown(field) {
|
|
20
|
+
return isFieldShown(field, predicateModel.value);
|
|
21
|
+
}
|
|
22
|
+
const hasKeptFields = computed(() => keptFields.value.length > 0);
|
|
23
|
+
const hasShownFields = computed(() => keptFields.value.some(isShown));
|
|
12
24
|
const expandedFieldKey = ref(null);
|
|
13
25
|
const expandedFieldLabel = computed(() => {
|
|
14
26
|
if (!expandedFieldKey.value) return "";
|
|
@@ -125,10 +137,16 @@ function colClass(cols) {
|
|
|
125
137
|
</Transition>
|
|
126
138
|
</Teleport>
|
|
127
139
|
|
|
128
|
-
<!-- Flat grid
|
|
129
|
-
|
|
140
|
+
<!-- Flat grid: not rendered while `visible` removes every field, hidden while
|
|
141
|
+
none of the others shows. -->
|
|
142
|
+
<div
|
|
143
|
+
v-if="hasKeptFields"
|
|
144
|
+
v-show="hasShownFields"
|
|
145
|
+
class="grid grid-cols-12 gap-5"
|
|
146
|
+
>
|
|
130
147
|
<div
|
|
131
|
-
v-for="field in
|
|
148
|
+
v-for="field in keptFields"
|
|
149
|
+
v-show="isShown(field)"
|
|
132
150
|
:key="field.key"
|
|
133
151
|
:class="colClass(field.cols)"
|
|
134
152
|
>
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MapoFormFlatSection.vue.d.ts","sourceRoot":"","sources":["../../../src/runtime/components/MapoFormFlatSection.vue"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"MapoFormFlatSection.vue.d.ts","sourceRoot":"","sources":["../../../src/runtime/components/MapoFormFlatSection.vue"],"names":[],"mappings":"AAwMA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAK5D,KAAK,WAAW,GAAG;IACjB,+CAA+C;IAC/C,MAAM,EAAE,kBAAkB,EAAE,CAAC;CAC9B,CAAC;AAGF,KAAK,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAkU3C,QAAA,MAAM,UAAU,kSAEd,CAAC;AACH,QAAA,MAAM,YAAY,EAAS,eAAe,CAAC,OAAO,UAAU,EAAE,WAAW,CAAC,CAAC;wBACtD,OAAO,YAAY;AAAxC,wBAAyC;AACzC,KAAK,eAAe,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG;IAChC,QAAO;QACN,MAAM,EAAE,CAAC,CAAC;KACV,CAAA;CACD,CAAC"}
|
|
@@ -1,30 +1,22 @@
|
|
|
1
1
|
<script setup>
|
|
2
|
-
import {
|
|
3
|
-
ref,
|
|
4
|
-
computed,
|
|
5
|
-
provide,
|
|
6
|
-
watchEffect,
|
|
7
|
-
onMounted,
|
|
8
|
-
onUnmounted
|
|
9
|
-
} from "vue";
|
|
2
|
+
import { ref, computed, provide, onMounted, onUnmounted } from "vue";
|
|
10
3
|
import { useRuntimeConfig } from "#app";
|
|
11
4
|
import { injectMapoForm } from "../composables/useMapoForm.js";
|
|
5
|
+
import {
|
|
6
|
+
isFieldRemoved,
|
|
7
|
+
isFieldShown,
|
|
8
|
+
pickActiveTab
|
|
9
|
+
} from "../utils/tabVisibility.js";
|
|
12
10
|
import MapoFormField from "./MapoFormField.vue";
|
|
13
11
|
const props = defineProps({
|
|
14
12
|
name: { type: String, required: true },
|
|
15
|
-
label: { type: String, required: false },
|
|
13
|
+
label: { type: String, required: false, default: void 0 },
|
|
16
14
|
fields: { type: Array, required: true },
|
|
17
|
-
subtabs: { type: Map, required: false },
|
|
18
|
-
initialExpanded: { type: Boolean, required: false }
|
|
15
|
+
subtabs: { type: Map, required: false, default: void 0 },
|
|
16
|
+
initialExpanded: { type: Boolean, required: false, default: void 0 }
|
|
19
17
|
});
|
|
20
18
|
const globalExpanded = useRuntimeConfig().public.mapoForm?.groups?.expanded ?? true;
|
|
21
19
|
const expanded = ref(props.initialExpanded ?? globalExpanded);
|
|
22
|
-
const activeSubtab = ref("");
|
|
23
|
-
watchEffect(() => {
|
|
24
|
-
if (props.subtabs && props.subtabs.size > 0 && !activeSubtab.value) {
|
|
25
|
-
activeSubtab.value = [...props.subtabs.keys()][0] ?? "";
|
|
26
|
-
}
|
|
27
|
-
});
|
|
28
20
|
const expandedFieldKey = ref(null);
|
|
29
21
|
function expandField(key) {
|
|
30
22
|
expandedFieldKey.value = key;
|
|
@@ -46,6 +38,36 @@ provide("mapoGroupExpand", { expandField, collapseField, expandedFieldKey });
|
|
|
46
38
|
const form = injectMapoForm();
|
|
47
39
|
const model = computed(() => form?.model.value);
|
|
48
40
|
const currentLang = computed(() => form?.currentLang.value ?? "");
|
|
41
|
+
const predicateModel = computed(
|
|
42
|
+
() => model.value ?? {}
|
|
43
|
+
);
|
|
44
|
+
function keptOf(fields) {
|
|
45
|
+
return fields.filter((field) => !isFieldRemoved(field, predicateModel.value));
|
|
46
|
+
}
|
|
47
|
+
function isShown(field) {
|
|
48
|
+
return isFieldShown(field, predicateModel.value);
|
|
49
|
+
}
|
|
50
|
+
const keptFields = computed(() => keptOf(props.fields));
|
|
51
|
+
const keptSubtabs = computed(
|
|
52
|
+
() => [...props.subtabs?.entries() ?? []].map(([name, fields]) => ({ name, fields: keptOf(fields) })).filter((subtab) => subtab.fields.length > 0)
|
|
53
|
+
);
|
|
54
|
+
const shownSubtabs = computed(
|
|
55
|
+
() => keptSubtabs.value.filter((subtab) => subtab.fields.some(isShown))
|
|
56
|
+
);
|
|
57
|
+
const hasKeptFlatFields = computed(() => keptFields.value.length > 0);
|
|
58
|
+
const hasKeptSubtabs = computed(() => keptSubtabs.value.length > 0);
|
|
59
|
+
const hasShownFlatFields = computed(() => keptFields.value.some(isShown));
|
|
60
|
+
const hasShownSubtabs = computed(() => shownSubtabs.value.length > 0);
|
|
61
|
+
const hasKeptFields = computed(
|
|
62
|
+
() => hasKeptFlatFields.value || hasKeptSubtabs.value
|
|
63
|
+
);
|
|
64
|
+
const hasShownFields = computed(
|
|
65
|
+
() => hasShownFlatFields.value || hasShownSubtabs.value
|
|
66
|
+
);
|
|
67
|
+
const pickedSubtab = ref(null);
|
|
68
|
+
const activeSubtab = computed(
|
|
69
|
+
() => pickActiveTab(shownSubtabs.value, pickedSubtab.value)
|
|
70
|
+
);
|
|
49
71
|
const COL_SPAN = {
|
|
50
72
|
1: "col-span-1",
|
|
51
73
|
2: "col-span-2",
|
|
@@ -143,8 +165,11 @@ function colClass(cols) {
|
|
|
143
165
|
</Transition>
|
|
144
166
|
</Teleport>
|
|
145
167
|
|
|
146
|
-
<!-- Regular group
|
|
168
|
+
<!-- Regular group: not rendered while `visible` removes all its fields,
|
|
169
|
+
hidden while none of the others shows. -->
|
|
147
170
|
<div
|
|
171
|
+
v-if="hasKeptFields"
|
|
172
|
+
v-show="hasShownFields"
|
|
148
173
|
class="mapo-form-group relative overflow-hidden rounded-xl border border-gray-200 bg-white shadow-sm"
|
|
149
174
|
>
|
|
150
175
|
<!-- Collapsible heading -->
|
|
@@ -164,14 +189,17 @@ function colClass(cols) {
|
|
|
164
189
|
|
|
165
190
|
<!-- Body -->
|
|
166
191
|
<div v-if="expanded">
|
|
167
|
-
<!-- Flat fields (no subtab)
|
|
192
|
+
<!-- Flat fields (no subtab); the sub-tab area below brings its own top
|
|
193
|
+
padding. -->
|
|
168
194
|
<div
|
|
169
|
-
v-if="
|
|
170
|
-
|
|
171
|
-
|
|
195
|
+
v-if="hasKeptFlatFields"
|
|
196
|
+
v-show="hasShownFlatFields"
|
|
197
|
+
class="grid grid-cols-12 gap-5 px-5 pt-4"
|
|
198
|
+
:class="hasShownSubtabs ? 'pb-0' : 'pb-5'"
|
|
172
199
|
>
|
|
173
200
|
<div
|
|
174
|
-
v-for="field in
|
|
201
|
+
v-for="field in keptFields"
|
|
202
|
+
v-show="isShown(field)"
|
|
175
203
|
:key="field.key"
|
|
176
204
|
:class="colClass(field.cols)"
|
|
177
205
|
>
|
|
@@ -191,32 +219,39 @@ function colClass(cols) {
|
|
|
191
219
|
</div>
|
|
192
220
|
|
|
193
221
|
<!-- Sub-tab bar + content (when subtabs are present) -->
|
|
194
|
-
<div
|
|
222
|
+
<div
|
|
223
|
+
v-if="hasKeptSubtabs"
|
|
224
|
+
v-show="hasShownSubtabs"
|
|
225
|
+
class="px-5 pb-5 pt-4"
|
|
226
|
+
>
|
|
195
227
|
<!-- Sub-tab bar -->
|
|
196
|
-
<div
|
|
228
|
+
<div
|
|
229
|
+
class="mapo-form-subtab-bar mb-4 flex flex-wrap gap-1 border-b border-gray-200"
|
|
230
|
+
>
|
|
197
231
|
<button
|
|
198
|
-
v-for="
|
|
199
|
-
:key="
|
|
232
|
+
v-for="subtab in shownSubtabs"
|
|
233
|
+
:key="subtab.name"
|
|
200
234
|
type="button"
|
|
201
235
|
class="relative max-w-full px-3 py-1.5 text-sm font-medium transition-colors focus:outline-none"
|
|
202
236
|
:class="[
|
|
203
|
-
activeSubtab ===
|
|
237
|
+
activeSubtab === subtab.name ? 'text-primary-600 border-b-2 border-primary-600 -mb-px' : 'text-gray-500 hover:text-gray-700'
|
|
204
238
|
]"
|
|
205
|
-
@click="
|
|
239
|
+
@click="pickedSubtab = subtab.name"
|
|
206
240
|
>
|
|
207
|
-
{{
|
|
241
|
+
{{ subtab.name }}
|
|
208
242
|
</button>
|
|
209
243
|
</div>
|
|
210
244
|
|
|
211
245
|
<!-- Sub-tab fields -->
|
|
212
246
|
<div
|
|
213
|
-
v-for="
|
|
214
|
-
v-show="activeSubtab ===
|
|
215
|
-
:key="
|
|
247
|
+
v-for="subtab in keptSubtabs"
|
|
248
|
+
v-show="activeSubtab === subtab.name"
|
|
249
|
+
:key="subtab.name"
|
|
216
250
|
class="grid grid-cols-12 gap-5"
|
|
217
251
|
>
|
|
218
252
|
<div
|
|
219
|
-
v-for="field in
|
|
253
|
+
v-for="field in subtab.fields"
|
|
254
|
+
v-show="isShown(field)"
|
|
220
255
|
:key="field.key"
|
|
221
256
|
:class="colClass(field.cols)"
|
|
222
257
|
>
|
|
@@ -1,22 +1,33 @@
|
|
|
1
1
|
import type { AnyFieldDescriptor } from "../types/index.js";
|
|
2
2
|
type __VLS_Props = {
|
|
3
|
+
/** Group identifier; the heading shows it when `label` is not set. */
|
|
3
4
|
name: string;
|
|
5
|
+
/** Heading of the group card. */
|
|
4
6
|
label?: string;
|
|
7
|
+
/** Fields of the group outside any sub-tab, in a 12-column grid. */
|
|
5
8
|
fields: AnyFieldDescriptor[];
|
|
9
|
+
/**
|
|
10
|
+
* Sub-tab name → its fields, shown as a tab bar inside the card. A sub-tab
|
|
11
|
+
* with no field to show leaves the bar.
|
|
12
|
+
*/
|
|
6
13
|
subtabs?: Map<string, AnyFieldDescriptor[]>;
|
|
14
|
+
/**
|
|
15
|
+
* Whether the group starts expanded. When omitted, the module option
|
|
16
|
+
* `groups.expanded` decides (`true` unless configured).
|
|
17
|
+
*/
|
|
7
18
|
initialExpanded?: boolean;
|
|
8
19
|
};
|
|
9
20
|
declare var __VLS_19: `field.${string}`, __VLS_20: {
|
|
10
21
|
field: AnyFieldDescriptor;
|
|
11
|
-
model:
|
|
22
|
+
model: Record<string, unknown> | undefined;
|
|
12
23
|
currentLang: string;
|
|
13
24
|
}, __VLS_30: string, __VLS_31: any, __VLS_39: `field.${string}`, __VLS_40: {
|
|
14
25
|
field: AnyFieldDescriptor;
|
|
15
|
-
model:
|
|
26
|
+
model: Record<string, unknown> | undefined;
|
|
16
27
|
currentLang: string;
|
|
17
28
|
}, __VLS_50: string, __VLS_51: any, __VLS_54: `field.${string}`, __VLS_55: {
|
|
18
29
|
field: AnyFieldDescriptor;
|
|
19
|
-
model:
|
|
30
|
+
model: Record<string, unknown> | undefined;
|
|
20
31
|
currentLang: string;
|
|
21
32
|
}, __VLS_65: string, __VLS_66: any;
|
|
22
33
|
type __VLS_Slots = {} & {
|
|
@@ -32,7 +43,11 @@ type __VLS_Slots = {} & {
|
|
|
32
43
|
} & {
|
|
33
44
|
[K in NonNullable<typeof __VLS_65>]?: (props: typeof __VLS_66) => any;
|
|
34
45
|
};
|
|
35
|
-
declare const __VLS_base: import("vue").DefineComponent<__VLS_Props, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {
|
|
46
|
+
declare const __VLS_base: import("vue").DefineComponent<__VLS_Props, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {
|
|
47
|
+
label: string;
|
|
48
|
+
subtabs: Map<string, AnyFieldDescriptor[]>;
|
|
49
|
+
initialExpanded: boolean;
|
|
50
|
+
}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
|
|
36
51
|
declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;
|
|
37
52
|
declare const _default: typeof __VLS_export;
|
|
38
53
|
export default _default;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MapoFormGroup.vue.d.ts","sourceRoot":"","sources":["../../../src/runtime/components/MapoFormGroup.vue"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"MapoFormGroup.vue.d.ts","sourceRoot":"","sources":["../../../src/runtime/components/MapoFormGroup.vue"],"names":[],"mappings":"AAyWA,OAAO,KAAK,EACV,kBAAkB,EAEnB,MAAM,mBAAmB,CAAC;AAY3B,KAAK,WAAW,GAAG;IACf,sEAAsE;IACtE,IAAI,EAAE,MAAM,CAAC;IACb,iCAAiC;IACjC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,oEAAoE;IACpE,MAAM,EAAE,kBAAkB,EAAE,CAAC;IAC7B;;;OAGG;IACH,OAAO,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,EAAE,CAAC,CAAC;IAC5C;;;OAGG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,CAAC;AAuhBJ,QAAA,IAAI,QAAQ,mBAAW,EAAE,QAAQ;;;;CAAW,EAAE,QAAQ,QAAW,EAAE,QAAQ,KAAW,EAAE,QAAQ,mBAAW,EAAE,QAAQ;;;;CAAW,EAAE,QAAQ,QAAW,EAAE,QAAQ,KAAW,EAAE,QAAQ,mBAAW,EAAE,QAAQ;;;;CAAW,EAAE,QAAQ,QAAW,EAAE,QAAQ,KAAY,CAAE;AACjQ,KAAK,WAAW,GAAG,EAAE,GACnB;KAAG,CAAC,IAAI,WAAW,CAAC,OAAO,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,QAAQ,KAAK,GAAG;CAAE,GACzE;KAAG,CAAC,IAAI,WAAW,CAAC,OAAO,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,QAAQ,KAAK,GAAG;CAAE,GACzE;KAAG,CAAC,IAAI,WAAW,CAAC,OAAO,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,QAAQ,KAAK,GAAG;CAAE,GACzE;KAAG,CAAC,IAAI,WAAW,CAAC,OAAO,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,QAAQ,KAAK,GAAG;CAAE,GACzE;KAAG,CAAC,IAAI,WAAW,CAAC,OAAO,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,QAAQ,KAAK,GAAG;CAAE,GACzE;KAAG,CAAC,IAAI,WAAW,CAAC,OAAO,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,QAAQ,KAAK,GAAG;CAAE,CAAC;AAG5E,QAAA,MAAM,UAAU;WA9iBJ,MAAM;aAOJ,GAAG,CAAC,MAAM,EAAE,kBAAkB,EAAE,CAAC;qBAKzB,OAAO;6EAqiB3B,CAAC;AACH,QAAA,MAAM,YAAY,EAAS,eAAe,CAAC,OAAO,UAAU,EAAE,WAAW,CAAC,CAAC;wBACtD,OAAO,YAAY;AAAxC,wBAAyC;AAWzC,KAAK,eAAe,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG;IAChC,QAAO;QACN,MAAM,EAAE,CAAC,CAAC;KACV,CAAA;CACD,CAAC"}
|
|
@@ -3,6 +3,7 @@ import { ref, computed, watch, watchEffect } from "vue";
|
|
|
3
3
|
import { useI18n } from "vue-i18n";
|
|
4
4
|
import { useMapoForm, injectMapoForm } from "../../composables/useMapoForm.js";
|
|
5
5
|
import { useFocusMode } from "../../composables/useFocusMode.js";
|
|
6
|
+
import { isFieldRemoved, isFieldShown } from "../../utils/tabVisibility.js";
|
|
6
7
|
import MapoFormField from "../MapoFormField.vue";
|
|
7
8
|
const { t } = useI18n();
|
|
8
9
|
const props = defineProps({
|
|
@@ -73,6 +74,14 @@ watchEffect(() => {
|
|
|
73
74
|
form.readonly.value = props.readonly;
|
|
74
75
|
if (parentCtx) form.ctx.submitted.value = parentCtx.submitted.value;
|
|
75
76
|
});
|
|
77
|
+
const keptFields = computed(
|
|
78
|
+
() => props.fields.filter((field) => !isFieldRemoved(field, localModel.value))
|
|
79
|
+
);
|
|
80
|
+
function isShown(field) {
|
|
81
|
+
return isFieldShown(field, localModel.value);
|
|
82
|
+
}
|
|
83
|
+
const hasKeptFields = computed(() => keptFields.value.length > 0);
|
|
84
|
+
const hasShownFields = computed(() => keptFields.value.some(isShown));
|
|
76
85
|
const label = computed(
|
|
77
86
|
() => props.previewLabel?.(localModel.value, props.index) ?? `Item ${props.index + 1}`
|
|
78
87
|
);
|
|
@@ -83,6 +92,8 @@ const isCompressed = computed(() => {
|
|
|
83
92
|
const hasMiniCard = !!miniCardAttrs.value?.miniCard;
|
|
84
93
|
return hasMiniCard && (props.totalItems ?? 0) >= threshold;
|
|
85
94
|
});
|
|
95
|
+
const isOpen = computed(() => expanded.value && !isCompressed.value);
|
|
96
|
+
const rendersBody = computed(() => isOpen.value && hasKeptFields.value);
|
|
86
97
|
const miniCard = computed(
|
|
87
98
|
() => miniCardAttrs.value?.miniCard?.(localModel.value, props.index)
|
|
88
99
|
);
|
|
@@ -332,9 +343,14 @@ function enterFocusMode() {
|
|
|
332
343
|
|
|
333
344
|
<!-- ── Item body (fields) ──────────────────────────────────────────────── -->
|
|
334
345
|
<!-- COL_SPAN: Tailwind v4 requires static classes — do not use dynamic template literals. -->
|
|
335
|
-
<div
|
|
346
|
+
<div
|
|
347
|
+
v-if="rendersBody"
|
|
348
|
+
v-show="hasShownFields"
|
|
349
|
+
class="grid grid-cols-12 gap-5 p-4"
|
|
350
|
+
>
|
|
336
351
|
<div
|
|
337
|
-
v-for="field in
|
|
352
|
+
v-for="field in keptFields"
|
|
353
|
+
v-show="isShown(field)"
|
|
338
354
|
:key="field.key"
|
|
339
355
|
:class="{
|
|
340
356
|
'col-span-1': field.cols === 1,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MapoRepeaterItem.vue.d.ts","sourceRoot":"","sources":["../../../../src/runtime/components/fields/MapoRepeaterItem.vue"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"MapoRepeaterItem.vue.d.ts","sourceRoot":"","sources":["../../../../src/runtime/components/fields/MapoRepeaterItem.vue"],"names":[],"mappings":"AAgdA,OAAO,KAAK,EACV,kBAAkB,EAClB,aAAa,EACb,kBAAkB,EACnB,MAAM,sBAAsB,CAAC;AAQ9B,KAAK,WAAW,GAAG;IACjB,iEAAiE;IACjE,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9B,MAAM,EAAE,kBAAkB,EAAE,CAAC;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IACvC,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,EAAE,aAAa,CAAC;IACxB,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;IACxD,eAAe,EAAE,OAAO,CAAC;IACzB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,wEAAwE;IACxE,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,kFAAkF;IAClF,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iDAAiD;IACjD,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,mEAAmE;IACnE,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,8EAA8E;IAC9E,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,mCAAmC;IACnC,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AA82BF,QAAA,IAAI,QAAQ,IAAY,CAAE;AAC1B,KAAK,WAAW,GAAG,EAAE,GACnB;IAAE,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,QAAQ,KAAK,GAAG,CAAA;CAAE,CAAC;AAKhD,QAAA,MAAM,UAAU;;;;;;;;;;;;;;;;kFAGd,CAAC;AACH,QAAA,MAAM,YAAY,EAAS,eAAe,CAAC,OAAO,UAAU,EAAE,WAAW,CAAC,CAAC;wBACtD,OAAO,YAAY;AAAxC,wBAAyC;AACzC,KAAK,eAAe,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG;IAChC,QAAO;QACN,MAAM,EAAE,CAAC,CAAC;KACV,CAAA;CACD,CAAC"}
|