qj-common 4.2.1 → 4.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qj-common",
-  "version": "4.2.1",
+  "version": "4.2.2",
   "description": "common files && template for qj-paas",
   "scripts": {
     "gulp": "gulp css"

package/src/permission.js

@@ -2,7 +2,7 @@
 import main from '#/main';
 
 // White List
-const whiteList = [`b2b.heidelbergchina.com`,`uatb2b.heidelbergchina.com`];
+const whiteList = [`b2b.heidelbergchina.com`, `uatb2b.heidelbergchina.com`];
 
 // Executor
 main(({ menuActions }, { proApp, router, store, _import, _import_common, NProgress, PageNotFound, domCreate, interceptor, queryParams, getActiveMenu, generateRoutesFromMenu }) => {
@@ -30,7 +30,7 @@ main(({ menuActions }, { proApp, router, store, _import, _import_common, NProgre
     }
 
     // Dispatch GetAppInfo
-    store.dispatch('GetAppInfo').then(res => {
+    store.dispatch('GetAppInfo').then((res) => {
       // Get App Path
       const appPath = process.env.APP_PATH;
 
@@ -46,7 +46,7 @@ main(({ menuActions }, { proApp, router, store, _import, _import_common, NProgre
       if (menuList) {
         // Current Routes
         if (menuList.routerMap[appPath]) {
-          return menuList.routerMap[appPath].forEach(el => {
+          return menuList.routerMap[appPath].forEach((el) => {
             handleRouter(el.children);
           });
         }
@@ -56,10 +56,10 @@ main(({ menuActions }, { proApp, router, store, _import, _import_common, NProgre
       }
 
       // No Storage
-      store.dispatch('GetAppRouter').then(menuList => {
+      store.dispatch('GetAppRouter').then((menuList) => {
         // Current Routes
         if (menuList.routerMap[appPath]) {
-          return menuList.routerMap[appPath].forEach(el => {
+          return menuList.routerMap[appPath].forEach((el) => {
             handleRouter(el.children);
           });
         }
@@ -87,7 +87,7 @@ main(({ menuActions }, { proApp, router, store, _import, _import_common, NProgre
       const menu = {};
 
       // Set Menu
-      menuList && menuList.forEach(element => (menu[element.proappModelCode] = element.children));
+      menuList && menuList.forEach((element) => (menu[element.proappModelCode] = element.children));
 
       // Set Code
       menuCode(menuList);
@@ -101,7 +101,7 @@ main(({ menuActions }, { proApp, router, store, _import, _import_common, NProgre
         return;
       }
 
-      data.forEach(item => {
+      data.forEach((item) => {
         if (item.menuCode === 'P0000111') {
           return window.sessionStorage.setItem('menuAction', item.menuAction);
         }
@@ -153,10 +153,10 @@ main(({ menuActions }, { proApp, router, store, _import, _import_common, NProgre
       const noneLayout = [];
 
       // Check Action by Preset
-      data.forEach(e => (menuActions.includes(e.menuAction) ? noneLayout.push(e) : dataLayout.push(e)));
+      data.forEach((e) => (menuActions.includes(e.menuAction) ? noneLayout.push(e) : dataLayout.push(e)));
 
       // Check First for No Data
-      noneLayout.forEach(item => {
+      noneLayout.forEach((item) => {
         // 只做一级
         menus.push({
           path: '/' + item.menuAction,
@@ -228,30 +228,56 @@ main(({ menuActions }, { proApp, router, store, _import, _import_common, NProgre
     if (!proappEnvLayout) {
       return;
     }
-
-    // Extension Link of 1 ?
-    const link = document.getElementsByTagName('link')[1];
-
+    let arr = document.getElementsByTagName('link') || [];
+    let link, head;
     // Get Head
-    const head = document.getElementsByTagName('head')[0];
-
-    // Set Href of Link
-    link.href = '';
-    link.href = proappEnvLayout.proappEnvIconUrl;
-
-    // Extension Metas
-    const keywords = domCreate('meta', {
-      name: 'keywords',
-      content: proappEnvLayout.proappEnvDes,
-    });
+    if (Array.isArray(arr)) {
+      head = document.getElementsByTagName('head')[0];
+      // Extension Metas
+      const keywords = domCreate('meta', {
+        name: 'keywords',
+        content: proappEnvLayout.proappEnvDes,
+      });
 
-    const description = domCreate('meta', {
-      name: 'description',
-      content: proappEnvLayout.proappEnvDes,
-    });
+      const description = domCreate('meta', {
+        name: 'description',
+        content: proappEnvLayout.proappEnvDes,
+      });
 
-    // Insert
-    head.appendChild(keywords);
-    head.appendChild(description);
+      // Insert
+      head.appendChild(keywords);
+      head.appendChild(description);
+    }
+    if (Array.isArray(arr) && arr.length > 1) {
+      // Extension Link of 1 ?
+      link = document.getElementsByTagName('link')[1];
+      // Set Href of Link
+      link.href = '';
+      link.href = proappEnvLayout.proappEnvIconUrl;
+    }
+    // // Extension Link of 1 ?
+    // const link = document.getElementsByTagName('link')[1];
+
+    // // Get Head
+    // const head = document.getElementsByTagName('head')[0];
+
+    // // Set Href of Link
+    // link.href = '';
+    // link.href = proappEnvLayout.proappEnvIconUrl;
+
+    // // Extension Metas
+    // const keywords = domCreate('meta', {
+    //   name: 'keywords',
+    //   content: proappEnvLayout.proappEnvDes,
+    // });
+
+    // const description = domCreate('meta', {
+    //   name: 'description',
+    //   content: proappEnvLayout.proappEnvDes,
+    // });
+
+    // // Insert
+    // head.appendChild(keywords);
+    // head.appendChild(description);
   });
 });