@vc-shell/framework 1.0.54 → 1.0.57

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

@@ -1,9 +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 }"
-    :label="handleDisplayName || property['displayName']"
-    :name="property['displayName'] || property['name']"
+    :label="handleDisplayName || property.displayName"
+    :name="property.displayName || property.name"
     :modelValue="getter(property, true)"
     :rules="rules"
   >
@@ -11,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) => {
@@ -19,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"
@@ -33,14 +33,12 @@
 
   <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, errors }"
+    :name="property.name"
+    :modelValue="property.values"
     :label="handleDisplayName"
-    :name="property['name']"
-    :modelValue="property['values']"
     :rules="rules"
   >
     <VcSelect
@@ -48,14 +46,14 @@
       :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"
       :multiple="true"
@@ -64,14 +62,12 @@
 
   <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, errors }"
+    :name="property.name"
     :label="handleDisplayName"
-    :name="property['name']"
-    :modelValue="property['values']"
+    :modelValue="property.values"
     :rules="rules"
   >
     <VcSelect
@@ -79,14 +75,14 @@
       :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"
       :disabled="disabled"
       :options="items"
@@ -94,15 +90,15 @@
       option-value="id"
       @search="onSearch"
       @close="onClose"
-      :multiple="property['multivalue']"
+      :multiple="property.multivalue"
     ></VcSelect>
   </Field>
 
   <Field
-    v-else-if="property['valueType'] === 'ShortText'"
+    v-else-if="property.valueType === 'ShortText'"
     v-slot="{ errorMessage, handleChange, errors }"
-    :label="handleDisplayName || property['displayName']"
-    :name="property['displayName'] || property['name']"
+    :name="property.displayName || property.name"
+    :label="handleDisplayName || property.displayName"
     :modelValue="getter(property)"
     :rules="rules"
   >
@@ -110,33 +106,33 @@
       v-bind="$attrs"
       :error="!!errors.length"
       :error-message="errorMessage"
-      :label="handleDisplayName || property['displayName']"
+      :label="handleDisplayName || property.displayName"
       :modelValue="(getter(property) as string | number | Date)"
       @update:modelValue="
         (e) => {
           handleChange(e);
-          setter(property, e);
+          setter(property, e as Record<string, unknown> | string | number | boolean);
         }
       "
       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);
@@ -144,7 +140,7 @@
         }
       "
       type="number"
-      :required="property['required'] || property['isRequired']"
+      :required="property.required || property.isRequired"
       placeholder="Add value"
       :disabled="disabled"
       :error="!!errors.length"
@@ -157,10 +153,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"
   >
@@ -173,22 +169,22 @@
       @update:modelValue="
         (e) => {
           handleChange(e);
-          setter(property, e);
+          setter(property, e as Record<string, unknown> | string | number | boolean);
         }
       "
       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"
   >
@@ -201,23 +197,23 @@
       @update:modelValue="
         (e) => {
           handleChange(e);
-          setter(property, e);
+          setter(property, e as Record<string, unknown> | string | number | boolean);
         }
       "
       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"
   >
@@ -230,21 +226,21 @@
       @update:modelValue="
         (e) => {
           handleChange(e);
-          setter(property, e);
+          setter(property, e as Record<string, unknown> | string | number | boolean);
         }
       "
       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"
   >
@@ -259,17 +255,17 @@
           setter(property, e);
         }
       "
-      :required="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 }"
-    :label="handleDisplayName || property['displayName']"
-    :name="property['displayName'] || property['name']"
+    :name="property.displayName || property.name"
+    :label="handleDisplayName || property.displayName"
     :modelValue="getter(property)"
     :rules="rules"
   >
@@ -283,39 +279,39 @@
           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 }"
-    :label="handleDisplayName || property['displayName']"
-    :name="property['displayName'] || property['name']"
+    :name="property.displayName || property.name"
+    :label="handleDisplayName || property.displayName"
     :modelValue="getter(property)"
     :rules="rules"
   >
-    <VcEditor
+    <VcCodeEditor
       v-bind="$attrs"
-      :label="handleDisplayName || property['displayName']"
+      :label="handleDisplayName || property.displayName"
       :modelValue="(getter(property) as string | number | Date)"
       @update:modelValue="
         (e) => {
           handleChange(e);
-          setter(property, e);
+          setter(property, e as Record<string, unknown> | string | number | boolean);
         }
       "
-      :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>
+    </VcCodeEditor>
   </Field>
 </template>
 
@@ -323,7 +319,34 @@
 import { ref, onMounted, computed } from "vue";
 import { useI18n } from "./../../../../core/composables";
 import { Field } from "vee-validate";
