aloha-vue 1.0.217 → 1.0.219

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.
@@ -22,6 +22,7 @@ div
22
22
  key-label="label"
23
23
  label="Test label"
24
24
  :is-button-group="true"
25
+ :required="true"
25
26
  )
26
27
  div modelArr:
27
28
  pre {{ modelArr }}
@@ -25,7 +25,9 @@ export default {
25
25
  grow: 2,
26
26
  footerSlot: "footerAloha",
27
27
  class: "a_text_right",
28
+ icon: "Close",
28
29
  isRender: true,
30
+ title: "Aloha",
29
31
  },
30
32
  {
31
33
  label: "Slot",
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "aloha-vue",
3
3
  "description": "Project aloha",
4
- "version": "1.0.217",
4
+ "version": "1.0.219",
5
5
  "author": "Ilia Brykin",
6
6
  "scripts": {
7
7
  "build-icons": "node scriptsNode/iconsSvgToJs.js bootstrap3 && node scriptsNode/iconsSvgToJs.js bootstrap-1-9-1"
@@ -456,7 +456,14 @@ export default {
456
456
  ref: "modal_footer",
457
457
  class: "a_modal_footer",
458
458
  }, [
459
- this.$slots.modalFooter && this.$slots.modalFooter(),
459
+ this.$slots.modalFooterPrepend && this.$slots.modalFooterPrepend({
460
+ saveButtonClass: this.saveButtonClass,
461
+ closeButtonClass: this.closeButtonClass,
462
+ disabled: this.disabledLocal,
463
+ disabledSave: this.disabledSave,
464
+ save: this.save,
465
+ close: this.close,
466
+ }),
460
467
  (!this.isSaveButtonHide && this.save) && h("button", {
461
468
  type: "button",
462
469
  class: this.saveButtonClass,
@@ -473,6 +480,14 @@ export default {
473
480
  }, [
474
481
  h("span", null, this.closeButtonText),
475
482
  ]),
483
+ this.$slots.modalFooterAppend && this.$slots.modalFooterAppend({
484
+ saveButtonClass: this.saveButtonClass,
485
+ closeButtonClass: this.closeButtonClass,
486
+ disabled: this.disabledLocal,
487
+ disabledSave: this.disabledSave,
488
+ save: this.save,
489
+ close: this.close,
490
+ }),
476
491
  ]),
477
492
  ]),
478
493
  ]),
@@ -196,9 +196,25 @@ export default {
196
196
  ],
