cloud-web-corejs 1.0.75 → 1.0.77

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

@@ -1,13 +1,15 @@
-import {treeScollx} from "../../../utils/global.js";
-import ElImageViewer from "../../../components/VabUpload/image-viewer";
-import propertiesDialog from "../propertiesDialog";
-import categoryMoveDialog from "../categoryMoveDialog";
-import fileHistoryDialog from "../fileHistoryDialog";
-import shareDialog from "../shareDialog";
-import recycleBinDialog from "../recycleBinDialog";
-import videoDialog from "../../../components/video/dialog";
-import userDialog from "../../../views/user/user/dialog";
+import {treeScollx} from "@base/utils/global.js";
+import ElImageViewer from "@base/components/VabUpload/image-viewer";
+import propertiesDialog from "@base/components/fileLibrary/propertiesDialog";
+import categoryMoveDialog from "@base/components/fileLibrary/categoryMoveDialog";
+import fileHistoryDialog from "@base/components/fileLibrary/fileHistoryDialog";
+import shareDialog from "@base/components/fileLibrary/shareDialog";
+import recycleBinDialog from "@base/components/fileLibrary/recycleBinDialog";
+import videoDialog from "@base/components/video/dialog";
+import userDialog from "@base/views/user/user/dialog";
 import {encode} from "js-base64";
+import fileObjAuthDialog from "@base/components/fileLibrary/fileObjAuthDialog";
+import filterDialog from "@base/components/fileLibrary/filterDialog.vue";
 
 let modules;
 modules = {
@@ -25,6 +27,8 @@ modules = {
     recycleBinDialog,
     videoDialog,
     userDialog,
+    fileObjAuthDialog,
+    filterDialog
   },
   provide() {
     return {
@@ -154,6 +158,10 @@ modules = {
       end_y: 0,
       scrollTop1: 0,
       scrollTop2: 0,
+      showFileObjAuthDialog: false,
+      fileObjAuth: {},
+      popAnnexFilter: false,
+      showFilterDialog: false
     };
   },
   computed: {
@@ -262,6 +270,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];
     },

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

@@ -19,10 +19,14 @@ modules = {
       falseValue: false,
       vxeOption: {},
       showContent: true,
-      attachmentDTO: {},
+      attachmentDTO: {
+        fileAttachAttributeDTOs:[]
+      },
+      fileAttachObjDTOs:[],
       // current_prefix: '',
       filePrefix: '',
-      fileName: ''
+      fileName: '',
+      vxeOption2:{}
     };
   },
   watch: {
@@ -48,6 +52,7 @@ modules = {
   mounted() {
     this.getData();
     this.initTableM1();
+    this.initTableM2();
   },
   methods: {
     initFilePrefix() {
@@ -92,6 +97,7 @@ modules = {
     },
     reloadContent() {
       this.getAttributes();
+      this.getObjs();
     },
     getData() {
       this.$http({
@@ -105,6 +111,7 @@ modules = {
         success: res => {
           this.attachmentDTO = res.objx || {};
           this.getAttributes();
+          this.getObjs();
         }
       });
     },
@@ -122,6 +129,21 @@ modules = {
         }
       });
     },
+    getObjs() {
+      this.$http({
+        url: this.current_prefix + '/file_attach/obj/list',
+        method: 'post',
+        data: {
+          stringOne: this.attachmentDTO.fileSn
+        },
+        isLoading: true,
+        // modalStrictly: true,
+        success: res => {
+          // this.$set(this.attachmentDTO, 'fileAttachObjDTOs', res.objx || []);
+          this.fileAttachObjDTOs = res.objx || []
+        }
+      });
+    },
     initTableM1() {
       //明细
       var that = this;
@@ -188,6 +210,43 @@ modules = {
         temp = temp.toFixed(2);
         return temp + 'GB';
       }
+    },
+    initTableM2() {
+      //明细
+      var that = this;
+      const tableRef = 'table-m2';
+      const tableOption = {
+        vue: this,
+        tableRef: tableRef,
+        tableName: 'user_fileLibrary_propertiesDialog_list-m2',
+        columns: [
+          {
+            type: 'checkbox',
+            fixed: 'left',
+            width: 48,
+            resizable: false
+          },
+          {
+            title: this.$t1('关联对象编码'),
+            field: 'objSn',
+            width: 200
+          },
+          {
+            title: this.$t1('关联对象名称'),
+            field: 'objName',
+            width: 200
+          },
+          {
+            width: 50,
+            fixed: 'right',
+            title: '',
+            sortable: false
+          }
+        ]
+      };
+      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
+        this.vxeOption2 = opts;
+      });
     }
   }
 };

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

@@ -1,4 +1,4 @@
-import ElImageViewer from '../../../components/VabUpload/image-viewer';
+import ElImageViewer from '@base/components/VabUpload/image-viewer';
 import recycleBinPropertiesDialog from "../recycleBinPropertiesDialog";
 import categoryMoveDialog from '../categoryMoveDialog'
 

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"><b>{{ attachmentDTO.fileTypeName }}</b></td>
+                  </tr>
                   <tr>
                     <th>{{ $t2('文件大小', 'components.fileLibrary.fileSize') }}</th>
                     <td>{{ formatFileSize(attachmentDTO.fileSize) }}</td>
@@ -129,6 +133,20 @@
                 </vxe-grid>
               </template>
             </baseTabPane>
+            <baseTabPane :label="$t1('文件关联对象')">
+              <template #button></template>
+              <template #default>
+                <vxe-grid
+                  ref="table-m2"
+                  class="vxe-tableNo"
+                  height="224px"
+                  :data="fileAttachObjDTOs"
+                  v-bind="vxeOption2"
+                  @resizable-change="$vxeTableUtil.onColumnWitchChange"
+                  @custom="$vxeTableUtil.customHandle"
+                ></vxe-grid>
+              </template>
+            </baseTabPane>
           </baseTabs>
         </el-form>
       </div>

package/src/components/fileLibrary/shareDialog.vue

@@ -46,7 +46,7 @@
 </template>
 
 <script>
-import mixins from "../../components/fileLibrary/mixins/shareDialogMixins";
+import mixins from "./mixins/shareDialogMixins";
 
 export default {
   mixins:[mixins]