github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2025-12-10 18:02:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf: 优化系统参数

Browse Source
This commit is contained in:
Pang 2024-01-17 13:58:48 +08:00
parent 96b0cb8aa0
commit 0a4ac6abb7
36 changed files with 279 additions and 235 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
app/Http/Controllers/IndexController.php
View File

@ -372,27 +372,20 @@ class IndexController extends InvokeController
}
/**
* 设置语言和皮肤
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View
* 保存配置
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View|string
*/
public function setting__theme_language()
public function storage__synch()
{
return view('setting', [
'theme' => Request::input('theme'),
'language' => Request::input('language')
]);
}
/**
* 设置用户信息
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View
*/
public function setting__userinfo()
{
return view('setting', [
'userid' => Request::input('userid'),
'token' => Request::input('token')
]);
$key = Request::input('key');
$value = Request::input('value');
if ($key) {
$value = [$key => $value];
}
if (!is_array($value)) {
$value = Base::json2array($value);
}
return view('storage', ['value' => Base::array2json($value)]);
}
/**

3
app/Http/Middleware/VerifyCsrfToken.php
View File

@ -15,6 +15,9 @@ class VerifyCsrfToken extends Middleware
// 接口部分
'api/*',
// 保存配置
'storage/synch/',
// 发布桌面端
'desktop/publish/',
];

2
docker-compose.yml
View File

@ -177,7 +177,7 @@ services:
okr:
container_name: "dootask-okr-${APP_ID}"
image: "kuaifan/doookr:0.0.29"
image: "kuaifan/doookr:0.0.30"
environment:
TZ: "${TIMEZONE:-PRC}"
DOO_TASK_URL: "http://${APP_IPPR}.3"

3
electron/index.html
View File

@ -12,6 +12,7 @@
<!--style-->
<link rel="stylesheet" type="text/css" href="./css/iview.css">
<link rel="stylesheet" type="text/css" href="./css/loading.css">
<script src="./js/loading-theme.js"></script>
<script src="./js/jsencrypt.min.js"></script>
<script src="./js/scroll-into-view.min.js"></script>
<script src="./config.js"></script>
@ -20,7 +21,7 @@
<div id="app">
<div class="app-view-loading">
<div class="app-view-loading no-dark-mode">
<div>
<div>PAGE LOADING</div>
<span></span>

65
resources/assets/js/App.vue
View File

@ -19,9 +19,6 @@
<!--网络提示-->
<NetworkException v-if="windowLandscape"/>
<!--Hidden IFrame-->
<iframe v-for="item in iframes" :key="item.key" v-if="item.url" v-show="false" :src="item.url"></iframe>
<!--引导页-->
<GuidePage/>
</div>
@ -44,7 +41,7 @@ import NetworkException from "./components/NetworkException";
import GuidePage from "./components/GuidePage";
import TaskOperation from "./pages/manage/components/TaskOperation";
import {mapState} from "vuex";
import {languageType} from "./language";
import {languageName} from "./language";
export default {
components: {TaskOperation, NetworkException, PreviewImageState, RightBottom, FloatSpinner, GuidePage},
@ -53,7 +50,6 @@ export default {
return {
routePath: null,
searchInter: null,
iframes: [],
}
},
@ -61,8 +57,6 @@ export default {
this.electronEvents();
this.eeuiEvents();
this.otherEvents();
this.synchThemeLanguage();
this.synchAppTheme();
},
mounted() {
@ -80,11 +74,7 @@ export default {
},
computed: {
...mapState(['ws', 'themeMode', 'themeIsDark', 'windowOrientation']),
isSoftware() {
return this.$Electron || this.$isEEUiApp;
},
...mapState(['ws', 'themeConf', 'windowOrientation']),
},
watch: {
@ -108,7 +98,6 @@ export default {
userId: {
handler() {
this.$store.dispatch("websocketConnection");
this.synchUserToken();
//
if (this.userId > 0) {
if (this.$isEEUiApp) {
@ -143,6 +132,13 @@ export default {
}
})
}
//
window.localStorage.setItem("__system:userId__", this.userId)
window.localStorage.setItem("__system:userToken__", this.userToken)
$A.storageByIframe({
userId: this.userId,
userToken: this.userToken,
})
},
immediate: true
},
@ -187,10 +183,6 @@ export default {
this.$store.dispatch("audioStop", true)
}
},
themeIsDark() {
this.synchThemeLanguage();
}
},
methods: {
@ -226,42 +218,12 @@ export default {
});
},
synchUserToken() {
if (this.isSoftware) {
this.iframes = this.iframes.filter(({key}) => key != 'synchUserToken')
this.iframes.push({
key: 'synchUserToken',
url: $A.apiUrl(`../setting/userinfo?userid=${this.userId}&token=${this.userToken}`)
})
}
},
autoTheme() {
if (this.themeMode === "auto") {
if (this.themeConf === "auto") {
this.$store.dispatch("synchTheme")
}
},
synchThemeLanguage() {
if (this.isSoftware) {
this.iframes = this.iframes.filter(({key}) => key != 'synchThemeLanguage')
this.iframes.push({
key: 'synchThemeLanguage',
url: $A.apiUrl(`../setting/theme_language?theme=${this.themeIsDark ? 'dark' : 'light'}&language=${languageType}`)
})
}
this.synchAppTheme()
},
synchAppTheme() {
if (this.$isEEUiApp) {
$A.eeuiAppSendMessage({
action: 'updateTheme',
themeName: this.themeIsDark ? 'dark' : 'light',
});
}
},
windowSizeListener() {
const windowWidth = $A(window).width(),
windowHeight = $A(window).height(),
@ -315,10 +277,7 @@ export default {
this.$Electron.registerMsgListener('browserWindowFocus', _ => {
this.$store.state.windowActive = true;
})
this.iframes.push({
key: 'manifest',
url: $A.apiUrl("../manifest")
})
$A.loadIframe($A.apiUrl("../manifest")).catch(_ => {})
$A.bindScreenshotKey(this.$store.state.cacheKeyboard);
//
this.$Electron.sendMessage('setMenuLanguage', {
@ -422,7 +381,7 @@ export default {
},
otherEvents() {
if (!this.isSoftware) {
if (!this.$isSoftware) {
// 非客户端监听窗口激活
const hiddenProperty = 'hidden' in document ? 'hidden' : 'webkitHidden' in document ? 'webkitHidden' : 'mozHidden' in document ? 'mozHidden' : null;
const visibilityChangeEvent = hiddenProperty.replace(/hidden/i, 'visibilitychange');

4
resources/assets/js/app.js vendored
View File

@ -2,7 +2,7 @@ const isElectron = !!(window && window.process && window.process.type);
const isEEUiApp = window && window.navigator && /eeui/i.test(window.navigator.userAgent);
import microappInit from "./microapp"
import {switchLanguage as $L, setLanguage, getLanguage} from "./language";
import {switchLanguage as $L} from "./language";
import './functions/common'
import './functions/eeui'
@ -147,6 +147,7 @@ $A.isMainElectron = false;
$A.isSubElectron = false;
$A.isEEUiApp = isEEUiApp;
$A.isElectron = isElectron;
$A.isSoftware = isEEUiApp || isElectron;
$A.openLog = false;
if (isElectron) {
$A.Electron = electron;
@ -192,6 +193,7 @@ Vue.prototype.$Platform = $A.Platform;
Vue.prototype.$isMainElectron = $A.isMainElectron;
Vue.prototype.$isSubElectron = $A.isSubElectron;
Vue.prototype.$isEEUiApp = $A.isEEUiApp;
Vue.prototype.$isSoftware = $A.isSoftware;
Vue.config.productionTip = false;
Vue.mixin(mixin)

4
resources/assets/js/components/AceEditor.vue
View File

@ -294,11 +294,11 @@ export default {
}
},
computed: {
...mapState(['themeIsDark']),
...mapState(['themeName']),
editTheme() {
if (this.theme == 'auto') {
if (this.themeIsDark) {
if (this.themeName === 'dark') {
return "dracula-dark"
} else {
return "chrome"

10
resources/assets/js/components/Drawio.vue
View File

@ -37,7 +37,7 @@
<script>
import {mapState} from "vuex";
import IFrame from "../pages/manage/components/IFrame";
import {languageType} from "../language";
import {languageName} from "../language";
export default {
name: "Drawio",
@ -67,15 +67,15 @@ export default {
}
},
created() {
let lang = languageType;
switch (languageType) {
let lang = languageName;
switch (languageName) {
case 'zh-CHT':
lang = 'zh-tw'
break;
}
let lightbox = this.readOnly ? 1 : 0;
let chrome = this.readOnly ? 0 : 1;
let theme = this.themeIsDark ? 'dark' : 'kennedy';
let theme = this.themeName === 'dark' ? 'dark' : 'kennedy';
let title = this.title ? encodeURIComponent(this.title) : '';
let query = `?title=${title}&chrome=${chrome}&lightbox=${lightbox}&ui=${theme}&lang=${lang}&offline=1&pwa=0&embed=1&noLangIcon=1&noExitBtn=1&noSaveBtn=1&saveAndExit=0&spin=1&proto=json`;
if (this.$Electron) {
@ -103,7 +103,7 @@ export default {
},
},
computed: {
...mapState(['themeIsDark'])
...mapState(['themeName'])
},
methods: {
formatZoom(val) {

2
resources/assets/js/components/GanttView.vue
View File

@ -50,8 +50,6 @@
</template>
<script>
import {mapState} from "vuex";
export default {
name: 'GanttView',
props: {

2
resources/assets/js/components/ImgUpload.vue
View File

@ -77,8 +77,6 @@
</template>
<script>
import {mapState} from "vuex";
export default {
name: 'ImgUpload',
props: {

47
resources/assets/js/components/MicroApps.vue
View File

@ -5,7 +5,8 @@
<Loading/>
</div>
</transition>
<micro-app v-if="url && !loading"
<micro-app
v-if="url && !loading"
:name='name'
:url='url'
inline
@ -18,19 +19,19 @@
@unmount='handleUnmount'
@error='handleError'
@datachange='handleDataChange'
></micro-app>
/>
</div>
</template>
<script>
import Vue from 'vue'
import store from '../store/index'
import { mapState } from "vuex";
import { EventCenterForMicroApp, unmountAllApps } from '@micro-zoe/micro-app'
import {mapState} from "vuex";
import {EventCenterForMicroApp, unmountAllApps} from '@micro-zoe/micro-app'
import DialogWrapper from '../pages/manage/components/DialogWrapper.vue'
import UserSelect from "./UserSelect.vue";
import { languageList, languageType } from "../language";
import { DatePicker } from 'view-design-hi';
import {languageList, languageName} from "../language";
import {DatePicker} from 'view-design-hi';
export default {
name: "MicroApps",
@ -47,9 +48,10 @@ export default {
type: String,
default: ""
},
datas:{
datas: {
type: Object,
default: () => {}
default: () => {
}
}
},
data() {
@ -64,13 +66,13 @@ export default {
this.appData = this.getAppData
},
watch: {
loading(val){
if(val){
loading(val) {
if (val) {
this.showSpin = true;
}
},
path(val) {
this.appData = { path: val }
this.appData = {path: val}
},
datas: {
handler(info) {
@ -80,7 +82,7 @@ export default {
},
'$route': {
handler(to) {
if(to.name == 'manage-apps' || to.name == 'single-apps'){
if (to.name == 'manage-apps' || to.name == 'single-apps') {
this.appData = {
path: to.hash || to.fullPath
}
@ -90,10 +92,10 @@ export default {
},
userToken(val) {
this.appData = this.getAppData;
if(!val){
unmountAllApps({ destroy: true })
if (!val) {
unmountAllApps({destroy: true})
this.loading = true;
}else{
} else {
this.loading = false;
}
},
@ -101,9 +103,9 @@ export default {
computed: {
...mapState([
'userInfo',
'themeMode',
'themeName',
]),
getAppData(){
getAppData() {
return {
type: 'init',
url: this.url,
@ -116,10 +118,11 @@ export default {
DatePicker
}
},
theme: this.themeMode,
theme: this.themeName,
languages: {
languageList,
languageType,
languageName,
languageType: languageName,
},
userInfo: this.userInfo,
path: this.path,
@ -132,17 +135,17 @@ export default {
// 创建前
window.eventCenterForAppNameVite = new EventCenterForMicroApp(e.detail.name)
this.appData = this.getAppData
this.showSpin = window["eventCenterForAppNameViteLoad-" + e.detail.name] ? false : true
this.showSpin = !window["eventCenterForAppNameViteLoad-" + e.detail.name]
},
handleBeforeMount(e) {
window["eventCenterForAppNameViteLoad-" + e.detail.name] = 1;
},
handleMount(e) {
// 加载完成
if(this.datas){
if (this.datas) {
this.appData = this.datas;
}
if(this.path){
if (this.path) {
this.appData.path = this.path
}
this.showSpin = false;

10
resources/assets/js/components/OnlyOffice.vue
View File

@ -64,7 +64,7 @@
import {mapState} from "vuex";
import IFrame from "../pages/manage/components/IFrame";
import {languageType} from "../language";
import {languageName} from "../language";
export default {
name: "OnlyOffice",
@ -114,7 +114,7 @@ export default {
},
computed: {
...mapState(['userInfo', 'themeIsDark']),
...mapState(['userInfo', 'themeName']),
fileType() {
return this.getType(this.value.type);
@ -211,8 +211,8 @@ export default {
this.docEditor = null;
}
//
let lang = languageType;
switch (languageType) {
let lang = languageName;
switch (languageName) {
case 'zh-CHT':
lang = "zh-TW";
break;
@ -239,7 +239,7 @@ export default {
"name": this.userInfo.nickname
},
"customization": {
"uiTheme": this.themeIsDark ? "theme-dark" : "theme-classic-light",
"uiTheme": this.themeName === 'dark' ? "theme-dark" : "theme-classic-light",
"forcesave": true,
"help": false,
},

9
resources/assets/js/components/RightBottom.vue
View File

@ -43,7 +43,6 @@
<script>
import MarkdownPreview from "./MDEditor/components/preview";
import axios from "axios";
import {mapState} from "vuex";
import {Store} from "le5le-store";
export default {
@ -99,12 +98,8 @@ export default {
},
computed: {
isSoftware() {
return this.$Electron || this.$isEEUiApp;
},
showSSO() {
return this.isSoftware && ['login'].includes(this.$route.name)
return this.$isSoftware && ['login'].includes(this.$route.name)
},
showDown() {
@ -119,7 +114,7 @@ export default {
methods: {
isNotServer() {
let apiHome = $A.getDomain(window.systemInfo.apiUrl)
return this.isSoftware && (apiHome == "" || apiHome == "public")
return this.$isSoftware && (apiHome == "" || apiHome == "public")
},
checkVersion() {

10
resources/assets/js/components/TEditor.vue
View File

@ -59,7 +59,7 @@
import tinymce from 'tinymce/tinymce';
import ImgUpload from "./ImgUpload";
import {mapState} from "vuex";
import {languageType} from "../language";
import {languageName} from "../language";
const windowTouch = "ontouchend" in document
@ -191,7 +191,7 @@
this.destroy();
},
computed: {
...mapState(['themeIsDark']),
...mapState(['themeName']),
headers() {
return {
@ -258,8 +258,8 @@
},
option(isFull) {
let lang = languageType;
switch (languageType) {
let lang = languageName;
switch (languageName) {
case 'zh':
lang = "zh_CN";
break;
@ -312,7 +312,7 @@
resize: !isFull,
convert_urls:false,
toolbar_mode: 'sliding',
content_css: this.themeIsDark ? 'dark' : 'default',
content_css: this.themeName === 'dark' ? 'dark' : 'default',
setup: (editor) => {
editor.ui.registry.addMenuButton('uploadImages', {
text: this.$L('图片'),

58
resources/assets/js/functions/common.js vendored
View File

@ -1055,6 +1055,64 @@ const localforage = require("localforage");
},
__loadCss: {},
/**
* 动态加载iframe
* @param url
* @param loadedRemove
* @returns {Promise<unknown>}
*/
loadIframe(url, loadedRemove = 0) {
return new Promise(async (resolve, reject) => {
url = $A.originUrl(url)
//
let i = 0
while (this.__loadIframe[url] === "loading") {
await new Promise(r => setTimeout(r, 1000))
i++
if (i > 30) {
return reject("加载超时")
}
}
if (this.__loadIframe[url] === "loaded") {
return resolve(false)
}
this.__loadIframe[url] = "loading"
//
const iframe = document.createElement("iframe")
iframe.style.display = 'none'
iframe.src = url
iframe.onload = () => {
this.__loadIframe[url] = "loaded"
resolve(true)
if (loadedRemove > 0) {
setTimeout(() => {
document.body.removeChild(iframe)
delete this.__loadIframe[url]
}, loadedRemove)
}
}
iframe.onerror = (e) => {
this.__loadIframe[url] = "error"
reject(e)
}
document.body.appendChild(iframe)
})
},
loadIframes(urls) {
return new Promise(resolve => {
let i = 0
const recursiveCallback = () => {
if (++i < urls.length) {
this.loadIframe(urls[i]).finally(recursiveCallback)
} else {
resolve()
}
}
this.loadIframe(urls[0]).finally(recursiveCallback)
})
},
__loadIframe: {},
/**
* 对象中有Date格式的转成指定格式
* @param params

12
resources/assets/js/functions/web.js vendored
View File

@ -914,6 +914,17 @@ import {MarkdownPreview} from "../store/markdown";
}
}
return false;
},
/**
* 通过Iframe存储数据
* @param json
*/
storageByIframe(json) {
if ($A.isSoftware) {
const value = encodeURIComponent(JSON.stringify(json));
$A.loadIframe($A.apiUrl(`../storage/synch?value=${value}`), 100).catch(_ => {})
}
}
});
@ -1320,7 +1331,6 @@ import {MarkdownPreview} from "../store/markdown";
html {
min-width: 100%;
min-height: 100%;
background: #000;
}
.child-view {
background-color: #fff;

30
resources/assets/js/language/index.js vendored
View File

@ -1,9 +1,13 @@
const utils = require('./utils')
const languageList = utils.languageTypes
const languageType = utils.getLanguage()
const languageList = utils.languageList
const languageName = utils.getLanguage()
const languageRege = {}
if (typeof window.LANGUAGE_DATA === "undefined") {
window.LANGUAGE_DATA = {}
}
/**
* 添加语言数据
* @param data
@ -36,18 +40,15 @@ function setLanguage(language, silence = false) {
if (language === undefined) {
return
}
if(silence){
window.localStorage.setItem("__language:type__", language)
if (silence) {
utils.saveLanguage(language)
$A.reloadUrl()
}else{
} else {
$A.modalConfirm({
content: '切换语言需要刷新后生效，是否确定刷新？',
cancelText: '取消',
okText: '确定',
onOk: () => {
window.localStorage.setItem("__language:type__", language)
$A.reloadUrl()
}
onOk: () => setLanguage(language, true)
})
}
}
@ -74,12 +75,12 @@ function switchLanguage(text) {
//
if (typeof window.LANGUAGE_DATA === "undefined"
|| typeof window.LANGUAGE_DATA["key"] === "undefined"
|| typeof window.LANGUAGE_DATA[languageType] === "undefined") {
|| typeof window.LANGUAGE_DATA[languageName] === "undefined") {
return text
}
const index = window.LANGUAGE_DATA["key"][text] || -1
if (index > -1) {
return window.LANGUAGE_DATA[languageType][index] || text
return window.LANGUAGE_DATA[languageName][index] || text
}
if (typeof languageRege[text] === "undefined") {
languageRege[text] = false
@ -89,7 +90,7 @@ function switchLanguage(text) {
if (rege.test(text)) {
let j = 0
const index = window.LANGUAGE_DATA["key"][key]
const value = (window.LANGUAGE_DATA[languageType][index] || key)?.replace(/\(\*\)/g, function () {
const value = (window.LANGUAGE_DATA[languageName][index] || key)?.replace(/\(\*\)/g, function () {
return "$" + (++j)
})
languageRege[text] = {rege, value}
@ -118,10 +119,11 @@ function switchLanguage(text) {
languageTmp.push(text)
window.localStorage.setItem(key, JSON.stringify(languageTmp))
}
} catch (e) { }
} catch (e) {
}
}, 10)
}
return text
}
export { languageType, languageList, addLanguage, setLanguage, getLanguage, switchLanguage }
export {languageName, languageList, addLanguage, setLanguage, getLanguage, switchLanguage}

20
resources/assets/js/language/utils.js vendored
View File

@ -2,7 +2,7 @@ export default {
/**
* 语言类型
*/
languageTypes: {
languageList: {
"zh": "简体中文",
"zh-CHT": "繁體中文",
"en": "English",
@ -49,8 +49,8 @@ export default {
* @returns {string}
*/
getLanguage() {
let lang = window.localStorage.getItem("__language:type__")
if (typeof lang === "string" && typeof this.languageTypes[lang] !== "undefined") {
let lang = window.localStorage.getItem("__system:languageName__")
if (typeof lang === "string" && typeof this.languageList[lang] !== "undefined") {
return lang;
}
lang = 'en';
@ -69,12 +69,20 @@ export default {
lang = 'zh-CHT'
break;
default:
if (typeof this.languageTypes[navLang] !== "undefined") {
if (typeof this.languageList[navLang] !== "undefined") {
lang = navLang
}
break;
}
window.localStorage.setItem("__language:type__", lang)
this.saveLanguage(lang)
return lang
}
},
/**
* 保存语言
* @param lang
*/
saveLanguage(lang) {
window.localStorage.setItem("__system:languageName__", lang)
},
}

12
resources/assets/js/pages/index.vue
View File

@ -3,19 +3,13 @@
</template>
<script>
import {languageType} from "../language";
import {languageName} from "../language";
export default {
data() {
return {}
},
computed: {
isSoftware() {
return this.$Electron || this.$isEEUiApp;
},
},
mounted() {
if (/^https*:/i.test(window.location.protocol)) {
if (this.$router.mode === "hash") {
@ -36,7 +30,7 @@ export default {
methods: {
start() {
if (this.isSoftware) {
if (this.$isSoftware) {
this.goNext()
return;
}
@ -52,7 +46,7 @@ export default {
},
goIndex() {
if (languageType === "zh" || languageType === "zh-CHT") {
if (languageName === "zh" || languageName === "zh-CHT") {
window.location.href = $A.apiUrl("../site/zh/index.html")
} else {
window.location.href = $A.apiUrl("../site/en/index.html")

22
resources/assets/js/pages/login.vue
View File

@ -27,7 +27,7 @@
<transition name="login-mode">
<div v-if="loginMode=='access'" class="login-access">
<Input
v-if="isSoftware && cacheServerUrl"
v-if="$isSoftware && cacheServerUrl"
:value="$A.getDomain(cacheServerUrl)"
prefix="ios-globe-outline"
size="large"
@ -121,7 +121,7 @@
v-for="(item, key) in themeList"
:key="key"
:name="item.value"
:selected="themeMode === item.value">{{$L(item.name)}}</DropdownItem>
:selected="themeConf === item.value">{{$L(item.name)}}</DropdownItem>
</DropdownMenu>
</Dropdown>
<Dropdown placement="right-start" transfer @on-click="onLanguage">
@ -136,7 +136,7 @@
v-for="(item, key) in languageList"
:key="key"
:name="key"
:selected="languageType === key">{{item}}</DropdownItem>
:selected="languageName === key">{{item}}</DropdownItem>
</DropdownMenu>
</Dropdown>
</DropdownMenu>
@ -165,7 +165,7 @@
<script>
import {mapState} from "vuex";
import {Store} from "le5le-store";
import {languageList, languageType, setLanguage} from "../language";
import {languageList, languageName, setLanguage} from "../language";
import VueQrcode from "@chenfengyuan/vue-qrcode";
export default {
@ -175,7 +175,7 @@ export default {
loadIng: 0,
languageList,
languageType,
languageName,
qrcodeVal: '',
qrcodeTimer: null,
@ -210,7 +210,7 @@ export default {
this.privacyShow = !!this.$isEEUiApp && (await $A.IDBString("cachePrivacyShow")) !== "no";
this.email = await $A.IDBString("cacheLoginEmail") || ''
//
if (this.isSoftware) {
if (this.$isSoftware) {
this.chackServerUrl().catch(_ => {});
} else {
this.setServerUrl('').catch(_ => {});
@ -254,16 +254,12 @@ export default {
...mapState([
'cacheServerUrl',
'themeMode',
'themeConf',
'themeList',
]),
isSoftware() {
return this.$Electron || this.$isEEUiApp;
},
currentLanguage() {
return languageList[languageType] || 'Language'
return languageList[languageName] || 'Language'
},
welcomeTitle() {
@ -493,7 +489,7 @@ export default {
isNotServer() {
let apiHome = $A.getDomain(window.systemInfo.apiUrl)
return this.isSoftware && (apiHome == "" || apiHome == "public")
return this.$isSoftware && (apiHome == "" || apiHome == "public")
},
onBlur() {

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

@ -205,7 +205,7 @@
</template>
<script>
import { mapState } from "vuex";
import {mapState} from "vuex";
import DrawerOverlay from "../../components/DrawerOverlay";
import UserSelect from "../../components/UserSelect";
import Report from "../manage/components/Report";

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

@ -31,7 +31,7 @@
<script>
import DrawerOverlay from "../../../components/DrawerOverlay";
import store from '../../../store/state'
import {languageType} from "../../../language";
import {languageName} from "../../../language";
export default {
name: "ApproveSetting",
components: {DrawerOverlay},
@ -48,7 +48,7 @@ export default {
watch: {
approvalSettingShow(val) {
if (val) {
this.iframeSrc = $A.apiUrl(`../approve/#/?name=${this.name}&token=${store.userToken}&lang=${languageType}`)
this.iframeSrc = $A.apiUrl(`../approve/#/?name=${this.name}&token=${store.userToken}&lang=${languageName}`)
}
}
},

4
resources/assets/js/pages/manage/calendar.vue
View File

@ -137,7 +137,7 @@ export default {
},
computed: {
...mapState(['cacheTasks', 'taskCompleteTemps', 'wsOpenNum', 'themeIsDark']),
...mapState(['cacheTasks', 'taskCompleteTemps', 'wsOpenNum', 'themeName']),
...mapGetters(['transforTasks']),
@ -189,7 +189,7 @@ export default {
};
if (data.p_name) {
let priorityStyle = `background-color:${data.p_color}`;
if (this.themeIsDark) {
if (this.themeName === 'dark') {
priorityStyle = `color:${data.p_color};border:1px solid ${data.p_color};padding:1px 3px;`;
}
task.priority = `<span class="priority" style="${priorityStyle}">${data.p_name}</span>`;

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

@ -55,8 +55,6 @@
</template>
<script>
import {mapState} from "vuex";
export default {
name: "ProjectArchived",
data() {

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

@ -79,8 +79,6 @@
</template>
<script>
import {mapState} from "vuex";
export default {
name: "ProjectManagement",
data() {

6
resources/assets/js/pages/manage/components/TaskPriority.vue
View File

@ -24,11 +24,11 @@ export default {
}
},
computed: {
...mapState(['themeIsDark']),
...mapState(['themeName']),
myStyle() {
const {color, background, backgroundColor, themeIsDark} = this;
if (themeIsDark) {
const {color, background, backgroundColor, themeName} = this;
if (themeName === 'dark') {
return {
color: backgroundColor || background,
borderColor: backgroundColor || background,

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

@ -432,7 +432,6 @@
</template>
<script>
import axios from "axios";
import {mapState} from "vuex";
import {sortBy} from "lodash";
import DrawerOverlay from "../../components/DrawerOverlay";

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

@ -15,7 +15,7 @@
</template>
<script>
import {languageList, languageType, setLanguage} from "../../../language";
import {languageList, languageName, setLanguage} from "../../../language";
import {mapState} from "vuex";
export default {
@ -43,7 +43,7 @@ export default {
methods: {
initData() {
this.$set(this.formData, 'language', languageType);
this.$set(this.formData, 'language', languageName);
this.formData_bak = $A.cloneJSON(this.formData);
},

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

@ -36,7 +36,7 @@ export default {
computed: {
...mapState([
'themeMode',
'themeConf',
'themeList',
'formLabelPosition',
'formLabelWidth'
@ -45,7 +45,7 @@ export default {
methods: {
initData() {
this.$set(this.formData, 'theme', this.themeMode);
this.$set(this.formData, 'theme', this.themeConf);
this.formData_bak = $A.cloneJSON(this.formData);
},

4
resources/assets/js/pages/pro.vue
View File

@ -2,11 +2,11 @@
</template>
<script>
import {languageType} from "../language";
import {languageName} from "../language";
export default {
mounted() {
if (languageType === "zh" || languageType === "zh-CHT") {
if (languageName === "zh" || languageName === "zh-CHT") {
window.location.href = $A.apiUrl("../site/zh/price.html")
} else {
window.location.href = $A.apiUrl("../site/en/price.html")

69
resources/assets/js/store/actions.js vendored
View File

@ -1,6 +1,6 @@
import {Store} from 'le5le-store';
import * as openpgp from 'openpgp_hi/lightweight';
import {languageType} from "../language";
import {languageName} from "../language";
import {$callData, $urlSafe, SSEClient} from './utils'
export default {
@ -83,8 +83,9 @@ export default {
// 加载语言包
await $A.loadScriptS([
`language/web/key.js`,
`language/web/${languageType}.js`,
`language/web/${languageName}.js`,
])
$A.storageByIframe({languageName})
resolve(action)
})
@ -101,7 +102,7 @@ export default {
if (!$A.isJson(params)) params = {url: params}
const header = {
'Content-Type': 'application/json',
'language': languageType,
'language': languageName,
'token': state.userToken,
'fd': $A.getSessionStorageString("userWsFd"),
'version': window.systemInfo.version || "0.0.1",
@ -464,10 +465,11 @@ export default {
/**
* 设置主题
* @param state
* @param dispatch
* @param mode
* @returns {Promise<unknown>}
*/
setTheme({state}, mode) {
setTheme({state, dispatch}, mode) {
return new Promise(function (resolve) {
if (mode === undefined) {
resolve(false)
@ -482,20 +484,7 @@ export default {
resolve(false)
return;
}
switch (mode) {
case 'dark':
$A.dark.enableDarkMode()
break;
case 'light':
$A.dark.disableDarkMode()
break;
default:
$A.dark.autoDarkMode()
break;
}
state.themeMode = mode;
state.themeIsDark = $A.dark.isDarkEnabled();
window.localStorage.setItem("__theme:mode__", mode);
dispatch("synchTheme", mode)
resolve(true)
});
},
@ -503,9 +492,14 @@ export default {
/**
* 同步主题
* @param state
* @param dispatch
* @param mode
*/
synchTheme({state}) {
switch (state.themeMode) {
synchTheme({state, dispatch}, mode = undefined) {
if (typeof mode === "undefined") {
mode = state.themeConf
}
switch (mode) {
case 'dark':
$A.dark.enableDarkMode()
break;
@ -513,11 +507,20 @@ export default {
$A.dark.disableDarkMode()
break;
default:
state.themeMode = "auto"
state.themeConf = "auto"
$A.dark.autoDarkMode()
break;
}
state.themeIsDark = $A.dark.isDarkEnabled()
state.themeName = $A.dark.isDarkEnabled() ? 'dark' : 'light'
window.localStorage.setItem("__system:themeConf__", state.themeConf)
//
if ($A.isEEUiApp) {
$A.eeuiAppSendMessage({
action: 'updateTheme',
themeName: state.themeName,
});
}
$A.storageByIframe({themeConf: state.themeConf})
},
/**
@ -833,11 +836,15 @@ export default {
*/
handleKeyboard({state}, newData) {
return new Promise(resolve => {
const data = $A.isJson(newData) ? newData : ($A.jsonParse(window.localStorage.getItem("__keyboard:data__")) || {})
if (!window.localStorage.getItem("__system:keyboardConf__")) {
window.localStorage.setItem("__system:keyboardConf__", window.localStorage.getItem("__keyboard:data__"))
window.localStorage.removeItem("__keyboard:data__")
}
const data = $A.isJson(newData) ? newData : ($A.jsonParse(window.localStorage.getItem("__system:keyboardConf__")) || {})
data.screenshot_key = (data.screenshot_key || "").trim().toLowerCase()
data.send_button_app = data.send_button_app || 'button' // button, enter 移动端发送按钮，默认 button （页面按钮发送）
data.send_button_desktop = data.send_button_desktop || 'enter' // button, enter 桌面端发送按钮，默认 enter （键盘回车发送）
window.localStorage.setItem("__keyboard:data__", $A.jsonStringify(data))
window.localStorage.setItem("__system:keyboardConf__", $A.jsonStringify(data))
state.cacheKeyboard = data
resolve(data)
})
@ -854,13 +861,13 @@ export default {
return new Promise(async resolve => {
try {
// localStorage
const languageType = window.localStorage.getItem("__language:type__");
const keyboardData = window.localStorage.getItem("__keyboard:data__");
const themeMode = window.localStorage.getItem("__theme:mode__");
const themeConf = window.localStorage.getItem("__system:themeConf__");
const languageName = window.localStorage.getItem("__system:languageName__");
const keyboardConf = window.localStorage.getItem("__system:keyboardConf__");
window.localStorage.clear();
window.localStorage.setItem("__language:type__", languageType)
window.localStorage.setItem("__keyboard:data__", keyboardData)
window.localStorage.setItem("__theme:mode__", themeMode)
window.localStorage.setItem("__system:themeConf__", themeConf)
window.localStorage.setItem("__system:languageName__", languageName)
window.localStorage.setItem("__system:keyboardConf__", keyboardConf)
// localForage
const clientId = await $A.IDBString("clientId")
@ -3372,7 +3379,7 @@ export default {
let url = $A.apiUrl('../ws');
url = url.replace("https://", "wss://");
url = url.replace("http://", "ws://");
url += `?action=web&token=${state.userToken}&language=${languageType}`;
url += `?action=web&token=${state.userToken}&language=${languageName}`;
//
const wgLog = $A.openLog;
const wsRandom = $A.randomString(16);

4
resources/assets/js/store/state.js vendored
View File

@ -188,13 +188,13 @@ export default {
],
// 主题皮肤
themeMode: window.localStorage.getItem("__theme:mode__"),
themeConf: window.localStorage.getItem("__system:themeConf__"), // auto|light|dark
themeName: null, // 自动生成
themeList: [
{name: '跟随系统', value: 'auto'},
{name: '明亮', value: 'light'},
{name: '暗黑', value: 'dark'},
],
themeIsDark: false,
// 客户端新版本号
clientNewVersion: null,

14
resources/assets/statics/public/js/loading-theme.js vendored Normal file
View File

@ -0,0 +1,14 @@
let themeName = window.localStorage.getItem('__system:themeConf__')
if (!['dark', 'light'].includes(themeName)) {
let isDark = window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches
if (/eeui/i.test(window.navigator.userAgent)) {
isDark = requireModuleJs("eeui").getThemeName() === "dark"
}
themeName = isDark ? 'dark' : 'light'
}
if (themeName === 'dark') {
let style = document.createElement('style');
style.rel = 'stylesheet';
style.innerHTML = '.app-view-loading{background-color:#0D0D0D}'
document.head.appendChild(style);
}

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

@ -16,6 +16,7 @@
@endif
<link rel="stylesheet" type="text/css" href="{{ asset_main('css/iview.css') }}?v={{ $version }}">
<link rel="stylesheet" type="text/css" href="{{ asset_main('css/loading.css') }}?v={{ $version }}">
<script src="{{ asset_main('js/loading-theme.js') }}?v={{ $version }}"></script>
<script src="{{ asset_main('js/jsencrypt.min.js') }}?v={{ $version }}"></script>
<script src="{{ asset_main('js/scroll-into-view.min.js') }}?v={{ $version }}"></script>
<script>
@ -36,7 +37,7 @@
@extends('ie')
<div id="app">
<div class="app-view-loading">
<div class="app-view-loading no-dark-mode">
<div>
<div>PAGE LOADING</div>
<span></span>

14
resources/views/setting.blade.php
View File

@ -1,14 +0,0 @@
<script>
@if ($theme)
window.localStorage.setItem("__theme:mode__", "{{ $theme }}");
@endif
@if ($language)
window.localStorage.setItem("__language:type__", "{{ $language }}");
@endif
@if ($userid)
window.localStorage.setItem("__user:userid__", "{{ $userid }}");
@endif
@if ($token)
window.localStorage.setItem("__user:token__", "{{ $token }}");
@endif
</script>

21
resources/views/storage.blade.php Executable file
View File

@ -0,0 +1,21 @@
<script>
function isArray(obj) {
return typeof (obj) == "object" && Object.prototype.toString.call(obj).toLowerCase() == '[object array]' && typeof obj.length == "number";
}
function isJson(obj) {
return typeof (obj) == "object" && Object.prototype.toString.call(obj).toLowerCase() == "[object object]" && typeof obj.length == "undefined";
}
let storages = {!! $value !!};
if (isArray(storages)) {
storages.forEach(storage => {
window.localStorage.setItem(`__system:${storage.key}__`, storage.value);
})
} else if (isJson(storages)) {
for (let key in storages) {
let value = storages[key];
window.localStorage.setItem(`__system:${key}__`, value);
}
}
</script>