fix: chart not correct render font color

@@ -26,6 +26,10 @@ enum DataComponentUrl {
   UPDATE_DATA_COMPONENT = '/data_component',
 }
 
+enum DeviceUrl {
+  GET_DEVICE = '/device/list',
+}
+
 /**
  * @description 获取数据看板
  * @param params
@@ -132,3 +136,15 @@ export const updateDataComponent = (params: UpdateDataComponentParams) => {
     params: params.record,
   });
 };
+
+/**
+ * @description 获取所有设备
+ * @param params
+ * @returns
+ */
+export const getAllAvailableDeviceByOrgId = (params: string) => {
+  return defHttp.get({
+    url: `${DeviceUrl.GET_DEVICE}/DIRECT_CONNECTION`,
+    params: { organizationId: params },
+  });
+};

@@ -36,7 +36,11 @@ export interface DashboardComponentLayout {
   componentType: InstrumentComponentType;
 }
 
-export const instrumentComponent1 = (params?: { value: number; unit: string }): EChartsOption => {
+export const instrumentComponent1 = (params?: {
+  value: number;
+  unit: string;
+  fontColor: string;
+}): EChartsOption => {
   const { value = 10, unit = '°C' } = params || {};
   return {
     series: [
@@ -98,8 +102,8 @@ export const instrumentComponent1 = (params?: { value: number; unit: string }):
           offsetCenter: [0, '-15%'],
           // fontSize: 16,
           fontWeight: 'bolder',
-          formatter: `{value} ${unit}`,
-          color: 'inherit',
+          formatter: `{value} ${unit ?? '°C'}`,
+          color: params?.fontColor || 'inherit',
         },
         data: [
           {
@@ -153,6 +157,7 @@ export const instrumentComponent2 = (params?: {
   gradient: GradientInfo[];
   value: number;
   unit: string;
+  fontColor: string;
 }): EChartsOption => {
   const { gradient = [], value = 0, unit = 'km/h' } = params || {};
   const firstRecord = getGradient(Gradient.FIRST, gradient);
@@ -212,7 +217,7 @@ export const instrumentComponent2 = (params?: {
         detail: {
           valueAnimation: true,
           formatter: `{value} ${unit}`,
-          color: 'inherit',
+          color: params?.fontColor || 'inherit',
           fontSize: 14,
         },
         data: [
@@ -291,6 +296,7 @@ function setGradientInfo(dataSource: DataSource) {
     unit: componentInfo.unit,
     value: 0,
     gradient: componentInfo.gradientInfo,
+    fontColor: componentInfo.fontColor,
   });
 }
 
@@ -303,6 +309,14 @@ export const transformDashboardComponentConfig = (
   if (config.componentType === 'instrument-component-2') {
     chartOption = setGradientInfo(dataSourceRecord);
   }
+  if (config.componentType === 'instrument-component-1') {
+    const componentInfo = dataSourceRecord.componentInfo;
+    chartOption = instrumentComponent1({
+      unit: componentInfo.unit,
+      value: 0,
+      fontColor: componentInfo.fontColor,
+    });
+  }
   return {
     layout: {
       chartOption: chartOption,

@@ -217,4 +217,8 @@
   .data-source-form:deep(.ant-row) {
     width: 100%;
   }
+
+  .data-source-form:deep(.ant-form-item-control-input-content > div > div) {
+    width: 100%;
+  }
 </style>

-import { byOganizationIdGetMasterDevice, getAttribute } from '/@/api/ruleengine/ruleengineApi';
+import { getAllAvailableDeviceByOrgId } from '/@/api/dataBoard';
+import { getAttribute } from '/@/api/ruleengine/ruleengineApi';
 import { getOrganizationList } from '/@/api/system/system';
 import { FormSchema } from '/@/components/Form';
 import { copyTransFun } from '/@/utils/fnUtils';
@@ -43,7 +44,7 @@ export const dataSourceSchema: FormSchema[] = [
           return data;
         },
         onChange() {
-          setFieldsValue({ device: null, attr: null });
+          setFieldsValue({ deviceId: null, attribute: null });
         },
         getPopupContainer: () => document.body,
       };
@@ -61,14 +62,14 @@ export const dataSourceSchema: FormSchema[] = [
         api: async () => {
           if (orgId) {
             const [, data] = await to<Record<'id' | 'name', string>[]>(
-              byOganizationIdGetMasterDevice(orgId)
+              getAllAvailableDeviceByOrgId(orgId)
             );
             if (data) return data.map((item) => ({ label: item.name, value: item.id }));
           }
           return [];
         },
         onChange() {
-          setFieldsValue({ attr: null });
+          setFieldsValue({ attribute: null });
         },
         placeholder: '请选择设备',
         getPopupContainer: () => document.body,

@@ -57,7 +57,7 @@ export function useSocketConnect(dataSourceRef: Ref<DataBoardLayoutInfo[]>) {
     server: `${import.meta.env.VITE_WEB_SOCKET}${token}`,
   };
 
-  const getNeedUpdateValueById = (componentId: string, deviceId: string) => {};
+  // const getNeedUpdateValueById = (componentId: string, deviceId: string) => {};
 
   const getNeedUpdateValueByIndex = (recordIndex: number, dataSourceIndex: number) => {
     return unref(dataSourceRef)[recordIndex].record.dataSource[dataSourceIndex];