wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-04-23 16:56:07 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

EditDocFix (#1886)

Browse Source
This commit is contained in:
Denis Bykhov 2022-05-27 22:38:22 +06:00 committed by GitHub
parent 2993925842
commit 4e69e4f0d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/view-resources/src/components/EditDoc.svelte
View File

@ -77,18 +77,21 @@
const dispatch = createEventDispatcher() const dispatch = createEventDispatcher()
function getMixins (): void { function getMixins (parentClass: Ref<Class<Doc>>, object: Doc): void {
if (object === undefined || parentClass === undefined) return
const descendants = hierarchy.getDescendants(parentClass).map((p) => hierarchy.getClass(p)) const descendants = hierarchy.getDescendants(parentClass).map((p) => hierarchy.getClass(p))
mixins = descendants.filter( mixins = descendants.filter(
(m) => m.kind === ClassifierKind.MIXIN && hierarchy.hasMixin(object, m._id) && !ignoreMixins.has(m._id) (m) => m.kind === ClassifierKind.MIXIN && hierarchy.hasMixin(object, m._id) && !ignoreMixins.has(m._id)
) )
} }
$: getMixins(parentClass, object)
let ignoreKeys: string[] = [] let ignoreKeys: string[] = []
let ignoreMixins: Set<Ref<Mixin<Doc>>> = new Set<Ref<Mixin<Doc>>>() let ignoreMixins: Set<Ref<Mixin<Doc>>> = new Set<Ref<Mixin<Doc>>>()
async function updateKeys (): Promise<void> { async function updateKeys (): Promise<void> {
const keysMap = new Map(getFiltredKeys(hierarchy, object._class, ignoreKeys).map((p) => [p.attr._id, p])) const keysMap = new Map(getFiltredKeys(hierarchy, realObjectClass, ignoreKeys).map((p) => [p.attr._id, p]))
for (const m of mixins) { for (const m of mixins) {
const mkeys = getFiltredKeys(hierarchy, m._id, ignoreKeys) const mkeys = getFiltredKeys(hierarchy, m._id, ignoreKeys)
for (const key of mkeys) { for (const key of mkeys) {
@ -120,7 +123,6 @@
async function getEditorOrDefault (_class: Ref<Class<Doc>>): Promise<void> { async function getEditorOrDefault (_class: Ref<Class<Doc>>): Promise<void> {
parentClass = getParentClass(_class) parentClass = getParentClass(_class)
mainEditor = await getEditor(_class) mainEditor = await getEditor(_class)
getMixins()
updateKeys() updateKeys()
} }
@ -254,7 +256,7 @@
on:open={(ev) => { on:open={(ev) => {
ignoreKeys = ev.detail.ignoreKeys ignoreKeys = ev.detail.ignoreKeys
ignoreMixins = new Set(ev.detail.ignoreMixins) ignoreMixins = new Set(ev.detail.ignoreMixins)
getMixins() getMixins(parentClass, object)
updateKeys() updateKeys()
}} }}
/> />