zhao/openwrt_helloworld
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

luci-app-nikki: sync upstream

Browse Source 
last commit: 71ee85148e
This commit is contained in:
gitea-action 2025-03-10 21:30:24 +08:00
parent 8db3a9d7a6
commit 42d38eb593
2 changed files with 22 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
luci-app-nikki/htdocs/luci-static/resources/view/nikki/editor.js
View File

@ -5,38 +5,6 @@
'require fs'; 'require fs';
'require tools.nikki as nikki' 'require tools.nikki as nikki'
function loadJS(url) {
return new Promise(function (resolve, reject) {
const script = document.createElement('script');
script.src = url;
script.onload = resolve;
script.onerror = reject;
document.body.appendChild(script);
});
}
function loadCSS(url) {
return new Promise(function (resolve, reject) {
const link = document.createElement('link');
link.rel = 'stylesheet';
link.href = url;
link.onload = resolve;
link.onerror = reject;
document.head.appendChild(link);
});
}
async function loadCodeMirror() {
try{
await loadJS('https://unpkg.com/codemirror@5/lib/codemirror.js');
await loadJS('https://unpkg.com/codemirror@5/mode/yaml/yaml.js');
await loadCSS('https://unpkg.com/codemirror@5/lib/codemirror.css');
await loadCSS('https://unpkg.com/codemirror@5/theme/dracula.css');
} catch (e) {
}
}
return view.extend({ return view.extend({
load: function () { load: function () {
return Promise.all([ return Promise.all([
@ -44,7 +12,6 @@ return view.extend({
nikki.listProfiles(), nikki.listProfiles(),
nikki.listRuleProviders(), nikki.listRuleProviders(),
nikki.listProxyProviders(), nikki.listProxyProviders(),
loadCodeMirror(),
]); ]);
}, },
render: function (data) { render: function (data) {
@ -86,51 +53,22 @@ return view.extend({
o.write = function (section_id, formvalue) { o.write = function (section_id, formvalue) {
return true; return true;
}; };
o.onchange = L.bind(function (event, section_id, value) { o.onchange = function (event, section_id, value) {
const uiElement = this.getUIElement(section_id, '_file_content'); return L.resolveDefault(fs.read_direct(value), '').then(function (content) {
const editor = uiElement.node.firstChild.editor; m.lookupOption('nikki.editor._file_content')[0].getUIElement('editor').setValue(content);
fs.read_direct(value).then(function (content) { });
const mode = value.endsWith('.yml') || value.endsWith('.yaml') ? 'yaml' : null; };
uiElement.setValue(content);
if (editor) {
editor.setValue(content);
editor.setOption('mode', mode);
editor.getDoc().clearHistory();
}
}).catch(function (e) {
uiElement.setValue('');
if (editor) {
editor.setValue('');
editor.setOption('mode', null);
editor.getDoc().clearHistory();
}
})
}, s);
o = s.option(form.TextValue, '_file_content',); o = s.option(form.TextValue, '_file_content',);
o.rows = 25; o.rows = 25;
o.wrap = false; o.wrap = false;
o.write = L.bind(function (section_id, formvalue) { o.write = function (section_id, formvalue) {
const path = this.getOption('_file').formvalue(section_id); const path = m.lookupOption('nikki.editor._file')[0].formvalue('editor');
return fs.write(path, formvalue); return fs.write(path, formvalue);
}, s); };
o.remove = L.bind(function (section_id) { o.remove = function (section_id) {
const path = this.getOption('_file').formvalue(section_id); const path = m.lookupOption('nikki.editor._file')[0].formvalue('editor');
return fs.write(path); return fs.write(path);
}, s);
o.render = function () {
return this.super('render', arguments).then(function (widget) {
const textarea = widget.firstChild.firstChild;
if (CodeMirror) {
const editor = CodeMirror.fromTextArea(textarea, { lineNumbers: true, theme: 'dracula' });
editor.on('change', function () {
editor.save();
});
editor.getWrapperElement().style.height = '420px';
textarea.editor = editor;
}
return widget;
});
}; };
return m.render(); return m.render();

24
luci-app-nikki/htdocs/luci-static/resources/view/nikki/log.js
View File

@ -29,10 +29,10 @@ return view.extend({
o = s.taboption('app_log', form.Button, 'clear_app_log'); o = s.taboption('app_log', form.Button, 'clear_app_log');
o.inputstyle = 'negative'; o.inputstyle = 'negative';
o.inputtitle = _('Clear Log'); o.inputtitle = _('Clear Log');
o.onclick = L.bind(function (event, section_id) { o.onclick = function () {
this.getUIElement(section_id, '_app_log').setValue(''); m.lookupOption('nikki.log._app_log')[0].getUIElement('log').setValue('');
return nikki.clearAppLog(); return nikki.clearAppLog();
}, s); };
o = s.taboption('app_log', form.TextValue, '_app_log'); o = s.taboption('app_log', form.TextValue, '_app_log');
o.rows = 25; o.rows = 25;
@ -52,20 +52,20 @@ return view.extend({
o = s.taboption('app_log', form.Button, 'scroll_app_log_to_bottom'); o = s.taboption('app_log', form.Button, 'scroll_app_log_to_bottom');
o.inputtitle = _('Scroll To Bottom'); o.inputtitle = _('Scroll To Bottom');
o.onclick = L.bind(function (event, section_id) { o.onclick = function () {
const element = this.getUIElement(section_id, '_app_log').node.firstChild; const element = m.lookupOption('nikki.log._app_log')[0].getUIElement('log').node.firstChild;
element.scrollTop = element.scrollHeight; element.scrollTop = element.scrollHeight;
}, s); };
s.tab('core_log', _('Core Log')); s.tab('core_log', _('Core Log'));
o = s.taboption('core_log', form.Button, 'clear_core_log'); o = s.taboption('core_log', form.Button, 'clear_core_log');
o.inputstyle = 'negative'; o.inputstyle = 'negative';
o.inputtitle = _('Clear Log'); o.inputtitle = _('Clear Log');
o.onclick = L.bind(function (event, section_id) { o.onclick = function () {
this.getUIElement(section_id, '_core_log').setValue(''); m.lookupOption('nikki.log._core_log')[0].getUIElement('log').setValue('');
return nikki.clearCoreLog(); return nikki.clearCoreLog();
}, s); };
o = s.taboption('core_log', form.TextValue, '_core_log'); o = s.taboption('core_log', form.TextValue, '_core_log');
o.rows = 25; o.rows = 25;
@ -85,10 +85,10 @@ return view.extend({
o = s.taboption('core_log', form.Button, 'scroll_core_log_to_bottom'); o = s.taboption('core_log', form.Button, 'scroll_core_log_to_bottom');
o.inputtitle = _('Scroll To Bottom'); o.inputtitle = _('Scroll To Bottom');
o.onclick = L.bind(function (event, section_id) { o.onclick = function () {
const element = this.getUIElement(section_id, '_core_log').node.firstChild; const element = m.lookupOption('nikki.log._core_log')[0].getUIElement('log').node.firstChild;
element.scrollTop = element.scrollHeight; element.scrollTop = element.scrollHeight;
}, s); };
s.tab('debug_log', _('Debug Log')); s.tab('debug_log', _('Debug Log'));