eoss-ui 0.5.93 → 0.5.94

package/lib/toolbar.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 80);
+/******/ 	return __webpack_require__(__webpack_require__.s = 81);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -192,7 +192,7 @@ function normalizeComponent(
 
 /***/ }),
 
-/***/ 80:
+/***/ 81:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/tree-group.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 66);
+/******/ 	return __webpack_require__(__webpack_require__.s = 67);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -3764,7 +3764,7 @@ module.exports = require("json-bigint");
 
 /***/ }),
 
-/***/ 66:
+/***/ 67:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/tree.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 65);
+/******/ 	return __webpack_require__(__webpack_require__.s = 66);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -3771,7 +3771,7 @@ module.exports = require("json-bigint");
 
 /***/ }),
 
-/***/ 65:
+/***/ 66:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/upload.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 35);
+/******/ 	return __webpack_require__(__webpack_require__.s = 36);
 /******/ })
 /************************************************************************/
 /******/ ([
@@ -3954,13 +3954,13 @@ window.__store = store;
 /* 22 */,
 /* 23 */,
 /* 24 */,
-/* 25 */
+/* 25 */,
+/* 26 */
 /***/ (function(module, exports) {
 
 module.exports = require("js-base64");
 
 /***/ }),
-/* 26 */,
 /* 27 */,
 /* 28 */,
 /* 29 */,
@@ -3969,7 +3969,8 @@ module.exports = require("js-base64");
 /* 32 */,
 /* 33 */,
 /* 34 */,
-/* 35 */
+/* 35 */,
+/* 36 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -4392,7 +4393,7 @@ var util = __webpack_require__(0);
 var store = __webpack_require__(12);
 
 // EXTERNAL MODULE: external "js-base64"
-var external_js_base64_ = __webpack_require__(25);
+var external_js_base64_ = __webpack_require__(26);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/main.vue?vue&type=script&lang=js&
 var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };

package/lib/wujie.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 68);
+/******/ 	return __webpack_require__(__webpack_require__.s = 69);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -3764,7 +3764,7 @@ module.exports = require("json-bigint");
 
 /***/ }),
 
-/***/ 68:
+/***/ 69:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/wxlogin.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);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -3764,7 +3764,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";
@@ -3969,149 +4112,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.5.93",
+  "version": "0.5.94",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [

package/packages/form/src/main.vue

@@ -2731,7 +2731,7 @@ export default {
       this.$refs.esForm &&
         this.$refs.esForm.$el.addEventListener('keyup', this.handleEnter);
       setTimeout(() => {
-        this.$refs.scrollbar.update();
+        this.$refs.scrollbar && this.$refs.scrollbar.update();
       }, 3000);
     });
   },

package/packages/login/src/main.vue

@@ -311,7 +311,7 @@
             <slot name="button"></slot>
             <span @click="downloadExe">初次使用请下载一键安装包</span>
           </div>
-          <div class="es-warning" v-if="warning">
+          <div class="es-warning" v-if="warnInfo">
             {{ warnInfo }}
           </div>
         </div>
@@ -371,6 +371,14 @@
     >
       <es-qr-code :content="checkCode" v-if="checkCode"></es-qr-code>
     </es-dialog>
+    <transition name="launch-fade">
+      <div class="es-launch-image" :style="_launchImage" v-show="showLaunch">
+        <p class="es-launch-text es-launch-user-name">{{ userName }}，你好！</p>
+        <p class="es-launch-text es-launch-system-name">
+          欢迎进入{{ sysName }}
+        </p>
+      </div>
+    </transition>
   </div>
 </template>
 <script>
@@ -393,6 +401,7 @@ import {
   doAssistanceQrLogin
 } from 'eoss-ui/src/config/api.js';
 const ceshi = util.getParams('ceshi');
+import { dayImg, nightImg } from 'eoss-ui/src/config/image';
 export default {
   name: 'EsLogin',
   inheritAttrs: false,
@@ -410,6 +419,7 @@ export default {
       type: String,
       default: 'default'
     },
+    launch: Boolean,
     param: {
       type: Object,
       default() {
@@ -598,7 +608,16 @@ export default {
     },
     isScale: Boolean,
     showIosTips: Boolean,
-    safe: Boolean
+    safe: Boolean,
+    launchImage: {
+      type: [String, Object],
+      default() {
+        return {
+          day: dayImg,
+          night: nightImg
+        };
+      }
+    }
   },
   computed: {
     transform() {
@@ -707,6 +726,12 @@ export default {
         (this.passModifyModel.indexOf('6') > -1 ||
           this.passModifyModel.indexOf('11') > -1)
       );
+    },
+    _launchImage() {
+      let img = util.isObject(this.launchImages)
+        ? this.launchImages[this.launchKey]
+        : this.launchImages;
+      return { 'background-image': `url(${img})` };
     }
   },
   watch: {
@@ -831,6 +856,15 @@ export default {
           event.preventDefault();
           return false;
         }
+      },
+      userName: '',
+      launchShow: this.launch,
+      showLaunch: false,
+      launchImages: this.launchImage,
+      launchKey: 'day',
+      launchTime: {
+        type: Number,
+        default: 3000
       }
     };
   },
