cloud-web-corejs 1.0.54-dev.10 → 1.0.54-dev.101

package/src/components/fileLibrary/index.vue

@@ -108,6 +108,9 @@
                    v-if="isEdit && (fileObjAuth.deleteAuth || fileObjAuth.deleteDirAuth)">
           {{ $t2('删除', 'components.fileLibrary.delete') }}
         </el-button>
+        <el-button icon="iconfont icon-shaixuan" class="button-sty" @click="showFilterDialog = true">
+          {{ $t1('高级筛选') }}
+        </el-button>
 
         <template v-for="(fileButton,customToobarButtonIndex) in customToobarButtons">
           <template
@@ -483,7 +486,7 @@
               </el-breadcrumb>
             </el-form-item>
             <el-form-item :label="$t2('文件夹编码','components.fileLibrary.fileCategorySn')">
-              <span>{{editCategory.fileSn}}</span>
+              <span>{{ editCategory.fileSn }}</span>
             </el-form-item>
             <el-form-item :label="$t2('文件夹名称','components.fileLibrary.fileCategoryName')">
               <el-input v-model="editCategory.fileName" clearable class="all-width"/>
@@ -504,7 +507,7 @@
     </div>
     <propertiesDialog v-if="showPropertiesDialog" :visiable.sync="showPropertiesDialog"
                       :editAttachment.sync="editAttachment" :isEdit="isEdit"
-                      :treeNodeArr.sync="treeNodeArr"></propertiesDialog>
+                      :treeNodeArr.sync="treeNodeArr" :option="option"></propertiesDialog>
     <el-image-viewer v-if="showViewer" :on-close="() => {showViewer = false;}" :initial-index.sync="chooseIndex"
                      :url-list="imageDTOs"/>
     <categoryMoveDialog :checkRows.sync="checkRows" v-if="showCategoryMoveDialog"
@@ -522,16 +525,16 @@
                           :formData.sync="advancedFormData" @confirm="searchEvent">
       <template #form>
         <vxe-form :model="advancedFormData" title-width="102px" :inline="true" class="adSearchForm">
-          <vxe-form-item title="属性名称:">
-            <template v-slot>
-              <el-input v-model="advancedFormData.attributeName" clearable/>
-            </template>
-          </vxe-form-item>
-          <vxe-form-item title="属性值:">
-            <template v-slot>
-              <el-input v-model="advancedFormData.attributeValue" clearable/>
-            </template>
-          </vxe-form-item>
+          <!--          <vxe-form-item title="属性名称:">
+                      <template v-slot>
+                        <el-input v-model="advancedFormData.attributeName" clearable/>
+                      </template>
+                    </vxe-form-item>
+                    <vxe-form-item title="属性值:">
+                      <template v-slot>
+                        <el-input v-model="advancedFormData.attributeValue" clearable/>
+                      </template>
+                    </vxe-form-item>-->
           <!--          <vxe-form-item title="状态:">
                       <template v-slot>
                         <el-select v-model="advancedFormData.status" clearable>
@@ -581,6 +584,9 @@
     <videoDialog v-if="showVideoDialog" :visiable.sync="showVideoDialog" :option="videoOption"></videoDialog>
     <fileObjAuthDialog v-if="showFileObjAuthDialog" :visiable.sync="showFileObjAuthDialog"
                        :fileObjId="currentFileCategory ? currentFileCategory.id:0" :treeNodeArr="treeNodeArr"/>
+
+    <filterDialog v-if="showFilterDialog" :visiable.sync="showFilterDialog" queryType="pcp" :treeNodeArr="treeNodeArr"
+                  :currentFileCategory="currentFileCategory" @openFileDirs="openFileDirs"></filterDialog>
   </div>
 </template>
 
@@ -588,16 +594,18 @@
 
 import mixins from './mixins/indexMixins';
 import fileObjAuthDialog from "../../components/fileLibrary/fileObjAuthDialog";
