@nixweb/nixloc-ui 0.0.288 → 0.0.290
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/SideBar.vue +6 -16
- package/src/component/report/Report.vue +9 -2
- package/src/component/shared/file-manager/FileManager.vue +6 -8
- package/src/component/shared/filter-builder/FilterBuilder.vue +9 -4
- package/src/component/shared/filter-builder/FilterQuery.vue +2 -2
package/package.json
CHANGED
|
@@ -1,17 +1,7 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<div>
|
|
3
|
-
<b-sidebar
|
|
4
|
-
|
|
5
|
-
:title="title"
|
|
6
|
-
width="90%"
|
|
7
|
-
bg-variant="white"
|
|
8
|
-
no-header
|
|
9
|
-
right
|
|
10
|
-
backdrop-variant="dark"
|
|
11
|
-
@hidden="hideSideBar"
|
|
12
|
-
backdrop
|
|
13
|
-
shadow
|
|
14
|
-
>
|
|
3
|
+
<b-sidebar id="my-sidebar" :title="title" width="90%" bg-variant="white" no-header right backdrop-variant="dark"
|
|
4
|
+
@hidden="hideSideBar" backdrop shadow>
|
|
15
5
|
<div class="margin-side-bar">
|
|
16
6
|
<div>
|
|
17
7
|
<Messages />
|
|
@@ -73,22 +63,22 @@ export default {
|
|
|
73
63
|
padding-top: 20px !important;
|
|
74
64
|
}
|
|
75
65
|
|
|
76
|
-
.b-sidebar
|
|
66
|
+
.b-sidebar>.b-sidebar-body {
|
|
77
67
|
overflow-y: scroll !important;
|
|
78
68
|
}
|
|
79
69
|
|
|
80
|
-
.b-sidebar
|
|
70
|
+
.b-sidebar>.b-sidebar-body::-webkit-scrollbar-track {
|
|
81
71
|
background-color: white;
|
|
82
72
|
border-radius: 20px;
|
|
83
73
|
}
|
|
84
74
|
|
|
85
|
-
.b-sidebar
|
|
75
|
+
.b-sidebar>.b-sidebar-body::-webkit-scrollbar {
|
|
86
76
|
width: 6px;
|
|
87
77
|
background-color: #b9babb;
|
|
88
78
|
border-radius: 20px;
|
|
89
79
|
}
|
|
90
80
|
|
|
91
|
-
.b-sidebar
|
|
81
|
+
.b-sidebar>.b-sidebar-body::-webkit-scrollbar-thumb {
|
|
92
82
|
background-color: #b9babb;
|
|
93
83
|
border-radius: 20px;
|
|
94
84
|
}
|
|
@@ -33,8 +33,10 @@
|
|
|
33
33
|
<div v-if="!isValid">
|
|
34
34
|
<Alert type="info">
|
|
35
35
|
<span>
|
|
36
|
-
É necessário informar o filtro <
|
|
37
|
-
|
|
36
|
+
É necessário informar o filtro <div class="badge badge-default">
|
|
37
|
+
{{ fieldsRequired }}
|
|
38
|
+
</div>, clique no botão <b> <i class="div-icon-btn fa-sharp fa-solid fa-filters"
|
|
39
|
+
aria-hidden="true"></i> Filtros
|
|
38
40
|
</b>para
|
|
39
41
|
adicionar.
|
|
40
42
|
</span>
|
|
@@ -298,4 +300,9 @@ export default {
|
|
|
298
300
|
color: red;
|
|
299
301
|
cursor: pointer;
|
|
300
302
|
}
|
|
303
|
+
|
|
304
|
+
.badge-default {
|
|
305
|
+
background-color: #eeeeee;
|
|
306
|
+
font-size: 13px !important;
|
|
307
|
+
}
|
|
301
308
|
</style>
|
|
@@ -24,7 +24,8 @@
|
|
|
24
24
|
<b-col sm="9" v-if="!showCapture">
|
|
25
25
|
<div class="side-by-side" v-for="attachment in attachments">
|
|
26
26
|
<div class="text-center box-file">
|
|
27
|
-
<div class="div-image"
|
|
27
|
+
<div class="div-image"
|
|
28
|
+
v-if="attachment.extension == '.png' || attachment.extension == '.jpg'"
|
|
28
29
|
@click="openImage(baseUrl + attachment.fileName)">
|
|
29
30
|
<img class="img" :src="baseUrl + attachment.fileName">
|
|
30
31
|
</div>
|
|
@@ -165,7 +166,7 @@ export default {
|
|
|
165
166
|
});
|
|
166
167
|
},
|
|
167
168
|
async loadFiles() {
|
|
168
|
-
this.hideModal("confirm");
|
|
169
|
+
if (this.showInModal) this.hideModal("confirm");
|
|
169
170
|
this.loading = true;
|
|
170
171
|
let self = this;
|
|
171
172
|
for (const file of this.files) {
|
|
@@ -219,8 +220,7 @@ export default {
|
|
|
219
220
|
if (this.$refs.webcam) {
|
|
220
221
|
this.$refs.webcam.stop();
|
|
221
222
|
this.showCapture = false;
|
|
222
|
-
if (this.showInModal)
|
|
223
|
-
this.hideModal();
|
|
223
|
+
if (this.showInModal) this.hideModal();
|
|
224
224
|
}
|
|
225
225
|
},
|
|
226
226
|
captureImage() {
|
|
@@ -276,7 +276,7 @@ export default {
|
|
|
276
276
|
},
|
|
277
277
|
};
|
|
278
278
|
</script>
|
|
279
|
-
|
|
279
|
+
|
|
280
280
|
<style scoped>
|
|
281
281
|
.file {
|
|
282
282
|
position: relative;
|
|
@@ -385,6 +385,4 @@ export default {
|
|
|
385
385
|
.div-btn {
|
|
386
386
|
margin-bottom: 50px;
|
|
387
387
|
}
|
|
388
|
-
</style>
|
|
389
|
-
|
|
390
|
-
|
|
388
|
+
</style>
|
|
@@ -28,10 +28,13 @@
|
|
|
28
28
|
</b-col>
|
|
29
29
|
</b-row>
|
|
30
30
|
</div>
|
|
31
|
-
<div v-if="item.type == 'multiOptions'">
|
|
31
|
+
<div v-if="item.type == 'multiOptions' || item.type == 'listOptions'">
|
|
32
32
|
<div class="div-multi-options">
|
|
33
|
-
<CheckboxServer
|
|
34
|
-
v-model="item.value" />
|
|
33
|
+
<CheckboxServer v-if="!item.options" :title="item.title"
|
|
34
|
+
:propsParams="item.propsParams" :url="item.url" v-model="item.value" />
|
|
35
|
+
|
|
36
|
+
<CheckboxGroup v-else :title="item.title" :options="item.options"
|
|
37
|
+
:initialValue="item.value" v-model="item.value" />
|
|
35
38
|
</div>
|
|
36
39
|
</div>
|
|
37
40
|
<InputText v-if="item.type == 'text' || item.type == 'patrimony'" :title="item.title"
|
|
@@ -94,6 +97,7 @@ export default {
|
|
|
94
97
|
{
|
|
95
98
|
id: filter.type,
|
|
96
99
|
content: filter.title,
|
|
100
|
+
listName: filter.listName,
|
|
97
101
|
field: filter.field,
|
|
98
102
|
options: filter.options,
|
|
99
103
|
title: filter.title,
|
|
@@ -110,11 +114,12 @@ export default {
|
|
|
110
114
|
return this.filtersAdded.map(item => ({
|
|
111
115
|
routeName: this.$route.name,
|
|
112
116
|
title: item.title,
|
|
117
|
+
listName: item.listName,
|
|
113
118
|
field: item.field,
|
|
114
119
|
type: item.type,
|
|
115
120
|
originalValue: item.value,
|
|
116
121
|
required: item.required,
|
|
117
|
-
value: item.type == "decimal" ? [item.valueStart, item.valueEnd].join('
|
|
122
|
+
value: item.type == "decimal" ? [item.valueStart, item.valueEnd].join('<>') : Array.isArray(item.value) ? item.value.join('<>') : item.value
|
|
118
123
|
}));
|
|
119
124
|
},
|
|
120
125
|
},
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
<template>
|
|
2
|
-
<div class="div-main">
|
|
2
|
+
<div class="div-main-filter">
|
|
3
3
|
<div>
|
|
4
4
|
<Button _key="btnFilter" tooltip="Aplicar Filtros" color="black" backGroundColor="#F0F0F0" title="Filtros"
|
|
5
5
|
classIcon="fa-sharp fa-solid fa-filters" size="small" :clicked="openFilter" />
|
|
@@ -84,7 +84,7 @@ export default {
|
|
|
84
84
|
|
|
85
85
|
</script>.
|
|
86
86
|
<style>
|
|
87
|
-
.div-main {
|
|
87
|
+
.div-main-filter {
|
|
88
88
|
margin-bottom: 20px;
|
|
89
89
|
}
|
|
90
90
|
|