eoss-ui 0.4.39 → 0.4.41

package/lib/tips.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/tree-group.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,
@@ -2678,7 +2705,7 @@ module.exports = require("json-bigint");
 // 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/tree-group/src/main.vue?vue&type=template&id=37d34f42&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/tree-group/src/main.vue?vue&type=template&id=04a8be9a&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -2846,10 +2873,7 @@ var render = function () {
                   "es-form",
                   _vm._g(
                     _vm._b(
-                      {
-                        ref: _vm.form.ref ? _vm.form.ref : "esForm",
-                        attrs: { zoom: _vm.zoom },
-                      },
+                      { ref: _vm.form.ref ? _vm.form.ref : "esForm" },
                       "es-form",
                       _vm.form,
                       false
@@ -2864,11 +2888,7 @@ var render = function () {
                     _vm._b(
                       {
                         ref: _vm.table.ref ? _vm.table.ref : "esDataTable",
-                        attrs: {
-                          size: "mini",
-                          param: _vm.param,
-                          zoom: _vm.zoom,
-                        },
+                        attrs: { size: "mini", param: _vm.param },
                       },
                       "es-data-table",
                       Object.assign({}, { close: true }, _vm.table),
@@ -2997,7 +3017,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/tree-group/src/main.vue?vue&type=template&id=37d34f42&
+// CONCATENATED MODULE: ./packages/tree-group/src/main.vue?vue&type=template&id=04a8be9a&
 
 // EXTERNAL MODULE: ./src/utils/util.js
 var util = __webpack_require__(0);
@@ -3152,8 +3172,6 @@ var util = __webpack_require__(0);
 //
 //
 //
-//
-//
 
 
 /* harmony default export */ var mainvue_type_script_lang_js_ = ({

package/lib/tree.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/upload.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,
@@ -2657,8 +2684,8 @@ module.exports = require("qs");
 // 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/upload/src/main.vue?vue&type=template&id=7fa5744f&
-var mainvue_type_template_id_7fa5744f_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/main.vue?vue&type=template&id=a8255544&
+var mainvue_type_template_id_a8255544_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -2793,44 +2820,54 @@ var mainvue_type_template_id_7fa5744f_render = function () {
                         }),
                   ]
                 : [
-                    _vm.selectType === "icon-plus"
-                      ? _c("i", {
-                          staticClass: "el-icon-plus es-uploader-icon",
-                        })
-                      : _c(
-                          "el-button",
-                          {
-                            staticClass: "es-upload-button",
-                            class: _vm.icon,
-                            attrs: { type: _vm.selectType, size: _vm.btnSize },
-                          },
-                          [
-                            _vm._v(
-                              _vm._s(
-                                _vm.text
-                                  ? _vm.text
-                                  : _vm.autoUpload
-                                  ? "点击上传"
-                                  : "选择文件"
+                    !_vm.isDisabled
+                      ? [
+                          _vm.selectType === "icon-plus"
+                            ? _c("i", {
+                                staticClass: "el-icon-plus es-uploader-icon",
+                              })
+                            : _c(
+                                "el-button",
+                                {
+                                  staticClass: "es-upload-button",
+                                  class: _vm.icon,
+                                  attrs: {
+                                    type: _vm.selectType,
+                                    size: _vm.btnSize,
+                                  },
+                                },
+                                [
+                                  _vm._v(
+                                    _vm._s(
+                                      _vm.text
+                                        ? _vm.text
+                                        : _vm.autoUpload
+                                        ? "点击上传"
+                                        : "选择文件"
+                                    )
+                                  ),
+                                ]
+                              ),
+                          !_vm.autoUpload
+                            ? _c(
+                                "el-button",
+                                {
+                                  staticClass: "es-upload-button",
+                                  attrs: {
+                                    type: _vm.uploadType,
+                                    size: _vm.btnSize,
+                                  },
+                                  on: {
+                                    click: function ($event) {
+                                      $event.stopPropagation()
+                                      return _vm.handleUpload($event)
+                                    },
+                                  },
+                                },
+                                [_vm._v("\n            上传文件\n          ")]
                               )
-                            ),
-                          ]
-                        ),
-                    !_vm.autoUpload
-                      ? _c(
-                          "el-button",
-                          {
-                            staticClass: "es-upload-button",
-                            attrs: { type: _vm.uploadType, size: _vm.btnSize },
-                            on: {
-                              click: function ($event) {
-                                $event.stopPropagation()
-                                return _vm.handleUpload($event)
-                              },
-                            },
-                          },
-                          [_vm._v("\n          上传文件\n        ")]
-                        )
+                            : _vm._e(),
+                        ]
                       : _vm._e(),
                     _vm.showFileList && _vm.isDownloads
                       ? _c(
@@ -2992,10 +3029,10 @@ var mainvue_type_template_id_7fa5744f_render = function () {
   )
 }
 var staticRenderFns = []
-mainvue_type_template_id_7fa5744f_render._withStripped = true
+mainvue_type_template_id_a8255544_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=7fa5744f&
+// CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=a8255544&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -3186,6 +3223,10 @@ var _props;
 //
 //
 //
+//
+//
+//
+//
 
 
 
@@ -3440,10 +3481,12 @@ var _props;
       return _extends({}, picture, this.picture);
     },
     isRequiredOwnId: function isRequiredOwnId() {
+      if (this.requiredOwnId !== undefined) {
+        return this.requiredOwnId;
+      }
       if (!this.fileList || !this.fileList.length) {
         return true;
       }
-      return this.requiredOwnId;
     },
     show: function show() {
       if (this.photo && typeof this.photo === 'string' || this.value) {
@@ -3950,7 +3993,7 @@ var _props;
           this.$message.success(response.msg);
         }
       }
-      var se = this.filesTotalSize + Math.ceil(file.size / 1024 * 100) / 100;
+      var se = this.filesTotalSize + (this.resultFile ? Math.ceil(file.size / 1024 * 100) / 100 : 0);
       this.filesTotalSize = se;
       this.onSuccess && this.onSuccess(response, file, fileList);
       this.$emit('success', response, file, fileList);
@@ -4009,7 +4052,7 @@ var componentNormalizer = __webpack_require__(2);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_7fa5744f_render,
+  mainvue_type_template_id_a8255544_render,
   staticRenderFns,
   false,
   null,

package/lib/utils/util.js

@@ -1318,7 +1318,7 @@ var isFunction = function isFunction(obj) {
 };
 
 /**
- * isLogged
+ * isLogined
  * @desc:是否登录（用于路由守卫中）
  * @author huangbo
  * @date 2022年5月7日
@@ -1331,7 +1331,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,
@@ -1375,16 +1377,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();
@@ -1394,7 +1398,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':
@@ -1418,6 +1422,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) {
@@ -1446,6 +1469,9 @@ var isLogged = function isLogged(_ref8) {
     }
   }
 };
+var isLogged = function isLogged(res) {
+  isLogined(res);
+};
 
 /**
  * isObject
@@ -2097,6 +2123,7 @@ exports.default = {
   indexOfObj: indexOfObj,
   isFunction: isFunction,
   isLogged: isLogged,
+  isLogined: isLogined,
   isObject: isObject,
   jointUrl: jointUrl,
   loadJs: loadJs,