From ff1d6c3ce85e0c58609daef4cb48337b4f0b3188 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Tue, 23 Nov 2021 16:30:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=8F=8A=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/api.js             |  1 +
 src/views/data/Framework.vue | 76 ++++++++++--------------------------
 src/views/data/Product.vue   | 25 ++++++------
 3 files changed, 35 insertions(+), 67 deletions(-)

diff --git a/src/utils/api.js b/src/utils/api.js
index 761f3aa..9783b3a 100644
--- a/src/utils/api.js
+++ b/src/utils/api.js
@@ -164,6 +164,7 @@ export default {
     editTableName: `${host}/data/data/table/editTableName`,
     updateTableCommit: `${host}/data/data/updateTableCommit`,
     getLevel: `${host}/data/category/getLevel`,
+    getAllTableInfoByCategoryId: `${host}/data/data/product/getAllTableInfoByCategoryId`,
 
     // 产品管理
     deleteProduct: `${host}/data/data/product/delete`,
diff --git a/src/views/data/Framework.vue b/src/views/data/Framework.vue
index 9dff693..930e3e3 100644
--- a/src/views/data/Framework.vue
+++ b/src/views/data/Framework.vue
@@ -70,8 +70,7 @@
                 <div style="overflow:auto;height: 558px;width:330px;padding:15px;background:#fff" ref="typeTreeWrap" @scroll="loadType">
                     <el-tree
                         ref="typeTree"
-                        :load="getType"
-                        lazy
+                        :data="importTypeList"
                         node-key="id"
                         accordion
                         :default-expanded-keys="defaultTypeActive"
@@ -195,7 +194,6 @@ export default {
             curComment: [],
             submited: false,
             names: [],
-            showNames: [],
             nameVisible: false,
             curRow: {},
             headVisible: false,
@@ -486,7 +484,7 @@ export default {
                     data.map(n => {
                         that.importTypeIndex++
                         n.realId = n.id
-                        // 分类id跟表id可能是冲突,所以就加了个基数,后续再优化
+                        // 分类id跟表id可能会冲突,所以就加了个基数
                         n.id = String(that.importTypeIndex + n.id)
                         n.label = n.categoryName
                         if(n.children.length){
@@ -495,7 +493,7 @@ export default {
                     })
                 }
                 handleId(res)
-                this.$post(`${this.api.getIdQueryTable}?categoryId=${this.categoryId}&showName=${this.keyword}&pageNum=1&pageSize=10000&updateTime=${this.updateTime ? this.updateTime : ''}`).then(res1 => {
+                this.$post(`${this.api.getIdQueryTable}?categoryId=${this.categoryId}&showName=${this.keyword}&pageNum=1&pageSize=3000&updateTime=${this.updateTime ? this.updateTime : ''}`).then(res1 => {
                     let list = res1.pageList.records
                     this.defaultTypeChecked = list.map(n => n.copyId)
                     const that = this
@@ -556,63 +554,31 @@ export default {
         closeImport(){
             this.$refs.typeTree.setCheckedKeys([])
             this.names = []
-            this.showNames = []
         },
         // 获取names和showNames,提交的时候需要
-        getNames(){
-            // 获取已经勾选的分类
-            let list = this.$refs.typeTree.getCheckedNodes()
+        getNames(list){
+            const categoryId = Number(this.categoryId)
             return new Promise((resolve,reject) => {
-                let getLen = 0
-                list.map(n => {
-                    // 如果tableLen大于子级的数量，则表示这个分类下的子级是没有全部加载出来的，要在下面去查询出来，这里先记载要查询的分类数量
-                    if(n.tableLen && n.tableLen > n.children.length) getLen++
-                })
-                list.map((n,i) => {
-                    if(n.tableLen && n.tableLen > n.children.length){
-                        // pageSize传10000是要查询全部表,后续如果数据多了,则按需调整
-                        this.$post(`${this.api.originalListById}?categoryId=${n.realId}&pageNum=1&pageSize=10000`).then(res => {
-                            let tableList = res.list.records
-                            // 查询完1个,则数量-1
-                            getLen--
-                            tableList.map(n => {
-                                // 如果是默认没有的表,则添加进去
-                                if(!this.defaultTypeChecked.includes(String(n.id))){
-                                    this.names.push(n.name)
-                                    this.showNames.push(n.showName)
-                                }
-                            })
-                            // 清0后,才执行resolve
-                            if(!getLen) resolve()
-                        }).catch(res => {})
-                    }else if(n.name && !n.disabled && !this.names.includes(n.name)){ // 如果是表,并且不是存在于分类下了的表,并且没重复,则添加进去
-                        this.names.push(n.name)
-                        this.showNames.push(n.showName)
-                        if(!getLen) resolve()
-                    }
-                })
+                // 根据选择的分类id查询下面的表id
+                this.$get(`${this.api.getAllTableInfoByCategoryId}?categoryId=${list.join()}`).then(res => {
+                    const list = res.tableInfo
+                    list.map(e => {
+                        delete e.id
+                        e.categoryId = categoryId
+                    })
+                    this.names = list
+                    resolve()
+                }).catch(res => {})
             })
         },
         confirmImport(){
             if(this.submited) return false
+            const checked = this.$refs.typeTree.getCheckedNodes() // 勾选的数据
             // 如果没有选择任何数据
-            if(!this.$refs.typeTree.getCheckedNodes().length) return this.$message.warning('请选择数据')
-            this.getNames().then(() => {
-                let names = Array.from(new Set(this.names))
-                let showNames = Array.from(new Set(this.showNames))
-                if(!names.length) return this.$message.warning('请选择数据')
-            
-                this.submited = true
-                let data = []
-                let categoryId = Number(this.categoryId)
-                names.map((n,i) => {
-                    data.push({
-                        categoryId,
-                        name: n,
-                        showName: showNames[i],
-                    })
-                })
-                this.$post(this.api.saveTable,data).then(res => {
+            if(!checked.length) return this.$message.warning('请选择数据')
+            const typeIds = checked.filter(e => !e.name).map(e => e.realId) // 先筛选出分类id，再获取分类真正的id
+            this.getNames(typeIds).then(() => {
+                this.$post(this.api.saveTable, this.names).then(res => {
                     this.$message.success('导入成功')
                     this.getData()
                     this.importVisible = false
@@ -623,7 +589,7 @@ export default {
                     this.submited = false
                 })
             })
-        },
+        }
     }
 };
 </script>
diff --git a/src/views/data/Product.vue b/src/views/data/Product.vue
index 7aef0fc..d9cd532 100644
--- a/src/views/data/Product.vue
+++ b/src/views/data/Product.vue
@@ -82,7 +82,6 @@
                 </el-form-item>
                 <el-form-item label="配置数据">
                     <el-button type="primary" @click="configData">配置数据权限</el-button>
-                    <!-- <div class="type-wrap" ref="typeWrap" @scroll="loadType" v-if="configChecked.length"> -->
                     <div class="type-wrap" ref="typeWrap" @scroll="loadType" style="display: none">
                         <el-tree ref="type" :data="typeList" show-checkbox accordion node-key="id" :default-expanded-keys="checkedIds" :default-checked-keys="checkedIds" :props="defaultProps" @node-expand="typeExpand">
                             <span class="custom-tree-node" slot-scope="{ node, data }">
@@ -286,9 +285,9 @@ export default {
                 function handleId(data){
                     data.map(n => {
                         n.originId = n.id
-                        n.id = String(++that.typeIndex)
+                        n.id = String(++that.typeIndex) // 分类id跟表id有可能会重复，所以把分类id都加上个基数，防止冲突，同时用originId保存起来真正的id
                         n.label = n.categoryName
-                        n.disabled = true
+                        n.disabled = true // 一律禁止勾选
                         if(n.children.length){
                             handleId(n.children)
                         }
@@ -471,6 +470,7 @@ export default {
             let list = this.checkedIds
             this.tableId = []
             const proList = []
+            // 勾选的分类id分别去查询下面的表id，也可以全部id用逗号分隔去查，这里遍历去查是因为这样速度更快
             list.map(e => {
                 proList.push(new Promise((resolve,reject) => {
                     this.$get(`${this.api.getAllTableIdBycategoryId}?categoryId=${e}`).then(res => {
@@ -481,6 +481,7 @@ export default {
                     })
                 }))
             })
+            // 全部分类id遍历查询完resolve回去
             return Promise.all(proList).then(res => {
                 resolve()
             }).catch(err => {})
@@ -490,10 +491,8 @@ export default {
             if(!this.productName) return this.$message.warning('请输入数据产品名称')
             if(!this.market) return this.$message.warning('请输入市场价格')
             if(isNaN(this.market)) return this.$message.warning('市场价格请输入数字')
-            // if(!this.$refs.type.getCheckedNodes().length) return this.$message.warning('请选择数据')
-            
-            this.submited = true
-
+            if(!this.checkedIds.length) return this.$message.warning('请选择数据')
+            this.submited = true // 提交状态
             this.getIds().then(() => {
                 let tableId = Array.from(new Set(this.tableId))
                 if(!tableId.length) return this.$message.warning('请选择数据')
@@ -508,7 +507,7 @@ export default {
                     orderNum: '',
                     status: '',
                     tableNum: tableId.length,
-                    updateTime: '',
+                    updateTime: ''
                 }
                 if(this.id){
                     this.$post(this.api.updateProduct,data).then(res => {
@@ -531,15 +530,15 @@ export default {
                 }
             })
         },
-
         configData(){
             this.configVisible = true
             this.getConfigType()
+            // 编辑的时候才需要获取外面的弹框的已选数据，传到配置数据里去默认勾选
             if (this.id) {
                 let list = this.$refs.type.getCheckedNodes()
                 let configIds = []
                 list.map(n => {
-                    if(!n.name) configIds.push(n.originId)
+                    if(!n.name) configIds.push(n.originId) // 分类没有name。只需要分类id，因为配置数据里是以分类为维度的，所以获取表id无法默认勾选
                 })
                 this.configIds = configIds
             }
@@ -598,6 +597,7 @@ export default {
             this.$get(`${this.api.previewData}?tableName=${row.name}&tableId=${row.id}`).then(res => {
                 let comment = res.comment
                 let previewHead = []
+                // 不显示id和操作时间
                 comment.map(n => {
                     n.field != 'id' && n.field != 'operation_time' && previewHead.push(n)
                 })
@@ -606,6 +606,7 @@ export default {
                 let data = res.data
                 data.map(n => {
                     for(let i in n){
+                        // 把返回的时间格式化
                         if(typeof n[i] == 'string' && n[i].endsWith('+0000')) n[i] = this.formatDate('yyyy-MM-dd hh:mm:ss',new Date(n[i]))
                     }
                 })
@@ -619,7 +620,7 @@ export default {
             list.map(n => {
                 if(n.children && n.children.length){
                     this.getTableId(n.children)
-                    if(checked.includes(n.originId) && n.children[0].name){
+                    if(checked.includes(n.originId) && n.children[0].name){ // 选中的并且是表（表才有name）
                         this.configCheckedTableId = [...this.configCheckedTableId,...n.children.map(n => n.id)]
                     }else{
                         this.getTableId(n.children)
@@ -628,7 +629,7 @@ export default {
             })
         },
         confirmConfig(){
-            this.configChecked = this.$refs.typeConfig.getCheckedKeys().map(n => n)
+            this.configChecked = this.$refs.typeConfig.getCheckedKeys().map(n => n) // 获取选中的id
             this.checkedIds = this.configChecked
             this.configVisible = false
             this.$nextTick(() => {