@@ -851,6 +885,8 @@ export default {
     ]);
   },
   created() {
+    sessionStorage.setItem('launchImage', JSON.stringify(this.launchImages));
+    this.launchKey = 5 < new Date().getHours() < 18 ? 'day' : 'night';
     if (ceshi == 'true' || ceshi == true) {
       this.loginModel = '0';
     }
@@ -1097,9 +1133,10 @@ export default {
       if (res.linuxDownloadUrl) {
         downloads['linux'] = res.linuxDownloadUrl;
       }
+      this.sysName = res.subsystemName;
+      sessionStorage.setItem('sysName', this.sysName);
       this.secret = res.secret;
       this.setup = res.setup;
-      this.sysName = res.subsystemName;
       this.downloadSetup = res.downloadSetup;
       if (res.subsystemName) {
         document.title = res.subsystemName;
@@ -1179,6 +1216,39 @@ export default {
         if (res.subsystemExtend.uosDownloadUrl) {
           downloads.uos = res.subsystemExtend.uosDownloadUrl;
         }
+        if (res.subsystemExtend.warningText) {
+          this.warningText = res.subsystemExtend.warningText;
+        }
+        if (res.subsystemExtend.launchTime) {
+          sessionStorage.setItem('launchTime', res.subsystemExtend.launchTime);
+        }
+        if (res.subsystemExtend.launchImage) {
+          if (!this.launchShow) {
+            this.launchShow = true;
+            setTimeout(
+              () => {
+                this.launchShow = false;
+              },
+              res.subsystemExtend.launchTime
+                ? parseInt(res.subsystemExtend.launchTime)
+                : this.launchTime
+            );
+          }
+          if (
+            res.subsystemExtend.launchImage != 'true' &&
+            res.subsystemExtend.launchImage != true
+          ) {
+            this.launchImages =
+              res.subsystemExtend.launchImage.indexOf('{') > -1 &&
+              res.subsystemExtend.launchImage.indexOf('}') > -1
+                ? JSON.parse(res.subsystemExtend.launchImage)
+                : res.subsystemExtend.launchImage;
+          }
+          sessionStorage.setItem(
+            'launchImage',
+            JSON.stringify(this.launchImages)
+          );
+        }
       }
       this.passModifyModel = res.passModifyModel;
       this.wechatAppid = res.wechatAppid;
@@ -1493,6 +1563,7 @@ export default {
     handleResults(results, type) {
       switch (results.statusCode) {
         case 0:
+          this.userName = results.userName;
           util.setStorage({
             type: this.storage,
             key: {
@@ -1505,26 +1576,52 @@ export default {
               useCaseCodes: results.resourceCodes
             }
           });
-          this.$message({
-            message: '登录成功!',
-            type: 'success',
-            duration: 1500,
-            onClose: () => {
-              if (this.toUrl) {
-                window.location.href = this.toUrl;
-              } else if (results.doorIndex && this.doorIndex) {
-                sessionStorage.setItem('doorIndex', results.doorIndex);
-                localStorage.setItem('isLogined', true);
-                window.location.href = results.doorIndex;
+          if (
+            this.launchShow &&
+            !this.toUrl &&
+            !results.doorIndex &&
+            !this.doorIndex
+          ) {
+            this.$message({
+              message: '登录成功!',
+              type: 'success',
+              duration: 1000
+            });
+            this.showLaunch = true;
+            setTimeout(() => {
+              sessionStorage.setItem('showLaunch', 1);
+              if (window.location.href.indexOf('login.html') > -1) {
+                window.location.href = './main.html';
               } else {
-                if (window.location.href.indexOf('login.html') > -1) {
-                  window.location.href = './main.html';
+                this.$router.push({ name: 'main' });
+              }
+              this.showLaunch = false;
+            }, 3000);
+          } else {
+            if (this.launchShow) {
+              sessionStorage.setItem('launch', this.launchShow);
+            }
+            this.$message({
+              message: '登录成功!',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {
+                if (this.toUrl) {
+                  window.location.href = this.toUrl;
+                } else if (results.doorIndex && this.doorIndex) {
+                  sessionStorage.setItem('doorIndex', results.doorIndex);
+                  localStorage.setItem('isLogined', true);
+                  window.location.href = results.doorIndex;
                 } else {
-                  this.$router.push({ name: 'main' });
+                  if (window.location.href.indexOf('login.html') > -1) {
+                    window.location.href = './main.html';
+                  } else {
+                    this.$router.push({ name: 'main' });
+                  }
                 }
               }
-            }
-          });
+            });
+          }
           break;
         case 2:
           this.$confirm(