diff --git a/electron/build.js b/electron/build.js
index 8079349a1..78b7761a9 100644
--- a/electron/build.js
+++ b/electron/build.js
@@ -102,6 +102,7 @@ function genericPublish({url, version, output}) {
function startBuild(data, publish, release) {
const systemInfo = {
title: data.name,
+ debug: "no",
version: config.version,
origin: "./",
homeUrl: utils.formatUrl(data.url),
diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue
index 67b6056f8..2715782ba 100644
--- a/resources/assets/js/pages/manage/components/DialogWrapper.vue
+++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue
@@ -89,7 +89,7 @@
:item-class-add="itemClassAdd"
:extra-props="{dialogData, operateVisible, operateItem, isMyDialog, msgId}"
- :estimate-size="78"
+ :estimate-size="dialogData.type=='group' ? 105 : 77"
:keeps="50"
:disabled="scrollDisabled"
@scroll="onScroll"
diff --git a/resources/assets/js/pages/manage/file.vue b/resources/assets/js/pages/manage/file.vue
index 38d7ff4fa..9593ea00f 100644
--- a/resources/assets/js/pages/manage/file.vue
+++ b/resources/assets/js/pages/manage/file.vue
@@ -850,7 +850,7 @@ export default {
render: (h, {row}) => {
let type = this.types.find(({value, name}) => value == row.type && name);
if (type) {
- return h('AutoTip', type.name);
+ return h('AutoTip', this.$L(type.name));
} else {
return h('div', (row.ext || row.type).toUpperCase())
}
diff --git a/resources/assets/js/pages/manage/setting/components/SystemEmailSetting.vue b/resources/assets/js/pages/manage/setting/components/SystemEmailSetting.vue
index 0a886d497..bd74e06d8 100644
--- a/resources/assets/js/pages/manage/setting/components/SystemEmailSetting.vue
+++ b/resources/assets/js/pages/manage/setting/components/SystemEmailSetting.vue
@@ -31,8 +31,8 @@
{{$L('开启后:')}}
- {{$L('① 帐号需验证通过才可登录')}}
- {{$L('② 修改邮箱和删除帐号需要邮箱验证码')}}
+ ① {{$L('帐号需验证通过才可登录')}}
+ ② {{$L('修改邮箱和删除帐号需要邮箱验证码')}}
diff --git a/resources/assets/js/pages/manage/setting/index.vue b/resources/assets/js/pages/manage/setting/index.vue
index 75e5c8fa6..8d1513029 100644
--- a/resources/assets/js/pages/manage/setting/index.vue
+++ b/resources/assets/js/pages/manage/setting/index.vue
@@ -199,6 +199,7 @@ export default {
content += `
${this.$L('服务器版本')}: v${data.version}`
content += `
${this.$L('客户端版本')}: v${this.version}`
$A.modalInfo({
+ language: false,
title: '版本信息',
content
})
diff --git a/resources/assets/sass/pages/components/dialog-wrapper.scss b/resources/assets/sass/pages/components/dialog-wrapper.scss
index ba92ed411..a2e6e9e38 100644
--- a/resources/assets/sass/pages/components/dialog-wrapper.scss
+++ b/resources/assets/sass/pages/components/dialog-wrapper.scss
@@ -479,7 +479,7 @@
display: block;
margin: 0;
padding: 0;
- line-height: 1.5;
+ line-height: 20px;
white-space: pre-wrap;
word-wrap: break-word;
word-break: break-word;
@@ -1566,8 +1566,7 @@
}
.content-text {
> pre {
- line-height: 1.4;
- font-size: 16px;
+ font-size: 15px;
}
}
}
diff --git a/resources/assets/sass/pages/components/project-dialog.scss b/resources/assets/sass/pages/components/project-dialog.scss
index 988196146..aaf4d4459 100644
--- a/resources/assets/sass/pages/components/project-dialog.scss
+++ b/resources/assets/sass/pages/components/project-dialog.scss
@@ -7,10 +7,10 @@
position: relative;
.dialog-user {
margin-top: 26px;
- padding: 0 22px;
.member-head {
display: flex;
align-items: center;
+ padding: 0 22px;
.member-title {
flex: 1;
font-size: 18px;
@@ -42,6 +42,7 @@
display: flex;
align-items: center;
margin-top: 12px;
+ padding: 0 22px;
overflow: auto;
&::-webkit-scrollbar {
diff --git a/resources/assets/sass/pages/page-setting.scss b/resources/assets/sass/pages/page-setting.scss
index 458216026..079278f46 100755
--- a/resources/assets/sass/pages/page-setting.scss
+++ b/resources/assets/sass/pages/page-setting.scss
@@ -57,13 +57,6 @@
background-color: #F4F5F7;
}
- &.version {
- cursor: default;
- &:hover {
- background-color: transparent;
- }
- }
-
&.divided {
position: relative;
margin-top: 10px;
diff --git a/resources/views/main.blade.php b/resources/views/main.blade.php
index ea604d79d..2ba8586c9 100755
--- a/resources/views/main.blade.php
+++ b/resources/views/main.blade.php
@@ -19,7 +19,7 @@