新增租户产品包功能

dev
smallchill 4 years ago
parent 642eb76fa8
commit 421f359dc8
  1. 21
      src/api/system/tenant.js
  2. 50
      src/api/system/tenantpackage.js
  3. 4
      src/main.js
  4. 157
      src/views/system/tenant.vue
  5. 243
      src/views/system/tenantpackage.vue
  6. 2
      src/views/tool/code.vue

@ -79,3 +79,24 @@ export const info = (domain) => {
}
})
}
export const packageInfo = (tenantId) => {
return request({
url: '/api/blade-system/tenant/package-detail',
method: 'get',
params: {
tenantId
}
})
}
export const packageSetting = (tenantId, packageId) => {
return request({
url: '/api/blade-system/tenant/package-setting',
method: 'post',
params: {
tenantId,
packageId
}
})
}

@ -0,0 +1,50 @@
import request from '@/router/axios';
export const getList = (current, size, params) => {
return request({
url: '/api/blade-system/tenant-package/list',
method: 'get',
params: {
...params,
current,
size,
}
})
}
export const getDetail = (id) => {
return request({
url: '/api/blade-system/tenant-package/detail',
method: 'get',
params: {
id
}
})
}
export const remove = (ids) => {
return request({
url: '/api/blade-system/tenant-package/remove',
method: 'post',
params: {
ids,
}
})
}
export const add = (row) => {
return request({
url: '/api/blade-system/tenant-package/submit',
method: 'post',
data: row
})
}
export const update = (row) => {
return request({
url: '/api/blade-system/tenant-package/submit',
method: 'post',
data: row
})
}

