eoss-ui 0.5.98 → 0.6.0

package/lib/wujie.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 69);
+/******/ 	return __webpack_require__(__webpack_require__.s = 70);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -3768,7 +3768,150 @@ module.exports = require("json-bigint");
 
 /***/ }),
 
-/***/ 69:
+/***/ 7:
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony import */ var sockjs_client__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(8);
+/* harmony import */ var sockjs_client__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(sockjs_client__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var stompjs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(9);
+/* harmony import */ var stompjs__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(stompjs__WEBPACK_IMPORTED_MODULE_1__);
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+
+
+
+var WebSocket = function () {
+  // 构造函数
+  function WebSocket() {
+    _classCallCheck(this, WebSocket);
+
+    this.host = sessionStorage.getItem('wshost') || '';
+    this.tryTimes = 1; // 重连次数
+    this.callback = null; // 回调函数
+    this.client = null; // stomp对象
+    this.reconTimeout = null; // 重连延时器
+    this.debug = true; // 调试
+    this.interval = 20; // 重连间隔时间
+    this.vm = null;
+    this.nextDate = 0;
+    this.connects = 1;
+    this.recon = false;
+    this.sendTimeout = null;
+    this.socket = null;
+    this.subscription = null;
+  }
+
+  /** socket连接 */
+
+
+  WebSocket.prototype.connect = function connect() {
+    var _this = this;
+
+    if (!this.client) {
+      // 连接SockJS
+      this.socket = new sockjs_client__WEBPACK_IMPORTED_MODULE_0___default.a(this.host + this.url, { timeout: 60000 });
+      this.client = stompjs__WEBPACK_IMPORTED_MODULE_1___default.a.over(this.socket);
+    }
+
+    // 日志不打印
+    if (!this.debug) {
+      this.client.debug = function () {};
+    }
+
+    // 向服务器发起websocket连接
+    this.client.connect({}, function () {
+      _this.recon = true;
+      // tryTimes定义重置
+      _this.connects = 1;
+      // 订阅消息
+      _this.subscribe();
+    }, function (error) {
+      _this.unsubscribe();
+      _this.client = null;
+      var diffSecond = parseInt((new Date() - _this.nextDate) / 1000, 10);
+      if (_this.connects > 5 && diffSecond < _this.interval) {
+        _this.error && _this.error(error);
+      } else {
+        _this.reconTimeout = setTimeout(function () {
+          _this.connect();
+          _this.connects++;
+        }, 5000);
+      }
+    });
+  }; // 清除订阅
+
+
+  WebSocket.prototype.unsubscribe = function unsubscribe() {
+    if (this.subscription) {
+      this.subscription.unsubscribe();
+      this.subscription = null;
+    }
+  };
+  /** 订阅服务端 */
+
+
+  WebSocket.prototype.subscribe = function subscribe() {
+    var _this2 = this;
+
+    // 订阅服务端提供的某个topic
+    this.subscription = this.client.subscribe(this.take, function (response) {
+      if (response && (_this2.callback || _this2.success)) {
+        var callback = _this2.callback || _this2.success;
+        callback(JSON.parse(response.body));
+      }
+    });
+  };
+
+  /** 赋值、初始化socket */
+
+
+  WebSocket.prototype.init = function init(option, vm) {
+    for (var i in option) {
+      this[i] = option[i];
+    }
+    this.vm = vm;
+    // 初始化连接
+    this.connect();
+  };
+
+  /** 发送消息 */
+
+
+  WebSocket.prototype.send = function send(data) {
+    var _this3 = this;
+
+    if (this.recon) {
+      clearTimeout(this.sendTimeout);
+      this.client.send(this.take, {}, typeof data === 'string' ? data : JSON.stringify(data));
+    } else {
+      this.sendTimeout = setTimeout(function () {
+        _this3.send(data);
+      }, 1000);
+    }
+  };
+
+  /** 销毁 */
+
+
+  WebSocket.prototype.destroy = function destroy() {
+    // 断开连接,清除定时器
+    this.unsubscribe();
+    if (this.client) {
+      this.client.disconnect();
+    };
+    this.reconTimeout && clearTimeout(this.reconTimeout);
+    this.sendTimeout && clearTimeout(this.sendTimeout);
+  };
+
+  return WebSocket;
+}();
+
+/* harmony default export */ __webpack_exports__["a"] = (WebSocket);
+
+/***/ }),
+
+/***/ 70:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -4009,149 +4152,6 @@ main.install = function (Vue) {
 
 /***/ }),
 
-/***/ 7:
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony import */ var sockjs_client__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(8);
-/* harmony import */ var sockjs_client__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(sockjs_client__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var stompjs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(9);
-/* harmony import */ var stompjs__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(stompjs__WEBPACK_IMPORTED_MODULE_1__);
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-
-
-
-var WebSocket = function () {
-  // 构造函数
-  function WebSocket() {
-    _classCallCheck(this, WebSocket);
-
-    this.host = sessionStorage.getItem('wshost') || '';
-    this.tryTimes = 1; // 重连次数
-    this.callback = null; // 回调函数
-    this.client = null; // stomp对象
-    this.reconTimeout = null; // 重连延时器
-    this.debug = true; // 调试
-    this.interval = 20; // 重连间隔时间
-    this.vm = null;
-    this.nextDate = 0;
-    this.connects = 1;
-    this.recon = false;
-    this.sendTimeout = null;
-    this.socket = null;
-    this.subscription = null;
-  }
-
-  /** socket连接 */
-
-
-  WebSocket.prototype.connect = function connect() {
-    var _this = this;
-
-    if (!this.client) {
-      // 连接SockJS
-      this.socket = new sockjs_client__WEBPACK_IMPORTED_MODULE_0___default.a(this.host + this.url, { timeout: 60000 });
-      this.client = stompjs__WEBPACK_IMPORTED_MODULE_1___default.a.over(this.socket);
-    }
-
-    // 日志不打印
-    if (!this.debug) {
-      this.client.debug = function () {};
-    }
-
-    // 向服务器发起websocket连接
-    this.client.connect({}, function () {
-      _this.recon = true;
-      // tryTimes定义重置
-      _this.connects = 1;
-      // 订阅消息
-      _this.subscribe();
-    }, function (error) {
-      _this.unsubscribe();
-      _this.client = null;
-      var diffSecond = parseInt((new Date() - _this.nextDate) / 1000, 10);
-      if (_this.connects > 5 && diffSecond < _this.interval) {
-        _this.error && _this.error(error);
-      } else {
-        _this.reconTimeout = setTimeout(function () {
-          _this.connect();
-          _this.connects++;
-        }, 5000);
-      }
-    });
-  }; // 清除订阅
-
-
-  WebSocket.prototype.unsubscribe = function unsubscribe() {
-    if (this.subscription) {
-      this.subscription.unsubscribe();
-      this.subscription = null;
-    }
-  };
-  /** 订阅服务端 */
-
-
-  WebSocket.prototype.subscribe = function subscribe() {
-    var _this2 = this;
-
-    // 订阅服务端提供的某个topic
-    this.subscription = this.client.subscribe(this.take, function (response) {
-      if (response && (_this2.callback || _this2.success)) {
-        var callback = _this2.callback || _this2.success;
-        callback(JSON.parse(response.body));
-      }
-    });
-  };
-
-  /** 赋值、初始化socket */
-
-
-  WebSocket.prototype.init = function init(option, vm) {
-    for (var i in option) {
-      this[i] = option[i];
-    }
-    this.vm = vm;
-    // 初始化连接
-    this.connect();
-  };
-
-  /** 发送消息 */
-
-
-  WebSocket.prototype.send = function send(data) {
-    var _this3 = this;
-
-    if (this.recon) {
-      clearTimeout(this.sendTimeout);
-      this.client.send(this.take, {}, typeof data === 'string' ? data : JSON.stringify(data));
-    } else {
-      this.sendTimeout = setTimeout(function () {
-        _this3.send(data);
-      }, 1000);
-    }
-  };
-
-  /** 销毁 */
-
-
-  WebSocket.prototype.destroy = function destroy() {
-    // 断开连接,清除定时器
-    this.unsubscribe();
-    if (this.client) {
-      this.client.disconnect();
-    };
-    this.reconTimeout && clearTimeout(this.reconTimeout);
-    this.sendTimeout && clearTimeout(this.sendTimeout);
-  };
-
-  return WebSocket;
-}();
-
-/* harmony default export */ __webpack_exports__["a"] = (WebSocket);
-
-/***/ }),
-
 /***/ 8:
 /***/ (function(module, exports) {
 

package/lib/wxlogin.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 70);
+/******/ 	return __webpack_require__(__webpack_require__.s = 71);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -3911,7 +3911,7 @@ var WebSocket = function () {
 
 /***/ }),
 
-/***/ 70:
+/***/ 71:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.5.98",
+  "version": "0.6.0",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [
@@ -97,7 +97,7 @@
     "cp-cli": "^1.0.2",
     "cross-env": "^3.1.3",
     "css-loader": "^2.1.0",
-    "eoss-element": "^0.3.27",
+    "eoss-element": "^0.3.28",
     "es6-promise": "^4.0.5",
     "eslint": "4.18.2",
     "eslint-config-elemefe": "0.1.1",

package/packages/dialog/src/main.vue

@@ -385,7 +385,7 @@ export default {
         mini: { width: '800px', height: '400px' },
         sm: { width: '960px', height: '500px' },
         md: { width: '1060px', height: '600px' },
-        lg: { width: '1200px', height: '800px' },
+        lg: { width: '1200px', height: availHeight < 800 ? '560px' : '800px' },
         max: { width: `${availWidth}px`, height: `${availHeight}px` },
         full: { width: '100%', height: '100%' }
       },

package/packages/handler/src/main.vue

@@ -222,11 +222,6 @@ export default {
           icon: 'es-icon-home',
           title: '门户'
         },
-        {
-          type: 'new',
-          icon: 'es-icon-tiyanxinban',
-          title: '体验新版'
-        },
         {
           type: 'notice',
           icon: 'es-icon-tongzhi',

package/packages/login/src/main.vue

@@ -1237,6 +1237,7 @@ export default {
       this.wechatScope = res.wechatScope;
       this.download = { ...this.downLoadUrls, ...downloads };
       if (res.sysLogoIco) {
+        localStorage.setItem('sysLogoIco', res.sysLogoIco);
         util.setFavicon(res.sysLogoIco);
       }
     },

package/packages/main/src/default/index.vue

@@ -167,10 +167,11 @@
     </div>
     <settings
       v-bind="$attrs"
+      layout-type="default"
+      :active="layout"
       :theme="color"
       :predefine="themes"
-      :visible.sync="showSet"
-      :layout="layout"
+      :visible.sync="showSets"
       @change="handleChange"
       @layout="handleLayout"
     ></settings>
@@ -208,7 +209,7 @@
 </template>
 <script>
 import userinfo from './userinfo.vue';
-import settings from './settings.vue';
+import settings from '../public/settings.vue';
 import message from './message.vue';
 import notice from './notice.vue';
 import online from '../public/online.vue';
@@ -483,11 +484,10 @@ export default {
         );
       }
       let hides = {
-        set: !this.set,
+        set: !this.showSet,
         index: this.doorIndex ? false : true,
         system: true,
-        home: this.homePage ? false : true,
-        new: this.showNew ? false : true
+        home: this.homePage ? false : true
       };
 
       if (this.layout === 'subsystem' || this.application) {
@@ -541,6 +541,11 @@ export default {
           util.updateTheme(val);
         }
       }
+    },
+    scene(val) {
+      if (val) {
+        this.layout = val.toLowerCase();
+      }
     }
   },
   data() {
@@ -609,7 +614,7 @@ export default {
       //刷新路由
       refresh: true,
       //显示设置面板
-      showSet: false,
+      showSets: false,
       //当前设置的主题
       color: util.getStorage('theme') ? util.getStorage('theme') : this.theme,
       //显示用户信息
@@ -638,7 +643,7 @@ export default {
       hideSubMenu: false,
       doorIndex: '',
       topRightToolHide: '',
-      showNew: this.newVersion
+      showSet: this.set
     };
   },
   created() {
@@ -788,7 +793,7 @@ export default {
     },
     //显示隐藏设置面板
     handleSet() {
-      this.showSet = !this.showSet;
+      this.showSets = !this.showSets;
     },
     setConfig(results) {
       if (this.socket) {
@@ -897,8 +902,8 @@ export default {
           if (results[i].portalPage || results[i].portalpage) {
             this.doorIndex = results[i].portalPage || results[i].portalpage;
           }
-          if (results[i].multipleVersion || results[i].newVersion) {
-            this.showNew = results[i].newVersion ? results[i].newVersion : true;
+          if (results[i].multipleVersion) {
+            this.showSet = true;
           }
           if (results[i].topRightToolHide) {
             this.topRightToolHide = results[i].topRightToolHide;
@@ -1122,6 +1127,13 @@ export default {
     },
     //获取应用导航菜单
     getMenu() {
+      const menuData = store.get('nav');
+      if (menuData && menuData.length) {
+        this.menus = JSON.parse(JSON.stringify(menuData));
+        this.setTips(this.menus);
+        this.setMenu(this.menus);
+        return;
+      }
       let param = this.menuCode ? { menuCode: this.menuCode } : {};
       let params = { ...this.param, ...param };
       util
@@ -1131,7 +1143,7 @@ export default {
             if (res.results && res.results.length) {
               this.menus = JSON.parse(JSON.stringify(res.results));
               this.setTips(this.menus);
-              store.set('nav', this.menus);
+              store.set('nav', JSON.parse(JSON.stringify(res.results)));
               this.setMenu(this.menus);
             } else {
               this.$message.error('未分配菜单权限，请联系管理员！');
@@ -1713,13 +1725,6 @@ export default {
         case 'set':
           this.handleSet();
           break;
-        case 'new':
-          if (typeof this.showNew === 'string') {
-            window.location.href = this.showNew;
-          } else {
-            this.$emit('chang-layout', 'simplicity');
-          }
-          break;
         case 'goView':
           util.win.open(res.path, '_blank');
           break;
@@ -1883,8 +1888,9 @@ export default {
       }
       return false;
     },
-    handleLayout(res, old) {
-      if (res == old) {
+    handleLayout(layout, res, old) {
+      this.$emit('chang-layout', layout);
+      if (res == old || layout == 'simplicity') {
         return;
       }
       this.layout = res;

package/packages/main/src/main.vue

@@ -2,20 +2,21 @@
   <div class="es-main-box" v-if="isLogin">
     <simplicity
       ref="main"
-      v-if="layout == 'simplicity'"
+      v-if="layoutType == 'simplicity'"
       :appCode="appCode"
       :old-version="multiple"
-      @chang-layout="changLayout"
       v-bind="$attrs"
       v-on="$listeners"
+      @chang-layout="changLayout"
     ></simplicity>
     <main-default
       v-else
       :new-version="multiple"
+      :scene="layout"
       v-bind="$attrs"
       ref="main"
-      @chang-layout="changLayout"
       v-on="$listeners"
+      @chang-layout="changLayout"
     ></main-default>
 
     <!-- 公用弹窗 -->
@@ -63,6 +64,7 @@ export default {
     MainDefault
   },
   props: {
+    scene: String,
     launch: Boolean,
     type: String,
     launchImage: {
@@ -97,13 +99,14 @@ export default {
       dialogs: [],
       visibles: [],
       isLogin: false,
-      layout: this.type
+      layoutType: this.type,
+      layout: this.scene
     };
   },
   created() {
     const layoutType = localStorage.getItem('layoutType');
     if (layoutType) {
-      this.layout = layoutType;
+      this.layoutType = layoutType;
     }
     this.params = util.getParams() || {};
     this.sysCode = this.params.sysCode;
@@ -170,9 +173,12 @@ export default {
      * @author huangbo
      * @date 2024年9月7日
      **/
-    changLayout(res) {
-      this.layout = res;
+    changLayout(res, active) {
+      this.layoutType = res;
       localStorage.setItem('layoutType', res);
+      if (active) {
+        this.layout = active;
+      }
     },
     /**
      * @desc:重新登录