+import filterDialog from "./filterDialog.vue";
 
 export default {
   name: 'ledgerLibrary',
   mixins: [mixins],
-  components: {fileObjAuthDialog},
+  components: {fileObjAuthDialog, filterDialog},
   data() {
     return {
       showFileObjAuthDialog: false,
       fileObjAuth: {},
-      popAnnexFilter: false
+      popAnnexFilter: false,
+      showFilterDialog: false
     }
   }
 }
@@ -683,5 +691,8 @@ export default {
     height: calc(100vh - 215px);
   }
 }
-#labBtn{height:calc(100vh - 34px)}
+
+#labBtn {
+  height: calc(100vh - 34px)
+}
 </style>

package/src/components/fileLibrary/mixins/fileObjAuthDialogMixin.js

@@ -17,7 +17,7 @@ modules = {
   components: {
     editView, userDialog, positionDialog, saleOrgDialog, roleDialog, fileObjAuthEditDialog, fileObjNotifyEdit
   },
-  inject: ['current_prefix'],
+  inject: ['current_prefix', 'getFileStoreArea'],
   mounted() {
     this.initTableList();
   },
@@ -56,6 +56,11 @@ modules = {
       showFileObjNotifyEdit: true
     };
   },
+  computed: {
+    fileStoreArea() {
+      return this.getFileStoreArea();
+    }
+  },
   methods: {
     searchEvent() {
       this.$refs['table-m1'].commitProxy('reload');
@@ -285,7 +290,7 @@ modules = {
               }
             }
           },
-          {
+          ...(this.fileStoreArea.toDownWatermark ? [{
             title: this.$t1('下载打水印 '),
             field: 'downWatermarkAuth',
             width: 150,
@@ -297,7 +302,7 @@ modules = {
                 ];
               }
             }
-          },
+          }] : []),
           {title: this.$t2('创建人', 'system.label.createBy'), field: 'createBy', width: 150},
           {title: this.$t2('创建时间', 'system.label.createDate'), field: 'createDate', width: 150},
           {title: this.$t2('更新人', 'system.label.modifyBy'), field: 'modifyBy', width: 150},

package/src/components/fileLibrary/mixins/fileObjAuthEditDialogMixin.js

@@ -14,7 +14,7 @@ modules = {
   components: {
     userDialog, positionDialog, saleOrgDialog, roleDialog
   },
-  inject: ['current_prefix'],
+  inject: ['current_prefix', 'getFileStoreArea'],
   data() {
     return {
       isEdit: false,
@@ -56,6 +56,9 @@ modules = {
       let prevTitle = this.currentRow ? this.$t2('查看', 'system.button.check') : this.$t2('新增', 'system.button.add')
       let title = prevTitle + this.$t2('文件权限', 'components.fileLibrary.fileAuth')
       return title;
+    },
+    fileStoreArea(){
+      return this.getFileStoreArea();
     }
   },
   mounted() {

package/src/components/fileLibrary/mixins/fileObjAuthEditMixin.js

@@ -13,7 +13,7 @@ modules = {
   components: {
     userDialog, positionDialog, saleOrgDialog, roleDialog
   },
-  inject: ['current_prefix'],
+  inject: ['current_prefix', 'getFileStoreArea'],
   data() {
     return {
       isEdit: false,

package/src/components/fileLibrary/mixins/indexMixins.js

@@ -44,6 +44,9 @@ modules = {
       getObjectForeignId: () => {
         return this.objectForeignId;
       },
+      getFileStoreArea: () => {
+        return this.fileStoreArea;
+      }
     };
   },
   async created() {
@@ -73,6 +76,7 @@ modules = {
       billDialogContent: null,
       checkBillDatas: [],
       title: "",
+      fileStoreArea: {},
       folderStatus: false,
       filterText: "",
       defaultProps: {
@@ -258,6 +262,34 @@ modules = {
     }
   },
   methods: {
+    openFileDirs(row) {
+      let keys = row.treePath.split(',').filter(item => !!item);
+      let size = keys.length
+      let tree = this.$refs.tree
+
+      let parent = null;
+      let loopDo = (index) => {
+        if (size <= index) return
+        let key = keys[index]
+        let node = tree.getNode(key + "");
+        let data = node.data;
+        if (size == index + 1) {
+          tree.setCurrentKey(data);
+          this.handleNodeClick(data, node, this);
+          return
+        }
+
+        if (!data.leaf) {
+          node.expand(() => {
+            loopDo(index + 1)
+          })
+        }
+      }
+      this.getTopNode().expand(() => {
+        loopDo(0)
+      })
+
+    },
     getTopNode() {
       return this.$refs.tree.root.childNodes[0];
     },
@@ -1004,36 +1036,44 @@ modules = {
           rows.forEach((value) => {
             value.leaf = !value.hasChild;
           });
+          let items = [];
           if (node.level === 0) {
+            let item = {
+              parent: null,
+              fileName: this.title,
+              leaf: rows.length == 0,
+              allFileBtn: true,
+              id: 0,
+              children: rows,
+            };
+            items.push(item);
             setTimeout(() => {
               this.$refs.tree.setCurrentKey(node.childNodes[0].data);
               this.handleNodeData(node.childNodes[0]);
               node.childNodes[0].expand();
+              if (this.option.treeExpandAll) {
+                //默认全部展开树分类
+                node.childNodes[0].childNodes.forEach(item => {
+                  if (!item.data.leaf) item.expand();
+                })
+              }
             }, 200);
             this.$nextTick(() => {
               callback && callback();
             });
             this.searchEvent();
           } else {
+            items = rows;
             this.$nextTick(() => {
+              if (this.option.treeExpandAll) {
+                //默认全部展开树分类
+                node.childNodes.forEach(item => {
+                  if (!item.data.leaf) item.expand();
+                })
+              }
               callback && callback();
             });
           }
-          let items = [];
-          if (node.level === 0) {
-            let item = {
-              parent: null,
-              fileName: this.title,
-              leaf: rows.length == 0,
-              allFileBtn: true,
-              id: 0,
-              children: rows,
-            };
-            items.push(item);
-          } else {
-            items = rows;
-          }
-
           resolve(items);
         },
       });
@@ -1403,6 +1443,7 @@ modules = {
         success: (res) => {
           let fileStoreArea = res.objx;
           if (fileStoreArea) {
+            this.fileStoreArea = fileStoreArea;
             this.title = fileStoreArea.storeAreaName;
             this.$nextTick(() => {
               treeScollx({target: this, type: "default"});
@@ -1749,11 +1790,12 @@ modules = {
       }
     },
     downloadSingerFile(attachment) {
+
       let fileObjAuth = this.fileObjAuth;
       if (attachment.dirs || !fileObjAuth.downloadAuth) return
       let url = attachment.domain + attachment.url;
-      let loginAccount = this.$store.getters.loginAccount;
-      if (fileObjAuth.downWatermarkAuth) {
+      if (this.fileStoreArea.toDownWatermark && fileObjAuth.downWatermarkAuth) {
+        let loginAccount = this.$store.getters.loginAccount;
         url += '?_w=' + encode(loginAccount)
       }
       this.$commonFileUtil.downloadFile(url, attachment.fileName)

package/src/components/fileLibrary/mixins/propertiesDialogMixins.js

@@ -8,7 +8,8 @@ modules = {
     },
     treeNodeArr: {
       type: Array
-    }
+    },
+    option:Object
   },
   inject: ['current_prefix', 'getTitle'],
   components: {},

package/src/components/fileLibrary/propertiesDialog.vue

@@ -58,6 +58,10 @@
                     <th>{{ $t2('所属对象描述', 'components.fileLibrary.note') }}</th>
                     <td colspan="3">{{ attachmentDTO.note }}</td>
                   </tr>
+                  <tr>
+                    <th>{{ $t1('文件类型名') }}</th>
+                    <td colspan="3">{{ attachmentDTO.fileTypeName }}</td>
+                  </tr>
                   <tr>
                     <th>{{ $t2('文件大小', 'components.fileLibrary.fileSize') }}</th>
                     <td>{{ formatFileSize(attachmentDTO.fileSize) }}</td>