aloha-vue 1.0.43 → 1.0.46

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

@@ -60,6 +60,7 @@ export default {
           id: "aloha1",
           classColumn: "a_column_8",
           required: true,
+          isHide: true,
         },
         {
           type: "text",
@@ -79,6 +80,7 @@ export default {
           keyGroup: "group",
           data: this.selectData,
           helpText: "ALOHA help!!!",
+          change: this.changeAloha,
         },
         {
           type: "text",
@@ -196,5 +198,9 @@ export default {
     reset() {
       this.errors = undefined;
     },
+
+    changeAloha(arg) {
+      console.log("arg", arg);
+    },
   },
 };

package/docs/src/views/PageInput/PageInput.pug

@@ -7,7 +7,7 @@ div
     type="text"
     label="Input 1"
     :required="true"
-    @change="changeModel1"
+    :change="changeModel1"
   )
   div model1: {{ model1 }}
   h2 Textarea

package/package.json

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

package/src/AModal/AModal.js

@@ -415,7 +415,7 @@ export default {
                 ref: "modal_header",
                 class: "a_modal_header",
               }, [
-                this.$slots.header && this.$slots.header(),
+                this.$slots.modalHeader && this.$slots.modalHeader(),
                 this.headerText && h(this.headerTag, {
                   class: "a_modal_title",
                 }, [
@@ -433,7 +433,7 @@ export default {
                 ref: "modal_body",
                 class: "a_modal_body",
               }, [
-                this.$slots.body && this.$slots.body(),
+                this.$slots.modalBodyPrepend && this.$slots.modalBodyPrepend(),
                 this.isDataForm && h(AForm, {
                   modelValue: this.modelValue,
                   data: this.dataForm,
@@ -446,12 +446,13 @@ export default {
                 this.bodyHtml && h("div", {
                   innerHTML: this.bodyHtml,
                 }),
+                this.$slots.modalBodyAppend && this.$slots.modalBodyAppend(),
               ]),
               h("div", {
                 ref: "modal_footer",
                 class: "a_modal_footer",
               }, [
-                this.$slots.footer && this.$slots.footer(),
+                this.$slots.modalFooter && this.$slots.modalFooter(),
                 this.save && h("button", {
                   type: "button",
                   class: this.saveButtonClass,

package/src/ui/ACheckbox/ACheckbox.js

@@ -95,7 +95,7 @@ export default {
     };
   },
   render() {
-    return h("div", {
+    return !this.isHide && h("div", {
       style: this.componentStyleHideDependencies,
     }, [
       h("div", {

package/src/ui/AFieldset/AFieldset.js

@@ -68,7 +68,7 @@ export default {
     };
   },
   render() {
-    return h("div", {
+    return !this.isHide && h("div", {
       style: this.componentStyleHideDependencies,
     }, [
       h("fieldset", {

package/src/ui/AInput/AInput.js

@@ -122,7 +122,7 @@ export default {
     };
   },
   render() {
-    return h("div", {
+    return !this.isHide && h("div", {
       style: this.componentStyleHideDependencies,
     }, [
       h("div", {

package/src/ui/AOneCheckbox/AOneCheckbox.js

@@ -89,7 +89,7 @@ export default {
     };
   },
   render() {
-    return h("div", {
+    return !this.isHide && h("div", {
       style: this.componentStyleHideDependencies,
     }, [
       h("div", {

package/src/ui/ARadio/ARadio.js

@@ -100,7 +100,7 @@ export default {
     };
   },
   render() {
-    return h("div", {
+    return !this.isHide && h("div", {
       style: this.componentStyleHideDependencies,
     }, [
       h("div", {

package/src/ui/ASelect/ASelect.js

@@ -267,6 +267,7 @@ export default {
       changeModel,
       togglePopover,
       dataLocal,
+      dataKeyByKeyIdLocal,
     });
 
     const {
@@ -355,7 +356,7 @@ export default {
     };
   },
   render() {
-    return h("div", {
+    return !this.isHide && h("div", {
       style: this.componentStyleHideDependencies,
     }, [
       h("div", {

package/src/ui/ASelect/compositionAPI/ASelectModelChangeAPI.js

@@ -14,6 +14,7 @@ export default function ASelectModelChangeAPI(props, {
   changeModel = () => {},
   togglePopover = () => {},
   dataLocal = computed(() => []),
+  dataKeyByKeyIdLocal = computed(() => ({})),
 }) {
   const isCloseByClick = toRef(props, "isCloseByClick");
   const isCloseByClickLocal = computed(() => {
@@ -50,6 +51,8 @@ export default function ASelectModelChangeAPI(props, {
     changeModel({
       model: modelValueLocal,
       $event,
+      currentModel: currentValue,
+      item: dataKeyByKeyIdLocal.value[currentValue],
     });
 
     if (isCloseByClickLocal.value) {

package/src/ui/ASwitch/ASwitch.js

@@ -179,7 +179,7 @@ export default {
     };
   },
   render() {
-    return h("div", {
+    return !this.isHide && h("div", {
       style: this.componentStyleHideDependencies,
     }, [
       h("div", {

package/src/ui/ATemplate/ATemplate.js

@@ -38,7 +38,7 @@ export default {
     };
   },
   render() {
-    return h("div", {
+    return !this.isHide && h("div", {
       class: "a_template",
       ...this.attributesWithHtml,
     }, this.$slots[this.slotName] &&

package/src/ui/ATextarea/ATextarea.js

@@ -157,7 +157,7 @@ export default {
     };
   },
   render() {
-    return h("div", null, [
+    return !this.isHide && h("div", null, [
       h("div", {
         class: ["a_form_element__parent", {
           a_form_element__parent_float: this.isLabelFloat,

package/src/ui/compositionApi/UiAPI.js

@@ -25,11 +25,14 @@ export default function UiAPI(props, { emit }) {
     htmlIdLocal,
   });
 
-  const changeModel = ({ model }) => {
+  const change = toRef(props, "change");
+  const changeModel = ({ model, currentModel, item }) => {
     emit("update:modelValue", model);
-    emit("change", {
+    change.value({
       model,
       props,
+      currentModel,
+      item,
     });
   };
 

package/src/ui/mixins/UiMixinProps.js

@@ -91,10 +91,18 @@ export default {
       type: String,
       required: false,
     },
+    isHide: {
+      type: Boolean,
+      required: false,
+    },
+    change: {
+      type: Function,
+      required: false,
+      default: () => {},
+    },
   },
   emits: [
     "update:modelValue",
-    "change",
     "focus",
     "blur",
   ],