@vc-shell/framework 1.0.160 → 1.0.163

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vc-shell/framework",
-  "version": "1.0.160",
+  "version": "1.0.163",
   "type": "module",
   "main": "./dist/framework.js",
   "types": "./dist/index.d.ts",
@@ -53,9 +53,9 @@
     "whatwg-fetch": "^3.6.19"
   },
   "devDependencies": {
-    "@vc-shell/api-client-generator": "^1.0.160",
-    "@vc-shell/config-generator": "^1.0.160",
-    "@vc-shell/ts-config": "^1.0.160",
+    "@vc-shell/api-client-generator": "^1.0.163",
+    "@vc-shell/config-generator": "^1.0.163",
+    "@vc-shell/ts-config": "^1.0.163",
     "@vitejs/plugin-vue": "^5.0.3",
     "sass": "^1.69.6",
     "typescript": "^5.3.3",

package/shared/modules/dynamic/components/factories.ts

@@ -52,6 +52,7 @@ export const ControlBaseProps = ({
   name = undefined,
   tooltip = undefined,
   key = undefined,
+  classNames = undefined,
   ...rest
 }: IControlBaseProps): IControlBaseProps => ({
   key,
@@ -62,6 +63,7 @@ export const ControlBaseProps = ({
   required,
   name,
   tooltip,
+  classNames,
   ...rest,
 });
 

package/shared/modules/dynamic/components/fields/Button.ts

@@ -24,6 +24,9 @@ export default {
             },
           },
           unrefNested(props.baseProps),
+          {
+            class: unrefNested(props.baseProps).classNames ?? "",
+          },
         ),
         slots: {
           default: () => unref(computed(() => t(props.element.content))),

package/shared/modules/dynamic/components/fields/Card.ts

@@ -63,6 +63,9 @@ export default {
             "onState:collapsed": (e: boolean) => handleCollapsed(props.element.id, e),
           },
           unrefNested(props.baseProps),
+          {
+            class: unrefNested(props.baseProps).classNames ?? "",
+          },
         ),
 
         slots: {

package/shared/modules/dynamic/components/fields/Checkbox.ts

@@ -22,6 +22,9 @@ export default {
             falseValue: props.element.falseValue,
           },
           unrefNested(props.baseProps),
+          {
+            class: unrefNested(props.baseProps).classNames ?? "",
+          },
         ),
         slots: {
           default: () =>

package/shared/modules/dynamic/components/fields/ContentField.ts

@@ -18,6 +18,9 @@ export default {
             orientation: props.element.orientation,
           },
           unrefNested(props.baseProps),
+          {
+            class: unrefNested(props.baseProps).classNames ?? "",
+          },
         ),
       });
 

package/shared/modules/dynamic/components/fields/CustomComponent.ts

@@ -1,6 +1,7 @@
 import { CustomComponentSchema } from "./../../types";
 import { ExtractPropTypes, resolveComponent, h } from "vue";
 import componentProps from "./props";
+import { unrefNested } from "../../helpers/unrefNested";
 
 export default {
   name: "CustomComponentRenderer",
@@ -10,9 +11,18 @@ export default {
       const component = resolveComponent(props.element?.name);
 
       return typeof component === "object"
-        ? h(component, {
-            context: props.bladeContext,
-          })
+        ? h(
+            component,
+            Object.assign(
+              {},
+              {
+                context: props.bladeContext,
+              },
+              {
+                class: unrefNested(props.baseProps).classNames ?? "",
+              },
+            ),
+          )
         : null;
     };
   },

package/shared/modules/dynamic/components/fields/DynamicProperty.ts

@@ -122,7 +122,14 @@ export default {
 
     return () => {
       return properties && properties.length
-        ? properties?.map((field) => h(field.component as Component, unrefNested(field.props)))
+        ? properties?.map((field) =>
+            h(
+              field.component as Component,
+              Object.assign(unrefNested(field.props), {
+                class: unrefNested(props.baseProps).classNames ?? "",
+              }),
+            ),
+          )
         : null;
     };
   },

