aloha-vue 1.0.174 → 1.0.176

package/docs/src/views/PageForm/PageForm.js

@@ -7,7 +7,9 @@ export default {
   },
   data() {
     return {
-      model: undefined,
+      model: {
+        alohadate: "2023-01-10",
+      },
       selectData: [
         {
           label: "Aloha 1",
@@ -77,6 +79,13 @@ export default {
           step: 0.01,
           required: true,
         },
+        {
+          type: "date",
+          label: "Aloha date",
+          id: "alohadate",
+          classColumn: "a_column_8",
+          required: true,
+        },
         {
           type: "file",
           label: "Aloha File",

package/docs/src/views/PageTable/PageTable.js

@@ -27,11 +27,11 @@ export default {
         },
         {
           label: "Alohafreidsfdsfdsfsdfdsfdsfdsfsd",
-          id: "aloha1",
-          keyLabel: "aloha",
-          sortId: "aloha",
+          id: "number",
+          keyLabel: "number",
+          sortId: "number",
           grow: 0,
-          footerKeyLabel: "aloha",
+          footerKeyLabel: "number",
           class: "a_justify_content_end",
         },
         {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "aloha-vue",
   "description": "Project aloha",
-  "version": "1.0.174",
+  "version": "1.0.176",
   "author": "Ilia Brykin",
   "scripts": {
     "build-icons": "node scriptsNode/iconsSvgToJs.js bootstrap3 && node scriptsNode/iconsSvgToJs.js bootstrap-1-9-1"

package/src/directives/ASafeHtml.js

@@ -1,10 +1,22 @@
 import DOMPurify from "dompurify";
 
+import {
+  isNumber,
+  toString,
+} from "lodash-es";
+
 export default {
   beforeMount(el, binding) {
-    el.innerHTML = DOMPurify.sanitize(binding.value);
+    el.innerHTML = DOMPurify.sanitize(toCorrectFormat(binding.value));
   },
   updated(el, binding) {
-    el.innerHTML = DOMPurify.sanitize(binding.value);
+    el.innerHTML = DOMPurify.sanitize(toCorrectFormat(binding.value));
   },
 };
+
+function toCorrectFormat(value) {
+  if (isNumber(value)) {
+    return toString(value);
+  }
+  return value;
+}

package/src/ui/ADatepicker/ADatepicker.js

@@ -46,7 +46,7 @@ export default {
       default: undefined,
     },
     valueType: {
-      default: "date",
+      default: "format",
       validator: function(value) {
         return ["timestamp", "format", "date"].indexOf(value) !== -1 || isPlainObject(value);
       },
@@ -143,6 +143,11 @@ export default {
       required: false,
       default: false,
     },
+    formatSave: {
+      type: String,
+      required: false,
+      default: "YYYY-MM-DD",
+    },
   },
   emits: [
     "blur",
@@ -259,8 +264,8 @@ export default {
         value2date,
       } = this.transform;
       if (!this.range) {
-        return this.isValidValue(this.modelValue)
-          ? this.stringify(value2date(this.modelValue))
+        return this.isValidValueText(this.modelValue)
+          ? this.stringify(this.value2dateText(this.modelValue))
           : "";
       }
       return this.isValidRangeValue(this.modelValue)
@@ -446,7 +451,7 @@ export default {
     parse(value) {
       return (isPlainObject(this.format) && typeof this.format.parse === "function")
         ? this.format.parse(value)
-        : parseDate(value, this.format);
+        : parseDate(value, this.format, this.formatSave);
     },
 
     isValidValue(value) {
@@ -516,7 +521,7 @@ export default {
       const { date2value } = this.transform;
       const value = this.range
         ? this.currentValue.map(date2value)
-        : date2value(this.currentValue);
+        : formatDate(this.currentValue, this.formatSave);
       this.changeModel({
         model: value,
       });
@@ -705,6 +710,23 @@ export default {
     setCloseFocus() {
       this.$refs.focusByClose && this.$refs.focusByClose.focus();
     },
+
+    isValidValueText(value) {
+      return !!parseDate(value, this.format, this.formatSave);
+    },
+
+    value2dateText(value) {
+      let dateValue = null;
+      try {
+        dateValue = moment(value, this.formatSave) || null;
+      } catch (e) {
+
+      }
+      if (dateValue && dateValue.isValid && !dateValue.isValid()) {
+        dateValue = null;
+      }
+      return dateValue;
+    },
   },
   render() {
     return this.isRender && h("div", {

package/src/ui/ADatepicker/utils/index.js

@@ -1,4 +1,5 @@
-import fecha from "fecha";
+// import fecha from "fecha";
+import moment from "moment";
 
 export function isPlainObject(obj) {
   return Object.prototype.toString.call(obj) === "[object Object]";
@@ -59,15 +60,16 @@ export function formatDate(date, format) {
     return "";
   }
   try {
-    return fecha.format(new Date(date), format);
+    return moment(date).format(format);
+    // return fecha.format(new Date(date), format);
   } catch (e) {
     return "";
   }
 }
 
-export function parseDate(value, format) {
+export function parseDate(value, format, formatSave) {
   try {
-    return fecha.parse(value, format) || null;
+    return moment(value, formatSave).format(format) || null;
   } catch (e) {
     return null;
   }