From 1315f5489cab1264c70040b2fd222310c59f9d04 Mon Sep 17 00:00:00 2001
From: Jo <479214531@qq.com>
Date: Sun, 21 Nov 2021 23:28:19 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E6=94=B9=E6=88=90=E6=87=92=E5=8A=A0=E8=BD=BD=EF=BC=88=E6=9C=AA?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=EF=BC=89?=
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 |  68 +++++++++---------
 src/views/data/Introduce.vue |  56 +++++----------
 src/views/data/Product.vue   | 131 ++++++++++++++---------------------
 4 files changed, 103 insertions(+), 153 deletions(-)

diff --git a/src/utils/api.js b/src/utils/api.js
index e322202..ffc1e86 100644
--- a/src/utils/api.js
+++ b/src/utils/api.js
@@ -163,6 +163,7 @@ export default {
     staticPreview: `${host}/data/data/staticPreview`,
     editTableName: `${host}/data/data/table/editTableName`,
     updateTableCommit: `${host}/data/data/updateTableCommit`,
+    getLevel: `${host}/data/category/getLevel`,
 
     // 产品管理
     deleteProduct: `${host}/data/data/product/delete`,
diff --git a/src/views/data/Framework.vue b/src/views/data/Framework.vue
index 6ae93cb..9dff693 100644
--- a/src/views/data/Framework.vue
+++ b/src/views/data/Framework.vue
@@ -5,7 +5,7 @@
                 <div class="plus">
                     <i class="el-icon-circle-plus-outline" @click.stop="addType(0)"></i>
                 </div>
-                <el-tree ref="type" :data="typeList" node-key="id" accordion :default-expanded-keys="defaultActive" :current-node-key="categoryId" :props="defaultProps" :highlight-current="true" @current-change="typeClick">
+                <el-tree ref="type" :load="getType" lazy node-key="id" accordion :default-expanded-keys="defaultActive" :current-node-key="categoryId" :props="defaultProps" :highlight-current="true" @current-change="typeClick">
                     <span class="custom-tree-node" slot-scope="{ node, data }">
                         <span :title="node.label">{{ node.label }}</span>
                         <span class="actions">
@@ -70,7 +70,8 @@
                 <div style="overflow:auto;height: 558px;width:330px;padding:15px;background:#fff" ref="typeTreeWrap" @scroll="loadType">
                     <el-tree
                         ref="typeTree"
-                        :data="importTypeList"
+                        :load="getType"
+                        lazy
                         node-key="id"
                         accordion
                         :default-expanded-keys="defaultTypeActive"
@@ -156,10 +157,9 @@
 export default {
     data() {
         return {
-            typeList: [],
             defaultProps: {
                 children: 'children',
-                label: 'label'
+                label: 'categoryName'
             },
             defaultActive: [],
             added: false,
@@ -199,7 +199,10 @@ export default {
             nameVisible: false,
             curRow: {},
             headVisible: false,
-            editIndex: 0
+            editIndex: 0,
+            node: [],
+            resolve: null,
+            curNode: {}
         };
     },
     watch: {
@@ -210,37 +213,20 @@ export default {
             },500)
         }
     },
-    mounted(){
-        this.getType()
-    },
+    mounted(){},
     methods: {
-        getType(){
-            this.$post(this.api.getTableByClassification).then(res => {
-                // 递归赋值,同时添加层级标识
-                function handleId(data,level = 0){
-                    data.map(n => {
-                        n.id = String(n.id)
-                        n.label = n.categoryName
-                        n.level = level + 1
-                        if(n.children.length){
-                            handleId(n.children,n.level)
-                        }
-                    })
-                }
-                handleId(res)
-
-                this.typeList = res
-                if (!this.added) {
-                    if(res[0].children.length){
-                        this.categoryId = res[0].children[0].id
-                        this.defaultActive = [res[0].children[0].id]
-                    }else{
-                        this.categoryId = res[0].id
-                        this.defaultActive = [res[0].id]
-                    }
-                    // 取第一个分类的id
+        getType(node, resolve){
+            this.$post(`${this.api.getLevel}?parentId=${node.level ? node.data.id : 0}`).then(res => {
+                const list = res.list
+                this.node = node
+                this.resolve = resolve
+                resolve(list)
+                // 取第一个分类的id
+                if (!this.added && list.length) {
+                    this.categoryId = list[0].id
+                    this.defaultActive = [list[0].id]
                     this.$nextTick(() => {
-                        this.$refs.type.setCurrentKey(res[0].children[0].id)
+                        this.$refs.type.setCurrentKey(list[0].id)
                     })
                 }
                 this.added = false
@@ -274,6 +260,7 @@ export default {
             this.getData()
         },
         addType(row){
+            this.categoryId = row.data.id
             if (row) this.defaultActive = [row.data.id]
             this.typeVisible = true
             this.levelId = row ? row.data.id : 0
@@ -282,6 +269,8 @@ export default {
             this.typeVisible = true
             this.id = row.data.id
             this.categoryName = row.data.categoryName
+            this.curNode = row
+            this.categoryId = row.data.id
         },
         delType(row){
             // 该分类下的数据表已存在于产品管理中，是否确认删除？
@@ -291,7 +280,7 @@ export default {
                 this.added = true
                 this.$post(`${this.api.deleteCategory}?categoryId=${row.data.id}`).then(res => {
                     this.$message.success('删除成功')
-                    this.getType()
+                    this.$refs.type.remove(row)
                 }).catch(res => {})
             }).catch(() => {})
         },
@@ -305,7 +294,9 @@ export default {
                     categoryName: this.categoryName
                 }).then(res => {
                     this.$message.success('编辑成功')
-                    this.getType()
+                    this.curNode.data.categoryName = this.categoryName
+                    this.$refs.type.updateKeyChildren(this.id, this.curNode)
+                    this.getType(this.node, this.resolve)
                     this.typeVisible = false
                     setTimeout(() => {
                         this.submited = false
@@ -319,7 +310,10 @@ export default {
                     categoryName: this.categoryName
                 }).then(res => {
                     this.$message.success('添加成功')
-                    this.getType()
+                    this.getType(this.node, this.resolve)
+                    let node = this.$refs.type.getNode(this.categoryId)
+                    node.loaded = false
+                    node.expand()
                     this.typeVisible = false
                     setTimeout(() => {
                         this.submited = false
diff --git a/src/views/data/Introduce.vue b/src/views/data/Introduce.vue
index 66e5f3d..45e9c05 100644
--- a/src/views/data/Introduce.vue
+++ b/src/views/data/Introduce.vue
@@ -2,7 +2,7 @@
     <div>
         <el-container>
             <el-aside width="350px">
-                <el-tree ref="type" :data="typeList" node-key="id" accordion :default-expanded-keys="defaultActive" :current-node-key="categoryId" :props="defaultProps" highlight-current @node-click="typeClick"></el-tree>
+                <el-tree ref="type" :load="getData" lazy node-key="id" accordion :default-expanded-keys="defaultActive" :current-node-key="categoryId" :props="defaultProps" :highlight-current="true" @current-change="typeClick"></el-tree>
             </el-aside>
 
             <el-main style="padding-top: 0">
@@ -56,10 +56,9 @@
 export default {
     data() {
         return {
-            typeList: [],
             defaultProps: {
                 children: 'children',
-                label: 'label'
+                label: 'categoryName'
             },
             defaultActive: [],
             editing: false,
@@ -69,7 +68,10 @@ export default {
             introduceText: '',
             categoryId: '',
             keywordList: [],
-            newKeyword: ''
+            newKeyword: '',
+            node: [],
+            resolve: null,
+            curNode: {}
         };
     },
     watch: {
@@ -80,42 +82,22 @@ export default {
             },500)
         }
     },
-    mounted(){
-        this.getData()
-    },
+    mounted(){},
     methods: {
-        getData(){
+        getData(node, resolve){
             // 获取分类
-            this.$post(this.api.getTableByClassification).then(res => {
-                // 递归处理id和label
-                function handleId(data){
-                    data.map(n => {
-                        n.id = String(n.id)
-                        n.label = n.categoryName
-                        if(n.children.length){
-                            handleId(n.children)
-                        }
-                    })
-                }
-                handleId(res)
-
-                this.typeList = res
+            this.$post(`${this.api.getLevel}?parentId=${node.level ? node.data.id : 0}`).then(res => {
+                const list = res.list
+                this.node = node
+                this.resolve = resolve
+                resolve(list)
                 // 取首个的id和简介
-                if (!this.edited) {
-                    if(res[0].children.length){
-                        let item = res[0].children[0]
-                        this.categoryId = item.id
-                        this.dataSource = res[0].children[0].dataSource
-                        this.defaultActive = [item.id]
-                        this.introduceText = item.introduce
-                        this.introduce = item.introduce
-                    }else{
-                        this.categoryId = res[0].id
-                        this.dataSource = res[0].dataSource
-                        this.defaultActive = [res[0].id]
-                        this.introduceText = res[0].introduce
-                        this.introduce = res[0].introduce
-                    }
+                if (!this.edited && list.length) {
+                    this.categoryId = list[0].id
+                    this.dataSource = list[0].dataSource
+                    this.defaultActive = [list[0].id]
+                    this.introduceText = list[0].introduce
+                    this.introduce = list[0].introduce
                 }
                 this.getKeyword()
             }).catch(res => {})
diff --git a/src/views/data/Product.vue b/src/views/data/Product.vue
index 0838271..01b1523 100644
--- a/src/views/data/Product.vue
+++ b/src/views/data/Product.vue
@@ -81,14 +81,10 @@
                     </el-input>
                 </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>0'>
-                        <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 }">
-                                <span :title="node.label">{{ node.label }}</span>
-                            </span>
-                        </el-tree>
-                    </div>
+                    <el-button type="primary" @click="configData" style="margin-bottom: 10px;">配置数据权限</el-button>
+                    <!-- <div class="type-wrap" ref="typeWrap" @scroll="loadType" v-if='checkedIds.length>0'> -->
+                        <el-tree ref="type" :data="typeList" accordion node-key="id" :default-expanded-keys="checkedIds" :default-checked-keys="checkedIds" :props="defaultProps" @node-expand="typeExpand"></el-tree>
+                    <!-- </div> -->
                 </el-form-item>
             </el-form>
             <span slot="footer" class="dialog-footer" v-if="!isDetail">
@@ -100,7 +96,7 @@
         <el-dialog title="数据配置" :visible.sync="configVisible" width="70%" center @close="closeConfig" :close-on-click-modal="false">
             <el-container style="padding: 20px 0 20px 20px;background-color: #f0f0f0;">
                 <el-aside width="300px">
-                    <el-tree style="margin: 10px;" ref="typeConfig" :data="typeConfigList" show-checkbox node-key="id" accordion :default-expanded-keys="configIds" :default-checked-keys="configIds" :current-node-key="categoryId" :props="defaultProps" highlight-current @current-change="typeConfigClick">
+                    <el-tree style="margin: 10px;" ref="typeConfig" :load="getConfigType" lazy show-checkbox node-key="id" accordion :default-expanded-keys="configIds" :default-checked-keys="configIds" :current-node-key="categoryId" :props="defaultProps" highlight-current @current-change="typeConfigClick">
                         <span class="custom-tree-node" slot-scope="{ node, data }">
                             <span :title="node.label">{{ node.label }}</span>
                         </span>
@@ -185,7 +181,7 @@ export default {
             typeList: [],
             defaultProps: {
                 children: 'children',
-                label: 'label'
+                label: 'categoryName'
             },
             checkedIds: [],
             isDetail: false,
@@ -203,7 +199,6 @@ export default {
             configIds: [],
             updateTime: '',
             keywordConfig: '',
-            typeConfigList: [],
             pageConfig: 1,
             pageSizeConfig: 10,
             totalConfig: 0,
@@ -260,7 +255,7 @@ export default {
             this.getData()
         },
         getTable(n,isConcat){
-            this.$post(`${this.api.getIdQueryTable}?categoryId=${n.originId}&showName=&pageNum=${n.typePage}&pageSize=${this.typeUnit}&updateTime=`).then(res => {
+            this.$post(`${this.api.getIdQueryTable}?categoryId=${n.id}&showName=&pageNum=${n.typePage}&pageSize=${this.typeUnit}&updateTime=`).then(res => {
                 let list = res.pageList.records
                 list.map(n => {
                     n.label = n.showName
@@ -278,40 +273,25 @@ export default {
             }).catch(res => {})
         },
         // 获取分类
-        getType(){
-            this.productVisible = true
-            this.$post(this.api.getTableByClassification).then(res => {
+        getType(node, resolve){
+            this.$post(`${this.api.getLevel}?parentId=${node.level ? node.data.id : 0}`).then(res => {
                 const that = this
-                function handleId(data){
-                    data.map(n => {
-                        n.originId = n.id
-                        n.id = String(++that.typeIndex)
-                        n.label = n.categoryName
-                        n.disabled = true
-                        if(n.children.length){
-                            handleId(n.children)
-                        }
-                    })
-                }
-                handleId(res)
-
+                const list = res.list
+                this.node = node
+                this.resolve = resolve
+                resolve(list)
                 // 获取分类下的表
                 function getTable(data){
                     data.map(n => {
-                        if(n.children.length){
+                        if(n.children && n.children.length){
                             getTable(n.children)
                         }else{
                             n.typePage = 1
-                            n.disabled = true
                             that.getTable(n)
                         }
                     })
                 }
-                getTable(res)
-
-                setTimeout(() => {
-                    this.typeList = res
-                },500)
+                getTable(list)
                 this.importVisible = true
             }).catch(res => {})
         },
@@ -382,17 +362,20 @@ export default {
                 this.productName = data.productName
                 this.market = data.market
                 this.configChecked = data.tableId
-                this.checkedIds = this.handleType(data.tableId.split(','),this.typeList)
-                this.$refs.type.setCheckedNodes(this.checkedIds)
+                // this.checkedIds = this.handleType(data.tableId.split(','),this.typeList)
+                this.configIds = data.tableId.split(',')
+                console.log('getDetail', this.configIds)
+                // this.$refs.type.setCheckedNodes(this.checkedIds)
             }).catch(res => {})
         },
         add(){
-            this.getType()
+            this.productVisible = true
             this.id = ''
             this.checkedIds = []
         },
         edit(row){
-            this.getType()
+            this.productVisible = true
+            // this.getType()
             this.id = row.id
             this.userId = row.userId
             this.getDetail()
@@ -416,7 +399,8 @@ export default {
         },
         preview(row){
             this.isDetail = true
-            this.getType()
+            this.productVisible = true
+            // this.getType()
             this.id = row.id
             this.getDetail()
         },
@@ -476,7 +460,7 @@ export default {
                 list.map((n,i) => {
                     if(n.tableLen && n.tableLen > n.children.length){
                         // pageSize传10000是要查询全部表,后续如果数据多了,则按需调整
-                        this.$post(`${this.api.getIdQueryTable}?categoryId=${n.originId}&showName=&pageNum=1&pageSize=10000&updateTime=`).then(res => {
+                        this.$post(`${this.api.getIdQueryTable}?categoryId=${n.id}&showName=&pageNum=1&pageSize=10000&updateTime=`).then(res => {
                             let tableList = res.pageList.records
                             tableList.map(n => {
                                 this.tableId.push(String(n.id))
@@ -498,25 +482,26 @@ 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('请选择数据')
+            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('请选择数据')
+            // this.getIds().then(() => {
+                // let tableId = Array.from(new Set(this.tableId))
+                // if(!tableId.length) return this.$message.warning('请选择数据')
+                // return console.log(333, this.checkedIds)
                 let data = {
                     id: this.id,
                     productName: this.productName,
                     market: this.market,
-                    tableId: tableId.join(),
+                    tableId: this.checkedIds.join(),
                     userId: this.userId,
                     userName: this.userName,
                     createTime: '',
                     orderNum: '',
                     status: '',
-                    tableNum: tableId.length,
-                    updateTime: '',
+                    tableNum: this.checkedIds.length,
+                    updateTime: ''
                 }
                 if(this.id){
                     this.$post(this.api.updateProduct,data).then(res => {
@@ -537,19 +522,19 @@ export default {
                         this.submited = false
                     })
                 }
-            })
+            // })
         },
 
         configData(){
             this.configVisible = true
-            this.getConfigType()
-
-            let list = this.$refs.type.getCheckedNodes()
-            let configIds = []
-            list.map(n => {
-                if(!n.name) configIds.push(n.originId)
-            })
-            this.configIds = configIds
+            if (this.id) {
+                // let list = this.$refs.type.getCheckedNodes()
+                // let configIds = []
+                // list.map(n => {
+                //     if(!n.name) configIds.push(n.id)
+                // })
+                // this.configIds = configIds
+            }
         },
         typeConfigClick(data,node){
             this.categoryId = data.id
@@ -560,23 +545,12 @@ export default {
             this.$refs.typeConfig.setCheckedNodes([])
         },
         // 获取配置数据里面的分类
-        getConfigType(){
-            this.$post(this.api.getTableByClassification).then(res => {
-                function handleId(data){
-                    data.map(n => {
-                        n.id = String(n.id)
-                        n.label = n.categoryName
-                        if(n.children.length){
-                            handleId(n.children)
-                        }
-                    })
-                }
-                handleId(res)
-                this.typeConfigList = res
-                if(res[0].children.length){
-                    this.categoryId = res[0].children[0].id
-                }else{
-                    this.categoryId = res[0].id
+        getConfigType(node, resolve){
+            this.$post(`${this.api.getLevel}?parentId=${node.level ? node.data.id : 0}`).then(res => {
+                const list = res.list
+                resolve(list)
+                if(list.length){
+                    this.categoryId = list[0].id
                 }
                 this.getConfigTable()
             }).catch(res => {})
@@ -626,7 +600,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.id) && n.children[0].name){
                         this.configCheckedTableId = [...this.configCheckedTableId,...n.children.map(n => n.id)]
                     }else{
                         this.getTableId(n.children)
@@ -635,11 +609,10 @@ export default {
             })
         },
         confirmConfig(){
-            this.configChecked = this.$refs.typeConfig.getCheckedKeys().map(n => Number(n))
-            this.getTableId(this.typeList)
-            this.checkedIds = Array.from(new Set(this.configCheckedTableId))
+            this.checkedIds = this.$refs.typeConfig.getCheckedKeys().map(n => Number(n))
             this.configVisible = false
-            this.$refs.type.setCheckedNodes(this.checkedIds)
+            console.log(22, this.$refs.typeConfig.getCheckedNodes())
+            this.typeList = this.$refs.typeConfig.getCheckedNodes()
         }
     }
 };

From 79746ba66051d34eeddbe0f16c6a0497478927e8 Mon Sep 17 00:00:00 2001
From: Jo <479214531@qq.com>
Date: Tue, 23 Nov 2021 07:28:16 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E4=BA=A7=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/api.js           |   1 +
 src/views/data/Product.vue | 172 +++++++++++++++++++++----------------
 2 files changed, 98 insertions(+), 75 deletions(-)

diff --git a/src/utils/api.js b/src/utils/api.js
index ffc1e86..761f3aa 100644
--- a/src/utils/api.js
+++ b/src/utils/api.js
@@ -172,6 +172,7 @@ export default {
     saveProduct: `${host}/data/data/product/save`,
     updateProduct: `${host}/data/data/product/update`,
     saveRecord: `${host}/data/data/dataRecord/saveRecord`,
+    getAllTableIdBycategoryId: `${host}/data/data/product/getAllTableIdBycategoryId`,
 
     // 关键词
     addKeyword: `${host}/data/keyword/addKeyword`,
diff --git a/src/views/data/Product.vue b/src/views/data/Product.vue
index 01b1523..744a48f 100644
--- a/src/views/data/Product.vue
+++ b/src/views/data/Product.vue
@@ -81,10 +81,14 @@
                     </el-input>
                 </el-form-item>
                 <el-form-item label="已选数据">
-                    <el-button type="primary" @click="configData" style="margin-bottom: 10px;">配置数据权限</el-button>
-                    <!-- <div class="type-wrap" ref="typeWrap" @scroll="loadType" v-if='checkedIds.length>0'> -->
-                        <el-tree ref="type" :data="typeList" accordion node-key="id" :default-expanded-keys="checkedIds" :default-checked-keys="checkedIds" :props="defaultProps" @node-expand="typeExpand"></el-tree>
-                    <!-- </div> -->
+                    <el-button type="primary" @click="configData">配置数据权限</el-button>
+                    <div class="type-wrap" ref="typeWrap" @scroll="loadType" v-if="configChecked.length">
+                        <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 }">
+                                <span :title="node.label">{{ node.label }}</span>
+                            </span>
+                        </el-tree>
+                    </div>
                 </el-form-item>
             </el-form>
             <span slot="footer" class="dialog-footer" v-if="!isDetail">
@@ -96,7 +100,7 @@
         <el-dialog title="数据配置" :visible.sync="configVisible" width="70%" center @close="closeConfig" :close-on-click-modal="false">
             <el-container style="padding: 20px 0 20px 20px;background-color: #f0f0f0;">
                 <el-aside width="300px">
-                    <el-tree style="margin: 10px;" ref="typeConfig" :load="getConfigType" lazy show-checkbox node-key="id" accordion :default-expanded-keys="configIds" :default-checked-keys="configIds" :current-node-key="categoryId" :props="defaultProps" highlight-current @current-change="typeConfigClick">
+                    <el-tree style="margin: 10px;" ref="typeConfig" :data="typeConfigList" show-checkbox node-key="id" accordion :default-expanded-keys="configIds" :default-checked-keys="configIds" :current-node-key="categoryId" :props="defaultProps" highlight-current @current-change="typeConfigClick">
                         <span class="custom-tree-node" slot-scope="{ node, data }">
                             <span :title="node.label">{{ node.label }}</span>
                         </span>
@@ -181,7 +185,7 @@ export default {
             typeList: [],
             defaultProps: {
                 children: 'children',
-                label: 'categoryName'
+                label: 'label'
             },
             checkedIds: [],
             isDetail: false,
@@ -199,6 +203,7 @@ export default {
             configIds: [],
             updateTime: '',
             keywordConfig: '',
+            typeConfigList: [],
             pageConfig: 1,
             pageSizeConfig: 10,
             totalConfig: 0,
@@ -255,7 +260,7 @@ export default {
             this.getData()
         },
         getTable(n,isConcat){
-            this.$post(`${this.api.getIdQueryTable}?categoryId=${n.id}&showName=&pageNum=${n.typePage}&pageSize=${this.typeUnit}&updateTime=`).then(res => {
+            this.$post(`${this.api.getIdQueryTable}?categoryId=${n.originId}&showName=&pageNum=${n.typePage}&pageSize=${this.typeUnit}&updateTime=`).then(res => {
                 let list = res.pageList.records
                 list.map(n => {
                     n.label = n.showName
@@ -273,25 +278,40 @@ export default {
             }).catch(res => {})
         },
         // 获取分类
-        getType(node, resolve){
-            this.$post(`${this.api.getLevel}?parentId=${node.level ? node.data.id : 0}`).then(res => {
+        getType(){
+            this.productVisible = true
+            this.$post(this.api.getTableByClassification).then(res => {
                 const that = this
-                const list = res.list
-                this.node = node
-                this.resolve = resolve
-                resolve(list)
+                function handleId(data){
+                    data.map(n => {
+                        n.originId = n.id
+                        n.id = String(++that.typeIndex)
+                        n.label = n.categoryName
+                        n.disabled = true
+                        if(n.children.length){
+                            handleId(n.children)
+                        }
+                    })
+                }
+                handleId(res)
+
                 // 获取分类下的表
                 function getTable(data){
                     data.map(n => {
-                        if(n.children && n.children.length){
+                        if(n.children.length){
                             getTable(n.children)
                         }else{
                             n.typePage = 1
+                            n.disabled = true
                             that.getTable(n)
                         }
                     })
                 }
-                getTable(list)
+                getTable(res)
+
+                setTimeout(() => {
+                    this.typeList = res
+                },500)
                 this.importVisible = true
             }).catch(res => {})
         },
@@ -362,20 +382,17 @@ export default {
                 this.productName = data.productName
                 this.market = data.market
                 this.configChecked = data.tableId
-                // this.checkedIds = this.handleType(data.tableId.split(','),this.typeList)
-                this.configIds = data.tableId.split(',')
-                console.log('getDetail', this.configIds)
-                // this.$refs.type.setCheckedNodes(this.checkedIds)
+                this.checkedIds = this.handleType(data.tableId.split(','),this.typeList)
+                this.$refs.type.setCheckedNodes(this.checkedIds)
             }).catch(res => {})
         },
         add(){
-            this.productVisible = true
+            this.getType()
             this.id = ''
             this.checkedIds = []
         },
         edit(row){
-            this.productVisible = true
-            // this.getType()
+            this.getType()
             this.id = row.id
             this.userId = row.userId
             this.getDetail()
@@ -399,8 +416,7 @@ export default {
         },
         preview(row){
             this.isDetail = true
-            this.productVisible = true
-            // this.getType()
+            this.getType()
             this.id = row.id
             this.getDetail()
         },
@@ -450,58 +466,47 @@ export default {
         // 获取tableId,提交的时候需要
         getIds(){
             // 获取已经勾选的分类
-            let list = this.$refs.type.getCheckedNodes()
-            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.getIdQueryTable}?categoryId=${n.id}&showName=&pageNum=1&pageSize=10000&updateTime=`).then(res => {
-                            let tableList = res.pageList.records
-                            tableList.map(n => {
-                                this.tableId.push(String(n.id))
-                            })
-                            // 查询完1个,则数量-1
-                            getLen--
-                            // 清0后,才执行resolve
-                            if(!getLen) resolve()
-                        }).catch(res => {})
-                    }else if(n.name && !this.tableId.includes(n.id)){ // 如果是表,并且没重复,则添加进去
-                        this.tableId.push(n.id)
-                        if(!getLen) resolve()
-                    }
-                })
+            let list = this.checkedIds
+            this.tableId = []
+            const proList = []
+            list.map(e => {
+                proList.push(new Promise((resolve,reject) => {
+                    this.$get(`${this.api.getAllTableIdBycategoryId}?categoryId=${e}`).then(res => {
+                        res.tableId && this.tableId.push(...res.tableId.split(','))
+                        resolve()
+                    }).catch(res => {
+                        this.submited = false
+                    })
+                }))
             })
+            return Promise.all(proList).then(res => {
+                resolve()
+            }).catch(err => {})
         },
         confirm(){
             if(this.submited) return false
             if(!this.productName) return this.$message.warning('请输入数据产品名称')
             if(!this.market) return this.$message.warning('请输入市场价格')
             if(isNaN(this.market)) return this.$message.warning('市场价格请输入数字')
-            if(!this.checkedIds.length) return this.$message.warning('请选择数据')
+            if(!this.$refs.type.getCheckedNodes().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('请选择数据')
-                // return console.log(333, this.checkedIds)
+            this.getIds().then(() => {
+                let tableId = Array.from(new Set(this.tableId))
+                if(!tableId.length) return this.$message.warning('请选择数据')
                 let data = {
                     id: this.id,
                     productName: this.productName,
                     market: this.market,
-                    tableId: this.checkedIds.join(),
+                    tableId: tableId.join(),
                     userId: this.userId,
                     userName: this.userName,
                     createTime: '',
                     orderNum: '',
                     status: '',
-                    tableNum: this.checkedIds.length,
-                    updateTime: ''
+                    tableNum: tableId.length,
+                    updateTime: '',
                 }
                 if(this.id){
                     this.$post(this.api.updateProduct,data).then(res => {
@@ -522,18 +527,19 @@ export default {
                         this.submited = false
                     })
                 }
-            // })
+            })
         },
 
         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.id)
-                // })
-                // this.configIds = configIds
+                let list = this.$refs.type.getCheckedNodes()
+                let configIds = []
+                list.map(n => {
+                    if(!n.name) configIds.push(n.originId)
+                })
+                this.configIds = configIds
             }
         },
         typeConfigClick(data,node){
@@ -545,12 +551,23 @@ export default {
             this.$refs.typeConfig.setCheckedNodes([])
         },
         // 获取配置数据里面的分类
-        getConfigType(node, resolve){
-            this.$post(`${this.api.getLevel}?parentId=${node.level ? node.data.id : 0}`).then(res => {
-                const list = res.list
-                resolve(list)
-                if(list.length){
-                    this.categoryId = list[0].id
+        getConfigType(){
+            this.$post(this.api.getTableByClassification).then(res => {
+                function handleId(data){
+                    data.map(n => {
+                        n.id = String(n.id)
+                        n.label = n.categoryName
+                        if(n.children.length){
+                            handleId(n.children)
+                        }
+                    })
+                }
+                handleId(res)
+                this.typeConfigList = res
+                if(res[0].children.length){
+                    this.categoryId = res[0].children[0].id
+                }else{
+                    this.categoryId = res[0].id
                 }
                 this.getConfigTable()
             }).catch(res => {})
@@ -600,7 +617,7 @@ export default {
             list.map(n => {
                 if(n.children && n.children.length){
                     this.getTableId(n.children)
-                    if(checked.includes(n.id) && n.children[0].name){
+                    if(checked.includes(n.originId) && n.children[0].name){
                         this.configCheckedTableId = [...this.configCheckedTableId,...n.children.map(n => n.id)]
                     }else{
                         this.getTableId(n.children)
@@ -609,10 +626,15 @@ export default {
             })
         },
         confirmConfig(){
-            this.checkedIds = this.$refs.typeConfig.getCheckedKeys().map(n => Number(n))
-            this.configVisible = false
-            console.log(22, this.$refs.typeConfig.getCheckedNodes())
-            this.typeList = this.$refs.typeConfig.getCheckedNodes()
+            this.configChecked = this.$refs.typeConfig.getCheckedKeys().map(n => n)
+            // this.getTableId(this.typeList)
+            this.checkedIds = this.configChecked
+            console.log(44, this.checkedIds, this.configChecked, this.typeList)
+            this.getIds().then(() => {
+                this.configVisible = false
+                console.log(33, this.tableId)
+                this.$refs.type.setCheckedNodes([...this.tableId, ...this.checkedIds])
+            })
         }
     }
 };

From f1ecd77ff699146f8eaf20a7cf2c31a9dadda06b Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Tue, 23 Nov 2021 11:33:07 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BA=A7=E5=93=81=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=94=B9=E6=88=90=E4=BC=A0=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?id=EF=BC=8C=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E5=85=A8?=
 =?UTF-8?q?=E9=83=A8tableId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/data/Product.vue | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/views/data/Product.vue b/src/views/data/Product.vue
index 744a48f..7aef0fc 100644
--- a/src/views/data/Product.vue
+++ b/src/views/data/Product.vue
@@ -80,9 +80,10 @@
                         <span slot="suffix">元/账号</span>
                     </el-input>
                 </el-form-item>
-                <el-form-item label="已选数据">
+                <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" 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 }">
                                 <span :title="node.label">{{ node.label }}</span>
@@ -462,6 +463,7 @@ export default {
             this.typeList = []
             this.tableId = []
             this.configChecked = []
+            this.configIds = []
         },
         // 获取tableId,提交的时候需要
         getIds(){
@@ -488,7 +490,7 @@ 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('请选择数据')
+            // if(!this.$refs.type.getCheckedNodes().length) return this.$message.warning('请选择数据')
             
             this.submited = true
 
@@ -627,13 +629,10 @@ export default {
         },
         confirmConfig(){
             this.configChecked = this.$refs.typeConfig.getCheckedKeys().map(n => n)
-            // this.getTableId(this.typeList)
             this.checkedIds = this.configChecked
-            console.log(44, this.checkedIds, this.configChecked, this.typeList)
-            this.getIds().then(() => {
-                this.configVisible = false
-                console.log(33, this.tableId)
-                this.$refs.type.setCheckedNodes([...this.tableId, ...this.checkedIds])
+            this.configVisible = false
+            this.$nextTick(() => {
+                this.$refs.type.setCheckedNodes(this.checkedIds)
             })
         }
     }

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 4/6] =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=8F=8A=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=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(() => {

From f781780a5bf5ffe4c19dcf5acdfe172994bc4036 Mon Sep 17 00:00:00 2001
From: Jo <479214531@qq.com>
Date: Wed, 24 Nov 2021 01:15:22 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/data/Framework.vue | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/views/data/Framework.vue b/src/views/data/Framework.vue
index 930e3e3..e1a1a4c 100644
--- a/src/views/data/Framework.vue
+++ b/src/views/data/Framework.vue
@@ -576,16 +576,32 @@ export default {
             const checked = this.$refs.typeTree.getCheckedNodes() // 勾选的数据
             // 如果没有选择任何数据
             if(!checked.length) return this.$message.warning('请选择数据')
+            this.submited = true
             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 => {
+                const data = this.names
+                const dataList = []
+                for (let i = 0, len = data.length; i < len; i += 3000) {
+                    dataList.push(data.slice(i, i + 3000))
+                }
+                const promiseList = []
+                dataList.map(e => {
+                    promiseList.push(new Promise((resolve,reject) => {
+                        this.$post(this.api.saveTable, e).then(res => {
+                            resolve()
+                        }).catch(res => {
+                            reject()
+                        })
+                    }))
+                })
+                Promise.all(promiseList).then(res => {
                     this.$message.success('导入成功')
                     this.getData()
                     this.importVisible = false
                     setTimeout(() => {
                         this.submited = false
                     },1000)
-                }).catch(res => {
+                }).catch(err => {
                     this.submited = false
                 })
             })

From a3d55fa495d9bdb7e1debf413c235a83e76f401f Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Wed, 24 Nov 2021 14:20:20 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=AF=8F=E6=AC=A1=E4=BF=9D=E5=AD=98=E6=95=B0=E9=87=8F=E6=94=B9?=
 =?UTF-8?q?=E6=88=902000?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/data/Framework.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/data/Framework.vue b/src/views/data/Framework.vue
index e1a1a4c..a60879e 100644
--- a/src/views/data/Framework.vue
+++ b/src/views/data/Framework.vue
@@ -581,8 +581,8 @@ export default {
             this.getNames(typeIds).then(() => {
                 const data = this.names
                 const dataList = []
-                for (let i = 0, len = data.length; i < len; i += 3000) {
-                    dataList.push(data.slice(i, i + 3000))
+                for (let i = 0, len = data.length; i < len; i += 2000) {
+                    dataList.push(data.slice(i, i + 2000))
                 }
                 const promiseList = []
                 dataList.map(e => {