vxe-table 4.15.10 → 4.15.12

package/packages/locale/lang/nb-NO.ts

@@ -44,6 +44,7 @@ export default {
       coverProp: 'Parameteren "{1}" av "{0}" er gjentatte ganger definert, noe som kan forårsake en feil',
       uniField: 'Feltnavnet "{0}" er gjentatte ganger definert, noe som kan forårsake en feil',
       repeatKey: 'Gjenta den primære tasten {0} = "{1}", som kan forårsake en feil',
+      repeatProp: '参数重复 {0}="{1}"，这可能会出现错误',
       delFunc: 'Metode "{0}" er utdatert, bruk "{1}"',
       delProp: 'Parameter "{0}" er utdatert, bruk "{1}"',
       delEvent: 'Hendelse "{0}" er utdatert, bruk "{1}"',
@@ -536,6 +537,35 @@ export default {
         ss: 'Sekund'
       }
     },
+    gantt: {
+      tFullFormat: {
+        year: '{yy}年',
+        quarter: '{yy}年第{q}季度',
+        month: '{yy}年{M}月',
+        week: '{yy}年第{W}周',
+        day: '{yy}年{M}月{d}日',
+        hour: '{yy}年 {M}月{d}日{H}时',
+        minute: '{yy}年{M}月{d}日{H}时{m}分'
+      },
+      tSimpleFormat: {
+        year: '{yy}年',
+        quarter: '{q}季度',
+        month: '{M}月',
+        week: '{W}周',
+        day: '{d}',
+        hour: '{H}时',
+        minute: '{m}分'
+      },
+      dayss: {
+        w0: '日',
+        w1: '一',
+        w2: '二',
+        w3: '三',
+        w4: '四',
+        w5: '五',
+        w6: '六'
+      }
+    },
     plugins: {
       extendCellArea: {
         area: {

package/packages/locale/lang/pt-BR.ts

@@ -44,6 +44,7 @@ export default {
       coverProp: 'O parâmetro "{1}" de "{0}" é definido repetidamente, o que pode causar um erro',
       uniField: 'O nome do campo "{0}" é definido repetidamente, o que pode causar um erro',
       repeatKey: 'Repita a chave primária {0} = "{1}", que pode causar um erro',
+      repeatProp: '参数重复 {0}="{1}"，这可能会出现错误',
       delFunc: 'Método "{0}" está depreciado, use "{1}"',
       delProp: 'O parâmetro "{0}" está depreciado, use "{1}"',
       delEvent: 'Evento "{0}" está descontinuado, use "{1}"',
@@ -536,6 +537,35 @@ export default {
         ss: 'Segundo'
       }
     },
+    gantt: {
+      tFullFormat: {
+        year: '{yy}年',
+        quarter: '{yy}年第{q}季度',
+        month: '{yy}年{M}月',
+        week: '{yy}年第{W}周',
+        day: '{yy}年{M}月{d}日',
+        hour: '{yy}年 {M}月{d}日{H}时',
+        minute: '{yy}年{M}月{d}日{H}时{m}分'
+      },
+      tSimpleFormat: {
+        year: '{yy}年',
+        quarter: '{q}季度',
+        month: '{M}月',
+        week: '{W}周',
+        day: '{d}',
+        hour: '{H}时',
+        minute: '{m}分'
+      },
+      dayss: {
+        w0: '日',
+        w1: '一',
+        w2: '二',
+        w3: '三',
+        w4: '四',
+        w5: '五',
+        w6: '六'
+      }
+    },
     plugins: {
       extendCellArea: {
         area: {

package/packages/locale/lang/ru-RU.ts

@@ -44,6 +44,7 @@ export default {
       coverProp: 'Параметр «{1}» из «{0}» неоднократно определяется, что может вызвать ошибку',
       uniField: 'Имя поля «{0}» неоднократно определяется, что может вызвать ошибку',
       repeatKey: 'Повторите первичную клавишу {0} = "{1}", которая может вызвать ошибку',
+      repeatProp: '参数重复 {0}="{1}"，这可能会出现错误',
       delFunc: 'Метод "{0}" устарел, пожалуйста, используйте "{1}"',
       delProp: 'Параметр "{0}" устарел, пожалуйста, используйте "{1}"',
       delEvent: 'Событие "{0}" устарело, пожалуйста, используйте "{1}"',
@@ -536,6 +537,35 @@ export default {
         ss: 'Второй'
       }
     },
+    gantt: {
+      tFullFormat: {
+        year: '{yy}年',
+        quarter: '{yy}年第{q}季度',
+        month: '{yy}年{M}月',
+        week: '{yy}年第{W}周',
+        day: '{yy}年{M}月{d}日',
+        hour: '{yy}年 {M}月{d}日{H}时',
+        minute: '{yy}年{M}月{d}日{H}时{m}分'
+      },
+      tSimpleFormat: {
+        year: '{yy}年',
+        quarter: '{q}季度',
+        month: '{M}月',
+        week: '{W}周',
+        day: '{d}',
+        hour: '{H}时',
+        minute: '{m}分'
+      },
+      dayss: {
+        w0: '日',
+        w1: '一',
+        w2: '二',
+        w3: '三',
+        w4: '四',
+        w5: '五',
+        w6: '六'
+      }
+    },
     plugins: {
       extendCellArea: {
         area: {

package/packages/locale/lang/th-TH.ts

@@ -44,6 +44,7 @@ export default {
       coverProp: 'พารามิเตอร์ "{1}" ของ "{0}" ถูกกำหนดซ้ำ ๆ ซึ่งอาจทำให้เกิดข้อผิดพลาด',
       uniField: 'ชื่อฟิลด์ "{0}" ถูกกำหนดซ้ำ ๆ ซึ่งอาจทำให้เกิดข้อผิดพลาด',
       repeatKey: 'ทำซ้ำคีย์หลัก {0} = "{1}" ซึ่งอาจทำให้เกิดข้อผิดพลาด',
+      repeatProp: '参数重复 {0}="{1}"，这可能会出现错误',
       delFunc: 'วิธีการ "{0}" เลิกใช้โปรดใช้ "{1}"',
       delProp: 'พารามิเตอร์ "{0}" เลิกใช้โปรดใช้ "{1}"',
       delEvent: 'เหตุการณ์ "{0}" เลิกใช้โปรดใช้ "{1}"',
@@ -536,6 +537,35 @@ export default {
         ss: 'ที่สอง'
       }
     },
+    gantt: {
+      tFullFormat: {
+        year: '{yy}年',
+        quarter: '{yy}年第{q}季度',
+        month: '{yy}年{M}月',
+        week: '{yy}年第{W}周',
+        day: '{yy}年{M}月{d}日',
+        hour: '{yy}年 {M}月{d}日{H}时',
+        minute: '{yy}年{M}月{d}日{H}时{m}分'
+      },
+      tSimpleFormat: {
+        year: '{yy}年',
+        quarter: '{q}季度',
+        month: '{M}月',
+        week: '{W}周',
+        day: '{d}',
+        hour: '{H}时',
+        minute: '{m}分'
+      },
+      dayss: {
+        w0: '日',
+        w1: '一',
+        w2: '二',
+        w3: '三',
+        w4: '四',
+        w5: '五',
+        w6: '六'
+      }
+    },
     plugins: {
       extendCellArea: {
         area: {

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

@@ -44,6 +44,7 @@ export default {
       coverProp: '"{0}" نىڭ پارامېتىرى "{1}" قايتىلانما قىممەت بىرىلدى، بەلكىم خاتالىق كەلتۈرۈپ چىقىرىشى مومكىن',
       uniField: 'سۆز بولىكى  "{0}" قايتىلانما قىممەت بىرىلدى، بۇ بەلكىم خاتالىق كەلتۈرۈپ چىقىرىشى مومكىن',
       repeatKey: 'ئاچقۇچلىق پارامېتىر قايتىلانما {0}="{1}" بۇ بەلكىم خاتالىق كەلتۈرۈپ چىقىرىشى مومكىن',
+      repeatProp: '参数重复 {0}="{1}"，这可能会出现错误',
       delFunc: 'ئۇسۇل "{0}" تاشلىۋىتىلدى،تەۋسىيەلىك تولۇقلانما ئۇسۇل "{1}"',
       delProp: 'پارامېتىر "{0}" تاشلىۋىتىلدى،تەۋسىيەلىك پارامېتىر "{1}"',
       delEvent: 'ھەرىكەت "{0}" تاشلىۋىتىلدى،تەۋسىيەلىك ھەرىكەت "{1}"',
@@ -536,6 +537,35 @@ export default {
         ss: 'سېكۇنت'
       }
     },
+    gantt: {
+      tFullFormat: {
+        year: '{yy}年',
+        quarter: '{yy}年第{q}季度',
+        month: '{yy}年{M}月',
+        week: '{yy}年第{W}周',
+        day: '{yy}年{M}月{d}日',
+        hour: '{yy}年 {M}月{d}日{H}时',
+        minute: '{yy}年{M}月{d}日{H}时{m}分'
+      },
+      tSimpleFormat: {
+        year: '{yy}年',
+        quarter: '{q}季度',
+        month: '{M}月',
+        week: '{W}周',
+        day: '{d}',
+        hour: '{H}时',
+        minute: '{m}分'
+      },
+      dayss: {
+        w0: '日',
+        w1: '一',
+        w2: '二',
+        w3: '三',
+        w4: '四',
+        w5: '五',
+        w6: '六'
+      }
+    },
     plugins: {
       extendCellArea: {
         area: {

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

@@ -44,6 +44,7 @@ export default {
       coverProp: 'Параметр "{1}" "{0}" неодноразово визначається, що може спричинити помилку',
       uniField: 'Назва поля "{0}" неодноразово визначається, що може спричинити помилку',
       repeatKey: 'Повторіть первинний ключ {0} = "{1}", що може спричинити помилку',
+      repeatProp: '参数重复 {0}="{1}"，这可能会出现错误',
       delFunc: 'Метод "{0}" застарілий, будь ласка, використовуйте "{1}"',
       delProp: 'Параметр "{0}" застарілий, будь ласка, використовуйте "{1}"',
       delEvent: 'Подія "{0}" застаріла, будь ласка, використовуйте "{1}"',
@@ -536,6 +537,35 @@ export default {
         ss: 'Другий'
       }
     },
+    gantt: {
+      tFullFormat: {
+        year: '{yy}年',
+        quarter: '{yy}年第{q}季度',
+        month: '{yy}年{M}月',
+        week: '{yy}年第{W}周',
+        day: '{yy}年{M}月{d}日',
+        hour: '{yy}年 {M}月{d}日{H}时',
+        minute: '{yy}年{M}月{d}日{H}时{m}分'
+      },
+      tSimpleFormat: {
+        year: '{yy}年',
+        quarter: '{q}季度',
+        month: '{M}月',
+        week: '{W}周',
+        day: '{d}',
+        hour: '{H}时',
+        minute: '{m}分'
+      },
+      dayss: {
+        w0: '日',
+        w1: '一',
+        w2: '二',
+        w3: '三',
+        w4: '四',
+        w5: '五',
+        w6: '六'
+      }
+    },
     plugins: {
       extendCellArea: {
         area: {

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

@@ -44,6 +44,7 @@ export default {
       coverProp: '"{1}" parametr "{0}" parametr bir necha bor aniqlanadi, bu xatoga olib kelishi mumkin',
       uniField: '"{0}" dagi "{0}" da bir necha bor aniqlanadi, bu xatoga olib kelishi mumkin',
       repeatKey: 'Birlamchi kalit {0} = "{1}" ni takrorlash mumkin, bu xatoga olib kelishi mumkin',
+      repeatProp: '参数重复 {0}="{1}"，这可能会出现错误',
       delFunc: '"{0}" himoyalangan, iltimos "{1}" dan foydalaning',
       delProp: '"{0}" parametri bekor qilinadi, "{1}" dan foydalaning',
       delEvent: '"{0}" bekor qilinadi, iltimos "{1}" dan foydalaning',
@@ -536,6 +537,35 @@ export default {
         ss: 'Ikkinchi'
       }
     },
+    gantt: {
+      tFullFormat: {
+        year: '{yy}年',
+        quarter: '{yy}年第{q}季度',
+        month: '{yy}年{M}月',
+        week: '{yy}年第{W}周',
+        day: '{yy}年{M}月{d}日',
+        hour: '{yy}年 {M}月{d}日{H}时',
+        minute: '{yy}年{M}月{d}日{H}时{m}分'
+      },
+      tSimpleFormat: {
+        year: '{yy}年',
+        quarter: '{q}季度',
+        month: '{M}月',
+        week: '{W}周',
+        day: '{d}',
+        hour: '{H}时',
+        minute: '{m}分'
+      },
+      dayss: {
+        w0: '日',
+        w1: '一',
+        w2: '二',
+        w3: '三',
+        w4: '四',
+        w5: '五',
+        w6: '六'
+      }
+    },
     plugins: {
       extendCellArea: {
         area: {

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

@@ -44,6 +44,7 @@ export default {
       coverProp: 'Tham số "{1}" của "{0}" được xác định nhiều lần, có thể gây ra lỗi',
       uniField: 'Tên trường "{0}" được xác định nhiều lần, có thể gây ra lỗi',
       repeatKey: 'Lặp lại khóa chính {0} = "{1}", có thể gây ra lỗi',
+      repeatProp: '参数重复 {0}="{1}"，这可能会出现错误',
       delFunc: 'Phương thức "{0}" không được dùng nữa, vui lòng sử dụng "{1}"',
       delProp: 'Tham số "{0}" không được dùng, vui lòng sử dụng "{1}"',
       delEvent: 'Sự kiện "{0}" được không dùng nữa, vui lòng sử dụng "{1}"',
@@ -536,6 +537,35 @@ export default {
         ss: 'Thứ hai'
       }
     },
+    gantt: {
+      tFullFormat: {
+        year: '{yy}年',
+        quarter: '{yy}年第{q}季度',
+        month: '{yy}年{M}月',
+        week: '{yy}年第{W}周',
+        day: '{yy}年{M}月{d}日',
+        hour: '{yy}年 {M}月{d}日{H}时',
+        minute: '{yy}年{M}月{d}日{H}时{m}分'
+      },
+      tSimpleFormat: {
+        year: '{yy}年',
+        quarter: '{q}季度',
+        month: '{M}月',
+        week: '{W}周',
+        day: '{d}',
+        hour: '{H}时',
+        minute: '{m}分'
+      },
+      dayss: {
+        w0: '日',
+        w1: '一',
+        w2: '二',
+        w3: '三',
+        w4: '四',
+        w5: '五',
+        w6: '六'
+      }
+    },
     plugins: {
       extendCellArea: {
         area: {

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

@@ -44,6 +44,7 @@ export default {
       coverProp: '"{0}" 的參數 "{1}" 重複定義，這可能會出現錯誤',
       uniField: '字段名 "{0}" 重複定義，這可能會出現錯誤',
       repeatKey: '主鍵重複 {0}="{1}"，這可能會出現錯誤',
+      repeatProp: '参数重复 {0}="{1}"，这可能会出现错误',
       delFunc: '方法 "{0}" 已廢棄，請使用 "{1}"',
       delProp: '參數 "{0}" 已廢棄，請使用 "{1}"',
       delEvent: '事件 "{0}" 已廢棄，請使用 "{1}"',
@@ -536,6 +537,35 @@ export default {
         ss: '秒'
       }
     },
+    gantt: {
+      tFullFormat: {
+        year: '{yy}年',
+        quarter: '{yy}年第{q}季度',
+        month: '{yy}年{M}月',
+        week: '{yy}年第{W}周',
+        day: '{yy}年{M}月{d}日',
+        hour: '{yy}年 {M}月{d}日{H}时',
+        minute: '{yy}年{M}月{d}日{H}时{m}分'
+      },
+      tSimpleFormat: {
+        year: '{yy}年',
+        quarter: '{q}季度',
+        month: '{M}月',
+        week: '{W}周',
+        day: '{d}',
+        hour: '{H}时',
+        minute: '{m}分'
+      },
+      dayss: {
+        w0: '日',
+        w1: '一',
+        w2: '二',
+        w3: '三',
+        w4: '四',
+        w5: '五',
+        w6: '六'
+      }
+    },
     plugins: {
       extendCellArea: {
         area: {

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

@@ -44,6 +44,7 @@ export default {
       coverProp: '"{0}" 的参数 "{1}" 重复定义，这可能会出现错误',
       uniField: '字段名 "{0}" 重复定义，这可能会出现错误',
       repeatKey: '主键重复 {0}="{1}"，这可能会出现错误',
+      repeatProp: '参数重复 {0}="{1}"，这可能会出现错误',
       delFunc: '方法 "{0}" 已废弃，请使用 "{1}"',
       delProp: '参数 "{0}" 已废弃，请使用 "{1}"',
       delEvent: '事件 "{0}" 已废弃，请使用 "{1}"',
@@ -536,6 +537,37 @@ export default {
         ss: '秒'
       }
     },
+    gantt: {
+      tFullFormat: {
+        year: '{yy}年',
+        quarter: '{yy}年第{q}季度',
+        month: '{yy}年{M}月',
+        week: '{yy}年第{W}周',
+        day: '{yy}年{M}月{E}日',
+        date: '{yy}年{M}月{d}日',
+        hour: '{yy}年 {M}月{d}日{H}时',
+        minute: '{yy}年{M}月{d}日{H}时{m}分'
+      },
+      tSimpleFormat: {
+        year: '{yy}年',
+        quarter: '{q}季度',
+        month: '{M}月',
+        week: '{W}周',
+        day: '{d}',
+        date: '{d}',
+        hour: '{H}时',
+        minute: '{m}分'
+      },
+      dayss: {
+        w0: '日',
+        w1: '一',
+        w2: '二',
+        w3: '三',
+        w4: '四',
+        w5: '五',
+        w6: '六'
+      }
+    },
     plugins: {
       extendCellArea: {
         area: {

package/packages/table/src/cell.ts

@@ -432,10 +432,15 @@ export const Cell = {
         groupColumn: (colRest ? colRest.column : null) as VxeTableDefines.ColumnInfo,
         column,
         groupValue: groupContent,
-        children: childList,
+        childList,
         childCount,
         aggValue: null as any,
 
+        /**
+         * 已废弃
+         * @deprecated
+         */
+        children: childList,
         /**
          * 已废弃
          * @deprecated
@@ -443,7 +448,7 @@ export const Cell = {
         totalValue: childCount
       }
       if (gcSlot) {
-        return renderCellBaseVNs(params, $table.callSlot(gcSlot, Object.assign({ groupField, groupContent, childCount }, params)))
+        return renderCellBaseVNs(params, $table.callSlot(gcSlot, Object.assign({ groupField, groupContent, childList, childCount }, params)))
       }
       if (mode === 'column' ? field === aggRow.groupField : rowGroupNode) {
         cellValue = groupContent
@@ -1194,9 +1199,12 @@ export const Cell = {
     return Cell.renderDeepNodeBtn(params, Cell.renderCellEdit(params) as VNode[])
   },
   runRenderer (params: VxeTableDefines.CellRenderBodyParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }, isEdit: boolean) {
-    const { $table, column } = params
-    const { slots, editRender, formatter } = column
+    const { $table, row, column } = params
+    const tableReactData = $table.reactData
+    const { isRowGroupStatus } = tableReactData
+    const { slots, field, editRender, formatter } = column
     const defaultSlot = slots ? slots.default : null
+    const gcSlot = slots ? (slots.groupContent || slots['group-content']) : null
     const editSlot = slots ? slots.edit : null
     const compConf = renderer.get(editRender.name)
     const rtEdit = compConf ? (compConf.renderTableEdit || compConf.renderEdit) : null
@@ -1211,9 +1219,25 @@ export const Cell = {
       }
       return []
     }
-    if (defaultSlot) {
-      return renderCellBaseVNs(params, $table.callSlot(defaultSlot, cellParams))
+
+    if (isRowGroupStatus && field && row.isAggregate) {
+      const aggRow: VxeTableDefines.AggregateRowInfo = row
+      const { computeAggregateOpts } = $table.getComputeMaps()
+      const aggregateOpts = computeAggregateOpts.value
+      const { mapChildrenField } = aggregateOpts
+      const groupField = aggRow.groupField
+      const groupContent = aggRow.groupContent
+      const childList = mapChildrenField ? (aggRow[mapChildrenField] || []) : []
+      const childCount = aggRow.childCount
+      if (gcSlot) {
+        return renderCellBaseVNs(params, $table.callSlot(gcSlot, Object.assign({ groupField, groupContent, childList, childCount }, params)))
+      }
+    } else {
+      if (defaultSlot) {
+        return renderCellBaseVNs(params, $table.callSlot(defaultSlot, cellParams))
+      }
     }
+
     if (formatter) {
       return renderCellBaseVNs(params, [
         h('span', {

package/packages/table/src/table.ts

@@ -12133,6 +12133,12 @@ export default defineVxeComponent({
         if (props.resizable) {
           warnLog('vxe.error.delProp', ['resizable', 'column-config.resizable'])
         }
+        if (props.virtualXConfig && props.scrollX) {
+          warnLog('vxe.error.notSupportProp', ['virtual-x-config', 'scroll-x', 'scroll-x=null'])
+        }
+        if (props.virtualYConfig && props.scrollY) {
+          warnLog('vxe.error.notSupportProp', ['virtual-y-config', 'scroll-y', 'scroll-y=null'])
+        }
         // if (props.scrollY) {
         //   warnLog('vxe.error.delProp', ['scroll-y', 'virtual-y-config'])
         // }
@@ -12223,6 +12229,15 @@ export default defineVxeComponent({
           warnLog('vxe.error.delProp', ['checkbox-config.halfField', 'checkbox-config.indeterminateField'])
         }
 
+        if (treeConfig) {
+          XEUtils.arrayEach(['rowField', 'parentField', 'childrenField', 'hasChildField', 'mapChildrenField'], key => {
+            const val = treeOpts[key as 'rowField']
+            if (val && val.indexOf('.') > -1) {
+              errLog('vxe.error.errProp', [`${key}=${val}`, `${key}=${val.split('.')[0]}`])
+            }
+          })
+        }
+
         if (rowOpts.currentMethod) {
           warnLog('vxe.error.delProp', ['row-config.currentMethod', 'current-row-config.beforeSelectMethod'])
         }