fix: 看板组件添加是否显示时间字段选择

@@ -13,7 +13,7 @@ export const option: PublicPresetOptions = {
   [ComponentConfigFieldEnum.SHOW_DEVICE_NAME]: false,
   [ComponentConfigFieldEnum.UNIT]: 'm',
   [ComponentConfigFieldEnum.FONT_COLOR]: '#fff',
-  [ComponentConfigFieldEnum.SHOW_DEVICE_NAME]: false,
+  [ComponentConfigFieldEnum.SHOW_TIME]: false,
   [ComponentConfigFieldEnum.FLOWMETER_CONFIG]: {
     [ComponentConfigFieldEnum.BACKGROUND_COLOR]: '#8badcb',
     [ComponentConfigFieldEnum.WAVE_FIRST]: '#4579e2',

@@ -55,6 +55,12 @@
         component: 'Checkbox',
         defaultValue: option.showDeviceName,
       },
+      {
+        field: ComponentConfigFieldEnum.SHOW_TIME,
+        label: '显示时间',
+        component: 'Checkbox',
+        defaultValue: option.showDeviceName,
+      },
     ],
     showActionButtonGroup: false,
     labelWidth: 120,

@@ -20,12 +20,13 @@
   const getDesign = computed(() => {
     const { option, persetOption } = props.config;
     const { componentInfo, attribute, attributeName, attributeRename } = option;
-    const { flowmeterConfig, unit, fontColor } = componentInfo || {};
+    const { flowmeterConfig, unit, fontColor, showTime } = componentInfo || {};
     const { backgroundColor, waveFirst, waveSecond, waveThird } = flowmeterConfig || {};
     const {
       flowmeterConfig: presetFlowmeterConfig,
       unit: persetUnit,
       fontColor: presetFontColor,
+      showTime: persetShowTime,
     } = persetOption || {};
     const {
       backgroundColor: presetBackgroundColor,
@@ -41,6 +42,7 @@
       unit: unit ?? persetUnit,
       fontColor: fontColor ?? presetFontColor,
       attribute: attributeRename || attributeName || attribute,
+      showTime: showTime ?? persetShowTime,
     };
   });
 
@@ -76,7 +78,10 @@
 </script>
 
 <template>
-  <main class="w-full h-full flex flex-col justify-center items-center relative">
+  <main
+    class="w-full h-full flex flex-col justify-center items-center relative"
+    :class="!getDesign.showTime && 'p-5'"
+  >
     <DeviceName :config="config" />
     <svg
       class="waves-rect"
@@ -121,7 +126,7 @@
     <div class="text-gray-500 text-sm truncate" style="flex: 0 0 20px">{{
       getDesign.attribute || '属性'
     }}</div>
-    <UpdateTime :time="time" />
+    <UpdateTime v-show="getDesign.showTime" :time="time" />
   </main>
 </template>
 

@@ -11,6 +11,7 @@ import { ComponentConfigFieldEnum } from '/@/views/visual/packages/enum';
 
 export const option: PublicPresetOptions = {
   [ComponentConfigFieldEnum.SHOW_DEVICE_NAME]: false,
+  [ComponentConfigFieldEnum.SHOW_TIME]: false,
   [ComponentConfigFieldEnum.UNIT]: 'm',
   [ComponentConfigFieldEnum.FLOWMETER_CONFIG]: {
     [ComponentConfigFieldEnum.BACKGROUND_COLOR]: '#8badcb',

@@ -55,6 +55,12 @@
         component: 'Checkbox',
         defaultValue: option.showDeviceName,
       },
+      {
+        field: ComponentConfigFieldEnum.SHOW_TIME,
+        label: '显示时间',
+        component: 'Checkbox',
+        defaultValue: option.showTime,
+      },
     ],
     showActionButtonGroup: false,
     labelWidth: 120,

