eoss-ui 0.4.14 → 0.4.17

package/packages/main/src/main.vue

@@ -21,7 +21,7 @@
           :deep="modal === 'topnav'"
           :default-active="topActive"
           @select="
-            res => {
+            (res) => {
               handleSelect(res, 'nav');
             }
           "
@@ -37,7 +37,7 @@
         :notice="notice"
         :data="handleData"
         @select="
-          res => {
+          (res) => {
             handleSelect(res, 'sys');
           }
         "
@@ -67,12 +67,12 @@
           :menu-tips="menuTips"
           :is-default="isDefault"
           @trigger="
-            res => {
+            (res) => {
               handleSelect(res, 'sub');
             }
           "
           @select="
-            res => {
+            (res) => {
               handleSelect(res, 'menu');
             }
           "
@@ -87,7 +87,7 @@
             :default-active="tabsId"
             :menu-tips="menuTips"
             @select="
-              res => {
+              (res) => {
                 handleSelect(res, 'tabs');
               }
             "
@@ -522,7 +522,7 @@ export default {
     util.win.refresh = this.handleRefresh;
     util.win.jumpMenu = this.jumpMenu;
     if (util.win.$wujie) {
-      util.win.$wujie.bus.$on('changeTheme', res => {
+      util.win.$wujie.bus.$on('changeTheme', (res) => {
         util.updateTheme(res);
       });
     }
@@ -565,7 +565,7 @@ export default {
           params: { color: escape(color.toLowerCase()) },
           data: { color: escape(color.toLowerCase()) }
         })
-        .then(res => {
+        .then((res) => {
           if (res.rCode === 0) {
             this.color = color;
             localStorage.setItem('theme', color);
@@ -583,7 +583,7 @@ export default {
             this.$message.error(msg);
           }
         })
-        .catch(err => {
+        .catch((err) => {
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
           }
@@ -666,7 +666,7 @@ export default {
       }
       util
         .ajax({ url: this.mainConfig })
-        .then(res => {
+        .then((res) => {
           if (res && res.rCode === 0) {
             this.setConfig(res.results, 1);
           } else {
@@ -674,7 +674,7 @@ export default {
             this.$message.error(msg);
           }
         })
-        .catch(err => {
+        .catch((err) => {
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
           }
@@ -683,7 +683,7 @@ export default {
     reGetConfig() {
       util
         .ajax({ url: this.mainConfig })
-        .then(res => {
+        .then((res) => {
           if (res && res.rCode === 0) {
             const results = JSON.parse(JSON.stringify(res.results));
             this.setConfig(results, 1);
@@ -692,7 +692,7 @@ export default {
             this.$message.error(msg);
           }
         })
-        .catch(err => {
+        .catch((err) => {
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
           }
@@ -759,7 +759,7 @@ export default {
     getMenu() {
       util
         .ajax({ url: this.action })
-        .then(res => {
+        .then((res) => {
           if (res.rCode === 0) {
             this.menus = JSON.parse(JSON.stringify(res.results));
             let applicationid =
@@ -790,7 +790,7 @@ export default {
             this.$message.error(msg);
           }
         })
-        .catch(err => {
+        .catch((err) => {
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
           }
@@ -877,7 +877,7 @@ export default {
         } else {
           this.tabs = obj.fourthTabs;
           if (obj.url) {
-            let tab = obj.fourthTabs.filter(item => {
+            let tab = obj.fourthTabs.filter((item) => {
               return item.url === obj.url;
             })[0];
             if (tab) {
@@ -902,7 +902,7 @@ export default {
     //遍历设置菜单气泡提醒
     setTips(obj) {
       if (Array.isArray(obj)) {
-        obj.forEach(item => {
+        obj.forEach((item) => {
           this.setTips(item);
         });
       } else {
@@ -912,7 +912,7 @@ export default {
         }
         let flag = false;
         if (obj.children && obj.children.length) {
-          obj.children.forEach(item => {
+          obj.children.forEach((item) => {
             if (this.setTips(item)) {
               flag = true;
             }
@@ -922,7 +922,7 @@ export default {
             return true;
           }
         } else if (obj.fourthTabs && obj.fourthTabs.length) {
-          obj.fourthTabs.forEach(item => {
+          obj.fourthTabs.forEach((item) => {
             if (this.setTips(item)) {
               flag = true;
             }
@@ -1051,7 +1051,7 @@ export default {
             this.active = this.getFirst(node.children[0]);
           } else {
             if (node.url) {
-              let tab = node.fourthTabs.filter(item => {
+              let tab = node.fourthTabs.filter((item) => {
                 return item.url === node.url;
               })[0];
               if (tab) {
@@ -1100,7 +1100,7 @@ export default {
             }
           }
           if (node.url) {
-            let tab = (node.fourthTabs || []).filter(item => {
+            let tab = (node.fourthTabs || []).filter((item) => {
               return item.url === node.url;
             })[0];
             if (tab) {
@@ -1314,7 +1314,7 @@ export default {
     handleListener() {
       util.win.addEventListener(
         'message',
-        e => {
+        (e) => {
           var msg = e.data;
           if (msg.key == 'jump_Menu') {
             let res = msg.data1;
@@ -1346,7 +1346,7 @@ export default {
         () => {
           //localStorage.setItem("socket",true);
           //订阅服务端的
-          client.subscribe(topic, response => {
+          client.subscribe(topic, (response) => {
             let res = JSON.parse(response.body);
             let data = res.data;
             for (let i in data) {
@@ -1373,7 +1373,7 @@ export default {
             }
           });
         },
-        error => {
+        (error) => {
           console.log('webSocket连接失败');
           client.disconnect();
         }
@@ -1461,7 +1461,7 @@ export default {
             }
           }
         })
-        .catch(e => {});
+        .catch((e) => {});
     },
     openPage(url, name, width, height) {
       let src = url;
@@ -1472,18 +1472,18 @@ export default {
           pathname.splice(pathname.length - 1);
           pathname = pathname.join('/');
         }
-        src = pathname + url.replace('./', '');
+        src = pathname + url.replace('./', '/');
       }
       if (name) {
         let w = width ? width : util.win.top.screen.availWidth - 10;
         let h = height ? height : util.win.top.screen.availHeight - 60;
-        util.win.open(
+        return util.win.open(
           src,
           name,
           `width=${w}px,height=${h}px,resizable=yes,status=yes,menubar=no,scrollbars=yes`
         );
       } else {
-        util.win.open(src);
+        return util.win.open(src);
       }
     }
   },

package/packages/mainComp/src/main.vue

@@ -29,7 +29,7 @@
           :deep="modal === 'topnav'"
           :default-active="topActive"
           @select="
-            res => {
+            (res) => {
               handleSelect(res, 'nav');
             }
           "
@@ -50,7 +50,7 @@
         v-bind="themeJSON.topNav.data"
         :componentRenderUrl="themeJSON.topNav.comp"
         @select="
-          res => {
+          (res) => {
             handleSelect(res, 'sys');
           }
         "
@@ -67,7 +67,7 @@
         :notice="notice"
         :data="handleData"
         @select="
-          res => {
+          (res) => {
             handleSelect(res, 'sys');
           }
         "
@@ -90,12 +90,12 @@
           :application="application"
           :menuUrl="menuUrl"
           @trigger="
-            res => {
+            (res) => {
               handleSelect(res, 'sub');
             }
           "
           @select="
-            res => {
+            (res) => {
               handleSelect(res, 'menu');
             }
           "
@@ -113,12 +113,12 @@
           :menu-tips="menuTips"
           :is-default="isDefault"
           @trigger="
-            res => {
+            (res) => {
               handleSelect(res, 'sub');
             }
           "
           @select="
-            res => {
+            (res) => {
               handleSelect(res, 'menu');
             }
           "
@@ -133,7 +133,7 @@
             :default-active="tabsId"
             :menu-tips="menuTips"
             @select="
-              res => {
+              (res) => {
                 handleSelect(res, 'tabs');
               }
             "
@@ -170,11 +170,13 @@
             </template>
           </div>
           <AsyncComponent
-            style="position: absolute;
-                   height: 60px;
-                   bottom: 0;
-                   left: 0;
-                   right: 0;"
+            style="
+              position: absolute;
+              height: 60px;
+              bottom: 0;
+              left: 0;
+              right: 0;
+            "
             v-if="themeJSON.copyright.comp"
             :key="themeJSON.copyright.comp"
             v-bind="themeJSON.copyright.data"
@@ -287,8 +289,6 @@ export default {
     data: Array,
     //头部背景图片
     headerImage: String,
-    //默认选中菜单id
-    defaultActive: Array,
     //默认主题颜色
     theme: {
       type: String,
@@ -609,7 +609,7 @@ export default {
     util.win.refresh = this.handleRefresh;
     util.win.jumpMenu = this.jumpMenu;
     if (util.win.$wujie) {
-      util.win.$wujie.bus.$on('changeTheme', res => {
+      util.win.$wujie.bus.$on('changeTheme', (res) => {
         util.updateTheme(res);
       });
     }
@@ -629,7 +629,7 @@ export default {
       };
       util
         .ajax(params)
-        .then(res => {
+        .then((res) => {
           let _that = this;
           if (!res.results) {
             _that.showDefault = true;
@@ -663,7 +663,7 @@ export default {
             _that.setMenu(_that.data);
           }
         })
-        .catch(err => {
+        .catch((err) => {
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
           }
@@ -688,7 +688,7 @@ export default {
       let area = this.$refs.area.$el;
       let box = this.$refs.box;
       let [sTime, eTime] = [0, 0];
-      area.addEventListener('mousedown', e => {
+      area.addEventListener('mousedown', (e) => {
         sTime = new Date().getTime();
         let { y: downY } = e;
         let { height: winH } = document.body.getBoundingClientRect();
@@ -696,7 +696,7 @@ export default {
         document.body.onselectstart = document.body.oncontextmenu = () => {
           return false;
         };
-        document.onmousemove = eve => {
+        document.onmousemove = (eve) => {
           let size = 40;
           let { y: moveY } = eve;
           let { top: boxTop } = box.getBoundingClientRect();
@@ -737,7 +737,7 @@ export default {
           params: { color: escape(color.toLowerCase()) },
           data: { color: escape(color.toLowerCase()) }
         })
-        .then(res => {
+        .then((res) => {
           if (res.rCode === 0) {
             this.color = color;
             localStorage.setItem('theme', color);
@@ -752,7 +752,7 @@ export default {
             this.$message.error(msg);
           }
         })
-        .catch(err => {
+        .catch((err) => {
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
           }
@@ -820,7 +820,7 @@ export default {
       }
       util
         .ajax({ url: this.mainConfig })
-        .then(res => {
+        .then((res) => {
           if (res && res.rCode === 0) {
             this.setConfig(res.results, 1);
           } else {
@@ -828,7 +828,7 @@ export default {
             this.$message.error(msg);
           }
         })
-        .catch(err => {
+        .catch((err) => {
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
           }
@@ -837,7 +837,7 @@ export default {
     reGetConfig() {
       util
         .ajax({ url: this.mainConfig })
-        .then(res => {
+        .then((res) => {
           if (res && res.rCode === 0) {
             const results = JSON.parse(JSON.stringify(res.results));
             this.setConfig(results, 1);
@@ -846,7 +846,7 @@ export default {
             this.$message.error(msg);
           }
         })
-        .catch(err => {
+        .catch((err) => {
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
           }
@@ -900,7 +900,7 @@ export default {
     getMenu() {
       util
         .ajax({ url: this.action })
-        .then(res => {
+        .then((res) => {
           if (res && res.rCode === 0) {
             this.menus = JSON.parse(JSON.stringify(res.results));
             if (
@@ -927,7 +927,7 @@ export default {
             this.$message.error(msg);
           }
         })
-        .catch(err => {
+        .catch((err) => {
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
           }
@@ -936,7 +936,7 @@ export default {
     //遍历设置菜单气泡提醒
     setTips(obj) {
       if (Array.isArray(obj)) {
-        obj.forEach(item => {
+        obj.forEach((item) => {
           this.setTips(item);
         });
       } else {
@@ -946,7 +946,7 @@ export default {
         }
         let flag = false;
         if (obj.children && obj.children.length) {
-          obj.children.forEach(item => {
+          obj.children.forEach((item) => {
             if (this.setTips(item)) {
               flag = true;
             }
@@ -956,7 +956,7 @@ export default {
             return true;
           }
         } else if (obj.fourthTabs && obj.fourthTabs.length) {
-          obj.fourthTabs.forEach(item => {
+          obj.fourthTabs.forEach((item) => {
             if (this.setTips(item)) {
               flag = true;
             }
@@ -1143,7 +1143,7 @@ export default {
         } else {
           this.tabs = obj.fourthTabs;
           if (obj.url) {
-            let tab = obj.fourthTabs.filter(item => {
+            let tab = obj.fourthTabs.filter((item) => {
               return item.url === obj.url;
             })[0];
             if (tab) {
@@ -1268,7 +1268,7 @@ export default {
           if (view.indexOf('.js') > -1) {
             let views = view.split(',');
             let jss = [];
-            views.forEach(item => {
+            views.forEach((item) => {
               jss.push({
                 src:
                   (util.win.path
@@ -1482,7 +1482,7 @@ export default {
             this.active = this.getFirst(node.children[0]);
           } else {
             if (node.url) {
-              let tab = node.fourthTabs.filter(item => {
+              let tab = node.fourthTabs.filter((item) => {
                 return item.url === node.url;
               })[0];
               if (tab) {
@@ -1532,7 +1532,7 @@ export default {
             }
           }
           if (node.url) {
-            let tab = node.fourthTabs.filter(item => {
+            let tab = node.fourthTabs.filter((item) => {
               return item.url === node.url;
             })[0];
             if (tab) {
@@ -1749,7 +1749,7 @@ export default {
     handleListener() {
       util.win.addEventListener(
         'message',
-        function(e) {
+        function (e) {
           var msg = e.data;
           if (msg.key == 'jump_Menu') {
             let res = msg.data1;
@@ -1771,7 +1771,7 @@ export default {
         this.websocket = new SockJS(url);
       }
 
-      if (!this.console) {
+      if (!this.console && this.client) {
         this.client.debug = null;
       }
       this.handleConnect(this.client);
@@ -1782,7 +1782,7 @@ export default {
         () => {
           //localStorage.setItem("socket",true);
           //订阅服务端的
-          client.subscribe(topic, response => {
+          client.subscribe(topic, (response) => {
             let res = JSON.parse(response.body);
             let data = res.data;
             for (let i in data) {
@@ -1809,7 +1809,7 @@ export default {
             }
           });
         },
-        error => {
+        (error) => {
           console.log('webSocket连接失败');
           if (this.connect < 10 && !util.getStorage('timer')) {
             this.handleConnect(client);
@@ -1898,7 +1898,7 @@ export default {
             }
           }
         })
-        .catch(e => {});
+        .catch((e) => {});
     },
     openPage(url, name, width, height) {
       let src = url;

package/packages/upload/src/main.vue

@@ -640,7 +640,7 @@ export default {
             data: { code: this.code },
             params: { code: this.code }
           })
-          .then(res => {
+          .then((res) => {
             if (res.rCode === 0) {
               if (res.results) {
                 this.excludeNames = res.results.excludeName;
@@ -655,7 +655,7 @@ export default {
               }
             }
           })
-          .catch(err => {
+          .catch((err) => {
             if (err.message && err.message !== 'canceled') {
               this.$message.error(err.message);
             }
@@ -663,6 +663,7 @@ export default {
       }
     },
     getFiles(params) {
+      console.log(111, params);
       if (
         !this.show ||
         (this.isRequiredOwnId &&
@@ -678,7 +679,7 @@ export default {
           params: params,
           format: false
         })
-        .then(res => {
+        .then((res) => {
           if (res.rCode === 0) {
             if (this.portrait === true) {
               this.image = JSON.parse(JSON.stringify(res.results))[0];
@@ -691,7 +692,7 @@ export default {
             this.$message.error(msg);
           }
         })
-        .catch(err => {
+        .catch((err) => {
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
           }
@@ -858,7 +859,7 @@ export default {
                       id: file.adjunctId || file.response.adjunctId
                     }
                   })
-                  .then(res => {
+                  .then((res) => {
                     if (res.rCode === 0) {
                       this.$message.success(res.msg);
                       resolve();
@@ -868,7 +869,7 @@ export default {
                       reject();
                     }
                   })
-                  .catch(err => {
+                  .catch((err) => {
                     if (err.message && err.message !== 'canceled') {
                       this.$message.error(err.message);
                     }
@@ -930,7 +931,7 @@ export default {
         if (this.onSort) {
           this.onSort(files);
         } else {
-          let ids = files.map(item => {
+          let ids = files.map((item) => {
             if (item.status === 'success') {
               return item.adjunctId || item.response.adjunctId;
             }
@@ -947,7 +948,7 @@ export default {
                 ids: ids
               }
             })
-            .then(res => {
+            .then((res) => {
               if (res.rCode === 0) {
                 this.$message.success(res.msg);
               } else {
@@ -955,7 +956,7 @@ export default {
                 this.$message.error(msg);
               }
             })
-            .catch(err => {
+            .catch((err) => {
               if (err.message && err.message !== 'canceled') {
                 this.$message.error(err.message);
               }

package/src/index.js

@@ -115,7 +115,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.4.14',
+  version: '0.4.17',
   install,
   Button,
   ButtonGroup,

package/src/utils/util.js

@@ -37,9 +37,9 @@ import { MessageBox, Loading } from 'eoss-element';
  * @param {String} [host] - host
  * @param {Object} [data] - 请求参数
  * @param {Object} [params] - 请求参数
- * @param {Boolean} [format] - post请求是否使用表单类型
- * @param {Boolean} [mix] - 是否混合传参
- * @param {Boolean} [defaults] - 是否传入默认参数userId
+ * @param {Boolean} [format = true] - post请求是否使用表单类型
+ * @param {Boolean} [mix = false] - 是否混合传参
+ * @param {Boolean} [defaults = false] - 是否传入默认参数userId
  * @param {Object} [loading] - loading加载对象
  **/
 // 请求
@@ -1426,10 +1426,23 @@ const isLogged = function ({
   } else {
     const token = getStorage('token') || getStorage('Authorization');
     if (
-      Object.prototype.hasOwnProperty.call(to.query, 'serverId') &&
+      !token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') &&
       Object.prototype.hasOwnProperty.call(to.query, 'authType')
     ) {
-      const url = win.top.location.href;
+      let url = win.top.location.href;
+      if (to.query.openType) {
+        switch (to.query.openType) {
+          case 'self':
+            url = win.location.href;
+            break;
+          case 'blank':
+            url = win.location.href;
+            break;
+          case 'parent':
+            url = win.parent.location.href;
+            break;
+        }
+      }
       ajax({
         method: 'post',
         url: authCenter,