developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
yangsunyue_wd
fd100d24 1 parent b60b8faa

冲突调整

Inline Side-by-side
Showing 5 changed files with 13 additions and 3 deletions
... ... @@ -4,6 +4,9 @@ import { BannerComponent } from './view/BannerComponent';
import { LabelComponent } from './view/LabelComponent';
import { TitleAbbrComponent } from './view/TitleAbbrComponent';
import { TitleAllComponent } from './view/TitleAllComponent';
import { HorizontalStrokeCardThreeTwoRadioForOneComponent } from './view/HorizontalStrokeCardThreeTwoRadioForOneComponent';
import { HorizontalStrokeCardThreeTwoRadioForTwoComponent } from './view/HorizontalStrokeCardThreeTwoRadioForTwoComponent';
import { HorizontalStrokeCardThreeTwoRadioForMoreComponent } from './view/HorizontalStrokeCardThreeTwoRadioForMoreComponent';
/**
* comp适配器.
... ... @@ -21,6 +24,12 @@ export struct CompParser {
componentBuilder(compDTO: CompDTO, compIndex: number) {
if (compDTO.compStyle === CompStyle.Label_03) {
LabelComponent({ compDTO: compDTO })
} else if (compIndex == 0) {
HorizontalStrokeCardThreeTwoRadioForOneComponent({ compDTO: compDTO })
} else if (compIndex == 1) {
HorizontalStrokeCardThreeTwoRadioForTwoComponent({ compDTO: compDTO })
} else if (compIndex == 2) {
HorizontalStrokeCardThreeTwoRadioForMoreComponent({ compDTO: compDTO })
} else if (compDTO.compStyle === CompStyle.Title_Abbr_01) {
TitleAbbrComponent({ compDTO: compDTO })
} else if (compDTO.compStyle === CompStyle.Title_All_01) {
... ...
import { CommonConstants } from 'wdConstant'
import { CompDTO } from '../repository/bean/CompDTO'
import { CompDTO } from '../../repository/bean/CompDTO'
@Component
export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent {
... ...
import { CommonConstants } from 'wdConstant'
import { CompDTO } from '../repository/bean/CompDTO'
import { CompDTO } from '../../repository/bean/CompDTO'
@Component
export struct HorizontalStrokeCardThreeTwoRadioForOneComponent {
... ...
import { CommonConstants } from 'wdConstant'
import { CompDTO } from '../repository/bean/CompDTO'
import { CompDTO } from '../../repository/bean/CompDTO'
@Component
export struct HorizontalStrokeCardThreeTwoRadioForTwoComponent {
... ...
... ... @@ -36,6 +36,7 @@
"name": "color_212228",
"value": "#212228"
},
{
"name": "color_fff",
"value": "#ffffff"
},
... ...