kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4630 from zyhfish/task/sync-maui-resources

Browse Source 
sync changes to maui resources.
This commit is contained in:
Shaun Walker 2024-09-18 10:46:34 -04:00 committed by GitHub
commit 64c7f1962c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 102 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
Oqtane.Maui/wwwroot/css/app.css
View File

@ -35,6 +35,9 @@ app {
} }
/* Action Dialog */ /* Action Dialog */
.app-actiondialog{
position: absolute;
}
.app-actiondialog .modal { .app-actiondialog .modal {
position: fixed; /* Stay in place */ position: fixed; /* Stay in place */
z-index: 9999; /* Sit on top */ z-index: 9999; /* Sit on top */
@ -230,5 +233,41 @@ app {
} }
.app-form-inline { .app-form-inline {
display: inline-block; display: inline;
}
.app-search{
display: inline-block;
position: relative;
}
.app-search input + button{
background: none;
border: none;
position: absolute;
right: 0;
top: 0;
}
.app-search input + button .oi{
top: 0;
}
.app-search-noinput {
display: inline-block;
position: relative;
}
.app-search-noinput button {
background: none;
border: none;
color: var(--bs-heading-color);
}
.app-search-noinput button:hover {
color: var(--bs-heading-color);
}
/* Text Editor */
.text-area-editor > textarea {
width: 100%;
min-height: 250px;
}
.app-logo .navbar-brand {
padding: 5px 20px 5px 20px;
} }

101
Oqtane.Maui/wwwroot/js/interop.js
View File

@ -206,18 +206,25 @@ Oqtane.Interop = {
returnPromise: true, returnPromise: true,
before: function (path, element) { before: function (path, element) {
for (let s = 0; s < scripts.length; s++) { for (let s = 0; s < scripts.length; s++) {
if (path === scripts[s].href && scripts[s].integrity !== '') { if (path === scripts[s].href) {
element.integrity = scripts[s].integrity; if (scripts[s].integrity !== '') {
} element.integrity = scripts[s].integrity;
if (path === scripts[s].href && scripts[s].crossorigin !== '') { }
element.crossOrigin = scripts[s].crossorigin; if (scripts[s].crossorigin !== '') {
} element.crossOrigin = scripts[s].crossorigin;
if (path === scripts[s].href && scripts[s].es6module === true) { }
element.type = "module"; if (scripts[s].es6module === true) {
} element.type = "module";
if (path === scripts[s].href && scripts[s].location === 'body') { }
document.body.appendChild(element); if (typeof scripts[s].dataAttributes !== "undefined" && scripts[s].dataAttributes !== null) {
return false; // return false to bypass default DOM insertion mechanism for (var key in scripts[s].dataAttributes) {
element.setAttribute(key, scripts[s].dataAttributes[key]);
}
}
if (scripts[s].location === 'body') {
document.body.appendChild(element);
return false; // return false to bypass default DOM insertion mechanism
}
} }
} }
} }
@ -286,41 +293,49 @@ Oqtane.Interop = {
}, },
uploadFiles: function (posturl, folder, id, antiforgerytoken, jwt) { uploadFiles: function (posturl, folder, id, antiforgerytoken, jwt) {
var fileinput = document.getElementById('FileInput_' + id); var fileinput = document.getElementById('FileInput_' + id);
var files = fileinput.files;
var progressinfo = document.getElementById('ProgressInfo_' + id); var progressinfo = document.getElementById('ProgressInfo_' + id);
var progressbar = document.getElementById('ProgressBar_' + id); var progressbar = document.getElementById('ProgressBar_' + id);
if (progressinfo !== null && progressbar !== null) { if (progressinfo !== null && progressbar !== null) {
progressinfo.setAttribute("style", "display: inline;"); progressinfo.setAttribute("style", "display: inline;");
progressinfo.innerHTML = '';
progressbar.setAttribute("style", "width: 100%; display: inline;"); progressbar.setAttribute("style", "width: 100%; display: inline;");
progressbar.value = 0;
} }
var files = fileinput.files;
var totalSize = 0;
for (var i = 0; i < files.length; i++) { for (var i = 0; i < files.length; i++) {
var FileChunk = []; totalSize = totalSize + files[i].size;
var file = files[i]; }
var MaxFileSizeMB = 1;
var BufferChunkSize = MaxFileSizeMB * (1024 * 1024);
var FileStreamPos = 0;
var EndPos = BufferChunkSize;
var Size = file.size;
while (FileStreamPos < Size) { var maxChunkSizeMB = 1;
FileChunk.push(file.slice(FileStreamPos, EndPos)); var bufferChunkSize = maxChunkSizeMB * (1024 * 1024);
FileStreamPos = EndPos; var uploadedSize = 0;
EndPos = FileStreamPos + BufferChunkSize;
for (var i = 0; i < files.length; i++) {
var fileChunk = [];
var file = files[i];
var fileStreamPos = 0;
var endPos = bufferChunkSize;
while (fileStreamPos < file.size) {
fileChunk.push(file.slice(fileStreamPos, endPos));
fileStreamPos = endPos;
endPos = fileStreamPos + bufferChunkSize;
} }
var TotalParts = FileChunk.length; var totalParts = fileChunk.length;
var PartCount = 0; var partCount = 0;
while (Chunk = FileChunk.shift()) { while (chunk = fileChunk.shift()) {
PartCount++; partCount++;
var FileName = file.name + ".part_" + PartCount.toString().padStart(3, '0') + "_" + TotalParts.toString().padStart(3, '0'); var fileName = file.name + ".part_" + partCount.toString().padStart(3, '0') + "_" + totalParts.toString().padStart(3, '0');
var data = new FormData(); var data = new FormData();
data.append('__RequestVerificationToken', antiforgerytoken); data.append('__RequestVerificationToken', antiforgerytoken);
data.append('folder', folder); data.append('folder', folder);
data.append('formfile', Chunk, FileName); data.append('formfile', chunk, fileName);
var request = new XMLHttpRequest(); var request = new XMLHttpRequest();
request.open('POST', posturl, true); request.open('POST', posturl, true);
if (jwt !== "") { if (jwt !== "") {
@ -328,28 +343,36 @@ Oqtane.Interop = {
request.withCredentials = true; request.withCredentials = true;
} }
request.upload.onloadstart = function (e) { request.upload.onloadstart = function (e) {
if (progressinfo !== null && progressbar !== null) { if (progressinfo !== null && progressbar !== null && progressinfo.innerHTML === '') {
progressinfo.innerHTML = file.name + ' 0%'; if (files.length === 1) {
progressbar.value = 0; progressinfo.innerHTML = file.name;
}
else {
progressinfo.innerHTML = file.name + ", ...";
}
} }
}; };
request.upload.onprogress = function (e) { request.upload.onprogress = function (e) {
if (progressinfo !== null && progressbar !== null) { if (progressinfo !== null && progressbar !== null) {
var percent = Math.ceil((e.loaded / e.total) * 100); var percent = Math.ceil(((uploadedSize + e.loaded) / totalSize) * 100);
progressinfo.innerHTML = file.name + '[' + PartCount + '] ' + percent + '%';
progressbar.value = (percent / 100); progressbar.value = (percent / 100);
} }
}; };
request.upload.onloadend = function (e) { request.upload.onloadend = function (e) {
if (progressinfo !== null && progressbar !== null) { if (progressinfo !== null && progressbar !== null) {
progressinfo.innerHTML = file.name + ' 100%'; uploadedSize = uploadedSize + e.total;
progressbar.value = 1; var percent = Math.ceil((uploadedSize / totalSize) * 100);
progressbar.value = (percent / 100);
} }
}; };
request.upload.onerror = function() { request.upload.onerror = function() {
if (progressinfo !== null && progressbar !== null) { if (progressinfo !== null && progressbar !== null) {
progressinfo.innerHTML = file.name + ' Error: ' + request.statusText; if (files.length === 1) {
progressbar.value = 0; progressinfo.innerHTML = file.name + ' Error: ' + request.statusText;
}
else {
progressinfo.innerHTML = ' Error: ' + request.statusText;
}
} }
}; };
request.send(data); request.send(data);