Merge remote-tracking branch 'origin/master'

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" :load="getType" lazy node-key="id" accordion :default-expanded-keys="defaultActive" :current-node-key="categoryId" :props="defaultProps" :highlight-current="true" @current-change="typeClick">
+                <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">
                     <span class="custom-tree-node" slot-scope="{ node, data }">
                         <span :title="node.label">{{ node.label }}</span>
                         <span class="actions">
@@ -156,9 +156,10 @@
 export default {
     data() {
         return {
+            typeList: [],
             defaultProps: {
                 children: 'children',
-                label: 'categoryName'
+                label: 'label'
             },
             defaultActive: [],
             added: false,
@@ -211,20 +212,37 @@ export default {
             },500)
         }
     },
-    mounted(){},
+    mounted(){
+        this.getType()
+    },
     methods: {
-        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)
+        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
-                if (!this.added && list.length) {
-                    this.categoryId = list[0].id
-                    this.defaultActive = [list[0].id]
                     this.$nextTick(() => {
-                        this.$refs.type.setCurrentKey(list[0].id)
+                        this.$refs.type.setCurrentKey(res[0].children[0].id)
                     })
                 }
                 this.added = false
@@ -258,7 +276,6 @@ 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
@@ -267,8 +284,6 @@ 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){
             // 该分类下的数据表已存在于产品管理中，是否确认删除？
@@ -278,7 +293,7 @@ export default {
                 this.added = true
                 this.$post(`${this.api.deleteCategory}?categoryId=${row.data.id}`).then(res => {
                     this.$message.success('删除成功')
-                    this.$refs.type.remove(row)
+                    this.getType()
                 }).catch(res => {})
             }).catch(() => {})
         },
@@ -292,9 +307,7 @@ export default {
                     categoryName: this.categoryName
                 }).then(res => {
                     this.$message.success('编辑成功')
-                    this.curNode.data.categoryName = this.categoryName
-                    this.$refs.type.updateKeyChildren(this.id, this.curNode)
-                    this.getType(this.node, this.resolve)
+                    this.getType()
                     this.typeVisible = false
                     setTimeout(() => {
                         this.submited = false
@@ -308,10 +321,7 @@ export default {
                     categoryName: this.categoryName
                 }).then(res => {
                     this.$message.success('添加成功')
-                    this.getType(this.node, this.resolve)
-                    let node = this.$refs.type.getNode(this.categoryId)
-                    node.loaded = false
-                    node.expand()
+                    this.getType()
                     this.typeVisible = false
                     setTimeout(() => {
                         this.submited = false
@@ -578,6 +588,13 @@ export default {
             if(!checked.length) return this.$message.warning('请选择数据')
             this.submited = true
             const typeIds = checked.filter(e => !e.name).map(e => e.realId) // 先筛选出分类id，再获取分类真正的id
+            const tableIds = checked.filter(e => e.name)
+            const categoryId = Number(this.categoryId)
+            tableIds.map(e => {
+                delete e.id
+                e.categoryId = categoryId
+            })
+            if (typeIds.length) {
                 this.getNames(typeIds).then(() => {
                     const data = this.names
                     const dataList = []
@@ -605,6 +622,18 @@ export default {
                         this.submited = false
                     })
                 })
+            } else {
+                this.$post(this.api.saveTable, tableIds).then(res => {
+                    this.$message.success('导入成功')
+                    this.getData()
+                    this.importVisible = false
+                    setTimeout(() => {
+                        this.submited = false
+                    },1000)
+                }).catch(res => {
+                    this.submited = false
+                })
+            }
         }
     }
 };

src/views/data/Introduce.vue

@@ -2,7 +2,7 @@
     <div>
         <el-container>
             <el-aside width="350px">
-                <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-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-aside>
 
             <el-main style="padding-top: 0">
@@ -56,9 +56,10 @@
 export default {
     data() {
         return {
+            typeList: [],
             defaultProps: {
                 children: 'children',
-                label: 'categoryName'
+                label: 'label'
             },
             defaultActive: [],
             editing: false,
@@ -68,10 +69,7 @@ export default {
             introduceText: '',
             categoryId: '',
             keywordList: [],
-            newKeyword: '',
-            node: [],
-            resolve: null,
-            curNode: {}
+            newKeyword: ''
         };
     },
     watch: {
@@ -82,22 +80,42 @@ export default {
             },500)
         }
     },
-    mounted(){},
+    mounted(){
+        this.getData()
+    },
     methods: {
-        getData(node, resolve){
+        getData(){
             // 获取分类
-            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)
+            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
                 // 取首个的id和简介
-                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
+                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
+                    }
                 }
                 this.getKeyword()
             }).catch(res => {})

src/views/data/Product.vue

@@ -82,7 +82,7 @@
                 </el-form-item>
                 <el-form-item label="配置数据">
                     <el-button type="primary" @click="configData">配置数据权限</el-button>
-                    <div class="type-wrap" ref="typeWrap" @scroll="loadType" style="display: none">
+                    <div class="type-wrap" ref="typeWrap" @scroll="loadType" v-show="checkedIds.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>
@@ -137,7 +137,7 @@
             </el-container>
             <span slot="footer" class="dialog-footer">
                 <el-button @click="configVisible = false">取 消</el-button>
-                <el-button type="primary" @click="confirmConfig">确 定</el-button>
+                <el-button type="primary" :loading="configLoading" @click="confirmConfig">确 定</el-button>
             </span>
         </el-dialog>
 
@@ -194,11 +194,9 @@ export default {
             typeUnit: 20,
             typeScrollTop: 0,
             typeTimer: null,
-            tableId: [],
 
             configVisible: false,
-            configChecked: [],
-            configCheckedTableId: [],
+            configLoading: false,
             categoryId: '',
             configIds: [],
             updateTime: '',
@@ -278,7 +276,7 @@ export default {
             }).catch(res => {})
         },
         // 获取分类
-        getType(){
+        getType(queryDetail){
             this.productVisible = true
             this.$post(this.api.getTableByClassification).then(res => {
                 const that = this
@@ -294,6 +292,7 @@ export default {
                     })
                 }
                 handleId(res)
+                this.typeConfigList = JSON.parse(JSON.stringify(res))
 
                 // 获取分类下的表
                 function getTable(data){
@@ -311,6 +310,7 @@ export default {
 
                 setTimeout(() => {
                     this.typeList = res
+                    queryDetail && this.getDetail()
                 },500)
                 this.importVisible = true
             }).catch(res => {})
@@ -381,9 +381,8 @@ export default {
                 const data = res.product
                 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 = data.tableId.split(',')
+                this.$refs.type.setCheckedKeys(this.checkedIds)
             }).catch(res => {})
         },
         add(){
@@ -392,12 +391,11 @@ export default {
             this.checkedIds = []
         },
         edit(row){
-            this.getType()
+            this.getType(true)
             this.id = row.id
             this.userId = row.userId
-            this.getDetail()
         },
-        switchOff(val,row,index) {
+        switchOff(val,row) {
             this.$post(this.api.updateProduct,{
                 id: row.id,
                 productName: row.productName,
@@ -415,10 +413,9 @@ export default {
             }).catch(err => {})
         },
         preview(row){
+            this.getType(true)
             this.isDetail = true
-            this.getType()
             this.id = row.id
-            this.getDetail()
         },
         handleDelete(row) {
             this.$confirm('确定要删除吗？', '提示', {
@@ -460,21 +457,19 @@ export default {
             this.isDetail = false
             this.typeIndex = 100000
             this.typeList = []
-            this.tableId = []
-            this.configChecked = []
             this.configIds = []
         },
         // 获取tableId,提交的时候需要
-        getIds(){
+        getIds(list){
             // 获取已经勾选的分类
-            let list = this.checkedIds
-            this.tableId = []
+            this.checkedIds = []
             const proList = []
+            this.configLoading = true
             // 勾选的分类id分别去查询下面的表id，也可以全部id用逗号分隔去查，这里遍历去查是因为这样速度更快
             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(','))
+                        res.tableId && this.checkedIds.push(...res.tableId.split(','))
                         resolve()
                     }).catch(res => {
                         this.submited = false
@@ -483,8 +478,11 @@ export default {
             })
             // 全部分类id遍历查询完resolve回去
             return Promise.all(proList).then(res => {
+                this.configLoading = false
                 resolve()
-            }).catch(err => {})
+            }).catch(err => {
+                this.configLoading = false
+            })
         },
         confirm(){
             if(this.submited) return false
@@ -493,8 +491,7 @@ export default {
             if(isNaN(this.market)) 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))
+            let tableId = this.checkedIds
             if(!tableId.length) return this.$message.warning('请选择数据')
             let data = {
                 id: this.id,
@@ -528,22 +525,18 @@ export default {
                     this.submited = false
                 })
             }
-            })
         },
         configData(){
             this.configVisible = true
             this.getConfigType()
             // 编辑的时候才需要获取外面的弹框的已选数据，传到配置数据里去默认勾选
-            if (this.id) {
+            if (this.checkedIds.length) {
                 let list = this.$refs.type.getCheckedNodes()
-                let configIds = []
-                list.map(n => {
-                    if(!n.name) configIds.push(n.originId) // 分类没有name。只需要分类id，因为配置数据里是以分类为维度的，所以获取表id无法默认勾选
-                })
-                this.configIds = configIds
+                this.configIds = list.filter(n => !n.name).map(n => n.id)
+                this.$refs.typeConfig.setCheckedKeys(this.configIds)
             }
         },
-        typeConfigClick(data,node){
+        typeConfigClick(data){
             this.categoryId = data.id
             this.getConfigTable()
         },
@@ -553,25 +546,22 @@ export default {
         },
         // 获取配置数据里面的分类
         getConfigType(){
-            this.$post(this.api.getTableByClassification).then(res => {
+            const list = this.typeConfigList
             function handleId(data){
                 data.map(n => {
-                        n.id = String(n.id)
-                        n.label = n.categoryName
+                    n.disabled = false // 配置数据都是可选的
                     if(n.children.length){
                         handleId(n.children)
                     }
                 })
             }
-                handleId(res)
-                this.typeConfigList = res
-                if(res[0].children.length){
-                    this.categoryId = res[0].children[0].id
+            handleId(list)
+            if(list[0].children.length){
+                this.categoryId = list[0].children[0].id
             }else{
-                    this.categoryId = res[0].id
+                this.categoryId = list[0].id
             }
             this.getConfigTable()
-            }).catch(res => {})
         },
         // 获取配置数据里面分类下的表
         getConfigTable(){
@@ -614,26 +604,12 @@ export default {
                 this.previewVisible = true
             }).catch(res => {})
         },
-        // 递归获取选中的分类id
-        getTableId(list){
-            let checked = this.configChecked
-            list.map(n => {
-                if(n.children && n.children.length){
-                    this.getTableId(n.children)
-                    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)
-                    }
-                }
-            })
-        },
         confirmConfig(){
-            this.configChecked = this.$refs.typeConfig.getCheckedKeys().map(n => n) // 获取选中的id
-            this.checkedIds = this.configChecked
+            const list = this.$refs.typeConfig.getCheckedNodes().map(e => e.originId) // 获取选中的id
+            this.getIds(list).then(() => {
                 this.configVisible = false
-            this.$nextTick(() => {
-                this.$refs.type.setCheckedNodes(this.checkedIds)
+                this.$refs.type.setCheckedKeys(this.checkedIds)
+                
             })
         }
     }