diff --git a/src/api/mdp_pub/larc.js b/src/api/mdp_pub/larc.js index 843bad7f..c9cafd78 100644 --- a/src/api/mdp_pub/larc.js +++ b/src/api/mdp_pub/larc.js @@ -25,7 +25,7 @@ import { getAccessToken } from '@/utils/auth' * 文件上传下载时带上token * @returns */ - export const getArcUploadHeader = () => { return {Authorization: "Bearor "+ getAccessToken()} } + export const getArcUploadHeader = () => { return {Authorization: "Bearer "+ getAccessToken()} } // --arc tag 相关api diff --git a/src/components/mdp-ui-ext/mdp-cate-tree/Index.vue b/src/components/mdp-ui-ext/mdp-cate-tree/Index.vue index 2f0becc4..9214af77 100644 --- a/src/components/mdp-ui-ext/mdp-cate-tree/Index.vue +++ b/src/components/mdp-ui-ext/mdp-cate-tree/Index.vue @@ -72,7 +72,7 @@ 全网公开 内部公开 受限 - 配置限制规则 + 配置限制规则 所有子类遵守上级权限规则 @@ -85,13 +85,13 @@ - + - + @@ -168,13 +168,6 @@ export default { type:String, default:null }, - /** - * 上级分类 - */ - pid:{ - type:String, - default:'' - }, crelyType:{ type:String, default:'' @@ -200,6 +193,8 @@ export default { var hidden ={ batchDel: true, del:isSelect, + importTop:false, + importSub:false, changePid: false, addTop: isSelect, addSub: isSelect, @@ -235,6 +230,18 @@ export default { if(this.params){ Object.assign(params,this.params) } + if(this.crelyType){ + params.crelyType=this.crelyType + } + if(this.crelyStype){ + params.crelyStype=this.crelyStype + } + if(this.crelyId){ + params.crelyId=this.crelyId + } + if(this.crelySid){ + params.crelySid=this.crelySid + } let codeKey=util.getCodeKey("tree_listCategory",params) if(node.level===0){ let datas=MdpCateTreeMap.get(codeKey) @@ -276,7 +283,7 @@ export default { if (!this.initExtParams(formData)) { return } - + Object.assign(this.addForm,formData) this.$refs['addDialog'].open({ formData: formData, parent: null, @@ -287,6 +294,13 @@ export default { if(this.categoryType){ formData.categoryType=this.categoryType } + if(this.filters.categoryType){ + formData.categoryType=this.filters.categoryType + } + if(parent?.id){ + formData.categoryType=parent.categoryType + formData.pid=parent.id + } return true }, onAddSubClick: function (parent, callback) { diff --git a/src/components/mdp-ui-ext/mdp-cate-tree/QxSet.vue b/src/components/mdp-ui-ext/mdp-cate-tree/QxSet.vue index ca7ebffa..c1e052f0 100644 --- a/src/components/mdp-ui-ext/mdp-cate-tree/QxSet.vue +++ b/src/components/mdp-ui-ext/mdp-cate-tree/QxSet.vue @@ -1,94 +1,90 @@ -