qj-common 5.0.0 → 5.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qj-common",
-  "version": "5.0.0",
+  "version": "5.0.1",
   "description": "common files && template for qj-paas",
   "scripts": {
     "gulp": "gulp css"
@@ -15,4 +15,4 @@
     "not ie <= 8"
   ],
   "license": "MIT"
-}
+}

package/src/permission.js

@@ -43,7 +43,7 @@ main(({ menuActions }, { proApp, router, store, _import, _import_common, NProgre
       }
 
       // Menu from Storage
-      if (menuList) {
+      if (menuList && menuList.routerMap) {
         // Current Routes
         if (menuList.routerMap[appPath]) {
           return menuList.routerMap[appPath].forEach((el) => {
@@ -58,7 +58,7 @@ main(({ menuActions }, { proApp, router, store, _import, _import_common, NProgre
       // No Storage
       store.dispatch('GetAppRouter').then((menuList) => {
         // Current Routes
-        if (menuList.routerMap[appPath]) {
+        if (menuList.routerMap && menuList.routerMap[appPath]) {
           return menuList.routerMap[appPath].forEach((el) => {
             handleRouter(el.children);
           });

package/src/store/modules/user.js

@@ -97,8 +97,15 @@ const user = {
         }).catch()
       }
     },
-    GetAppRouter: function () {
+    GetAppRouter: function next() {
       return getTopPerMenuListFPc().then(function (res) {
+        if(!Array.isArray(res.menuList)){
+          localStorage.removeItem('saas-token')
+          localStorage.removeItem('saasToken')
+          sessionStorage.removeItem('menuList')
+          next();
+          return
+        }
         if (res.menuList) {
           window.sessionStorage.setItem('menuList', JSON.stringify(res))
           if (!res) {

package/src/utils/request.js

@@ -190,9 +190,10 @@ service.interceptors.request.use(
     // if (getLocalStorage('saas-token')) {
     //   config.headers['saas-token'] = getLocalStorage('saas-token');
     // }
-    if (window.qs && window.qs['saas-token']) {
-      config.headers['saas-token'] = window.qs['saas-token']
-    } else if (getQueryString('saas-token')) {
+    // if (window.qs && window.qs['saas-token']) {
+    //   config.headers['saas-token'] = window.qs['saas-token']
+    // } else 
+    if (getQueryString('saas-token')) {
       config.headers['saas-token'] = getQueryString('saas-token');
       console.log('saas-token', getQueryString('saas-token'));
     } else if (getLocalStorage('saas-token')) {

package/src/utils/utils.js

@@ -6,7 +6,7 @@ let globalObj = {
   proappEnvLayout: window.sessionStorage.getItem('proappEnvLayout'),
   manager: ['index', 'pc-static', 'pc-mall', 'points-manager', 'consult-manager', 'message-manager', 'user-manager', 'order-manager', 'invoice-manager', 'promotion-manager','b2b-cli-pc-ayd'],
 };
-// timer();
+timer();
 
 function timer() {
   globalObj.proappEnvLayout = window.sessionStorage.getItem('proappEnvLayout');

package/src/views/templates/templateTable.vue

@@ -367,6 +367,7 @@
                 :reserve-selection="temTablePack.reserve_selection ? true : false"
                 type="selection"
                 v-if="'selection' in temTablePack ? temTablePack.selection.state : false"
+                :selectable="selectable ? selectable : () => { return true}"
                 width="40"
               ></el-table-column>
               <el-table-column
@@ -615,7 +616,7 @@ const querystring = require('querystring');
 import { isUndefined } from 'lodash';
 import { parseTime } from '#/utils/index'; //时间格式化
 export default {
-  props: ['temInput', 'params', 'temTable', 'temPage', 'temTab', 'url', 'temPageLayout', 'subtotal'],
+  props: ['temInput', 'params', 'selectable', 'temTable', 'temPage', 'temTab', 'url', 'temPageLayout', 'subtotal'],
   computed: {
     temInputPack() {
       if (!this.temInput) {
@@ -1305,21 +1306,21 @@ export default {
                   });
                 }
               }
-            } else if (res && res.rows) {
-              this.tableData = res.rows;
+            } else if (res && res.list) {
+              this.tableData = res.list;
               if (this.temPage !== false) {
                 this.pagenation.total = res.total;
               }
-              this.tableData = res.rows;
-              this.$emit('getData', res.rows);
+              this.tableData = res.list;
+              this.$emit('getData', res.list);
               this.$emit('getTotal', res.total);
               // 小计
-              if (res.rows.length > 0) {
+              if (res.list.length > 0) {
                 if (this.subtotal && this.subtotal.length > 0) {
                   this.subtotal.forEach((el) => {
                     el.value = 0;
                     if (el.name) {
-                      res.rows.forEach((res) => {
+                      res.list.forEach((res) => {
                         el.value = this.accAdd(el.value, Number(res[el.name]));
                         el.value = el.value.toFixed(2);
                       });