aloha-vue 2.57.2 → 2.57.4

package/src/ATableForm/compositionAPI/EditAPI.js

@@ -1,107 +1,119 @@
-import {
-  computed,
-  ref,
-  toRef,
-} from "vue";
-
-import {
-  cloneDeep,
-  isFunction,
-} from "lodash-es";
-
-export default function EditAPI(props, {
-  getRowKey = () => {},
-}) {
-  const addRow = toRef(props, "addRow");
-  const columns = toRef(props, "columns");
-  const isAddable = toRef(props, "isAddable");
-  const isEditable = toRef(props, "isEditable");
-  const prepareEditModel = toRef(props, "prepareEditModel");
-  const rows = toRef(props, "rows");
-
-  const activeEditRowKey = ref(undefined);
-  const activeEditModel = ref(undefined);
-  const isAddRowActive = ref(false);
-
-  const hasActiveEditRow = computed(() => {
-    return !!activeEditRowKey.value || isAddRowActive.value;
-  });
-
-  const canAddRow = computed(() => {
-    if (!isAddable.value) {
-      return false;
-    }
-
-    return isFunction(addRow.value);
-  });
-
-  const hasRequiredEditableColumns = computed(() => {
-    if (!isEditable.value) {
-      return false;
-    }
-
-    return columns.value.some(column => {
-      return !!column.formElement?.required;
-    });
-  });
-
-  const getPreparedEditModel = params => {
-    if (!isFunction(prepareEditModel.value)) {
-      return undefined;
-    }
-
-    const result = prepareEditModel.value(params);
-
-    if (result?.model === undefined) {
-      return undefined;
-    }
-
-    return cloneDeep(result.model);
-  };
-
-  const onAddRow = () => {
-    if (hasActiveEditRow.value || !canAddRow.value) {
-      return;
-    }
-
-    activeEditRowKey.value = undefined;
-    activeEditModel.value = getPreparedEditModel({
-      rows: rows.value,
-    });
-    isAddRowActive.value = true;
-  };
-
-  const onCancelEditRow = () => {
-    activeEditRowKey.value = undefined;
-    activeEditModel.value = undefined;
-    isAddRowActive.value = false;
-  };
-
-  const onEditRow = ({ row, rowIndex }) => {
-    if (isAddRowActive.value) {
-      return;
-    }
-
-    activeEditModel.value = getPreparedEditModel({
-      row,
-      rowIndex,
-      rows: rows.value,
-    });
-    activeEditRowKey.value = getRowKey({
-      row,
-      rowIndex,
-    });
-  };
-
-  return {
-    activeEditRowKey,
-    activeEditModel,
-    canAddRow,
-    hasActiveEditRow,
-    hasRequiredEditableColumns,
-    isAddRowActive,
-    onAddRow,
-    onCancelEditRow,
-    onEditRow,
-  };
-}
+import {
+  computed,
+  ref,
+  toRef,
+} from "vue";
+
+import {
+  setFocusToElement,
+} from "../../utils/utilsDOM";
+import {
+  cloneDeep,
+  isFunction,
+} from "lodash-es";
+
+export default function EditAPI(props, {
+  getRowKey = () => {},
+}) {
+  const addRow = toRef(props, "addRow");
+  const columns = toRef(props, "columns");
+  const isAddable = toRef(props, "isAddable");
+  const isEditable = toRef(props, "isEditable");
+  const prepareEditModel = toRef(props, "prepareEditModel");
+  const rows = toRef(props, "rows");
+
+  const activeEditRowKey = ref(undefined);
+  const activeEditModel = ref(undefined);
+  const isAddRowActive = ref(false);
+
+  const hasActiveEditRow = computed(() => {
+    return !!activeEditRowKey.value || isAddRowActive.value;
+  });
+
+  const canAddRow = computed(() => {
+    if (!isAddable.value) {
+      return false;
+    }
+
+    return isFunction(addRow.value);
+  });
+
+  const hasRequiredEditableColumns = computed(() => {
+    if (!isEditable.value) {
+      return false;
+    }
+
+    return columns.value.some(column => {
+      return !!column.formElement?.required;
+    });
+  });
+
+  const getPreparedEditModel = params => {
+    if (!isFunction(prepareEditModel.value)) {
+      return undefined;
+    }
+
+    const result = prepareEditModel.value(params);
+
+    if (result?.model === undefined) {
+      return undefined;
+    }
+
+    return cloneDeep(result.model);
+  };
+
+  const onAddRow = () => {
+    if (hasActiveEditRow.value || !canAddRow.value) {
+      return;
+    }
+
+    activeEditRowKey.value = undefined;
+    activeEditModel.value = getPreparedEditModel({
+      rows: rows.value,
+    });
+    isAddRowActive.value = true;
+  };
+
+  const onCancelEditRow = ({ trigger, id } = {}) => {
+    activeEditRowKey.value = undefined;
+    activeEditModel.value = undefined;
+    isAddRowActive.value = false;
+    if (trigger === "cancel") {
+      setTimeout(() => {
+        setFocusToElement({ selector: `#${ id }_edit` });
+      });
+    } else if (trigger === "save") {
+      setTimeout(() => {
+        setFocusToElement({ selector: `#${ id }` });
+      });
+    }
+  };
+
+  const onEditRow = ({ row, rowIndex }) => {
+    if (isAddRowActive.value) {
+      return;
+    }
+
+    activeEditModel.value = getPreparedEditModel({
+      row,
+      rowIndex,
+      rows: rows.value,
+    });
+    activeEditRowKey.value = getRowKey({
+      row,
+      rowIndex,
+    });
+  };
+
+  return {
+    activeEditRowKey,
+    activeEditModel,
+    canAddRow,
+    hasActiveEditRow,
+    hasRequiredEditableColumns,
+    isAddRowActive,
+    onAddRow,
+    onCancelEditRow,
+    onEditRow,
+  };
+}

