diff --git a/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html b/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html
index 0bf7ce20..a2d3866f 100644
--- a/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html
+++ b/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html
@@ -1,3 +1,3 @@
+ (selectedEvent)="getConfigList($event)" (saveEvent)="saveAction($event)">
\ No newline at end of file
diff --git a/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.ts b/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.ts
index 51b0b2e7..54b23b33 100644
--- a/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.ts
+++ b/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.ts
@@ -13,7 +13,6 @@ export class BasicSettingComponent implements OnInit {
selectedTab: any = null;
configList: any = [];
-
constructor(public service: SystemService) {}
ngOnInit() {
@@ -27,21 +26,24 @@ export class BasicSettingComponent implements OnInit {
if (typeData) {
this.tabs = typeData.children;
this.selectedTab = typeData.children[0];
- this.getConfigList(this.selectedTab.id);
+ this.getConfigList(this.selectedTab);
}
}
});
}
- getConfigList(id: string) {
- this.service.request(this.service.$api_get_config_by_parent_id, { id }).subscribe((res: Array) => {
+ getConfigList(selectedTab: any) {
+ this.selectedTab = selectedTab;
+ this.service.request(this.service.$api_get_config_by_parent_id, { id: selectedTab.id }).subscribe((res: Array) => {
if (res?.length > 0) {
res = res.map(item => ({
...item,
remark: item.remark ? JSON.parse(item.remark) : null,
- extend: item.extend ? JSON.parse(item.extend) : [],
- itemValue: item.itemValue ? JSON.parse(item.itemValue) : item.itemValue
+ itemValue: item.itemValue ? JSON.parse(item.itemValue) : item.itemValue,
+ itemData: item.itemData ? JSON.parse(item.itemData) : item.itemData
}));
+ console.log(res);
+
this.configList = res;
} else {
this.configList = [];
@@ -49,17 +51,16 @@ export class BasicSettingComponent implements OnInit {
});
}
- changeType(type: any): void {
- this.selectedTab = type;
- this.getConfigList(this.selectedTab.id);
- }
-
saveAction(params: any) {
- this.service.request(this.service.$api_update_config_batch, params).subscribe(res => {
- if (res) {
- this.service.msgSrv.success('修改配置成功');
- this.getConfigList(this.selectedTab.id);
- }
- });
+ console.log(params);
+
+ // this.service.request(this.service.$api_update_config_batch, params).subscribe(res => {
+ // if (res) {
+ // this.service.msgSrv.success('修改配置成功');
+ // setTimeout(() => {
+ // this.getConfigList(this.selectedTab);
+ // }, 100);
+ // }
+ // });
}
}
diff --git a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html
index 35763daf..f9144846 100644
--- a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html
+++ b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html
@@ -24,8 +24,8 @@
-
-
+
+
diff --git a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts
index 7106657b..9043ffb4 100644
--- a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts
+++ b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts
@@ -1,6 +1,7 @@
import { Component, OnInit, EventEmitter, Input, Output } from '@angular/core';
import { BaseService } from '@shared';
+const JSONTYPE = new Set([5]);
@Component({
selector: 'app-dynamic-setting-h5',
templateUrl: './dynamic-setting-h5.component.html',
@@ -39,12 +40,18 @@ export class DynamicSettingH5Component implements OnInit {
if (this.configList?.length < 0) {
return;
}
- const params = this.configList.map((item: any) => ({
- ...item,
- remark: item.remark ? JSON.stringify(item.remark) : null,
- itemData: item.itemData ? JSON.stringify(item.itemData) : null,
- itemValue: item.itemValue ? JSON.stringify(item.itemValue) : null
- }));
+
+ let params = [...this.configList];
+ params = params.map((item: any) => {
+ if (JSONTYPE.has(item.itemType)) {
+ item.itemValue = item.itemValue ? JSON.stringify(item.itemValue) : null;
+ }
+ return {
+ ...item,
+ remark: item.remark ? JSON.stringify(item.remark) : null,
+ itemData: item.itemData ? JSON.stringify(item.itemData) : null
+ };
+ });
this.saveEvent.emit(params);
}
}