-import { dynamicPropertyProps } from "./vc-dynamic-property-model";
+
+export interface Props {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  property: any;
+  dictionaries?: Record<string, unknown>;
+  getter: (
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    property: Record<string, any>,
+    isDictionary?: boolean
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  ) => Record<string, any> | string | number | boolean | Date;
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  optionsGetter: (property: Record<string, any>, keyword?: string) => Promise<any[] | undefined> | any[];
+  setter: (
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    property: Record<string, any>,
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    value: Record<string, any> | string | number | boolean,
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    dictionary?: any[]
+  ) => void | undefined;
+  culture?: string;
+  disabled?: boolean;
+}
+
+export interface PropertyItem {
+  alias: string;
+}
 
 type IValidationRules = {
   required?: boolean;
@@ -337,32 +360,32 @@ interface IDisplayName {
   name?: string;
 }
 
-const props = defineProps(dynamicPropertyProps);
+const props = withDefaults(defineProps<Props>(), {
+  culture: "en-US",
+});
 
 const { locale, te, t } = useI18n();
 
 const rules: IValidationRules = {};
-const items = ref([]);
+const items = ref<PropertyItem[]>([]);
 const handleDisplayProperty = computed(() => {
   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) =>
+  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())
-    ? t(localized.toUpperCase())
-    : localized;
+  return localized && te(localized.toUpperCase()) ? t(localized.toUpperCase()) : localized;
 });
 
 onMounted(async () => {
@@ -371,24 +394,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/index.ts

@@ -1,8 +1,3 @@
-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;
+import _Gallery from "./vc-gallery.vue";
+
+export const VcGallery = _Gallery as typeof _Gallery;

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

@@ -67,14 +67,55 @@
 
 <script lang="ts" setup>
 import { computed, ref } from "vue";
+import { IImage } from "../../../../core/types";
 import { VcLabel, VcFileUpload } from "./../../../components";
 import VcGalleryItem from "./_internal/vc-gallery-item/vc-gallery-item.vue";
 import VcGalleryPreview from "./_internal/vc-gallery-preview/vc-gallery-preview.vue";
-import { galleryEmits, galleryProps } from "./vc-gallery-model";
 
-const props = defineProps(galleryProps);
+export interface Props {
+  images?: IImage[];
+  disabled?: boolean;
+  required?: boolean;
+  label?: string;
+  tooltip?: string;
+  tooltipIcon?: string;
+  uploadIcon?: string;
+  multiple?: boolean;
+  variant?: "gallery" | "file-upload";
+  itemActions?: {
+    name?: string;
+    preview: boolean;
+    edit: boolean;
+    remove: boolean;
+  };
+  disableDrag?: boolean;
+  hideAfterUpload?: boolean;
+  rules?: string | Record<string, unknown>;
+  name?: string;
+}
+
+export interface Emits {
+  (event: "upload", files: FileList): void;
+  (event: "sort", sorted: IImage[]): void;
+  (event: "item:edit", image: IImage): void;
+  (event: "item:remove", image: IImage): void;
+  (event: "item:move", image: IImage): void;
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  images: () => [],
+  tooltipIcon: "fas fa-info",
+  uploadIcon: "fas fa-upload",
+  variant: "gallery",
+  itemActions: () => ({
+    preview: true,
+    edit: true,
+    remove: true,
+  }),
+  name: "Gallery",
+});
 
-const emit = defineEmits(galleryEmits);
+const emit = defineEmits<Emits>();
 
 const preview = ref(false);
 const previewImageIndex = ref();

package/ui/components/organisms/vc-login-form/index.ts

@@ -1,5 +1,10 @@
-import { ComponentPublicInstance } from "vue";
-import { VcLoginFormProps } from "./vc-login-form-model";
-import { ComponentConstructor } from "./../../../types/ts-helpers";
-import LoginForm from "./vc-login-form.vue";
-export const VcLoginForm: ComponentConstructor<ComponentPublicInstance<VcLoginFormProps>> = LoginForm;
+import { VNode } from "vue";
+import _LoginForm from "./vc-login-form.vue";
+
+export const VcLoginForm = _LoginForm as typeof _LoginForm & {
+  new (): {
+    $slots: {
+      default: () => VNode[];
+    };
+  };
+};

package/ui/components/organisms/vc-login-form/vc-login-form.vue

@@ -27,9 +27,15 @@
 </template>
 
 <script lang="ts" setup>
-import { loginFormProps } from "./vc-login-form-model";
+export interface Props {
+  logo: string;
+  background: string;
+  title?: string;
+}
 
-defineProps(loginFormProps);
+withDefaults(defineProps<Props>(), {
+  title: "Login",
+});
 
 console.debug("Init vc-login-form");
 </script>

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

@@ -1,7 +1,10 @@
-import { ComponentPublicInstance } from "vue";
-import { VcPopupEmits, VcPopupProps } from "./vc-popup-model";
-import { ComponentConstructor } from "./../../../types/ts-helpers";
-import Popup from "./vc-popup.vue";
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const VcPopup: ComponentConstructor<ComponentPublicInstance<VcPopupProps, any, any, any, any, VcPopupEmits>> =
-  Popup;
+import { VNode } from "vue";
+import _Popup from "./vc-popup.vue";
+
+export const VcPopup = _Popup as typeof _Popup & {
+  new (): {
+    $slots: {
+      default: () => VNode[];
+    };
+  };
+};

package/ui/components/organisms/vc-popup/vc-popup.vue

@@ -26,11 +26,22 @@
 </template>
 
 <script lang="ts" setup>
-import { popupEmits, popupProps } from "./vc-popup-model";
+export interface Props {
+  title?: string;
+  closable?: boolean;
+  variant?: "small" | "medium" | "fullscreen";
+}
+
+export interface Emits {
+  (event: "close"): void;
+}
 
-defineProps(popupProps);
+withDefaults(defineProps<Props>(), {
+  closable: true,
+  variant: "fullscreen",
+});
 
-defineEmits(popupEmits);
+defineEmits<Emits>();
 </script>
 
 <style lang="scss">

package/ui/components/organisms/vc-table/_internal/vc-table-cell/vc-table-cell.vue

@@ -95,10 +95,7 @@ export interface Props {
   item: Record<string, unknown>;
 }
 
-const props = withDefaults(defineProps<Props>(), {
-  cell: undefined,
-  item: undefined,
-});
+const props = defineProps<Props>();
 
 const locale = window.navigator.language;
 const value = computed(() => {