Merge remote-tracking branch 'origin/master'

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java

@@ -879,9 +879,15 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         List<String> fieldFile = fieldFileList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
         //下拉类型的字段
         List<String> fieldPull = fieldPullList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
+        //过滤出树形字段
+        List<OnlCgformField> treeFieldList = fieldList.stream()
+                .filter(e -> FieldTypeEnum.TREE.getValue().equals(e.getFieldShowType()))
+                .collect(Collectors.toList());
 
         //数据字典
         List<SysDictItem> sysDictItems = sysDictItemServiceImpl.selectItemsAll();
+        //树形数据字典
+        List<SysCategory> categoryList = sysCategoryService.list();
         //下拉选处理数据字典
         for (Map.Entry<String, Object> entry : dataList.get(0).entrySet()) {
             List<OnlCgformField> collect = fieldPullList.stream()
@@ -889,6 +895,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                     .collect(Collectors.toList());
             //下拉选处理数据字典
             dictItem(sysDictItems, entry, collect, cut);
+            treeDictItem(categoryList, entry, treeFieldList, cut);
         }
         for (Map.Entry<String, Object> entry : mapTemp.entrySet()) {
             List<OnlCgformField> collect = fieldPullList.stream()
@@ -896,6 +903,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                     .collect(Collectors.toList());
             //下拉选处理数据字典
             dictItem(sysDictItems, entry, collect, cut);
+            treeDictItem(categoryList, entry, treeFieldList, cut);
         }
 
         StringBuilder sb = new StringBuilder();

jero-web/public/api_address_config.js

@@ -9,4 +9,4 @@ window._CONFIG['staticDomainURL'] = window._CONFIG['domianURL'] + '/sys/common/d
 window._CONFIG['pdfDomainURL'] = window._CONFIG['domianURL'] + '/sys/common/pdf/pdfPreviewIframe'
 window._CONFIG['casPrefixUrl'] = 'http://cas.example.org:8443/cas'
 // 预览文件地址
-window._CONFIG['onlinePreviewDomainURL'] = 'http://127.0.0.1:8012/onlinePreview'
+window._CONFIG['onlinePreviewDomainURL'] = 'http://cas.example.org:8443/onlinePreview'

jero-web/src/components/dict/JDictSelectTag.vue

@@ -8,7 +8,7 @@
   </a-radio-group>
 
   <a-select v-else-if="tagType=='select'" :getPopupContainer = "getPopupContainer" :placeholder="placeholder" :disabled="disabled" :value="getValueSting" @change="handleInput">
-    <a-select-option :value="undefined">{{$t('pleaseSelect')}}</a-select-option>
+    <a-select-option :value="null">{{$t('pleaseSelect')}}</a-select-option>
     <a-select-option v-for="(item, key) in dictOptions" :key="key" :value="item.value">
       <span style="display: inline-block;width: 100%" :title=" item.text || item.label ">
         {{ item.text || item.label }}

jero-web/src/components/uploadFile/file.vue

@@ -196,10 +196,22 @@
         this.fileList = []
       },
       preview(file) {
-        if (file.response) {
+        console.log(file)
-          downloadFile('/sys/common/download', file.response.result.fileName, { id: file.response.result.id })
+        let fileQuery = file.response ? file.response.result : file
+        let fileName = fileQuery.fileName
+        let index1 = fileName.lastIndexOf('.')
+        let index2 = fileName.length
+        let fileSuffix = fileName.substring(index1, index2)
+        if (fileSuffix == '.pdf') {
+          window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id))
+        } else if (fileSuffix == '.docx') {
+          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + encodeURIComponent(this.downLoadFileUrl + '/' + fileQuery.id)
+          window.open(url, '_blank')
+        } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') {
+          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + encodeURIComponent(this.downLoadFileUrl + '/' + fileQuery.id)
+          window.open(url, '_blank')
         } else {
-          downloadFile('/sys/common/download', file.fileName, { id: file.id })
+          downloadFile('/sys/common/download', fileQuery.fileName, { id: fileQuery.id })
         }
       }
     }