Merge branch 'fix/DEFECT-1434' into 'main_dev'

fix：修改看板组件teambition上的问题

See merge request yunteng/thingskit-front!749

@@ -63,9 +63,9 @@
           icon: icon ?? persetIcon,
           iconColor: iconColor ?? persetIconColor,
           attribute: attribute,
-          attributeName: attributeRename ?? attributeName,
+          attributeName: attributeRename || attributeName,
           showDeviceName,
-          deviceName: deviceRename ?? deviceName,
+          deviceName: deviceRename || deviceName,
           id: deviceId,
         };
       }),

@@ -12,6 +12,7 @@ import { ComponentConfigFieldEnum } from '/@/views/visual/packages/enum';
 export const option: PublicPresetOptions = {
   [ComponentConfigFieldEnum.SHOW_DEVICE_NAME]: false,
   [ComponentConfigFieldEnum.UNIT]: 'm',
+  [ComponentConfigFieldEnum.MAX_NUMBER]: 100,
   [ComponentConfigFieldEnum.FONT_COLOR]: '#fff',
   [ComponentConfigFieldEnum.SHOW_TIME]: false,
   [ComponentConfigFieldEnum.FLOWMETER_CONFIG]: {

@@ -4,7 +4,7 @@
   import { PublicFormInstaceType } from '/@/views/visual/dataSourceBindPanel/index.type';
   import { option } from './config';
   import { ComponentInfo } from '/@/views/visual/palette/types';
-  import { toRaw } from 'vue';
+  import { nextTick, toRaw } from 'vue';
 
   const [register, { getFieldsValue, setFieldsValue, resetFields }] = useForm({
     schemas: [
@@ -50,6 +50,27 @@
         defaultValue: option.unit,
       },
       {
+        field: ComponentConfigFieldEnum.MAX_NUMBER,
+        label: '最大值',
+        component: 'InputNumber',
+        defaultValue: 100,
+        componentProps: ({ formActionType }) => {
+          const { setFieldsValue } = formActionType;
+          return {
+            placeholder: '请输入最小值',
+            min: 100,
+            onChange: async (e) => {
+              if (!e) {
+                await nextTick();
+                setFieldsValue({
+                  [ComponentConfigFieldEnum.MAX_NUMBER]: 100,
+                });
+              }
+            },
+          };
+        },
+      },
+      {
         field: ComponentConfigFieldEnum.SHOW_DEVICE_NAME,
         label: '显示设备名称',
         component: 'Checkbox',

@@ -20,13 +20,14 @@
   const getDesign = computed(() => {
     const { option, persetOption } = props.config;
     const { componentInfo, attribute, attributeName, attributeRename } = option;
-    const { flowmeterConfig, unit, fontColor, showTime } = componentInfo || {};
+    const { flowmeterConfig, unit, fontColor, showTime, maxNumber } = componentInfo || {};
     const { backgroundColor, waveFirst, waveSecond, waveThird } = flowmeterConfig || {};
     const {
       flowmeterConfig: presetFlowmeterConfig,
       unit: persetUnit,
       fontColor: presetFontColor,
       showTime: persetShowTime,
+      maxNumber: persetMaxNumber,
     } = persetOption || {};
     const {
       backgroundColor: presetBackgroundColor,
@@ -43,6 +44,7 @@
       fontColor: fontColor ?? presetFontColor,
       attribute: attributeRename || attributeName || attribute,
       showTime: showTime ?? persetShowTime,
+      maxNumber: maxNumber ?? persetMaxNumber,
     };
   });
 
@@ -58,12 +60,20 @@
 
   const getWaveHeight = computed(() => {
     const value = unref(currentValue);
-    return value <= 0 ? 0 : -value - 15;
+    const size = ref(1);
+    if (unref(getDesign).maxNumber > 100) {
+      size.value = 100 / unref(getDesign).maxNumber;
+    }
+    return value * unref(size) <= 0 ? 0 : -(value * unref(size)) - 15;
   });
 
   const getHeight = computed(() => {
     const value = unref(currentValue);
-    return value >= 100 ? 0 : 100 - value + 10;
+    const size = ref(1);
+    if (unref(getDesign).maxNumber > 100) {
+      size.value = 100 / unref(getDesign).maxNumber;
+    }
+    return value * unref(size) >= 100 ? 0 : 100 - value * unref(size) + 10;
   });
 
   const updateFn: DataFetchUpdateFn = (message, attribute) => {

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

@@ -4,7 +4,7 @@
   import { PublicFormInstaceType } from '/@/views/visual/dataSourceBindPanel/index.type';
   import { option } from './config';
   import { ComponentInfo } from '/@/views/visual/palette/types';
-  import { toRaw } from 'vue';
+  import { nextTick, toRaw } from 'vue';
 
   const [register, { getFieldsValue, setFieldsValue, resetFields }] = useForm({
     schemas: [
@@ -49,6 +49,33 @@
         component: 'Input',
         defaultValue: option.unit,
       },
+      // {
+      //   field: ComponentConfigFieldEnum.MIN_NUMBER,
+      //   label: '最小值',
+      //   component: 'InputNumber',
+      //   defaultValue: 0,
+      // },
+      {
+        field: ComponentConfigFieldEnum.MAX_NUMBER,
+        label: '最大值',
+        component: 'InputNumber',
+        defaultValue: 100,
+        componentProps: ({ formActionType }) => {
+          const { setFieldsValue } = formActionType;
+          return {
+            placeholder: '请输入最小值',
+            min: 100,
+            onChange: async (e) => {
+              if (!e) {
+                await nextTick();
+                setFieldsValue({
+                  [ComponentConfigFieldEnum.MAX_NUMBER]: 100,
+                });
+              }
+            },
+          };
+        },
+      },
       {
         field: ComponentConfigFieldEnum.SHOW_DEVICE_NAME,
         label: '显示设备名称',

@@ -20,13 +20,14 @@
   const getDesign = computed(() => {
     const { option, persetOption } = props.config;
     const { componentInfo, attribute, attributeName, attributeRename } = option;
-    const { flowmeterConfig, unit, fontColor, showTime } = componentInfo || {};
+    const { flowmeterConfig, unit, fontColor, showTime, maxNumber } = componentInfo || {};
     const { backgroundColor, waveFirst, waveSecond, waveThird } = flowmeterConfig || {};
     const {
       flowmeterConfig: presetFlowmeterConfig,
       unit: persetUnit,
       fontColor: presetFontColor,
       showTime: persetShowTime,
+      maxNumber: persetMaxNumber,
     } = persetOption || {};
     const {
       backgroundColor: presetBackgroundColor,
@@ -43,17 +44,26 @@
       fontColor: fontColor ?? presetFontColor,
       attribute: attributeRename || attributeName || attribute,
       showTime: showTime ?? persetShowTime,
+      maxNumber: maxNumber ?? persetMaxNumber,
     };
   });
 
   const getWaveHeight = computed(() => {
     const value = unref(currentValue);
-    return value <= 0 ? 0 : -value - 15;
+    const size = ref(1);
+    if (unref(getDesign).maxNumber > 100) {
+      size.value = 100 / unref(getDesign).maxNumber;
+    }
+    return value * unref(size) <= 0 ? 0 : -(value * unref(size)) - 15;
   });
 
   const getHeight = computed(() => {
     const value = unref(currentValue);
-    return value >= 100 ? 0 : 100 - value + 10;
+    const size = ref(1);
+    if (unref(getDesign).maxNumber > 100) {
+      size.value = 100 / unref(getDesign).maxNumber;
+    }
+    return value * unref(size) >= 100 ? 0 : 100 - value * unref(size) + 10;
   });
 
   const updateFn: DataFetchUpdateFn = (message, attribute) => {

@@ -54,7 +54,7 @@
       },
       {
         field: ComponentConfigFieldEnum.SHOW_TIME,
-        label: '显示设备名称',
+        label: '显示时间',
         component: 'Checkbox',
         defaultValue: option.showTime,
       },

@@ -28,9 +28,9 @@
       showTime: persetShowTime,
     } = persetOption;
 
-    const { componentInfo, attributeRename } = option;
+    const { componentInfo, attributeName, attributeRename } = option;
 
-    const { icon, iconColor, fontColor, unit, iconClose, iconColorClose, attributeName, showTime } =
+    const { icon, iconColor, fontColor, unit, iconClose, iconColorClose, showTime } =
       componentInfo || {};
     return {
       iconColor: iconColor || persetIconColor,

@@ -68,11 +68,10 @@
           unit: unit ?? presetUnit,
           fontColor: fontColor ?? presetFontColor,
           backgroundColor: backgroundColor ?? persetBackgroundColor,
-          deviceName,
-          deviceRename,
+          deviceName: deviceRename || deviceName,
           attribute,
-          attributeRename,
-          attributeName,
+          attributeName: attributeRename || attributeName,
+
           id: deviceId,
         } as PercentType;
       }),
@@ -113,9 +112,9 @@
       <div class="flex justify-between">
         <div class="text-gray-500 text-sm truncate" :style="{ color: item.fontColor }">
           {{
-            `${item.deviceRename || item.deviceName}
+            `${item.deviceName}
             -
-            ${item.attributeRename || item.attributeName || item.attribute || '温度'}`
+            ${item.attributeName || item.attribute || '温度'}`
           }}
         </div>
         <span class="text-lg" :style="{ color: item.fontColor }"

@@ -36,11 +36,9 @@
           fontColor: fontColor ?? persetFontColor,
           icon: icon ?? persetIcon,
           iconColor: iconColor ?? persetIconColor,
-          attribute: attribute || attributeRename,
-          attributeRename,
-          deviceName,
-          attributeName,
-          deviceRename,
+          attribute,
+          deviceName: deviceRename || deviceName,
+          attributeName: attributeRename || attributeName,
           id: deviceId,
         };
       }),
@@ -49,8 +47,8 @@
   const defaultSvgList = ref<any>([
     {
       value: 26.2,
-      deviceRename: '温湿度',
-      attributeRename: '温度',
+      deviceName: '温湿度',
+      attributeName: '温度',
       icon: 'zongfushe',
       unit: '℃',
       iconColor: '#367BFF',
@@ -58,8 +56,8 @@
     },
     {
       value: 53.7,
-      deviceRename: '温湿度',
-      attributeRename: '湿度',
+      deviceName: '温湿度',
+      attributeName: '湿度',
       icon: 'guangzhaoqiangdu',
       unit: '℃',
       iconColor: '#FFA000',
@@ -106,9 +104,7 @@
         />
 
         <div class="text-gray-500 text-lg truncate ml-6">{{
-          item.deviceRename ||
-          item.deviceName + '-' + (item.attributeRename || item.attributeName) ||
-          '温度'
+          item.deviceName + '-' + item.attributeName || '温度'
         }}</div>
       </div>
 

@@ -5,6 +5,7 @@ export enum ComponentConfigFieldEnum {
   INSTRUMENT_PANEL_COLOR = 'instrumentPanelColor',
   CONTROL_BAR_COLOR = 'controlBarColor',
   // INSTRUMENT_PANEL_WIDTH = 'instrumentPanelWidth',
+  LINE_COLOR = 'lineColor',
 
   PROGRESS_BAR_CIRCLE = 'progressBarCircle',
 
@@ -29,4 +30,6 @@ export enum ComponentConfigFieldEnum {
   BACKGROUND_COLOR = 'backgroundColor',
   OPEN_COLOR = 'openColor',
   CLOSE_COLOR = 'closeColor',
+  MIN_NUMBER = 'minNumber',
+  MAX_NUMBER = 'maxNumber',
 }