cloud-web-corejs 1.0.54-dev.29 → 1.0.54-dev.291

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,25 +584,18 @@
     <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>
 
 <script>
 
 import mixins from './mixins/indexMixins';
-import fileObjAuthDialog from "../../components/fileLibrary/fileObjAuthDialog";
-
 export default {
   name: 'ledgerLibrary',
-  mixins: [mixins],
-  components: {fileObjAuthDialog},
-  data() {
-    return {
-      showFileObjAuthDialog: false,
-      fileObjAuth: {},
-      popAnnexFilter: false
-    }
-  }
+  mixins: [mixins]
 }
 </script>
 <style lang="scss" scoped>
@@ -683,5 +679,8 @@ export default {
     height: calc(100vh - 215px);
   }
 }
-#labBtn{height:calc(100vh - 34px)}
+
+#labBtn {
+  height: calc(100vh - 34px)
+}
 </style>

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

@@ -1,5 +1,5 @@
 let modules;
-import {treeScolly} from "../../../utils/global.js";
+import {treeScolly} from "@base/utils/global.js";
 
 modules = {
   props: {

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

@@ -1,5 +1,5 @@
 let modules;
-import {treeScolly} from "../../../utils/global.js";
+import {treeScolly} from "@base/utils/global.js";
 
 modules = {
   props: {

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

@@ -1,5 +1,5 @@
-import {selectDialogMixins} from '../../../mixins/selectDialog/index.js';
-import ElImageViewer from '../../../components/VabUpload/image-viewer';
+import {selectDialogMixins} from '@base/mixins/selectDialog/index.js';
+import ElImageViewer from '@base/components/VabUpload/image-viewer';
 
 let modules;
 modules = {