fan 2 лет назад
Родитель
Сommit
2d1f0fd48d

+ 1 - 0
src/components/Table/src/components/editable/EditableCell.vue

@@ -533,6 +533,7 @@
 
 
     .ant-select:not(.ant-select-customize-input) .ant-select-selector,
     .ant-select:not(.ant-select-customize-input) .ant-select-selector,
     .ant-input,
     .ant-input,
+    .ant-input-number,
     .ant-picker {
     .ant-picker {
       border: 0;
       border: 0;
       border-bottom: 1px solid #d9d9d9;
       border-bottom: 1px solid #d9d9d9;

+ 9 - 5
src/components/XTCard/src/ChartsCard.vue

@@ -65,9 +65,13 @@
       ],
       ],
     },
     },
     // 图表数据
     // 图表数据
-    data: {
-      type: Object,
-      default: () => {},
+    infoData: {
+      type: Array,
+      default: () => [],
+    },
+    dateData: {
+      type: Array,
+      default: () => [],
     },
     },
   });
   });
   const chartRef = ref<HTMLDivElement | null>(null);
   const chartRef = ref<HTMLDivElement | null>(null);
@@ -87,8 +91,8 @@
     // console.log(resData);
     // console.log(resData);
     // infoData.value = resData.validCount || [];
     // infoData.value = resData.validCount || [];
     // dateData.value = resData.uploadTimes || [];
     // dateData.value = resData.uploadTimes || [];
-    infoData.value = [10, 25, 30, 16, 36, 10];
-    dateData.value = [
+    infoData.value = props.infoData || [10, 25, 30, 16, 36, 10];
+    dateData.value = props.dateData || [
       '2023-05-10',
       '2023-05-10',
       '2023-05-11',
       '2023-05-11',
       '2023-05-12',
       '2023-05-12',

+ 3 - 2
src/components/XTCard/src/DescCard.vue

@@ -20,7 +20,7 @@
             <div class="card-body-item_label" v-if="item.label">{{ item.label }}</div>
             <div class="card-body-item_label" v-if="item.label">{{ item.label }}</div>
             <div class="card-body-item_value">
             <div class="card-body-item_value">
               <div v-if="item.value">{{ item.value }}</div>
               <div v-if="item.value">{{ item.value }}</div>
-              <div v-if="item.tags" class="flex ml-3">
+              <div v-if="item.tags" :class="['flex', item.value ? ' ml-3' : '']">
                 <div
                 <div
                   v-for="t in item.tags"
                   v-for="t in item.tags"
                   :key="t.id"
                   :key="t.id"
@@ -95,7 +95,8 @@
             fontColor: string;
             fontColor: string;
             bgColor: string;
             bgColor: string;
           }>
           }>
-        | unknown;
+        | unknown
+        | any;
     }>;
     }>;
   }
   }
   const props = withDefaults(defineProps<Props>(), {
   const props = withDefaults(defineProps<Props>(), {