12-12

electron-builder.yml

@@ -8,7 +8,6 @@ files:
   - 'package.json'
   - 'resources/**/*'
   - '!resources/java/app/license/*'
-  - '!resources/java/app/lib/*'
   - '!resources/java/app/logs/*'
   - '!resources/java/app/poi/*'
   - '!resources/java/app/upload/*'

installer.nsh

@@ -1,9 +1,40 @@
+Var D_DRIVE_EXISTS
+Var defaultInstallDir
 !macro preInit
+
+    StrCpy $D_DRIVE_EXISTS 0
+    StrCpy $defaultInstallDir "$PROGRAMFILES\${APP_ID}"
+
+    FindFirst $R0 $R1 "D:\*.*"
+    ${If} $R0 != ""
+        StrCpy $D_DRIVE_EXISTS 1
+        StrCpy $defaultInstallDir "D:\ProgramFiles\${APP_ID}"
+        FindClose $R0
+    ${EndIf}
+
+    ${If} $D_DRIVE_EXISTS == 0
+    ${EndIf}
+
+
     SetRegView 64
-    WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "D:\ProgramFiles\dzsp_shijingjun_offline_Y_save"
+    WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "$defaultInstallDir"
-    WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "D:\ProgramFiles\dzsp_shijingjun_offline_Y_save"
+    WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "$defaultInstallDir"
     #writeUninstaller $INSTDIR\uninstaller.exe
     SetRegView 32
-    WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "D:\ProgramFiles\dzsp_shijingjun_offline_Y_save"
+    WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "$defaultInstallDir"
-    WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "D:\ProgramFiles\dzsp_shijingjun_offline_Y_save"
+    WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "$defaultInstallDir"
+!macroend
+
+!macro customUnInstall
+    SetRegView 64
+    DeleteRegKey HKLM "${INSTALL_REGISTRY_KEY}"
+    DeleteRegKey HKCU "${INSTALL_REGISTRY_KEY}"
+    SetRegView 32
+    DeleteRegKey HKLM "${INSTALL_REGISTRY_KEY}"
+    DeleteRegKey HKCU "${INSTALL_REGISTRY_KEY}"
+
+    Delete "$APPDATA\${APP_ID}\*.*"
+    RMDir /r "$APPDATA\${APP_ID}"
+    Delete "$LOCALAPPDATA\${APP_ID}\*.*"
+    RMDir /r "$LOCALAPPDATA\${APP_ID}"
 !macroend

resources/java/app/application.yml

@@ -1,7 +1,7 @@
 server:
   host: 127.0.0.1
   port: 8849
-  path: C:\Users\Administrator\AppData\Roaming\dzsp_shijingjun_offline_Y_save
+  path: C:\Users\MSI\AppData\Roaming\dzsp_shijingjun_offline_Y_save
 poi:
   global:
     enabled: false

src/main/index.ts

