no message
This commit is contained in:
+8
-3
@@ -2419,7 +2419,8 @@ class Base
|
||||
*/
|
||||
public static function isThumb($file): bool
|
||||
{
|
||||
return str_ends_with($file, '_thumb.jpg')
|
||||
return str_ends_with($file, '_thumb.jpeg')
|
||||
|| str_ends_with($file, '_thumb.jpg')
|
||||
|| str_ends_with($file, '_thumb.png');
|
||||
}
|
||||
|
||||
@@ -2430,7 +2431,9 @@ class Base
|
||||
*/
|
||||
public static function getThumbExt($file): string
|
||||
{
|
||||
if (file_exists($file . '_thumb.jpg')) {
|
||||
if (file_exists($file . '_thumb.jpeg')) {
|
||||
return 'jpeg';
|
||||
} elseif (file_exists($file . '_thumb.jpg')) {
|
||||
return 'jpg';
|
||||
} elseif (file_exists($file . '_thumb.png')) {
|
||||
return 'png';
|
||||
@@ -2446,7 +2449,9 @@ class Base
|
||||
*/
|
||||
public static function thumbRestore($file): mixed
|
||||
{
|
||||
if (str_ends_with($file, '_thumb.jpg')) {
|
||||
if (str_ends_with($file, '_thumb.jpeg')) {
|
||||
return Base::rightDelete($file, '_thumb.jpeg');
|
||||
} elseif (str_ends_with($file, '_thumb.jpg')) {
|
||||
return Base::rightDelete($file, '_thumb.jpg');
|
||||
} elseif (str_ends_with($file, '_thumb.png')) {
|
||||
return Base::rightDelete($file, '_thumb.png');
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Vendored
+1
File diff suppressed because one or more lines are too long
Vendored
+1
File diff suppressed because one or more lines are too long
Vendored
+2029
File diff suppressed because one or more lines are too long
@@ -375,9 +375,9 @@
|
||||
|
||||
__thumb(url) {
|
||||
if ($A.strExists(url, "?", false)) {
|
||||
return url + "&__thumb=true";
|
||||
return $A.mainUrl(url) + "&__thumb=true";
|
||||
}else{
|
||||
return url + "?__thumb=true";
|
||||
return $A.mainUrl(url) + "?__thumb=true";
|
||||
}
|
||||
},
|
||||
|
||||
|
||||
@@ -649,6 +649,10 @@ export default {
|
||||
if (['dialog', 'log'].includes(navActive)) {
|
||||
this.navActive = navActive;
|
||||
}
|
||||
$A.IDBJson('delayTaskForm').then(data => {
|
||||
data.type && this.$set(this.delayTaskForm, 'type', data.type);
|
||||
data.time && this.$set(this.delayTaskForm, 'time', data.time);
|
||||
});
|
||||
},
|
||||
|
||||
mounted() {
|
||||
@@ -1753,7 +1757,7 @@ export default {
|
||||
return;
|
||||
}
|
||||
this.delayTaskLoading = true;
|
||||
var date = new Date(this.taskDetail.end_at);
|
||||
let date = new Date(this.taskDetail.end_at);
|
||||
if (this.delayTaskForm.type === 'day') {
|
||||
date.setDate(date.getDate() + Number(this.delayTaskForm.time));
|
||||
} else {
|
||||
@@ -1770,10 +1774,9 @@ export default {
|
||||
$A.messageSuccess(msg);
|
||||
this.delayTaskLoading = false;
|
||||
this.delayTaskShow = false;
|
||||
this.delayTaskForm.type = 'hour';
|
||||
this.delayTaskForm.time = '24';
|
||||
this.delayTaskForm.remark = '';
|
||||
this.$store.dispatch("getTaskOne", this.taskDetail.id).catch(() => {})
|
||||
$A.IDBSet('delayTaskForm', this.delayTaskForm);
|
||||
}).catch(({msg}) => {
|
||||
$A.modalError(msg);
|
||||
this.delayTaskLoading = false;
|
||||
|
||||
Reference in New Issue
Block a user