Commit e45fad1c authored by 邓超's avatar 邓超

fix: 产品配置添加civ_base包

parent 726aab0f
Pipeline #71938 passed with stages
......@@ -42,13 +42,17 @@ const HomeConfigModal = props => {
let obj = { homePage: form.getFieldsValue().homePage, productType: '' };
let arrUrl = obj.homePage.split('/'); // 用const声明常量
const product = allProductList.find(item => item.PackageName.includes(arrUrl[0]));
let allProList = JSON.parse(JSON.stringify(allProductList));
allProList.push({ PackageName: 'civ_base' });
const product = allProList.find(item => item.PackageName.includes(arrUrl[0]));
if (!product) {
// arrUrl.shift();
obj.homePage = `civweb4/${obj.homePage}`;
}
obj.productType = product?.PackageName || 'civweb4';
if (!productList.some(item => item.PackageName === obj.productType)) {
let proList = JSON.parse(JSON.stringify(productList));
proList.push({ PackageName: 'civ_base' });
if (!proList.some(item => item.PackageName === obj.productType)) {
message.error(`${obj.productType}未授权,不能使用该功能当主页`);
return;
}
......
......@@ -272,15 +272,18 @@ export default props => {
console.log(validate);
if (validate.homePage) {
let arr = validate.homePage.split('/'); // 用const声明常量
const product = allProductList.find(item => item.PackageName.includes(arr[0]));
let allProList = JSON.parse(JSON.stringify(allProductList));
allProList.push({ PackageName: 'civ_base' });
const product = allProList.find(item => item.PackageName.includes(arr[0]));
if (product) {
arr.shift();
validate.homePage = arr.join('/');
}
console.log(product, 'product');
validate.productType = product?.PackageName || 'civweb4';
if (!productList.some(item => item.PackageName === validate.productType)) {
let proList = JSON.parse(JSON.stringify(productList));
proList.push({ PackageName: 'civ_base' });
if (!proList.some(item => item.PackageName === validate.productType)) {
message.error(`${validate.productType}未授权,不能使用该功能当主页`);
return;
}
......
......@@ -34,7 +34,9 @@ const AddForm = props => {
if (!arr[0]) {
arr.shift();
}
const product = allProductList.find(item => item.PackageName.includes(arr[0]));
let allProList = JSON.parse(JSON.stringify(allProductList));
allProList.push({ PackageName: 'civ_base' });
const product = allProList.find(item => item.PackageName.includes(arr[0]));
if (product) {
if (arr.length > 1) {
arr.shift();
......@@ -44,7 +46,9 @@ const AddForm = props => {
}
console.log(product, 'product');
obj.product = product?.PackageName || 'civweb4';
if (!productList.some(item => item.PackageName === obj.product)) {
let proList = JSON.parse(JSON.stringify(productList));
proList.push({ PackageName: 'civ_base' });
if (!proList.some(item => item.PackageName === obj.product)) {
message.error(`${obj.product}未授权,不能使用该功能`);
return;
}
......
......@@ -156,7 +156,9 @@ const EditForm = props => {
if (!arr[0]) {
arr.shift();
}
const product = allProductList.find(item => item.PackageName.includes(arr[0]));
let allProList = JSON.parse(JSON.stringify(allProductList));
allProList.push({ PackageName: 'civ_base' });
const product = allProList.find(item => item.PackageName.includes(arr[0]));
console.log(product, 'product');
if (product) {
arr.shift();
......@@ -164,7 +166,11 @@ const EditForm = props => {
}
obj.product = product?.PackageName || 'civweb4';
if (!productList.some(item => item.PackageName === obj.product)) {
console.log(productList, 'productList');
let proList = JSON.parse(JSON.stringify(productList));
proList.push({ PackageName: 'civ_base' });
if (!proList.some(item => item.PackageName === obj.product)) {
message.error(`${obj.product}未授权,不能使用该功能`);
return;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment