mirror of https://gitee.com/karson/fastadmin.git
Compare commits
2 Commits
cdb41c5334
...
709424da7f
| Author | SHA1 | Date |
|---|---|---|
|
|
709424da7f | |
|
|
ae57feebb6 |
|
|
@ -305,7 +305,7 @@ class Upload
|
||||||
|
|
||||||
$attachment = $this->upload();
|
$attachment = $this->upload();
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
@unlink($destFile);
|
@unlink($uploadPath);
|
||||||
throw new UploadException($e->getMessage());
|
throw new UploadException($e->getMessage());
|
||||||
}
|
}
|
||||||
return $attachment;
|
return $attachment;
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@ if (isset($_GET['lang'])) {
|
||||||
$langSet = strtolower($_COOKIE['think_var']);
|
$langSet = strtolower($_COOKIE['think_var']);
|
||||||
} elseif (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
|
} elseif (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
|
||||||
preg_match('/^([a-z\d\-]+)/i', $_SERVER['HTTP_ACCEPT_LANGUAGE'], $matches);
|
preg_match('/^([a-z\d\-]+)/i', $_SERVER['HTTP_ACCEPT_LANGUAGE'], $matches);
|
||||||
$langSet = strtolower($matches[1]);
|
$langSet = strtolower($matches[1] ?? '');
|
||||||
}
|
}
|
||||||
$langSet = $langSet && in_array($langSet, ['zh-cn', 'en']) ? $langSet : 'zh-cn';
|
$langSet = $langSet && in_array($langSet, ['zh-cn', 'en']) ? $langSet : 'zh-cn';
|
||||||
$langSet == 'en' && $lang = array_combine(array_keys($lang), array_keys($lang));
|
$langSet == 'en' && $lang = array_combine(array_keys($lang), array_keys($lang));
|
||||||
|
|
|
||||||
|
|
@ -583,7 +583,7 @@ define(['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'], functio
|
||||||
});
|
});
|
||||||
return success === conditionArr.length;
|
return success === conditionArr.length;
|
||||||
};
|
};
|
||||||
form.on("keyup change click configchange", "input,select", function () {
|
form.on("keyup change click configchange", "input,textarea,select", function () {
|
||||||
$("[data-favisible][data-favisible!='']", form).each(function () {
|
$("[data-favisible][data-favisible!='']", form).each(function () {
|
||||||
var visible = $(this).data("favisible");
|
var visible = $(this).data("favisible");
|
||||||
var groupArr = visible.split(/\|\|/);
|
var groupArr = visible.split(/\|\|/);
|
||||||
|
|
@ -609,7 +609,7 @@ define(['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'], functio
|
||||||
}
|
}
|
||||||
}, 0);
|
}, 0);
|
||||||
|
|
||||||
$("input,select", form).trigger("configchange");
|
$("input,textarea,select", form).trigger("configchange");
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
api: {
|
api: {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue