diff --git a/app/Http/Controllers/Api/SystemController.php b/app/Http/Controllers/Api/SystemController.php index a2b6e2a85..295b19d04 100755 --- a/app/Http/Controllers/Api/SystemController.php +++ b/app/Http/Controllers/Api/SystemController.php @@ -1178,7 +1178,7 @@ class SystemController extends AbstractController if ($logResults) { $logVersion = $logResults[0]['title']; $logContent = implode("\n", array_map(function($item) { - return "## [{$item['title']}]" . $item['content']; + return "## {$item['title']}" . $item['content']; }, $logResults)); } return Base::retSuccess('success', [ diff --git a/composer.lock b/composer.lock index 7215d079e..e5ef1c4e8 100644 --- a/composer.lock +++ b/composer.lock @@ -2739,16 +2739,16 @@ }, { "name": "maatwebsite/excel", - "version": "3.1.63", + "version": "3.1.64", "source": { "type": "git", "url": "https://github.com/SpartnerNL/Laravel-Excel.git", - "reference": "fccd234da23b39ab03e1a1f6fe9178fb96ec1be1" + "reference": "e25d44a2d91da9179cd2d7fec952313548597a79" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/SpartnerNL/Laravel-Excel/zipball/fccd234da23b39ab03e1a1f6fe9178fb96ec1be1", - "reference": "fccd234da23b39ab03e1a1f6fe9178fb96ec1be1", + "url": "https://api.github.com/repos/SpartnerNL/Laravel-Excel/zipball/e25d44a2d91da9179cd2d7fec952313548597a79", + "reference": "e25d44a2d91da9179cd2d7fec952313548597a79", "shasum": "" }, "require": { @@ -2804,7 +2804,7 @@ ], "support": { "issues": "https://github.com/SpartnerNL/Laravel-Excel/issues", - "source": "https://github.com/SpartnerNL/Laravel-Excel/tree/3.1.63" + "source": "https://github.com/SpartnerNL/Laravel-Excel/tree/3.1.64" }, "funding": [ { @@ -2816,7 +2816,7 @@ "type": "github" } ], - "time": "2025-02-19T14:24:57+00:00" + "time": "2025-02-24T11:12:50+00:00" }, { "name": "madnest/madzipper", @@ -3810,27 +3810,27 @@ }, { "name": "orangehill/iseed", - "version": "v3.1.0", + "version": "v3.1.1", "source": { "type": "git", "url": "https://github.com/orangehill/iseed.git", - "reference": "8f1970930e6ec3c7a1c8cd001adf88f58e904525" + "reference": "bfe8f5882641f70b309cd01e30f02e8e9d09b492" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/orangehill/iseed/zipball/8f1970930e6ec3c7a1c8cd001adf88f58e904525", - "reference": "8f1970930e6ec3c7a1c8cd001adf88f58e904525", + "url": "https://api.github.com/repos/orangehill/iseed/zipball/bfe8f5882641f70b309cd01e30f02e8e9d09b492", + "reference": "bfe8f5882641f70b309cd01e30f02e8e9d09b492", "shasum": "" }, "require": { - "illuminate/support": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0", + "illuminate/support": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0", "php": "^7.2|^8.0.2" }, "require-dev": { - "illuminate/filesystem": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0", - "laravel/framework": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0", + "illuminate/filesystem": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0", + "laravel/framework": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0", "mockery/mockery": "^1.0.0", - "phpunit/phpunit": "^8.0" + "phpunit/phpunit": "^8.0|^11.5.3" }, "type": "library", "extra": { @@ -3867,9 +3867,9 @@ ], "support": { "issues": "https://github.com/orangehill/iseed/issues", - "source": "https://github.com/orangehill/iseed/tree/v3.1.0" + "source": "https://github.com/orangehill/iseed/tree/v3.1.1" }, - "time": "2025-02-13T10:49:30+00:00" + "time": "2025-03-04T07:56:48+00:00" }, { "name": "overtrue/http", diff --git a/language/original-api.txt b/language/original-api.txt index 94a09e3be..11aa57a19 100644 --- a/language/original-api.txt +++ b/language/original-api.txt @@ -823,3 +823,4 @@ AI机器人不存在 不能选择自己的子部门作为上级部门 转文字失败 +状态[(*)]设置错误,状态负责人[(*)]不在项目成员内 diff --git a/language/original-web.txt b/language/original-web.txt index fccd81fec..382022bee 100644 --- a/language/original-web.txt +++ b/language/original-web.txt @@ -1982,3 +1982,5 @@ API请求的URL路径 创建任务 在消息中打开 + +项目已归档,无法查看 diff --git a/resources/assets/js/components/SearchBox.vue b/resources/assets/js/components/SearchBox.vue index 8f3ee9bf3..eb9889025 100755 --- a/resources/assets/js/components/SearchBox.vue +++ b/resources/assets/js/components/SearchBox.vue @@ -207,6 +207,10 @@ export default { break; case 'project': + if (item.rawData.archived_at) { + $A.modalWarning("项目已归档,无法查看") + return + } this.goForward({name: 'manage-project', params: {projectId: item.id}}) this.onHide() break; diff --git a/resources/assets/js/pages/manage/setting/version.vue b/resources/assets/js/pages/manage/setting/version.vue index 6b2704aa7..a604bd9d3 100644 --- a/resources/assets/js/pages/manage/setting/version.vue +++ b/resources/assets/js/pages/manage/setting/version.vue @@ -17,6 +17,25 @@ .vuepress-markdown-body { padding: 0 !important; color: inherit; + h1, h2, h3, h4, h5, h6 { + line-height: 1.25; + } + h2 { + padding-bottom: .4em; + font-size: 1.5em; + margin: 1.5em 0 1em; + } + h3 { + font-size: 1.2em; + margin: 1.5em 0 1em; + } + ul, ol { + padding-left: 2em; + line-height: 1.5; + } + li { + margin-top: .25em; + } } }