Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 02:16:05 +01:00
Code Issues Packages Projects Releases Activity

click on inherited attr will also bring up the attribute detail widget

Browse Source
This commit is contained in:
zadam
2020-07-05 23:53:55 +02:00
parent 9f2545395d
commit 50b976990c
4 changed files with 87 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
package-lock.json generated
View File

@@ -8487,9 +8487,9 @@
} }
}, },
"ws": { "ws": {
"version": "7.3.0", "version": "7.3.1",
"resolved": "https://registry.npmjs.org/ws/-/ws-7.3.0.tgz", "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz",
"integrity": "sha512-iFtXzngZVXPGgpTlP1rBqsUK82p9tKqsWRPg5L56egiljujJT3vGAYnHANvFxBieXrTFavhzhxW52jnaWV+w2w==" "integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA=="
}, },
"x-xss-protection": { "x-xss-protection": {
"version": "1.3.0", "version": "1.3.0",

2
package.json
View File

@@ -70,7 +70,7 @@
"turndown": "6.0.0", "turndown": "6.0.0",
"turndown-plugin-gfm": "1.0.2", "turndown-plugin-gfm": "1.0.2",
"unescape": "1.0.1", "unescape": "1.0.1",
"ws": "7.3.0", "ws": "7.3.1",
"yauzl": "^2.10.0", "yauzl": "^2.10.0",
"yazl": "^2.5.1" "yazl": "^2.5.1"
}, },

36
src/public/app/widgets/attribute_detail.js
View File

