@nixweb/nixloc-ui 0.0.170 → 0.0.172
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 +1 -1
- package/src/component/forms/CheckboxSimple.vue +3 -0
- package/src/component/forms/ImageUpload.vue +2 -1
- package/src/component/forms/Select.vue +2 -2
- package/src/component/forms/SideBar.vue +18 -1
- package/src/component/layout/ScrollBar.vue +7 -4
- package/src/component/template/ViewTemplateReportPreview.vue +11 -3
- package/src/store/modules/user.js +5 -0
package/package.json
CHANGED
|
@@ -243,7 +243,7 @@ export default {
|
|
|
243
243
|
this.hideVodal(this.nameNewRegister);
|
|
244
244
|
},
|
|
245
245
|
cleanSelect() {
|
|
246
|
-
let obj = { id: "",
|
|
246
|
+
let obj = { id: "", content: "" };
|
|
247
247
|
this.currentValue = obj;
|
|
248
248
|
this.$emit("input", obj);
|
|
249
249
|
this.$refs.multiselect.deactivate();
|
|
@@ -295,7 +295,7 @@ export default {
|
|
|
295
295
|
resetForm: {
|
|
296
296
|
handler(form) {
|
|
297
297
|
if (form.nome == this.formName) {
|
|
298
|
-
let obj = { id: "",
|
|
298
|
+
let obj = { id: "", content: "" };
|
|
299
299
|
this.currentValue = obj;
|
|
300
300
|
this.$emit("input", obj);
|
|
301
301
|
this.formDirty = false;
|
|
@@ -70,10 +70,27 @@ export default {
|
|
|
70
70
|
border-radius: 15px 15px 0px 0px !important;
|
|
71
71
|
margin-top: 20px !important;
|
|
72
72
|
margin-right: 5% !important;
|
|
73
|
+
padding-top: 20px !important;
|
|
73
74
|
}
|
|
74
75
|
|
|
75
76
|
.b-sidebar > .b-sidebar-body {
|
|
76
|
-
overflow:
|
|
77
|
+
overflow-y: scroll !important;
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
.b-sidebar > .b-sidebar-body::-webkit-scrollbar-track {
|
|
81
|
+
background-color: white;
|
|
82
|
+
border-radius: 20px;
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
.b-sidebar > .b-sidebar-body::-webkit-scrollbar {
|
|
86
|
+
width: 6px;
|
|
87
|
+
background-color: #b9babb;
|
|
88
|
+
border-radius: 20px;
|
|
89
|
+
}
|
|
90
|
+
|
|
91
|
+
.b-sidebar > .b-sidebar-body::-webkit-scrollbar-thumb {
|
|
92
|
+
background-color: #b9babb;
|
|
93
|
+
border-radius: 20px;
|
|
77
94
|
}
|
|
78
95
|
|
|
79
96
|
.title-side-bar {
|
|
@@ -2,9 +2,13 @@
|
|
|
2
2
|
<div
|
|
3
3
|
:id="id"
|
|
4
4
|
class="scrollbar"
|
|
5
|
-
:style="
|
|
5
|
+
:style="
|
|
6
|
+
'max-height:' + maxHeight + 'px' + ';' + 'min-height:' + minHeight + 'px'
|
|
7
|
+
"
|
|
6
8
|
>
|
|
7
|
-
<
|
|
9
|
+
<div id="scroll-bar">
|
|
10
|
+
<slot></slot>
|
|
11
|
+
</div>
|
|
8
12
|
</div>
|
|
9
13
|
</template>
|
|
10
14
|
|
|
@@ -23,7 +27,7 @@ export default {
|
|
|
23
27
|
const listElm = document.querySelector("#" + this.id);
|
|
24
28
|
if (listElm != null)
|
|
25
29
|
listElm.addEventListener("scroll", (e) => {
|
|
26
|
-
if (listElm.scrollTop + listElm.clientHeight >= listElm.scrollHeight) {
|
|
30
|
+
if (listElm.scrollTop + listElm.clientHeight >= listElm.scrollHeight) {
|
|
27
31
|
if (this.endScrollBar) this.endScrollBar();
|
|
28
32
|
}
|
|
29
33
|
});
|
|
@@ -39,5 +43,4 @@ div {
|
|
|
39
43
|
overflow-y: visible;
|
|
40
44
|
overflow-x: hidden;
|
|
41
45
|
}
|
|
42
|
-
|
|
43
46
|
</style>
|
|
@@ -9,6 +9,7 @@
|
|
|
9
9
|
>
|
|
10
10
|
<div slot="content-main">
|
|
11
11
|
<br />
|
|
12
|
+
<Loading type="line" :center="false" v-show="loadingSearch" />
|
|
12
13
|
<div v-show="!showFilter">
|
|
13
14
|
<div
|
|
14
15
|
class="div-progress"
|
|
@@ -153,6 +154,7 @@ import Button from "@nixweb/nixloc-ui/src/component/forms/Button";
|
|
|
153
154
|
import Modal from "@nixweb/nixloc-ui/src/component/forms/Modal";
|
|
154
155
|
import Alert from "@nixweb/nixloc-ui/src/component/layout/Alert";
|
|
155
156
|
import Tags from "@nixweb/nixloc-ui/src/component/shared/query-builder/Tags.vue";
|
|
157
|
+
import Loading from "@nixweb/nixloc-ui/src/component/shared/Loading.vue";
|
|
156
158
|
import Report from "../shared/Report.vue";
|
|
157
159
|
|
|
158
160
|
import ReportCreateUpdate from "@nixweb/nixloc-ui/src/component/template/ReportCreateUpdate.vue";
|
|
@@ -176,6 +178,7 @@ export default {
|
|
|
176
178
|
Modal,
|
|
177
179
|
Alert,
|
|
178
180
|
Tags,
|
|
181
|
+
Loading,
|
|
179
182
|
Report,
|
|
180
183
|
ReportCreateUpdate,
|
|
181
184
|
Fields,
|
|
@@ -194,7 +197,7 @@ export default {
|
|
|
194
197
|
},
|
|
195
198
|
baseParams: {
|
|
196
199
|
currentPage: 0,
|
|
197
|
-
totalPerPage:
|
|
200
|
+
totalPerPage: 100,
|
|
198
201
|
totalPage: 0,
|
|
199
202
|
totalRecords: 0,
|
|
200
203
|
},
|
|
@@ -204,6 +207,7 @@ export default {
|
|
|
204
207
|
width: 0,
|
|
205
208
|
},
|
|
206
209
|
btnSearchDisabled: false,
|
|
210
|
+
loadingSearch: false,
|
|
207
211
|
btnSaveDisabled: true,
|
|
208
212
|
isLoading: false,
|
|
209
213
|
showBodyReport: false,
|
|
@@ -251,6 +255,7 @@ export default {
|
|
|
251
255
|
},
|
|
252
256
|
getAll() {
|
|
253
257
|
this.btnSearchDisabled = true;
|
|
258
|
+
this.loadingSearch = true;
|
|
254
259
|
|
|
255
260
|
if (this.rulesIsValid) {
|
|
256
261
|
this.getTotalRecords();
|
|
@@ -263,10 +268,11 @@ export default {
|
|
|
263
268
|
getTotalRecords() {
|
|
264
269
|
let paramsQuery = { url: this.urlQuery };
|
|
265
270
|
this.resetData();
|
|
266
|
-
|
|
267
271
|
this.getApiOdata(paramsQuery).then((response) => {
|
|
268
272
|
this.isLoading = true;
|
|
269
273
|
let totalRecords = response["@odata.count"];
|
|
274
|
+
this.loadingSearch = false;
|
|
275
|
+
|
|
270
276
|
if (totalRecords == 0) this.noDataReturned = true;
|
|
271
277
|
|
|
272
278
|
this.baseParams.totalRecords = totalRecords;
|
|
@@ -373,7 +379,7 @@ export default {
|
|
|
373
379
|
: "$apply=";
|
|
374
380
|
let baseUrl = `${
|
|
375
381
|
this.templateList.urlGetApi
|
|
376
|
-
}?${query}aggregate(${this.oDataFilter.totalization.replace(",", "")})`;
|
|
382
|
+
}?${query}aggregate(${this.oDataFilter.totalization.replace(",", "")})/$count`;
|
|
377
383
|
return baseUrl;
|
|
378
384
|
},
|
|
379
385
|
liveTotalRecords() {
|
|
@@ -390,9 +396,11 @@ export default {
|
|
|
390
396
|
"content.totalPages": {
|
|
391
397
|
handler(totalPages) {
|
|
392
398
|
if (totalPages.length > 0) {
|
|
399
|
+
console.log("Total Pages...");
|
|
393
400
|
let self = this;
|
|
394
401
|
setTimeout(function () {
|
|
395
402
|
self.getAllManyPages();
|
|
403
|
+
console.log("Get All Many Pages...");
|
|
396
404
|
}, 1000);
|
|
397
405
|
}
|
|
398
406
|
if (totalPages.length == 1) this.isLoading = false;
|
|
@@ -49,6 +49,11 @@ export default {
|
|
|
49
49
|
updateParameterStock: (state, parameterStock) => {
|
|
50
50
|
state.userLogged.parameterStock = parameterStock;
|
|
51
51
|
},
|
|
52
|
+
updateParameterDangerZone: (state, parameterDangerZone) => {
|
|
53
|
+
state.userLogged.parameterStock.calculateByFullPeriod = parameterDangerZone.calculateByFullPeriod;
|
|
54
|
+
state.userLogged.parameterStock.displayPeriod = parameterDangerZone.displayPeriod;
|
|
55
|
+
state.userLogged.parameterStock.manageByPatrimony = parameterDangerZone.manageByPatrimony;
|
|
56
|
+
},
|
|
52
57
|
updateToken: (state, token) => {
|
|
53
58
|
state.userLogged.token = token;
|
|
54
59
|
}
|