aloha-vue 2.62.0 → 2.63.0

package/src/ui/compositionApi/UiDataWithKeyIdAndLabelAPI.js

@@ -1,22 +1,22 @@
-import {
-  computed,
-  inject,
-  ref,
-  toRef,
-} from "vue";
-import {
-  AKeyId,
-  AKeyLabel,
-  AKeyLabelSearch,
-  extractTextFromHtml,
-  getTranslatedText,
-  isArrayOfArrays,
-  isPlaceholderTranslate,
-} from "../../index";
-
-import {
-  AIsDataPreparedInjection,
-} from "../const/UiInjectionKeys";
+import {
+  computed,
+  inject,
+  ref,
+  toRef,
+} from "vue";
+import {
+  AKeyId,
+  AKeyLabel,
+  AKeyLabelSearch,
+  extractTextFromHtml,
+  getTranslatedText,
+  isArrayOfArrays,
+  isPlaceholderTranslate,
+} from "../../index";
+
+import {
+  AIsDataPreparedInjection,
+} from "../const/UiInjectionKeys";
 import {
   cloneDeep,
   forEach,
@@ -25,38 +25,38 @@ import {
   keyBy,
   uniqBy,
 } from "lodash-es";
-
-export default function UiDataWithKeyIdAndLabelAPI(props) {
-  const alwaysTranslate = toRef(props, "alwaysTranslate");
-  const data = toRef(props, "data");
-  const dataExtra = toRef(props, "dataExtra");
-  const isDataSimpleArray = toRef(props, "isDataSimpleArray");
-  const keyId = toRef(props, "keyId");
-  const keyLabel = toRef(props, "keyLabel");
-  const keyLabelCallback = toRef(props, "keyLabelCallback");
-  const searchTextInHtml = toRef(props, "searchTextInHtml");
-  const translateData = toRef(props, "translateData");
-
+
+export default function UiDataWithKeyIdAndLabelAPI(props) {
+  const alwaysTranslate = toRef(props, "alwaysTranslate");
+  const data = toRef(props, "data");
+  const dataExtra = toRef(props, "dataExtra");
+  const isDataSimpleArray = toRef(props, "isDataSimpleArray");
+  const keyId = toRef(props, "keyId");
+  const keyLabel = toRef(props, "keyLabel");
+  const keyLabelCallback = toRef(props, "keyLabelCallback");
+  const searchTextInHtml = toRef(props, "searchTextInHtml");
+  const translateData = toRef(props, "translateData");
+
   const isDataPrepared = inject(AIsDataPreparedInjection, false);
 
   const dataFromServer = ref([]);
   const dataFromRetrieve = ref([]);
-
-  const isArrayOfArraysDataExtra = computed(() => {
-    return isArrayOfArrays(dataExtra.value);
-  });
-
-  const prepareDataLabelSearch = ({ _data }) => {
-    forEach(_data, item => {
-      item[AKeyLabelSearch] = extractTextFromHtml(item[AKeyLabel]);
-    });
-    return _data;
-  };
-
+
+  const isArrayOfArraysDataExtra = computed(() => {
+    return isArrayOfArrays(dataExtra.value);
+  });
+
+  const prepareDataLabelSearch = ({ _data }) => {
+    forEach(_data, item => {
+      item[AKeyLabelSearch] = extractTextFromHtml(item[AKeyLabel]);
+    });
+    return _data;
+  };
+
   const prepareData = ({ _data, _isArrayOfArrays = false }) => {
-    if (isDataPrepared) {
-      return _data;
-    }
+    if (isDataPrepared) {
+      return _data;
+    }
 
     const DATA = cloneDeep(_data);
     const isPreparedSimpleArrayItem = item => {
@@ -66,21 +66,21 @@ export default function UiDataWithKeyIdAndLabelAPI(props) {
     };
 
     if (_isArrayOfArrays) {
-      const DATA_LOCAL = [];
-      forEach(DATA, item => {
-        const ID = item[0];
-        let label = item[1];
-        if (translateData.value && isPlaceholderTranslate(label)) {
-          label = getTranslatedText({ placeholder: label, alwaysTranslate: alwaysTranslate.value });
-        }
-        DATA_LOCAL.push({
-          [AKeyId]: ID,
-          [AKeyLabel]: label,
-        });
-      });
-      return DATA_LOCAL;
-    }
-    if (keyLabelCallback.value) {
+      const DATA_LOCAL = [];
+      forEach(DATA, item => {
+        const ID = item[0];
+        let label = item[1];
+        if (translateData.value && isPlaceholderTranslate(label)) {
+          label = getTranslatedText({ placeholder: label, alwaysTranslate: alwaysTranslate.value });
+        }
+        DATA_LOCAL.push({
+          [AKeyId]: ID,
+          [AKeyLabel]: label,
+        });
+      });
+      return DATA_LOCAL;
+    }
+    if (keyLabelCallback.value) {
       if (isDataSimpleArray.value) {
         const DATA_LOCAL = [];
         forEach(DATA, item => {
@@ -98,23 +98,23 @@ export default function UiDataWithKeyIdAndLabelAPI(props) {
           let label = keyLabelCallback.value({ item });
           if (translateData.value && isPlaceholderTranslate(label)) {
             label = getTranslatedText({ placeholder: label, alwaysTranslate: alwaysTranslate.value });
-          }
-          DATA_LOCAL.push({
-            [AKeyId]: item,
-            [AKeyLabel]: label,
-          });
-        });
-        return DATA_LOCAL;
-      }
-      forEach(DATA, item => {
-        let label = keyLabelCallback.value({ item });
-        if (translateData.value && isPlaceholderTranslate(label)) {
-          label = getTranslatedText({ placeholder: label, alwaysTranslate: alwaysTranslate.value });
-        }
-        item[AKeyId] = get(item, keyId.value);
-        item[AKeyLabel] = label;
-      });
-    } else {
+          }
+          DATA_LOCAL.push({
+            [AKeyId]: item,
+            [AKeyLabel]: label,
+          });
+        });
+        return DATA_LOCAL;
+      }
+      forEach(DATA, item => {
+        let label = keyLabelCallback.value({ item });
+        if (translateData.value && isPlaceholderTranslate(label)) {
+          label = getTranslatedText({ placeholder: label, alwaysTranslate: alwaysTranslate.value });
+        }
+        item[AKeyId] = get(item, keyId.value);
+        item[AKeyLabel] = label;
+      });
+    } else {
       if (isDataSimpleArray.value) {
         const DATA_LOCAL = [];
         forEach(DATA, item => {
@@ -132,26 +132,26 @@ export default function UiDataWithKeyIdAndLabelAPI(props) {
           let label = item;
           if (translateData.value && isPlaceholderTranslate(label)) {
             label = getTranslatedText({ placeholder: label, alwaysTranslate: alwaysTranslate.value });
-          }
-          DATA_LOCAL.push({
-            [AKeyId]: item,
-            [AKeyLabel]: label,
-          });
-        });
-        return DATA_LOCAL;
-      }
-      forEach(DATA, item => {
-        let label = get(item, keyLabel.value);
-        if (translateData.value && isPlaceholderTranslate(label)) {
-          label = getTranslatedText({ placeholder: label, alwaysTranslate: alwaysTranslate.value });
-        }
-        item[AKeyId] = get(item, keyId.value);
-        item[AKeyLabel] = label;
-      });
-    }
-    return DATA;
-  };
-
+          }
+          DATA_LOCAL.push({
+            [AKeyId]: item,
+            [AKeyLabel]: label,
+          });
+        });
+        return DATA_LOCAL;
+      }
+      forEach(DATA, item => {
+        let label = get(item, keyLabel.value);
+        if (translateData.value && isPlaceholderTranslate(label)) {
+          label = getTranslatedText({ placeholder: label, alwaysTranslate: alwaysTranslate.value });
+        }
+        item[AKeyId] = get(item, keyId.value);
+        item[AKeyLabel] = label;
+      });
+    }
+    return DATA;
+  };
+
   const dataComputed = computed(() => {
     let DATA_LOCAL = data.value || [];
 
@@ -168,66 +168,66 @@ export default function UiDataWithKeyIdAndLabelAPI(props) {
       ...dataFromRetrieve.value,
     ], item => get(item, AKeyId, item));
   });
