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

bug-300【数据模板最后一列宽度设置失效】

cfort 2 лет назад
Родитель
Сommit
82fab8ba14

+ 2 - 2
src/business/platform/data/templaterender/templates/list.vue

@@ -1322,8 +1322,8 @@ export default {
                         }
                         break
                 }
-                // 所有字段都在fields范围内或最后一个字段在fields范围内时,去除最后一个字段的宽度
-                if (allInIt || fields.includes(displayColumns[displayColumns.length - 1].name)) {
+                // 所有字段都在fields范围内  之前的所有字段都设置了宽度且最后一个字段在fields范围内时,去除最后一个字段的宽度
+                if (allInIt || (displayColumns.every(col => col.width) && fields.includes(displayColumns[displayColumns.length - 1].name))) {
                     displayColumns[displayColumns.length - 1].width = ''
                 }
                 const field = this.convertField(col)

+ 1 - 1
src/store/modules/ibps/modules/account.js

@@ -49,7 +49,7 @@ export default {
                     const { data = {} } = response
                     const tokenInfo = JSON.parse(JSON.stringify(data))
                     tokenInfo.licJson = undefined
-                    const licenceData = data.licJson || {}
+                    const licenceData = data.licJson || { isTrialVersion: false }
                     const { isTrialVersion, notAfter, reminderDays, notBefore } = licenceData
                     const now = Date.now()
                     // 判定是否超时

+ 2 - 2
src/views/system/licence/index.vue

@@ -95,7 +95,7 @@ export default {
             this.licenceFormVisible = true
         },
         transformDate (v) {
-            return new Date(v).toLocaleString('zh-CN', { hour12: false }).replace(/\//g, '-')
+            return v ? new Date(v).toLocaleString('zh-CN', { hour12: false }).replace(/\//g, '-') : ''
         }
     }
 }
@@ -131,7 +131,7 @@ export default {
             background-color: #fff;
             transition: transform 0.2s;
             &:hover {
-                transform: scale(1.03);
+                transform: scale(1.01);
             }
             .label {
                 font-size: 16px;