eoss-ui 0.4.39 → 0.4.41

package/lib/handle-user.js

@@ -1403,7 +1403,7 @@ var isFunction = function isFunction(obj) {
 };
 
 /**
- * isLogged
+ * isLogined
  * @desc:是否登录（用于路由守卫中）
  * @author huangbo
  * @date 2022年5月7日
@@ -1416,7 +1416,9 @@ var isFunction = function isFunction(obj) {
  * @param {sting} [loginPage] - 第三方登录页面地址
  * @param {boolean} [redirect] - 是否重定向（用于新脚手架）
  **/
-var isLogged = function isLogged(_ref8) {
+var isLogined = function isLogined(_ref8) {
+  var _this = this;
+
   var to = _ref8.to,
       from = _ref8.from,
       next = _ref8.next,
@@ -1460,16 +1462,18 @@ var isLogged = function isLogged(_ref8) {
         data: to.query
       }).then(function (res) {
         if (res.rCode === 0) {
-          switch (res.results.statusCode) {
+          var results = res.results;
+
+          switch (results.statusCode) {
             case 0:
               var storage = getStorage('storage');
               setStorage({
                 type: storage,
                 key: {
-                  ssId: res.results.ssId,
-                  token: res.results.token,
-                  Authorization: res.results.token,
-                  deviceUnique: res.results.deviceUnique
+                  ssId: results.ssId,
+                  token: results.token,
+                  Authorization: results.token,
+                  deviceUnique: results.deviceUnique
                 }
               });
               next();
@@ -1479,7 +1483,7 @@ var isLogged = function isLogged(_ref8) {
             case 2:
               break;
             case 3:
-              var href = res.results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(url));
+              var href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(url));
               if (to.query.openType) {
                 switch (to.query.openType) {
                   case 'self':
@@ -1503,6 +1507,25 @@ var isLogged = function isLogged(_ref8) {
                 }
               }
               break;
+            case 4:
+              _this.$alert(results.msg ? results.msg : '账号未绑定，账号密码登录后自动绑定！', '提示', {
+                confirmButtonText: '确定',
+                type: 'error'
+              }).then(function () {
+                sessionStorage.setItem('extUserBindHandleId', results.extUserBindHandleId);
+                window.location.href = delUrlParam({ key: 'code' });
+                if (loginPage) {
+                  win.top.location.replace(loginPage);
+                } else if (document.referrer) {
+                  win.top.location.replace(document.referrer);
+                } else if (win.top.location.href.indexOf('main.html') > -1) {
+                  win.top.location.href = './login.html';
+                } else {
+                  next('/login');
+                }
+              }).catch(function (e) {});
+              break;
+            default:
           }
         } else {
           if (token) {
@@ -1531,6 +1554,9 @@ var isLogged = function isLogged(_ref8) {
     }
   }
 };
+var isLogged = function isLogged(res) {
+  isLogined(res);
+};
 
 /**
  * isObject
@@ -2182,6 +2208,7 @@ var watermark = function watermark(option) {
   indexOfObj: indexOfObj,
   isFunction: isFunction,
   isLogged: isLogged,
+  isLogined: isLogined,
   isObject: isObject,
   jointUrl: jointUrl,
   loadJs: loadJs,

package/lib/handler.js

@@ -1403,7 +1403,7 @@ var isFunction = function isFunction(obj) {
 };
 
 /**
- * isLogged
+ * isLogined
  * @desc:是否登录（用于路由守卫中）
  * @author huangbo
  * @date 2022年5月7日
@@ -1416,7 +1416,9 @@ var isFunction = function isFunction(obj) {
  * @param {sting} [loginPage] - 第三方登录页面地址
  * @param {boolean} [redirect] - 是否重定向（用于新脚手架）
  **/
-var isLogged = function isLogged(_ref8) {
+var isLogined = function isLogined(_ref8) {
+  var _this = this;
+
   var to = _ref8.to,
       from = _ref8.from,
       next = _ref8.next,
@@ -1460,16 +1462,18 @@ var isLogged = function isLogged(_ref8) {
         data: to.query
       }).then(function (res) {
         if (res.rCode === 0) {
-          switch (res.results.statusCode) {
+          var results = res.results;
+
+          switch (results.statusCode) {
             case 0:
               var storage = getStorage('storage');
               setStorage({
                 type: storage,
                 key: {
-                  ssId: res.results.ssId,
-                  token: res.results.token,
-                  Authorization: res.results.token,
-                  deviceUnique: res.results.deviceUnique
+                  ssId: results.ssId,
+                  token: results.token,
+                  Authorization: results.token,
+                  deviceUnique: results.deviceUnique
                 }
               });
               next();
@@ -1479,7 +1483,7 @@ var isLogged = function isLogged(_ref8) {
             case 2:
               break;
             case 3:
-              var href = res.results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(url));
+              var href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(url));
               if (to.query.openType) {
                 switch (to.query.openType) {
                   case 'self':
@@ -1503,6 +1507,25 @@ var isLogged = function isLogged(_ref8) {
                 }
               }
               break;
+            case 4:
+              _this.$alert(results.msg ? results.msg : '账号未绑定，账号密码登录后自动绑定！', '提示', {
+                confirmButtonText: '确定',
+                type: 'error'
+              }).then(function () {
+                sessionStorage.setItem('extUserBindHandleId', results.extUserBindHandleId);
+                window.location.href = delUrlParam({ key: 'code' });
+                if (loginPage) {
+                  win.top.location.replace(loginPage);
+                } else if (document.referrer) {
+                  win.top.location.replace(document.referrer);
+                } else if (win.top.location.href.indexOf('main.html') > -1) {
+                  win.top.location.href = './login.html';
+                } else {
+                  next('/login');
+                }
+              }).catch(function (e) {});
+              break;
+            default:
           }
         } else {
           if (token) {
@@ -1531,6 +1554,9 @@ var isLogged = function isLogged(_ref8) {
     }
   }
 };
+var isLogged = function isLogged(res) {
+  isLogined(res);
+};
 
 /**
  * isObject
@@ -2182,6 +2208,7 @@ var watermark = function watermark(option) {
   indexOfObj: indexOfObj,
   isFunction: isFunction,
   isLogged: isLogged,
+  isLogined: isLogined,
   isObject: isObject,
   jointUrl: jointUrl,
   loadJs: loadJs,

package/lib/icons.js

@@ -192,7 +192,7 @@ function normalizeComponent(
 
 /***/ }),
 
-/***/ 21:
+/***/ 20:
 /***/ (function(module) {
 
 module.exports = JSON.parse("[\"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\"]");
@@ -321,7 +321,7 @@ render._withStripped = true
 // CONCATENATED MODULE: ./packages/icons/src/main.vue?vue&type=template&id=32c03886&
 
 // EXTERNAL MODULE: ./packages/icons/src/icon.json
-var icon = __webpack_require__(21);
+var icon = __webpack_require__(20);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/icons/src/main.vue?vue&type=script&lang=js&
 //