package/shared/modules/dynamic/components/fields/EditorField.ts

@@ -17,6 +17,9 @@ export default {
             assetsFolder: unref(props.formData).id || unref(props.formData).categoryId,
           },
           unrefNested(props.baseProps),
+          {
+            class: unrefNested(props.baseProps).classNames ?? "",
+          },
         ),
       });
 

package/shared/modules/dynamic/components/fields/Fieldset.ts

@@ -3,6 +3,7 @@ import componentProps from "./props";
 import * as _ from "lodash-es";
 import { VcButton, VcCol, VcRow } from "../../../../../ui/components";
 import { FieldsetSchema } from "../../types";
+import { unrefNested } from "../../helpers/unrefNested";
 
 export default {
   name: "Fieldset",
@@ -19,7 +20,7 @@ export default {
         return h(
           "div",
           {
-            class: "tw-flex tw-row tw-relative",
+            class: `tw-flex tw-row tw-relative ${unrefNested(props.baseProps).classNames ?? ""}`,
             key: `fieldset-${index}`,
           },
           [

package/shared/modules/dynamic/components/fields/GalleryField.ts

@@ -134,6 +134,9 @@ export default {
             hideAfterUpload: props.element.hideAfterUpload,
           },
           unrefNested(props.baseProps),
+          {
+            class: unrefNested(props.baseProps).classNames ?? "",
+          },
         ),
       });
 

package/shared/modules/dynamic/components/fields/ImageField.ts

@@ -22,6 +22,9 @@ export default {
             background: props.element.background,
           },
           unrefNested(props.baseProps),
+          {
+            class: unrefNested(props.baseProps).classNames ?? "",
+          },
         ),
       });
 

package/shared/modules/dynamic/components/fields/InputCurrency.ts

@@ -33,6 +33,9 @@ export default {
             clearable: props.element.clearable || false,
           },
           unrefNested(props.baseProps),
+          {
+            class: unrefNested(props.baseProps).classNames ?? "",
+          },
         ),
       });
       const render = h(field.component as Component, field.props);

package/shared/modules/dynamic/components/fields/InputField.ts

@@ -27,6 +27,9 @@ export default {
             clearable: props.element.clearable || false,
           },
           unrefNested(props.baseProps),
+          {
+            class: unrefNested(props.baseProps).classNames ?? "",
+          },
         ),
         slots: Object.entries(slotsMap).reduce(
           (acc, [key, value]) => {

package/shared/modules/dynamic/components/fields/MultivalueField.ts

@@ -26,6 +26,9 @@ export default {
             currentLanguage: props.currentLocale,
           },
           unrefNested(props.baseProps),
+          {
+            class: unrefNested(props.baseProps).classNames ?? "",
+          },
         ),
 
         slots:

package/shared/modules/dynamic/components/fields/RatingField.ts

@@ -16,6 +16,9 @@ export default {
             variant: props.element.type,
           },
           unrefNested(props.baseProps),
+          {
+            class: unrefNested(props.baseProps).classNames ?? "",
+          },
         ),
       });
 

package/shared/modules/dynamic/components/fields/SelectField.ts

@@ -29,6 +29,9 @@ export default {
             searchable: props.element.searchable || false,
           },
           unrefNested(props.baseProps),
+          {
+            class: unrefNested(props.baseProps).classNames ?? "",
+          },
         ),
 
         slots:

package/shared/modules/dynamic/components/fields/StatusField.ts

@@ -33,6 +33,9 @@ export default {
             extend: props.element.extend,
           },
           unrefNested(props.baseProps),
+          {
+            class: unrefNested(props.baseProps).classNames ?? "",
+          },
         ),
         slots: {
           default: () => {

package/shared/modules/dynamic/components/fields/SwitchField.ts

@@ -17,6 +17,9 @@ export default {
             falseValue: props.element.falseValue,
           },
           unrefNested(props.baseProps),
+          {
+            class: unrefNested(props.baseProps).classNames ?? "",
+          },
         ),
       });
 

