eoss-ui 0.5.80 → 0.5.81-beta1

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 = 69);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -1387,7 +1387,7 @@ var getLightness = function getLightness($v, $i, $isLight) {
  * @param {function} callback - 回调函数
  **/
 var getMainConfig = function getMainConfig(callback) {
-  ajax({ url: _config_api__WEBPACK_IMPORTED_MODULE_0__[/* mainConfig */ "eb"] }).then(function (res) {
+  ajax({ url: _config_api__WEBPACK_IMPORTED_MODULE_0__[/* mainConfig */ "fb"] }).then(function (res) {
     if (res && res.rCode === 0) {
       callback(res.results);
     }
@@ -2121,7 +2121,7 @@ var isLogined = function isLogined(_ref8) {
   }
   var quit = getParams('quit') || getParams('logout');
   if (quit) {
-    ajax({ method: 'post', url: _config_api__WEBPACK_IMPORTED_MODULE_0__[/* logout */ "db"] }).then(function (res) {
+    ajax({ method: 'post', url: _config_api__WEBPACK_IMPORTED_MODULE_0__[/* logout */ "eb"] }).then(function (res) {
       if (res.rCode === 0) {
         removeStorage();
       }
@@ -2560,7 +2560,7 @@ var replenish = function replenish(_ref12) {
     while (res.length <= len + precision) {
       res += '0';
     }
-    return parseFloat(res);
+    return res;
   }
   return data;
 };
@@ -3249,8 +3249,8 @@ var watermark = function watermark(option) {
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "l", function() { return doCaLogin; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "p", function() { return doUserLogin; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "n", function() { return doQrLogin; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "db", function() { return logout; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "W", function() { return initLogin; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "eb", function() { return logout; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "X", function() { return initLogin; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ub", function() { return switchUserTo; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "c", function() { return changeImg; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "F", function() { return getLoginCode; });
@@ -3258,19 +3258,19 @@ var watermark = function watermark(option) {
 /* unused harmony export updateCode */
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "G", function() { return getModifyPassCode; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "d", function() { return codeModifyPass; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "bb", function() { return loginModifyPassword; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "cb", function() { return loginModifyPassword; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return authCenter; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "X", function() { return initModifyPassword; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Y", function() { return initModifyPassword; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "q", function() { return doWechatQrLogin; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "R", function() { return getTwoFactorLoginCode; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "o", function() { return doTwoFactorLogin; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Y", function() { return initRetrialAuth; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Z", function() { return initRetrialAuth; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "N", function() { return getRetrialAuthCode; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "pb", function() { return scanCodeRetrialAuth; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "e", function() { return codeRetrialAuth; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "k", function() { return doAssistanceQrLogin; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "eb", function() { return mainConfig; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Z", function() { return initUserSet; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fb", function() { return mainConfig; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ab", function() { return initUserSet; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Xb", function() { return updateUserInfo; });
 /* unused harmony export getUserImgUrl */
 /* unused harmony export getDoorIndex */
@@ -3279,11 +3279,12 @@ var watermark = function watermark(option) {
 /* unused harmony export getApplicationIdArray */
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "B", function() { return getComplexApplications; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "C", function() { return getComplexApplicationsNew; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "S", function() { return getUserAppWithTag; });
 /* unused harmony export getUserCustomInfo */
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Wb", function() { return updateUserCustomInfo; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "vb", function() { return sysMsgPage; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "V", function() { return ignoreSysMsg; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "U", function() { return ignoreAllSysMsg; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "W", function() { return ignoreSysMsg; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "V", function() { return ignoreAllSysMsg; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "A", function() { return getAdjunctProperties; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "bc", function() { return uploads; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Zb", function() { return uploadOnlyOne; });
@@ -3305,9 +3306,9 @@ var watermark = function watermark(option) {
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "v", function() { return findSysCode; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "D", function() { return getDictList; });
 /* unused harmony export findUserBaseInfo */
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "S", function() { return gethelpdoc; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "T", function() { return gethelpdoc; });
 /* unused harmony export getCurrentuser */
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fb", function() { return mainDetail; });
+/* unused harmony export mainDetail */
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Ib", function() { return toStartFlow; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Fb", function() { return tempSave; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "f", function() { return commonOpion; });
@@ -3336,8 +3337,8 @@ var watermark = function watermark(option) {
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Hb", function() { return toSendMsg; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "tb", function() { return sendMsg; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "t", function() { return endFlowHtml; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "T", function() { return handleInfo; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "cb", function() { return loginUserInfo; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "U", function() { return handleInfo; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "db", function() { return loginUserInfo; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "cc", function() { return wss; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Tb", function() { return topic; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "K", function() { return getPresetCustomInfo; });
@@ -3350,7 +3351,7 @@ var watermark = function watermark(option) {
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "hb", function() { return pendedhistoryListJson; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ib", function() { return pressListJson; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "i", function() { return deleteFlow; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ab", function() { return isCanStartSubFlow; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "bb", function() { return isCanStartSubFlow; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Qb", function() { return toTaskUnionExamine; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Db", function() { return taskUnionExamine; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Ob", function() { return toTaskTakeAdvice; });
@@ -3406,6 +3407,7 @@ var getQuickMenuIds = '/main2/main/getQuickMenuIds'; // 获取已绑定的快捷
 var getApplicationIdArray = '/main2/main/getApplicationIdArray'; // 获取应用父id数组
 var getComplexApplications = '/main2/menu/getComplexApplications'; // 获取当前用户菜单; 含页签菜单格式的数据
 var getComplexApplicationsNew = '/main2/menu/getComplexApplicationsNew'; // 获取当前用户应用菜单; 含页签菜单格式的数据
+var getUserAppWithTag = '/sysv3/sysUucApp/getUserAppWithTag'; // 获取应用
 var getUserCustomInfo = '/main2/main/getUserCustomInfo'; // 获取主题样式
 var updateUserCustomInfo = '/main2/main/updateUserCustomInfo'; // 更新主题样式
 // 框架 - 系统消息
@@ -3730,150 +3732,7 @@ module.exports = require("json-bigint");
 
 /***/ }),
 
-/***/ 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:
+/***/ 69:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -4078,6 +3937,149 @@ 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.80",
+  "version": "0.5.81-beta1",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [
@@ -59,7 +59,7 @@
     "js-base64": "^3.7.5",
     "json-bigint": "^1.0.0",
     "net": "^1.0.2",
-    "qrcode": "^1.5.1",
+    "qrcode": "1.5.3",
     "qs": "^6.11.2",
     "runtime-import": "^2.2.1",
     "slate": "^0.100.0",

package/packages/data-table/src/main.vue

@@ -1460,6 +1460,7 @@ export default {
               data: JSON.parse(JSON.stringify(data))
             })
           : data;
+
       if (this.url && this.executeFilter) {
         this.getTableData({ where: this.wheres });
       }

package/packages/handler/src/main.vue

@@ -191,7 +191,9 @@ export default {
       return true;
     },
     onlineList() {
-      return this.useCaseCodes.includes('sys_user_onlineList');
+      return (
+        this.useCaseCodes && this.useCaseCodes.includes('sys_user_onlineList')
+      );
     }
   },
   data() {

package/packages/icon/src/main.vue

@@ -1,16 +1,26 @@
 <template>
-  <i
-    :class="[className, { 'es-pointer': Object.keys(event).length }]"
+  <component
+    :is="tag"
+    :class="[
+      className,
+      { 'es-pointer': Object.keys(event).length, 'es-icon_image': tag == 'img' }
+    ]"
+    :src="tag == 'img' ? url : ''"
     v-on="event"
     v-html="code"
-  >
-  </i>
+  />
 </template>
 <script>
+import util from 'eoss-ui/src/utils/util';
+import { previewAdjunct } from 'eoss-ui/src/config/api.js';
 export default {
   name: 'EsIcon',
   inheritAttrs: false,
   props: {
+    preview: {
+      type: String,
+      default: `${previewAdjunct}?adjunctId=`
+    },
     contents: [Object, String]
   },
   watch: {
@@ -19,13 +29,32 @@ export default {
       deep: true,
       handler(val) {
         if (val) {
-          if (typeof val == 'string') {
-            if (!this.unicode(val)) {
-              this.code = val;
-              this.className = 'es-icon';
+          if (typeof val == 'string' && val) {
+            if (
+              val.indexOf('.jpge') > 1 ||
+              val.indexOf('.jpg') > 1 ||
+              val.indexOf('.gif') > 1 ||
+              val.indexOf('.png') > 1 ||
+              val.indexOf('data:image/jpge;base64') > -1 ||
+              val.indexOf('data:image/jpg;base64') > -1 ||
+              val.indexOf('data:image/gif;base64') > -1 ||
+              val.indexOf('data:image/png;base64') > -1 ||
+              util.startWith(val, ['http', 'https', '/'])
+            ) {
+              this.tag = 'img';
+              this.url = val;
             } else {
-              this.code = '';
-              this.className = val;
+              this.tag = 'i';
+              if (this.unicode(val)) {
+                this.code = '';
+                this.className = val;
+              } else if (util.startWith(val, '&#')) {
+                this.code = val;
+                this.className = 'es-icon';
+              } else {
+                this.tag = 'img';
+                this.url = this.preview + val;
+              }
             }
           } else {
             this.code = val.code;
@@ -38,6 +67,8 @@ export default {
   },
   data() {
     return {
+      tag: 'i',
+      url: '',
       code: '',
       className: '',
       event: {}
@@ -49,7 +80,7 @@ export default {
       if (!res) {
         return false;
       }
-      var reg = new RegExp(/^es-\S+/, 'g');
+      var reg = new RegExp(/^[es-|el-]\S+/, 'g');
       return res.match(reg) ? res.match(reg).length : 0;
     }
   }

package/packages/icons/src/icon.json

@@ -1 +1 @@
-["zuomian","monitor","maximize","pointer-up","pointer-left","pointer-down","tri-down","retrograde","rainfall","caveat","print","alarm","table","duigouquan","bumen","mm","accelerate","quanping","password","qing","kaifa","daoru","piaochongicon","instructions","notice","wifi","tishicuo","minganciguanli","switch-off","switch-on","narrow","yidongduan","web","upload","message","go-back","close","shujutongji","folder","edit","enter","dian","wendu","shangwu","shenbao","magnifier","project-add","xiexian","caidan","tupian","home","yinyu","wenhao","template","daiban","set","zhengwen","cuowu","chenggong","indent","increase","ziliaoku","tuichu","quit","leaf","refresh","statistic","gengduo","lvyou","mail","user","zhishi","weizhi","jinggao","zuzhijigou","xue","fenxiang","jinrong","shanchu","jianhao","jiahao","yinzhang","renyuanqiehuan","gouxuanzhong1","circle","fuxuankuang1","fangkuang","application","wenjianjia","jiaren","xiugai","duanxinguanli","workbench","rizhi","gongwen","qingshi","shiwu","official","baogao","document","wodeyouxiang","ziliaojiaohuan","denglu","podium","fangkuai","xuewei","duoyun","pm","xiajia","huanbao","dunpai","shu","gongzuozheng","more","fenlei","delete","fengsu","bar","yuanqu","duomeiti","youjian","qiye","zuixinzixun","biaoge","omit","diaotou","jiantou-left","jiantou-right","jiantou-up","roles","jiantou-next","chijiuhuacunchu","zhuanhuan","cloudy","form","wuye","tri-up","pointer-right","bianji","tri-right","tri-left","daimaguanli","jiankong","kaifazhong","fujian","bingtu","zhuzhuangtu","lose","rmb","move","xiazai","yiban","laoshi","clear","jinyong","yunxing","weihu","chakan","pifu","ren","gouwuche","loading2","yulan","ziliao","yidong","fenxiang11","kaoqin","change","shidu","portfolio","info","yanjing","laba","camera","xitongxiaoxi","xitongguanli","webduan","wagnz","group","shengqian","jiantou-prev","attention","look","guanzhu","daikuan","tubiao","duigou","star","dayin","xinzeng","reduce","goup","calendar","tree","yingyong","caution","zhuanfa","add","zongtiqixian","daochu","gongwu","ihouse","chilun","weixiu","chengguo","trophy","duiwu","qiehuanjiaose","door","shebei","fangjian","microscope","huaxue","shiyanshianquan","shiyan","qiyexinxi","yewuxinxi","lab","shiyanguanli","yuqing","big-screen","signal-search","database","star-mark","cng","professor","informatization","code","science","price","xunhuan","savings","administration","aid","biao","line","xietong","jingzheng","enterprise","datatable","toubiao","bingdu","keji2","qiyeku5","touzi5","zijinliu","zhishichanquan3","kejifuwu2","zhishichanquan2","zijinanquan","kejifuwu1","geju","yiqingfangkong","kejifuwu","anquanfangkong","shujufuwu","shujuceng","shujugongxiang","flows","setup","shujulian","caiwujianguan","caiwuliushui","mubiaogeju","juxing","fuwuqi","touzijigou","xiezilou","jianzhu","logo","touzhi","zijin","fintech","touzixiangmu","library","touziguanli","zhongda","ziyuan","shujutai","shujudongtai","bank","shujuzhongxin","zhongyaomubiao","touzishijian","caiwuguanli","mingzhong","touzishenpi","jingzhenggeju","property","keji","qiyeku","zhongyaojihui","touzilicai","zhishichanquan","touzi","tzz","menu","xiangmushu","pdf","jiazai","gongsi","rise","jbxx","zwxx","jypx","jcgl","ndkh","grjl","shgx","gou","shijian","fukuan","guoji","shoukuan","down","gongzuotai","gaigedongtai","xitongshezhi","relation","zuzhirenshi","kaohepingjia","caiwujiandu","sanzhongyida","mima","xianshi","zhanghao","bangongshi","checked","checke","help","kuoda","banli","xiaoxi","shouqicaidan","shouqicaidan-right","smile","tongzhi","guanji","shuaxin","guiji","tianjiawenjianjia","yunxiazai","del","touzifangan","zongheguanli","sanzhongyida_mian","gongwenguanli1","heguiguanli","jingyingfenxi","txl","diannao","renliziyuan","caiwuxitong","shiwuguanli","shouye","bangongyongpin","sidebar","zhidulashi","log","fawenguanli","huiyiguanli","zuzhishishi","gongwenqianshou","jinxiupeixun","gongwenbao","jiaohuan","daibanshixiang","richeng","tongxunlu","yongche","yanzheng","daibanxinxi","shuben","fanfu","guangbo","shuzhuangtu","bengqiye","tongguo","dengdai","cross","daichuli","zhenggai","shouli","shujuhecha","guanli","paper-file","wenjian","dakaiwenjian","yewu","jiance","jiheguanli","jinru","arrow-right","lingdao","rencai","prev","next","jianpan","qrcode","bohui","homepage","download","gantanhao","dingding","weixin","pad","ios","android","txt","doc","audioo","video","zip","shuru","duanxin","saoma","youxiang","word","excel","fileword","picture","ppt","ca","usb-key","wenjianjiadakai","yingyonglan"]
+["zuomian","monitor","maximize","pointer-up","pointer-left","pointer-down","tri-down","retrograde","rainfall","caveat","print","alarm","table","duigouquan","bumen","mm","accelerate","quanping","password","qing","kaifa","daoru","piaochongicon","instructions","notice","wifi","tishicuo","minganciguanli","switch-off","switch-on","narrow","yidongduan","web","upload","message","go-back","close","shujutongji","folder","edit","enter","dian","wendu","shangwu","shenbao","magnifier","project-add","xiexian","caidan","tupian","yinyu","wenhao","template","daiban","set","zhengwen","cuowu","chenggong","indent","increase","ziliaoku","tuichu","quit","leaf","refresh","statistic","gengduo","lvyou","mail","user","zhishi","weizhi","jinggao","zuzhijigou","xue","fenxiang","jinrong","shanchu","jianhao","jiahao","yinzhang","renyuanqiehuan","gouxuanzhong1","circle","fuxuankuang1","fangkuang","application","wenjianjia","jiaren","xiugai","duanxinguanli","workbench","rizhi","gongwen","qingshi","shiwu","official","baogao","document","wodeyouxiang","ziliaojiaohuan","denglu","podium","fangkuai","xuewei","duoyun","pm","xiajia","huanbao","dunpai","shu","gongzuozheng","more","fenlei","delete","fengsu","bar","yuanqu","duomeiti","youjian","qiye","zuixinzixun","biaoge","omit","diaotou","jiantou-left","jiantou-right","jiantou-up","roles","jiantou-next","chijiuhuacunchu","zhuanhuan","cloudy","form","wuye","tri-up","pointer-right","bianji","tri-right","tri-left","daimaguanli","jiankong","kaifazhong","fujian","bingtu","zhuzhuangtu","lose","rmb","move","xiazai","yiban","laoshi","clear","jinyong","yunxing","weihu","chakan","pifu","ren","gouwuche","loading2","yulan","ziliao","yidong","fenxiang11","kaoqin","change","shidu","portfolio","info","yanjing","laba","camera","xitongxiaoxi","xitongguanli","webduan","wagnz","group","shengqian","jiantou-prev","attention","look","guanzhu","daikuan","tubiao","duigou","star","dayin","xinzeng","reduce","goup","calendar","tree","yingyong","caution","zhuanfa","add","zongtiqixian","daochu","gongwu","ihouse","chilun","weixiu","chengguo","trophy","duiwu","qiehuanjiaose","door","shebei","fangjian","microscope","huaxue","shiyanshianquan","shiyan","qiyexinxi","yewuxinxi","lab","shiyanguanli","yuqing","big-screen","signal-search","database","star-mark","cng","professor","informatization","code","science","price","xunhuan","savings","administration","aid","biao","line","xietong","jingzheng","enterprise","datatable","toubiao","bingdu","keji2","qiyeku5","touzi5","zijinliu","zhishichanquan3","kejifuwu2","zhishichanquan2","zijinanquan","kejifuwu1","geju","yiqingfangkong","kejifuwu","anquanfangkong","shujufuwu","shujuceng","shujugongxiang","flows","setup","shujulian","caiwujianguan","caiwuliushui","mubiaogeju","juxing","fuwuqi","touzijigou","xiezilou","jianzhu","logo","touzhi","zijin","fintech","touzixiangmu","library","touziguanli","zhongda","ziyuan","shujutai","shujudongtai","bank","shujuzhongxin","zhongyaomubiao","touzishijian","caiwuguanli","mingzhong","touzishenpi","jingzhenggeju","property","keji","qiyeku","zhongyaojihui","touzilicai","zhishichanquan","touzi","tzz","menu","xiangmushu","pdf","jiazai","gongsi","rise","jbxx","zwxx","jypx","jcgl","ndkh","grjl","shgx","gou","shijian","fukuan","guoji","shoukuan","down","gongzuotai","gaigedongtai","xitongshezhi","relation","zuzhirenshi","kaohepingjia","caiwujiandu","sanzhongyida","mima","xianshi","zhanghao","bangongshi","checked","checke","help","kuoda","banli","xiaoxi","shouqicaidan","shouqicaidan-right","smile","tongzhi","guanji","shuaxin","guiji","tianjiawenjianjia","yunxiazai","del","touzifangan","zongheguanli","sanzhongyida_mian","gongwenguanli1","heguiguanli","jingyingfenxi","txl","diannao","renliziyuan","caiwuxitong","shiwuguanli","shouye","bangongyongpin","sidebar","zhidulashi","log","fawenguanli","huiyiguanli","zuzhishishi","gongwenqianshou","jinxiupeixun","gongwenbao","jiaohuan","daibanshixiang","richeng","tongxunlu","yongche","yanzheng","daibanxinxi","shuben","fanfu","guangbo","shuzhuangtu","bengqiye","tongguo","dengdai","cross","daichuli","zhenggai","shouli","shujuhecha","guanli","paper-file","wenjian","dakaiwenjian","yewu","jiance","jiheguanli","jinru","arrow-right","lingdao","rencai","prev","next","jianpan","qrcode","bohui","homepage","download","gantanhao","dingding","weixin","pad","ios","android","txt","doc","audioo","video","zip","shuru","duanxin","saoma","youxiang","word","excel","fileword","picture","ppt","ca","usb-key","wenjianjiadakai","yingyonglan","home"]

package/packages/login/src/main.vue

@@ -2,6 +2,11 @@
   <div
     v-if="!code"
     class="es-login-screen"
+    :class="{
+      'es-login-medium': size == 'medium',
+      'es-login-small': size == 'small',
+      'es-login-mini': size == 'mini'
+    }"
     :style="getBackground(loginBackgroundImg)"
   >
     <img v-if="loginLogoImg" class="es-login-logo" :src="loginLogoImg" />
@@ -393,6 +398,7 @@ export default {
       type: String,
       default: initLogin
     },
+    size: String,
     mode: {
       type: String,
       default: 'default'
@@ -987,12 +993,12 @@ export default {
     isShow(res) {
       return this.loginModel.indexOf(res) > -1;
     },
-    getLogin() {
+    async getLogin() {
       const config = util.getStorage('initLogin');
       if (config) {
         this.setConfig(config);
       }
-      util
+      await util
         .ajax({ url: this.initLogin })
         .then((res) => {
           if (res && res.rCode === 0) {
@@ -1143,12 +1149,13 @@ export default {
       }
       let data = {};
       let flag = false;
+      let ref = 'login' + this.active;
       if (this.active == 12) {
         if (!this.formData.username) {
-          this.$refs.login.validateField('username');
+          this.$refs[ref].validateField('username');
           return false;
         }
-        this.$refs.login.validateField('username', (res) => {
+        this.$refs[ref].validateField('username', (res) => {
           flag = res != '';
         });
         if (flag) {
@@ -1161,10 +1168,10 @@ export default {
         };
       } else {
         if (!this.formData.target) {
-          this.$refs.login.validateField('target');
+          this.$refs[ref].validateField('target');
           return false;
         }
-        this.$refs.login.validateField('target', (res) => {
+        this.$refs[ref].validateField('target', (res) => {
           flag = res != '';
         });
         if (flag) {
@@ -1442,6 +1449,7 @@ export default {
               if (this.toUrl) {
                 window.location.href = this.toUrl;
               } else if (results.doorIndex && this.doorIndex) {
+                sessionStorage.setItem('doorIndex', results.doorIndex);
                 window.location.href = results.doorIndex;
               } else {
                 if (window.location.href.indexOf('login.html') > -1) {