@mapomodule/uikit 1.0.0-alpha.48 → 1.0.0-alpha.49
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/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,22 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
# [1.0.0-alpha.49](https://github.com/lotrekagency/mapo/compare/v1.0.0-alpha.48...v1.0.0-alpha.49) (2023-07-27)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* component TimeField resolve browser loop ([504a629](https://github.com/lotrekagency/mapo/commit/504a62902f0fd5fd54b74a1c251cca3c53dbcf67))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
### Features
|
|
15
|
+
|
|
16
|
+
* added max-depth prop to menu manager to give the possibility of set a limit in depth for nesting ([e4ab7a1](https://github.com/lotrekagency/mapo/commit/e4ab7a137cbb392e709e8865404105d7707a7634))
|
|
17
|
+
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
|
|
21
|
+
|
|
6
22
|
# [1.0.0-alpha.48](https://github.com/lotrekagency/mapo/compare/v1.0.0-alpha.47...v1.0.0-alpha.48) (2023-07-14)
|
|
7
23
|
|
|
8
24
|
|
|
@@ -68,6 +68,7 @@ export default {
|
|
|
68
68
|
return {
|
|
69
69
|
model: { model: null, returnDate: false },
|
|
70
70
|
menu: null,
|
|
71
|
+
isUpdating: false, // Add a flag to track updates
|
|
71
72
|
};
|
|
72
73
|
},
|
|
73
74
|
props: {
|
|
@@ -83,10 +84,13 @@ export default {
|
|
|
83
84
|
},
|
|
84
85
|
},
|
|
85
86
|
watch: {
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
87
|
+
value(val) {
|
|
88
|
+
if (!this.isUpdating) { // Check if an update is already in progress
|
|
89
|
+
const model = this.setupModel(val);
|
|
90
|
+
if (JSON.stringify(model) !== JSON.stringify(this.model)) {
|
|
91
|
+
this.isUpdating = true; // Set the flag to indicate an update is in progress
|
|
92
|
+
this.model = model;
|
|
93
|
+
}
|
|
90
94
|
}
|
|
91
95
|
},
|
|
92
96
|
model: {
|
|
@@ -140,8 +144,10 @@ export default {
|
|
|
140
144
|
},
|
|
141
145
|
},
|
|
142
146
|
mounted() {
|
|
143
|
-
|
|
144
|
-
|
|
147
|
+
this.model = this.setupModel(this.value); // Initialize the model on mount
|
|
148
|
+
},
|
|
149
|
+
updated() {
|
|
150
|
+
this.isUpdating = false; // Reset the flag after the component updates
|
|
145
151
|
},
|
|
146
152
|
};
|
|
147
153
|
</script>
|
|
@@ -9,6 +9,7 @@
|
|
|
9
9
|
<MenuTreeview
|
|
10
10
|
v-model="selected"
|
|
11
11
|
:nodes.sync="nodes"
|
|
12
|
+
:max-depth="maxDepth"
|
|
12
13
|
:title="`Menu: ${model.key}`"
|
|
13
14
|
ref="treeview"
|
|
14
15
|
>
|
|
@@ -140,6 +141,10 @@ export default {
|
|
|
140
141
|
type: String | Number,
|
|
141
142
|
default: "new",
|
|
142
143
|
},
|
|
144
|
+
maxDepth: {
|
|
145
|
+
type: Number,
|
|
146
|
+
default: -1
|
|
147
|
+
}
|
|
143
148
|
},
|
|
144
149
|
data() {
|
|
145
150
|
return {
|
|
@@ -25,9 +25,11 @@
|
|
|
25
25
|
class="menu-treeview--main-draggable-wrapper"
|
|
26
26
|
:emptyInsertThreshold="25"
|
|
27
27
|
group="nodes"
|
|
28
|
+
:move="move"
|
|
28
29
|
draggable=".menu-treeview--draggable"
|
|
29
30
|
@start="_dragging = true"
|
|
30
31
|
@end="_dragging = false"
|
|
32
|
+
data-depth="0"
|
|
31
33
|
>
|
|
32
34
|
<v-list-item
|
|
33
35
|
v-for="item in inNodes"
|
|
@@ -39,6 +41,7 @@
|
|
|
39
41
|
<MenuTreeviewNode
|
|
40
42
|
:node="item"
|
|
41
43
|
:selected.sync="selected"
|
|
44
|
+
:max-depth="maxDepth"
|
|
42
45
|
@delete="deleteNode"
|
|
43
46
|
@silentDelete="silentDeleteNode"
|
|
44
47
|
ref="nodes"
|
|
@@ -115,6 +118,7 @@
|
|
|
115
118
|
|
|
116
119
|
<script>
|
|
117
120
|
import draggable from "vuedraggable";
|
|
121
|
+
import { calcMaxMenuNestDepth } from "@mapomodule/utils/helpers/menu";
|
|
118
122
|
|
|
119
123
|
export default {
|
|
120
124
|
name: "MenuTreeview",
|
|
@@ -133,6 +137,10 @@ export default {
|
|
|
133
137
|
type: Object | null,
|
|
134
138
|
required: false,
|
|
135
139
|
},
|
|
140
|
+
maxDepth: {
|
|
141
|
+
type: Number,
|
|
142
|
+
default: -1
|
|
143
|
+
},
|
|
136
144
|
loading: Boolean,
|
|
137
145
|
},
|
|
138
146
|
data() {
|
|
@@ -156,6 +164,11 @@ export default {
|
|
|
156
164
|
},
|
|
157
165
|
},
|
|
158
166
|
methods: {
|
|
167
|
+
move(val){
|
|
168
|
+
let { draggedContext: { element }} = val
|
|
169
|
+
let totalDepth = calcMaxMenuNestDepth(element) + (+val.to.dataset.depth);
|
|
170
|
+
return !(this.maxDepth > 0 && totalDepth >= this.maxDepth)
|
|
171
|
+
},
|
|
159
172
|
newNode() {
|
|
160
173
|
let node = {
|
|
161
174
|
new: true,
|
|
@@ -165,7 +178,11 @@ export default {
|
|
|
165
178
|
meta: {},
|
|
166
179
|
link: { relational: {} },
|
|
167
180
|
};
|
|
168
|
-
(this.
|
|
181
|
+
if (this.maxDepth > 0 && this.currentDepth >= this.maxDepth){
|
|
182
|
+
this.inNodes.push(node);
|
|
183
|
+
} else {
|
|
184
|
+
this.selected ? this.selected.nodes.push(node) : this.inNodes.push(node);
|
|
185
|
+
}
|
|
169
186
|
this.$refs?.nodes?.forEach((nodeRef) => nodeRef.openIfChild(node));
|
|
170
187
|
},
|
|
171
188
|
compareItems(a, b) {
|
|
@@ -202,5 +219,19 @@ export default {
|
|
|
202
219
|
return this.deleteNode(this.selected);
|
|
203
220
|
},
|
|
204
221
|
},
|
|
222
|
+
computed: {
|
|
223
|
+
currentDepth() {
|
|
224
|
+
let find = (nodes, depth = 0) => {
|
|
225
|
+
let node = nodes.find(({ id }) => id == this.selected?.id);
|
|
226
|
+
return node
|
|
227
|
+
? depth + 1
|
|
228
|
+
: nodes
|
|
229
|
+
.filter(({ nodes }) => nodes.length)
|
|
230
|
+
.reduce((acc, node) => {
|
|
231
|
+
return acc > 0 ? acc : find(node.nodes, depth + 1);
|
|
232
|
+
}, 0);
|
|
233
|
+
};
|
|
234
|
+
return this.selected ? find(this.nodes) : 0},
|
|
235
|
+
}
|
|
205
236
|
};
|
|
206
237
|
</script>
|
|
@@ -46,6 +46,8 @@
|
|
|
46
46
|
draggable=".menu-treeview--draggable"
|
|
47
47
|
@start="inDragging = true"
|
|
48
48
|
@end="inDragging = false"
|
|
49
|
+
:move="move"
|
|
50
|
+
:data-depth="depth"
|
|
49
51
|
>
|
|
50
52
|
<v-list-item
|
|
51
53
|
v-for="(item, i) in inNode.nodes"
|
|
@@ -58,6 +60,8 @@
|
|
|
58
60
|
:node="item"
|
|
59
61
|
:selected.sync="inSelected"
|
|
60
62
|
:dragging.sync="inDragging"
|
|
63
|
+
:depth="depth + 1"
|
|
64
|
+
:max-depth="maxDepth"
|
|
61
65
|
ref="nodes"
|
|
62
66
|
@delete="$emit('delete', $event)"
|
|
63
67
|
@silentDelete="$emit('silentDelete', $event)"
|
|
@@ -90,6 +94,7 @@
|
|
|
90
94
|
|
|
91
95
|
<script>
|
|
92
96
|
import draggable from "vuedraggable";
|
|
97
|
+
import { calcMaxMenuNestDepth } from "@mapomodule/utils/helpers/menu";
|
|
93
98
|
|
|
94
99
|
export default {
|
|
95
100
|
name: "MenuTreeviewNode",
|
|
@@ -107,6 +112,14 @@ export default {
|
|
|
107
112
|
type: Boolean,
|
|
108
113
|
default: true,
|
|
109
114
|
},
|
|
115
|
+
depth: {
|
|
116
|
+
type: Number,
|
|
117
|
+
default: 1
|
|
118
|
+
},
|
|
119
|
+
maxDepth: {
|
|
120
|
+
type: Number,
|
|
121
|
+
default: -1
|
|
122
|
+
},
|
|
110
123
|
dragging: {
|
|
111
124
|
type: Boolean,
|
|
112
125
|
default: false,
|
|
@@ -149,6 +162,11 @@ export default {
|
|
|
149
162
|
},
|
|
150
163
|
},
|
|
151
164
|
methods: {
|
|
165
|
+
move(val){
|
|
166
|
+
let { draggedContext: { element }} = val
|
|
167
|
+
let totalDepth = calcMaxMenuNestDepth(element) + (+val.to.dataset.depth);
|
|
168
|
+
return !(this.maxDepth > 0 && totalDepth >= this.maxDepth)
|
|
169
|
+
},
|
|
152
170
|
select(e) {
|
|
153
171
|
this.inSelected = e;
|
|
154
172
|
},
|
package/package.json
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@mapomodule/uikit",
|
|
3
|
-
"version": "1.0.0-alpha.
|
|
3
|
+
"version": "1.0.0-alpha.49",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"description": "This is part of Mapo nuxt module. Injects Mapo ui components in the nuxt component discovery system.",
|
|
6
6
|
"author": "bnznamco <gabriele.baldi.01@gmail.com>",
|
|
7
7
|
"repository": "https://github.com/lotrekagency/mapo",
|
|
8
8
|
"main": "./module.js",
|
|
9
9
|
"dependencies": {
|
|
10
|
-
"@mapomodule/utils": "^1.0.0-alpha.
|
|
10
|
+
"@mapomodule/utils": "^1.0.0-alpha.49",
|
|
11
11
|
"@nuxtjs/i18n": "^7.2.2",
|
|
12
12
|
"@nuxtjs/vuetify": "^1.12.3",
|
|
13
13
|
"vuedraggable": "^2.24.3"
|
|
@@ -15,5 +15,5 @@
|
|
|
15
15
|
"publishConfig": {
|
|
16
16
|
"access": "public"
|
|
17
17
|
},
|
|
18
|
-
"gitHead": "
|
|
18
|
+
"gitHead": "5abcaf4c178b79ed2ad4ed555e22b5727cffa6fe"
|
|
19
19
|
}
|