From 7af547f373ee9143052bcbaaef85e583ba529833 Mon Sep 17 00:00:00 2001
From: zhengzhou <zhengzhou@hotmail.com>
Date: Sun, 25 Apr 2021 11:38:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=90=8E=E5=8F=B0=20=20?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=A8=A1=E6=9D=BF=E6=B7=BB=E5=8A=A0=E4=BC=81?=
 =?UTF-8?q?=E4=B8=9A=E6=A8=A1=E6=9D=BF=E6=96=87=E4=BB=B6=E7=9A=84=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/services/template.js                      |   7 +-
 .../workspace/components/add-file-button.vue  |   3 +-
 .../main_web/workspace/workspace.new.vue      |   2 +-
 .../template/components/template-files.vue    | 115 ++++++++++++------
 4 files changed, 83 insertions(+), 44 deletions(-)

diff --git a/src/services/template.js b/src/services/template.js
index 80f48fc8..63d83bc6 100644
--- a/src/services/template.js
+++ b/src/services/template.js
@@ -125,8 +125,11 @@ export async function fileExchange(unit) {
  * 查询模板节点下的所有样本文件
  * @param {string} nodeId 
  */
-export async function queryAllTemplateNodeModelFile(nodeId) {
-  const res = await fetchApi('template/queryAllTemplateNodeModelFile', { templateNodeId: nodeId });
+export async function queryAllTemplateNodeModelFile(nodeId, companyId) {
+  const res = await fetchApi('template/queryAllTemplateNodeModelFile', { templateNodeId: nodeId, companyId: companyId ? undefined : '0' });
+  if(companyId && res.Data) {
+    res.Data = res.Data.filter(file => file.CompanyId === '0' || file.CompanyId === companyId);
+  }
   return wrapErrorHint(res);
 }
 /**
diff --git a/src/views/main_web/workspace/components/add-file-button.vue b/src/views/main_web/workspace/components/add-file-button.vue
index 9634be9a..1e75100b 100644
--- a/src/views/main_web/workspace/components/add-file-button.vue
+++ b/src/views/main_web/workspace/components/add-file-button.vue
@@ -101,6 +101,7 @@ export default {
       isShowNewFiledialog: false,
       isShowNewTemplateFileDialog: false,//新建样板文件弹窗
       listTempFiles: [],
+      companyId: sessionStorage.companyId,
     }
   },
   mounted() {
@@ -133,7 +134,7 @@ export default {
       const currentNodeFolderId = this.currentNodeFolder?.nodeId;
       if(!currentNodeFolderId) { return; }
 
-      const res = await queryAllTemplateNodeModelFile(currentNodeFolderId);
+      const res = await queryAllTemplateNodeModelFile(currentNodeFolderId, this.companyId);
       if (res.Code !== 0) return;
       this.listTempFiles = (res.Data || []).map(f => firstCharToLowerCase(f));
     },
diff --git a/src/views/main_web/workspace/workspace.new.vue b/src/views/main_web/workspace/workspace.new.vue
index c7d0c7cb..2fa6670a 100644
--- a/src/views/main_web/workspace/workspace.new.vue
+++ b/src/views/main_web/workspace/workspace.new.vue
@@ -520,7 +520,7 @@ import AddFileButton from './components/add-file-button';
 import vuetify from "vuetify";
 import system from '@/services/system';
 import { getUserInfo, getUserListByNode } from '@/services/user.js';
-import { queryAllTemplateNodeModelFile, queryNestTemplateByProjectId } from '@/services/template.js';
+import { queryNestTemplateByProjectId } from '@/services/template.js';
 import * as services from './service';
 import { firstCharToLowerCase, firstCharToUpperCase, notify } from '@/utils/tool';
 import FileItem from './components/file-item';
diff --git a/src/views/manage_company/template/components/template-files.vue b/src/views/manage_company/template/components/template-files.vue
index f2f03822..16272c24 100644
--- a/src/views/manage_company/template/components/template-files.vue
+++ b/src/views/manage_company/template/components/template-files.vue
@@ -16,28 +16,40 @@
         模板样板文件
       </div>
       <div class="template_files_right_list">
-        <div class="template_files_right_list_item">
-          <div>文件名</div>
-          <div>文件扩展名</div>
-          <div>文件大小</div>
+        <div
+          class="template_files_right_list_item"
+          v-for="file in commonFileList"
+          :key="file.id"
+        >
+          <div>{{file.fileName}}</div>
+          <div>{{file.extension}}</div>
+          <div>{{file.fileSize | resolveFileSize}}</div>
           <div />
         </div>
       </div>
       <div class="template_files_right_title">
         新增样板文件
-        <file-uploader
-          :on-success="uploadFileSuccess"
-        >
-          <el-button class="title_button" type="primary">上传文件</el-button>
+        <file-uploader :on-success="uploadFileSuccess">
+          <el-button
+            class="title_button"
+            type="primary"
+          >上传文件</el-button>
         </file-uploader>
       </div>
       <div class="template_files_right_list">
-        <div class="template_files_right_list_item">
-          <div>文件名</div>
-          <div>文件扩展名</div>
-          <div>文件大小</div>
+        <div
+          class="template_files_right_list_item"
+          v-for="file in companyFileList"
+          :key="file.id"
+        >
+          <div>{{file.fileName}}</div>
+          <div>{{file.extension}}</div>
+          <div>{{file.fileSize | resolveFileSize}}</div>
           <div>
-            <el-button class="del_button" type="text">删除</el-button>
+            <el-button
+              class="del_button"
+              type="text"
+            >删除</el-button>
           </div>
         </div>
       </div>
@@ -46,9 +58,10 @@
 </template>
 
 <script>
-import { firstCharToLowerCase } from '@/utils/tool';
-import FileUploader from '@/components/file-uploader';
-import { wrapOssProtocol } from '@/services/oss';
+import { firstCharToLowerCase, notify } from "@/utils/tool";
+import FileUploader from "@/components/file-uploader";
+import { wrapOssProtocol } from "@/services/oss";
+import { addTemplateNodeModelFile, queryAllTemplateNodeModelFile } from "@/services/template";
 
 export default {
   components: {
@@ -64,49 +77,63 @@ export default {
       this.selectedNode = list[0];
     },
     selectedNode(node) {
-      if(!node) { return; }
+      this.commonFileList = [];
+      this.companyFileList = [];
+      if (!node) {
+        return;
+      }
       this.fetchNodeTemplateFiles(node);
-    }
+    },
   },
   data() {
     return {
       selectedNode: this.nodeList[0],
-    }
+      commonFileList: [],
+      companyFileList: [],
+    };
   },
   mounted() {
     this.fetchNodeTemplateFiles(this.selectedNode);
   },
   methods: {
     async fetchNodeTemplateFiles(node) {
-      // todo
-      const  res = await this.$fetchApi('template/queryAllTemplateNodeModelFile', { templateNodeId : node.id, companyId: this.companyId });
-      const fileList = (res.Data || []).map(firstCharToLowerCase);
-      console.log(fileList);
-
+      const filesRes = await queryAllTemplateNodeModelFile(node.id, this.companyId);
+      const [commonFileList, companyFileList] = (filesRes.Data || []).reduce((cArr, upperFile) => {
+        const file = firstCharToLowerCase(upperFile);
+        if(file.companyId === '0') {
+          cArr[0].push(file);
+        } else if (file.companyId === this.companyId) {
+          cArr[1].push(file);
+        }
+        return cArr;
+      }, [[], []]);
+      this.commonFileList = commonFileList;
+      this.companyFileList = companyFileList;
     },
     /**
      * 上传成功保存文件
      */
-    async uploadFileSuccess (ossFile) {
+    async uploadFileSuccess(ossFile) {
       const currentNode = this.selectedNode;
       const ossUrl = wrapOssProtocol(ossFile.ossUrl);
-      const fileNameStrs = ossFile.name.split('.');
+      const fileNameStrs = ossFile.name.split(".");
       const extension = fileNameStrs.pop();
       const param = {
         Extension: extension,
-        FileName: fileNameStrs.join('.'),
+        FileName: fileNameStrs.join("."),
         FileSize: ossFile.size,
         OssUrl: ossUrl,
         templateNodeId: currentNode.id,
+        CompanyId: this.companyId,
       };
-      debugger;
-      // const res = await services.addTemplateNodeModelFile(param);
-      // if(res.Code !== 0) return;
-      // notify.success('文件已上传。');
+      const res = await addTemplateNodeModelFile(param);
+      if (res.Code !== 0) return;
+      notify.success("文件已上传。");
+      this.fetchNodeTemplateFiles(currentNode);
       // this.nodeClick(currentNode);
     },
   },
-}
+};
 </script>
 
 <style lang="scss" scoped>
