vue2-client 1.10.30 → 1.10.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.10.30",
+  "version": "1.10.31",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/base-client/components/common/XDataCard/XDataCard.vue

@@ -17,10 +17,10 @@
 <!--              <slot :name="column.slots.customRender">{{ card[config.bandage] }}</slot>-->
 <!--            </template>-->
 <!--          </div>-->
-          <div v-if="config.bandage && card[config.bandage.ribbon] && card[config.bandage.ribbonColor]"
+          <div v-if="config && card[config.ribbon]"
                class="ribbon"
-               :style="{ backgroundColor: getRibbonColor(card[config.bandage.ribbonColor]) }">
-            {{ card[config.bandage.ribbon] }}
+               :style="{ backgroundColor: getRibbonColor(card[config.ribbonColor]) }">
+            {{ card[config.ribbon] }}
           </div>
           <!-- 自定义标题 -->
           <template #title>
@@ -33,6 +33,7 @@
                 <div class="title-main">
                   <span class="title-name">{{ card[config.title] }}</span>
                   <span class="title-info">{{ card[config.title2] }}</span>
+                  <span class="title-title3">{{ card[config.title3] }}</span>
                 </div>
                 <div class="additional-info" v-if="card[config.subtitle2] || card[config.subtitle3] || card[config.subtitle4]">
                   <a-tooltip placement="top" v-if="card[config.subtitle2]">
@@ -51,7 +52,7 @@
           <!-- 主体 -->
           <div class="body">
             <div class="body-text" v-if="card[config.text]">
-              <a-tooltip>
+              <a-tooltip :title="card[config.text]">
                 <span class="text-ellipsis">{{ card[config.text] }}</span>
               </a-tooltip>
             </div>
@@ -94,8 +95,8 @@
             </template>
           </div>
           <!-- 下方按钮 -->
-          <div class="footer">
-            <a-row align="middle">
+          <template #actions>
+            <a-row align="middle" class="custom-actions">
               <template v-for="(item, footerIndex) in config.footer">
                 <a-col :key="'footer_' + footerIndex" class="footer-item" :span="11" @click="clickFooter(card, item.emit)">
                   <span>
@@ -112,7 +113,7 @@
                 </a-col>
               </template>
             </a-row>
-          </div>
+          </template>
         </a-card>
       </template>
     </div>
@@ -220,14 +221,13 @@ export default {
         id: '未获取到配置',
         title: '未获取到配置',
         title2: '未获取到配置',
+        title3: '未获取到配置',
         subtitle2: '未获取到配置',
         subtitle3: '未获取到配置',
         subtitle4: '未获取到配置',
         text: '未获取到配置',
-        bandage: {
-          ribbon: '未获取到配置',
-          ribbonColor: '未获取到配置'
-        },
+        ribbon: '未获取到配置',
+        ribbonColor: '未获取到配置',
         content: [
           {
             label: '未获取到配置',
@@ -388,9 +388,13 @@ export default {
     max-width: 300px;
     border: 2px solid rgb(244,244,244);
     border-radius: 5px;
-    margin: 5px;
+    margin: 2px;
     overflow: hidden;
 
+    ::v-deep .ant-card-body {
+      padding: 15px !important; // 使用 !important 确保样式覆盖
+    }
+
     .header {
       width: 100%;
       background-color: rgb(244,244,244);
@@ -417,7 +421,7 @@ export default {
       }
 
       .body-item {
-        padding: 5px 15px;
+        padding: 3px 5px;
       }
 
       .body-split {
@@ -465,29 +469,6 @@ export default {
         color: black;
       }
     }
-
-    .footer {
-      padding: 5px 15px;
-      background-color: rgb(244,244,244);
-      margin: 0 -10px -10px -10px;
-      .footer-icon {
-        margin-right: 5px;
-      }
-
-      .footer-item-split {
-        color: rgba(220, 220, 220, 0.59);
-      }
-
-      .footer-item {
-        color: rgba(117, 117, 117, 0.8);
-        font-size: 1em;
-      }
-
-      .footer-item:hover {
-        color: rgb( 24,144,255 );
-        cursor: pointer;
-      }
-    }
   }
 
   .custom-title {
@@ -497,7 +478,7 @@ export default {
 
     .title-id {
       flex-shrink: 0;
-      width: 60px;
+      width: 65px;
       color: #1890ff;
       font-size: 16px;
       font-weight: bold;
@@ -529,6 +510,10 @@ export default {
         align-items: center;
         gap: 8px;
         .title-info {
+          margin-left: 6px;
+          color: #808080;
+        }
+        .title-title3 {
           color: #808080;
         }
       }
@@ -557,6 +542,26 @@ export default {
     transform-origin: top right;
     z-index: 1;
   }
+
+  .custom-actions {
+      .footer-icon {
+        margin-right: 5px;
+      }
+
+      .footer-item-split {
+        color: rgba(220, 220, 220, 0.59);
+      }
+
+      .footer-item {
+        color: rgba(117, 117, 117, 0.8);
+        font-size: 1em;
+      }
+
+      .footer-item:hover {
+        color: rgb( 24,144,255 );
+        cursor: pointer;
+      }
+  }
 }
 
 .ellipsis {