eoss-ui 0.4.95 → 0.4.97

package/packages/theme-chalk/lib/selector.css

@@ -1 +1 @@
-@charset "UTF-8";.es-selector,.es-selector .es-selector-tags{position:relative}.es-selector{line-height:normal}.es-selector .el-select__tags{max-width:100%;padding-left:4px}.es-selector .el-select__tags.es-selector-edit>span{padding-top:4px}.es-selector .el-select__tags .el-tag{margin-right:4px;margin-bottom:4px}.es-selector .es-selector-search .el-select__tags{max-width:calc(100% - 71px)}.es-selector .es-selector-tags.es-selector-more{padding-right:50px;width:100%}.es-selector .es-selector-tags.es-selector-more .el-tag{display:block}.es-selector .es-selector-tags.es-selector-more .es-tags-more{width:40px;padding:0 4px;position:absolute;top:0;right:6px;text-align:center}.es-selector .es-selector-tags-box{line-height:0}.es-selector .es-pointer .el-input__inner{cursor:pointer}.es-selector .es-selector-dropdown-item.hover,.es-selector .es-selector-dropdown-item:hover{background-color:#f5f7fa}.es-selector .es-selector-dropdown-item{font-size:14px;padding:0 20px;position:relative;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;color:#606266;height:34px;line-height:34px;-webkit-box-sizing:border-box;box-sizing:border-box;cursor:pointer}.es-selector .es-selector-dropdown-item.es-selected{color:#1890ff}.es-zindex-2{z-index:2}.es-selector-dialog .el-dialog__header{padding:12px 20px 8px}.es-selector-dialog .el-dialog__header .el-dialog__title{font-size:14px}.es-selector-dialog .el-dialog__headerbtn{top:14px;right:16px}.es-selector-dialog .el-dialog__body{padding:4px}
+@charset "UTF-8";.es-selector,.es-selector .es-selector-tags{position:relative}.es-selector{line-height:normal}.es-selector .el-select__tags{max-width:100%;padding-left:4px}.es-selector .el-select__tags.es-selector-edit>span{padding-top:4px}.es-selector .el-select__tags .el-tag{margin-right:4px;margin-bottom:4px}.es-selector .es-selector-search .el-select__tags{max-width:calc(100% - 71px)}.es-selector .es-selector-tags.es-selector-more{padding-right:50px;width:100%}.es-selector .es-selector-tags.es-selector-more .el-tag{display:block}.es-selector .es-selector-tags.es-selector-more .es-tags-more{width:40px;padding:0 4px;position:absolute;top:0;right:6px;text-align:center}.es-selector .es-selector-tags-box{line-height:0}.es-selector .es-pointer .el-input__inner{cursor:pointer}.es-selector-dropdown-item.hover,.es-selector-dropdown-item:hover{background-color:#f5f7fa}.es-selector-popover{padding:0}.es-selector-popover .es-selector-dropdown__list{padding:12px}.es-selector-popover .es-selector-dropdown-item{font-size:14px;padding:0 20px;position:relative;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;color:#606266;height:34px;line-height:34px;-webkit-box-sizing:border-box;box-sizing:border-box;cursor:pointer}.es-selector-popover .es-selector-dropdown-item.es-selected{color:#1890ff}.es-zindex-2{z-index:2}.es-selector-dialog .el-dialog__header{padding:12px 20px 8px}.es-selector-dialog .el-dialog__header .el-dialog__title{font-size:14px}.es-selector-dialog .el-dialog__headerbtn{top:14px;right:16px}.es-selector-dialog .el-dialog__body{padding:4px}

package/packages/theme-chalk/lib/toolbar.css

@@ -1 +1 @@
-@charset "UTF-8";.es-toolbar{padding:6px 12px;border-bottom:1px solid #d9d9d9;position:relative;background-color:#fff}.es-toolbar .es-toolbar-content{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}.es-toolbar .es-toolbar-content .es-button-content{-webkit-box-flex:1;-ms-flex:1;flex:1}.es-toolbar .es-toolbar-content .es-form{background:0 0}.es-toolbar .es-toolbar-content .es-form .es-form-content{padding:0}.es-toolbar .es-toolbar-content .es-form .el-form-item{margin-bottom:0}.es-toolbar .es-toolbar-content .es-advanced-btn{margin-left:12px}.es-toolbar .es-toolbar-content .es-toolbar-text{line-height:32px}.es-toolbar .es-toolbar-content .es-toolbar-info{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.es-toolbar .es-toolbar-content .es-toolbar-info .es-info{font-size:13px;margin-left:20px}.es-toolbar .es-toolbar-content .el-menu--horizontal{border-bottom:0;position:relative;bottom:-6px}.es-toolbar .es-toolbar-content .el-menu-item{height:32px;line-height:24px}.es-toolbar .es-toolbar-content .el-input__inner,.es-toolbar .es-toolbar-content .es-checkbox-group{height:32px;line-height:32px}.es-toolbar .es-toolbar-content .es-radio-group,.es-toolbar .es-toolbar-content .es-switch-content{line-height:32px}.es-toolbar .es-toolbar-content .el-switch{top:-2px}.es-toolbar .es-toolbar-content .el-button span{line-height:14px}.es-toolbar .es-toolbar-content .el-checkbox:not(:last-child),.es-toolbar .es-toolbar-content .el-radio:not(:last-child){margin-right:8px}.es-toolbar .es-toolbar-content .el-form-item.es-toolbar-item-checkbox+.el-form-item,.es-toolbar .es-toolbar-content .el-form-item.es-toolbar-item-radio+.el-form-item,.es-toolbar .es-toolbar-content .el-form-item.es-toolbar-item-switch+.el-form-item{margin-left:16px}.es-toolbar .es-toolbar-content .el-form-item .el-input__icon{line-height:32px;vertical-align:top}.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner{width:100%;max-width:156px}.es-toolbar .es-advanced-filter{margin-top:20px;z-index:9}.es-toolbar .es-advanced-filter.es-absolute{position:absolute;left:0;top:45px;right:0;margin-top:0;-webkit-box-shadow:0 1px 10px rgba(0,0,0,.05),0 4px 5px rgba(0,0,0,.08),0 2px 4px -1px rgba(0,0,0,.12);box-shadow:0 1px 10px rgba(0,0,0,.05),0 4px 5px rgba(0,0,0,.08),0 2px 4px -1px rgba(0,0,0,.12);border-bottom-left-radius:6px;border-bottom-right-radius:6px}.es-toolbar .es-advanced-filter.es-absolute .es-form{background-color:#fff;border:1px solid #d9d9d9;border-bottom-left-radius:6px;border-bottom-right-radius:6px;border-top:0;padding:20px 20px 20px 10px}.es-toolbar .el-form-item__content,.es-toolbar .el-form-item__label{line-height:32px!important}.es-toolbar .el-button.es-upload{padding:0!important;border:0!important}
+@charset "UTF-8";.es-toolbar{padding:6px 12px;border-bottom:1px solid #d9d9d9;position:relative;background-color:#fff}.es-toolbar .es-toolbar-content{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}.es-toolbar .es-toolbar-content .es-button-content{-webkit-box-flex:1;-ms-flex:1;flex:1}.es-toolbar .es-toolbar-content .es-form{background:0 0}.es-toolbar .es-toolbar-content .es-form .es-form-content{padding:0}.es-toolbar .es-toolbar-content .es-form .el-form-item{margin-bottom:0}.es-toolbar .es-toolbar-content .es-advanced-btn{margin-left:12px}.es-toolbar .es-toolbar-content .es-toolbar-text{line-height:32px}.es-toolbar .es-toolbar-content .es-toolbar-info{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.es-toolbar .es-toolbar-content .es-toolbar-info .es-info{font-size:13px;margin-left:20px}.es-toolbar .es-toolbar-content .el-menu--horizontal{border-bottom:0;position:relative;bottom:-6px}.es-toolbar .es-toolbar-content .el-menu-item{height:32px;line-height:24px}.es-toolbar .es-toolbar-content .el-input__inner,.es-toolbar .es-toolbar-content .es-checkbox-group{height:32px;line-height:32px}.es-toolbar .es-toolbar-content .es-radio-group,.es-toolbar .es-toolbar-content .es-switch-content{line-height:32px}.es-toolbar .es-toolbar-content .el-switch{top:-2px}.es-toolbar .es-toolbar-content .el-button span{line-height:14px}.es-toolbar .es-toolbar-content .el-checkbox:not(:last-child),.es-toolbar .es-toolbar-content .el-radio:not(:last-child){margin-right:8px}.es-toolbar .es-toolbar-content .el-form-item.es-toolbar-item-checkbox+.el-form-item,.es-toolbar .es-toolbar-content .el-form-item.es-toolbar-item-radio+.el-form-item,.es-toolbar .es-toolbar-content .el-form-item.es-toolbar-item-switch+.el-form-item{margin-left:16px}.es-toolbar .es-toolbar-content .el-form-item .el-input__icon{line-height:32px;vertical-align:top}.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner{width:100%;max-width:156px}.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner.el-date-editor--daterange{max-width:300px}.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner.el-date-editor--daterange .el-input__icon,.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner.el-date-editor--daterange .el-range-separator{line-height:24px}.es-toolbar .es-advanced-filter{margin-top:20px;z-index:9}.es-toolbar .es-advanced-filter.es-absolute{position:absolute;left:0;top:45px;right:0;margin-top:0;-webkit-box-shadow:0 1px 10px rgba(0,0,0,.05),0 4px 5px rgba(0,0,0,.08),0 2px 4px -1px rgba(0,0,0,.12);box-shadow:0 1px 10px rgba(0,0,0,.05),0 4px 5px rgba(0,0,0,.08),0 2px 4px -1px rgba(0,0,0,.12);border-bottom-left-radius:6px;border-bottom-right-radius:6px}.es-toolbar .es-advanced-filter.es-absolute .es-form{background-color:#fff;border:1px solid #d9d9d9;border-bottom-left-radius:6px;border-bottom-right-radius:6px;border-top:0;padding:20px 20px 20px 10px}.es-toolbar .el-form-item__content,.es-toolbar .el-form-item__label{line-height:32px!important}.es-toolbar .el-button.es-upload{padding:0!important;border:0!important}

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

@@ -44,9 +44,15 @@
       cursor: pointer;
     }
   }
-  .es-selector-dropdown-item.hover,
-  .es-selector-dropdown-item:hover {
-    background-color: #f5f7fa;
+}
+.es-selector-dropdown-item.hover,
+.es-selector-dropdown-item:hover {
+  background-color: #f5f7fa;
+}
+.es-selector-popover {
+  padding: 0;
+  .es-selector-dropdown__list {
+    padding: 12px;
   }
   .es-selector-dropdown-item {
     font-size: 14px;

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

@@ -83,6 +83,13 @@
       .el-input__inner {
         width: 100%;
         max-width: 156px;
+        &.el-date-editor--daterange {
+          max-width: 300px;
+          .el-input__icon,
+          .el-range-separator {
+            line-height: 24px;
+          }
+        }
       }
     }
   }

package/packages/upload/src/main.vue

@@ -191,6 +191,7 @@ import {
 import util from 'eoss-ui/src/utils/util.js';
 import picture from './picture.js';
 import store from 'eoss-ui/src/utils/store';
+import { Base64 } from 'js-base64';
 export default {
   name: 'EsUpload',
   components: {
@@ -431,7 +432,8 @@ export default {
       source: '',
       excludeNames: '',
       previewAdjunct: previewAdjunct,
-      boxHeight: this.listHeight
+      boxHeight: this.listHeight,
+      kkfileview: null
     };
   },
   computed: {
@@ -721,6 +723,9 @@ export default {
                       })
                       .join(',');
                   }
+                  this.kkfileview = res.results.kkViewRootPath
+                    ? res.results.kkViewRootPath
+                    : null;
                   this.fileSize = res.results.limitFileSize
                     ? res.results.limitFileSize
                     : 0;
@@ -796,6 +801,19 @@ export default {
     handleUpload() {
       this.$refs.upload.submit();
     },
+    openKkfileview(file) {
+      let url = encodeURIComponent(
+        Base64.encode(
+          (typeof this.download === 'string'
+            ? this.download
+            : downloadByAdjunctId) +
+            `?adjunctId=${
+              file.adjunctId || file.response.adjunctId
+            }&fullfilename=${file.originalName}`
+        )
+      );
+      util.win.top.open(`${this.kkfileview}?url=${url}`);
+    },
     handlePreview(res) {
       if (this.preview) {
         if (this.onPreview) {
@@ -818,25 +836,33 @@ export default {
               suffix.includes('xlsx') ||
               suffix.includes('ppt')
             ) {
-              util.win.open(
-                this.host +
-                  (url ? url : previewAdjunctOffice) +
-                  '?cmd=view&bucketName=' +
-                  file.absolutePath +
-                  '&fileId=' +
-                  file.adjunctId +
-                  '&fileName=' +
-                  file.newName
-              );
+              if (this.kkfileview) {
+                this.openKkfileview(file);
+              } else {
+                util.win.top.open(
+                  this.host +
+                    (url ? url : previewAdjunctOffice) +
+                    '?cmd=view&bucketName=' +
+                    file.absolutePath +
+                    '&fileId=' +
+                    file.adjunctId +
+                    '&fileName=' +
+                    file.newName
+                );
+              }
             } else if (suffix.includes('pdf')) {
-              util.win.open(
-                this.host +
-                  (url ? url : previewAdjunct2) +
-                  '/' +
-                  file.originalName +
-                  '?adjunctId=' +
-                  file.adjunctId
-              );
+              if (this.kkfileview) {
+                this.openKkfileview(file);
+              } else {
+                util.win.top.open(
+                  this.host +
+                    (url ? url : previewAdjunct2) +
+                    '/' +
+                    file.originalName +
+                    '?adjunctId=' +
+                    file.adjunctId
+                );
+              }
             } else if (
               suffix.includes('jpge') ||
               suffix.includes('jpg') ||
@@ -866,15 +892,19 @@ export default {
               this.title = file.originalName;
               this.showVideo = true;
             } else {
-              util.win.open(
-                this.host +
-                  (url ? url : this.previewAdjunct) +
-                  '?adjunctId=' +
-                  file.adjunctId
-              );
+              if (this.kkfileview) {
+                this.openKkfileview(file);
+              } else {
+                util.win.top.open(
+                  this.host +
+                    (url ? url : this.previewAdjunct) +
+                    '?adjunctId=' +
+                    file.adjunctId
+                );
+              }
             }
           } else {
-            util.win.open(URL.createObjectURL(file.raw));
+            util.win.top.open(URL.createObjectURL(file.raw));
           }
         }
       }

package/src/index.js

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