vxe-table 4.20.10 → 4.20.12

package/packages/locale/lang/ug-CN.ts

@@ -620,6 +620,17 @@ export default {
         minute: '{mm}',
         second: '{ss}'
       },
+      stepFormat: {
+        year: '{start.yyyy}~{end.yyyy}年',
+        quarter: '{start.q}~{end.q}季度',
+        month: '{start.M}~{end.M}月',
+        week: '{start.W}~{end.W}周',
+        day: '{sE}~{eE}',
+        date: '{start.d}~{end.d}',
+        hour: '{start.HH}~{end.HH}',
+        minute: '{start.mm}~{end.mm}',
+        second: '{start.ss}~{end.ss}'
+      },
       dayss: {
         w0: '日',
         w1: '一',
@@ -628,6 +639,15 @@ export default {
         w4: '四',
         w5: '五',
         w6: '六'
+      },
+      days: {
+        w0: '日',
+        w1: '一',
+        w2: '二',
+        w3: '三',
+        w4: '四',
+        w5: '五',
+        w6: '六'
       }
     },
     plugins: {

package/packages/locale/lang/uk-UA.ts

@@ -620,6 +620,17 @@ export default {
         minute: '{mm}',
         second: '{ss}'
       },
+      stepFormat: {
+        year: '{start.yyyy}~{end.yyyy}年',
+        quarter: '{start.q}~{end.q}季度',
+        month: '{start.M}~{end.M}月',
+        week: '{start.W}~{end.W}周',
+        day: '{sE}~{eE}',
+        date: '{start.d}~{end.d}',
+        hour: '{start.HH}~{end.HH}',
+        minute: '{start.mm}~{end.mm}',
+        second: '{start.ss}~{end.ss}'
+      },
       dayss: {
         w0: '日',
         w1: '一',
@@ -628,6 +639,15 @@ export default {
         w4: '四',
         w5: '五',
         w6: '六'
+      },
+      days: {
+        w0: '日',
+        w1: '一',
+        w2: '二',
+        w3: '三',
+        w4: '四',
+        w5: '五',
+        w6: '六'
       }
     },
     plugins: {

package/packages/locale/lang/uz-UZ.ts

@@ -620,6 +620,17 @@ export default {
         minute: '{mm}',
         second: '{ss}'
       },
+      stepFormat: {
+        year: '{start.yyyy}~{end.yyyy}年',
+        quarter: '{start.q}~{end.q}季度',
+        month: '{start.M}~{end.M}月',
+        week: '{start.W}~{end.W}周',
+        day: '{sE}~{eE}',
+        date: '{start.d}~{end.d}',
+        hour: '{start.HH}~{end.HH}',
+        minute: '{start.mm}~{end.mm}',
+        second: '{start.ss}~{end.ss}'
+      },
       dayss: {
         w0: '日',
         w1: '一',
@@ -628,6 +639,15 @@ export default {
         w4: '四',
         w5: '五',
         w6: '六'
+      },
+      days: {
+        w0: '日',
+        w1: '一',
+        w2: '二',
+        w3: '三',
+        w4: '四',
+        w5: '五',
+        w6: '六'
       }
     },
     plugins: {

package/packages/locale/lang/vi-VN.ts

@@ -620,6 +620,17 @@ export default {
         minute: '{mm}',
         second: '{ss}'
       },
+      stepFormat: {
+        year: '{start.yyyy}~{end.yyyy}年',
+        quarter: '{start.q}~{end.q}季度',
+        month: '{start.M}~{end.M}月',
+        week: '{start.W}~{end.W}周',
+        day: '{sE}~{eE}',
+        date: '{start.d}~{end.d}',
+        hour: '{start.HH}~{end.HH}',
+        minute: '{start.mm}~{end.mm}',
+        second: '{start.ss}~{end.ss}'
+      },
       dayss: {
         w0: '日',
         w1: '一',
@@ -628,6 +639,15 @@ export default {
         w4: '四',
         w5: '五',
         w6: '六'
+      },
+      days: {
+        w0: '日',
+        w1: '一',
+        w2: '二',
+        w3: '三',
+        w4: '四',
+        w5: '五',
+        w6: '六'
       }
     },
     plugins: {

package/packages/locale/lang/zh-CHT.ts

@@ -620,6 +620,17 @@ export default {
         minute: '{mm}',
         second: '{ss}'
       },
+      stepFormat: {
+        year: '{start.yyyy}~{end.yyyy}年',
+        quarter: '{start.q}~{end.q}季度',
+        month: '{start.M}~{end.M}月',
+        week: '{start.W}~{end.W}周',
+        day: '{sE}~{eE}',
+        date: '{start.d}~{end.d}',
+        hour: '{start.HH}~{end.HH}',
+        minute: '{start.mm}~{end.mm}',
+        second: '{start.ss}~{end.ss}'
+      },
       dayss: {
         w0: '日',
         w1: '一',
@@ -628,6 +639,15 @@ export default {
         w4: '四',
         w5: '五',
         w6: '六'
+      },
+      days: {
+        w0: '日',
+        w1: '一',
+        w2: '二',
+        w3: '三',
+        w4: '四',
+        w5: '五',
+        w6: '六'
       }
     },
     plugins: {

package/packages/locale/lang/zh-CN.ts

@@ -603,7 +603,7 @@ export default {
         quarter: '{yyyy}年第{q}季度',
         month: '{yyyy}年{MM}月',
         week: '{yyyy}年第{W}周',
-        day: '{yyyy}年{MM}月 {E}',
+        day: '{yyyy}年{MM}月 {eLabel}',
         date: '{yyyy}年{MM}月{dd}日',
         hour: '{yyyy}年{MM}月{dd}日{HH}时',
         minute: '{yyyy}年{MM}月{dd}日{HH}时{mm}分',
@@ -614,12 +614,23 @@ export default {
         quarter: '{q}季度',
         month: '{M}月',
         week: '{W}周',
-        day: '{d}',
+        day: '{eLabel}',
         date: '{d}',
         hour: '{HH}',
         minute: '{mm}',
         second: '{ss}'
       },
+      stepFormat: {
+        year: '{start.yyyy}~{end.yyyy}年',
+        quarter: '{start.q}~{end.q}季度',
+        month: '{start.M}~{end.M}月',
+        week: '{start.W}~{end.W}周',
+        day: '{eStartLabel}~{eEndLabel}',
+        date: '{start.d}~{end.d}',
+        hour: '{start.HH}~{end.HH}',
+        minute: '{start.mm}~{end.mm}',
+        second: '{start.ss}~{end.ss}'
+      },
       dayss: {
         w0: '日',
         w1: '一',
@@ -628,6 +639,15 @@ export default {
         w4: '四',
         w5: '五',
         w6: '六'
+      },
+      days: {
+        w0: '日',
+        w1: '一',
+        w2: '二',
+        w3: '三',
+        w4: '四',
+        w5: '五',
+        w6: '六'
       }
     },
     plugins: {

package/packages/table/src/table.ts

@@ -5579,6 +5579,18 @@ export default defineVxeComponent({
         }
         const { editConfig } = props
         const { formatter, editRender, cellRender } = column
+        let etOpSize = null
+        let etOgSize = null
+        let clOpSize = null
+        let clOgSize = null
+        if (editRender) {
+          etOpSize = editRender.options ? editRender.options.length : 0
+          etOgSize = editRender.optionGroups ? editRender.optionGroups.length : 0
+        }
+        if (cellRender) {
+          clOpSize = cellRender.options ? cellRender.options.length : 0
+          clOgSize = cellRender.optionGroups ? cellRender.optionGroups.length : 0
+        }
         // formatter > tableCellFormatter
         const renderOpts = formatter ? null : (editConfig && isEnableConf(editRender) ? editRender : (isEnableConf(cellRender) ? cellRender : null))
         const compConf = renderOpts ? renderer.get(renderOpts.name) : null
@@ -5597,7 +5609,8 @@ export default defineVxeComponent({
               formatData = fullAllDataRowIdData[rowid].formatData = {}
             }
             if (rowRest && formatData[colid]) {
-              if (formatData[colid].value === cellValue) {
+              const ftValue = formatData[colid].value
+              if (ftValue && ftValue[0] === cellValue && ftValue[1] === etOpSize && ftValue[2] === etOgSize && ftValue[3] === clOpSize && ftValue[4] === clOgSize) {
                 return formatData[colid].label
               }
             }
@@ -5626,7 +5639,8 @@ export default defineVxeComponent({
             cellLabel = tcFormatter(renderOpts, formatParams)
           }
           if (formatData) {
-            formatData[colid] = { value: cellValue, label: cellLabel }
+            const ftValue = [cellValue, etOpSize, etOgSize, clOpSize, clOgSize]
+            formatData[colid] = { value: ftValue, label: cellLabel }
           }
         }
         return cellLabel