package/shared/modules/dynamic/components/fields/Table.ts

@@ -27,9 +27,7 @@ export default {
             columns: props.element.columns?.map((col) => ({ ...col, title: computed(() => t(col.title)) })),
             items: unrefNested(props.baseProps).modelValue ?? [],
             stateKey: props.element.id,
-            class: {
-              "!tw-flex-auto": true,
-            },
+            class: `!tw-flex-auto ${unrefNested(props.baseProps).classNames ?? ""}`,
           },
           unrefNested(props.baseProps),
         ),

package/shared/modules/dynamic/components/fields/TextareaField.ts

@@ -18,6 +18,9 @@ export default {
             clearable: props.element.clearable || false,
           },
           unrefNested(props.baseProps),
+          {
+            class: unrefNested(props.baseProps).classNames ?? "",
+          },
         ),
       });
 

package/shared/modules/dynamic/components/fields/VideoField.ts

@@ -17,6 +17,9 @@ export default {
             size: props.element.size,
           },
           unrefNested(props.baseProps),
+          {
+            class: unrefNested(props.baseProps).classNames ?? "",
+          },
         ),
       });
 

package/shared/modules/dynamic/composables/useFilterBuilder/index.ts

@@ -1,3 +1,4 @@
+import { toReactive, createUnrefFn } from "@vueuse/core";
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import {
   h,
@@ -19,7 +20,6 @@ import * as _ from "lodash-es";
 import { Checkbox, InputField } from "../../components/factories";
 import { AsyncAction } from "../../../../../core/composables";
 import { VcButton, VcCol, VcContainer, VcRow } from "../../../../../ui/components";
-import { createUnrefFn } from "@vueuse/core";
 import { useI18n } from "vue-i18n";
 import { FilterBase, FilterCheckbox, FilterDateInput } from "../../types";
 
@@ -163,14 +163,14 @@ export default <Query>(args: {
   }
 
   async function applyFilters(filterHandlerFn: () => void) {
+    appliedFilter.value = {
+      ...filter.value,
+    };
     filterHandlerFn();
     await _search({
       ...unref(args.query),
       ...filter.value,
     });
-    appliedFilter.value = {
-      ...filter.value,
-    };
   }
 
   async function resetFilters(filterHandlerFn: () => void) {
@@ -190,9 +190,7 @@ export default <Query>(args: {
       VcContainer,
       {
         onVnodeBeforeMount: () => {
-          if (Object.keys(appliedFilter.value).length) {
-            filter.value = _.cloneDeep(appliedFilter.value);
-          }
+          filter.value = { ...appliedFilter.value };
         },
       },
       () => [
@@ -253,7 +251,7 @@ export default <Query>(args: {
   return {
     filterComponent: render,
     activeFilterCount,
-    filter: readonly(filter.value),
+    filter: readonly(toReactive(filter)),
     isFilterVisible: computed(() => isFilterVisible.value),
     reset,
   };

package/shared/modules/dynamic/helpers/nodeBuilder.ts

@@ -118,7 +118,7 @@ function nodeBuilder<
     "onUpdate:modelValue": onUpdateModelValue,
     tooltip: computed(() => (tooltip ? t(tooltip) : undefined)),
     multilanguage,
-    class:
+    classNames:
       "horizontalSeparator" in controlSchema && controlSchema.horizontalSeparator
         ? "tw-border-b tw-border-solid tw-border-b-[#e5e5e5] tw-mb-[5px] tw-pb-[21px]"
         : "",

package/shared/modules/dynamic/types/models.ts

@@ -77,6 +77,7 @@ export interface IControlBaseProps {
   tooltip?: string;
   "onUpdate:modelValue"?: (event: any) => void;
   multilanguage?: boolean;
+  classNames?: string;
 }
 
 export type WithRequiredProperty<Type, Key extends keyof Type> = Type & {