@ganwei-web/ganwei-pc-cli 6.3.6 → 6.3.8

package/ganwei-iotcenter-index-6.2.3/packages/ganwei-iotcenter-index/public/static/fonts/font/iconfont.json

@@ -5,6 +5,13 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "46768117",
+      "name": "更新配置",
+      "font_class": "gengxinpeizhi",
+      "unicode": "ea0f",
+      "unicode_decimal": 59919
+    },
     {
       "icon_id": "46566483",
       "name": "gw-icon-iot-access-record",

package/ganwei-iotcenter-index-6.2.3/packages/ganwei-iotcenter-index/public/static/themes/dark-6-1.css

@@ -94,11 +94,19 @@
     --frame-main-background-3: var(--gw-color-Neutrals21);
     /* 任务库 popover 背景 */
     --frame-main-background-4: var(--gw-color-Neutrals20);
+    --frame-main-background-primary: var(--gw-color-primary);
+    --frame-main-background-success: var(--gw-color-success);
+    --frame-main-background-waning: var(--gw-color-waning);
+    --frame-main-background-danger: var(--gw-color-danger);
     /* 主要字体色 */
     --frame-main-color: var(--gw-color-Neutrals2);
     /* 稍浅字体色 */
     --frame-main-color-1: var(--gw-color-Neutrals12);
     --frame-main-color-2: var(--gw-color-waning4);
+    --frame-main-color-primary: var(--gw-color-primary);
+    --frame-main-color-success: var(--gw-color-success);
+    --frame-main-color-waning: var(--gw-color-waning);
+    --frame-main-color-danger: var(--gw-color-danger);
     /* 主要边框色 */
     /* --bor-default =>  --border-color-2 =>*/
     --frame-main-border: var(--gw-color-Neutrals18);
@@ -385,6 +393,13 @@
     --collapse-color__hover: var(--frame-main-color);
     --collapse-content-background: transparent;
 
+    /* descriptions */
+    --descriptions-border: var(--gw-color-Neutrals18);
+    --descriptions-label-color: var(--frame-main-color);
+    --descriptions-label-background: var(--gw-color-Neutrals21);
+    --descriptions-content-color: var(--frame-main-color);
+    --descriptions-content-background: var(--frame-main-background-2);
+
     /* 穿梭框 */
     --transfer-background: var(--gw-color-Neutrals25);
     --transfer-border: var(--gw-color-Neutrals18);

package/ganwei-iotcenter-index-6.2.3/packages/ganwei-iotcenter-index/public/static/themes/green-6-1.css

@@ -84,11 +84,19 @@
     --frame-main-background-3: var(--gw-color-Neutrals22);
     /* 任务库 popover 背景 */
     --frame-main-background-4: var(--gw-color-Neutrals20);
+    --frame-main-background-primary: var(--gw-color-primary);
+    --frame-main-background-success: var(--gw-color-success);
+    --frame-main-background-waning: var(--gw-color-waning);
+    --frame-main-background-danger: var(--gw-color-danger);
     /* 主要字体色 */
     --frame-main-color: var(--gw-color-Neutrals2);
     /* 稍浅字体色 */
     --frame-main-color-1: var(--gw-color-Neutrals12);
     --frame-main-color-2: var(--gw-color-waning4);
+    --frame-main-color-primary: var(--gw-color-primary);
+    --frame-main-color-success: var(--gw-color-success);
+    --frame-main-color-waning: var(--gw-color-waning);
+    --frame-main-color-danger: var(--gw-color-danger);
     /* 主要边框色 */
     /* --bor-default =>  --border-color-2 =>*/
     --frame-main-border: var(--gw-color-Neutrals18);
@@ -315,6 +323,22 @@
     --transfer-border: var(--gw-color-Neutrals18);
     --transfer-header-background: var(--gw-color-Neutrals21);
 
+    /* collapse */
+    --collapse-header-background: var(--gw-color-Neutrals21);
+    --collapse-header-background__hover: var(--gw-color-Neutrals29);
+    --collapse-header-background__active: var(--gw-color-Neutrals29);
+    --collapse-color: var(--frame-main-color);
+    --collapse-color__hover: var(--frame-main-color);
+    --collapse-content-background: transparent;
+
+    /* descriptions */
+    --descriptions-border: var(--gw-color-Neutrals18);
+    --descriptions-label-color: var(--frame-main-color);
+    --descriptions-label-background: var(--gw-color-Neutrals21);
+    --descriptions-content-color: var(--frame-main-color);
+    --descriptions-content-background: var(--frame-main-background-2);
+
+
     /* fullcalendar 日历 */
     --fc-color: var(--gw-color-Neutrals2);
     --fc-color__active: var(--gw-color-Neutrals27);

package/ganwei-iotcenter-index-6.2.3/packages/ganwei-iotcenter-index/public/static/themes/light-6-1.css

@@ -94,11 +94,19 @@
     --frame-main-background-3: var(--gw-color-Neutrals22);
     /* 任务库 popover 背景 */
     --frame-main-background-4: var(--gw-color-Neutrals20);
+    --frame-main-background-primary: var(--gw-color-primary);
+    --frame-main-background-success: var(--gw-color-success);
+    --frame-main-background-waning: var(--gw-color-waning);
+    --frame-main-background-danger: var(--gw-color-danger);
     /* 主要字体色 */
     --frame-main-color: var(--gw-color-Neutrals2);
     /* 稍浅字体色 */
     --frame-main-color-1: var(--gw-color-Neutrals12);
     --frame-main-color-2: var(--gw-color-waning4);
+    --frame-main-color-primary: var(--gw-color-primary);
+    --frame-main-color-success: var(--gw-color-success);
+    --frame-main-color-waning: var(--gw-color-waning);
+    --frame-main-color-danger: var(--gw-color-danger);
     /* 主要边框色 */
     /* --bor-default =>  --border-color-2 =>*/
     --frame-main-border: var(--gw-color-Neutrals18);
@@ -214,7 +222,7 @@
 
     /*el-input 基础*/
     --input-color: var(--gw-color-Neutrals2);
-    --input-background: var(--gw-color-Neutrals19);
+    --input-background: var(--gw-color-Neutrals25);
     --input-background__disabled: var(--gw-color-Neutrals20);
     --input-placeholder: var(--gw-color-Neutrals13);
     --input-border: var(--gw-color-Neutrals18);
@@ -391,6 +399,13 @@
     --collapse-color__hover: var(--frame-main-color);
     --collapse-content-background: transparent;
 
+    /* descriptions */
+    --descriptions-border: var(--gw-color-Neutrals18);
+    --descriptions-label-color: var(--frame-main-color);
+    --descriptions-label-background: var(--gw-color-Neutrals21);
+    --descriptions-content-color: var(--frame-main-color);
+    --descriptions-content-background: var(--frame-main-background-2);
+
     /* 穿梭框 */
     --transfer-background: var(--gw-color-Neutrals25);
     --transfer-border: var(--gw-color-Neutrals18);

package/ganwei-iotcenter-index-6.2.3/packages/ganwei-iotcenter-index/src/components/layouts/Navigation/TopNav.vue

@@ -163,25 +163,21 @@ watch(
       console.log('TopNav routesMap 数据尚未加载，跳过路由匹配')
       return
     }
-
     const map = routesMap.value
     const decodedPath = decodeURIComponent(fullPath as string)
-    let routeBase = decodedPath
-
-    // 移除查询参数获取基础路径
-    if (routeBase.indexOf('?') != -1) {
-      routeBase = routeBase.split('?')[0]
-    }
-
-    // 优先精确匹配
+    // 判断fullPath是否存在映射地址中map[decodedPath]
     if (decodedPath in map) {
       const index = map[decodedPath]
       if (index !== props.modelValue) {
         emit('update:modelValue', index)
       }
     } else {
-      // 如果精确匹配失败，遍历 routesMap 查找匹配的基础路径（适用于外部链接）
+      // 去除映射键值参数和去除fullPath参数地址对比
       let matchedIndex = -1
+      let routeBase = decodedPath
+      if (routeBase.indexOf('?') != -1) {
+        routeBase = routeBase.split('?')[0]
+      }
       for (const [mapKey, index] of Object.entries(map)) {
         const mapKeyBase = mapKey.indexOf('?') != -1 ? mapKey.split('?')[0] : mapKey
         // 移除可能存在的空格后比较
@@ -192,8 +188,6 @@ watch(
       }
       if (matchedIndex !== -1 && matchedIndex !== props.modelValue) {
         emit('update:modelValue', matchedIndex)
-      } else {
-        console.log('TopNav 未匹配到菜单:', { decodedPath, routeBase })
       }
     }
   },
@@ -211,12 +205,6 @@ watch(
     }
     const fullPath = route.fullPath
     const decodedPath = decodeURIComponent(fullPath as string)
-    let routeBase = decodedPath
-
-    if (routeBase.indexOf('?') != -1) {
-      routeBase = routeBase.split('?')[0]
-    }
-
     if (decodedPath in newMap) {
       const index = newMap[decodedPath]
       if (index !== props.modelValue) {
@@ -224,6 +212,10 @@ watch(
       }
     } else {
       let matchedIndex = -1
+      let routeBase = decodedPath
+      if (routeBase.indexOf('?') != -1) {
+        routeBase = routeBase.split('?')[0]
+      }
       for (const [mapKey, index] of Object.entries(newMap)) {
         const mapKeyBase = mapKey.indexOf('?') != -1 ? mapKey.split('?')[0] : mapKey
         if (mapKeyBase.trim() === routeBase.trim()) {

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

@@ -173,7 +173,6 @@ export default {
          * 从服务器获取菜单数据，处理并设置菜单样式
          */
         getMenus() {
-
             this.loading = true
             this.$api
                 .GetMenus()
@@ -190,7 +189,7 @@ export default {
                             this.correctMenuLevel(data)
                             this.allMenus = data
                             let menesIndex = this.getMenusIndex()
-                            this.navTopActive = menesIndex == -1 ? 0 : menesIndex;
+                            this.navTopActive = menesIndex == -2 ? 0 : menesIndex;
                             window.sessionStorage.asideList = JSON.stringify(this.allMenus)
                         }
                     } else {
@@ -361,7 +360,7 @@ export default {
                     return i
                 }
             }
-            return -1
+            return -2
         }
     },
     watch: {
@@ -371,8 +370,8 @@ export default {
                 this.isHideMenu = window.getParameterMap().get("isHideMenu") === 'true'
                 this.isHideHead = window.getParameterMap().get("isHideHead") === 'true'
                 // 路由变化时更新 navTopActive，确保左侧菜单正确显示
-                const menesIndex = this.getMenusIndex()
-                this.navTopActive = menesIndex == -1 ? (this.allMenus.length > 0 ? 0 : -1) : menesIndex
+                // const menesIndex = this.getMenusIndex()
+                // this.navTopActive = menesIndex == -1 ? (this.allMenus.length > 0 ? 0 : -1) : menesIndex 
             },
             deep: true,
             immediate: true

package/ganwei-iotcenter-index-6.2.3/packages/ganwei-iotcenter-login/public/static/themes/light-6-1.css

@@ -212,7 +212,7 @@
 
     /*el-input 基础*/
     --input-color: var(--gw-color-Neutrals2);
-    --input-background: var(--gw-color-Neutrals27);
+    --input-background: var(--gw-color-Neutrals25);
     --input-background__disabled: var(--gw-color-Neutrals20);
     --input-placeholder: var(--gw-color-Neutrals13);
     --input-border: var(--gw-color-Neutrals18);

package/ganwei-iotcenter-index-6.2.3/packages/ganwei-iotcenter-login/src/views/ssoLogin.vue

@@ -138,17 +138,21 @@ export default {
                                     }
                                 })
                             } else {
-                                let url = new URL(window.location.origin);
-                                const search = url.href.indexOf('?') > -1 ? url.href.split('?')[1] : ''
-                                const urlSearchParams = new URLSearchParams(search)
-                                const searchParams = new URLSearchParams(this.query)
-                                const mergedParams = this.mergeURLSearchParams(searchParams, urlSearchParams)
-                                mergedParams.delete('url')
-                                mergedParams.delete('code')
-                                mergedParams.delete('state')
-                                let urlString = url.origin + '/#/Index' + url.hash.split('?')[0] + '?' + mergedParams.toString()
-
-                                window.location.href = urlString;
+                                if (this.urlConfig.api) {
+                                    window.location.href = this.urlConfig.api;
+                                } else {
+                                    let url = new URL(window.location.origin);
+                                    const search = url.href.indexOf('?') > -1 ? url.href.split('?')[1] : ''
+                                    const urlSearchParams = new URLSearchParams(search)
+                                    const searchParams = new URLSearchParams(this.query)
+                                    const mergedParams = this.mergeURLSearchParams(searchParams, urlSearchParams)
+                                    mergedParams.delete('url')
+                                    mergedParams.delete('code')
+                                    mergedParams.delete('state')
+                                    let urlString = url.origin + '/#/Index' + url.hash.split('?')[0] + '?' + mergedParams.toString()
+
+                                    window.location.href = urlString;
+                                }
                             }
                         }
 

package/ganwei-iotcenter-index-6.2.3/packages/ganwei-iotcenter-template/env.d.ts

@@ -8,4 +8,11 @@ declare module '*.vue' {
 
 interface ImportMeta {
   readonly env: ImportMetaEnv
+}
+
+interface Window {
+  packageId: string
+  routeName: string
+  permissionList: () => Promise<void>
+  getParameterMap: () => Map<string, string>
 }

package/ganwei-iotcenter-index-6.2.3/packages/ganwei-iotcenter-template/package.json

@@ -13,8 +13,8 @@
         "@babel/core": "^7.26.0",
         "@babel/eslint-parser": "^7.25.9",
         "@element-plus/icons-vue": "^2.3.1",
-        "@ganwei-web/gw-base-api-plus": "^1.0.1",
-        "@ganwei-web/gw-base-components-plus": "^1.0.22",
+        "@ganwei-web/gw-base-api-plus": "^1.0.2",
+        "@ganwei-web/gw-base-components-plus": "^1.0.24",
         "@ganwei-web/gw-base-style-plus": "^1.0.0",
         "@ganwei-web/gw-base-utils-plus": "^1.0.1",
         "@types/lodash-es": "^4.17.12",
@@ -75,7 +75,7 @@
         "postcss-pxtorem": "^6.1.0",
         "qs": "^6.14.1",
         "rollup-plugin-visualizer": "^5.12.0",
-        "typescript": "^4.9.5",
+        "typescript": "^6.0.2",
         "unplugin-auto-import": "^0.13.0",
         "vite": "^4.5.5",
         "vite-plugin-html": "^3.2.2",