197
197
  }, [
198
198
  h(this.componentLocal, this.attributesForButton, [
199
- h(ATranslation, {
199
+ this.column.icon && h(AIcon, {
200
+ icon: this.column.icon,
201
+ class: "a_table__th__icon",
202
+ }),
203
+ this.column.label && h(ATranslation, {
200
204
  html: this.column.label,
201
205
  tag: "span",
206
+ class: "a_table__th__text",
207
+ }),
208
+ this.column.title && h(ATranslation, {
209
+ title: this.column.title,
210
+ ariaHidden: true,
211
+ tag: "span",
212
+ class: "a_position_absolute_all",
213
+ }),
214
+ this.column.title && h(ATranslation, {
215
+ text: this.column.title,
216
+ tag: "span",
217
+ class: "a_sr_only",
202
218
  }),
203
219
  h("span", {
204
220
  class: "a_table__th__sort__icons",
@@ -105,6 +105,7 @@
105
105
  align-items: center;
106
106
  background-color: var(--a_table_th_bg);
107
107
  border-bottom: var(--a_table_th_border_bottom_width) solid var(--a_table_th_border_bottom_color);
108
+ position: relative;
108
109
  }
109
110
  .a_table__th_draggable {
110
111
  cursor: move;
@@ -206,6 +207,10 @@
206
207
  border-top: var(--a_table_footer_border_top);
207
208
  }
208
209
 
210
+ .a_table__th__icon + .a_table__th__text {
211
+ margin-left: var(--a_table_between_actions_margin, .5rem);
212
+ }
213
+
209
214
  .a_table__th__sort {
210
215
  padding: 0;
211
216
  border: none;
@@ -1,4 +1,5 @@
1
1
  import {
2
+ computed,
2
3
  h,
3
4
  toRef,
4
5
  withDirectives,
@@ -6,6 +7,7 @@ import {
6
7
 
7
8
  import ACheckboxItem from "./ACheckboxItem/ACheckboxItem";
8
9
  import AErrorsText from "../AErrorsText/AErrorsText";
10
+ import ATranslation from "../../ATranslation/ATranslation";
9
11
 
10
12
  import ASafeHtml from "../../directives/ASafeHtml";
11
13
 
@@ -83,6 +85,8 @@ export default {
83
85
  "updateData",
84
86
  ],
85
87
  setup(props, context) {
88
+ const required = toRef(props, "required");
89
+
86
90
  const {
87
91
  componentStyleHide,
88
92
  } = UiStyleHideAPI(props);
@@ -107,6 +111,10 @@ export default {
107
111
  dataKeyByKeyIdLocal,
108
112
  });
109
113
 
114
+ const textAfterLabel = computed(() => {
115
+ return required.value ? "*" : "";
116
+ });
117
+
110
118
  const disabled = toRef(props, "disabled");
111
119
  const onChangeModelValue = ({ model, $event }) => {
112
120
  if (disabled.value) {
@@ -128,6 +136,7 @@ export default {
128
136
  helpTextId,
129
137
  htmlIdLocal,
130
138
  isErrors,
139
+ textAfterLabel,
131
140
 
132
141
  dataLocal,
133
142
 
@@ -159,13 +168,14 @@ export default {
159
168
  ],
160
169
  "aria-describedby": this.ariaDescribedbyLocal,
161
170
  }, [
162
- this.label && withDirectives(h("legend", {
171
+ this.label && h(ATranslation, {
172
+ tag: "legend",
163
173
  class: ["a_legend", {
164
174
  a_legend_invalid: this.isErrors,
165
175
  }],
166
- }), [
167
- [ASafeHtml, this.label],
168
- ]),
176
+ html: this.label,
177
+ textAfter: this.textAfterLabel,
178
+ }),
169
179
  h("div", {
170
180
  class: {
171
181
  a_btn_group: this.isButtonGroup,
@@ -1,4 +1,5 @@
1
1
  import {
2
+ computed,
2
3
  h,
3
4
  toRef,
4
5
  withDirectives,
@@ -15,6 +16,7 @@ import UiAPI from "../compositionApi/UiAPI";
15
16
  import UiDataWithKeyIdAndLabelAPI from "../compositionApi/UiDataWithKeyIdAndLabelAPI";
16
17
  import UiDataWatchEmitAPI from "../compositionApi/UiDataWatchEmitAPI";
17
18
  import UiStyleHideAPI from "../compositionApi/UiStyleHideAPI";
19
+ import ATranslation from "../../ATranslation/ATranslation";
18
20
 
19
21
  export default {
20
22
  name: "ARadio",
@@ -83,6 +85,8 @@ export default {
83
85
  "updateData",
84
86
  ],
85
87
  setup(props, context) {
88
+ const required = toRef(props, "required");
89
+
86
90
  const {
87
91
  componentStyleHide,
88
92
  } = UiStyleHideAPI(props);
@@ -107,6 +111,10 @@ export default {
107
111
  dataKeyByKeyIdLocal,
108
112
  });
109
113
 
114
+ const textAfterLabel = computed(() => {
115
+ return required.value ? "*" : "";
116
+ });
117
+
110
118
  const disabled = toRef(props, "disabled");
111
119
  const onChangeModelValue = ({ model, $event }) => {
112
120
  if (disabled.value) {
@@ -128,6 +136,7 @@ export default {
128
136
  helpTextId,
129
137
  htmlIdLocal,
130
138
  isErrors,
139
+ textAfterLabel,
131
140
 
132
141
  dataLocal,
133
142
 
@@ -159,13 +168,14 @@ export default {
159
168
  ],
160
169
  "aria-describedby": this.ariaDescribedbyLocal,
161
170
  }, [
162
- this.label && withDirectives(h("legend", {
171
+ this.label && h(ATranslation, {
172
+ tag: "legend",
163
173
  class: ["a_legend", {
164
174
  a_legend_invalid: this.isErrors,
165
175
  }],
166
- }), [
167
- [ASafeHtml, this.label],
168
- ]),
176
+ html: this.label,
177
+ textAfter: this.textAfterLabel,
178
+ }),
169
179
  h("div", {
170
180
  class: {
171
181
  a_btn_group: this.isButtonGroup,