aloha-vue 1.2.145 → 1.2.147

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -14,7 +14,7 @@
14
14
  "Vue.js"
15
15
  ],
16
16
  "homepage": "https://github.com/ilia-brykin/aloha/#README.md",
17
- "version": "1.2.145",
17
+ "version": "1.2.147",
18
18
  "author": {
19
19
  "name": "Ilia Brykin",
20
20
  "email": "brykin.ilia@gmail.com"
@@ -37,6 +37,11 @@ export default {
37
37
  required: false,
38
38
  default: () => alertPluginOptions.value.propsDefault.closable,
39
39
  },
40
+ extra: {
41
+ type: Object,
42
+ required: false,
43
+ default: undefined,
44
+ },
40
45
  html: {
41
46
  type: String,
42
47
  required: false,
@@ -154,6 +159,7 @@ export default {
154
159
  ],
155
160
  }, [
156
161
  (this.html || this.text || this.safeHtml) && h(ATranslation, {
162
+ extra: this.extra,
157
163
  html: this.html,
158
164
  safeHtml: this.safeHtml,
159
165
  text: this.text,
@@ -9,6 +9,7 @@ import {
9
9
  } from "vue";
10
10
 
11
11
  import AButton from "../AButton/AButton";
12
+ import ALoading from "../ALoading/ALoading";
12
13
  import ATranslation from "../ATranslation/ATranslation";
13
14
 
14
15
  import CloseFromOutsideAPI from "./compositionAPI/CloseFromOutsideAPI";
@@ -343,28 +344,33 @@ export default {
343
344
  ref: "modal_footer",
344
345
  class: "a_modal_footer",
345
346
  }, [
346
- this.$slots.modalFooterPrepend && this.$slots.modalFooterPrepend(),
347
- (!this.isSaveButtonHide && this.save) && h(AButton, {
348
- id: this.saveButtonId,
349
- class: this.saveButtonClass,
350
- disabled: this.disabledLocal || this.disabledSave,
351
- extra: this.extra,
352
- html: this.saveButtonText,
353
- type: "button",
354
- ...this.saveButtonAttributes,
355
- onClick: this.save,
356
- }),
357
- !this.isCloseButtonHide && h(AButton, {
358
- id: this.closeButtonId,
359
- type: "button",
360
- class: this.closeButtonClass,
361
- disabled: this.disabledLocal,
362
- html: this.closeButtonText,
363
- extra: this.extra,
364
- ...this.closeButtonAttributes,
365
- onClick: () => this.close(true),
366
- }),
367
- this.$slots.modalFooterAppend && this.$slots.modalFooterAppend(),
347
+ h(ALoading, {
348
+ isLoading: this.loading,
349
+ }, () => [
350
+ this.$slots.modalFooterPrepend && this.$slots.modalFooterPrepend(),
351
+ (!this.isSaveButtonHide && this.save) && h(AButton, {
352
+ id: this.saveButtonId,
353
+ class: this.saveButtonClass,
354
+ disabled: this.disabledLocal || this.disabledSave,
355
+ extra: this.extra,
356
+ html: this.saveButtonText,
357
+ type: "button",
358
+ ...this.saveButtonAttributes,
359
+ onClick: this.save,
360
+ }),
361
+ !this.isCloseButtonHide && h(AButton, {
362
+ id: this.closeButtonId,
363
+ type: "button",
364
+ class: this.closeButtonClass,
365
+ disabled: this.disabledLocal,
366
+ html: this.closeButtonText,
367
+ extra: this.extra,
368
+ ...this.closeButtonAttributes,
369
+ onClick: () => this.close(true),
370
+ }),
371
+ this.$slots.modalFooterAppend && this.$slots.modalFooterAppend(),
372
+ ]),
373
+
368
374
  ]) : "",
369
375
  ]),
370
376
  ]),
@@ -9,6 +9,7 @@ import AErrorsText from "../AErrorsText/AErrorsText";
9
9
  import AFormHelpText from "../AFormHelpText/AFormHelpText";
10
10
  import ATranslation from "../../ATranslation/ATranslation";
11
11
  import AUiComponents from "../AUiComponents";
12
+ import AUiContainerComponents from "../AUiContainerComponents";
12
13
 
13
14
  import UiMixinProps from "../mixins/UiMixinProps";
14
15
 
@@ -84,8 +85,9 @@ export default {
84
85
  } = UIExcludeRenderAttributesAPI(props);
85
86
 
86
87
  const componentTypesMapping = {
88
+ ...AUiComponents,
89
+ ...AUiContainerComponents,
87
90
  fieldset: resolveComponent("AFieldset"),
88
- ...AUiComponents
89
91
  };
90
92
 
91
93
  const {
@@ -47,7 +47,7 @@ export default {
47
47
  type: String,
48
48
  required: false,
49
49
  default: inputNumberPluginOptions.value.propsDefault.controlsType,
50
- validator: value => ["plus-minus", "arrows"].indexOf(value) !== -1,
50
+ validator: value => ["plus-minus", "arrows", "none"].indexOf(value) !== -1,
51
51
  // TODO: "arrows",
52
52
  },
53
53
  eAllowed: {