eoss-ui 0.4.40 → 0.4.41

package/lib/date-picker.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/dialog.js

@@ -1402,7 +1402,7 @@ var isFunction = function isFunction(obj) {
 };
 
 /**
- * isLogged
+ * isLogined
  * @desc:是否登录（用于路由守卫中）
  * @author huangbo
  * @date 2022年5月7日
@@ -1415,7 +1415,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,
@@ -1459,16 +1461,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();
@@ -1478,7 +1482,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':
@@ -1502,6 +1506,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) {
@@ -1530,6 +1553,9 @@ var isLogged = function isLogged(_ref8) {
     }
   }
 };
+var isLogged = function isLogged(res) {
+  isLogined(res);
+};
 
 /**
  * isObject
@@ -2181,6 +2207,7 @@ var watermark = function watermark(option) {
   indexOfObj: indexOfObj,
   isFunction: isFunction,
   isLogged: isLogged,
+  isLogined: isLogined,
   isObject: isObject,
   jointUrl: jointUrl,
   loadJs: loadJs,
@@ -2700,13 +2727,13 @@ module.exports = require("vue");
 /* 16 */,
 /* 17 */,
 /* 18 */,
-/* 19 */,
-/* 20 */
+/* 19 */
 /***/ (function(module, exports) {
 
 module.exports = require("wujie-vue2");
 
 /***/ }),
+/* 20 */,
 /* 21 */,
 /* 22 */,
 /* 23 */,
@@ -2734,7 +2761,7 @@ module.exports = require("wujie-vue2");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/dialog/src/main.vue?vue&type=template&id=0fe85ebd&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/dialog/src/main.vue?vue&type=template&id=7f267c7b&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -2788,7 +2815,7 @@ var render = function () {
                               _vm._b(
                                 {
                                   key: index,
-                                  attrs: { zoom: _vm.zoom, model: item.model },
+                                  attrs: { model: item.model },
                                   on: {
                                     "update:model": function ($event) {
                                       _vm.$set(item, "model", $event)
@@ -2811,7 +2838,7 @@ var render = function () {
                             "es-data-table",
                             _vm._g(
                               _vm._b(
-                                { key: index, attrs: { zoom: _vm.zoom } },
+                                { key: index },
                                 "es-data-table",
                                 _vm.handleExclAttribute({
                                   data: item,
@@ -2912,7 +2939,7 @@ var render = function () {
                             "es-tree-group",
                             _vm._g(
                               _vm._b(
-                                { key: index, attrs: { zoom: _vm.zoom } },
+                                { key: index },
                                 "es-tree-group",
                                 _vm.handleExclAttribute({
                                   data: item,
@@ -2946,10 +2973,7 @@ var render = function () {
                             "es-tabs",
                             _vm._g(
                               _vm._b(
-                                {
-                                  key: index,
-                                  attrs: { full: true, zoom: _vm.zoom },
-                                },
+                                { key: index, attrs: { full: true } },
                                 "es-tabs",
                                 _vm.handleExclAttribute({
                                   data: item,
@@ -3033,10 +3057,7 @@ var render = function () {
                         _vm._g(
                           _vm._b(
                             {
-                              attrs: {
-                                zoom: _vm.zoom,
-                                model: _vm.contents.model,
-                              },
+                              attrs: { model: _vm.contents.model },
                               on: {
                                 "update:model": function ($event) {
                                   _vm.$set(_vm.contents, "model", $event)
@@ -3060,7 +3081,7 @@ var render = function () {
                         "es-data-table",
                         _vm._g(
                           _vm._b(
-                            { attrs: { zoom: _vm.zoom } },
+                            {},
                             "es-data-table",
                             _vm.handleExclAttribute({
                               data: _vm.contents,
@@ -3163,7 +3184,7 @@ var render = function () {
                         "es-tree-group",
                         _vm._g(
                           _vm._b(
-                            { attrs: { zoom: _vm.zoom } },
+                            {},
                             "es-tree-group",
                             _vm.handleExclAttribute({
                               data: _vm.contents,
@@ -3181,7 +3202,7 @@ var render = function () {
                         "es-flow-group",
                         _vm._g(
                           _vm._b(
-                            { attrs: { zoom: _vm.zoom } },
+                            {},
                             "es-flow-group",
                             _vm.handleExclAttribute({
                               data: _vm.contents,
@@ -3198,7 +3219,7 @@ var render = function () {
                         "es-tabs",
                         _vm._g(
                           _vm._b(
-                            { attrs: { full: true, zoom: _vm.zoom } },
+                            { attrs: { full: true } },
                             "es-tabs",
                             _vm.handleExclAttribute({
                               data: _vm.contents,
@@ -3254,14 +3275,14 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/dialog/src/main.vue?vue&type=template&id=0fe85ebd&
+// CONCATENATED MODULE: ./packages/dialog/src/main.vue?vue&type=template&id=7f267c7b&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(9);
 var regenerator_default = /*#__PURE__*/__webpack_require__.n(regenerator_);
 
 // EXTERNAL MODULE: external "wujie-vue2"
-var external_wujie_vue2_ = __webpack_require__(20);
+var external_wujie_vue2_ = __webpack_require__(19);
 var external_wujie_vue2_default = /*#__PURE__*/__webpack_require__.n(external_wujie_vue2_);
 
 // EXTERNAL MODULE: ./src/utils/util.js
@@ -3540,15 +3561,6 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
 //
 //
 //
-//
-//
-//
-//
-//
-//
-//
-//
-//
 
 
 
@@ -3561,7 +3573,7 @@ var mainvue_type_script_lang_js_bus = external_wujie_vue2_default.a.bus;
   provide: function provide() {
     return {
       esDialog: this,
-      scale: this.zoom
+      scale: this.scales
     };
   },
 
@@ -3661,7 +3673,7 @@ var mainvue_type_script_lang_js_bus = external_wujie_vue2_default.a.bus;
       wd: '',
       ht: '',
       zoom: 1,
-      scale: {}
+      scales: { zoom: 1 }
     };
   },
   created: function created() {
@@ -3806,6 +3818,7 @@ var mainvue_type_script_lang_js_bus = external_wujie_vue2_default.a.bus;
     },
     handleScale: function handleScale(res) {
       this.zoom = res;
+      this.$set(this.scales, 'zoom', res);
       this.$emit('scale', res);
     }
   }