package/src/ui/AInputCurrency/AInputCurrency.js

@@ -242,6 +242,10 @@ export default {
       required: false,
       default: () => AInputCurrencyPluginOptions.propsDefault.modelUndefined,
     },
+    skipRequiredModelInit: {
+      type: Boolean,
+      required: false,
+    },
     modelValue: {
       type: [String, Number],
       required: false,

package/src/ui/AInputCurrency/compositionAPI/InputEventsAPI.js

@@ -30,6 +30,7 @@ export default function InputEventsAPI(props, {
   const modelValue = toRef(props, "modelValue");
   const readonly = toRef(props, "readonly");
   const required = toRef(props, "required");
+  const skipRequiredModelInit = toRef(props, "skipRequiredModelInit");
   const decimalPartLength = toRef(props, "decimalPartLength");
   const thousandDivider = toRef(props, "thousandDivider");
   const validationOnChange = toRef(props, "validationOnChange");
@@ -60,6 +61,10 @@ export default function InputEventsAPI(props, {
     return `${ value.slice(0, start) }${ replacement }${ value.slice(end) }`;
   };
 
+  const isZeroIntegerPart = value => {
+    return value === "0" || value === "-0";
+  };
+
   const setValueLocal = ({ value, updateOutside, trigger, triggerDetails }) => {
     setCurrentValue({ value, updateOutside, trigger, triggerDetails });
   };
@@ -117,7 +122,7 @@ export default function InputEventsAPI(props, {
   };
 
   const handleInput = ($event, { value: _value, updateOutside = false, triggerDetails = "keydown" } = {}) => {
-    if (!required.value && isNil(_value) && !$event?.target?.value) {
+    if ((!required.value || skipRequiredModelInit.value) && isNil(_value) && !$event?.target?.value) {
       setValueLocal({ value: _value, updateOutside, triggerDetails });
 
       return;
@@ -381,6 +386,7 @@ export default function InputEventsAPI(props, {
     const keyCode = $event.keyCode;
     const keyValue = $event.key;
     const keyIsNumber = keyCode >= 48 && keyCode <= 57 || keyCode >= 96 && keyCode <= 105;
+    const keyIsZero = keyCode === 48 || keyCode === 96;
     const keyIsDecimalDivider = keyValue === decimalDivider.value && !!decimalPartLength.value;
     const decimalDividerIndex = $event.target.value.indexOf(decimalDivider.value);
     const hasDecimalDivider = decimalDividerIndex !== -1;
@@ -512,6 +518,11 @@ export default function InputEventsAPI(props, {
           }
         } else {
           const intValWithoutDivider = intVal.replaceAll(thousandDivider.value, "");
+          if (keyIsZero && isZeroIntegerPart(intValWithoutDivider) && !hasSelection) {
+            $event.preventDefault();
+
+            return;
+          }
           if (intValWithoutDivider.length >= integerPartMaxLength.value && !hasSelection) {
             $event.preventDefault();
 
@@ -520,6 +531,11 @@ export default function InputEventsAPI(props, {
         }
       } else {
         const intValWithoutDivider = value.replaceAll(thousandDivider.value, "");
+        if (keyIsZero && isZeroIntegerPart(intValWithoutDivider) && !hasSelection) {
+          $event.preventDefault();
+
+          return;
+        }
         if (intValWithoutDivider.length >= integerPartMaxLength.value && !hasSelection) {
           $event.preventDefault();
 
@@ -540,7 +556,7 @@ export default function InputEventsAPI(props, {
       $event.preventDefault();
     }
 
-    if ($event.keyCode !== AKeysCode.home && $event.keyCode !== AKeysCode.end && !$event.ctrlKey && $event.keyCode) {
+    if (keyIsNumber && !$event.ctrlKey && $event.keyCode) {
       if (cursorPosition === 0 && value.length && value[0] === "0") {
         $event.preventDefault();
         const newVal = `${ keyValue }${ value.slice(1) }`;
@@ -711,7 +727,7 @@ export default function InputEventsAPI(props, {
           valueToSet = `${ setMinusSymbol }${ intPart }${ decimalDivider.value }${ floatPart }${ zerosToAdd }`;
         }
       } else {
-        valueToSet = required.value ?
+        valueToSet = required.value && !skipRequiredModelInit.value ?
           [
             "0",
             decimalDivider.value,
@@ -719,7 +735,7 @@ export default function InputEventsAPI(props, {
           ].join("") :
           modelUndefinedLocal.value;
       }
-      const shouldInitModel = required.value && !hasModel;
+      const shouldInitModel = required.value && !skipRequiredModelInit.value && !hasModel;
       handleInput(null, { value: valueToSet, updateOutside: !shouldInitModel, triggerDetails: "init" });
     });
   };

package/src/ui/AInputCurrency/compositionAPI/ModelAPI.js

@@ -17,6 +17,7 @@ export default function ModelAPI(props, {
   const modelValue = toRef(props, "modelValue");
   const modelType = toRef(props, "modelType");
   const modelUndefined = toRef(props, "modelUndefined");
+  const skipRequiredModelInit = toRef(props, "skipRequiredModelInit");
   const decimalDivider = toRef(props, "decimalDivider");
   const disabled = toRef(props, "disabled");
   const decimalPartLength = toRef(props, "decimalPartLength");
@@ -36,7 +37,7 @@ export default function ModelAPI(props, {
   });
 
   const modelUndefinedLocal = computed(() => {
-    if (!required.value) {
+    if (!required.value || skipRequiredModelInit.value) {
       return modelUndefined.value;
     }
     if (!decimalPartLength.value) {
@@ -53,7 +54,7 @@ export default function ModelAPI(props, {
   const setCurrentValue = ({ value, updateOutside = false, trigger, triggerDetails } = {}) => {
     displayValue.value = isNil(value) ? "" : value;
     let newVal;
-    if (!required.value && isNil(value)) {
+    if ((!required.value || skipRequiredModelInit.value) && isNil(value)) {
       newVal = modelUndefinedLocal.value;
     } else {
       newVal = modelType.value === "number" ?