diff --git a/app/Http/Controllers/IndexController.php b/app/Http/Controllers/IndexController.php index a534b8c8e..0b5b5bba9 100755 --- a/app/Http/Controllers/IndexController.php +++ b/app/Http/Controllers/IndexController.php @@ -37,9 +37,14 @@ class IndexController extends InvokeController if ($action) { $app .= "__" . $action; } - if ($app === 'manifest.txt') { - $app = 'manifest'; - $child = 'txt'; + switch ($app) { + case 'manifest.txt': + $app = 'manifest'; + $child = 'txt'; + break; + + case 'default': + return ''; } if (!method_exists($this, $app)) { $app = method_exists($this, $method) ? $method : 'main'; diff --git a/electron/build.js b/electron/build.js index 549268f09..062d03535 100644 --- a/electron/build.js +++ b/electron/build.js @@ -203,8 +203,6 @@ function startBuild(data) { fs.writeFileSync(electronDir + "/config.js", "window.systemInfo = " + JSON.stringify(systemInfo), 'utf8'); fs.writeFileSync(nativeCachePath, utils.formatUrl(data.url)); fs.writeFileSync(devloadCachePath, "", 'utf8'); - // default (fix "Failed to load resource: net::ERR_FILE_NOT_FOUND" report) - fs.writeFileSync(electronDir + "/default", "default", 'utf8'); // index.html let manifestFile = path.resolve(electronDir, "manifest.json"); if (!fs.existsSync(manifestFile)) { diff --git a/resources/assets/js/pages/manage/components/ChatInput/index.vue b/resources/assets/js/pages/manage/components/ChatInput/index.vue index d6ab76e36..24a056a49 100755 --- a/resources/assets/js/pages/manage/components/ChatInput/index.vue +++ b/resources/assets/js/pages/manage/components/ChatInput/index.vue @@ -876,6 +876,7 @@ export default { } this.emojiTimer && clearTimeout(this.emojiTimer) this.emojiTimer = setTimeout(_ => { + this.emojiTimer = null if (/ { diff --git a/resources/assets/sass/pages/components/dialog-wrapper.scss b/resources/assets/sass/pages/components/dialog-wrapper.scss index c28f871c7..ab20027ee 100644 --- a/resources/assets/sass/pages/components/dialog-wrapper.scss +++ b/resources/assets/sass/pages/components/dialog-wrapper.scss @@ -940,6 +940,7 @@ .file-thumb { width: 36px; + flex-shrink: 0; } .file-info {