From c432f38beada5d30132fe91de77a7a5d293b8ea7 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Wed, 20 Apr 2022 17:14:28 +0800 Subject: [PATCH] edit --- proxy.conf.js | 2 +- .../basic-setting/basic-setting.component.ts | 4 +-- .../dynamic-setting-h5.component.html | 34 +++++++++++++++++++ .../dynamic-setting-h5.component.ts | 17 +++++++++- 4 files changed, 53 insertions(+), 4 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index eb92fbd4..00392e43 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -30,7 +30,7 @@ module.exports = { // }, '//api': { target: { - host: 'tms-api-test.eascs.com', + host: 'tms-api-dev.eascs.com', protocol: 'https:', port: 443 }, 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 e765f3dc..bc02ace2 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 @@ -12,7 +12,7 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { SFComponent, SFSchema, SFUISchema } from '@delon/form'; import { dateTimePickerUtil } from '@delon/util'; import { SystemService } from '../../services/system.service'; - +const NOJSONTYPE = new Set([8, 12, 13]); @Component({ selector: 'app-basic-setting', templateUrl: './basic-setting.component.html', @@ -49,7 +49,7 @@ export class BasicSettingComponent implements OnInit { res = res.map(item => ({ ...item, remark: item.remark ? JSON.parse(item.remark) : null, - itemValue: item?.itemValue ? (item?.itemType !== 8 ? JSON.parse(item?.itemValue) : item?.itemValue) : item?.itemValue, + itemValue: item?.itemValue ? (NOJSONTYPE.has(item?.itemType) ? item?.itemValue : JSON.parse(item?.itemValue)) : item?.itemValue, itemData: item.itemData ? JSON.parse(item.itemData) : item.itemData })); const hiddenType = res.find(item => item.itemType === 7 || item.itemType === 999); 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 4818365b..7e86f88f 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 @@ -109,6 +109,40 @@ *ngFor="let re of item.remark"> + + +
+ + + +
上传
+
+
+ +
+
+

支持 + + {{item}}, + + 格式,文件小于{{item.remark?.size || 2}}M(建议尺寸 + {{item.remark?.width || 750}}px * {{item.remark?.height|| 1622}}px)。 + 查看示例 +

+
+
+ + + + 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 14ba8893..544ca3bc 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 @@ -10,6 +10,9 @@ */ import { Component, OnInit, EventEmitter, Input, Output } from '@angular/core'; import { BaseService } from '@shared'; +import { NzImageService } from 'ng-zorro-antd/image'; +import { NzUploadFile } from 'ng-zorro-antd/upload'; +import { of } from 'rxjs'; const JSONTYPE = new Set([5, 6, 9, 999]); @Component({ @@ -37,7 +40,7 @@ export class DynamicSettingH5Component implements OnInit { @Input() itemValue = 'itemValue'; listUrls: any; - constructor(public service: BaseService) {} + constructor(public service: BaseService, private nzImageService: NzImageService) {} ngOnInit() {} @@ -84,5 +87,17 @@ export class DynamicSettingH5Component implements OnInit { }); this.saveEvent.emit(params); } + + uploadChange(info: { file: NzUploadFile; type?: string }, item: any): void { + switch (info.type) { + case 'success': + item.itemValue = info.file.response.data.fullFilePath; + break; + } + } + + showImg(url: any) { + this.nzImageService.preview([{ src: url }]); + } } // [0]?.response?.data.fullFilePath