@@ -20,12 +20,13 @@
   const getDesign = computed(() => {
     const { option, persetOption } = props.config;
     const { componentInfo, attribute, attributeName, attributeRename } = option;
-    const { flowmeterConfig, unit, fontColor } = componentInfo || {};
+    const { flowmeterConfig, unit, fontColor, showTime } = componentInfo || {};
     const { backgroundColor, waveFirst, waveSecond, waveThird } = flowmeterConfig || {};
     const {
       flowmeterConfig: presetFlowmeterConfig,
       unit: persetUnit,
       fontColor: presetFontColor,
+      showTime: persetShowTime,
     } = persetOption || {};
     const {
       backgroundColor: presetBackgroundColor,
@@ -41,6 +42,7 @@
       unit: unit ?? persetUnit,
       fontColor: fontColor ?? presetFontColor,
       attribute: attributeRename || attributeName || attribute,
+      showTime: showTime ?? persetShowTime,
     };
   });
 
@@ -66,7 +68,10 @@
 </script>
 
 <template>
-  <main class="w-full h-full flex flex-col justify-center items-center relative">
+  <main
+    class="w-full h-full flex flex-col justify-center items-center relative"
+    :class="!getDesign.showTime && 'p-5'"
+  >
     <DeviceName :config="config" />
     <svg
       class="waves-rect"
@@ -114,7 +119,7 @@
     <div class="text-gray-500 text-sm truncate" style="flex: 0 0 20px">{{
       getDesign.attribute || '属性'
     }}</div>
-    <UpdateTime :time="time" />
+    <UpdateTime v-show="getDesign.showTime" :time="time" />
   </main>
 </template>
 

@@ -12,6 +12,7 @@ import { ComponentConfigFieldEnum } from '/@/views/visual/packages/enum';
 export const option: PublicPresetOptions = {
   [ComponentConfigFieldEnum.FONT_COLOR]: '#',
   [ComponentConfigFieldEnum.SHOW_DEVICE_NAME]: false,
+  [ComponentConfigFieldEnum.SHOW_TIME]: false,
 };
 
 export default class Config extends PublicConfigClass implements CreateComponentType {

@@ -19,6 +19,11 @@
         label: '显示设备名称',
         component: 'Checkbox',
       },
+      {
+        field: ComponentConfigFieldEnum.SHOW_TIME,
+        label: '显示时间',
+        component: 'Checkbox',
+      },
     ],
     showActionButtonGroup: false,
     labelWidth: 120,

@@ -37,12 +37,13 @@
 
   const getDesign = computed(() => {
     const { persetOption, option } = props.config;
-    const { fontColor: presetFontColor } = persetOption || {};
+    const { fontColor: presetFontColor, showTime: persetShowTime } = persetOption || {};
     const { componentInfo, attribute, attributeName, attributeRename } = option || {};
-    const { fontColor } = componentInfo || {};
+    const { fontColor, showTime } = componentInfo || {};
     return {
       fontColor: fontColor ?? presetFontColor,
       attribute: attributeRename || attributeName || attribute,
+      showTime: showTime ?? persetShowTime,
     };
   });
 
@@ -59,7 +60,10 @@
 </script>
 
 <template>
-  <main class="w-full h-full flex flex-col justify-center items-center relative">
+  <main
+    class="w-full h-full flex flex-col justify-center items-center relative"
+    :class="!getDesign.showTime && 'p-5'"
+  >
     <DeviceName :config="config" />
     <svg class="flowmeter-thermometer" viewBox="0 0 200 250" xmlns="http://www.w3.org/2000/svg">
       <defs>
@@ -256,7 +260,7 @@
     <div class="text-gray-500 text-sm truncate" style="flex: 0 0 20px">{{
       getDesign.attribute || '属性'
     }}</div>
-    <UpdateTime :time="time" />
+    <UpdateTime v-show="getDesign.showTime" :time="time" />
   </main>
 </template>
 

@@ -13,6 +13,7 @@ export const option: PublicPresetOptions = {
   [ComponentConfigFieldEnum.FONT_COLOR]: '#000',
   [ComponentConfigFieldEnum.UNIT]: 'kw/h',
   [ComponentConfigFieldEnum.SHOW_DEVICE_NAME]: false,
+  [ComponentConfigFieldEnum.SHOW_TIME]: false,
 };
 
 export default class Config extends PublicConfigClass implements CreateComponentType {

@@ -28,6 +28,12 @@
         component: 'Checkbox',
         defaultValue: option.showDeviceName,
       },
