diff --git a/resources/startUp/startUp.html b/resources/startUp/startUp.html index 98e6e60..147e72a 100644 --- a/resources/startUp/startUp.html +++ b/resources/startUp/startUp.html @@ -256,7 +256,7 @@ clearInterval(interval); } updateProgress(progress); - }, 100); // 保持100毫秒的间隔 + }, 125); // 保持100毫秒的间隔 }, 100); // 初始延迟500毫秒 diff --git a/src/main/index.ts b/src/main/index.ts index e6ce29d..6e8aeeb 100644 --- a/src/main/index.ts +++ b/src/main/index.ts @@ -277,6 +277,9 @@ function createWindow(): void { mainWindow.webContents.send('fullscreen-status-changed', false) }); mainWindow.on("close", (e) => { + if (isRestart) { + return + } e.preventDefault(); dialog .showMessageBox(mainWindow, { @@ -539,6 +542,10 @@ function closeAllWindows() { }); } +function getmainWindow() { + return mainWindow; +} + const gotTheLock = app.requestSingleInstanceLock(); if (!gotTheLock) { @@ -604,5 +611,7 @@ if (!gotTheLock) { }; } +export { getmainWindow }; + // In this file you can include the rest of your app's specific main process // code. You can also put them in separate files and require them here. diff --git a/src/renderer/public/startUp/startUp.html b/src/renderer/public/startUp/startUp.html index fa24297..d0f08ce 100644 --- a/src/renderer/public/startUp/startUp.html +++ b/src/renderer/public/startUp/startUp.html @@ -255,7 +255,7 @@ clearInterval(interval); } updateProgress(progress); - }, 100); // 保持100毫秒的间隔 + }, 150); // 保持100毫秒的间隔 }, 100); // 初始延迟500毫秒 diff --git a/src/renderer/public/tree/jquery.ztree.excheck.js b/src/renderer/public/tree/jquery.ztree.excheck.js index 44b5336..7fda95e 100644 --- a/src/renderer/public/tree/jquery.ztree.excheck.js +++ b/src/renderer/public/tree/jquery.ztree.excheck.js @@ -101,7 +101,7 @@ nodeEventType = "mouseoutCheck"; } } else if (tools.eqs(e.type, "click")) { - if (setting.check.enable && tools.eqs(target.tagName, "span") && target.getAttribute("treeNode" + consts.id.CHECK) !== null) { + if (setting.check.enable && (tools.eqs(target.tagName, "span") || tools.eqs(target.tagName, "svg")) && target.getAttribute("treeNode" + consts.id.CHECK) !== null) { tId = tools.getNodeMainDom(target).id; nodeEventType = "checkNode"; } @@ -156,12 +156,18 @@ _beforeA = function (setting, node, html) { if (setting.check.enable) { data.makeChkFlag(setting, node); - html.push(""); + if(node.check_Child_State>0 || node.isShow) { + html.push("`); + } + else { + html.push("`); + } } }, //update zTreeObj, add method of check _zTreeTools = function (setting, zTreeTools) { zTreeTools.checkNode = function (node, checked, checkTypeFlag, callbackFlag) { + var nodeChecked = data.nodeChecked(setting, node); if (node.chkDisabled === true) return; if (checked !== true && checked !== false) { @@ -512,6 +518,12 @@ obj.show(); } obj.attr('class', view.makeChkClass(setting, node)); + if(node.check_Child_State>0 || node.isShow) { + obj.html(``) + } + else { + obj.html(``) + } }, setParentNodeCheckBox: function (setting, node, value, srcNode) { var checkObj = $$(node, consts.id.CHECK, setting); diff --git a/src/renderer/src/assets/images/tree/roots-close.png b/src/renderer/src/assets/images/tree/roots-close.png new file mode 100644 index 0000000..3879bd4 Binary files /dev/null and b/src/renderer/src/assets/images/tree/roots-close.png differ diff --git a/src/renderer/src/assets/images/tree/roots-open.png b/src/renderer/src/assets/images/tree/roots-open.png new file mode 100644 index 0000000..c9d6a99 Binary files /dev/null and b/src/renderer/src/assets/images/tree/roots-open.png differ diff --git a/src/renderer/src/assets/styles/global.css b/src/renderer/src/assets/styles/global.css index 4d28040..3eea871 100644 --- a/src/renderer/src/assets/styles/global.css +++ b/src/renderer/src/assets/styles/global.css @@ -364,6 +364,7 @@ img { .login-select-popper { border: 1px solid var(--el-border-color-light) !important; box-shadow: var(--el-box-shadow-light) !important; + z-index: 9999 !important; .el-select-dropdown { background: #fff !important; @@ -384,25 +385,47 @@ img { background: url(../images/tree/folder-empty.png) 0 0 no-repeat; background-size: 100% 100% !important; background-position: center !important; + margin: 0 6px 0 4px !important; } .ztree li span.button.ico_close { background: url(../images/tree/folder-close.png) 0 0 no-repeat; background-size: 100% 100% !important; background-position: center !important; + margin: 0 6px 0 4px !important; } .ztree li span.button.ico_open { background: url(../images/tree/folder-open.png) 0 0 no-repeat; background-size: 100% 100% !important; background-position: center !important; + margin: 0 6px 0 4px !important; } .ztree li span.button.ico_docu:not([style=""]) { background-size: 90% 90% !important; background-position: center !important; + margin: 0 6px 0 4px !important; /* margin-top: 1px; */ } +.ztree li ul.line { + background: none !important; +} +.ztree li span.button.switch, +.ztree li span.button.chk { + background: none; +} +.ztree li span.button.roots_open, .ztree li span.button.bottom_open { + background: url(../images/tree/roots-open.png) 0 0 no-repeat; + background-position: center !important; +} +.ztree li span.button.roots_close, .ztree li span.button.bottom_close { + background: url(../images/tree/roots-close.png) 0 0 no-repeat; + background-position: center !important; +} +.ztree li span.button.switch { + margin-right: 5px; +} #app { .ztree * { diff --git a/src/renderer/src/router/index.ts b/src/renderer/src/router/index.ts index 1882f34..c76de79 100644 --- a/src/renderer/src/router/index.ts +++ b/src/renderer/src/router/index.ts @@ -2,21 +2,21 @@ import { createRouter, createWebHashHistory } from 'vue-router' import homeIndex from '@/views/home/index.vue' const routes = [ - // { - // path: '/', - // component: () => import('@/views/login/index.vue'), - // hidden: true - // }, { path: '/', - component: () => import('@/views/author/index.vue'), - hidden: true - }, - { - path: '/login', component: () => import('@/views/login/index.vue'), hidden: true }, + // { + // path: '/', + // component: () => import('@/views/author/index.vue'), + // hidden: true + // }, + // { + // path: '/login', + // component: () => import('@/views/login/index.vue'), + // hidden: true + // }, { path: '/ts', component: () => import('@/views/TS/list.vue'), hidden: true }, { path: '/tsEdit', name: 'tsEdit', component: () => import('@/views/TS/edit.vue'), hidden: true }, { path: '/404', component: () => import('@/views/404.vue'), hidden: true }, @@ -37,7 +37,7 @@ const router = createRouter({ }) router.beforeEach((to, from, next) => { // 去登录，放行 - if (to.path === '/') { + if (to.path === '/' || to.path === '/login') { next() } else { if (localStorage.getItem('Authorization')) { diff --git a/src/renderer/src/views/TS/components/eventParams.vue b/src/renderer/src/views/TS/components/eventParams.vue index bcb7090..d8e9635 100644 --- a/src/renderer/src/views/TS/components/eventParams.vue +++ b/src/renderer/src/views/TS/components/eventParams.vue @@ -39,7 +39,7 @@ import {TsApi} from "../../../api/ts"; const times = ref(0) const numbers = ref(0) -const detail = ref({}) +const detail:any = ref({}) const eventBus: any = inject('bus') let eventObj: any = ref(null) diff --git a/src/renderer/src/views/author/index.vue b/src/renderer/src/views/author/index.vue index dc39d63..ff369f0 100644 --- a/src/renderer/src/views/author/index.vue +++ b/src/renderer/src/views/author/index.vue @@ -1,12 +1,9 @@ +