eoss-ui 0.5.79 → 0.5.80

package/packages/theme-chalk/src/clients.scss

@@ -39,7 +39,7 @@
     font-weight: bold;
     color: #fff;
     text-align: center;
-    margin-bottom: 68px;
+    margin-bottom: 5%;
   }
   .es-clients-list {
     display: flex;

package/packages/theme-chalk/src/data-table.scss

@@ -217,3 +217,6 @@
   text-align: right;
   margin-top: 7px;
 }
+.el-table__empty-block {
+  position: relative;
+}

package/packages/theme-chalk/src/form.scss

@@ -234,14 +234,14 @@
         color: #c0c4cc;
         line-height: 40px;
       }
-      & > div:not(.es-range):not(.es-flex-none) {
+      & > div:not(.es-range):not(.es-flex-none):not(.fixed-width) {
         flex: 1;
       }
     }
     .el-form-item__error {
       bottom: -16px;
     }
-    & > .el-form-item {
+    & > .el-form-item:not(.fixed-width) {
       flex: 1;
     }
     .es-button-inline {

package/packages/upload/src/main.vue

@@ -433,9 +433,10 @@ export default {
       videoChange: false,
       source: '',
       excludeNames: '',
-      previewAdjunct: previewAdjunct,
       boxHeight: this.listHeight,
-      kkfileview: null
+      previewAdjunct: previewAdjunct,
+      kkfileview: null,
+      dochubConfig: {}
     };
   },
   computed: {
@@ -485,8 +486,8 @@ export default {
       let url = this.action
         ? this.action
         : this.portrait
-        ? uploadOnlyOne
-        : uploads;
+        ? this.dochubConfig.reuploadDocument || uploadOnlyOne
+        : this.dochubConfig.uploadDocument || uploads;
       return url.indexOf(this.host) > -1 ? url : this.host + url;
     },
     excludes() {
@@ -713,6 +714,7 @@ export default {
           this.fileAccept = config.accept;
           this.fileSize = config.size;
           this.fileTotalSize = config.totalSize;
+          this.dochubConfig = config.dochubConfig;
         } else {
           util
             .ajax({
@@ -734,6 +736,12 @@ export default {
                       })
                       .join(',');
                   }
+                  if (
+                    res.results.dochubConfig &&
+                    Object.keys(res.results.dochubConfig).length
+                  ) {
+                    this.dochubConfig = res.results.dochubConfig;
+                  }
                   if (res.results.kkViewRootPath) {
                     this.kkfileview = res.results.kkViewRootPath;
                   }
@@ -744,7 +752,8 @@ export default {
                   store.set(this.code, {
                     accept: this.fileAccept,
                     size: this.fileSize,
-                    totalSize: this.fileTotalSize
+                    totalSize: this.fileTotalSize,
+                    dochubConfig: this.dochubConfig
                   });
                 }
               }
@@ -851,78 +860,117 @@ export default {
           if (res.status === 'success') {
             let suffix = file.suffix;
             suffix = suffix.toLowerCase();
-            if (
-              suffix.includes('doc') ||
-              suffix.includes('docx') ||
-              suffix.includes('xls') ||
-              suffix.includes('xlsx') ||
-              suffix.includes('ppt')
-            ) {
-              if (this.kkfileview) {
-                this.openKkfileview(file);
-              } else {
-                util.win.open(
-                  this.host +
-                    (url ? url : previewAdjunctOffice) +
-                    '?cmd=view&bucketName=' +
-                    file.absolutePath +
-                    '&fileId=' +
-                    file.adjunctId +
-                    '&fileName=' +
-                    file.newName
-                );
-              }
-            } else if (suffix.includes('pdf')) {
-              if (this.kkfileview) {
-                this.openKkfileview(file);
+            if (this.dochubConfig.previewDocumentUrl) {
+              if (
+                suffix.includes('jpge') ||
+                suffix.includes('jpg') ||
+                suffix.includes('gif') ||
+                suffix.includes('png')
+              ) {
+                this.imgUrl =
+                  res.url && util.startWith(url, ['http', '/', true])
+                    ? res.url
+                    : this.host +
+                      (url
+                        ? url
+                        : `${this.previewAdjunct}?adjunctId=${file.adjunctId}`);
+                this.title = file.originalName;
+                this.showImg = true;
+                this.$nextTick(() => {
+                  this.loadImage();
+                });
+              } else if (suffix.includes('mp4')) {
+                this.source = {
+                  src:
+                    this.host +
+                    (url
+                      ? url
+                      : `${this.previewAdjunct}?adjunctId=${file.adjunctId}`)
+                };
+                this.title = file.originalName;
+                this.showVideo = true;
               } else {
                 util.win.open(
                   this.host +
-                    (url ? url : previewAdjunct2) +
-                    '/' +
-                    file.originalName +
-                    '?adjunctId=' +
-                    file.adjunctId
+                    (url
+                      ? url
+                      : `${this.dochubConfig.previewDocumentUrl}?documentId=${file.adjunctId}&action=附件预览`)
                 );
               }
-            } else if (
-              suffix.includes('jpge') ||
-              suffix.includes('jpg') ||
-              suffix.includes('gif') ||
-              suffix.includes('png')
-            ) {
-              this.imgUrl =
-                res.url && util.startWith(url, ['http', '/', true])
-                  ? res.url
-                  : this.host +
-                    (url ? url : this.previewAdjunct) +
-                    '?adjunctId=' +
-                    file.adjunctId;
-              this.title = file.originalName;
-              this.showImg = true;
-              this.$nextTick(() => {
-                this.loadImage();
-              });
-            } else if (suffix.includes('mp4')) {
-              this.source = {
-                src:
-                  this.host +
-                  (url ? url : this.previewAdjunct) +
-                  '?adjunctId=' +
-                  file.adjunctId
-              };
-              this.title = file.originalName;
-              this.showVideo = true;
             } else {
-              if (this.kkfileview) {
-                this.openKkfileview(file);
-              } else {
-                util.win.open(
-                  this.host +
+              if (
+                suffix.includes('doc') ||
+                suffix.includes('docx') ||
+                suffix.includes('xls') ||
+                suffix.includes('xlsx') ||
+                suffix.includes('ppt')
+              ) {
+                if (this.kkfileview) {
+                  this.openKkfileview(file);
+                } else {
+                  util.win.open(
+                    this.host +
+                      (url ? url : previewAdjunctOffice) +
+                      '?cmd=view&bucketName=' +
+                      file.absolutePath +
+                      '&fileId=' +
+                      file.adjunctId +
+                      '&fileName=' +
+                      file.newName
+                  );
+                }
+              } else if (suffix.includes('pdf')) {
+                if (this.kkfileview) {
+                  this.openKkfileview(file);
+                } else {
+                  util.win.open(
+                    this.host +
+                      (url ? url : previewAdjunct2) +
+                      '/' +
+                      file.originalName +
+                      '?adjunctId=' +
+                      file.adjunctId
+                  );
+                }
+              } else if (
+                suffix.includes('jpge') ||
+                suffix.includes('jpg') ||
+                suffix.includes('gif') ||
+                suffix.includes('png')
+              ) {
+                this.imgUrl =
+                  res.url && util.startWith(url, ['http', '/', true])
+                    ? res.url
+                    : this.host +
+                      (url ? url : this.previewAdjunct) +
+                      '?adjunctId=' +
+                      file.adjunctId;
+                this.title = file.originalName;
+                this.showImg = true;
+                this.$nextTick(() => {
+                  this.loadImage();
+                });
+              } else if (suffix.includes('mp4')) {
+                this.source = {
+                  src:
+                    this.host +
                     (url ? url : this.previewAdjunct) +
                     '?adjunctId=' +
                     file.adjunctId
-                );
+                };
+                this.title = file.originalName;
+                this.showVideo = true;
+              } else {
+                if (this.kkfileview) {
+                  this.openKkfileview(file);
+                } else {
+                  util.win.open(
+                    this.host +
+                      (url ? url : this.previewAdjunct) +
+                      '?adjunctId=' +
+                      file.adjunctId
+                  );
+                }
               }
             }
           } else {
@@ -1034,17 +1082,19 @@ export default {
                     ? this.deleted
                     : this.remove === 'string'
                     ? this.remove
-                    : delAdjunct;
+                    : this.dochubConfig.deleteDocumentUrl || delAdjunct;
                 util
                   .ajax({
                     method: this.method,
                     url: url,
                     data: {
                       userName: userName,
+                      documentId: file.adjunctId || file.response.adjunctId,
                       id: file.adjunctId || file.response.adjunctId
                     },
                     params: {
                       userName: userName,
+                      documentId: file.adjunctId || file.response.adjunctId,
                       id: file.adjunctId || file.response.adjunctId
                     }
                   })
@@ -1078,7 +1128,9 @@ export default {
     },
     handleDownloads() {
       let url =
-        typeof this.downloads === 'string' ? this.downloads : uploadDownloads;
+        typeof this.downloads === 'string'
+          ? this.downloads
+          : this.dochubConfig.compressDownloadDocument || uploadDownloads;
       util.win.open(
         this.host +
           url +
@@ -1094,11 +1146,13 @@ export default {
         let url =
           typeof this.download === 'string'
             ? this.download
-            : downloadByAdjunctId;
+            : this.dochubConfig.downloadDocumentUrl || downloadByAdjunctId;
         util.win.open(
           this.host +
             url +
             '?adjunctId=' +
+            (file.adjunctId || file.response.adjunctId) +
+            '&documentId=' +
             (file.adjunctId || file.response.adjunctId)
         );
       } else {
@@ -1133,7 +1187,7 @@ export default {
           util
             .ajax({
               method: this.method,
-              url: uploadSort,
+              url: this.dochubConfig.sortDocumentsUrl || uploadSort,
               data: {
                 ids: ids
               },

package/src/index.js

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

package/src/utils/util.js

@@ -296,7 +296,7 @@ const ajax = function ({
           }, 1000);
         }
         // eslint-disable-next-line no-undef
-        return Promise.resolve(response.data);
+        return Promise.resolve(JSON.parse(JSON.stringify(response.data)));
       }
     },
     error => {