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 fbd7880f..0bf7ce20 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,81 +1,3 @@
-
-
-
-
-
-
- {{selectedTab?.name}}
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
\ 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 c6b8dce2..51b0b2e7 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
@@ -43,7 +43,6 @@ export class BasicSettingComponent implements OnInit {
itemValue: item.itemValue ? JSON.parse(item.itemValue) : item.itemValue
}));
this.configList = res;
- console.log(res);
} else {
this.configList = [];
}
@@ -55,15 +54,7 @@ export class BasicSettingComponent implements OnInit {
this.getConfigList(this.selectedTab.id);
}
- saveAction() {
- if (this.configList?.length < 0) {
- return;
- }
- const params = this.configList.map((item: any) => ({
- ...item,
- remark: item.remark ? JSON.stringify(item.remark) : null,
- itemValue: item.itemValue ? JSON.stringify(item.itemValue) : null
- }));
+ saveAction(params: any) {
this.service.request(this.service.$api_update_config_batch, params).subscribe(res => {
if (res) {
this.service.msgSrv.success('修改配置成功');
diff --git a/src/app/routes/sys-setting/components/network-freight/network-freight.component.ts b/src/app/routes/sys-setting/components/network-freight/network-freight.component.ts
index cc081c8a..483ffe54 100644
--- a/src/app/routes/sys-setting/components/network-freight/network-freight.component.ts
+++ b/src/app/routes/sys-setting/components/network-freight/network-freight.component.ts
@@ -1,6 +1,7 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { STComponent, STColumn, STChange } from '@delon/abc/st';
import { SFComponent, SFRadioWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
+import { DynamicSettingModalComponent } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal';
import { SystemService } from '../../services/system.service';
@@ -19,7 +20,7 @@ export class NetworkFreightComponent implements OnInit {
schema: SFSchema = {};
addSchema: SFSchema = {};
_$expand = false;
- formData :any;
+ formData: any;
isVisible = false;
edit = false;
editId = false;
@@ -33,7 +34,13 @@ export class NetworkFreightComponent implements OnInit {
{ title: '电子合同账号', index: 'electronicContractAccount' },
{ title: '开户行', index: 'bankName' },
{ title: '虚拟账户', index: 'virtualAccount' },
- { title: '附加费比例', index: 'surchargeRate', format: (item: any) => {return item.surchargeRate + '%'} },
+ {
+ title: '附加费比例',
+ index: 'surchargeRate',
+ format: (item: any) => {
+ return item.surchargeRate + '%';
+ }
+ },
{
title: '操作',
buttons: [
@@ -45,22 +52,27 @@ export class NetworkFreightComponent implements OnInit {
text: '合同设置',
click: item => this.roleAction(item, 2)
},
+ {
+ text: '基础设置',
+ click: item => this.settingAction(item)
+ }
]
}
];
selectedRows: any[] = [];
- get reqParams (){
+ get reqParams() {
return {
- ...this.sf?.value,
- }};
+ ...this.sf?.value
+ };
+ }
constructor(public service: SystemService, private nzModalService: NzModalService) {}
ngOnInit(): void {
- this.initSF()
- this.initSFFre()
+ this.initSF();
+ this.initSFFre();
}
stChange(e: STChange): void {
@@ -73,83 +85,80 @@ export class NetworkFreightComponent implements OnInit {
break;
}
}
- /**
- * 伸缩查询条件
- */
- expandToggle(): void {
- this._$expand = !this._$expand;
- this.sf?.setValue('/_$expand', this._$expand);
- }
- /**
+ /**
+ * 伸缩查询条件
+ */
+ expandToggle(): void {
+ this._$expand = !this._$expand;
+ this.sf?.setValue('/_$expand', this._$expand);
+ }
+ /**
* 查询字段个数
*/
- get queryFieldCount(): number {
- return Object.keys(this.schema?.properties || {}).length;
- }
- initSF(){
- this.schema = {
- properties: {
- _$expand: { type: 'boolean', ui: { hidden: true } },
- enterpriseName: {
- type: 'string',
- title: '公司名称',
- ui: { placeholder: '请输入' }
- },
- taxCode: {
- type: 'string',
- title: '纳税人识别号',
- ui: { placeholder: '请输入' }
- },
- }
-
- };
- this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } };
+ get queryFieldCount(): number {
+ return Object.keys(this.schema?.properties || {}).length;
+ }
+ initSF() {
+ this.schema = {
+ properties: {
+ _$expand: { type: 'boolean', ui: { hidden: true } },
+ enterpriseName: {
+ type: 'string',
+ title: '公司名称',
+ ui: { placeholder: '请输入' }
+ },
+ taxCode: {
+ type: 'string',
+ title: '纳税人识别号',
+ ui: { placeholder: '请输入' }
+ }
+ }
+ };
+ this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } };
}
initSFFre() {
- this.addSchema = {
- properties: {
- enterpriseName: {
- type: 'string',
- title: '公司名称',
- ui: { placeholder: '请输入' }
- },
- taxCode: {
- type: 'string',
- title: '纳税人识别号',
- ui: { placeholder: '请输入' }
- },
- customerCode: {
- type: 'string',
- title: '税收分类编码',
- ui: { placeholder: '请输入' }
- },
- invoiceTaxRate: {
- type: 'string',
- title: '发票税率',
- ui: { placeholder: '请输入' }
- },
- surchargeRate: {
- type: 'string',
- title: '附加费比例',
- ui: { placeholder: '请输入' }
- },
-
- },
- required: ['enterpriseName', 'taxCode', 'customerType', 'invoiceTaxRate', 'surchargeRate']
- };
-this.ui2 = { '*': { spanLabelFixed: 120, grid: { span: 24 } } };
-}
- roleAction(value: any,item?: any) {
-
- this.service.request(this.service.$api_get_crmCustomer, {id: value.id}).subscribe((res: any) => {
- console.log(res)
- if(res) {
- this.formData = res;
+ this.addSchema = {
+ properties: {
+ enterpriseName: {
+ type: 'string',
+ title: '公司名称',
+ ui: { placeholder: '请输入' }
+ },
+ taxCode: {
+ type: 'string',
+ title: '纳税人识别号',
+ ui: { placeholder: '请输入' }
+ },
+ customerCode: {
+ type: 'string',
+ title: '税收分类编码',
+ ui: { placeholder: '请输入' }
+ },
+ invoiceTaxRate: {
+ type: 'string',
+ title: '发票税率',
+ ui: { placeholder: '请输入' }
+ },
+ surchargeRate: {
+ type: 'string',
+ title: '附加费比例',
+ ui: { placeholder: '请输入' }
}
- })
- this.edit = true;
- this.editId = value.id;
- this.isVisible = true;
+ },
+ required: ['enterpriseName', 'taxCode', 'customerType', 'invoiceTaxRate', 'surchargeRate']
+ };
+ this.ui2 = { '*': { spanLabelFixed: 120, grid: { span: 24 } } };
+ }
+ roleAction(value: any, item?: any) {
+ this.service.request(this.service.$api_get_crmCustomer, { id: value.id }).subscribe((res: any) => {
+ console.log(res);
+ if (res) {
+ this.formData = res;
+ }
+ });
+ this.edit = true;
+ this.editId = value.id;
+ this.isVisible = true;
}
deleteAction(item?: any) {
@@ -161,6 +170,19 @@ this.ui2 = { '*': { spanLabelFixed: 120, grid: { span: 24 } } };
});
}
+ settingAction(item?: any) {
+ this.nzModalService.create({
+ nzTitle: '基础设置',
+ nzContent: DynamicSettingModalComponent,
+ nzWidth: 900,
+ nzComponentParams: {
+ extendType: '1',
+ businessId: item.id
+ },
+ nzFooter: null
+ });
+ }
+
/**
* 重置表单
*/
@@ -168,30 +190,29 @@ this.ui2 = { '*': { spanLabelFixed: 120, grid: { span: 24 } } };
this.sf.reset();
}
handleCancel() {
- this.isVisible = false
+ this.isVisible = false;
}
handleOK() {
- console.log(this.sfFre.value)
- if(!this.sfFre.valid) {
- this.service.msgSrv.warning('请正确填写完整!')
- return
+ console.log(this.sfFre.value);
+ if (!this.sfFre.valid) {
+ this.service.msgSrv.warning('请正确填写完整!');
+ return;
}
- const params ={
+ const params = {
...this.sfFre.value
+ };
+ if (this.editId) {
+ params.id = this.editId;
}
- if(this.editId) {
- params.id = this.editId
- }
- this.service.request(this.service.$api_save_crmCustomer, params).subscribe((res:any) => {
- if(res) {
- this.service.msgSrv.success('保存成功!')
- this.isVisible = false
- this.st.reload();
+ this.service.request(this.service.$api_save_crmCustomer, params).subscribe((res: any) => {
+ if (res) {
+ this.service.msgSrv.success('保存成功!');
+ this.isVisible = false;
+ this.st.reload();
} else {
- this.service.msgSrv.warning(res?.msg)
-
+ this.service.msgSrv.warning(res?.msg);
}
- })
+ });
}
}
diff --git a/src/app/routes/sys-setting/sys-setting.module.ts b/src/app/routes/sys-setting/sys-setting.module.ts
index 3bf9d1f7..816faebb 100644
--- a/src/app/routes/sys-setting/sys-setting.module.ts
+++ b/src/app/routes/sys-setting/sys-setting.module.ts
@@ -8,7 +8,7 @@
*/
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
-import { SharedModule } from '@shared';
+import { DynamicSettingModule, SharedModule } from '@shared';
import { StaffManagementComponent } from './components/staff-management/staff-management.component';
import { SysSettingRoutingModule } from './sys-setting-routing.module';
import { BuyerTranspowerComponent } from './components/staff-management/transpower/transpower.component';
@@ -61,10 +61,10 @@ const NOTROUTECOMPONENTS = [
AuditResonConfigActionModalComponent,
CartConfigActionModalComponent,
SettingRoleEditComponent,
- SettingMenuComponent,
+ SettingMenuComponent
];
@NgModule({
declarations: [...COMPONENTS, ...NOTROUTECOMPONENTS],
- imports: [CommonModule, SysSettingRoutingModule, SharedModule]
+ imports: [CommonModule, SysSettingRoutingModule, SharedModule, DynamicSettingModule]
})
export class SysSettingModule {}
diff --git a/src/app/routes/usercenter/components/driver/captain/captain.component.ts b/src/app/routes/usercenter/components/driver/captain/captain.component.ts
index 356f3751..cf637e7b 100644
--- a/src/app/routes/usercenter/components/driver/captain/captain.component.ts
+++ b/src/app/routes/usercenter/components/driver/captain/captain.component.ts
@@ -2,6 +2,7 @@ import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { STColumn, STColumnBadge, STComponent, STData } from '@delon/abc/st';
import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
+import { DynamicSettingModalComponent } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal';
import { UsermanageService } from '../../../services/usercenter.service';
@Component({
@@ -82,6 +83,19 @@ export class UserCenterComponentsDriverCaptainComponent implements OnInit {
});
}
+ settingAction(item?: any) {
+ this.modal.create({
+ nzTitle: '基础设置',
+ nzContent: DynamicSettingModalComponent,
+ nzWidth: 900,
+ nzComponentParams: {
+ extendType: '4',
+ businessId: item.id
+ },
+ nzFooter: null
+ });
+ }
+
expandToggle() {
this._$expand = !this._$expand;
this.sf?.setValue('/expand', this._$expand);
@@ -206,6 +220,10 @@ export class UserCenterComponentsDriverCaptainComponent implements OnInit {
click: item => {
this.router.navigate(['/usercenter/driver/captain/detail', item.appUserId]);
}
+ },
+ {
+ text: '基础设置',
+ click: item => this.settingAction(item)
}
]
}
diff --git a/src/app/routes/usercenter/components/driver/driver.component.ts b/src/app/routes/usercenter/components/driver/driver.component.ts
index 83d191c8..1fe5aaca 100644
--- a/src/app/routes/usercenter/components/driver/driver.component.ts
+++ b/src/app/routes/usercenter/components/driver/driver.component.ts
@@ -2,6 +2,7 @@ import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { STColumn, STColumnBadge, STComponent, STData } from '@delon/abc/st';
import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
+import { DynamicSettingModalComponent } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal';
import { UsermanageService } from '../../services/usercenter.service';
@Component({
@@ -77,6 +78,19 @@ export class UserCenterComponentsDriverComponent implements OnInit {
});
}
+ settingAction(item?: any) {
+ this.modal.create({
+ nzTitle: '基础设置',
+ nzContent: DynamicSettingModalComponent,
+ nzWidth: 900,
+ nzComponentParams: {
+ extendType: '3',
+ businessId: item.id
+ },
+ nzFooter: null
+ });
+ }
+
expandToggle() {
this._$expand = !this._$expand;
this.sf?.setValue('/expand', this._$expand);
@@ -264,6 +278,10 @@ export class UserCenterComponentsDriverComponent implements OnInit {
this.router.navigate(['./detail', item.appUserId], { relativeTo: this.ar });
// this.router.navigate(['./view', item.id], { relativeTo: this.ar, queryParams: { tenantId: item.tenantId } });
}
+ },
+ {
+ text: '基础设置',
+ click: item => this.settingAction(item)
}
]
}
diff --git a/src/app/routes/usercenter/components/freight/list/list.component.ts b/src/app/routes/usercenter/components/freight/list/list.component.ts
index 9377a8d2..caf9cef8 100644
--- a/src/app/routes/usercenter/components/freight/list/list.component.ts
+++ b/src/app/routes/usercenter/components/freight/list/list.component.ts
@@ -2,6 +2,7 @@ import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { STColumn, STColumnBadge, STComponent, STData } from '@delon/abc/st';
import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
+import { DynamicSettingModalComponent } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal';
import { UsermanageService } from '../../../services/usercenter.service';
@Component({
@@ -52,6 +53,20 @@ export class FreightComponentsListComponent implements OnInit {
return i;
});
}
+
+ settingAction(item?: any) {
+ this.modal.create({
+ nzTitle: '基础设置',
+ nzContent: DynamicSettingModalComponent,
+ nzWidth: 900,
+ nzComponentParams: {
+ extendType: '2',
+ businessId: item.id
+ },
+ nzFooter: null
+ });
+ }
+
initSF() {
this.schema = {
properties: {
@@ -180,6 +195,10 @@ export class FreightComponentsListComponent implements OnInit {
this.router.navigate(['./detail', item.id], { relativeTo: this.ar });
// this.router.navigate(['./view', item.id], { relativeTo: this.ar, queryParams: { tenantId: item.tenantId } });
}
+ },
+ {
+ text: '基础设置',
+ click: item => this.settingAction(item)
}
]
}
diff --git a/src/app/routes/usercenter/usercenter.module.ts b/src/app/routes/usercenter/usercenter.module.ts
index 7dfe0d5f..6df953ea 100644
--- a/src/app/routes/usercenter/usercenter.module.ts
+++ b/src/app/routes/usercenter/usercenter.module.ts
@@ -7,7 +7,7 @@
* @FilePath: \tms-obc-web\src\app\routes\usercenter\usercenter.module.ts
*/
import { NgModule } from '@angular/core';
-import { SharedModule } from '@shared';
+import { DynamicSettingModule, SharedModule } from '@shared';
import { UserCenterComponentsDriverCaptainComponent } from './components/driver/captain/captain.component';
import { UserCenterComponentsDriverDetailComponent } from './components/driver/detail/detail.component';
import { UserCenterComponentsDriverComponent } from './components/driver/driver.component';
@@ -40,7 +40,7 @@ const COMPONENTS = [
];
@NgModule({
- imports: [SharedModule, UsercenterRoutingModule],
+ imports: [SharedModule, UsercenterRoutingModule, DynamicSettingModule],
declarations: [...COMPONENTS]
})
export class UsercenterModule {}
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
new file mode 100644
index 00000000..35763daf
--- /dev/null
+++ b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html
@@ -0,0 +1,81 @@
+
+
+
+
+
+
+ {{selectedTab?.name}}
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.less b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.less
new file mode 100644
index 00000000..4b87d5c1
--- /dev/null
+++ b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.less
@@ -0,0 +1,27 @@
+:host {
+ ::ng-deep {
+ .card-height {
+ min-height: 600px;
+ }
+
+ .save-btn {
+ width : 100%;
+ text-align: right;
+ }
+
+ .block-radio {
+ display : flex;
+ min-height: 32px;
+ }
+
+ input {
+ width : 100px;
+ margin-left: 10px;
+ }
+
+ .ant-form-item-control-input-content {
+ display: flex;
+ }
+ }
+
+ }
\ No newline at end of file
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
new file mode 100644
index 00000000..7106657b
--- /dev/null
+++ b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts
@@ -0,0 +1,50 @@
+import { Component, OnInit, EventEmitter, Input, Output } from '@angular/core';
+import { BaseService } from '@shared';
+
+@Component({
+ selector: 'app-dynamic-setting-h5',
+ templateUrl: './dynamic-setting-h5.component.html',
+ styleUrls: ['./dynamic-setting-h5.component.less']
+})
+export class DynamicSettingH5Component implements OnInit {
+ @Input()
+ tabs: any[] = [];
+ @Input()
+ selectedTab: any = null;
+
+ @Input()
+ configList: any = [];
+ @Output()
+ selectedEvent = new EventEmitter();
+ @Output()
+ saveEvent = new EventEmitter();
+
+ @Input()
+ tabSpan = 4;
+ @Input()
+ labelWidth = 250;
+ @Input()
+ itemValue = 'itemValue';
+
+ constructor(public service: BaseService) {}
+
+ ngOnInit() {}
+
+ changeType(type: any): void {
+ this.selectedTab = type;
+ this.selectedEvent.emit(this.selectedTab);
+ }
+
+ saveAction() {
+ 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
+ }));
+ this.saveEvent.emit(params);
+ }
+}
diff --git a/src/app/shared/components/dynamic-setting/dynamic-setting-modal/dynamic-setting-modal.component.html b/src/app/shared/components/dynamic-setting/dynamic-setting-modal/dynamic-setting-modal.component.html
new file mode 100644
index 00000000..a57ef84e
--- /dev/null
+++ b/src/app/shared/components/dynamic-setting/dynamic-setting-modal/dynamic-setting-modal.component.html
@@ -0,0 +1,3 @@
+
+
\ No newline at end of file
diff --git a/src/app/shared/components/dynamic-setting/dynamic-setting-modal/dynamic-setting-modal.component.less b/src/app/shared/components/dynamic-setting/dynamic-setting-modal/dynamic-setting-modal.component.less
new file mode 100644
index 00000000..e69de29b
diff --git a/src/app/shared/components/dynamic-setting/dynamic-setting-modal/dynamic-setting-modal.component.ts b/src/app/shared/components/dynamic-setting/dynamic-setting-modal/dynamic-setting-modal.component.ts
new file mode 100644
index 00000000..fed36e60
--- /dev/null
+++ b/src/app/shared/components/dynamic-setting/dynamic-setting-modal/dynamic-setting-modal.component.ts
@@ -0,0 +1,91 @@
+import { Component, Input, OnInit } from '@angular/core';
+import { ModalHelper } from '@delon/theme';
+import { NzModalRef } from 'ng-zorro-antd/modal';
+import { BaseService } from 'src/app/shared/services';
+
+@Component({
+ selector: 'app-dynamic-setting-modal',
+ templateUrl: './dynamic-setting-modal.component.html',
+ styleUrls: ['./dynamic-setting-modal.component.less']
+})
+export class DynamicSettingModalComponent implements OnInit {
+ tabs: any[] = [];
+ selectedTab: any = null;
+
+ configList: any = [];
+
+ @Input()
+ extendType!: string;
+ @Input()
+ businessId!: string;
+
+ constructor(public service: BaseService, private modalHelp: NzModalRef) {}
+
+ ngOnInit() {
+ this.getTypeList();
+ }
+
+ getTypeList() {
+ this.service
+ .request('/api/mdc/pbc/sysConfigItemExtend/getSysConfigExtend', {
+ configFullKey: 'sys.config',
+ extendType: this.extendType,
+ businessId: this.businessId
+ })
+ .subscribe((res: Array) => {
+ if (res?.length > 0) {
+ const typeData = res.find(config => config.configFullKey === 'sys.config');
+ if (typeData) {
+ this.tabs = typeData.children;
+ this.selectedTab = typeData.children[0];
+
+ this.configList = this.formatItems(this.selectedTab.items);
+ }
+ }
+ });
+ }
+
+ changeType(type: any): void {
+ this.selectedTab = type;
+ this.configList = this.formatItems(type.items);
+ }
+
+ saveAction(params: Array) {
+ const p = params.map(config => ({
+ businessId: this.businessId,
+ configId: config.configId,
+ extendType: this.extendType,
+ id: config.extendId,
+ configItemId: config.id,
+ parentId: config.parentId,
+ itemData: config.itemData,
+ itemValue: config.itemValue,
+ remark: config.remark
+ }));
+ this.service.request('/api/mdc/pbc/sysConfigItemExtend/saveBatch', p).subscribe(res => {
+ if (res) {
+ this.service.msgSrv.success('修改配置成功');
+ this.modalHelp.destroy();
+ }
+ });
+ }
+
+ private formatItems(items: Array): Array {
+ if (items?.length > 0) {
+ return items
+ .map(item => ({
+ ...item,
+ itemData: item.extendItemData || item.itemData,
+ itemValue: item.extendItemValue || item.itemValue
+ }))
+ .map(item => ({
+ ...item,
+ remark: item.remark ? JSON.parse(item.remark) : null,
+ extend: item.extend ? JSON.parse(item.extend) : [],
+ // itemData: item.itemData ? JSON.parse(item.itemData) : item.itemData,
+ itemValue: item.itemValue ? JSON.parse(item.itemValue) : item.itemValue
+ }));
+ }
+ return [];
+ }
+}
diff --git a/src/app/shared/components/dynamic-setting/dynamic-setting.module.ts b/src/app/shared/components/dynamic-setting/dynamic-setting.module.ts
new file mode 100644
index 00000000..cddc9b6d
--- /dev/null
+++ b/src/app/shared/components/dynamic-setting/dynamic-setting.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { DynamicSettingH5Component } from './dynamic-setting-h5/dynamic-setting-h5.component';
+import { SHARED_ZORRO_MODULES } from '../../shared-zorro.module';
+import { SHARED_DELON_MODULES } from '../../shared-delon.module';
+import { FormsModule } from '@angular/forms';
+import { DynamicSettingModalComponent } from './dynamic-setting-modal/dynamic-setting-modal.component';
+
+@NgModule({
+ declarations: [DynamicSettingH5Component, DynamicSettingModalComponent],
+ imports: [CommonModule, FormsModule, SHARED_ZORRO_MODULES, SHARED_DELON_MODULES],
+ exports: [DynamicSettingH5Component]
+})
+export class DynamicSettingModule {}
diff --git a/src/app/shared/components/dynamic-setting/index.ts b/src/app/shared/components/dynamic-setting/index.ts
new file mode 100644
index 00000000..2ec98c4c
--- /dev/null
+++ b/src/app/shared/components/dynamic-setting/index.ts
@@ -0,0 +1,2 @@
+export * from './dynamic-setting.module';
+export * from './dynamic-setting-modal/dynamic-setting-modal.component';
diff --git a/src/app/shared/index.ts b/src/app/shared/index.ts
index 1ade0aef..bc5f4295 100644
--- a/src/app/shared/index.ts
+++ b/src/app/shared/index.ts
@@ -18,6 +18,7 @@ export * from './components/address/index';
export * from './components/captcha/index';
export * from './components/amap/index';
export * from './components/dict-select/index';
+export * from './components/dynamic-setting';
// Utils
export * from './utils';