diff --git a/ejs/apps.ejs b/ejs/apps.ejs index 9c388fa..3e0069f 100644 --- a/ejs/apps.ejs +++ b/ejs/apps.ejs @@ -69,6 +69,11 @@ +
  • + + + Tiny DB +
  • diff --git a/ejs/data.ejs b/ejs/data.ejs index 8a35b16..2be376a 100644 --- a/ejs/data.ejs +++ b/ejs/data.ejs @@ -72,6 +72,11 @@
    • +
  • + + + Tiny DB +
  • @@ -146,7 +151,7 @@
    -
    +
    主题  @@ -172,7 +177,7 @@
    -
    +
    @@ -182,27 +187,6 @@
    -
    -
    -
    -
    TinyDB
    -
    -
    - - - - - - - - - - - -
    键值更新时间
    -
    -
    -
    diff --git a/ejs/projects.ejs b/ejs/projects.ejs index ed9bd68..cdcbe7c 100644 --- a/ejs/projects.ejs +++ b/ejs/projects.ejs @@ -67,6 +67,11 @@
    • +
  • + + + Tiny DB +
  • diff --git a/ejs/tinydb.ejs b/ejs/tinydb.ejs new file mode 100644 index 0000000..9331816 --- /dev/null +++ b/ejs/tinydb.ejs @@ -0,0 +1,584 @@ + + + + + + + + + + MixIO - TinyDB + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + +
    + + +
    + + + + + +
    + + + + +
    + +
    +
    +
    +
    数据列表
    +
    + + + +
    +
    +
    +
    + + + + + + + + + + + +
    标签值操作
    +
    +
    +
    +
    +
    +
    + + +
    + + + +
    +
    +
    + Copyright © mixio.mixly.org 2021 +
    +
    +
    + +
    + + +
    + + + + + + + + + + + \ No newline at end of file diff --git a/js/data.js b/js/data.js index b292fbb..fe22e5f 100644 --- a/js/data.js +++ b/js/data.js @@ -1,48 +1,4 @@ -function init_special_table(rows) { - var tableBody = $('#special_data'); - tableBody.empty(); - - rows.forEach(function(row) { - var tr = $(''); - tr.append('' + (row.topic || '') + ''); - tr.append('' + (row.message || '') + ''); - tr.append('' + (row.time || '') + ''); - tableBody.append(tr); - }); - - // 初始化DataTable（如果已初始化则销毁重新初始化） - if ($.fn.DataTable.isDataTable('#special_table')) { - $('#special_table').DataTable().destroy(); - } - $('#special_table').DataTable({ - "pageLength": 10, - "order": [[2, "desc"]], - language: { - "sProcessing": "处理中...", - "sLengthMenu": "每页 _MENU_ 项", - "sZeroRecords": "没有匹配结果", - "sInfo": "显示第 _START_ 项至 第 _END_ 项结果，共 _TOTAL_ 项", - "sInfoEmpty": "显示第 0 项至 0 项结果，共 0 项", - "sInfoFiltered": "(由 _MAX_ 项结果过滤)", - "sInfoPostFix": "", - "sSearch": "搜索:", - "sUrl": "", - "sEmptyTable": "表中数据为空", - "sLoadingRecords": "载入中...", - "sInfoThousands": ",", - "oPaginate": { - "sFirst": "首页", - "sPrevious": "上页", - "sNext": "下页", - "sLast": "末页" - }, - "oAria": { - "sSortAscending": ": 以升序排列此列", - "sSortDescending": ": 以降序排列此列" - } - }, - }); -} + function get_data() { $.get('queryHook', function(res) { @@ -61,17 +17,10 @@ function get_data() { $("#prj_num_bar").css("width", (res['count'] * 100 / max) + "%") // 筛选数据：topic不以$开头的存入globalRows，以$开头的存入globalRows2并去掉$ - globalRows = res["rows"].filter(row => !row.topic || !row.topic.startsWith('$')); - globalRows2 = res["rows"] - .filter(row => row.topic && row.topic.startsWith('$')) - .map(row => ({ - ...row, - topic: row.topic.substring(1) // 去掉开头的$ - })); + globalRows = res["rows"] init_table(globalRows) // 初始化表格使用非$开头的数据 sync_chart() - init_special_table(globalRows2) }) }) diff --git a/js/lang.js b/js/lang.js index 081876b..4aaea13 100644 --- a/js/lang.js +++ b/js/lang.js @@ -226,7 +226,8 @@ var JSLang = { "mic": "语音识别", "tinydb": "下拉选项", "resolution": "分辨率", - "fps": "帧率" + "fps": "帧率", + 'tdb': "TinyDB" }, "tw": { "beepAudio": "Audio", @@ -455,7 +456,8 @@ var JSLang = { "mic": "麥克風", "tinydb": "下拉選項", "resolution": "分辨率", - "fps": "幀率" + "fps": "幀率", + 'tdb': "TinyDB" }, "en": { "beepAudio": "Beep Audio", @@ -684,7 +686,8 @@ var JSLang = { "mic": "Microphone", "tinydb": "Options", "resolution": "Resolution", - "fps": "FPS" + "fps": "FPS", + 'tdb': "TinyDB" } } diff --git a/mixio.js b/mixio.js index b66ee45..a17f82c 100644 --- a/mixio.js +++ b/mixio.js @@ -1167,7 +1167,7 @@ var mixioServer = async function() { hash |= 0; } var targetDB = reserveDBs[Math.abs(hash) % 8] - targetDB.get("select count(*) from `reserve` where userName = ?", [userName, ], function(err, row) { + targetDB.get("select count(*) from `reserve` where userName = ? and topic not like '$%'", [userName, ], function(err, row) { if (err) { console.log(err.message) } else { @@ -1409,7 +1409,7 @@ var mixioServer = async function() { if (row) { res.json({ status: 'success', value: row.message }); } else { - res.json({ status: 'error', message: '变量不存在' }); + res.json({ status: 'success', value: "None" }); } }); } @@ -1948,6 +1948,19 @@ var mixioServer = async function() { res.redirect('/') }) + app.get('/tinydata', function(req, res) { + if (req.session.userName) { + ejs.renderFile(__dirname + '/ejs/tinydb.ejs', { + userName: req.session.userName, + projectPass: req.session.projectPass, + 'configs': configs + }, function(err, data) { + res.send(data) + }) + } else + res.redirect('/') + }) + app.get('/projects-mixly', function(req, res) { ejs.renderFile(__dirname + '/ejs/projects.ejs', { isMixly: 1, @@ -2007,7 +2020,7 @@ var mixioServer = async function() { hash = ((hash << 5) - hash) + chr; hash |= 0; } - reserveDBs[Math.abs(hash) % 8].all("select * from `reserve` where userName=?", [req.session.userName], function(err, rows) { + reserveDBs[Math.abs(hash) % 8].all("select * from `reserve` where userName=? and topic not like '$%'", [req.session.userName], function(err, rows) { if (err) { console.log(err) } else {