@vc-shell/framework 1.1.15 → 1.1.16

package/dist/ui/components/organisms/vc-dynamic-property/vc-dynamic-property.vue.d.ts

@@ -12,6 +12,7 @@ declare const _default: <T extends {
         property: T;
         modelValue: any;
         optionsGetter: (propertyId: string, keyword?: string, locale?: string) => Promise<any[] | undefined> | any[] | undefined;
+        measurementsGetter?: (measureId: string, locale?: string) => Promise<any[] | undefined> | any[] | undefined;
         required: boolean;
         multivalue?: boolean;
         multilanguage?: boolean;

package/dist/ui/components/organisms/vc-dynamic-property/vc-dynamic-property.vue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vc-dynamic-property.vue.d.ts","sourceRoot":"","sources":["../../../../../ui/components/organisms/vc-dynamic-property/vc-dynamic-property.vue"],"names":[],"mappings":"yBAmXiB,CAAC,SAAS;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;IAAC,EAAE,CAAC,EAAE,MAAM,CAAA;CAAE,EAC3D,aAAa,WAAW,CAAC,OAAO,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,EAC9D,YAAY,mBAAmB,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,WAAW,CAAC,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC,EAC3G,eAAe,WAAW,CAAC,OAAO,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC,EACjE;WAmlBO,mBAAmB,CAAC;;4BApiBqB,GAAG;kCAAwB,GAAG,EAAE;8BAAoB,MAAM;;;kBAtC7F,CAAC;oBACC,GAAG;uBACA,CACb,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,MAAM,EAChB,MAAM,CAAC,EAAE,MAAM,KACZ,OAAO,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC,GAAG,GAAG,EAAE,GAAG,SAAS;kBACzC,OAAO;qBACJ,OAAO;wBACJ,OAAO;0BACL,MAAM;mBACb,MAAM;qBACJ,OAAO;cACd,MAAM;uBACG,MAAM;uBACN,MAAM;uBACN;YACb,IAAI,CAAC,EAAE,MAAM,CAAC;YACd,YAAY,CAAC,EAAE,MAAM,CAAC;SACvB,EAAE;gBACK;YACN,GAAG,CAAC,EAAE,MAAM,CAAC;YACb,GAAG,CAAC,EAAE,MAAM,CAAC;YACb,KAAK,CAAC,EAAE,MAAM,CAAC;SAChB;mBACU,OAAO;sBACJ,MAAM;QAgjByC,OAAO,IAAsB,CAAC,4BAA2B;oBACzG,OAAO,KAAK,EAAE,gBAAgB,CAAC,EAAE,CAAC,GAAG,IAAI;WAClD,GAAG;;;wBAtiBsC,GAAG;8BAAwB,GAAG,EAAE;0BAAoB,MAAM;;EA0iBvG,KACQ,OAAO,KAAK,EAAE,KAAK,GAAG;IAAE,KAAK,CAAC,EAAE,OAAO,CAAC,OAAO,WAAW,CAAC,CAAA;CAAE;AA9lBzE,wBA8lB4E;AAC5E,KAAK,mBAAmB,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAG,GAAG,EAAE,CAAC"}
+{"version":3,"file":"vc-dynamic-property.vue.d.ts","sourceRoot":"","sources":["../../../../../ui/components/organisms/vc-dynamic-property/vc-dynamic-property.vue"],"names":[],"mappings":"yBA0ZiB,CAAC,SAAS;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;IAAC,EAAE,CAAC,EAAE,MAAM,CAAA;CAAE,EAC3D,aAAa,WAAW,CAAC,OAAO,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,EAC9D,YAAY,mBAAmB,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,WAAW,CAAC,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC,EAC3G,eAAe,WAAW,CAAC,OAAO,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC,EACjE;WA4oBO,mBAAmB,CAAC;;4BA5lBqB,GAAG;kCAAwB,GAAG,EAAE;8BAAoB,MAAM;;;kBAvC7F,CAAC;oBACC,GAAG;uBACA,CACb,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,MAAM,EAChB,MAAM,CAAC,EAAE,MAAM,KACZ,OAAO,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC,GAAG,GAAG,EAAE,GAAG,SAAS;6BAC9B,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC,GAAG,GAAG,EAAE,GAAG,SAAS;kBACjG,OAAO;qBACJ,OAAO;wBACJ,OAAO;0BACL,MAAM;mBACb,MAAM;qBACJ,OAAO;cACd,MAAM;uBACG,MAAM;uBACN,MAAM;uBACN;YACb,IAAI,CAAC,EAAE,MAAM,CAAC;YACd,YAAY,CAAC,EAAE,MAAM,CAAC;SACvB,EAAE;gBACK;YACN,GAAG,CAAC,EAAE,MAAM,CAAC;YACb,GAAG,CAAC,EAAE,MAAM,CAAC;YACb,KAAK,CAAC,EAAE,MAAM,CAAC;SAChB;mBACU,OAAO;sBACJ,MAAM;QAwmByC,OAAO,IAAsB,CAAC,4BAA2B;oBACzG,OAAO,KAAK,EAAE,gBAAgB,CAAC,EAAE,CAAC,GAAG,IAAI;WAClD,GAAG;;;wBA9lBsC,GAAG;8BAAwB,GAAG,EAAE;0BAAoB,MAAM;;EAkmBvG,KACQ,OAAO,KAAK,EAAE,KAAK,GAAG;IAAE,KAAK,CAAC,EAAE,OAAO,CAAC,OAAO,WAAW,CAAC,CAAA;CAAE;AAvpBzE,wBAupB4E;AAC5E,KAAK,mBAAmB,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAG,GAAG,EAAE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vc-shell/framework",
-  "version": "1.1.15",
+  "version": "1.1.16",
   "type": "module",
   "main": "./dist/framework.js",
   "types": "./dist/index.d.ts",
@@ -70,9 +70,9 @@
   "devDependencies": {
     "@fullhuman/postcss-purgecss": "^7.0.2",
     "@types/dompurify": "^3.0.5",
-    "@vc-shell/api-client-generator": "^1.1.15",
-    "@vc-shell/config-generator": "^1.1.15",
-    "@vc-shell/ts-config": "^1.1.15",
+    "@vc-shell/api-client-generator": "^1.1.16",
+    "@vc-shell/config-generator": "^1.1.16",
+    "@vc-shell/ts-config": "^1.1.16",
     "@vitejs/plugin-vue": "^5.2.3",
     "@vue/test-utils": "^2.4.5",
     "cypress-signalr-mock": "^1.5.0",

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

@@ -74,6 +74,8 @@ export default {
     const initialProps = _.cloneDeep(dynamicProps.value);
 
     const properties: UnwrapNestedRefs<IDynamicProperties[]> = reactiveComputed(() => {
+      console.log("props.bladeContext.scope?.dynamicProperties: ", props.bladeContext.scope?.dynamicProperties);
+      console.log("dynamicProps.value: ", dynamicProps.value);
       return (dynamicProps.value || [])?.map((prop) =>
         DynamicProperties({
           props: {
@@ -91,6 +93,10 @@ export default {
               keyword?: string | undefined,
               locale?: string | undefined,
             ) => Promise<Record<string, any>[]>,
+            measurementsGetter: props.bladeContext.scope?.dynamicProperties?.loadMeasurements as (
+              measureId: string,
+              locale?: string | undefined,
+            ) => Promise<Record<string, any>[]>,
             "onUpdate:model-value": (args: {
               value: string | Record<string, any>[];
               dictionary?: Record<string, any>[];

package/shared/modules/dynamic/factories/types/index.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { ComputedRef, MaybeRef, Ref, UnwrapNestedRefs } from "vue";
-import { AsyncAction } from "../../../../../core/composables";
+import { AsyncAction, IUseDynamicProperties } from "../../../../../core/composables";
 import { SettingsDetails, SettingsGrid, SettingsSchema } from "../../types";
 import {
   AssetsHandler,
@@ -155,22 +155,13 @@ export interface DetailsBaseBladeScope<Item = Record<string, any>> extends BaseB
     localesOptions: Ref<{ label: string | undefined; value: string }[]>;
     getLanguages: AsyncAction<void, void>;
   };
-  dynamicProperties?: {
-    loading: ComputedRef<boolean>;
-    loadDictionaries: (
-      propertyId: string,
-      keyword?: string,
-      locale?: string,
-    ) => Promise<Record<string, any>[] | undefined>;
-    getPropertyValue: (property: Record<string, any>, locale: string) => any;
-    setPropertyValue: (data: {
-      property: Record<string, any>;
-      value: string | Record<string, any>[];
-      dictionary?: Record<string, any>[];
-      locale?: string;
-      initialProp?: Record<string, any>;
-    }) => void;
-  };
+  dynamicProperties?: IUseDynamicProperties<
+    Record<string, any>,
+    Record<string, any>,
+    Record<string, any>,
+    Record<string, any>,
+    Record<string, any>
+  >;
   assetsHandler?: {
     assets?: AssetsHandler<ICommonAsset>;
     images?: AssetsHandler<ICommonAsset>;

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

@@ -189,6 +189,22 @@
       >
       </VcSwitch>
     </template>
+    <template v-else-if="computedProperty.valueType === 'Measure'">
+      <VcInputDropdown
+        v-bind="$attrs"
+        v-model="value"
+        v-model:option="defaultMeasurementOption"
+        :options="measurementOptions"
+        :loading="measurementLoading"
+        option-label="displayName"
+        option-value="displaySymbol"
+        input-type="number"
+        :label="computedProperty.displayName"
+        :placeholder="computedProperty.placeholder"
+        :required="computedProperty.required"
+        :disabled="disabled"
+      />
+    </template>
   </Field>
 </template>
 
@@ -216,6 +232,7 @@ const props = withDefaults(
       keyword?: string,
       locale?: string,
     ) => Promise<any[] | undefined> | any[] | undefined;
+    measurementsGetter?: (measureId: string, locale?: string) => Promise<any[] | undefined> | any[] | undefined;
     required: boolean;
     multivalue?: boolean;
     multilanguage?: boolean;
@@ -255,6 +272,9 @@ const loading = ref(false);
 const initialOptions = ref<any[]>([]);
 const internalProperty = ref(props.property) as Ref<typeof props.property>;
 const internalModel = ref(props.modelValue) as Ref<typeof props.modelValue>;
+const measurementOptions = ref<any[]>([]);
+const measurementLoading = ref(false);
+const defaultMeasurementOption = ref();
 
 watch(
   () => props.property,
@@ -333,6 +353,7 @@ const value = computed({
 
 onMounted(async () => {
   await getOptions();
+  await getMeasurements();
   initialOptions.value = items.value;
 });
 
@@ -351,6 +372,24 @@ async function getOptions(keyword: string | undefined = undefined) {
   }
 }
 
+async function getMeasurements() {
+  if (props.measurementsGetter && internalProperty.value.valueType === "Measure" && internalProperty.value.measureId) {
+    try {
+      measurementLoading.value = true;
+      const measurements = await props.measurementsGetter(
+        internalProperty.value.measureId,
+        props.currentLanguage ?? "en-US",
+      );
+      if (measurements) {
+        measurementOptions.value = measurements;
+        defaultMeasurementOption.value = measurements.filter((x) => x.isDefault)[0].displaySymbol;
+      }
+    } finally {
+      measurementLoading.value = false;
+    }
+  }
+}
+
 async function onSearch(keyword: string) {
   getOptions(keyword);
 }