diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php index ad5e7630..1ea1f985 100755 --- a/app/Http/Controllers/Api/UsersController.php +++ b/app/Http/Controllers/Api/UsersController.php @@ -369,7 +369,7 @@ class UsersController extends AbstractController $array[] = $userid; } if (count($array) > 50) { - return Base::retError(['一次最多只能获取%条数据', 50]); + return Base::retError('一次最多只能获取50条数据'); } $retArray = []; foreach ($array AS $id) { diff --git a/app/Http/Controllers/IndexController.php b/app/Http/Controllers/IndexController.php index 25edaef1..1894a0e7 100755 --- a/app/Http/Controllers/IndexController.php +++ b/app/Http/Controllers/IndexController.php @@ -61,4 +61,52 @@ class IndexController extends InvokeController return "success"; } + + /** + * 提取所有中文 + * @return array|string + */ + public function allcn() + { + if (!Base::is_internal_ip()) { + // 限制内网访问 + return "Forbidden Access"; + } + $list = Base::readDir(resource_path()); + $array = []; + foreach ($list as $item) { + $content = file_get_contents($item); + preg_match_all("/\\\$L\((.*?)\)/", $content, $matchs); + if ($matchs) { + foreach ($matchs[1] as $text) { + $array[trim(trim($text, '"'), "'")] = trim(trim($text, '"'), "'"); + } + } + } + return array_values($array); + } + + /** + * 提取所有中文 + * @return array|string + */ + public function allcn__php() + { + if (!Base::is_internal_ip()) { + // 限制内网访问 + return "Forbidden Access"; + } + $list = Base::readDir(app_path()); + $array = []; + foreach ($list as $item) { + $content = file_get_contents($item); + preg_match_all("/(retSuccess|retError|ApiException)\((.*?)[,|)]/", $content, $matchs); + if ($matchs) { + foreach ($matchs[2] as $text) { + $array[trim(trim($text, '"'), "'")] = trim(trim($text, '"'), "'"); + } + } + } + return array_values($array); + } } diff --git a/app/Module/Base.php b/app/Module/Base.php index 0bdc6741..a442bd77 100755 --- a/app/Module/Base.php +++ b/app/Module/Base.php @@ -2243,12 +2243,12 @@ class Base } $extension = strtolower($file->getClientOriginalExtension()); if ($type && is_array($type) && !in_array($extension, $type)) { - return Base::retError(['文件格式错误,限制类型:%', implode(",", $type)]); + return Base::retError('文件格式错误,限制类型:' . implode(",", $type)); } try { $fileSize = $file->getSize(); if ($param['size'] > 0 && $fileSize > $param['size'] * 1024) { - return Base::retError(['文件大小超限,最大限制:%KB', $param['size']]); + return Base::retError('文件大小超限,最大限制:' . $param['size'] . 'KB'); } } catch (Exception $e) { $fileSize = 0; diff --git a/package.json b/package.json index 2b7b290b..e6900717 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "DooTask", - "version": "0.2.31", + "version": "0.2.32", "description": "DooTask is task management system.", "scripts": { "dev": "npm run development", @@ -23,6 +23,7 @@ "jquery": "^3.5.1", "jspdf": "^2.3.1", "laravel-mix": "^6.0.6", + "less-loader": "^10.0.0", "lodash": "^4.17.19", "moment": "^2.29.1", "nativefier": "^44.0.4", @@ -30,7 +31,7 @@ "postcss": "^8.1.14", "resolve-url-loader": "^4.0.0", "sass": "^1.34.1", - "sass-loader": "^7.1.0", + "sass-loader": "^8.0.2", "stylus": "^0.54.8", "stylus-loader": "^3.0.2", "vue": "^2.6.12", diff --git a/resources/assets/js/components/ImgUpload.vue b/resources/assets/js/components/ImgUpload.vue index 5a603016..468aa951 100755 --- a/resources/assets/js/components/ImgUpload.vue +++ b/resources/assets/js/components/ImgUpload.vue @@ -260,7 +260,7 @@ //上传大小错误 $A.noticeWarning({ title: this.$L('超出文件大小限制'), - desc: this.$L('文件 ' + file.name + ' 太大,不能超过' + $A.bytesToSize(this.maxSize * 1024)) + desc: this.$L('文件 ' + file.name + ' 太大,不能超过:' + $A.bytesToSize(this.maxSize * 1024)) }); }, handleBeforeUpload () { diff --git a/resources/assets/js/components/MDEditor/index.vue b/resources/assets/js/components/MDEditor/index.vue index ec49866c..a6c7c91d 100755 --- a/resources/assets/js/components/MDEditor/index.vue +++ b/resources/assets/js/components/MDEditor/index.vue @@ -288,7 +288,7 @@ //上传大小错误 $A.modalWarning({ title: '超出文件大小限制', - content: '文件 ' + file.name + ' 太大,不能超过' + $A.bytesToSize(this.maxSize * 1024) + '。' + content: '文件 ' + file.name + ' 太大,不能超过:' + $A.bytesToSize(this.maxSize * 1024) + '。' }); }, diff --git a/resources/assets/js/pages/manage/setting/personal.vue b/resources/assets/js/pages/manage/setting/personal.vue index f80533b0..ef381b9e 100644 --- a/resources/assets/js/pages/manage/setting/personal.vue +++ b/resources/assets/js/pages/manage/setting/personal.vue @@ -3,7 +3,7 @@
- {{$L('建议尺寸:%', '200x200')}} + {{$L('建议尺寸:200x200')}} diff --git a/resources/assets/sass/pages/components/project-list.scss b/resources/assets/sass/pages/components/project-list.scss index 0b6ef022..23234bfd 100644 --- a/resources/assets/sass/pages/components/project-list.scss +++ b/resources/assets/sass/pages/components/project-list.scss @@ -323,6 +323,7 @@ line-height: 1.5; white-space: pre-wrap; word-wrap: break-word; + word-break: break-word; } } .task-menu {