@vc-shell/framework 1.0.52 → 1.0.54

package/ui/components/organisms/vc-dynamic-property/vc-dynamic-property.vue

@@ -1,10 +1,9 @@
 <template>
   <Field
-    v-if="
-      (property.dictionary || property.isDictionary) && !property.multivalue
-    "
+    v-if="(property['dictionary'] || property['isDictionary']) && !property['multivalue']"
     v-slot="{ errorMessage, handleChange, errors }"
-    :name="property.displayName || property.name"
+    :label="handleDisplayName || property['displayName']"
+    :name="property['displayName'] || property['name']"
     :modelValue="getter(property, true)"
     :rules="rules"
   >
@@ -12,7 +11,7 @@
       v-bind="$attrs"
       :error="!!errors.length"
       :error-message="errorMessage"
-      :label="handleDisplayName || property.displayName"
+      :label="handleDisplayName || property['displayName']"
       :modelValue="getter(property, true)"
       @update:modelValue="
         (e) => {
@@ -20,8 +19,8 @@
           setter(property, e, items);
         }
       "
-      :required="property.required || property.isRequired"
-      :placeholder="handleDisplayName || property.defaultValue"
+      :required="property['required'] || property['isRequired']"
+      :placeholder="handleDisplayName || property['defaultValue']"
       :options="items"
       option-value="id"
       :option-label="handleDisplayProperty"
@@ -34,70 +33,76 @@
 
   <Field
     v-else-if="
-      property.valueType === 'ShortText' &&
-      property.multivalue &&
-      !(property.dictionary || property.isDictionary)
+      property['valueType'] === 'ShortText' &&
+      property['multivalue'] &&
+      !(property['dictionary'] || property['isDictionary'])
     "
-    v-slot="{ errorMessage, handleChange }"
-    :name="property.name"
-    :modelValue="property.values"
+    v-slot="{ errorMessage, handleChange, errors }"
+    :label="handleDisplayName"
+    :name="property['name']"
+    :modelValue="property['values']"
     :rules="rules"
   >
-    <VcMultivalue
+    <VcSelect
       v-bind="$attrs"
+      :error="!!errors.length"
       :error-message="errorMessage"
       :label="handleDisplayName"
-      :modelValue="property.values"
+      :modelValue="property['values']"
       @update:modelValue="
         (e) => {
           handleChange(e);
           setter(property, e);
         }
       "
-      :required="property.required || property.isRequired"
+      :required="property['required'] || property['isRequired']"
       placeholder="Add value"
       :disabled="disabled"
-    ></VcMultivalue>
+      :multiple="true"
+    ></VcSelect>
   </Field>
 
   <Field
     v-else-if="
-      property.valueType === 'ShortText' &&
-      property.multivalue &&
-      (property.dictionary || property.isDictionary)
+      property['valueType'] === 'ShortText' &&
+      property['multivalue'] &&
+      (property['dictionary'] || property['isDictionary'])
     "
-    v-slot="{ errorMessage, handleChange }"
-    :name="property.name"
-    :modelValue="property.values"
+    v-slot="{ errorMessage, handleChange, errors }"
+    :label="handleDisplayName"
+    :name="property['name']"
+    :modelValue="property['values']"
     :rules="rules"
   >
-    <VcMultivalue
+    <VcSelect
       v-bind="$attrs"
+      :error="!!errors.length"
       :error-message="errorMessage"
       :label="handleDisplayName"
-      :modelValue="property.values"
+      :modelValue="property['values']"
       @update:modelValue="
         (e) => {
           handleChange(e);
           setter(property, e, items);
         }
       "
-      :required="property.required || property.isRequired"
+      :required="property['required'] || property['isRequired']"
       placeholder="Add value"
-      :multivalue="property.multivalue"
       :disabled="disabled"
       :options="items"
-      keyProperty="id"
-      displayProperty="alias"
+      option-label="alias"
+      option-value="id"
       @search="onSearch"
       @close="onClose"
-    ></VcMultivalue>
+      :multiple="property['multivalue']"
+    ></VcSelect>
   </Field>
 
   <Field
-    v-else-if="property.valueType === 'ShortText'"
+    v-else-if="property['valueType'] === 'ShortText'"
     v-slot="{ errorMessage, handleChange, errors }"
-    :name="property.displayName || property.name"
+    :label="handleDisplayName || property['displayName']"
+    :name="property['displayName'] || property['name']"
     :modelValue="getter(property)"
     :rules="rules"
   >
