@@ -302,13 +302,13 @@ class ThemeDetailPage extends React.Component<ThemeDetailPageProps, ThemeDetailP
302
302
type :"padding" ,
303
303
value :this . state . theme ?. padding ,
304
304
} ,
305
- {
306
- settingsKey :'gridColumns' ,
307
- name :trans ( 'themeDetail.gridColumns' ) ,
308
- desc :trans ( 'themeDetail.gridColumnsDesc' ) ,
309
- type :"gridColumns" ,
310
- value :this . state . theme ?. gridColumns ,
311
- }
305
+ // {
306
+ // settingsKey: 'gridColumns',
307
+ // name: trans('themeDetail.gridColumns'),
308
+ // desc: trans('themeDetail.gridColumnsDesc'),
309
+ // type: "gridColumns",
310
+ // value: this.state.theme?.gridColumns,
311
+ // }
312
312
]
313
313
} ,
314
314
{
@@ -332,6 +332,80 @@ class ThemeDetailPage extends React.Component<ThemeDetailPageProps, ThemeDetailP
332
332
} ,
333
333
] ;
334
334
335
+ const canvasSettings = [
336
+ {
337
+ title :trans ( 'themeDetail.gridSettings' ) ,
338
+ items :[
339
+ {
340
+ settingsKey :'gridColumns' ,
341
+ name :trans ( 'themeDetail.gridColumns' ) ,
342
+ desc :trans ( 'themeDetail.gridColumnsDesc' ) ,
343
+ type :"gridColumns" ,
344
+ value :this . state . theme ?. gridColumns ,
345
+ } ,
346
+ {
347
+ settingsKey :'gridRowHeight' ,
348
+ name :trans ( 'themeDetail.gridRowHeight' ) ,
349
+ desc :trans ( 'themeDetail.gridRowHeightDesc' ) ,
350
+ type :"gridRowHeight" ,
351
+ value :this . state . theme ?. gridRowHeight ,
352
+ } ,
353
+ ]
354
+ } ,
355
+ {
356
+ title :trans ( 'themeDetail.spacing' ) ,
357
+ items :[
358
+ {
359
+ settingsKey :'gridPadding' ,
360
+ name :trans ( 'themeDetail.gridPadding' ) ,
361
+ desc :trans ( 'themeDetail.gridPaddingDesc' ) ,
362
+ type :"gridPadding" ,
363
+ value :this . state . theme ?. gridPadding ,
364
+ }
365
+ ]
366
+ } ,
367
+ {
368
+ title :trans ( 'themeDetail.background' ) ,
369
+ items :[
370
+ {
371
+ settingsKey :'gridBgImage' ,
372
+ name :trans ( 'themeDetail.gridBgImage' ) ,
373
+ desc :trans ( 'themeDetail.gridBgImageDesc' ) ,
374
+ type :"gridBgImage" ,
375
+ value :this . state . theme ?. gridBgImage ,
376
+ } ,
377
+ {
378
+ settingsKey :'gridBgImageRepeat' ,
379
+ name :trans ( 'themeDetail.gridBgImageRepeat' ) ,
380
+ desc :trans ( 'themeDetail.gridBgImageRepeatDesc' ) ,
381
+ type :"gridBgImageRepeat" ,
382
+ value :this . state . theme ?. gridBgImageRepeat ,
383
+ } ,
384
+ {
385
+ settingsKey :'gridBgImageSize' ,
386
+ name :trans ( 'themeDetail.gridBgImageSize' ) ,
387
+ desc :trans ( 'themeDetail.gridBgImageSizeDesc' ) ,
388
+ type :"gridBgImageSize" ,
389
+ value :this . state . theme ?. gridBgImageSize ,
390
+ } ,
391
+ {
392
+ settingsKey :'gridBgImagePosition' ,
393
+ name :trans ( 'themeDetail.gridBgImagePosition' ) ,
394
+ desc :trans ( 'themeDetail.gridBgImagePositionDesc' ) ,
395
+ type :"gridBgImagePosition" ,
396
+ value :this . state . theme ?. gridBgImagePosition ,
397
+ } ,
398
+ {
399
+ settingsKey :'gridBgImageOrigin' ,
400
+ name :trans ( 'themeDetail.gridBgImageOrigin' ) ,
401
+ desc :trans ( 'themeDetail.gridBgImageOriginDesc' ) ,
402
+ type :"gridBgImageOrigin" ,
403
+ value :this . state . theme ?. gridBgImageOrigin ,
404
+ }
405
+ ]
406
+ } ,
407
+ ] ;
408
+
335
409
if ( ! this . themeDefault ) {
336
410
return (
337
411
< Flex align = "center" justify = "center" vertical style = { {
@@ -468,6 +542,45 @@ class ThemeDetailPage extends React.Component<ThemeDetailPageProps, ThemeDetailP
468
542
</ Flex >
469
543
</ Card >
470
544
</ ThemeSettingsView >
545
+
546
+ < ThemeSettingsView >
547
+ < StyleThemeSettingsCover >
548
+ < PageLayoutCompIcon width = { "36px" } style = { { marginRight :"10px" } } /> < h2 style = { { color :"#ffffff" , marginTop :"8px" } } > { trans ( "theme.canvas" ) } </ h2 >
549
+ </ StyleThemeSettingsCover >
550
+ < Card style = { { marginBottom :"20px" , minHeight :"200px" } } >
551
+ < Flex gap = { "middle" } >
552
+ < List
553
+ bordered
554
+ dataSource = { canvasSettings }
555
+ renderItem = { ( item ) => (
556
+ < >
557
+ { item . title && (
558
+ < List . Item >
559
+ < DetailTitle > { item . title } </ DetailTitle >
560
+ </ List . Item >
561
+ ) }
562
+ { item . items . map ( ( canvasSettingItem ) => (
563
+ < Tooltip key = { canvasSettingItem . settingsKey } title = { canvasSettingItem . desc } placement = "right" >
564
+ < List . Item key = { canvasSettingItem . settingsKey } >
565
+ < ThemeSettingsSelector
566
+ themeSettingKey = { canvasSettingItem . settingsKey }
567
+ name = { canvasSettingItem . name }
568
+ radius = { canvasSettingItem . value as string }
569
+ configChange = { ( params ) => {
570
+ this . configChange ( params ) ;
571
+ } }
572
+ />
573
+ </ List . Item >
574
+ </ Tooltip >
575
+ ) ) }
576
+ </ >
577
+ ) }
578
+ />
579
+ < Divider type = "vertical" style = { { height :"610px" } } />
580
+ < PreviewApp style = { { marginTop :'3px' , height :"620px" , width :"100%" } } theme = { this . state . theme ! } dsl = { dsl } />
581
+ </ Flex >
582
+ </ Card >
583
+ </ ThemeSettingsView >
471
584
472
585
< ThemeSettingsView >
473
586
< StyleThemeSettingsCover >