+      {
+        field: ComponentConfigFieldEnum.SHOW_TIME,
+        label: '显示时间',
+        component: 'Checkbox',
+        defaultValue: option.showDeviceName,
+      },
     ],
     showActionButtonGroup: false,
     labelWidth: 120,

@@ -48,12 +48,17 @@
   const getDesign = computed(() => {
     const { option, persetOption } = props.config;
     const { componentInfo, attribute, attributeRename, attributeName } = option;
-    const { fontColor: presetFontColor, unit: presetUnit } = persetOption || {};
-    const { unit, fontColor } = componentInfo || {};
+    const {
+      fontColor: presetFontColor,
+      unit: presetUnit,
+      showTime: persetShowTime,
+    } = persetOption || {};
+    const { unit, fontColor, showTime } = componentInfo || {};
     return {
       unit: unit ?? presetUnit,
       fontColor: fontColor ?? presetFontColor,
       attribute: attributeRename || attributeName || attribute,
+      showTime: showTime ?? persetShowTime,
     };
   });
 
@@ -71,7 +76,10 @@
 </script>
 
 <template>
-  <main class="w-full h-full flex flex-col justify-center items-center">
+  <main
+    class="w-full h-full flex flex-col justify-center items-center"
+    :class="!getDesign.showTime && 'p-5'"
+  >
     <div class="flex flex-col w-full h-full">
       <DeviceName class="text-center" :config="config" />
 
@@ -134,7 +142,7 @@
         <span>{{ getDesign.attribute || '电表' }}</span>
       </div>
 
-      <UpdateTime :time="time" />
+      <UpdateTime v-show="getDesign.showTime" :time="time" />
     </div>
   </main>
 </template>

@@ -12,6 +12,7 @@ import { ComponentConfigFieldEnum } from '../../../enum';
 export const option: PublicPresetOptions = {
   [ComponentConfigFieldEnum.FONT_COLOR]: '#FD7347',
   [ComponentConfigFieldEnum.SHOW_DEVICE_NAME]: false,
+  [ComponentConfigFieldEnum.SHOW_TIME]: false,
   [ComponentConfigFieldEnum.UNIT]: '℃',
 };
 

@@ -25,6 +25,12 @@
         component: 'Checkbox',
         defaultValue: option.showDeviceName,
       },
+      {
+        field: ComponentConfigFieldEnum.SHOW_TIME,
+        label: '显示时间',
+        component: 'Checkbox',
+        defaultValue: option.showTime,
+      },
     ],
     showActionButtonGroup: false,
     labelWidth: 120,

@@ -27,12 +27,17 @@
   const getDesign = computed(() => {
     const { option, persetOption } = props.config;
     const { componentInfo, attribute, attributeRename, attributeName } = option;
-    const { fontColor: presetFontColor, unit: presetUnit } = persetOption || {};
-    const { unit, fontColor } = componentInfo || {};
+    const {
+      fontColor: presetFontColor,
+      unit: presetUnit,
+      showTime: persetShowTime,
+    } = persetOption || {};
+    const { unit, fontColor, showTime } = componentInfo || {};
     return {
       unit: unit ?? presetUnit,
       fontColor: fontColor ?? presetFontColor,
       attribute: attributeRename || attributeName || attribute,
+      showTime: persetShowTime || showTime,
     };
   });
 
@@ -222,12 +227,15 @@
 </script>
 
 <template>
-  <main class="w-full h-full flex flex-col justify-center items-center">
+  <main
+    class="w-full h-full flex flex-col justify-center items-center"
+    :class="!getDesign.showTime && 'p-5'"
+  >
     <DeviceName :config="config" />
     <div ref="chartRefEl" class="flex-1 w-full h-full"> </div>
     <div class="text-gray-500 text-xs text-center truncate">{{
       getDesign.attribute || '温度'
     }}</div>
-    <UpdateTime :time="time" />
+    <UpdateTime v-show="getDesign.showTime" :time="time" />
   </main>
 </template>

@@ -29,6 +29,7 @@ export const option: PublicPresetOptions = {
   ],
   [ComponentConfigFieldEnum.UNIT]: 'km/h',
   [ComponentConfigFieldEnum.SHOW_DEVICE_NAME]: false,