@@ -105,8 +110,8 @@
       v-bind="$attrs"
       :error="!!errors.length"
       :error-message="errorMessage"
-      :label="handleDisplayName || property.displayName"
-      :modelValue="getter(property)"
+      :label="handleDisplayName || property['displayName']"
+      :modelValue="(getter(property) as string | number | Date)"
       @update:modelValue="
         (e) => {
           handleChange(e);
@@ -114,23 +119,24 @@
         }
       "
       clearable
-      :required="property.required || property.isRequired"
+      :required="property['required'] || property['isRequired']"
       :placeholder="handleDisplayName || 'Add value'"
       :disabled="disabled"
     ></VcInput>
   </Field>
 
   <Field
-    v-else-if="property.valueType === 'Number' && property.multivalue"
+    v-else-if="property['valueType'] === 'Number' && property['multivalue']"
     v-slot="{ errorMessage, handleChange, errors }"
-    :name="property.name"
-    :modelValue="property.values"
+    :label="handleDisplayName"
+    :name="property['name']"
+    :modelValue="property['values']"
     :rules="rules"
   >
     <VcSelect
       v-bind="$attrs"
       :label="handleDisplayName"
-      :modelValue="property.values"
+      :modelValue="property['values']"
       @update:modelValue="
         (e) => {
           handleChange(e);
@@ -138,7 +144,7 @@
         }
       "
       type="number"
-      :required="property.required || property.isRequired"
+      :required="property['required'] || property['isRequired']"
       placeholder="Add value"
       :disabled="disabled"
       :error="!!errors.length"
@@ -151,9 +157,10 @@
   </Field>
 
   <Field
-    v-else-if="property.valueType === 'Number'"
+    v-else-if="property['valueType'] === 'Number'"
     v-slot="{ errorMessage, handleChange, errors }"
-    :name="property.name"
+    :label="handleDisplayName"
+    :name="property['name']"
     :modelValue="getter(property)"
     :rules="rules"
   >
@@ -162,7 +169,7 @@
       :error="!!errors.length"
       :error-message="errorMessage"
       :label="handleDisplayName"
