mirror of
https://github.com/hcengineering/platform.git
synced 2025-04-20 23:32:14 +00:00
Fix Comment panning in Activity
1. Fix Comment panning in Activity 2. Apply formatting.
This commit is contained in:
parent
a520705763
commit
e9559562bd
@ -32,7 +32,9 @@
|
|||||||
|
|
||||||
let txes: TxCUD<Doc>[]
|
let txes: TxCUD<Doc>[]
|
||||||
|
|
||||||
$: txes = Array.from(txes1).concat(txes2).sort((a, b) => b.modifiedOn - a.modifiedOn)
|
$: txes = Array.from(txes1)
|
||||||
|
.concat(txes2)
|
||||||
|
.sort((a, b) => b.modifiedOn - a.modifiedOn)
|
||||||
|
|
||||||
const client = getClient()
|
const client = getClient()
|
||||||
|
|
||||||
@ -79,10 +81,10 @@
|
|||||||
|
|
||||||
const descriptors = createQuery()
|
const descriptors = createQuery()
|
||||||
$: descriptors.query(activity.class.TxViewlet, {}, (result) => {
|
$: descriptors.query(activity.class.TxViewlet, {}, (result) => {
|
||||||
viewlets = new Map(result.map(r => ([activityKey(r.objectClass, r.txClass), r])))
|
viewlets = new Map(result.map((r) => [activityKey(r.objectClass, r.txClass), r]))
|
||||||
})
|
})
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
{#if fullSize}
|
{#if fullSize}
|
||||||
<div class="flex-row-center header">
|
<div class="flex-row-center header">
|
||||||
<div class="icon"><IconActivity size={'small'} /></div>
|
<div class="icon"><IconActivity size={'small'} /></div>
|
||||||
@ -93,7 +95,7 @@
|
|||||||
{#if txes}
|
{#if txes}
|
||||||
<Grid column={1} rowGap={1.5}>
|
<Grid column={1} rowGap={1.5}>
|
||||||
{#each txes as tx}
|
{#each txes as tx}
|
||||||
<TxView {tx} {viewlets}/>
|
<TxView {tx} {viewlets} />
|
||||||
{/each}
|
{/each}
|
||||||
</Grid>
|
</Grid>
|
||||||
{/if}
|
{/if}
|
||||||
@ -114,7 +116,7 @@
|
|||||||
{#if txes}
|
{#if txes}
|
||||||
<Grid column={1} rowGap={1.5}>
|
<Grid column={1} rowGap={1.5}>
|
||||||
{#each txes as tx}
|
{#each txes as tx}
|
||||||
<TxView {tx} {viewlets}/>
|
<TxView {tx} {viewlets} />
|
||||||
{/each}
|
{/each}
|
||||||
</Grid>
|
</Grid>
|
||||||
{/if}
|
{/if}
|
||||||
|
@ -36,7 +36,7 @@
|
|||||||
const client = getClient()
|
const client = getClient()
|
||||||
|
|
||||||
$: if (client.getHierarchy().isDerived(tx._class, core.class.TxCollectionCUD)) {
|
$: if (client.getHierarchy().isDerived(tx._class, core.class.TxCollectionCUD)) {
|
||||||
const colCUD = (tx as TxCollectionCUD<Doc, AttachedDoc>)
|
const colCUD = tx as TxCollectionCUD<Doc, AttachedDoc>
|
||||||
displayTx = colCUD.tx
|
displayTx = colCUD.tx
|
||||||
} else if (client.getHierarchy().isDerived(tx._class, core.class.TxCUD)) {
|
} else if (client.getHierarchy().isDerived(tx._class, core.class.TxCUD)) {
|
||||||
displayTx = tx as TxCUD<Doc>
|
displayTx = tx as TxCUD<Doc>
|
||||||
@ -50,13 +50,14 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
let employee: EmployeeAccount | undefined
|
let employee: EmployeeAccount | undefined
|
||||||
$: client.findOne(contact.class.EmployeeAccount, { _id: tx.modifiedBy as Ref<EmployeeAccount> }).then(account => { employee = account })
|
$: client.findOne(contact.class.EmployeeAccount, { _id: tx.modifiedBy as Ref<EmployeeAccount> }).then((account) => {
|
||||||
|
employee = account
|
||||||
|
})
|
||||||
|
|
||||||
$: client.findAll(contact.class.EmployeeAccount, { }).then(accounts => { console.log(tx.modifiedBy, 'accounts', accounts) })
|
|
||||||
let model: AttributeModel[] = []
|
let model: AttributeModel[] = []
|
||||||
|
|
||||||
let buildModel: ((options: BuildModelOptions) => Promise<AttributeModel[]>)|undefined
|
let buildModel: ((options: BuildModelOptions) => Promise<AttributeModel[]>) | undefined
|
||||||
getResource(view.api.buildModel).then(bm => {
|
getResource(view.api.buildModel).then((bm) => {
|
||||||
buildModel = bm
|
buildModel = bm
|
||||||
})
|
})
|
||||||
|
|
||||||
@ -64,7 +65,7 @@
|
|||||||
utx = displayTx as TxUpdateDoc<Doc>
|
utx = displayTx as TxUpdateDoc<Doc>
|
||||||
const ops = { client, _class: utx.objectClass, keys: Object.keys(utx.operations), ignoreMissing: true }
|
const ops = { client, _class: utx.objectClass, keys: Object.keys(utx.operations), ignoreMissing: true }
|
||||||
model = []
|
model = []
|
||||||
buildModel?.(ops).then(m => {
|
buildModel?.(ops).then((m) => {
|
||||||
model = m
|
model = m
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
@ -83,9 +84,9 @@
|
|||||||
<div class="flex-center icon">
|
<div class="flex-center icon">
|
||||||
<div class="scale-75">
|
<div class="scale-75">
|
||||||
{#if viewlet}
|
{#if viewlet}
|
||||||
<Icon icon={viewlet.icon} size='medium'/>
|
<Icon icon={viewlet.icon} size="medium" />
|
||||||
{:else}
|
{:else}
|
||||||
<Icon icon={activity.icon.Activity} size='medium'/>
|
<Icon icon={activity.icon.Activity} size="medium" />
|
||||||
{/if}
|
{/if}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -98,26 +99,27 @@
|
|||||||
{/if}
|
{/if}
|
||||||
</b>
|
</b>
|
||||||
{#if viewlet}
|
{#if viewlet}
|
||||||
<Label label={viewlet.label}/>
|
<Label label={viewlet.label} />
|
||||||
{/if}
|
{/if}
|
||||||
{#if viewlet === undefined && model.length > 0 && utx}
|
{#if viewlet === undefined && model.length > 0 && utx}
|
||||||
{#each model as m}
|
{#each model as m}
|
||||||
changed {m.label} to
|
changed {m.label} to
|
||||||
<strong><svelte:component this={m.presenter} value={getValue(utx, m.key)}/></strong>
|
<strong><svelte:component this={m.presenter} value={getValue(utx, m.key)} /></strong>
|
||||||
{/each}
|
{/each}
|
||||||
{:else if viewlet && viewlet.display === 'inline' && viewlet.component}
|
{:else if viewlet && viewlet.display === 'inline' && viewlet.component}
|
||||||
<Component is={viewlet.component} props={{ tx: displayTx }} />
|
<Component is={viewlet.component} props={{ tx: displayTx }} />
|
||||||
{/if}
|
{/if}
|
||||||
</div>
|
</div>
|
||||||
<div class="content-trans-color"><TimeSince value={tx.modifiedOn}/></div>
|
<div class="content-trans-color"><TimeSince value={tx.modifiedOn} /></div>
|
||||||
</div>
|
</div>
|
||||||
{#if viewlet && viewlet.component && viewlet.display !== 'inline'}
|
{#if viewlet && viewlet.component && viewlet.display !== 'inline'}
|
||||||
<div class='content' class:emphasize={viewlet.display === 'emphasized'}>
|
<div class="content" class:emphasize={viewlet.display === 'emphasized'}>
|
||||||
<Component is={viewlet.component} props={{ tx: displayTx }} />
|
<Component is={viewlet.component} props={{ tx: displayTx }} />
|
||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
.msgactivity-container {
|
.msgactivity-container {
|
||||||
position: relative;
|
position: relative;
|
||||||
@ -153,18 +155,20 @@
|
|||||||
|
|
||||||
.content {
|
.content {
|
||||||
margin: 0.5rem 0 0.5rem 3.25rem;
|
margin: 0.5rem 0 0.5rem 3.25rem;
|
||||||
padding: 1rem;
|
|
||||||
}
|
}
|
||||||
.emphasize {
|
.emphasize {
|
||||||
background-color: var(--theme-bg-accent-color);
|
background-color: var(--theme-bg-accent-color);
|
||||||
border: 1px solid var(--theme-bg-accent-color);
|
border: 1px solid var(--theme-bg-accent-color);
|
||||||
border-radius: 0.75rem;
|
border-radius: 0.75rem;
|
||||||
|
padding: 1rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.label {
|
.label {
|
||||||
margin: 0 1rem;
|
margin: 0 1rem;
|
||||||
|
|
||||||
b { color: var(--theme-caption-color); }
|
b {
|
||||||
|
color: var(--theme-caption-color);
|
||||||
|
}
|
||||||
strong {
|
strong {
|
||||||
font-weight: 500;
|
font-weight: 500;
|
||||||
color: var(--theme-content-accent-color);
|
color: var(--theme-content-accent-color);
|
||||||
|
Loading…
Reference in New Issue
Block a user