Просмотр исходного кода

[Pref 0000] 类型更新及无用代码清理

houzekong 4 месяцев назад
Родитель
Сommit
2a8d9e7118

+ 3 - 45
src/components/Configurable/detail/MiniBoard.vue

@@ -25,46 +25,6 @@
         </div>
       </slot>
     </template>
-    <template v-if="layout === 'new-top'">
-      <slot name="label">
-        <div class="mini-board__label" :class="`mini-board__label_${type}`">{{ label }}</div>
-      </slot>
-      <slot name="value">
-        <div class="mini-board__value" :class="`mini-board__value_${type}`">{{ value }}</div>
-      </slot>
-    </template>
-    <template v-if="layout === 'new1-top'">
-      <slot name="label">
-        <div class="mini-board__label" :class="`mini-board__label_${type}`">{{ label }}</div>
-      </slot>
-      <slot name="value">
-        <div class="mini-board__value" :class="`mini-board__value_${type}`">{{ value }}</div>
-      </slot>
-    </template>
-    <template v-if="layout === 'new2-top'">
-      <slot name="value">
-        <div class="mini-board__value" :class="`mini-board__value_${type}`">{{ value }}</div>
-      </slot>
-      <slot name="label">
-        <div class="mini-board__label" :class="`mini-board__label_${type}`">{{ label }}</div>
-      </slot>
-    </template>
-    <template v-if="layout === 'new3-top'">
-      <div v-if="label === '进风(m³/min)'" class="mini-board_New3_jin">
-        <div class="mini-board__label" style="color: #afe6f2" :class="`mini-board__label_${type}`">{{ label }}</div>
-        <div class="mini-board__value" :class="`mini-board__value_${type}`">{{ value }}</div>
-      </div>
-      <div v-if="label === '回风(m³/min)'" class="mini-board_New3_hui">
-        <div class="mini-board__label" style="color: #afe6f2" :class="`mini-board__label_${type}`">{{ label }}</div>
-        <div class="mini-board__value" :class="`mini-board__value_${type}`">{{ value }}</div>
-      </div>
-      <!-- <slot name="value">
-        <div class="mini-board__label" :class="`mini-board__label_${type}`">{{ label }}</div>
-      </slot> -->
-      <!-- <slot name="lable">
-        <div class="mini-board__value" :class="`mini-board__value_${type}`">{{ value }}</div>
-      </slot> -->
-    </template>
   </div>
 </template>
 <script lang="ts" setup>
@@ -74,7 +34,7 @@
       value?: string;
       // 告示牌布局,类型为:'val-top' | 'label-top'
       layout: string;
-      // 告示牌类型,类型为:'A' | 'B' | 'C' | 'D' 
+      // 告示牌类型,类型为:'A' | 'B' | 'C' | 'D'
       type?: string;
     }>(),
     {
@@ -190,7 +150,6 @@
     font-size: 14px;
     font-family: 'Source Han Sans SC';
     font-weight: 700;
-
   }
   .mini-board__value_B {
     color: #000000;
@@ -250,13 +209,13 @@
   /* 2. 第二个容器:label和value为黄色 */
   .mini-board_C:nth-child(2) .mini-board__label_C,
   .mini-board_C:nth-child(2) .mini-board__value_C {
-    color: #B39F01;
+    color: #b39f01;
   }
 
   /* 3. 第三个容器:label和value为橙色 */
   .mini-board_C:nth-child(3) .mini-board__label_C,
   .mini-board_C:nth-child(3) .mini-board__value_C {
-    color: #E6A23D;
+    color: #e6a23d;
   }
 
   /* 4. 第四个容器:label和value为红色 */
@@ -302,5 +261,4 @@
     // width: 55px;
     font-size: 20px;
   }
-
 </style>

+ 1 - 1
src/components/Table/src/props.ts

@@ -131,7 +131,7 @@ export const basicProps = {
   },
   scroll: {
     // 代码逻辑说明: 【issues/1188】BasicTable加上scrollToFirstRowOnChange类型定义
-    type: Object as PropType<{ x?: number | true; y?: number; scrollToFirstRowOnChange?: boolean }>,
+    type: Object as PropType<{ x?: number | true | string; y?: number | string; scrollToFirstRowOnChange?: boolean }>,
     default: null,
   },
   beforeEditSubmit: {