This commit is contained in:
2021-12-09 20:32:15 +01:00
parent 7011b40683
commit 1130a5935d
9 changed files with 50 additions and 52 deletions
@@ -1,4 +1,4 @@
<template>
<!--<template>
<div class="blueprint" v-if="value && (isParent || isChild)">
<div class="blueprint-box">
<template v-if="isChild">
@@ -294,7 +294,7 @@
margin-top: -2px;
}
}
</style>
</style>-->
<!--
@@ -1,4 +1,4 @@
<template>
<!--<template>
<ui-overlay-editor class="blueprint-settings">
<template v-slot:header>
<ui-header-bar title="Synchronisation" :back-button="false" :close-button="true" />
@@ -220,4 +220,4 @@
color: var(--color-primary);
font-weight: 400;
}*/
</style>
</style>-->
@@ -23,7 +23,7 @@
<script>
import UiEditor from 'zero/editor/editor.vue';
import UiEditor from './editor.vue';
export default {
+1 -1
View File
@@ -1,6 +1,6 @@
import { generateId } from '../utils/numbers';
import EditorField from './editor-field.ts';
import EditorField from './editor-field';
class Editor
{
@@ -1,4 +1,4 @@
<template>
<!--<template>
<div v-if="!loading" class="ui-native-select" :disabled="disabled">
<select :value="value" @input="$emit('input', $event.target.value)" :disabled="disabled">
<option v-for="item in items" :value="item.code">{{item.name}}</option>
@@ -36,4 +36,4 @@
});
}
}
</script>
</script>-->
@@ -1,4 +1,4 @@
<template>
<!--<template>
<div class="ui-native-select" :disabled="disabled">
<select :value="value" @input="onChange($event)" :disabled="disabled">
<option :value="null"></option>
@@ -44,4 +44,4 @@
}
}
</script>
</script>-->
+30 -32
View File
@@ -11,12 +11,10 @@
</template>
<script>
import UiEditor from 'zero/editor/editor.vue';
import UiEditorOverlay from 'zero/editor/editor-overlay.vue';
import Overlay from 'zero/helpers/overlay.js';
import Editor from 'zero/core/editor.ts';
import Strings from 'zero/helpers/strings.js';
import Arrays from 'zero/helpers/arrays.js';
import UiEditor from '../editor.vue';
import UiEditorOverlay from '../editor-overlay.vue';
//import Overlay from 'zero/helpers/overlay.js';
import { convertHtmlToText, arrayMove } from '../../utils';
export default {
@@ -118,29 +116,29 @@
}
// open editing overlay
return Overlay.open({
component: UiEditorOverlay,
display: 'editor',
editor: this.editor,
title: this.title || '@ui.edit.title',
model: item,
width: this.width,
parentModel,
create: isAdd
}).then(value =>
{
if (isAdd)
{
this.items.push(value);
}
else
{
const index = this.items.indexOf(item);
this.removeItem(index);
this.items.splice(index, 0, value);
}
this.onChange();
});
//return Overlay.open({
// component: UiEditorOverlay,
// display: 'editor',
// editor: this.editor,
// title: this.title || '@ui.edit.title',
// model: item,
// width: this.width,
// parentModel,
// create: isAdd
//}).then(value =>
//{
// if (isAdd)
// {
// this.items.push(value);
// }
// else
// {
// const index = this.items.indexOf(item);
// this.removeItem(index);
// this.items.splice(index, 0, value);
// }
// this.onChange();
//});
},
@@ -160,13 +158,13 @@
getName(item)
{
let name = typeof this.itemLabel === 'function' ? this.itemLabel(item) : null;
return Strings.htmlToText(name ?? '@ui.item');
return convertHtmlToText(name ?? '@ui.item');
},
getDescription(item)
{
return Strings.htmlToText(typeof this.itemDescription === 'function' ? this.itemDescription(item) : '');
return convertHtmlToText(typeof this.itemDescription === 'function' ? this.itemDescription(item) : '');
},
@@ -178,7 +176,7 @@
onSortingUpdated(ev)
{
this.items = Arrays.move(this.items, ev.oldIndex, ev.newIndex);
this.items = arrayMove(this.items, ev.oldIndex, ev.newIndex);
this.onChange();
//this.$emit('input', this.multiple ? result : (result.length > 0 ? result[0] : null));
},
@@ -7,8 +7,8 @@
<script>
import Overlay from 'zero/helpers/overlay.js';
import PasswordChangeOverlay from 'zero/components/overlays/password-change.vue';
//import Overlay from 'zero/helpers/overlay.js';
//import PasswordChangeOverlay from 'zero/components/overlays/password-change.vue';
export default {
props: {
@@ -32,12 +32,12 @@
open()
{
return Overlay.open({
component: PasswordChangeOverlay
}).then(hash =>
{
this.$emit('input', hash);
});
//return Overlay.open({
// component: PasswordChangeOverlay
//}).then(hash =>
//{
// this.$emit('input', hash);
//});
}
}
@@ -1,4 +1,4 @@
<template>
<!--<template>
<video-picker :value="value" @input="$emit('input', $event)" :disabled="disabled" v-bind="{ disabled, limit }" title="Select a video" />
</template>
@@ -25,4 +25,4 @@
components: { VideoPicker }
}
</script>
</script>-->