-      :modelValue="getter(property)"
+      :modelValue="(getter(property) as string | number | Date)"
       @update:modelValue="
         (e) => {
           handleChange(e);
@@ -171,16 +178,17 @@
       "
       clearable
       type="number"
-      :required="property.required || property.isRequired"
-      :placeholder="handleDisplayName || property.defaultValue"
+      :required="property['required'] || property['isRequired']"
+      :placeholder="handleDisplayName || property['defaultValue']"
       :disabled="disabled"
     ></VcInput>
   </Field>
 
   <Field
-    v-else-if="property.valueType === 'Integer'"
+    v-else-if="property['valueType'] === 'Integer'"
     v-slot="{ errorMessage, handleChange, errors }"
-    :name="property.name"
+    :label="handleDisplayName"
+    :name="property['name']"
     :modelValue="getter(property)"
     :rules="rules"
   >
@@ -189,7 +197,7 @@
       :error="!!errors.length"
       :error-message="errorMessage"
       :label="handleDisplayName"
-      :modelValue="getter(property)"
+      :modelValue="(getter(property) as string | number | Date)"
       @update:modelValue="
         (e) => {
           handleChange(e);
@@ -199,16 +207,17 @@
       clearable
       type="number"
       step="1"
-      :required="property.required || property.isRequired"
-      :placeholder="handleDisplayName || property.defaultValue"
+      :required="property['required'] || property['isRequired']"
+      :placeholder="handleDisplayName || property['defaultValue']"
       :disabled="disabled"
     ></VcInput>
   </Field>
 
   <Field
-    v-else-if="property.valueType === 'DateTime'"
+    v-else-if="property['valueType'] === 'DateTime'"
     v-slot="{ errorMessage, handleChange, errors }"
-    :name="property.name"
+    :label="handleDisplayName"
+    :name="property['name']"
     :modelValue="getter(property)"
     :rules="rules"
   >
@@ -217,7 +226,7 @@
       :error="!!errors.length"
       :error-message="errorMessage"
       :label="handleDisplayName"
-      :modelValue="getter(property)"
+      :modelValue="(getter(property) as string | number | Date)"
       @update:modelValue="
         (e) => {
           handleChange(e);
@@ -225,16 +234,17 @@
         }
       "
       type="datetime-local"
-      :required="property.required || property.isRequired"
-      :placeholder="handleDisplayName || property.defaultValue"
+      :required="property['required'] || property['isRequired']"
+      :placeholder="handleDisplayName || property['defaultValue']"
       :disabled="disabled"
     ></VcInput>
   </Field>
 
   <Field
-    v-else-if="property.valueType === 'LongText'"
+    v-else-if="property['valueType'] === 'LongText'"
     v-slot="{ errorMessage, handleChange }"
-    :name="property.name"
+    :label="handleDisplayName"
+    :name="property['name']"
     :modelValue="getter(property)"
     :rules="rules"
   >
@@ -242,65 +252,67 @@
       v-bind="$attrs"
       :error-message="errorMessage"
       :label="handleDisplayName"
-      :modelValue="getter(property)"
+      :modelValue="getter(property) as string"
       @update:modelValue="
         (e) => {
           handleChange(e);
           setter(property, e);
         }
       "
-      :isRequired="property.required || property.isRequired"
-      :placeholder="handleDisplayName || property.defaultValue"
+      :required="property['required'] || property['isRequired']"
+      :placeholder="handleDisplayName || property['defaultValue']"
       :disabled="disabled"
     ></VcTextarea>
   </Field>
 
   <Field
-    v-else-if="property.valueType === 'Boolean'"
+    v-else-if="property['valueType'] === 'Boolean'"
     v-slot="{ errorMessage, handleChange }"
-    :name="property.displayName || property.name"
+    :label="handleDisplayName || property['displayName']"
+    :name="property['displayName'] || property['name']"
     :modelValue="getter(property)"
     :rules="rules"
   >
     <VcCheckbox
       v-bind="$attrs"
       :error-message="errorMessage"
-      :modelValue="getter(property)"
+      :modelValue="getter(property) as boolean"
       @update:modelValue="
         (e) => {
           handleChange(e);
           setter(property, e);
         }
       "
-      :required="property.required || property.isRequired"
+      :required="property['required'] || property['isRequired']"
       :disabled="disabled"
-      :name="property.displayName || property.name"
+      :name="property['displayName'] || property['name']"
     >
-      {{ handleDisplayName || property.displayName }}
+      {{ handleDisplayName || property["displayName"] }}
     </VcCheckbox>
   </Field>
 
   <Field
-    v-else-if="property.valueType === 'Html'"
+    v-else-if="property['valueType'] === 'Html'"
     v-slot="{ errorMessage, handleChange }"
-    :name="property.displayName || property.name"
+    :label="handleDisplayName || property['displayName']"
+    :name="property['displayName'] || property['name']"
     :modelValue="getter(property)"
     :rules="rules"
   >
     <VcEditor
       v-bind="$attrs"
-      :label="handleDisplayName || property.displayName"
-      :modelValue="getter(property)"
+      :label="handleDisplayName || property['displayName']"
+      :modelValue="(getter(property) as string | number | Date)"
       @update:modelValue="
         (e) => {
           handleChange(e);
           setter(property, e);
         }
       "
-      :required="property.required || property.isRequired"
+      :required="property['required'] || property['isRequired']"
       :placeholder="handleDisplayName || 'Add value'"
       :disabled="disabled"
-      :name="property.displayName || property.name"
+      :name="property['displayName'] || property['name']"
       :error-message="errorMessage"
     >
     </VcEditor>
@@ -309,8 +321,9 @@
 
 <script lang="ts" setup>
 import { ref, onMounted, computed } from "vue";
-import { useI18n } from "@/core/composables";
+import { useI18n } from "./../../../../core/composables";
 import { Field } from "vee-validate";
+import { dynamicPropertyProps } from "./vc-dynamic-property-model";
 
 type IValidationRules = {
   required?: boolean;
@@ -324,64 +337,27 @@ interface IDisplayName {
   name?: string;
 }
 
-const props = defineProps({
-  property: {
-    type: Object,
-    default: () => ({}),
-  },
-
-  dictionaries: {
-    type: Object,
-    default: () => ({}),
-  },
-
-  getter: {
-    type: Function,
-  },
-
-  optionsGetter: {
-    type: Function,
-  },
-
-  setter: {
-    type: Function,
-  },
-
-  culture: {
-    type: String,
-    default: "en-US",
-  },
-
-  disabled: {
-    type: Boolean,
-    default: false,
-  },
-});
+const props = defineProps(dynamicPropertyProps);
 
 const { locale, te, t } = useI18n();
 
 const rules: IValidationRules = {};
 const items = ref([]);
 const handleDisplayProperty = computed(() => {
-  return items.value?.some((x: { alias: string }) => x.alias)
-    ? "alias"
-    : "name";
+  return items.value?.some((x: { alias: string }) => x.alias) ? "alias" : "name";
 });
 const handleDisplayName = computed(() => {
   let localized: string;
-  const isLocaleExists = props.property.displayNames?.find((x: IDisplayName) =>
-    x.languageCode
-      ?.toLowerCase()
-      .startsWith((locale.value as string)?.toLowerCase())
+  const isLocaleExists = props.property["displayNames"]?.find((x: IDisplayName) =>
+    x.languageCode?.toLowerCase().startsWith((locale.value as string)?.toLowerCase())
   );
   if (isLocaleExists && isLocaleExists.name) {
     localized = isLocaleExists.name;
   } else {
-    const fallback = props.property.displayNames?.find((x: IDisplayName) =>
+    const fallback = props.property["displayNames"]?.find((x: IDisplayName) =>
       x.languageCode?.toLowerCase().includes(props.culture?.toLowerCase())
     );
-    localized =
-      fallback && fallback?.name ? fallback.name : props.property.name;
+    localized = fallback && fallback?.name ? fallback.name : props.property["name"];
   }
 
   return localized && te(localized.toUpperCase())
@@ -395,24 +371,24 @@ onMounted(async () => {
   }
 });
 
-if (props.property.required || props.property.isRequired) {
+if (props.property["required"] || props.property["isRequired"]) {
   rules.required = true;
 }
-if (props.property.validationRule?.charCountMin) {
-  rules.min = Number(props.property.validationRule.charCountMin);
+if (props.property["validationRule"]?.charCountMin) {
+  rules.min = Number(props.property["validationRule"].charCountMin);
 }
-if (props.property.validationRule?.charCountMax) {
-  rules.max = Number(props.property.validationRule.charCountMax);
+if (props.property["validationRule"]?.charCountMax) {
+  rules.max = Number(props.property["validationRule"].charCountMax);
 }
-if (props.property.validationRule?.regExp) {
-  rules.regex = new RegExp(props.property.validationRule?.regExp);
+if (props.property["validationRule"]?.regExp) {
+  rules.regex = new RegExp(props.property["validationRule"]?.regExp);
 }
 
 /*function getLabel() {
   return (
-    (props.property.displayNames as { culture: string }[]).find(
+    (props.property['displayNames'] as { culture: string }[]).find(
       (item) => item.culture === props.culture
-    ) || props.property.name
+    ) || props.property['name']
   );
 }
  */

package/ui/components/organisms/vc-gallery/_internal/vc-gallery-item/vc-gallery-item.vue

@@ -8,20 +8,27 @@
     @tap.stop="hover = !hover"
     v-click-outside="onClose"
   >
-    <VcImage aspect="1x1" :src="image.url" background="contain"></VcImage>
+    <VcImage
+      aspect="1x1"
+      :src="image.url"
+      background="contain"
+    ></VcImage>
     <div class="vc-gallery-item__overlay">
-      <div class= "tw-flex">
+      <div class="tw-flex">
         <VcIcon
           v-if="!readonly && !disableDrag"
           class="vc-gallery-item__move"
           icon="fas fa-arrows-alt"
           size="s"
         ></VcIcon>
-        <div class="tw-truncate" :title="image.name">
+        <div
+          class="tw-truncate"
+          :title="image.name"
+        >
           {{ image.name }}
         </div>
       </div>
-      <div class= "tw-flex tw-grow tw-basis-0 tw-items-center tw-justify-around">
+      <div class="tw-flex tw-grow tw-basis-0 tw-items-center tw-justify-around">
         <div
           class="vc-gallery-item__button"
           @click="$emit('preview', image)"
@@ -62,28 +69,38 @@
 
 <script lang="ts" setup>
 import { ref } from "vue";
-import { clickOutside as vClickOutside } from "@/core/directives";
-
-defineProps({
-  image: {
-    type: Object,
-    default: () => ({}),
-  },
+import { clickOutside as vClickOutside } from "./../../../../../../core/directives";
+import { IImage } from "./../../../../../../core/types";
 
-  readonly: {
-    type: Boolean,
-    default: false,
-  },
-
-  actions: {
-    type: Object,
-    default: () => ({}),
-  },
+export interface Props {
+  image?: IImage | undefined;
+  readonly?: boolean | undefined;
+  actions?:
+    | {
+        name?: string | undefined;
+        preview: boolean | undefined;
+        edit: boolean | undefined;
+        remove: boolean | undefined;
+      }
+    | undefined;
+  disableDrag?: boolean | undefined;
+}
 
-  disableDrag: {
-    type: Boolean,
-    default: false,
-  },
+withDefaults(defineProps<Props>(), {
+  image: () => ({
+    sortOrder: undefined,
+    title: undefined,
+    name: undefined,
+    url: undefined,
+  }),
+  readonly: false,
+  actions: () => ({
+    name: undefined,
+    preview: undefined,
+    edit: undefined,
+    remove: undefined,
+  }),
+  disableDrag: false,
 });
 
 defineEmits(["preview", "edit", "remove"]);

package/ui/components/organisms/vc-gallery/_internal/vc-gallery-preview/vc-gallery-preview.vue

@@ -1,5 +1,8 @@
 <template>
-  <VcPopup :title="currentImage.title" @close="$emit('close')">
+  <VcPopup
+    :title="currentImage.title"
+    @close="$emit('close')"
+  >
     <template v-slot:title>
       <div>
         <span>{{ currentImage.name }} (</span>
@@ -7,9 +10,7 @@
         <span>)</span>
       </div>
     </template>
-    <div
-      class="tw-w-full tw-h-full tw-box-border tw-flex tw-flex-col tw-items-center"
-    >
+    <div class="tw-w-full tw-h-full tw-box-border tw-flex tw-flex-col tw-items-center">
       <div class="tw-box-border p-5 tw-grow tw-basis-0 tw-w-full">
         <div
           class="bg-contain tw-bg-no-repeat tw-bg-center tw-w-full tw-h-full tw-box-border"
@@ -20,19 +21,23 @@
           class="tw-absolute tw-top-2/4 -tw-mt-9 tw-h-[72px] tw-w-[72px] tw-flex tw-items-center tw-justify-center tw-rounded-full tw-bg-[#f1f6fa] tw-cursor-pointer tw-text-[#a1c0d4] [--icon-size-xl: 36px] hover:tw-shadow-[0_0_20px_rgba(31,40,50,0.15)] tw-left-[25px]"
           @click="localIndex--"
         >
-          <VcIcon icon="fas fa-arrow-left" size="xl"></VcIcon>
+          <VcIcon
+            icon="fas fa-arrow-left"
+            size="xl"
+          ></VcIcon>
         </div>
         <div
           v-if="localIndex < images.length - 1"
           class="tw-absolute tw-top-2/4 -tw-mt-9 tw-h-[72px] tw-w-[72px] tw-flex tw-items-center tw-justify-center tw-rounded-full tw-bg-[#f1f6fa] tw-cursor-pointer tw-text-[#a1c0d4] [--icon-size-xl: 36px] hover:tw-shadow-[0_0_20px_rgba(31,40,50,0.15)] tw-right-[25px]"
           @click="localIndex++"
         >
-          <VcIcon icon="fas fa-arrow-right" size="xl"></VcIcon>
+          <VcIcon
+            icon="fas fa-arrow-right"
+            size="xl"
+          ></VcIcon>
         </div>
       </div>
-      <div
-        class="tw-p-4 tw-pb-[40px] tw-max-w-full tw-overflow-x-auto tw-box-border tw-shrink tw-flex"
-      >
+      <div class="tw-p-4 tw-pb-[40px] tw-max-w-full tw-overflow-x-auto tw-box-border tw-shrink tw-flex">
         <div
           v-for="(item, i) in images"
           :key="i"
@@ -56,8 +61,8 @@
 
 <script lang="ts" setup>
 import { computed, ref } from "vue";
-import { VcPopup } from "@/ui/components";
-import { IImage } from "@/core/types";
+import { VcPopup } from "./../../../../../components";
+import { IImage } from "./../../../../../../core/types";
 
 export interface Props {
   images?: IImage[];

package/ui/components/organisms/vc-gallery/index.ts

@@ -0,0 +1,8 @@
+import { ComponentPublicInstance } from "vue";
+import { VcGalleryEmits, VcGalleryProps } from "./vc-gallery-model";
+import { ComponentConstructor } from "./../../../types/ts-helpers";
+import Gallery from "./vc-gallery.vue";
+export const VcGallery: ComponentConstructor<
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  ComponentPublicInstance<VcGalleryProps, any, any, any, any, VcGalleryEmits>
+> = Gallery;