+  [ComponentConfigFieldEnum.SHOW_TIME]: false,
 };
 
 export default class Config extends PublicConfigClass implements CreateComponentType {

@@ -81,6 +81,12 @@
         component: 'Checkbox',
         defaultValue: option.showDeviceName,
       },
+      {
+        field: ComponentConfigFieldEnum.SHOW_TIME,
+        label: '显示时间',
+        component: 'Checkbox',
+        defaultValue: option.showTime,
+      },
     ],
     showActionButtonGroup: false,
     labelWidth: 120,
@@ -112,11 +118,12 @@
       fontColor: value[ComponentConfigFieldEnum.FONT_COLOR],
       unit: value[ComponentConfigFieldEnum.UNIT],
       showDeviceName: value[ComponentConfigFieldEnum.SHOW_DEVICE_NAME],
+      showTime: value[ComponentConfigFieldEnum.SHOW_TIME],
     } as ComponentInfo;
   };
 
   const setFormValues = (data: ComponentInfo) => {
-    const { gradientInfo, unit, fontColor, showDeviceName } = data;
+    const { gradientInfo, unit, fontColor, showDeviceName, showTime } = data;
     const firstRecord = gradientInfo.find((item) => item.key === Gradient.FIRST);
     const secondRecord = gradientInfo.find((item) => item.key === Gradient.SECOND);
     const thirdRecord = gradientInfo.find((item) => item.key === Gradient.THIRD);
@@ -124,6 +131,7 @@
       [ComponentConfigFieldEnum.UNIT]: unit,
       [ComponentConfigFieldEnum.FONT_COLOR]: fontColor,
       [ComponentConfigFieldEnum.SHOW_DEVICE_NAME]: showDeviceName,
+      [ComponentConfigFieldEnum.SHOW_TIME]: showTime,
       [ComponentConfigFieldEnum.FIRST_PHASE_VALUE]: firstRecord?.value,
       [ComponentConfigFieldEnum.FIRST_PHASE_COLOR]: firstRecord?.color,
       [ComponentConfigFieldEnum.SECOND_PHASE_VALUE]: secondRecord?.value,

@@ -36,14 +36,16 @@
       fontColor: presetFontColor,
       unit: presetUnit,
       gradientInfo: presetGradientInfo,
+      showTime: persetShowTime,
     } = persetOption || {};
 
-    const { unit, fontColor, gradientInfo } = componentInfo || {};
+    const { unit, fontColor, gradientInfo, showTime } = componentInfo || {};
     return {
       unit: unit ?? presetUnit,
       fontColor: fontColor ?? presetFontColor,
       gradientInfo: gradientInfo ?? presetGradientInfo,
       attribute: attributeRename || attributeName || attribute,
+      showTime: showTime || persetShowTime,
     };
   });
 
@@ -205,12 +207,15 @@
 </script>
 
 <template>
-  <main class="w-full h-full flex flex-col justify-center items-center">
+  <main
+    class="w-full h-full flex flex-col justify-center items-center"
+    :class="!getDesign.showTime && 'p-5'"
+  >
     <DeviceName :config="config" />
     <div ref="chartRefEl" class="flex-1 w-full h-full"> </div>
     <div class="text-center text-gray-500 text-xs truncate">
       {{ getDesign.attribute || '速度' }}
     </div>
-    <UpdateTime :time="time" />
+    <UpdateTime v-show="getDesign.showTime" :time="time" />
   </main>
 </template>

 import { Ref, inject, provide } from 'vue';
 
-const SymbolKey = Symbol('alarm-info');
+const SymbolKey = Symbol('history-info');
 interface IHistory {
   [key: string]: string;
 }
 
-export interface AlarmContextType {
+export interface HistoryContextType {
   historyForm: Ref<IHistory> | any;
   getHistoryForm: (value: any) => void;
 }
 
-export const createHistoryContext = (options: AlarmContextType) => {
+export const createHistoryContext = (options: HistoryContextType) => {
   provide(SymbolKey, options);
 };
 
 export const useHistoryContext = () => {
-  return inject<AlarmContextType>(SymbolKey) || ({} as Partial<AlarmContextType>);
+  return inject<HistoryContextType>(SymbolKey) || ({} as Partial<HistoryContextType>);
 };