@ -22,6 +22,9 @@ import thirdRegister from './components/third-register/main';
import avueUeditor from 'avue-plugin-ueditor';
import website from '@/config/website';
import crudCommon from '@/mixins/crud';
// 业务组件
import tenantPackage from './views/system/tenantpackage';
// 注册全局crud驱动
window.$crudCommon = crudCommon;
// 加载Vue拓展
@ -41,6 +44,7 @@ Vue.component('basicContainer', basicContainer);
Vue.component('basicBlock', basicBlock);
Vue.component('thirdRegister', thirdRegister);
Vue.component('avueUeditor', avueUeditor);
Vue.component('tenantPackage', tenantPackage);
// 加载相关url地址
Object.keys(urls).forEach(key => {
Vue.prototype[key] = urls[key];

@ -26,18 +26,38 @@
plain
@click="handleDelete">
</el-button>
<el-button size="small"
plain
v-if="userInfo.role_name.includes('administrator')"
icon="el-icon-setting"
@click="handleSetting">授权配置
</el-button>
<el-button size="small"
plain
v-if="userInfo.role_name.includes('administrator')"
icon="el-icon-coin"
@click="handleDatasource">数据源配置
</el-button>
<el-tooltip class="item" effect="dark" content="给租户配置账号额度、过期时间等授权信息" placement="top">
<el-button size="small"
plain
v-if="userInfo.role_name.includes('administrator')"
icon="el-icon-setting"
@click="handleSetting">授权配置
</el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="给租户配置独立数据源以实现数据库隔离" placement="top">
<el-button size="small"
plain
v-if="userInfo.role_name.includes('administrator')"
icon="el-icon-coin"
@click="handleDatasource">数据源配置
</el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="将菜单产品包与租户配置绑定" placement="top">
<el-button size="small"
plain
v-if="userInfo.role_name.includes('administrator')"
icon="el-icon-notebook-1"
@click="handlePackage">产品包配置
</el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="将自定义的菜单集合定制为租户绑定的菜单产品包" placement="top">
<el-button size="small"
plain
v-if="userInfo.role_name.includes('administrator')"
icon="el-icon-notebook-2"
@click="handlePackageSetting">产品包管理
</el-button>
</el-tooltip>
</template>
<template slot-scope="{row}"
slot="accountNumber">
@ -60,12 +80,27 @@
width="450px">
<avue-form :option="datasourceOption" v-model="datasourceForm" @submit="handleDatasourceSubmit"/>
</el-dialog>
<el-dialog title="租户产品包配置"
append-to-body
:visible.sync="packageBox"
width="450px">
<avue-form ref="formPackage" :option="packageOption" v-model="packageForm" @submit="handlePackageSubmit"/>
</el-dialog>
<el-dialog title="租户产品包管理"
append-to-body
:visible.sync="packageSettingBox"
width="1000px">
<tenant-package></tenant-package>
</el-dialog>
</basic-container>
</template>
<script>
import {getList, getDetail, remove, update, add, setting, datasource} from "@/api/system/tenant";
import {getList, getDetail, remove, update, add, setting, datasource, packageInfo, packageSetting} from "@/api/system/tenant";
import {getDetail as packageDetail} from "@/api/system/tenantpackage";
import {mapGetters} from "vuex";
import {getMenuTree} from "@/api/system/menu";
import {validatenull} from "@/util/validate";
export default {
data() {
@ -76,6 +111,8 @@ export default {
loading: true,
box: false,
datasourceBox: false,
packageBox: false,
packageSettingBox: false,
page: {
pageSize: 10,
currentPage: 1,
@ -222,9 +259,53 @@ export default {
}]
},
]
}
},
packageForm: {},
packageOption: {
column: [
{
label: "产品包",
prop: "packageId",
search: true,
span: 24,
type: "select",
dicUrl: "/api/blade-system/tenant-package/select",
props: {
label: "packageName",
value: "id"
},
rules: [{
required: true,
message: "请选择产品包",
trigger: "blur"
}]
},
{
label: "菜单预览",
prop: "menuId",
span: 24,
type: "tree",
dicData: [],
hide: true,
multiple: true,
props: {
label: "title"
},
},
]
},
};
},
watch: {
'packageForm.packageId'() {
if (!validatenull(this.packageForm.packageId)) {
packageDetail(this.packageForm.packageId).then(res => {
this.packageForm.menuId = res.data.data.menuId;
this.initData();
});
}
}
},
computed: {
...mapGetters(["userInfo", "permission"]),
permissionList() {
@ -247,6 +328,12 @@ export default {
}
},
methods: {
initData() {
getMenuTree().then(res => {
const column = this.findObject(this.packageOption.column, "menuId");
column.dicData = res.data.data;
});
},
rowSave(row, done, loading) {
add(row).then(() => {
this.onLoad(this.page);
@ -376,6 +463,34 @@ export default {
});
this.datasourceBox = true;
},
handlePackage() {
if (this.selectionList.length === 0) {
this.$message.warning("请选择至少一条数据");
return;
}
if (this.selectionList.length !== 1) {
this.$message.warning("只能选择一条数据");
return;
}
if (this.selectionList.length === 1) {
packageInfo(this.selectionList[0].id).then(res => {
const data = res.data.data;
this.packageForm.packageId = data.id;
this.packageForm.menuId = data.menuId;
});
} else {
this.packageForm.menuId = '';
}
this.packageBox = true;
//
setTimeout(() => {
const form = this.$refs.formPackage;
form.updateDic('packageId');
}, 10);
},
handlePackageSetting() {
this.packageSettingBox = true;
},
handleSubmit(form, done, loading) {
setting(this.ids, form).then(() => {
this.onLoad(this.page);
@ -403,6 +518,20 @@ export default {
loading();
});
},
handlePackageSubmit(form, done, loading) {
packageSetting(this.tenantId, form.packageId).then(() => {
this.onLoad(this.page);
this.$message({
type: "success",
message: "配置成功!"
});
done();
this.packageBox = false;
}, error => {
window.console.log(error);
loading();
});
},
currentChange(currentPage) {
this.page.currentPage = currentPage;
},

@ -0,0 +1,243 @@
<template>
<avue-crud :option="option"
:table-loading="loading"
:data="data"
:page.sync="page"
:permission="permissionList"
:before-open="beforeOpen"
v-model="form"
ref="crud"
@row-update="rowUpdate"
@row-save="rowSave"
@row-del="rowDel"
@search-change="searchChange"
@search-reset="searchReset"
@selection-change="selectionChange"
@current-change="currentChange"
@size-change="sizeChange"
@refresh-change="refreshChange"
@on-load="onLoad">
<template slot="menuLeft">
<el-button type="danger"
size="small"
icon="el-icon-delete"
plain
@click="handleDelete">
</el-button>
</template>
</avue-crud>
</template>
<script>
import {getList, getDetail, add, update, remove} from "@/api/system/tenantpackage";
import {mapGetters} from "vuex";
import {getMenuTree} from "@/api/system/menu";
export default {
name: "tenantPackage",
data() {
return {
form: {},
query: {},
loading: true,
page: {
pageSize: 10,
currentPage: 1,
total: 0
},
selectionList: [],
option: {
height: 'auto',
calcHeight: 30,
tip: false,
searchShow: true,
searchMenuSpan: 6,
border: true,
index: true,
viewBtn: true,
selection: true,
dialogClickModal: false,
dialogWidth: 600,
column: [
{
label: "产品包名",
prop: "packageName",
search: true,
span: 24,
rules: [{
required: true,
message: "请输入产品包名称",
trigger: "blur"
}]
},
{
label: "菜单列表",
prop: "menuId",
span: 24,
type: "tree",
dicData: [],
hide: true,
multiple: true,
props: {
label: "title"
},
rules: [{
required: true,
message: "请选择菜单",
trigger: "blur"
}]
},
{
label: "备注",
prop: "remark",
span: 24
},
]
},
data: []
};
},
computed: {
...mapGetters(["permission"]),
permissionList() {
return {
addBtn: true,
viewBtn: false,
delBtn: true,
editBtn: true
};
},
ids() {
let ids = [];
this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
}
},
methods: {
initData() {
getMenuTree().then(res => {
const column = this.findObject(this.option.column, "menuId");
column.dicData = res.data.data;
});
},
rowSave(row, done, loading) {
row.menuId = row.menuId.join(",");
add(row).then(() => {
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
done();
}, error => {
loading();
window.console.log(error);
});
},
rowUpdate(row, index, done, loading) {
update(row).then(() => {
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
done();
}, error => {
loading();
console.log(error);
});
},
rowDel(row) {
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
return remove(row.id);
})
.then(() => {
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
});
},
handleDelete() {
if (this.selectionList.length === 0) {
this.$message.warning("请选择至少一条数据");
return;
}
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
return remove(this.ids);
})
.then(() => {
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
this.$refs.crud.toggleSelection();
});
},
beforeOpen(done, type) {
if (["add", "edit"].includes(type)) {
this.initData();
}
if (["edit", "view"].includes(type)) {
getDetail(this.form.id).then(res => {
this.form = res.data.data;
});
}
done();
},
searchReset() {
this.query = {};
this.onLoad(this.page);
},
searchChange(params, done) {
this.query = params;
this.page.currentPage = 1;
this.onLoad(this.page, params);
done();
},
selectionChange(list) {
this.selectionList = list;
},
selectionClear() {
this.selectionList = [];
this.$refs.crud.toggleSelection();
},
currentChange(currentPage) {
this.page.currentPage = currentPage;
},
sizeChange(pageSize) {
this.page.pageSize = pageSize;
},
refreshChange() {
this.onLoad(this.page, this.query);
},
onLoad(page, params = {}) {
this.loading = true;
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
this.loading = false;
this.selectionClear();
});
}
}
};
</script>
<style>
</style>

@ -73,7 +73,7 @@
index: true,
selection: true,
labelWidth: 120,
menuWidth: 250,
menuWidth: 300,
viewBtn: true,
dialogClickModal: false,
column: [

Loading…
Cancel
Save