@@ -50,6 +50,8 @@ const TPL = `
<span class="bx bx-x close-attr-detail-button"></span> <span class="bx bx-x close-attr-detail-button"></span>
</div> </div>
<div class="attr-is-owned-by"></div>
<table class="attr-edit"> <table class="attr-edit">
<tr> <tr>
<th>Name:</th> <th>Name:</th>
@@ -64,7 +66,7 @@ const TPL = `
<td><input type="checkbox" class="attr-edit-inheritable form-control form-control-sm" /></td> <td><input type="checkbox" class="attr-edit-inheritable form-control form-control-sm" /></td>
</tr> </tr>
<tr> <tr>
<td colspan="2"> <td colspan="2" class="attr-edit-button-row">
<div style="display: flex; justify-content: space-between"> <div style="display: flex; justify-content: space-between">
<div> <div>
<button type="submit" class="btn btn-sm btn-primary">Save</button> <button type="submit" class="btn btn-sm btn-primary">Save</button>
@@ -100,7 +102,9 @@ export default class AttributeDetailWidget extends BasicWidget {
this.$attrEditName = this.$widget.find('.attr-edit-name'); this.$attrEditName = this.$widget.find('.attr-edit-name');
this.$attrEditValue = this.$widget.find('.attr-edit-value'); this.$attrEditValue = this.$widget.find('.attr-edit-value');
this.$attrEditInheritable = this.$widget.find('.attr-edit-inheritable'); this.$attrEditInheritable = this.$widget.find('.attr-edit-inheritable');
this.$attrEditButtonRow = this.$widget.find('.attr-edit-button-row');
this.$closeAttrDetailButton = this.$widget.find('.close-attr-detail-button'); this.$closeAttrDetailButton = this.$widget.find('.close-attr-detail-button');
this.$attrIsOwnedBy = this.$widget.find('.attr-is-owned-by');
this.$closeAttrDetailButton.on('click', () => this.hide()); this.$closeAttrDetailButton.on('click', () => this.hide());
@@ -111,8 +115,8 @@ export default class AttributeDetailWidget extends BasicWidget {
}); });
} }
async showAttributeDetail(attr, x, y) { async showAttributeDetail({attribute, isOwned, x, y}) {
if (!attr) { if (!attribute) {
this.hide(); this.hide();
return; return;
@@ -120,7 +124,7 @@ export default class AttributeDetailWidget extends BasicWidget {
this.toggleInt(true); this.toggleInt(true);
let {results, count} = await server.post('search-related', attr); let {results, count} = await server.post('search-related', attribute);
for (const res of results) { for (const res of results) {
res.noteId = res.notePathArray[res.notePathArray.length - 1]; res.noteId = res.notePathArray[res.notePathArray.length - 1];
@@ -132,7 +136,7 @@ export default class AttributeDetailWidget extends BasicWidget {
this.$relatedNotesTitle.hide(); this.$relatedNotesTitle.hide();
} }
else { else {
this.$relatedNotesTitle.text(`Other notes with ${attr.type} name "${attr.name}"`); this.$relatedNotesTitle.text(`Other notes with ${attribute.type} name "${attribute.name}"`);
} }
this.$relatedNotesList.empty(); this.$relatedNotesList.empty();
@@ -156,8 +160,26 @@ export default class AttributeDetailWidget extends BasicWidget {
this.$relatedNotesMoreNotes.hide(); this.$relatedNotesMoreNotes.hide();
} }
this.$attrEditName.val(attr.name); if (isOwned) {
this.$attrEditValue.val(attr.value); this.$attrIsOwnedBy.hide();
}
else {
this.$attrIsOwnedBy
.show()
.append(attribute.type === 'label' ? 'Label' : 'Relation')
.append(' is owned by note ')
.append(await linkService.createNoteLink(attribute.noteId))
}
this.$attrEditName
.val(attribute.name)
.attr('readonly', () => !isOwned);
this.$attrEditValue
.val(attribute.value)
.attr('readonly', () => !isOwned);
this.$attrEditButtonRow.toggle(!!isOwned);
this.$widget.css("left", x - this.$widget.width() / 2); this.$widget.css("left", x - this.$widget.width() / 2);
this.$widget.css("top", y + 30); this.$widget.css("top", y + 30);

42
src/public/app/widgets/note_attributes.js
View File

@@ -329,7 +329,12 @@ export default class NoteAttributesWidget extends TabAwareWidget {
} }
} }
this.attributeDetailWidget.showAttributeDetail(matchedAttr, e.pageX, e.pageY); this.attributeDetailWidget.showAttributeDetail({
attribute: matchedAttr,
isOwned: true,
x: e.pageX,
y: e.pageY
});
} }
}); });
@@ -419,7 +424,7 @@ export default class NoteAttributesWidget extends TabAwareWidget {
const ownedAttributes = note.getOwnedAttributes(); const ownedAttributes = note.getOwnedAttributes();
const $attributesContainer = $("<div>"); const $attributesContainer = $("<div>");
await this.renderAttributes(ownedAttributes, $attributesContainer); await this.renderAttributesIntoCKEditor(ownedAttributes, $attributesContainer);
await this.spacedUpdate.allowUpdateWithoutChange(() => { await this.spacedUpdate.allowUpdateWithoutChange(() => {
this.textEditor.setData($attributesContainer.html()); this.textEditor.setData($attributesContainer.html());
@@ -440,7 +445,7 @@ export default class NoteAttributesWidget extends TabAwareWidget {
this.$inheritedAttributes.empty(); this.$inheritedAttributes.empty();
await this.renderAttributes(inheritedAttributes, this.$inheritedAttributes); await this.renderAttributesIntoDiv(inheritedAttributes, this.$inheritedAttributes);
this.parseAttributes(); this.parseAttributes();
} }
@@ -457,8 +462,34 @@ export default class NoteAttributesWidget extends TabAwareWidget {
}); });
} }
async renderAttributes(attributes, $container) { async renderAttributesIntoCKEditor(attributes, $container) {
for (const attribute of attributes) { for (const attribute of attributes) {
this.renderAttribute(attribute, $container);
}
}
renderAttributesIntoDiv(attributes, $container) {
for (const attribute of attributes) {
const $span = $("<span>")
.on('click', e => this.attributeDetailWidget.showAttributeDetail({
attribute: {
noteId: attribute.noteId,
type: attribute.type,
name: attribute.name,
value: attribute.value
},
isOwned: false,
x: e.pageX,
y: e.pageY
}));
$container.append($span);
this.renderAttribute(attribute, $span);
}
}
renderAttribute(attribute, $container) {
if (attribute.type === 'label') { if (attribute.type === 'label') {
$container.append(document.createTextNode('#' + attribute.name)); $container.append(document.createTextNode('#' + attribute.name));
@@ -470,7 +501,7 @@ export default class NoteAttributesWidget extends TabAwareWidget {
$container.append(' '); $container.append(' ');
} else if (attribute.type === 'relation') { } else if (attribute.type === 'relation') {
if (attribute.isAutoLink) { if (attribute.isAutoLink) {
continue; return;
} }
if (attribute.value) { if (attribute.value) {
@@ -484,7 +515,6 @@ export default class NoteAttributesWidget extends TabAwareWidget {
ws.logError("Unknown attr type: " + attribute.type); ws.logError("Unknown attr type: " + attribute.type);
} }
} }
}
formatValue(val) { formatValue(val) {
if (/^[\p{L}\p{N}\-_,.]+$/u.test(val)) { if (/^[\p{L}\p{N}\-_,.]+$/u.test(val)) {