@ganwei-web/ganwei-pc-cli 6.3.1 → 6.3.2

package/ganwei-iotcenter-index-6.2.3/configuration/moduleConfiguration.json

@@ -1,6 +1,6 @@
 {
     "addressMapping": {
-        "ganwei-iotcenter-equip-lists": "http://127.0.0.1:8400",
+        "ganwei-iotcenter-equip-lists": "http://127.0.0.1:8440",
         "ganwei-iotcenter-event-querys": "http://127.0.0.1:8380",
         "ganwei-iotcenter-index": "http://127.0.0.1:8160",
         "ganwei-iotcenter-login": "http://127.0.0.1:8180",

package/ganwei-iotcenter-index-6.2.3/packages/ganwei-iotcenter-index/public/static/js/getLanguage.js

@@ -46,7 +46,6 @@ window.getElementLanguages = async () => {
         //① 是否需要请求 element.el
         const needElementRequest = !elementPkg || isEmptyObject(elementPkg['el']) || isEmptyObject(elementPkg['ele']);
 
-      
         //② 是否需要请求 publics（login.publics）
         const needPublicsRequest = !loginPkg || isEmptyObject(loginPkg['publics']);
 
@@ -72,8 +71,8 @@ window.haveExistLanguage = (pluginName, menuName) => {
         const key = pluginName + '__' + menuName;
         const pkg = JSON.parse(sessionStorage.languagePackage || '{}');
         return pkg[langType] &&
-               pkg[langType][key] &&
-               Object.keys(pkg[langType][key]).length > 0;
+            pkg[langType][key] &&
+            Object.keys(pkg[langType][key]).length > 0;
     } catch {
         return false;
     }
@@ -98,12 +97,12 @@ window.requestLanguage = async (pluginName, menuName, packageId, vm) => {
     }).catch(() => ({}));
 }
 
-window.updateLanguage = (pluginName, menuName,vm, i18n) => {
+window.updateLanguage = (pluginName, menuName, vm, i18n) => {
     if (!(vm && vm.i18nInstance) && !(i18n && i18n._vm)) {
         console.log(pluginName + '__' + menuName + ' 更新语言失败，没有找到 i18n 实例');
         return;
     }
-    
+
     const langType = localStorage.languageType || 'zh-CN';
     let languagePackage = {};
     try {
@@ -159,8 +158,8 @@ window.haveExistLanguage = (pluginName, menuName) => {
         const key = pluginName + '__' + menuName;
         const pkg = JSON.parse(sessionStorage.languagePackage || '{}');
         return pkg[langType] &&
-               pkg[langType][key] &&
-               Object.keys(pkg[langType][key]).length > 0;
+            pkg[langType][key] &&
+            Object.keys(pkg[langType][key]).length > 0;
     } catch {
         return false;
     }
@@ -186,9 +185,9 @@ window.saveToSession = (pluginName, menuName, language) => {
             languagePackage[langType]['publics'] = language['publics'] || {};
         }
         else if (key === 'ganwei-iotcenter-login__element') {
-                languagePackage[langType]['element'] = language || {};
-                languagePackage[langType]['el'] = language['el'] || {};
-                languagePackage[langType]['ele'] = language || {};
+            languagePackage[langType]['element'] = language || {};
+            languagePackage[langType]['el'] = language['el'] || {};
+            languagePackage[langType]['ele'] = language || {};
         }
         sessionStorage.setItem('languagePackage', JSON.stringify(languagePackage));
     } catch (e) {

package/ganwei-iotcenter-index-6.2.3/packages/ganwei-iotcenter-index/src/App.vue

@@ -1,23 +1,23 @@
 <template>
     <div class="app">
-        <!-- 验证通过后显示页面 -->
-        <el-config-provider>
-            <router-view v-cloak v-if="isShow" />
+        <!-- 验证通过且语言包加载完成后显示页面 -->
+        <el-config-provider v-if="isShow">
+            <router-view v-cloak />
         </el-config-provider>
     </div>
 </template>
 <script>
 import muduleObserve from '@ganwei-web/gw-base-utils-plus/moduleObserve/dist/index.es.js'
 
-import judgePermission from './mixins/judgePermission'
 import { setTheme } from './utils/storage.ts'
 
 export default {
-    mixins: [judgePermission, muduleObserve],
+    mixins: [muduleObserve],
     name: 'App',
     data() {
         return {
-            isNoRequestObserveGetPublic: true
+            isNoRequestObserveGetPublic: true,
+            isLoading: true
         }
     },
     mounted() {
@@ -31,35 +31,6 @@ export default {
 </script>
 
 <style>
-/* 登录验证加载状态 */
-.auth-loading {
-    position: fixed;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background: var(--frame-main-background, #121622);
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    z-index: 9999;
-}
-
-.loading-spinner {
-    width: 40px;
-    height: 40px;
-    border: 3px solid var(--frame-main-border, #2a3441);
-    border-top-color: var(--gw-color-primary, #3875ff);
-    border-radius: 50%;
-    animation: spin 0.8s linear infinite;
-}
-
-@keyframes spin {
-    to {
-        transform: rotate(360deg);
-    }
-}
-
 html {
     height: 100%;
     --left: calc(var(--maxActiveWidth) + 10);
@@ -115,4 +86,8 @@ html body div {
 iframe {
     border: none;
 }
+
+.el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell {
+    background-color: var(--table-body-background__hover) !important;
+}
 </style>

package/ganwei-iotcenter-index-6.2.3/packages/ganwei-iotcenter-index/src/components/indexRightContent/headerRight/expirationReminder/index.vue

@@ -1,6 +1,6 @@
 <template>
     <el-dialog :title="$t('login.应用到期提醒')" class="systemInformation_main" v-model="dialogVisible" :before-close="closeDialog" width="690" top="6vh" center append-to="#index">
-        <el-table :data="expirepluginList" height="400" border >
+        <el-table :data="expirepluginList" height="400px" border >
             <template v-slot:empty>
                 <div class="noDataTips"></div>
             </template>
@@ -27,11 +27,11 @@ export default {
             dialogVisible: false,
             expirepluginList: [],
             stateList: [{
-                value: true,
+                value: false,
                 label: 'login.即将到期',
                 type: 'warning'
             }, {
-                value: false,
+                value: true,
                 label: 'login.已到期',
                 type: 'error'
             }]
@@ -102,6 +102,10 @@ export default {
     justify-content: center;
     align-items: center;
 }
+.el-table {
+    min-height: 240px;
+    max-height: 480px;
+}
 :deep(td.el-table__cell) {
     border-bottom: 1px solid var(--frame-main-border) !important;
 }

package/ganwei-iotcenter-index-6.2.3/packages/ganwei-iotcenter-index/src/router.js

@@ -4,31 +4,133 @@ import {
     createRouter,
     createWebHashHistory
 } from 'vue-router'
+import hostMap from './hostMap.js'
 
 const INDEX = () => import('./views/Index.vue')
 const jumpIframe = () => import('@/views/jumpIframe/index.vue')
+
 const router = createRouter({
     history: createWebHashHistory(),
-    routes: [{
-        path: '/',
-        redirect: '/Index'
-    },
-    {
-        path: '/Index',
-        name: 'INDEX',
-        component: INDEX,
-        children: [
-            {
-                path: 'jumpIframe/:packageName([^/]*)/:route(.*)',
-                name: 'jumpIframe3',
-                component: jumpIframe
-            }
-        ]
-    },
+    routes: [
+        {
+            path: '/',
+            redirect: '/Index'
+        },
+        {
+            path: '/Index',
+            name: 'INDEX',
+            component: INDEX,
+            meta: { requiresAuth: true },
+            children: [
+                {
+                    path: 'jumpIframe/:packageName([^/]*)/:route(.*)',
+                    name: 'jumpIframe3',
+                    component: jumpIframe,
+                    meta: { requiresAuth: true }
+                }
+            ]
+        }
     ]
 })
+
+// ==================== 登录验证状态管理 ====================
+let authCheckPromise = null
+let isAuthChecked = false
+
+// 带超时的请求
+function fetchWithTimeout(promise, timeout) {
+    return Promise.race([
+        promise,
+        new Promise((_, reject) =>
+            setTimeout(() => reject(new Error('请求超时')), timeout)
+        )
+    ])
+}
+
+// 用 AxiosBuilder 构建的带拦截器的实例
+function getAxiosInstance() {
+    return window.AxiosBuilder?.axios || window.axios
+}
+
+// 验证登录状态（复用同一个 Promise，避免重复请求）
+async function checkAuthStatus() {
+    if (isAuthChecked) return true
+    if (authCheckPromise) return authCheckPromise
+
+    authCheckPromise = (async () => {
+        try {
+            console.time('getSystemInfo')
+            const res = await fetchWithTimeout(
+                getAxiosInstance().get('/IoT/api/v3/Auth/GetSystemRuntimeInfo'),
+                3000
+            )
+            console.timeEnd('getSystemInfo')
+
+            if (res?.data?.code == 200 || res?.data?.code == -99999) {
+                isAuthChecked = true
+                return true
+            }
+            return false
+        } catch (err) {
+            console.log('登录验证失败:', err?.message || err)
+            return false
+        } finally {
+            authCheckPromise = null
+        }
+    })()
+
+    return authCheckPromise
+}
+
+// 跳转登录页
+function redirectToLogin() {
+    const url = process.env.NODE_ENV === 'development'
+        ? hostMap('ganwei-iotcenter-login')
+        : '/ganwei-iotcenter-login/#/'
+    window.location.href = url
+}
+
+// 设置开发环境参数（从 URL 参数中读取）
+function setDevelopmentParams() {
+    let map = window?.getParameterMap() || {}
+    if (process.env.NODE_ENV === 'development' && map) {
+        if (map.get('languageType')) {
+            sessionStorage.languageType = localStorage.languageType = map.get('languageType')
+        }
+        sessionStorage.userName = map.get('userName')
+        sessionStorage.passwordPolicy = map.get('passwordPolicy')
+        if (map.get('multiPark')) {
+            localStorage.multiPark = map.get('multiPark')
+        }
+        if (!sessionStorage.getItem('theme') || sessionStorage.getItem('theme') == 'null' || sessionStorage.getItem('theme') == 'undefined') {
+            sessionStorage.setItem('theme', map.get('theme'))
+        }
+    }
+}
+
+// ==================== 路由守卫 ====================
 router.beforeEach(async (to, from, next) => {
-    next()
+
+    // 不需要认证的路由直接放行
+    if (!to.meta.requiresAuth) {
+        next()
+        return
+    }
+
+    // 设置开发环境参数
+    setDevelopmentParams()
+
+    // 验证登录状态
+    const isValid = await checkAuthStatus()
+
+    if (isValid) {
+        next()
+    } else {
+        // 验证失败，跳转登录页
+        redirectToLogin()
+    }
 })
-router.afterEach((to, from, next) => { })
+
+router.afterEach(() => { })
+
 export default router

package/ganwei-iotcenter-index-6.2.3/packages/ganwei-iotcenter-index/src/utils/date.ts

@@ -1,5 +1,6 @@
 import dayjs from 'dayjs'
 import relativeTime from 'dayjs/plugin/relativeTime'
+
 import 'dayjs/locale/zh-cn'
 
 dayjs.extend(relativeTime)
@@ -16,7 +17,7 @@ dayjs.locale('zh-cn')
  */
 export function formatDate(
   date: Date | number | string,
-  format: string = 'YYYY-MM-DD HH:mm:ss'
+  format = 'YYYY-MM-DD HH:mm:ss'
 ): string {
   return dayjs(date).format(format)
 }

package/ganwei-iotcenter-index-6.2.3/packages/ganwei-iotcenter-index/src/utils/dom.ts

@@ -70,9 +70,9 @@ export function toggleFullscreen(element?: HTMLElement): Promise<void> {
 
   if (!document.fullscreenElement) {
     return target.requestFullscreen()
-  } else {
+  } 
     return document.exitFullscreen()
-  }
+  
 }
 
 /**

package/ganwei-iotcenter-index-6.2.3/packages/ganwei-iotcenter-index/src/utils/env.ts

@@ -1,14 +1,20 @@
 export const ENV = {
+
     /** 应用标题 */
     APP_TITLE: import.meta.env.VITE_APP_TITLE,
+
     /** 应用端口 */
     APP_VERSION: import.meta.env.VITE_APP_PORT,
+
     /** proxy代理配置 */
     APP_ENV: import.meta.env.VITE_APP_TARGET_URL,
+
     /** 本地地址 */
     API_URL: import.meta.env.VITE_APP_THIS_URL,
+
     /** 是否开发环境 */
     IS_DEV: import.meta.env.DEV,
+
     /** 是否生产环境 */
     IS_PROD: import.meta.env.PROD
 } as const

package/ganwei-iotcenter-index-6.2.3/packages/ganwei-iotcenter-index/src/utils/file.ts

@@ -36,7 +36,7 @@ export function fileToBase64(file: File): Promise<string> {
  */
 export function base64ToBlob(
   base64: string,
-  mimeType: string = 'application/octet-stream'
+  mimeType = 'application/octet-stream'
 ): Blob {
   const byteString = atob(base64.split(',')[1])
   const arrayBuffer = new ArrayBuffer(byteString.length)

package/ganwei-iotcenter-index-6.2.3/packages/ganwei-iotcenter-index/src/utils/number.ts

@@ -4,7 +4,7 @@
  * @param decimals - 小数位数，默认 0
  * @returns 格式化后的数字字符串
  */
-export function formatNumber(num: number | string, decimals: number = 0): string {
+export function formatNumber(num: number | string, decimals = 0): string {
   const number = Number(num)
   if (isNaN(number)) return '0'
 
@@ -22,8 +22,8 @@ export function formatNumber(num: number | string, decimals: number = 0): string
  */
 export function formatMoney(
   amount: number | string,
-  currency: string = '¥',
-  decimals: number = 2
+  currency = '¥',
+  decimals = 2
 ): string {
   const number = Number(amount)
   if (isNaN(number)) return `${currency}0.00`
@@ -38,7 +38,7 @@ export function formatMoney(
  */
 export function formatPercent(
   value: number | string,
-  decimals: number = 2
+  decimals = 2
 ): string {
   const number = Number(value)
   if (isNaN(number)) return '0%'
@@ -51,7 +51,7 @@ export function formatPercent(
  * @param bytes - 字节数
  * @param decimals - 小数位数，默认 2
  */
-export function formatFileSize(bytes: number, decimals: number = 2): string {
+export function formatFileSize(bytes: number, decimals = 2): string {
   if (bytes === 0) return '0 B'
 
   const k = 1024
@@ -78,6 +78,6 @@ export function random(min: number, max: number): number {
 /**
  * 生成随机 ID
  */
-export function generateId(prefix: string = ''): string {
+export function generateId(prefix = ''): string {
   return `${prefix}${Date.now()}${Math.random().toString(36).substr(2, 9)}`
 }

package/ganwei-iotcenter-index-6.2.3/packages/ganwei-iotcenter-index/src/utils/performance.ts

@@ -7,7 +7,7 @@
 export function debounce<T extends (...args: any[]) => any>(
   func: T,
   wait: number,
-  immediate: boolean = false
+  immediate = false
 ): (...args: Parameters<T>) => ReturnType<T> | undefined {
   let timeout: ReturnType<typeof setTimeout> | null = null
 

package/ganwei-iotcenter-index-6.2.3/packages/ganwei-iotcenter-index/src/utils/string.ts

@@ -64,7 +64,7 @@ export function maskAddress(address: string): string {
 /**
  * 截断字符串
  */
-export function truncate(str: string, length: number, suffix: string = '...'): string {
+export function truncate(str: string, length: number, suffix = '...'): string {
     if (str.length <= length) return str
     return str.substring(0, length) + suffix
 }

package/ganwei-iotcenter-index-6.2.3/packages/ganwei-iotcenter-index/src/utils/xss-filter.ts

@@ -109,12 +109,16 @@ export function stripJavascriptProtocol(str: string): string {
  * @returns 过滤后的安全字符串
  */
 export interface XssFilterOptions {
+
   /** 是否转义 HTML，默认 true */
   escapeHtml?: boolean
+
   /** 是否移除危险标签，默认 true */
   stripDangerousTags?: boolean
+
   /** 是否移除危险属性，默认 true */
   stripDangerousAttrs?: boolean
+
   /** 是否移除 javascript 协议，默认 true */
   stripJavascriptProtocol?: boolean
 }

package/ganwei-iotcenter-index-6.2.3/packages/ganwei-iotcenter-template/.eslintrc.cjs

@@ -26,12 +26,12 @@ module.exports = {
     plugins: ['vue', '@typescript-eslint'],
 
     /*
-   下面这些rules是用来设置从插件来的规范代码的规则，使用必须去掉前缀eslint-plugin-
+    下面这些rules是用来设置从插件来的规范代码的规则，使用必须去掉前缀eslint-plugin-
     主要有如下的设置规则，可以设置字符串也可以设置数字，两者效果一致
     "off" -> 0 关闭规则
     "warn" -> 1 开启警告规则
     "error" -> 2 开启错误规则
-  */
+    */
     // 参数说明：
     // 参数1 ： 错误等级
     // 参数2 ： 处理方式

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ganwei-web/ganwei-pc-cli",
-    "version": "6.3.1",
+    "version": "6.3.2",
     "private": false,
     "type": "module",
     "license": "MIT",

package/ganwei-iotcenter-index-6.2.3/packages/ganwei-iotcenter-index/src/mixins/judgePermission.js

@@ -1,65 +0,0 @@
-
-export default {
-    data: () => ({
-        isLogin: false,
-        requestTimeout: 3000  // 请求超时时间
-    }),
-    created() {
-        let isLgStatus = window.getParameterMap().get('isLgStatus')
-        if (isLgStatus) {
-            sessionStorage.setItem('isLgStatus', isLgStatus);
-        }
-        if (isLgStatus == 'false') {
-            this.jumpLogin()
-            return
-        }
-        console.time("getSystemInfo")
-        this.checkLoginStatus()
-        let map = window?.getParameterMap() || {}
-        if (process.env.NODE_ENV == "development" && map) {
-            if (map.get("languageType")) { sessionStorage.languageType = localStorage.languageType = map.get("languageType") }
-            sessionStorage.userName = map.get("userName")
-            sessionStorage.passwordPolicy = map.get("passwordPolicy")
-            if (map.get("multiPark")) { localStorage.multiPark = map.get("multiPark") }
-            if (!sessionStorage.getItem('theme') || sessionStorage.getItem('theme') == 'null' || sessionStorage.getItem('theme') == 'undefined') {
-                sessionStorage.setItem('theme', map.get("theme"))
-            }
-        }
-    },
-    methods: {
-        // 带超时的请求
-        fetchWithTimeout(promise, timeout) {
-            return Promise.race([
-                promise,
-                new Promise((_, reject) =>
-                    setTimeout(() => reject(new Error('请求超时')), timeout)
-                )
-            ])
-        },
-
-        // 检查登录状态
-        async checkLoginStatus() {
-            try {
-                const res = await this.fetchWithTimeout(
-                    this.$api.getSystemInfo(),
-                    this.requestTimeout
-                )
-                console.timeEnd("getSystemInfo")
-
-                if (res?.data?.code == 200 || res?.data?.code == -99999) {
-                    this.isLogin = true
-                } else {
-                    this.jumpLogin()
-                }
-            } catch (err) {
-                console.log('登录验证失败:', err?.message || err)
-                this.jumpLogin()
-            }
-        },
-
-        jumpLogin() {
-            let url = (process.env.NODE_ENV === "development" ? this.$hostMap('ganwei-iotcenter-login') : '/ganwei-iotcenter-login/#/')
-            window.location.href = url
-        }
-    }
-}