gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 09:58:32 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

code mirror in SQL console, closes #24

Browse Source
This commit is contained in:
azivner 2018-02-10 09:14:18 -05:00
parent dbd28377e3
commit cac98392a6
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/public/javascripts/dialogs/sql_console.js
View File

@ -7,18 +7,38 @@ const sqlConsole = (function() {
const $resultHead = $('#sql-console-results thead'); const $resultHead = $('#sql-console-results thead');
const $resultBody = $('#sql-console-results tbody'); const $resultBody = $('#sql-console-results tbody');
let codeEditor;
function showDialog() { function showDialog() {
glob.activeDialog = $dialog; glob.activeDialog = $dialog;
$dialog.dialog({ $dialog.dialog({
modal: true, modal: true,
width: $(window).width(), width: $(window).width(),
height: $(window).height() height: $(window).height(),
open: function() {
CodeMirror.keyMap.default["Shift-Tab"] = "indentLess";
CodeMirror.keyMap.default["Tab"] = "indentMore";
CodeMirror.modeURL = 'libraries/codemirror/mode/%N/%N.js';
codeEditor = CodeMirror($query[0], {
value: "",
viewportMargin: Infinity,
indentUnit: 4,
highlightSelectionMatches: { showToken: /\w/, annotateScrollbar: false }
});
codeEditor.setOption("mode", "text/x-sqlite");
CodeMirror.autoLoadMode(codeEditor, "sql");
codeEditor.focus();
}
}); });
} }
async function execute() { async function execute() {
const sqlQuery = $query.val(); const sqlQuery = codeEditor.getValue();
const result = await server.post("sql/execute", { const result = await server.post("sql/execute", {
query: sqlQuery query: sqlQuery

7
src/views/index.ejs
View File

@ -360,8 +360,11 @@
</div> </div>
<div id="sql-console-dialog" title="SQL console" style="display: none; padding: 20px;"> <div id="sql-console-dialog" title="SQL console" style="display: none; padding: 20px;">
<textarea style="width: 100%; height: 100px" id="sql-console-query"></textarea> <div style="height: 150px; width: 100%; border: 1px solid #ccc; margin-bottom: 10px;" id="sql-console-query"></div>
<button class="btn btn-danger" id="sql-console-execute">Execute <kbd>CTRL+ENTER</kbd></button>
<div style="text-align: center">
<button class="btn btn-danger" id="sql-console-execute">Execute <kbd>CTRL+ENTER</kbd></button>
</div>
<table id="sql-console-results" class="table table-striped" style="overflow: scroll; width: 100%;"> <table id="sql-console-results" class="table table-striped" style="overflow: scroll; width: 100%;">
<thead></thead> <thead></thead>