diff --git a/electron/package.json b/electron/package.json index 30ad05991..fd5cbb090 100644 --- a/electron/package.json +++ b/electron/package.json @@ -32,7 +32,7 @@ "@electron-forge/maker-squirrel": "^6.1.1", "@electron-forge/maker-zip": "^6.1.1", "dotenv": "^16.0.3", - "electron": "^25.1.0", + "electron": "^23.3.6", "electron-builder": "^23.6.0", "electron-notarize": "^1.2.2", "form-data": "^4.0.0", diff --git a/language/original-web.txt b/language/original-web.txt index fe7ec4589..22f52d8d5 100644 --- a/language/original-web.txt +++ b/language/original-web.txt @@ -1225,3 +1225,5 @@ Markdown 格式发送 内容 添加评论 请输入内容! + +支持 Markdown 格式 diff --git a/resources/assets/js/components/MDEditor/components/preview/nostyle.vue b/resources/assets/js/components/MDEditor/components/preview/nostyle.vue new file mode 100644 index 000000000..502eee2a5 --- /dev/null +++ b/resources/assets/js/components/MDEditor/components/preview/nostyle.vue @@ -0,0 +1,36 @@ + + + diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue index 77dd625bd..4e309310e 100644 --- a/resources/assets/js/pages/manage/components/DialogWrapper.vue +++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue @@ -552,6 +552,10 @@ export default { type: Boolean, default: false }, + isMessenger: { + type: Boolean, + default: false + }, beforeBack: Function }, @@ -843,10 +847,10 @@ export default { return null }, - footerStyle() { - const {keyboardType, keyboardHeight, safeAreaBottom, windowScrollY} = this + footerStyle({keyboardType, keyboardHeight, safeAreaBottom, windowScrollY, isMessenger}) { const style = {}; if (windowScrollY === 0 + && isMessenger && keyboardType === "show" && keyboardHeight > 0 && keyboardHeight < 120) { diff --git a/resources/assets/js/pages/manage/components/ProjectPanel.vue b/resources/assets/js/pages/manage/components/ProjectPanel.vue index b77b88c7f..e75ba09c5 100644 --- a/resources/assets/js/pages/manage/components/ProjectPanel.vue +++ b/resources/assets/js/pages/manage/components/ProjectPanel.vue @@ -73,7 +73,9 @@
-
{{projectData.desc}}
+
+ +
{{$L('显示已完成')}} @@ -331,7 +333,7 @@ - +
@@ -472,10 +474,12 @@ import ProjectWorkflow from "./ProjectWorkflow"; import TaskMenu from "./TaskMenu"; import TaskDeleted from "./TaskDeleted"; import ProjectGantt from "./ProjectGantt"; +import MarkdownPreviewNostyle from "../../../components/MDEditor/components/preview/nostyle.vue"; export default { name: "ProjectPanel", components: { + MarkdownPreviewNostyle, TaskMenu, ProjectWorkflow, DrawerOverlay, diff --git a/resources/assets/js/pages/manage/messenger.vue b/resources/assets/js/pages/manage/messenger.vue index da235145c..a10f5d907 100644 --- a/resources/assets/js/pages/manage/messenger.vue +++ b/resources/assets/js/pages/manage/messenger.vue @@ -177,7 +177,7 @@
{{$L('选择一个会话开始聊天')}}
- +
diff --git a/resources/assets/sass/pages/components/project-panel.scss b/resources/assets/sass/pages/components/project-panel.scss index 547f61a36..32dad9398 100644 --- a/resources/assets/sass/pages/components/project-panel.scss +++ b/resources/assets/sass/pages/components/project-panel.scss @@ -126,8 +126,10 @@ .project-subtitle { float: left; color: $primary-desc-color; - line-height: 24px; - margin: 6px 0; + line-height: 1.5; + margin: 8px 0 7px; + max-height: 220px; + overflow: auto; } .project-switch { float: right; @@ -493,6 +495,9 @@ align-items: center; overflow: auto; margin-right: 24px; + &::-webkit-scrollbar { + display: none; + } > li { list-style: none; margin-left: -6px; diff --git a/resources/assets/sass/pages/page-manage.scss b/resources/assets/sass/pages/page-manage.scss index 4aec52350..95bad4566 100644 --- a/resources/assets/sass/pages/page-manage.scss +++ b/resources/assets/sass/pages/page-manage.scss @@ -27,6 +27,8 @@ position: sticky; top: 0; z-index: 1; + margin: 0 auto; + width: 80%; background: #F4F5F7; ul { flex: 1; @@ -41,8 +43,7 @@ color: #6b6e72; cursor: pointer; position: relative; - width: 80%; - max-width: 100%; + width: 100%; margin: 5px auto; padding: 0 4%; border-radius: 4px; @@ -77,7 +78,8 @@ align-items: center; padding: 12px 0 0; cursor: default; - width: 100%; + margin: 0 auto; + width: 80%; > ul { width: 100%; > li { @@ -85,7 +87,7 @@ flex-direction: column; list-style: none; cursor: pointer; - width: 80%; + width: 100%; margin: 2px auto; border: 2px solid transparent; .project-h1 {