eoss-ui 0.4.98 → 0.5.10

package/packages/form/src/main.vue

@@ -369,6 +369,12 @@
                         v-model="models[item.name]"
                         :plain="item.plain || item.name === undefined"
                         :readonly="readonly ? readonly : item.readonly"
+                        v-on="
+                          handleExclAttribute({
+                            data: item.events,
+                            attrs: 'change'
+                          })
+                        "
                         @change="
                           (val) => {
                             handleChange(item, val);
@@ -459,6 +465,12 @@
                         btn-size="medium"
                         :readonly="readonly ? readonly : item.readonly"
                         :rules="item.rules"
+                        v-on="
+                          handleExclAttribute({
+                            data: item.events,
+                            attrs: 'change'
+                          })
+                        "
                         @change="
                           (val) => {
                             handleChange(item, val);
@@ -473,6 +485,12 @@
                         v-else-if="item.type == 'selector'"
                         :readonly="readonly ? readonly : item.readonly"
                         :plain="item.plain || item.name === undefined"
+                        v-on="
+                          handleExclAttribute({
+                            data: item.events,
+                            attrs: 'change'
+                          })
+                        "
                         @change="
                           (val) => {
                             handleChange(item, val);
@@ -1387,6 +1405,12 @@
                     v-model="models[item.name]"
                     :readonly="readonly ? readonly : item.readonly"
                     :rules="item.rules"
+                    v-on="
+                      handleExclAttribute({
+                        data: item.events,
+                        attrs: 'change'
+                      })
+                    "
                     @change="
                       (val) => {
                         handleChange(item, val);
@@ -1401,6 +1425,12 @@
                     v-else-if="item.type === 'selector'"
                     :readonly="readonly ? readonly : item.readonly"
                     :plain="item.plain || item.name === undefined"
+                    v-on="
+                      handleExclAttribute({
+                        data: item.events,
+                        attrs: 'change'
+                      })
+                    "
                     @change="
                       (val) => {
                         handleChange(item, val);
@@ -2357,6 +2387,12 @@
                       v-model="models[item.name]"
                       :readonly="readonly ? readonly : item.readonly"
                       :rules="item.rules"
+                      v-on="
+                        handleExclAttribute({
+                          data: item.events,
+                          attrs: 'change'
+                        })
+                      "
                       @change="
                         (val) => {
                           handleChange(item, val);
@@ -2364,13 +2400,24 @@
                       "
                     ></es-upload>
                     <es-selector
+                      v-else-if="item.type == 'selector'"
                       v-bind="
                         handleExclAttribute({ data: item, attrs: ['value'] })
                       "
                       v-model="models[item.name]"
                       :readonly="readonly ? readonly : item.readonly"
                       :plain="item.plain || item.name === undefined"
-                      v-else-if="item.type == 'selector'"
+                      v-on="
+                        handleExclAttribute({
+                          data: item.events,
+                          attrs: 'change'
+                        })
+                      "
+                      @change="
+                        (val) => {
+                          handleChange(item, val);
+                        }
+                      "
                     ></es-selector>
                     <template v-else-if="item.type === 'table'">
                       <es-data-table-form
@@ -3233,6 +3280,12 @@
                   v-model="models[item.name]"
                   :readonly="readonly ? readonly : item.readonly"
                   :rules="item.rules"
+                  v-on="
+                    handleExclAttribute({
+                      data: item.events,
+                      attrs: 'change'
+                    })
+                  "
                   @change="
                     (val) => {
                       handleChange(item, val);
@@ -3245,6 +3298,12 @@
                   v-else-if="item.type == 'selector'"
                   :readonly="readonly ? readonly : item.readonly"
                   :plain="item.plain || item.name === undefined"
+                  v-on="
+                    handleExclAttribute({
+                      data: item.events,
+                      attrs: 'change'
+                    })
+                  "
                   @change="
                     (val) => {
                       handleChange(item, val);

package/packages/form/src/table.vue

@@ -407,6 +407,12 @@
                       v-else-if="item.type == 'selector'"
                       :readonly="readonly ? readonly : item.readonly"
                       :plain="item.plain"
+                      v-on="
+                        handleExclAttribute({
+                          data: item.events,
+                          attrs: 'change'
+                        })
+                      "
                       @change="
                         (val) => {
                           handleChange(item, val);

package/packages/login/src/main.vue

@@ -764,6 +764,7 @@ export default {
   },
   mounted() {
     this.getRemember();
+    delete util.win.websocket;
   },
   methods: {
     doWechatLogin(code) {

package/packages/main/src/main.vue

@@ -258,19 +258,20 @@ import {
   updateUserCustomInfo,
   getComplexApplications,
   getComplexApplicationsNew,
-  mainDetail,
-  wss,
-  topic
+  mainDetail
 } from 'eoss-ui/src/config/api.js';
 import store from 'eoss-ui/src/utils/store';
 import util from 'eoss-ui/src/utils/util';
-import SockJS from 'sockjs-client';
-import Stomp from 'stompjs';
 const isIE = navigator.userAgent.indexOf('MSIE') != -1;
 const log = util.getParams('console');
 export default {
   name: 'EsMain',
   inheritAttrs: false,
+  provide() {
+    return {
+      esMain: this
+    };
+  },
   components: {
     userinfo,
     settings,
@@ -539,8 +540,7 @@ export default {
         copyright: { comp: '', data: {} }
       },
       pageLoading: false,
-      client: null,
-      websocket: null,
+      close: null,
       connect: 0,
       wjName: 'singlespa',
       menus: '',
@@ -622,12 +622,13 @@ export default {
     };
   },
   created() {
+    let params = util.getParams() || {};
     this.homePage =
       typeof this.loadHomePage === 'string' ? this.loadHomePage : '';
-    this.isHeader = util.getParams('header');
+    this.isHeader = params.header;
     let sysLogoIco = sessionStorage.getItem('sysLogoIco');
     sysLogoIco && util.setFavicon(sysLogoIco);
-    this.isLogin();
+    this.isLogin(params);
   },
   mounted() {
     util.win.reLogin = this.handleReLogin;
@@ -642,8 +643,7 @@ export default {
     util.win.windowOpen = this.openPage;
   },
   methods: {
-    async isLogin() {
-      const query = util.getParams();
+    async isLogin(query) {
       const token =
         util.getStorage('token') || util.getStorage('Authorization');
 
@@ -663,6 +663,7 @@ export default {
       }
       if (
         !token &&
+        query &&
         Object.prototype.hasOwnProperty.call(query, 'serverId') &&
         Object.prototype.hasOwnProperty.call(query, 'authType')
       ) {
@@ -885,7 +886,7 @@ export default {
             this.navIds = ids;
             this.setTitle(ids[0]);
           }
-        } else if (sessionStorage.getItem('jump') && this.history) {
+        } else if (sessionStorage.getItem('jump') && this.isHistory) {
           let ids = this.getId(
             this.menus,
             sessionStorage.getItem('jump'),
@@ -908,7 +909,7 @@ export default {
               this.navIds = ids;
               this.setTitle(ids[0]);
             }
-          } else if (sessionStorage.getItem('jump') && this.history) {
+          } else if (sessionStorage.getItem('jump') && this.isHistory) {
             let ids = this.getId(
               this.menus,
               sessionStorage.getItem('jump'),
@@ -991,21 +992,37 @@ export default {
           this.results[i] = results[i].split(',');
         }
         if (i === 'indexUrl' && this.loadHomePage) {
-          this.homePage =
-            typeof this.loadHomePage === 'string'
-              ? this.loadHomePage
-              : results[i];
-          if (this.isHomePage && this.homePage) {
-            if (this.menus && this.menus.length) {
-              let ids = null;
-              this.homePage && (ids = this.getId(this.menus, this.homePage));
-              if (ids) {
-                this.defaultActive = ids;
-              } else if (this.homePage) {
-                this.handleJump(this.homePage);
+          let applicationid =
+            util.getParams('applicationid') || util.getParams('applicationId');
+          let hash = util.win.location.hash;
+          if (hash) {
+            hash = hash.split('?')[0];
+          }
+          let jump = sessionStorage.getItem('jump');
+          if (
+            !applicationid &&
+            (!jump || !this.isHistory) &&
+            hash === '#/' &&
+            hash === '#/main'
+          ) {
+            this.homePage =
+              typeof this.loadHomePage === 'string'
+                ? this.loadHomePage
+                : results[i];
+            if (this.isHomePage && this.homePage) {
+              if (this.menus && this.menus.length) {
+                let ids = null;
+                this.homePage && (ids = this.getId(this.menus, this.homePage));
+                if (ids) {
+                  this.defaultActive = ids;
+                } else if (this.homePage) {
+                  this.handleJump(this.homePage);
+                }
+                this.setMenu(this.menus);
               }
-              this.setMenu(this.menus);
             }
+          } else if (this.menus && this.menus.length) {
+            this.setMenu(this.menus);
           }
         }
         if (i === 'doorIndex' && results[i]) {
@@ -1091,22 +1108,26 @@ export default {
           }
         });
     },
-    jumpMenu(res, flag) {
+    jumpMenu(res, flag, param) {
+      let option = { url: res, flag: flag, param: param };
+      if (util.isObject(res)) {
+        option = { ...option, ...res };
+      }
       let ids;
-      if (typeof res === 'string') {
-        if (flag) {
-          ids = this.getId(this.menus, res, true);
+      if (typeof option.url === 'string') {
+        if (option.flag) {
+          ids = this.getId(this.menus, option.url, true);
           if (!ids) {
             this.$message.error('未在菜单栏中找到此地址');
             return;
           }
         } else {
-          ids = res.split(',');
+          ids = option.url.split(',');
         }
       } else {
-        ids = res;
+        ids = option.url;
       }
-      this.setDefault(this.menus, ids);
+      this.setDefault(this.menus, ids, option.param);
     },
     getId(arry, res, path) {
       if (!res) {
@@ -1175,7 +1196,7 @@ export default {
                 if (ids) {
                   this.defaultActive = ids;
                 }
-              } else if (sessionStorage.getItem('jump') && this.history) {
+              } else if (sessionStorage.getItem('jump') && this.isHistory) {
                 let ids = this.getId(
                   this.menus,
                   sessionStorage.getItem('jump'),
@@ -1202,7 +1223,7 @@ export default {
                     this.navIds = ids;
                     this.setTitle(ids[0]);
                   }
-                } else if (sessionStorage.getItem('jump') && this.history) {
+                } else if (sessionStorage.getItem('jump') && this.isHistory) {
                   let ids = this.getId(
                     this.menus,
                     sessionStorage.getItem('jump'),
@@ -1369,7 +1390,11 @@ export default {
           this.setTips(item);
         });
       } else {
-        if (Object.prototype.hasOwnProperty.call(obj, 'tips') && obj.tips) {
+        if (
+          obj &&
+          Object.prototype.hasOwnProperty.call(obj, 'tips') &&
+          obj.tips
+        ) {
           this.$set(obj, 'tips', false);
           delete obj.tips;
         }
@@ -1404,12 +1429,12 @@ export default {
       return false;
     },
     //设置默认导航页面
-    setDefault(res, active) {
+    setDefault(res, active, param) {
       this.navIds = JSON.parse(JSON.stringify(active));
       this.sysId = '';
       this.tabsId = '';
       this.active = '';
-      this.getUrl(res, active);
+      this.getUrl(res, active, param);
       if (
         this.layout === 'subsystem' ||
         this.layout === 'subSystem' ||
@@ -1472,18 +1497,18 @@ export default {
       this.showPage = true;
     },
     //获取页面类型及地址
-    getUrl(res, active, index) {
+    getUrl(res, active, index, param) {
       index = index === undefined ? 0 : index;
       for (let i = 0; i < res.length; i++) {
         let item = res[i];
         if (item.id === active[index]) {
           if (index === active.length - 1) {
-            this.handleJump(item.url, item.urlopenmode, item);
+            this.handleJump(item.url, item.urlopenmode, item, param);
             return item.url;
           } else {
             if (item.children && item.children.length) {
               index++;
-              let url = this.getUrl(item.children, active, index);
+              let url = this.getUrl(item.children, active, index, param);
               if (url && index === active.length - 1) {
                 this.tabs = '';
               }
@@ -1491,7 +1516,7 @@ export default {
             }
             if (item.fourthTabs && item.fourthTabs.length) {
               index++;
-              let url = this.getUrl(item.fourthTabs, active, index);
+              let url = this.getUrl(item.fourthTabs, active, index, param);
               if (url) {
                 this.$set(this, 'tabs', item.fourthTabs);
               }
@@ -1499,7 +1524,7 @@ export default {
             }
           }
         } else if (item.children && item.children.length) {
-          this.getUrl(item.children, active, index);
+          this.getUrl(item.children, active, index, param);
         }
       }
       return false;
@@ -1694,7 +1719,7 @@ export default {
         if (res.path !== '/' && pathname == path) {
           return pathname;
         }
-        if (Object.prototype.hasOwnProperty.call(res, 'children')) {
+        if (res && Object.prototype.hasOwnProperty.call(res, 'children')) {
           let path = this.hasRouter(res.children, url);
           if (path) {
             return path;
@@ -1761,7 +1786,8 @@ export default {
       }
     },
     //跳转页面
-    handleJump(page, type, res) {
+    handleJump(page, type, res, param) {
+      console.log(page);
       let prevPage = sessionStorage.getItem('jump');
       sessionStorage.setItem('jump', page);
       if (res) {
@@ -1782,7 +1808,7 @@ export default {
       } else if (type == 3) {
         this.method = 'iframe';
         this.refresh = false;
-        this.page = util.handlerUrl(page);
+        this.page = util.handlerUrl(page, param);
       } else if (page) {
         let urls = page.split('?');
         if (urls[0].indexOf('.js') > 1) {
@@ -1798,12 +1824,12 @@ export default {
         ) {
           this.method = 'iframe';
           this.refresh = false;
-          this.page = util.handlerUrl(page);
+          this.page = util.handlerUrl(page, param);
         } else {
           if (urls[0].indexOf('.html') === -1 && urls[0].indexOf('#/') === -1) {
             this.method = 'iframe';
             this.refresh = false;
-            this.page = util.handlerUrl(page);
+            this.page = util.handlerUrl(page, param);
           } else {
             this.method = 'router';
             const routes = this.$router.options.routes;
@@ -1811,6 +1837,9 @@ export default {
               let path = this.hasRouter(routes, urls[0]);
               if (path) {
                 let params = util.getParams({ url: page });
+                if (param) {
+                  params = { ...params, ...param };
+                }
                 if (res) {
                   this.routerKey = res.id;
                   if (Object.prototype.hasOwnProperty.call(res, 'keepAlive')) {
@@ -1836,7 +1865,7 @@ export default {
                 ) {
                   this.method = 'iframe';
                   this.refresh = false;
-                  this.page = util.handlerUrl(page);
+                  this.page = util.handlerUrl(page, param);
                 } else {
                   this.method = 'wujie';
                   this.wjName =
@@ -1983,55 +2012,46 @@ export default {
     },
     //开启weosocket
     initWebSocket() {
-      //初始化weosocket
-      if (!this.websocket) {
-        const url = (util.getStorage('wshost') || '') + wss;
-        this.websocket = new SockJS(url);
-      }
-      this.client = Stomp.over(this.websocket);
-      if (!this.isConsole && this.client) {
-        this.client.debug = null;
-      }
-      this.handleConnect(this.client);
-    },
-    handleConnect(client) {
-      client.connect(
-        {},
-        () => {
-          //localStorage.setItem("socket",true);
-          //订阅服务端的
-          client.subscribe(topic, (response) => {
-            let res = JSON.parse(response.body);
-            let data = res.data;
-            for (let i in data) {
-              if (data[i] !== null && data[i] !== undefined) {
-                if (i === 'onlineUserNums' && data[i] > 0) {
-                  this.online = data[i];
-                }
-                if (i === 'sysMsgNums') {
-                  this.notice = data[i];
-                  if (this.showMsg) {
-                    this.$refs.message.getMsg(true);
-                  }
-                }
-                if (i === 'menuTipsMap') {
-                  this.menuTips = data[i];
-                }
-                if (i === 'sysMsgList') {
-                  this.sysMsg = data[i];
-                }
-                if (i === 'extraData') {
-                  this.extraData = data[i];
+      util
+        .socket()
+        .then((res, close) => {
+          this.close = close;
+          let data = res.data;
+          for (let i in data) {
+            if (data[i] !== null && data[i] !== undefined) {
+              if (i === 'onlineUserNums' && data[i] > 0) {
+                this.online = data[i];
+              }
+              if (i === 'sysMsgNums') {
+                this.notice = data[i];
+                if (this.showMsg) {
+                  this.$refs.message.getMsg(true);
                 }
               }
+              if (i === 'menuTipsMap') {
+                this.menuTips = data[i];
+              }
+              if (i === 'sysMsgList') {
+                this.sysMsg = data[i];
+              }
+              if (i === 'extraData') {
+                this.extraData = data[i];
+              }
             }
-          });
-        },
-        (error) => {
-          console.log('webSocket连接失败');
-          client.disconnect();
-        }
-      );
+          }
+          if (this.$store) {
+            this.$store.commit('websocket', data);
+          }
+          if (this.$eventBus) {
+            this.$eventBus.$emit('websocket', data);
+          }
+          if (util.win.eventBus) {
+            util.win.eventBus.$emit('websocket', data);
+          }
+        })
+        .catch((err) => {
+          console.log(err);
+        });
     },
     handleOpened(res) {
       if (res === undefined) {
@@ -2166,8 +2186,8 @@ export default {
   },
   beforeDestroy() {
     this.timer = null;
-    if (this.client && this.client.connected) {
-      this.client.disconnect();
+    if (this.close) {
+      this.close();
     }
   }
 };

package/packages/radio-group/src/main.vue

@@ -11,6 +11,7 @@
       v-else
       v-show="display"
       v-model="model"
+      :value-key="valueKey"
       v-bind="$attrs"
       v-on="$listeners"
     >

package/packages/upload/src/main.vue

@@ -810,7 +810,6 @@ export default {
           host += this.host;
         }
       }
-      console.log(host);
       let url = encodeURIComponent(
         Base64.encode(
           host +

package/src/index.js

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