-
-  const dataLocal = computed(() => {
-    let _data = prepareData({
-      _data: dataComputed.value,
-      _isArrayOfArrays: false,
-    });
-
-    if (searchTextInHtml.value) {
-      _data = prepareDataLabelSearch({ _data });
-    }
-
-    return _data;
-  });
-
-  const dataExtraLocal = computed(() => {
-    let _data = prepareData({
-      _data: dataExtra.value,
-      _isArrayOfArrays: isArrayOfArraysDataExtra.value,
-    });
-
-    if (searchTextInHtml.value) {
-      _data = prepareDataLabelSearch({ _data });
-    }
-
-    return _data;
-  });
-
-  const dataExtraKeyByKeyId = computed(() => {
-    return keyBy(dataExtraLocal.value, AKeyId);
-  });
-
-  const dataKeyByKeyId = computed(() => {
-    return keyBy(dataLocal.value, AKeyId);
-  });
-
-  const dataKeyByKeyIdLocal = computed(() => {
-    return {
-      ...dataExtraKeyByKeyId.value,
-      ...dataKeyByKeyId.value,
-    };
-  });
-
-  const dataAll = computed(() => {
-    return [
-      ...dataExtraLocal.value,
-      ...dataLocal.value,
-    ];
-  });
-
-  const hasDataExtra = computed(() => {
-    return dataExtraLocal.value.length > 0;
-  });
-
-  return {
+
+  const dataLocal = computed(() => {
+    let _data = prepareData({
+      _data: dataComputed.value,
+      _isArrayOfArrays: false,
+    });
+
+    if (searchTextInHtml.value) {
+      _data = prepareDataLabelSearch({ _data });
+    }
+
+    return _data;
+  });
+
+  const dataExtraLocal = computed(() => {
+    let _data = prepareData({
+      _data: dataExtra.value,
+      _isArrayOfArrays: isArrayOfArraysDataExtra.value,
+    });
+
+    if (searchTextInHtml.value) {
+      _data = prepareDataLabelSearch({ _data });
+    }
+
+    return _data;
+  });
+
+  const dataExtraKeyByKeyId = computed(() => {
+    return keyBy(dataExtraLocal.value, AKeyId);
+  });
+
+  const dataKeyByKeyId = computed(() => {
+    return keyBy(dataLocal.value, AKeyId);
+  });
+
+  const dataKeyByKeyIdLocal = computed(() => {
+    return {
+      ...dataExtraKeyByKeyId.value,
+      ...dataKeyByKeyId.value,
+    };
+  });
+
+  const dataAll = computed(() => {
+    return [
+      ...dataExtraLocal.value,
+      ...dataLocal.value,
+    ];
+  });
+
+  const hasDataExtra = computed(() => {
+    return dataExtraLocal.value.length > 0;
+  });
+
+  return {
     dataAll,
     dataExtraLocal,
     dataFromRetrieve,
     dataFromServer,
     dataKeyByKeyIdLocal,
     dataLocal,
-    hasDataExtra,
-  };
-}
+    hasDataExtra,
+  };
+}

