Scarfski/dootask
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
Pang
2024-03-07 08:27:47 +08:00
parent edfd6e6de2
commit 38d8f289e4
20 changed files with 155 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Api/SystemController.php
+1 -1
View File
@@ -126,7 +126,7 @@ class SystemController extends AbstractController
$setting['file_upload_limit'] = $setting['file_upload_limit'] ?: '';
$setting['unclaimed_task_reminder'] = $setting['unclaimed_task_reminder'] ?: 'close';
$setting['unclaimed_task_reminder_time'] = $setting['unclaimed_task_reminder_time'] ?: '';
$setting['version'] = Base::getVersion();
$setting['server_version'] = Base::getVersion();
//
return Base::retSuccess('success', $setting ?: json_decode('{}'));
}
app/Http/Controllers/IndexController.php
+1 -1
View File
@@ -407,7 +407,7 @@ class IndexController extends InvokeController
}
/**
* 保存配置 (已废弃 Deprecated)
* 保存配置 (todo 已废弃)
* @return string
*/
public function storage__synch()
electron/electron.js
Vendored
+19
View File
@@ -675,6 +675,25 @@ ipcMain.on('updateChildWindow', (event, args) => {
event.returnValue = "ok"
})
/**
* 创建路由窗口（todo 已废弃）
* @param args {path, ?}
*/
ipcMain.on('windowRouter', (event, args) => {
createChildWindow(args)
event.returnValue = "ok"
})
/**
* 更新路由窗口（todo 已废弃）
* @param args {?name, ?path} // name: 不是要更改的窗口名，是要把窗口名改成什么， path: 地址
*/
ipcMain.on('updateRouter', (event, args) => {
const browser = BrowserWindow.fromWebContents(event.sender);
updateChildWindow(browser, args)
event.returnValue = "ok"
})
/**
* 内置浏览器 - 打开创建
* @param args {url, ?}
language/original-web.txt
+7 -1
View File
@@ -1509,7 +1509,7 @@ License Key
数据已超过(*)条，是否继续加载？
版本过低
服务器接口版本过低，部分功能可能无法正常使用。
服务器（(*)）接口版本过低，部分功能可能无法正常使用。
禁言
@@ -1528,3 +1528,9 @@ License Key
离最新版本只有一步之遥了！重新启动应用即可完成更新。
重新启动
欢迎使用本软件！
在您使用本软件前，请您认真阅读并了解相应的
以了解我们的服务内容和您相关个人信息的处理规则。
我们将严格的按照隐私服务协议为您提供服务，保护您的个人信息。
服务器（(*)）版本过低
language/translate.json
+66 -11
View File
@@ -19557,17 +19557,6 @@
"fr": "Version trop basse",
"id": "Versi rendah"
},
{
"key": "服务器接口版本过低，部分功能可能无法正常使用。",
"zh": "",
"zh-CHT": "服務器接口版本過低，部分功能可能無法正常使用。",
"en": "The version of the server interface is too early, and some functions may be unavailable.",
"ko": "서버 인터페이스 버전이 너무 낮아 일부 기능을 정상적으로 사용할 수 없을 것 같다.",
"ja": "サーバーインターフェースのバージョンが低すぎて、一部の機能が正常に使用できない場合があります。",
"de": "Die server-version ist zu niedrig und teilweise unbrauchbar.",
"fr": "La version de l’interface du serveur est trop basse, certaines fonctions peuvent ne pas fonctionner correctement.",
"id": "Versi antarmuka server yang rendah, sebagian fungsinya mungkin tidak berfungsi dengan baik."
},
{
"key": "没有任何联系人",
"zh": "",
@@ -19809,5 +19798,71 @@
"de": "Mach's nochmal!",
"fr": "Redémarrer le",
"id": "Restart"
},
{
"key": "欢迎使用本软件！",
"zh": "",
"zh-CHT": "歡迎使用本軟件！",
"en": "Welcome to use this software!",
"ko": "이 소프트웨어 사용을 환영합니다!",
"ja": "本ソフトの使用を歓迎します!",
"de": "Willkommen bei unserer software!",
"fr": "Bienvenue dans le logiciel!",
"id": "Selamat datang di perangkat lunak ini!"
},
{
"key": "在您使用本软件前，请您认真阅读并了解相应的",
"zh": "",
"zh-CHT": "在您使用本軟件前，請您認真閱讀並瞭解相應的",
"en": "Before you use this software, please read and understand the corresponding",
"ko": "이 소프트웨어를 사용하기 전에, 적절한 것을 읽고 이해하시기 바랍니다",
"ja": "本ソフトをご利用になる前に、該当するものをよくお読みになって、ご理解いただけますようお願いいたします。",
"de": "Bevor sie dieses programm verwenden, lesen sie es bitte sorgfältig und lernen sie es sich gut ein",
"fr": "Avant d’utiliser ce logiciel, veuillez lire attentivement et comprendre en conséquence",
"id": "Sebelum anda menggunakan perangkat lunak ini, silakan membaca dengan seksama dan memahami yang sesuai"
},
{
"key": "以了解我们的服务内容和您相关个人信息的处理规则。",
"zh": "",
"zh-CHT": "以瞭解我們的服務內容和您相關個人信息的處理規則。",
"en": "To understand the content of our services and your relevant personal information processing rules.",
"ko": "저희 서비스의 내용과 귀하 관련 개인 정보의 처리 방법을 알아보십시오.",
"ja": "私たちのサービス内容とあなたの箇人情報の取り扱いルールを理解するためです。",
"de": "Ich möchte sie fragen, welche regeln sie zur bearbeitung Von informationen haben.",
"fr": "Pour comprendre le contenu de nos services et les règles de traitement des informations personnelles vous concernant.",
"id": "Untuk mengetahui isi layanan kami dan aturan pengolahan untuk informasi pribadi anda."
},
{
"key": "我们将严格的按照隐私服务协议为您提供服务，保护您的个人信息。",
"zh": "",
"zh-CHT": "我們將嚴格的按照隱私服務協議爲您提供服務，保護您的個人信息。",
"en": "We will provide you with services in strict accordance with the privacy service agreement and protect your personal information.",
"ko": "당사는 귀하에게 서비스를 제공하고 귀하의 개인 정보를 보호하기 위해 엄격하게 개인 정보 보호 서비스 협의에 준할 것입니다.",
"ja": "プライバシーサービス契約に基づいて厳格なサービスを提供し、お客様の箇人情報を保護します。",
"de": "Wir werden ihre dienste strikt nach maßgabe der datenschutzbestimmungen anbieten und ihre persönlichen informationen schützen.",
"fr": "Nous vous fournirons nos services en stricte conformité avec notre accord de service de confidentialité pour protéger vos informations personnelles.",
"id": "Kami akan melayani anda dengan ketat sesuai dengan protokol privasi untuk melindungi informasi pribadi anda."
},
{
"key": "服务器（(*)）版本过低",
"zh": "",
"zh-CHT": "服務器（(*)）版本過低",
"en": "The server ((*)) version is too early",
"ko": "서버 (*) 버전이 너무 낮습니다",
"ja": "サーバー((*))のバージョンが低すぎます。",
"de": "Server (*) zu niedrig rüber gehen",
"fr": "Serveur ((*)) version trop basse",
"id": "Versi server (*) terlalu rendah"
},
{
"key": "服务器（(*)）接口版本过低，部分功能可能无法正常使用。",
"zh": "",
"zh-CHT": "服務器（(*)）接口版本過低，部分功能可能無法正常使用。",
"en": "The interface version of the server ((*)) is too early, and some functions may be unavailable.",
"ko": "서버 (*) 인터페이스 버전이 너무 낮아서 일부 기능을 제대로 사용할 수 없습니다.",
"ja": "サーバー((*))インターフェースのバージョンが低いため、一部の機能が正常に使用できない場合があります。",
"de": "Der server (*) ist bei zu niedrigen versionen möglicherweise nicht betriebsbereit",
"fr": "La version de l’interface du serveur ((*)) est trop basse et certaines fonctions peuvent ne pas fonctionner correctement.",
"id": "Server ((*) memiliki versi antarmuka yang lebih rendah sehingga sebagian fungsinya mungkin tidak berfungsi dengan baik."
}
]
public/language/web/de.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
public/language/web/en.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
public/language/web/fr.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
public/language/web/id.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
public/language/web/ja.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
public/language/web/key.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
public/language/web/ko.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
public/language/web/zh-CHT.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
public/language/web/zh.js
Vendored
+1 -1
View File
@@ -1 +1 @@
if(typeof window.LANGUAGE_DATA==="undefined")window.LANGUAGE_DATA={};window.LANGUAGE_DATA["zh"]=["","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","",""]
if(typeof window.LANGUAGE_DATA==="undefined")window.LANGUAGE_DATA={};window.LANGUAGE_DATA["zh"]=["","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","",""]
resources/assets/js/components/MicroApps.vue
+11 -1
View File
@@ -126,7 +126,17 @@ export default {
},
userInfo: this.userInfo,
path: this.path,
electron: this.$Electron
electron: this.$Electron,
openAppChildPage: (objects) => {
this.$store.dispatch('openAppChildPage', objects);
},
openChildWindow: (params) => {
this.$store.dispatch('openChildWindow', params);
},
openWebTabWindow: (url) => {
this.$store.dispatch('openWebTabWindow', url);
},
}
}
},
resources/assets/js/components/RightBottom.vue
+1 -1
View File
@@ -128,7 +128,7 @@ export default {
if (this.compareVersion(this.apiVersion, '0.19.0') === -1) {
$A.modalWarning({
title: '温馨提示',
message: '服务器接口版本过低，部分功能可能无法正常使用。',
message: `服务器（${$A.getDomain($A.apiUrl('../'))}）接口版本过低，部分功能可能无法正常使用。`,
});
}
if (this.$Electron) {
resources/assets/js/functions/eeui.js
Vendored
+10
View File
@@ -10,6 +10,16 @@
* =============================================================================
*/
$.extend({
eeuiAppVersion() {
if (!$A.isEEUiApp) return;
return requireModuleJs("eeui").getVersion();
},
eeuiAppLocalVersion() {
if (!$A.isEEUiApp) return;
return requireModuleJs("eeui").getLocalVersion();
},
eeuiAppAlert(object, callback) {
if (!$A.isEEUiApp) return;
if (typeof callback !== "function") callback = _ => {};
resources/assets/js/pages/login.vue
+1 -1
View File
@@ -452,7 +452,7 @@ export default {
url: `${url}system/setting`,
checkNetwork: false,
}).then(async ({data}) => {
if (typeof data.version === "undefined" && typeof data.all_group_mute === "undefined") {
if (typeof data.server_version === "undefined" && typeof data.all_group_mute === "undefined") {
reject(`服务器（${$A.getDomain(value)}）版本过低`)
} else {
await this.setServerUrl(url)
resources/assets/js/pages/manage/setting/index.vue
+28 -13
View File
@@ -58,7 +58,9 @@ export default {
},
mounted() {
if (this.$isEEUiApp) {
this.version = `${window.systemInfo.version} (${$A.eeuiAppLocalVersion()})`
}
},
computed: {
@@ -205,19 +207,32 @@ export default {
},
onVersion() {
axios.get($A.apiUrl('system/version')).then(({status, data}) => {
if (status === 200) {
let content = `${this.$L('服务器')}: ${$A.getDomain($A.apiUrl('../'))}`
content += `<br/>${this.$L('服务器版本')}: v${data.version}`
content += `<br/>${this.$L('客户端版本')}: v${this.version}`
$A.modalInfo({
language: false,
title: this.$L('版本信息'),
content
})
}
}).catch(_ => { })
const array = []
this.getServerVersion().then(version => {
array.push(`${this.$L('服务器')}: ${$A.getDomain($A.apiUrl('../'))}`)
array.push(`${this.$L('服务器版本')}: v${version}`)
array.push(`${this.$L('客户端版本')}: v${this.version}`)
$A.modalInfo({
language: false,
title: this.$L('版本信息'),
content: array.join('<br/>')
})
})
},
getServerVersion() {
return new Promise(resolve => {
if (/^\d+\.\d+\.\d+$/.test(window.systemInfo.server_version)) {
resolve(window.systemInfo.server_version)
return;
}
axios.get($A.apiUrl('system/version')).then(({status, data}) => {
if (status === 200) {
resolve(data.version)
}
}).catch(_ => { })
})
}
}
}
</script>
resources/views/desktop.blade.php
+1 -1
View File
@@ -181,7 +181,7 @@
<h1 class="mirror-nav">
<p>Download of v{{ $version }}</p>
<a class="download-other-btn" href="https://github.com/kuaifan/dootask/releases" target="_blank">Other Versions</a>
<a class="download-other-btn" href="https://github.com/kuaifan/dootask/releases" target="_blank">More Versions</a>
</h1>
<div class="mirror">
<table class="table">