cloud-web-corejs 1.0.54-dev.22 → 1.0.54-dev.221

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

@@ -1,7 +1,7 @@
-import userDialog from "../../../views/user/user/dialog";
-import positionDialog from "../../../views/user/position/dialog";
-import saleOrgDialog from "../../../views/user/sale_org/dialog";
-import roleDialog from "../../../views/user/role/dialog";
+import userDialog from "@base/views/user/user/dialog";
+import positionDialog from "@base/views/user/position/dialog";
+import saleOrgDialog from "@base/views/user/sale_org/dialog";
+import roleDialog from "@base/views/user/role/dialog";
 
 let modules = {};
 modules = {
@@ -9,17 +9,20 @@ modules = {
     _dataId: [String, Number],
     fileObjId: Number,
     treeNodeArr: Array,
-    currentRow: Object
+    currentRow: Object,
   },
   components: {
-    userDialog, positionDialog, saleOrgDialog, roleDialog
+    userDialog,
+    positionDialog,
+    saleOrgDialog,
+    roleDialog,
   },
-  inject: ['current_prefix'],
+  inject: ["current_prefix", "getFileStoreArea"],
   data() {
     return {
       isEdit: false,
-      tabIndex: 'first',
-      dataId: '',
+      tabIndex: "first",
+      dataId: "",
       showDialog: true,
       fileObjAuth: {
         saleOrgName: null,
@@ -37,37 +40,41 @@ modules = {
         deleteAuth: 1,
         deleteDirAuth: 1,
         historyAuth: 1,
-        shareAuth: 1
+        shareAuth: 1,
+        downWatermarkAuth: 0,
+        authAuth: 1,
       },
       showUserDialog: false,
       showPositionDialog: false,
       showSaleOrgDialog: false,
-      showRoleDialog: false
+      showRoleDialog: false,
     };
   },
   created() {
     if (this.currentRow) {
-      this.fileObjAuth = this.$baseLodash.cloneDeep(this.currentRow)
+      this.fileObjAuth = this.$baseLodash.cloneDeep(this.currentRow);
     }
-    ;
   },
   computed: {
     title() {
-      let prevTitle = this.currentRow ? this.$t2('查看', 'system.button.check') : this.$t2('新增', 'system.button.add')
-      let title = prevTitle + this.$t2('文件权限', 'components.fileLibrary.fileAuth')
+      let prevTitle = this.currentRow
+        ? this.$t2("查看", "system.button.check")
+        : this.$t2("新增", "system.button.add");
+      let title =
+        prevTitle + this.$t2("文件权限", "components.fileLibrary.fileAuth");
       return title;
-    }
-  },
-  mounted() {
-
+    },
+    fileStoreArea() {
+      return this.getFileStoreArea();
+    },
   },
+  mounted() {},
   methods: {
-
     saveData() {
-      this.$refs.editForm.$baseValidate(valid => {
+      this.$refs.editForm.$baseValidate((valid) => {
         if (valid) {
-            this.$emit("confirm", this.fileObjAuth);
-            this.handleClose()
+          this.$emit("confirm", this.fileObjAuth);
+          this.handleClose();
         }
       });
     },
@@ -101,8 +108,8 @@ modules = {
     },
     handleClose() {
       this.showDialog = false;
-      this.$emit("update:visiable", false)
-    }
-  }
+      this.$emit("update:visiable", false);
+    },
+  },
 };
 export default modules;

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

@@ -1,7 +1,7 @@
-import userDialog from "../../../views/user/user/dialog";
-import positionDialog from "../../../views/user/position/dialog";
-import saleOrgDialog from "../../../views/user/sale_org/dialog";
-import roleDialog from "../../../views/user/role/dialog";
+import userDialog from "@base/views/user/user/dialog";
+import positionDialog from "@base/views/user/position/dialog";
+import saleOrgDialog from "@base/views/user/sale_org/dialog";
+import roleDialog from "@base/views/user/role/dialog";
 
 let modules = {};
 modules = {
@@ -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

@@ -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 {
@@ -44,6 +48,9 @@ modules = {
       getObjectForeignId: () => {
         return this.objectForeignId;
       },
+      getFileStoreArea: () => {
+        return this.fileStoreArea;
+      }
     };
   },
   async created() {
@@ -73,6 +80,7 @@ modules = {
       billDialogContent: null,
       checkBillDatas: [],
       title: "",
+      fileStoreArea: {},
       folderStatus: false,
       filterText: "",
       defaultProps: {
@@ -150,6 +158,10 @@ modules = {
       end_y: 0,
       scrollTop1: 0,
       scrollTop2: 0,
+      showFileObjAuthDialog: false,
+      fileObjAuth: {},
+      popAnnexFilter: false,
+      showFilterDialog: false
     };
   },
   computed: {
@@ -258,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];
     },
@@ -1004,36 +1044,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 +1451,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,12 +1798,13 @@ 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) {
-        url += '?_w=' + encode(loginAccount)
+      if (this.fileStoreArea.toDownWatermark && fileObjAuth.downWatermarkAuth) {
+        let loginAccount = this.$store.getters.loginAccount;
+        url += '?_w=' + encodeURIComponent(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: {},
@@ -18,10 +19,14 @@ modules = {
       falseValue: false,
       vxeOption: {},
       showContent: true,
-      attachmentDTO: {},
+      attachmentDTO: {
+        fileAttachAttributeDTOs:[]
+      },
+      fileAttachObjDTOs:[],
       // current_prefix: '',
       filePrefix: '',
-      fileName: ''
+      fileName: '',
+      vxeOption2:{}
     };
   },
   watch: {
@@ -47,6 +52,7 @@ modules = {
   mounted() {
     this.getData();
     this.initTableM1();
+    this.initTableM2();
   },
   methods: {
     initFilePrefix() {
@@ -91,6 +97,7 @@ modules = {
     },
     reloadContent() {
       this.getAttributes();
+      this.getObjs();
     },
     getData() {
       this.$http({
@@ -104,6 +111,7 @@ modules = {
         success: res => {
           this.attachmentDTO = res.objx || {};
           this.getAttributes();
+          this.getObjs();
         }
       });
     },
@@ -121,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;
@@ -187,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]