package/src/ui/const/AUiTypes.js

@@ -1,69 +1,69 @@
-import {
-  ref,
-} from "vue";
-
-export const typesContainer = ref({
-  fieldset: true,
-  group: true,
-});
-
-export const typesModelArray = ref({
-  checkbox: true,
-  multiselect: true,
-  multiselectOrdered: true,
-  multiselectIcon: true,
-  multiselectStyle: true,
-});
-
-export const typesModelObject = ref({
-  dateRange: true,
-  integerNonNegativeRange: true,
-  integerPositiveRange: true,
-  integerRange: true,
-  numberRange: true,
-});
-
-export const typesWithData = ref({
-  checkbox: true,
-  multiselect: true,
-  multiselectOrdered: true,
-  radio: true,
-  select: true,
-});
-
-
-export const typesLabelProps = ref({
-  select: {
-    hideFor: true,
-    prevent: true,
-  },
-  multiselect: {
-    hideFor: true,
-    prevent: true,
-  },
-  file: {
-    hideId: true,
-  },
-  // numberRange
-  numberRange: {
-    hideFor: true,
-    prevent: true,
-  },
-  integerNonNegativeRange: {
-    hideFor: true,
-    prevent: true,
-  },
-  integerPositiveRange: {
-    hideFor: true,
-    prevent: true,
-  },
-  integerRange: {
-    hideFor: true,
-    prevent: true,
-  },
-  // numberRange /
-  dateRange: {
-    hideFor: true,
-    prevent: true,
-  },
-});
+import {
+  ref,
+} from "vue";
+
+export const typesContainer = ref({
+  fieldset: true,
+  group: true,
+});
+
+export const typesModelArray = ref({
+  checkbox: true,
+  multiselect: true,
+  multiselectOrdered: true,
+  multiselectIcon: true,
+  multiselectStyle: true,
+});
+
+export const typesModelObject = ref({
+  dateRange: true,
+  integerNonNegativeRange: true,
+  integerPositiveRange: true,
+  integerRange: true,
+  numberRange: true,
+});
+
+export const typesWithData = ref({
+  checkbox: true,
+  multiselect: true,
+  multiselectOrdered: true,
+  radio: true,
+  select: true,
+});
+
+
+export const typesLabelProps = ref({
+  select: {
+    hideFor: true,
+    prevent: true,
+  },
+  multiselect: {
+    hideFor: true,
+    prevent: true,
+  },
+  file: {
+    hideId: true,
+  },
+  // numberRange
+  numberRange: {
+    hideFor: true,
+    prevent: true,
+  },
+  integerNonNegativeRange: {
+    hideFor: true,
+    prevent: true,
+  },
+  integerPositiveRange: {
+    hideFor: true,
+    prevent: true,
+  },
+  integerRange: {
+    hideFor: true,
+    prevent: true,
+  },
+  // numberRange /
+  dateRange: {
+    hideFor: true,
+    prevent: true,
+  },
+});