github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-03-17 11:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
kuaifan 2022-07-16 21:53:53 +08:00
parent d565501e04
commit cfd3996af1
9 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
electron/build.js vendored
View File

@ -102,6 +102,7 @@ function genericPublish({url, version, output}) {
function startBuild(data, publish, release) { function startBuild(data, publish, release) {
const systemInfo = { const systemInfo = {
title: data.name, title: data.name,
debug: "no",
version: config.version, version: config.version,
origin: "./", origin: "./",
homeUrl: utils.formatUrl(data.url), homeUrl: utils.formatUrl(data.url),

2
resources/assets/js/pages/manage/components/DialogWrapper.vue
View File

@ -89,7 +89,7 @@
:item-class-add="itemClassAdd" :item-class-add="itemClassAdd"
:extra-props="{dialogData, operateVisible, operateItem, isMyDialog, msgId}" :extra-props="{dialogData, operateVisible, operateItem, isMyDialog, msgId}"
:estimate-size="78" :estimate-size="dialogData.type=='group' ? 105 : 77"
:keeps="50" :keeps="50"
:disabled="scrollDisabled" :disabled="scrollDisabled"
@scroll="onScroll" @scroll="onScroll"

2
resources/assets/js/pages/manage/file.vue
View File

@ -850,7 +850,7 @@ export default {
render: (h, {row}) => { render: (h, {row}) => {
let type = this.types.find(({value, name}) => value == row.type && name); let type = this.types.find(({value, name}) => value == row.type && name);
if (type) { if (type) {
return h('AutoTip', type.name); return h('AutoTip', this.$L(type.name));
} else { } else {
return h('div', (row.ext || row.type).toUpperCase()) return h('div', (row.ext || row.type).toUpperCase())
} }

4
resources/assets/js/pages/manage/setting/components/SystemEmailSetting.vue
View File

@ -31,8 +31,8 @@
</RadioGroup> </RadioGroup>
<div v-if="formData.reg_verify == 'open'" class="form-tip"> <div v-if="formData.reg_verify == 'open'" class="form-tip">
{{$L('开启后：')}}<br/> {{$L('开启后：')}}<br/>
{{$L('① 帐号需验证通过才可登录')}}<br/> ① {{$L('帐号需验证通过才可登录')}}<br/>
{{$L('② 修改邮箱和删除帐号需要邮箱验证码')}} ② {{$L('修改邮箱和删除帐号需要邮箱验证码')}}
</div> </div>
</FormItem> </FormItem>
<FormItem :label="$L('任务提醒')" prop="notice"> <FormItem :label="$L('任务提醒')" prop="notice">

1
resources/assets/js/pages/manage/setting/index.vue
View File

@ -199,6 +199,7 @@ export default {
content += `<br/>${this.$L('服务器版本')}: v${data.version}` content += `<br/>${this.$L('服务器版本')}: v${data.version}`
content += `<br/>${this.$L('客户端版本')}: v${this.version}` content += `<br/>${this.$L('客户端版本')}: v${this.version}`
$A.modalInfo({ $A.modalInfo({
language: false,
title: '版本信息', title: '版本信息',
content content
}) })

5
resources/assets/sass/pages/components/dialog-wrapper.scss vendored
View File

@ -479,7 +479,7 @@
display: block; display: block;
margin: 0; margin: 0;
padding: 0; padding: 0;
line-height: 1.5; line-height: 20px;
white-space: pre-wrap; white-space: pre-wrap;
word-wrap: break-word; word-wrap: break-word;
word-break: break-word; word-break: break-word;
@ -1566,8 +1566,7 @@
} }
.content-text { .content-text {
> pre { > pre {
line-height: 1.4; font-size: 15px;
font-size: 16px;
} }
} }
} }

3
resources/assets/sass/pages/components/project-dialog.scss vendored
View File

@ -7,10 +7,10 @@
position: relative; position: relative;
.dialog-user { .dialog-user {
margin-top: 26px; margin-top: 26px;
padding: 0 22px;
.member-head { .member-head {
display: flex; display: flex;
align-items: center; align-items: center;
padding: 0 22px;
.member-title { .member-title {
flex: 1; flex: 1;
font-size: 18px; font-size: 18px;
@ -42,6 +42,7 @@
display: flex; display: flex;
align-items: center; align-items: center;
margin-top: 12px; margin-top: 12px;
padding: 0 22px;
overflow: auto; overflow: auto;
&::-webkit-scrollbar { &::-webkit-scrollbar {

7
resources/assets/sass/pages/page-setting.scss vendored
View File

@ -57,13 +57,6 @@
background-color: #F4F5F7; background-color: #F4F5F7;
} }
&.version {
cursor: default;
&:hover {
background-color: transparent;
}
}
&.divided { &.divided {
position: relative; position: relative;
margin-top: 10px; margin-top: 10px;

2
resources/views/main.blade.php
View File

@ -19,7 +19,7 @@
<script src="{{ asset_main('js/scroll-into-view.min.js') }}"></script> <script src="{{ asset_main('js/scroll-into-view.min.js') }}"></script>
<script> <script>
window.csrfToken = { csrfToken : "{{ csrf_token() }}" }; window.csrfToken = { csrfToken : "{{ csrf_token() }}" };
window.systemInfo = { title: "{{config('app.name', 'WebPage')}}", version : "{{ $version }}", origin: window.location.origin + "/", homeUrl: null, apiUrl: null }; window.systemInfo = { title: "{{config('app.name', 'WebPage')}}", debug: "{{config('app.debug') ? 'yes' : 'no'}}", version : "{{ $version }}", origin: window.location.origin + "/", homeUrl: null, apiUrl: null };
</script> </script>
</head> </head>
<body> <body>