@@ -581,40 +581,22 @@ function windowAllClosed() {
 
   console.log('所有窗口已关闭，执行清理脚本...');
   getServer().close(() => {
-
+    // 执行批处理文件
-
+    const cleanupProcess = spawn('cmd.exe', ['/c', stopBatPath.substring(1, 200)], {
-    const vbsScript = `
-Set WshShell = CreateObject("WScript.Shell")
-WshShell.Run "${stopBatPath.substring(1, 200)}", 0, False
-Set WshShell = Nothing
-`;
-    const vbsPath = path.join(os.tmpdir(), 'run_bat_hidden.vbs');
-    require('fs').writeFileSync(vbsPath, vbsScript, 'utf8');
-
-    // 2. 执行 VBS 脚本（零窗口）
-    const batProcess = spawn('wscript.exe', [vbsPath], {
-      detached: true,
       stdio: 'ignore',
       windowsHide: true,
     });
+    cleanupProcess.on('exit', (code) => {
+      if (code === 0) {
+        console.log(code)
+      } else {
+        console.log(`脚本执行失败，退出码：${code}`);
+      }
+    });
 
-    batProcess.unref();
+    cleanupProcess.on('error', (error) => {
-
+      console.log('error', error)
-
+    });
-
-
-
-
-
-
-
-
-
-
-
-
-
-    // // 执行批处理文件
     // const cleanupProcess = exec(stopBatPath.substring(1, 200), (error, stdout, stderr) => {
     //   if (error) {
     //     console.error(`清理脚本执行失败: ${error.message}`);
@@ -630,12 +612,11 @@ Set WshShell = Nothing
     //   }
     // });
 
-    // // 监听子进程退出事件（确保即使脚本出错也能退出）
+    cleanupProcess.unref();
-    // cleanupProcess.on('exit', (code) => {
-    //   console.log(`清理脚本退出，代码: ${code}`);
-    // });
 
-    forceQuit();
+    setTimeout(() => {
+      forceQuit();
+    }, 500);
   })
 }
 

src/renderer/src/main.ts

@@ -102,6 +102,7 @@ setupStore(setApp)
 setupSvgIcon(setApp)
 setApp.use(EventBusPlugin)
 setApp.use(router)
+// @ts-ignore
 setApp.use(elTableInfiniteScroll)
 setApp.use(ElementPlus, {
   locale: zhCn

src/renderer/src/views/TS/edit/polygonObjectTs.vue

@@ -310,7 +310,7 @@ const closeCallback = () => {
   entityOptions.value.originalOptions = structuredClone(originalOptions)
   that.positionEditing = false
   entityOptions.value.closeNodeEdit()
-  entityOptions.value.reset()
+  that.reset()
   eventBus.emit("destroyComponent")
 }
 

src/renderer/src/views/TS/edit/polylineObjectTs.vue

@@ -472,7 +472,7 @@ const closeCallback = () => {
   entityOptions.value.originalOptions = structuredClone(originalOptions)
   that.positionEditing = false
   entityOptions.value.closeNodeEdit()
-  entityOptions.value.reset()
+  that.reset()
   eventBus.emit('destroyComponent')
 }
 const confirm = () => {

src/renderer/src/views/components/headers/components/setPup/components/setting.vue

@@ -654,10 +654,10 @@ const toggleGroup = (type: string) => {
 
 var backButShow: any = ref(false)
 //根据角色权限控制后台管理按钮显隐
-let option = JSON.parse(localStorage.getItem('frontFunctionArr'))
+let option = JSON.parse(localStorage.getItem('frontFunctionArr') || '{}')
 option = Object.keys(option)
 //数据权限
-let data = JSON.parse(localStorage.getItem('frontDataArr'))
+let data = JSON.parse(localStorage.getItem('frontDataArr') || '[]')
 if (option.length == 0 && data.length == 0) {
   //管理员
   backButShow.value = true

src/renderer/src/views/components/propertyBox/CircleObject.vue

@@ -311,7 +311,7 @@ const closeCallback = () => {
   entityOptions.value.originalOptions = structuredClone(originalOptions)
   that.positionEditing = false
   entityOptions.value.closeNodeEdit()
-  entityOptions.value.reset()
+  that.reset()
   eventBus.emit("destroyComponent")
 }
 

src/renderer/src/views/components/propertyBox/attackArrow.vue

@@ -327,7 +327,7 @@ const closeCallback = () => {
   entityOptions.value.originalOptions = structuredClone(originalOptions)
   that.positionEditing = false
   entityOptions.value.closeNodeEdit()
-  entityOptions.value.reset()
+  that.reset()
   eventBus.emit("destroyComponent")
 }
 

src/renderer/src/views/components/propertyBox/curvelineObject.vue

@@ -461,7 +461,7 @@ const closeCallback = () => {
   entityOptions.value.originalOptions = structuredClone(originalOptions)
   that.positionEditing = false
   entityOptions.value.closeNodeEdit()
-  entityOptions.value.reset()
+  that.reset()
   eventBus.emit('destroyComponent')
 }
 const confirm = () => {

src/renderer/src/views/components/propertyBox/explosion.vue

@@ -81,7 +81,7 @@ let that: any
 const closeCallback = () => {
   entityOptions.value.originalOptions = structuredClone(originalOptions)
   that.positionEditing = false
-  entityOptions.value.reset()
+  that.reset()
   eventBus.emit("destroyComponent")
 }
 const open = async (id: any) => {

src/renderer/src/views/components/propertyBox/flyLine.vue

@@ -102,7 +102,7 @@ let that: any
 const closeCallback = () => {
   entityOptions.value.originalOptions = structuredClone(originalOptions)
   that.positionEditing = false
-  entityOptions.value.reset()
+  that.reset()
   eventBus.emit("destroyComponent")
 }
 const open = async (id: any) => {

src/renderer/src/views/components/propertyBox/graphObject.vue

@@ -345,7 +345,7 @@ const closeCallback = () => {
   entityOptions.value.originalOptions = structuredClone(originalOptions)
   that.positionEditing = false
   // entityOptions.value.closeNodeEdit()
-  entityOptions.value.reset()
+  that.reset()
   eventBus.emit('destroyComponent')
 }
 

src/renderer/src/views/components/propertyBox/modelObject.vue

@@ -722,7 +722,7 @@ const closeCallback = () => {
   entityOptions.value.originalOptions = structuredClone(originalOptions)
   that.positionEditing = false
   // entityOptions.value.closeNodeEdit()
-  entityOptions.value.reset()
+  that.reset()
   eventBus.emit('destroyComponent')
 }
 

src/renderer/src/views/components/propertyBox/polygonObject.vue

@@ -308,7 +308,7 @@ const closeCallback = () => {
   entityOptions.value.originalOptions = structuredClone(originalOptions)
   that.positionEditing = false
   entityOptions.value.closeNodeEdit()
-  entityOptions.value.reset()
+  that.reset()
   eventBus.emit("destroyComponent")
 }
 

src/renderer/src/views/components/propertyBox/polyhedronObject.vue

@@ -160,7 +160,7 @@ const closeCallback = () => {
   entityOptions.value.originalOptions = structuredClone(originalOptions)
   that.positionEditing = false
   entityOptions.value.closeNodeEdit()
-  entityOptions.value.reset()
+  that.reset()
   eventBus.emit("destroyComponent")
 }
 

src/renderer/src/views/components/propertyBox/polylineObject.vue

@@ -469,7 +469,7 @@ const closeCallback = () => {
   entityOptions.value.originalOptions = structuredClone(originalOptions)
   that.positionEditing = false
   entityOptions.value.closeNodeEdit()
-  entityOptions.value.reset()
+  that.reset()
   eventBus.emit('destroyComponent')
 }
 const confirm = () => {

src/renderer/src/views/components/propertyBox/tileset.vue

@@ -78,7 +78,7 @@ let that: any
 const closeCallback = () => {
   entityOptions.value.oldData = structuredClone(originalOptions)
   that.positionEditing = false
-  entityOptions.value.reset()
+  that.reset()
   eventBus.emit("destroyComponent")
 }
 const open = async (id: any) => {

src/renderer/src/views/components/propertyBox/trajectoryMotion.vue

@@ -266,7 +266,7 @@ let that: any
 const closeCallback = () => {
   entityOptions.value.originalOptions = structuredClone(originalOptions)
   that.positionEditing = false
-  entityOptions.value.reset()
+  that.reset()
   eventBus.emit("destroyComponent")
 }
 const open = async (id: any) => {

src/renderer/src/views/login/index.vue

@@ -818,8 +818,13 @@ const validatePortRange = (rule, value, callback) => {
     .settings:hover svg g {
       filter: url(#filter_2442_1327);
     }
-    .exit:hover svg g {
+    .exit:hover svg {
-      filter: url(#filter_2442_480);
+      g {
+        filter: url(#filter_2442_480);
+        path {
+          fill: rgba(241, 108, 85, 1) !important;
+        }
+      }
     }
 
     .el-button {

src/renderer/src/views/login/useLogin.ts

@@ -81,7 +81,7 @@ export const useLogin = () => {
       })
       localStorage.setItem('frontFunctionArr', JSON.stringify(obj))
       //数据权限
-      let dataArr = []
+      let dataArr:any = []
       res.data.roleOperates.forEach(item => {
         dataArr.push(item.operate)
       })