eoss-ui 0.4.57 → 0.4.59

package/packages/upload/src/main.vue

@@ -11,11 +11,12 @@
     :show-file-list="showList"
     :file-list="lists"
     :result-file="resultFile"
-    :disabled="isDisabled"
+    :disabled="isDisabled || isReadonly"
+    :readonly="isReadonly"
     :class="[
       {
         'es-avatar-uploader': portrait,
-        'es-upload-readonly': isDisabled
+        'es-upload-readonly': isReadonly
       },
       'es-upload-' + listType
     ]"
@@ -76,14 +77,15 @@
           <i
             v-else
             class="avatar-uploader-icon"
-            :class="{ 'el-icon-plus': !isDisabled }"
+            :class="{ 'el-icon-plus': !isReadonly, 'is-disabled': isDisabled }"
             :style="{ width: width, height: height, lineHeight: height }"
           ></i>
         </template>
         <template v-else>
-          <template v-if="!isDisabled">
+          <template v-if="!isReadonly">
             <i
               class="el-icon-plus es-uploader-icon"
+              :class="{ 'is-disabled': isDisabled }"
               v-if="selectType === 'icon-plus'"
             ></i>
             <el-button
@@ -92,6 +94,7 @@
               :class="icon"
               :type="selectType"
               :size="btnSize"
+              :disabled="isDisabled"
               >{{
                 text ? text : autoUpload ? '点击上传' : '选择文件'
               }}</el-button
@@ -101,6 +104,7 @@
               v-if="!autoUpload"
               :type="uploadType"
               :size="btnSize"
+              :disabled="isDisabled"
               @click.stop="handleUpload"
             >
               上传文件
@@ -142,8 +146,15 @@
         <div v-if="tips" class="el-upload__tip">{{ tips }}</div>
       </slot>
     </template>
-
-    <es-dialog :title="title" :visible.sync="showImg" slot="dialog">
+    <el-image-viewer
+      slot="dialog"
+      v-if="previewScale && showImg"
+      :z-index="9999"
+      :initial-index="0"
+      :url-list="[imgUrl]"
+      :on-close="closeViewer"
+    ></el-image-viewer>
+    <es-dialog v-else :title="title" :visible.sync="showImg" slot="dialog">
       <div
         v-loading="imgChange"
         element-loading-background="rgba(0, 0, 0, 0.8)"
@@ -393,6 +404,10 @@ export default {
       default() {
         return {};
       }
+    },
+    previewScale: {
+      type: Boolean,
+      default: true
     }
   },
   data() {
@@ -500,11 +515,10 @@ export default {
       return false;
     },
     isDisabled() {
-      if (this.readonly || this.disabled) {
-        return true;
-      } else {
-        return false;
-      }
+      return this.disabled || (this.elForm || {}).disabled;
+    },
+    isReadonly() {
+      return this.readonly || (this.elForm || {}).readonly;
     },
     isRemove() {
       if (this.remove || this.deleted) {
@@ -513,7 +527,7 @@ export default {
       return false;
     },
     isSort() {
-      return this.dragSort && !this.isDisabled;
+      return this.dragSort && !this.isDisabled && this.isReadonly;
     },
     datas() {
       if (this.data) {
@@ -806,11 +820,12 @@ export default {
               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(() => {
@@ -840,32 +855,36 @@ export default {
         }
       }
     },
+    closeViewer() {
+      this.showImg = false;
+    },
     loadImage() {
-      this.$refs.showImg.onload = () => {
-        this.imgChange = false;
-        let w = this.$refs.showImg.naturalWidth;
-        let h = this.$refs.showImg.naturalHeight;
-        let pw = this.$refs.showImg.parentNode.offsetWidth;
-        let ph = this.$refs.showImg.parentNode.offsetHeight;
-        if (w / h > pw / ph) {
-          this.styles = { 'max-width': '100%' };
-        } else {
-          this.styles = { 'max-height': '100%' };
-        }
-        if (w < pw) {
-          this.styles.width = w + 'px';
-        }
-        if (h < ph) {
-          this.styles.height = h + 'px';
-        }
-      };
+      this.$refs.showImg &&
+        (this.$refs.showImg.onload = () => {
+          this.imgChange = false;
+          let w = this.$refs.showImg.naturalWidth;
+          let h = this.$refs.showImg.naturalHeight;
+          let pw = this.$refs.showImg.parentNode.offsetWidth;
+          let ph = this.$refs.showImg.parentNode.offsetHeight;
+          if (w / h > pw / ph) {
+            this.styles = { 'max-width': '100%' };
+          } else {
+            this.styles = { 'max-height': '100%' };
+          }
+          if (w < pw) {
+            this.styles.width = w + 'px';
+          }
+          if (h < ph) {
+            this.styles.height = h + 'px';
+          }
+        });
     },
     isLt(file) {
       let flag = false;
       let flieArr = file.name.split('.');
-      let suffix = '.' + flieArr[flieArr.length - 1];
+      let suffix = '.' + flieArr[flieArr.length - 1].toLowerCase();
       if (this.accepts) {
-        let accepts = this.accepts.split(',');
+        let accepts = this.accepts.toLowerCase().split(',');
         flag = accepts.includes(suffix);
         if (!flag) {
           this.$message.error(`文件类型错误，请上传${this.accepts}类型文件!`);

package/src/index.js

@@ -119,7 +119,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.4.57',
+  version: '0.4.59',
   install,
   Button,
   ButtonGroup,

package/src/utils/util.js

@@ -201,26 +201,36 @@ const ajax = function ({
                 .then(() => {
                   const loginPage = getStorage('login') || getStorage('loginPage');
                   if (loginPage) {
-                    win.top.location.href = loginPage;
-                  } else if (win.top.location.href.indexOf('main.html') > -1) {
+                    let src;
+                    if (!startWith(loginPage, ['http', '/'])) {
+                      let 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 {
                     const 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) {
                       const len = win.top.location.href.indexOf(hash);
-                      let 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(e => {
+                  sessionStorage.removeItem('remind');
                 });
             }, 1000));
           }
@@ -239,6 +249,7 @@ const ajax = function ({
                 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