Commit 0cb8be8e58238f72429c09ea40c2501a5bca97ee

Authored by loveumiko
1 parent 40dce1cc

fix: 修改看板组件实时数据表格样式和数据问题

@@ -19,6 +19,13 @@ @@ -19,6 +19,13 @@
19 component: 'Checkbox', 19 component: 'Checkbox',
20 defaultValue: option.showDeviceName, 20 defaultValue: option.showDeviceName,
21 }, 21 },
  22 + {
  23 + field: ComponentConfigFieldEnum.LINE_COLOR,
  24 + label: '线条颜色',
  25 + component: 'ColorPicker',
  26 + changeEvent: 'update:value',
  27 + defaultValue: option.fontColor,
  28 + },
22 ], 29 ],
23 showActionButtonGroup: false, 30 showActionButtonGroup: false,
24 labelWidth: 120, 31 labelWidth: 120,
@@ -32,6 +39,7 @@ @@ -32,6 +39,7 @@
32 const item = getFieldsValue(); 39 const item = getFieldsValue();
33 return { 40 return {
34 fontColor: item[ComponentConfigFieldEnum.FONT_COLOR], 41 fontColor: item[ComponentConfigFieldEnum.FONT_COLOR],
  42 + lineColor: item[ComponentConfigFieldEnum.LINE_COLOR],
35 unit: item[ComponentConfigFieldEnum.UNIT], 43 unit: item[ComponentConfigFieldEnum.UNIT],
36 showDeviceName: item[ComponentConfigFieldEnum.SHOW_DEVICE_NAME], 44 showDeviceName: item[ComponentConfigFieldEnum.SHOW_DEVICE_NAME],
37 } as ComponentInfo; 45 } as ComponentInfo;
@@ -39,11 +47,12 @@ @@ -39,11 +47,12 @@
39 47
40 const setFormValues = (data: Recordable) => { 48 const setFormValues = (data: Recordable) => {
41 // return setFieldsValue(data); 49 // return setFieldsValue(data);
42 - const { unit, fontColor, showDeviceName } = data; 50 + const { unit, fontColor, showDeviceName, lineColor } = data;
43 51
44 const value = { 52 const value = {
45 [ComponentConfigFieldEnum.UNIT]: unit, 53 [ComponentConfigFieldEnum.UNIT]: unit,
46 [ComponentConfigFieldEnum.FONT_COLOR]: fontColor, 54 [ComponentConfigFieldEnum.FONT_COLOR]: fontColor,
  55 + [ComponentConfigFieldEnum.LINE_COLOR]: lineColor,
47 [ComponentConfigFieldEnum.SHOW_DEVICE_NAME]: showDeviceName, 56 [ComponentConfigFieldEnum.SHOW_DEVICE_NAME]: showDeviceName,
48 }; 57 };
49 return setFieldsValue(value); 58 return setFieldsValue(value);