Compare commits
No commits in common. "880d6369e4ddee2df7c149161bf17f05fd74bf09" and "9c99e464aa699916fb35e15dbccdf736e79f99cb" have entirely different histories.
880d6369e4
...
9c99e464aa
|
|
@ -1,11 +1,11 @@
|
|||
{
|
||||
"name": "traxxx-web",
|
||||
"version": "0.41.7",
|
||||
"version": "0.41.6",
|
||||
"lockfileVersion": 2,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"version": "0.41.7",
|
||||
"version": "0.41.6",
|
||||
"dependencies": {
|
||||
"@brillout/json-serializer": "^0.5.8",
|
||||
"@dicebear/collection": "^7.0.5",
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@
|
|||
"overrides": {
|
||||
"vite": "$vite"
|
||||
},
|
||||
"version": "0.41.7",
|
||||
"version": "0.41.6",
|
||||
"imports": {
|
||||
"#/*": "./*.js"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -282,7 +282,6 @@ const fields = computed(() => [
|
|||
key: 'duration',
|
||||
type: 'duration',
|
||||
value: [Math.floor(scene.value.duration / 3600), Math.floor((scene.value.duration % 3600) / 60), scene.value.duration % 60],
|
||||
simplify: false,
|
||||
},
|
||||
{
|
||||
key: 'productionDate',
|
||||
|
|
@ -305,16 +304,16 @@ const fields = computed(() => [
|
|||
}]),
|
||||
]);
|
||||
|
||||
function simplifyArray(field) {
|
||||
if (Array.isArray(field.value) && field.simplify !== false) {
|
||||
return field.value.map((item) => item.hash || item.id);
|
||||
function simplifyArray(value) {
|
||||
if (Array.isArray(value)) {
|
||||
return value.map((item) => item.hash || item.id);
|
||||
}
|
||||
|
||||
return field.value;
|
||||
return value;
|
||||
}
|
||||
|
||||
const editing = ref(new Set());
|
||||
const edits = ref(Object.fromEntries(fields.value.map((field) => [field.key, simplifyArray(field)])));
|
||||
const edits = ref(Object.fromEntries(fields.value.map((field) => [field.key, simplifyArray(field.value)])));
|
||||
const comment = ref(null);
|
||||
const apply = ref(user.role !== 'user');
|
||||
const submitted = ref(false);
|
||||
|
|
@ -333,6 +332,7 @@ const keyMap = {
|
|||
function toggleField(item) {
|
||||
if (editing.value.has(item.key)) {
|
||||
editing.value.delete(item.key);
|
||||
// delete edits.value[item.key];
|
||||
|
||||
return;
|
||||
}
|
||||
|
|
@ -358,8 +358,7 @@ async function submit() {
|
|||
|
||||
return [[key, edits.value[key]]];
|
||||
})),
|
||||
// duration: edits.value.duration
|
||||
duration: editing.value.has('duration') && edits.value.duration
|
||||
duration: edits.value.duration
|
||||
? (((edits.value.duration[0] || 0) * 3600) + ((edits.value.duration[1] || 0) * 60) + (edits.value.duration[2] || 0)) || null
|
||||
: undefined,
|
||||
},
|
||||
|
|
|
|||
2
static
2
static
|
|
@ -1 +1 @@
|
|||
Subproject commit 7a1984e194a90987e906dabbec26ada28a400a3c
|
||||
Subproject commit 1fc67541d5b45b0e20d27cd366a01f9a83e444cc
|
||||
Loading…
Reference in New Issue