doway-coms 2.1.0 → 2.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doway-coms",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "description": "doway组件库",
   "author": "dowaysoft",
   "main": "packages/index.js",

package/packages/BaseGrid/src/index.vue

@@ -2054,13 +2054,26 @@ export default {
         if (!find) {
           return
         }
-        find.extraInfo.filterExpression
-          ? (loopCol.filters = find.extraInfo.filterExpression)
-          : (loopCol.filters[0].data = {
+        // 有筛选条件加筛选条件，没有筛选条件则初始化一下
+        if (find.extraInfo.filterExpression) {
+          loopCol.filters = find.extraInfo.filterExpression
+        } else {
+          if (loopCol.filters && loopCol.filters.length !== 0) {
+            loopCol.filters[0].data = {
               bindingValues: [],
               displayValues: [],
               displayValueSearchText: '',
-            })
+            }
+          } else{
+            loopCol.filters = [{
+              data: {
+                bindingValues: [],
+                displayValues: [],
+                displayValueSearchText: '',
+              },
+            }]
+          }
+        }
         find.extraInfo.order
           ? (loopCol.order = find.extraInfo.order)
           : (loopCol.order = null)

package/packages/utils/request.js

@@ -128,7 +128,12 @@ service.interceptors.response.use(
       return response.data
     }
     if (res.code === 401) {
-      store.dispatch('logOut')
+      // 判断是否为无界的子应用
+      if (window.__POWERED_BY_WUJIE__) {
+        store.dispatch('logOut')
+      } else {
+        store.dispatch('logOutMicro')  // 子应用的返回登录页操作
+      }
       return Promise.reject(res.msg)
     }
     // 如果是授权接口报的错，不通过通用错误显示
@@ -147,8 +152,12 @@ service.interceptors.response.use(
   },
   error => {
     if (error.response && error.response.status === 401) {
-      // alert('会话过期1');
-        store.dispatch('logOut').then(() => {})
+      // 判断是否为无界的子应用
+      if (window.__POWERED_BY_WUJIE__) {
+        store.dispatch('logOut')
+      } else {
+        store.dispatch('logOutMicro')  // 子应用的返回登录页操作
+      }
       return
     }
     let errorMsg = ''