t20-common-lib 0.9.10 → 0.9.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "t20-common-lib",
-  "version": "0.9.10",
+  "version": "0.9.12",
   "description": "T20",
   "private": false,
   "main": "dist/index.js",

package/packages/statis-card/src/main.vue

@@ -36,9 +36,9 @@
             -->
             <div class="content-item-val" @click="$emit('click', conItem)">
               <template v-if="hasAmountAndCount(conItem)">
-                {{ formatAmount(conItem, 'value') }}<span class="content-item-unit">{{ formatAmount(conItem, 'unit') }}</span>
-                <span class="divider-inline"> / </span>
                 <span class="count-val">{{ conItem.count }}<span class="content-item-unit">{{ conItem.countUnit || conItem.unit || '笔' }}</span></span>
+                <span class="divider-inline"></span>
+                {{ formatAmount(conItem, 'value') }}<span class="content-item-unit">{{ formatAmount(conItem, 'unit') }}</span>
               </template>
               <template v-else-if="conItem.amountFormat">
                 {{ formatAmount(conItem, 'value') }}<span class="content-item-unit">{{ formatAmount(conItem, 'unit') }}</span>
@@ -148,6 +148,11 @@ export default {
     formatAmount(item, type = 'value') {
       const amount = item.amount !== undefined && item.amount !== null ? item.amount : item.value;
       // 通过 this.$options.filters 调用组件内定义的过滤器
+      // 如果是请求单位并且调用方显式传了 unit 且标记了 amountFormat，优先返回该 unit（恢复原先逻辑）
+      if (type === 'unit' && item && item.amountFormat && item.unit) {
+        return item.unit;
+      }
+
       if (this.$options && this.$options.filters && typeof this.$options.filters.cardFormatAmount === 'function') {
         try {
           return this.$options.filters.cardFormatAmount(amount, type);
@@ -222,8 +227,7 @@ export default {
         }
 
         .count-val {
-          font-size: 14px;
-          vertical-align: middle;
+          font-size: 20px;
         }
         
         &-unit {