eoss-ui 0.4.57 → 0.4.59

package/lib/upload.js

@@ -264,20 +264,33 @@ var ajax = function ajax(_ref) {
             }).then(function () {
               var loginPage = getStorage('login') || getStorage('loginPage');
               if (loginPage) {
-                win.top.location.href = loginPage;
+                var src = void 0;
+                if (!startWith(loginPage, ['http', '/'])) {
+                  var pathname = win.top.location.pathname;
+                  if (pathname !== '/') {
+                    pathname = pathname.split('/');
+                    pathname.splice(pathname.length - 1);
+                    pathname = pathname.join('/');
+                  }
+                  src = pathname + loginPage.replace('./', '');
+                } else {
+                  src = loginPage;
+                }
+                win.top.location.href = src;
               } else if (win.top.location.href.indexOf('main.html') > -1) {
                 win.top.location.href = './login.html';
               } else {
                 var hash = win.top.location.hash;
-                if (hash || win.top.location.indexOf('model=') && win.top.location.indexOf('view=') && win.top.location.indexOf('render.html')) {
+                if (hash) {
                   var len = win.top.location.href.indexOf(hash);
-                  var href = win.top.location.href.slice(0, len) + '#/login';
-                  win.top.location.href = href;
+                  win.top.location.href = win.location.href.slice(0, len) + '#/login';
                 } else {
                   win.top.location.href = '/login.html';
                 }
               }
-            }).catch(function (e) {});
+            }).catch(function (e) {
+              sessionStorage.removeItem('remind');
+            });
           }, 1000));
         }
       } else if (response.data.rCode === 61) {
@@ -295,6 +308,7 @@ var ajax = function ajax(_ref) {
               return h('es-retrial-auth', {
                 ref: 'auth',
                 props: {
+                  reload: response.data.results.reload || response.data.results.refresh,
                   group: response.data.results.retrialAuthGroupIds,
                   type: response.data.results.retrialAuthType,
                   msgBox: msgBox
@@ -2832,8 +2846,8 @@ function normalizeComponent(
 // 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=a73af130&
-var mainvue_type_template_id_a73af130_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=456fded3&
+var mainvue_type_template_id_456fded3_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -2846,7 +2860,7 @@ var mainvue_type_template_id_a73af130_render = function () {
         class: [
           {
             "es-avatar-uploader": _vm.portrait,
-            "es-upload-readonly": _vm.isDisabled,
+            "es-upload-readonly": _vm.isReadonly,
           },
           "es-upload-" + _vm.listType,
         ],
@@ -2859,7 +2873,8 @@ var mainvue_type_template_id_a73af130_render = function () {
           "show-file-list": _vm.showList,
           "file-list": _vm.lists,
           "result-file": _vm.resultFile,
-          disabled: _vm.isDisabled,
+          disabled: _vm.isDisabled || _vm.isReadonly,
+          readonly: _vm.isReadonly,
           previewAdjunct: _vm.host + _vm.previewAdjunct,
           headers: _vm.headers,
           data: _vm.datas,
@@ -2959,7 +2974,10 @@ var mainvue_type_template_id_a73af130_render = function () {
                         })
                       : _c("i", {
                           staticClass: "avatar-uploader-icon",
-                          class: { "el-icon-plus": !_vm.isDisabled },
+                          class: {
+                            "el-icon-plus": !_vm.isReadonly,
+                            "is-disabled": _vm.isDisabled,
+                          },
                           style: {
                             width: _vm.width,
                             height: _vm.height,
@@ -2968,11 +2986,12 @@ var mainvue_type_template_id_a73af130_render = function () {
                         }),
                   ]
                 : [
-                    !_vm.isDisabled
+                    !_vm.isReadonly
                       ? [
                           _vm.selectType === "icon-plus"
                             ? _c("i", {
                                 staticClass: "el-icon-plus es-uploader-icon",
+                                class: { "is-disabled": _vm.isDisabled },
                               })
                             : _c(
                                 "el-button",
@@ -2982,6 +3001,7 @@ var mainvue_type_template_id_a73af130_render = function () {
                                   attrs: {
                                     type: _vm.selectType,
                                     size: _vm.btnSize,
+                                    disabled: _vm.isDisabled,
                                   },
                                 },
                                 [
@@ -3004,6 +3024,7 @@ var mainvue_type_template_id_a73af130_render = function () {
                                   attrs: {
                                     type: _vm.uploadType,
                                     size: _vm.btnSize,
+                                    disabled: _vm.isDisabled,
                                   },
                                   on: {
                                     click: function ($event) {
@@ -3105,50 +3126,61 @@ var mainvue_type_template_id_a73af130_render = function () {
         ],
         2
       ),
-      _c(
-        "es-dialog",
-        {
-          attrs: { slot: "dialog", title: _vm.title, visible: _vm.showImg },
-          on: {
-            "update:visible": function ($event) {
-              _vm.showImg = $event
+      _vm.previewScale && _vm.showImg
+        ? _c("el-image-viewer", {
+            attrs: {
+              slot: "dialog",
+              "z-index": 9999,
+              "initial-index": 0,
+              "url-list": [_vm.imgUrl],
+              "on-close": _vm.closeViewer,
             },
-          },
-          slot: "dialog",
-        },
-        [
-          _c(
-            "div",
+            slot: "dialog",
+          })
+        : _c(
+            "es-dialog",
             {
-              directives: [
-                {
-                  name: "loading",
-                  rawName: "v-loading",
-                  value: _vm.imgChange,
-                  expression: "imgChange",
+              attrs: { slot: "dialog", title: _vm.title, visible: _vm.showImg },
+              on: {
+                "update:visible": function ($event) {
+                  _vm.showImg = $event
                 },
-              ],
-              staticClass: "es-upload-dialog",
-              attrs: { "element-loading-background": "rgba(0, 0, 0, 0.8)" },
+              },
+              slot: "dialog",
             },
             [
-              _c("img", {
-                directives: [
-                  {
-                    name: "show",
-                    rawName: "v-show",
-                    value: !_vm.imgChange,
-                    expression: "!imgChange",
-                  },
-                ],
-                ref: "showImg",
-                style: _vm.styles,
-                attrs: { src: _vm.imgUrl },
-              }),
+              _c(
+                "div",
+                {
+                  directives: [
+                    {
+                      name: "loading",
+                      rawName: "v-loading",
+                      value: _vm.imgChange,
+                      expression: "imgChange",
+                    },
+                  ],
+                  staticClass: "es-upload-dialog",
+                  attrs: { "element-loading-background": "rgba(0, 0, 0, 0.8)" },
+                },
+                [
+                  _c("img", {
+                    directives: [
+                      {
+                        name: "show",
+                        rawName: "v-show",
+                        value: !_vm.imgChange,
+                        expression: "!imgChange",
+                      },
+                    ],
+                    ref: "showImg",
+                    style: _vm.styles,
+                    attrs: { src: _vm.imgUrl },
+                  }),
+                ]
+              ),
             ]
           ),
-        ]
-      ),
       _c(
         "es-dialog",
         {
@@ -3177,10 +3209,10 @@ var mainvue_type_template_id_a73af130_render = function () {
   )
 }
 var staticRenderFns = []
-mainvue_type_template_id_a73af130_render._withStripped = true
+mainvue_type_template_id_456fded3_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=a73af130&
+// CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=456fded3&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -3375,6 +3407,17 @@ var _props;
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -3582,6 +3625,9 @@ var _props;
     default: function _default() {
       return {};
     }
+  }, _props.previewScale = {
+    type: Boolean,
+    default: true
   }, _props),
   data: function data() {
     return {
@@ -3669,11 +3715,10 @@ var _props;
       return false;
     },
     isDisabled: function isDisabled() {
-      if (this.readonly || this.disabled) {
-        return true;
-      } else {
-        return false;
-      }
+      return this.disabled || (this.elForm || {}).disabled;
+    },
+    isReadonly: function isReadonly() {
+      return this.readonly || (this.elForm || {}).readonly;
     },
     isRemove: function isRemove() {
       if (this.remove || this.deleted) {
@@ -3682,7 +3727,7 @@ var _props;
       return false;
     },
     isSort: function isSort() {
-      return this.dragSort && !this.isDisabled;
+      return this.dragSort && !this.isDisabled && this.isReadonly;
     },
     datas: function datas() {
       if (this.data) {
@@ -3912,7 +3957,7 @@ var _props;
             } else if (suffix.includes('pdf')) {
               util["a" /* default */].win.open(this.host + (url ? url : api["hb" /* previewAdjunct2 */]) + '/' + file.originalName + '?adjunctId=' + file.adjunctId);
             } else if (suffix.includes('jpge') || suffix.includes('jpg') || suffix.includes('gif') || suffix.includes('png')) {
-              this.imgUrl = this.host + (url ? url : this.previewAdjunct) + '?adjunctId=' + file.adjunctId;
+              this.imgUrl = res.url ? res.url : this.host + (url ? url : this.previewAdjunct) + '?adjunctId=' + file.adjunctId;
               this.title = file.originalName;
               this.showImg = true;
               this.$nextTick(function () {
@@ -3933,10 +3978,13 @@ var _props;
         }
       }
     },
+    closeViewer: function closeViewer() {
+      this.showImg = false;
+    },
     loadImage: function loadImage() {
       var _this5 = this;
 
-      this.$refs.showImg.onload = function () {
+      this.$refs.showImg && (this.$refs.showImg.onload = function () {
         _this5.imgChange = false;
         var w = _this5.$refs.showImg.naturalWidth;
         var h = _this5.$refs.showImg.naturalHeight;
@@ -3953,14 +4001,14 @@ var _props;
         if (h < ph) {
           _this5.styles.height = h + 'px';
         }
-      };
+      });
     },
     isLt: function isLt(file) {
       var flag = false;
       var flieArr = file.name.split('.');
-      var suffix = '.' + flieArr[flieArr.length - 1];
+      var suffix = '.' + flieArr[flieArr.length - 1].toLowerCase();
       if (this.accepts) {
-        var accepts = this.accepts.split(',');
+        var accepts = this.accepts.toLowerCase().split(',');
         flag = accepts.includes(suffix);
         if (!flag) {
           this.$message.error('\u6587\u4EF6\u7C7B\u578B\u9519\u8BEF\uFF0C\u8BF7\u4E0A\u4F20' + this.accepts + '\u7C7B\u578B\u6587\u4EF6!');
@@ -4206,7 +4254,7 @@ var componentNormalizer = __webpack_require__(3);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_a73af130_render,
+  mainvue_type_template_id_456fded3_render,
   staticRenderFns,
   false,
   null,

package/lib/utils/util.js

@@ -179,20 +179,33 @@ var ajax = function ajax(_ref) {
             }).then(function () {
               var loginPage = getStorage('login') || getStorage('loginPage');
               if (loginPage) {
-                win.top.location.href = loginPage;
+                var src = void 0;
+                if (!startWith(loginPage, ['http', '/'])) {
+                  var pathname = win.top.location.pathname;
+                  if (pathname !== '/') {
+                    pathname = pathname.split('/');
+                    pathname.splice(pathname.length - 1);
+                    pathname = pathname.join('/');
+                  }
+                  src = pathname + loginPage.replace('./', '');
+                } else {
+                  src = loginPage;
+                }
+                win.top.location.href = src;
               } else if (win.top.location.href.indexOf('main.html') > -1) {
                 win.top.location.href = './login.html';
               } else {
                 var hash = win.top.location.hash;
-                if (hash || win.top.location.indexOf('model=') && win.top.location.indexOf('view=') && win.top.location.indexOf('render.html')) {
+                if (hash) {
                   var len = win.top.location.href.indexOf(hash);
-                  var href = win.top.location.href.slice(0, len) + '#/login';
-                  win.top.location.href = href;
+                  win.top.location.href = win.location.href.slice(0, len) + '#/login';
                 } else {
                   win.top.location.href = '/login.html';
                 }
               }
-            }).catch(function (e) {});
+            }).catch(function (e) {
+              sessionStorage.removeItem('remind');
+            });
           }, 1000));
         }
       } else if (response.data.rCode === 61) {
@@ -210,6 +223,7 @@ var ajax = function ajax(_ref) {
               return h('es-retrial-auth', {
                 ref: 'auth',
                 props: {
+                  reload: response.data.results.reload || response.data.results.refresh,
                   group: response.data.results.retrialAuthGroupIds,
                   type: response.data.results.retrialAuthType,
                   msgBox: msgBox

package/lib/wujie.js

@@ -264,20 +264,33 @@ var ajax = function ajax(_ref) {
             }).then(function () {
               var loginPage = getStorage('login') || getStorage('loginPage');
               if (loginPage) {
-                win.top.location.href = loginPage;
+                var src = void 0;
+                if (!startWith(loginPage, ['http', '/'])) {
+                  var pathname = win.top.location.pathname;
+                  if (pathname !== '/') {
+                    pathname = pathname.split('/');
+                    pathname.splice(pathname.length - 1);
+                    pathname = pathname.join('/');
+                  }
+                  src = pathname + loginPage.replace('./', '');
+                } else {
+                  src = loginPage;
+                }
+                win.top.location.href = src;
               } else if (win.top.location.href.indexOf('main.html') > -1) {
                 win.top.location.href = './login.html';
               } else {
                 var hash = win.top.location.hash;
-                if (hash || win.top.location.indexOf('model=') && win.top.location.indexOf('view=') && win.top.location.indexOf('render.html')) {
+                if (hash) {
                   var len = win.top.location.href.indexOf(hash);
-                  var href = win.top.location.href.slice(0, len) + '#/login';
-                  win.top.location.href = href;
+                  win.top.location.href = win.location.href.slice(0, len) + '#/login';
                 } else {
                   win.top.location.href = '/login.html';
                 }
               }
-            }).catch(function (e) {});
+            }).catch(function (e) {
+              sessionStorage.removeItem('remind');
+            });
           }, 1000));
         }
       } else if (response.data.rCode === 61) {
@@ -295,6 +308,7 @@ var ajax = function ajax(_ref) {
               return h('es-retrial-auth', {
                 ref: 'auth',
                 props: {
+                  reload: response.data.results.reload || response.data.results.refresh,
                   group: response.data.results.retrialAuthGroupIds,
                   type: response.data.results.retrialAuthType,
                   msgBox: msgBox

package/lib/wxlogin.js

@@ -264,20 +264,33 @@ var ajax = function ajax(_ref) {
             }).then(function () {
               var loginPage = getStorage('login') || getStorage('loginPage');
               if (loginPage) {
-                win.top.location.href = loginPage;
+                var src = void 0;
+                if (!startWith(loginPage, ['http', '/'])) {
+                  var pathname = win.top.location.pathname;
+                  if (pathname !== '/') {
+                    pathname = pathname.split('/');
+                    pathname.splice(pathname.length - 1);
+                    pathname = pathname.join('/');
+                  }
+                  src = pathname + loginPage.replace('./', '');
+                } else {
+                  src = loginPage;
+                }
+                win.top.location.href = src;
               } else if (win.top.location.href.indexOf('main.html') > -1) {
                 win.top.location.href = './login.html';
               } else {
                 var hash = win.top.location.hash;
-                if (hash || win.top.location.indexOf('model=') && win.top.location.indexOf('view=') && win.top.location.indexOf('render.html')) {
+                if (hash) {
                   var len = win.top.location.href.indexOf(hash);
-                  var href = win.top.location.href.slice(0, len) + '#/login';
-                  win.top.location.href = href;
+                  win.top.location.href = win.location.href.slice(0, len) + '#/login';
                 } else {
                   win.top.location.href = '/login.html';
                 }
               }
-            }).catch(function (e) {});
+            }).catch(function (e) {
+              sessionStorage.removeItem('remind');
+            });
           }, 1000));
         }
       } else if (response.data.rCode === 61) {
@@ -295,6 +308,7 @@ var ajax = function ajax(_ref) {
               return h('es-retrial-auth', {
                 ref: 'auth',
                 props: {
+                  reload: response.data.results.reload || response.data.results.refresh,
                   group: response.data.results.retrialAuthGroupIds,
                   type: response.data.results.retrialAuthType,
                   msgBox: msgBox

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.4.57",
+  "version": "0.4.59",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [
@@ -93,7 +93,7 @@
     "cp-cli": "^1.0.2",
     "cross-env": "^3.1.3",
     "css-loader": "^2.1.0",
-    "eoss-element": "^0.2.63",
+    "eoss-element": "^0.2.66",
     "es6-promise": "^4.0.5",
     "eslint": "4.18.2",
     "eslint-config-elemefe": "0.1.1",