@@ -114,8 +141,9 @@ export default {
   display: flex;
   flex-direction: row;
   height: 100%;
-  border-radius: 8px 8px 0 0 ;
-  box-shadow: 0px 4px 10px 1px rgba(0, 0, 0, 0.1), 0px 1px 3px 0px rgba(0, 0, 0, 0.1);
+  border-radius: 8px 8px 0 0;
+  box-shadow: 0px 4px 10px 1px rgba(0, 0, 0, 0.1),
+    0px 1px 3px 0px rgba(0, 0, 0, 0.1);
   overflow: hidden;
   &_left {
     flex: none;
@@ -160,7 +188,7 @@ export default {
         height: 40px;
         line-height: 40px;
         border-bottom: 1px solid rgba(#111111, 0.1);
-        >div {
+        > div {
           position: relative;
           padding-left: 10px;
           font-size: 12px;
@@ -168,13 +196,19 @@ export default {
             padding-left: 24px;
             flex: 407;
           }
-          &:nth-child(2) { flex: 139; }
-          &:nth-child(3) { flex: 140; }
-          &:nth-child(4) { flex: 70; }
+          &:nth-child(2) {
+            flex: 139;
+          }
+          &:nth-child(3) {
+            flex: 140;
+          }
+          &:nth-child(4) {
+            flex: 70;
+          }
           &:nth-child(2),
           &:nth-child(3) {
             &:before {
-              content: '';
+              content: "";
               position: absolute;
               top: 0;
               bottom: 0;
@@ -201,7 +235,8 @@ export default {
     line-height: 28px;
     font-size: 12px;
     cursor: pointer;
-    &:hover, &.item_active {
+    &:hover,
+    &.item_active {
       background-color: rgba(50, 50, 60, 0.1);
     }
   }