vxe-table 3.16.4 → 3.17.0-beta.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (159) hide show
  1. package/es/index.css +1 -1
  2. package/es/index.min.css +1 -1
  3. package/es/locale/lang/ar-EG.js +1 -0
  4. package/es/locale/lang/de-DE.js +1 -0
  5. package/es/locale/lang/en-US.js +1 -0
  6. package/es/locale/lang/es-ES.js +1 -0
  7. package/es/locale/lang/fr-FR.js +1 -0
  8. package/es/locale/lang/hu-HU.js +1 -0
  9. package/es/locale/lang/hy-AM.js +1 -0
  10. package/es/locale/lang/id-ID.js +1 -0
  11. package/es/locale/lang/it-IT.js +1 -0
  12. package/es/locale/lang/ja-JP.js +1 -0
  13. package/es/locale/lang/ko-KR.js +1 -0
  14. package/es/locale/lang/ms-MY.js +1 -0
  15. package/es/locale/lang/nb-NO.js +1 -0
  16. package/es/locale/lang/pt-BR.js +1 -0
  17. package/es/locale/lang/ru-RU.js +1 -0
  18. package/es/locale/lang/th-TH.js +1 -0
  19. package/es/locale/lang/ug-CN.js +1 -0
  20. package/es/locale/lang/uk-UA.js +1 -0
  21. package/es/locale/lang/uz-UZ.js +1 -0
  22. package/es/locale/lang/vi-VN.js +1 -0
  23. package/es/locale/lang/zh-CHT.js +1 -0
  24. package/es/locale/lang/zh-CN.js +1 -0
  25. package/es/style.css +1 -1
  26. package/es/style.min.css +1 -1
  27. package/es/table/src/body.js +1 -1
  28. package/es/table/src/columnInfo.js +11 -2
  29. package/es/table/src/header.js +1 -1
  30. package/es/table/src/table.js +4 -1
  31. package/es/table/style.css +10 -5
  32. package/es/table/style.min.css +1 -1
  33. package/es/ui/index.js +1 -1
  34. package/es/ui/src/log.js +1 -1
  35. package/es/vxe-table/style.css +10 -5
  36. package/es/vxe-table/style.min.css +1 -1
  37. package/lib/index.css +1 -1
  38. package/lib/index.min.css +1 -1
  39. package/lib/index.umd.js +23 -7
  40. package/lib/index.umd.min.js +1 -1
  41. package/lib/locale/lang/ar-EG.js +1 -0
  42. package/lib/locale/lang/ar-EG.min.js +1 -1
  43. package/lib/locale/lang/ar-EG.umd.js +1 -0
  44. package/lib/locale/lang/de-DE.js +1 -0
  45. package/lib/locale/lang/de-DE.min.js +1 -1
  46. package/lib/locale/lang/de-DE.umd.js +1 -0
  47. package/lib/locale/lang/en-US.js +1 -0
  48. package/lib/locale/lang/en-US.min.js +1 -1
  49. package/lib/locale/lang/en-US.umd.js +1 -0
  50. package/lib/locale/lang/es-ES.js +1 -0
  51. package/lib/locale/lang/es-ES.min.js +1 -1
  52. package/lib/locale/lang/es-ES.umd.js +1 -0
  53. package/lib/locale/lang/fr-FR.js +1 -0
  54. package/lib/locale/lang/fr-FR.min.js +1 -1
  55. package/lib/locale/lang/fr-FR.umd.js +1 -0
  56. package/lib/locale/lang/hu-HU.js +1 -0
  57. package/lib/locale/lang/hu-HU.min.js +1 -1
  58. package/lib/locale/lang/hu-HU.umd.js +1 -0
  59. package/lib/locale/lang/hy-AM.js +1 -0
  60. package/lib/locale/lang/hy-AM.min.js +1 -1
  61. package/lib/locale/lang/hy-AM.umd.js +1 -0
  62. package/lib/locale/lang/id-ID.js +1 -0
  63. package/lib/locale/lang/id-ID.min.js +1 -1
  64. package/lib/locale/lang/id-ID.umd.js +1 -0
  65. package/lib/locale/lang/it-IT.js +1 -0
  66. package/lib/locale/lang/it-IT.min.js +1 -1
  67. package/lib/locale/lang/it-IT.umd.js +1 -0
  68. package/lib/locale/lang/ja-JP.js +1 -0
  69. package/lib/locale/lang/ja-JP.min.js +1 -1
  70. package/lib/locale/lang/ja-JP.umd.js +1 -0
  71. package/lib/locale/lang/ko-KR.js +1 -0
  72. package/lib/locale/lang/ko-KR.min.js +1 -1
  73. package/lib/locale/lang/ko-KR.umd.js +1 -0
  74. package/lib/locale/lang/ms-MY.js +1 -0
  75. package/lib/locale/lang/ms-MY.min.js +1 -1
  76. package/lib/locale/lang/ms-MY.umd.js +1 -0
  77. package/lib/locale/lang/nb-NO.js +1 -0
  78. package/lib/locale/lang/nb-NO.min.js +1 -1
  79. package/lib/locale/lang/nb-NO.umd.js +1 -0
  80. package/lib/locale/lang/pt-BR.js +1 -0
  81. package/lib/locale/lang/pt-BR.min.js +1 -1
  82. package/lib/locale/lang/pt-BR.umd.js +1 -0
  83. package/lib/locale/lang/ru-RU.js +1 -0
  84. package/lib/locale/lang/ru-RU.min.js +1 -1
  85. package/lib/locale/lang/ru-RU.umd.js +1 -0
  86. package/lib/locale/lang/th-TH.js +1 -0
  87. package/lib/locale/lang/th-TH.min.js +1 -1
  88. package/lib/locale/lang/th-TH.umd.js +1 -0
  89. package/lib/locale/lang/ug-CN.js +1 -0
  90. package/lib/locale/lang/ug-CN.min.js +1 -1
  91. package/lib/locale/lang/ug-CN.umd.js +1 -0
  92. package/lib/locale/lang/uk-UA.js +1 -0
  93. package/lib/locale/lang/uk-UA.min.js +1 -1
  94. package/lib/locale/lang/uk-UA.umd.js +1 -0
  95. package/lib/locale/lang/uz-UZ.js +1 -0
  96. package/lib/locale/lang/uz-UZ.min.js +1 -1
  97. package/lib/locale/lang/uz-UZ.umd.js +1 -0
  98. package/lib/locale/lang/vi-VN.js +1 -0
  99. package/lib/locale/lang/vi-VN.min.js +1 -1
  100. package/lib/locale/lang/vi-VN.umd.js +1 -0
  101. package/lib/locale/lang/zh-CHT.js +1 -0
  102. package/lib/locale/lang/zh-CHT.min.js +1 -1
  103. package/lib/locale/lang/zh-CHT.umd.js +1 -0
  104. package/lib/locale/lang/zh-CN.js +1 -0
  105. package/lib/locale/lang/zh-CN.min.js +1 -1
  106. package/lib/locale/lang/zh-CN.umd.js +1 -0
  107. package/lib/style.css +1 -1
  108. package/lib/style.min.css +1 -1
  109. package/lib/table/src/body.js +1 -1
  110. package/lib/table/src/body.min.js +1 -1
  111. package/lib/table/src/columnInfo.js +14 -2
  112. package/lib/table/src/columnInfo.min.js +1 -1
  113. package/lib/table/src/header.js +1 -1
  114. package/lib/table/src/header.min.js +1 -1
  115. package/lib/table/src/table.js +4 -1
  116. package/lib/table/src/table.min.js +1 -1
  117. package/lib/table/style/style.css +10 -5
  118. package/lib/table/style/style.min.css +1 -1
  119. package/lib/ui/index.js +1 -1
  120. package/lib/ui/index.min.js +1 -1
  121. package/lib/ui/src/log.js +1 -1
  122. package/lib/ui/src/log.min.js +1 -1
  123. package/lib/vxe-table/style/style.css +10 -5
  124. package/lib/vxe-table/style/style.min.css +1 -1
  125. package/package.json +1 -1
  126. package/packages/locale/lang/ar-EG.ts +1 -0
  127. package/packages/locale/lang/de-DE.ts +1 -0
  128. package/packages/locale/lang/en-US.ts +1 -0
  129. package/packages/locale/lang/es-ES.ts +1 -0
  130. package/packages/locale/lang/fr-FR.ts +1 -0
  131. package/packages/locale/lang/hu-HU.ts +1 -0
  132. package/packages/locale/lang/hy-AM.ts +1 -0
  133. package/packages/locale/lang/id-ID.ts +1 -0
  134. package/packages/locale/lang/it-IT.ts +1 -0
  135. package/packages/locale/lang/ja-JP.ts +1 -0
  136. package/packages/locale/lang/ko-KR.ts +1 -0
  137. package/packages/locale/lang/ms-MY.ts +1 -0
  138. package/packages/locale/lang/nb-NO.ts +1 -0
  139. package/packages/locale/lang/pt-BR.ts +1 -0
  140. package/packages/locale/lang/ru-RU.ts +1 -0
  141. package/packages/locale/lang/th-TH.ts +1 -0
  142. package/packages/locale/lang/ug-CN.ts +1 -0
  143. package/packages/locale/lang/uk-UA.ts +1 -0
  144. package/packages/locale/lang/uz-UZ.ts +1 -0
  145. package/packages/locale/lang/vi-VN.ts +1 -0
  146. package/packages/locale/lang/zh-CHT.ts +1 -0
  147. package/packages/locale/lang/zh-CN.ts +1 -0
  148. package/packages/table/src/body.ts +1 -1
  149. package/packages/table/src/columnInfo.ts +13 -2
  150. package/packages/table/src/header.ts +1 -1
  151. package/packages/table/src/table.ts +4 -1
  152. package/styles/components/table.scss +12 -8
  153. package/styles/theme/base.scss +2 -2
  154. /package/es/{iconfont.1752646203441.ttf → iconfont.1753080034233.ttf} +0 -0
  155. /package/es/{iconfont.1752646203441.woff → iconfont.1753080034233.woff} +0 -0
  156. /package/es/{iconfont.1752646203441.woff2 → iconfont.1753080034233.woff2} +0 -0
  157. /package/lib/{iconfont.1752646203441.ttf → iconfont.1753080034233.ttf} +0 -0
  158. /package/lib/{iconfont.1752646203441.woff → iconfont.1753080034233.woff} +0 -0
  159. /package/lib/{iconfont.1752646203441.woff2 → iconfont.1753080034233.woff2} +0 -0
@@ -17,6 +17,7 @@ export default {
17
17
  groupTag: 'Az oszlopfejlécek csoportosításának a "{0}" -et használni kell a "{1}" helyett, amely hibákat okozhat',
18
18
  scrollErrProp: 'Ezt a "{0}" paramétert a virtuális görgetés engedélyezése után nem támogatják',
19
19
  errConflicts: 'A "{0}" paraméter konfliktusok "{1}"',
20
+ modelConflicts: '绑定的字段值 "{0}" 与 "{1}" 存在冲突,将会出现错误',
20
21
  notSupportProp: 'A "{1}" nem támogatott, ha a "{0}" paraméter engedélyezve van, "{2}" -nek kell lennie, különben hiba lép fel',
21
22
  notConflictProp: 'A "{0}" használatakor a "{1}" -et be kell állítani, különben funkcionális konfliktusok merülhetnek fel',
22
23
  unableInsert: 'Nem lehet beilleszteni a megadott helyre, kérjük, ellenőrizze, hogy a paraméterek helyesek -e',
@@ -17,6 +17,7 @@ export default {
17
17
  groupTag: '分组列头应该使用 "{0}" 而不是 "{1}",这可能会出现错误',
18
18
  scrollErrProp: '启用虚拟滚动后不支持该参数 "{0}"',
19
19
  errConflicts: '参数 "{0}" 与 "{1}" 有冲突',
20
+ modelConflicts: '绑定的字段值 "{0}" 与 "{1}" 存在冲突,将会出现错误',
20
21
  notSupportProp: '当启用参数 "{0}" 时不支持 "{1}",应该为 "{2}",否则将会出现错误',
21
22
  notConflictProp: '当使用 "{0}" 时,应该设置 "{1}",否则可能会存在功能冲突',
22
23
  unableInsert: '无法插入到指定位置,请检查参数是否正确',
@@ -17,6 +17,7 @@ export default {
17
17
  groupTag: 'Mengelompokkan header kolom harus menggunakan "{0}" bukan "{1}", yang dapat menyebabkan kesalahan',
18
18
  scrollErrProp: 'Parameter ini "{0}" tidak didukung setelah pengguliran virtual diaktifkan',
19
19
  errConflicts: 'Parameter "{0}" bertentangan dengan "{1}"',
20
+ modelConflicts: '绑定的字段值 "{0}" 与 "{1}" 存在冲突,将会出现错误',
20
21
  notSupportProp: '"{1}" tidak didukung ketika parameter "{0}" diaktifkan, itu harus menjadi "{2}", jika tidak kesalahan akan terjadi',
21
22
  notConflictProp: 'Saat menggunakan "{0}", "{1}" harus diatur, jika tidak mungkin ada konflik fungsional',
22
23
  unableInsert: 'Tidak dapat dimasukkan ke lokasi yang ditentukan, silakan periksa apakah parameternya benar',
@@ -17,6 +17,7 @@ export default {
17
17
  groupTag: 'Le intestazioni della colonna di raggruppamento dovrebbero usare "{0}" invece di "{1}", che può causare errori',
18
18
  scrollErrProp: 'Questo parametro "{0}" non è supportato dopo che lo scorrimento virtuale è abilitato',
19
19
  errConflicts: 'Parametro "{0}" conflitti con "{1}"',
20
+ modelConflicts: '绑定的字段值 "{0}" 与 "{1}" 存在冲突,将会出现错误',
20
21
  notSupportProp: '"{1}" non è supportato quando il parametro "{0}" è abilitato, dovrebbe essere "{2}", altrimenti si verificherà un errore',
21
22
  notConflictProp: 'Quando si utilizza "{0}", "{1}" dovrebbe essere impostato, altrimenti potrebbero esserci conflitti funzionali',
22
23
  unableInsert: 'Non può essere inserito nella posizione specificata, si prega di verificare se i parametri sono corretti',
@@ -17,6 +17,7 @@ export default {
17
17
  groupTag: 'グループ化列ヘッダーは、「{1}」の代わりに「{0}」を使用する必要があります。',
18
18
  scrollErrProp: 'このパラメーター「{0}」は、仮想スクロールが有効になった後にサポートされていません',
19
19
  errConflicts: 'パラメーター「{0}」は「{1}」と競合します',
20
+ modelConflicts: '绑定的字段值 "{0}" 与 "{1}" 存在冲突,将会出现错误',
20
21
  notSupportProp: '「{1}」はパラメーター「{0}」が有効になっている場合、「{2}」である必要があります。そうしないと、エラーが発生します。',
21
22
  notConflictProp: '「{0}」を使用する場合、「{1}」を設定する必要があります。',
22
23
  unableInsert: '指定された場所に挿入できません。パラメーターが正しいかどうかを確認してください',
@@ -17,6 +17,7 @@ export default {
17
17
  groupTag: '열 헤더 그룹화는 "{1}"대신 "{0}"을 사용해야하며 오류가 발생할 수 있습니다.',
18
18
  scrollErrProp: '이 매개 변수 "{0}"은 가상 스크롤링이 활성화 된 후에 지원되지 않습니다.',
19
19
  errConflicts: '매개 변수 "{0}" "{1}"과 충돌합니다.',
20
+ modelConflicts: '绑定的字段值 "{0}" 与 "{1}" 存在冲突,将会出现错误',
20
21
  notSupportProp: '"{1}"은 "{0}"매개 변수가 활성화 될 때 지원되지 않습니다. "{2}"이어야합니다. 그렇지 않으면 오류가 발생합니다.',
21
22
  notConflictProp: '"{0}"을 사용하는 경우 "{1}"을 설정해야합니다. 그렇지 않으면 기능적 충돌이있을 수 있습니다.',
22
23
  unableInsert: '지정된 위치에 삽입 할 수 없으므로 매개 변수가 올바른지 확인하십시오.',
@@ -17,6 +17,7 @@ export default {
17
17
  groupTag: 'Mengumpulkan tajuk lajur harus menggunakan "{0}" bukannya "{1}", yang boleh menyebabkan kesilapan',
18
18
  scrollErrProp: 'Parameter ini "{0}" tidak disokong selepas menatal maya diaktifkan',
19
19
  errConflicts: 'Parameter "{0}" Konflik dengan "{1}"',
20
+ modelConflicts: '绑定的字段值 "{0}" 与 "{1}" 存在冲突,将会出现错误',
20
21
  notSupportProp: '"{1}" tidak disokong apabila parameter "{0}" diaktifkan, ia harus "{2}", jika tidak, ralat akan berlaku',
21
22
  notConflictProp: 'Apabila menggunakan "{0}", "{1}" harus ditetapkan, jika tidak ada konflik fungsional',
22
23
  unableInsert: 'Tidak dapat dimasukkan ke lokasi yang ditentukan, sila periksa sama ada parameternya betul',
@@ -17,6 +17,7 @@ export default {
17
17
  groupTag: 'Gruppering av kolonneoverskrifter bør bruke "{0}" i stedet for "{1}", som kan forårsake feil',
18
18
  scrollErrProp: 'Denne parameteren "{0}" støttes ikke etter at virtuell rulling er aktivert',
19
19
  errConflicts: 'Parameter "{0}" Konflikter med "{1}"',
20
+ modelConflicts: '绑定的字段值 "{0}" 与 "{1}" 存在冲突,将会出现错误',
20
21
  notSupportProp: '"{1}" støttes ikke når parameteren "{0}" er aktivert, den skal være "{2}", ellers vil det oppstå en feil',
21
22
  notConflictProp: 'Når du bruker "{0}", "{1}" skal settes, ellers kan det være funksjonelle konflikter',
22
23
  unableInsert: 'Kan ikke settes inn på det spesifiserte stedet, vennligst sjekk om parametrene er riktige',
@@ -17,6 +17,7 @@ export default {
17
17
  groupTag: 'Os cabeçalhos da coluna de agrupamento devem usar "{0}" em vez de "{1}", o que pode causar erros',
18
18
  scrollErrProp: 'Este parâmetro "{0}" não é suportado após a rolagem virtual ser ativada',
19
19
  errConflicts: 'Parâmetro "{0}" conflita com "{1}"',
20
+ modelConflicts: '绑定的字段值 "{0}" 与 "{1}" 存在冲突,将会出现错误',
20
21
  notSupportProp: '"{1}" não é suportado quando o parâmetro "{0}" estiver ativado, ele deve ser "{2}", caso contrário, um erro ocorrerá',
21
22
  notConflictProp: 'Ao usar "{0}", "{1}" deve ser definido, caso contrário, pode haver conflitos funcionais',
22
23
  unableInsert: 'Não pode ser inserido no local especificado, verifique se os parâmetros estão corretos',
@@ -17,6 +17,7 @@ export default {
17
17
  groupTag: 'Заголовки столбцов группировки должны использовать «{0}» вместо «{1}», что может вызвать ошибки',
18
18
  scrollErrProp: 'Этот параметр "{0}" не поддерживается после включения виртуальной прокрутки',
19
19
  errConflicts: 'Параметр "{0}" Конфликт с "{1}"',
20
+ modelConflicts: '绑定的字段值 "{0}" 与 "{1}" 存在冲突,将会出现错误',
20
21
  notSupportProp: '"{1}" не поддерживается, когда параметр "{0}"',
21
22
  notConflictProp: 'При использовании "{0}", "{1}" должен быть установлен, в противном случае могут быть функциональные конфликты',
22
23
  unableInsert: 'Нельзя вставить в указанное место, пожалуйста, проверьте, являются ли параметры правильными',
@@ -17,6 +17,7 @@ export default {
17
17
  groupTag: 'ส่วนหัวคอลัมน์การจัดกลุ่มควรใช้ "{0}" แทน "{1}" ซึ่งอาจทำให้เกิดข้อผิดพลาด',
18
18
  scrollErrProp: 'พารามิเตอร์นี้ "{0}" นี้ไม่ได้รับการสนับสนุนหลังจากเปิดใช้งานการเลื่อนเสมือนจริง',
19
19
  errConflicts: 'พารามิเตอร์ "{0}" ขัดแย้งกับ "{1}"',
20
+ modelConflicts: '绑定的字段值 "{0}" 与 "{1}" 存在冲突,将会出现错误',
20
21
  notSupportProp: '"{1}" ไม่ได้รับการสนับสนุนเมื่อเปิดใช้งานพารามิเตอร์ "{0}" มันควรจะเป็น "{2}" มิฉะนั้นจะเกิดข้อผิดพลาดเกิดขึ้น',
21
22
  notConflictProp: 'เมื่อใช้ "{0}", "{1}" ควรตั้งค่ามิฉะนั้นอาจมีความขัดแย้งในการทำงาน',
22
23
  unableInsert: 'ไม่สามารถแทรกลงในตำแหน่งที่ระบุได้โปรดตรวจสอบว่าพารามิเตอร์ถูกต้องหรือไม่',
@@ -17,6 +17,7 @@ export default {
17
17
  groupTag: 'گۇرۇپپا قۇر بىشىغا چوقۇم "{0}" نى ئىشلىتىشىڭىز كىرەك،ھەرگىزمۇ "{1}"نى ئەمەس ،بولمىسا بۇ بەلكىم خاتالىق كەلتۈرۈپ چىقىرىشى مومكىن',
18
18
  scrollErrProp: 'مەۋھۇم يۇمىلاتما ئىقىدارىنى قوزغاتقاندىن كىيىن بۇ سېپىرنى تەكشەشكە بولمايدۇ "{0}"',
19
19
  errConflicts: 'سان سىپىر "{0}" بىلەن "{1}" دە ماسلاشماسلىق ئەھۋالى مەۋجۇت',
20
+ modelConflicts: '绑定的字段值 "{0}" 与 "{1}" 存在冲突,将会出现错误',
20
21
  notSupportProp: '当启用参数 "{0}" 时不支持 "{1}",应该为 "{2}",否则将会出现错误',
21
22
  notConflictProp: '当使用 "{0}" 时,应该设置 "{1}",否则可能会存在功能冲突',
22
23
  unableInsert: 'بىكىتىلگەن ئورۇنغا قىستۇرۇشقا بولمايدۇ، پارامېتىرىڭىزنىڭ توغرا-خاتالىقىنى تەكشۈرۈڭ ',
@@ -17,6 +17,7 @@ export default {
17
17
  groupTag: 'Заголовок стовпців групування повинно використовувати "{0}" замість "{1}", що може спричинити помилки',
18
18
  scrollErrProp: 'Цей параметр "{0}" не підтримується після включення віртуальної прокрутки',
19
19
  errConflicts: 'Параметр "{0}" Конфлікти з "{1}"',
20
+ modelConflicts: '绑定的字段值 "{0}" 与 "{1}" 存在冲突,将会出现错误',
20
21
  notSupportProp: '"{1}" не підтримується, коли параметр "{0}" ввімкнено, він повинен бути "{2}", інакше помилка станеться',
21
22
  notConflictProp: 'При використанні "{0}", "{1}" слід встановити, інакше можуть бути функціональні конфлікти',
22
23
  unableInsert: 'Неможливо вставити у вказане місце, будь ласка, перевірте, чи правильні параметри',
@@ -17,6 +17,7 @@ export default {
17
17
  groupTag: "\"Lim li}\" o'rniga guruh sarlavhalarida \"{1}\" o'rniga \"{0}\" o'rniga \"{0}\" dan foydalanish kerak",
18
18
  scrollErrProp: "Virtual aylantirish yoqilgandan so'ng \"{0}\" ushbu parametr qo'llab-quvvatlanmaydi",
19
19
  errConflicts: '"{0}" parametr "{1}" bilan ziddiyatlar',
20
+ modelConflicts: '绑定的字段值 "{0}" 与 "{1}" 存在冲突,将会出现错误',
20
21
  notSupportProp: '"{1}" parametri yoqilganda, u "{2}" parametrlari yoqilgan, aks holda xatolik yuz beradi',
21
22
  notConflictProp: "\"{0}\", \"{1}\" dan foydalanish kerak bo'lganda, aks holda funktsional to'qnashuvlar bo'lishi mumkin",
22
23
  unableInsert: "Belgilangan joyda kiritilishi mumkin emas, parametrlar to'g'ri yoki yo'qligini tekshiring",
@@ -17,6 +17,7 @@ export default {
17
17
  groupTag: 'Nhóm tiêu đề nhóm nên sử dụng "{0}" thay vì "{1}", có thể gây ra lỗi',
18
18
  scrollErrProp: 'Tham số này "{0}" không được hỗ trợ sau khi cuộn ảo được bật',
19
19
  errConflicts: 'Tham số "{0}" Xung đột với "{1}"',
20
+ modelConflicts: '绑定的字段值 "{0}" 与 "{1}" 存在冲突,将会出现错误',
20
21
  notSupportProp: '"{1}" không được hỗ trợ khi tham số "{0}" được bật, nó phải là "{2}", nếu không sẽ xảy ra lỗi',
21
22
  notConflictProp: 'Khi sử dụng "{0}", "{1}" nên được đặt, nếu không có thể có xung đột chức năng',
22
23
  unableInsert: 'Không thể được chèn vào vị trí đã chỉ định, vui lòng kiểm tra xem các tham số có đúng không',
@@ -17,6 +17,7 @@ export default {
17
17
  groupTag: '分組列頭應該使用 "{0}" 而不是 "{1}",這可能會出現錯誤',
18
18
  scrollErrProp: '啟用虛擬滾動後不支持該參數 "{0}"',
19
19
  errConflicts: '參數 "{0}" 與 "{1}" 有衝突',
20
+ modelConflicts: '绑定的字段值 "{0}" 与 "{1}" 存在冲突,将会出现错误',
20
21
  notSupportProp: '當啟用參數 "{0}" 時不支持 "{1}",應該為 "{2}",否則將會出現錯誤',
21
22
  notConflictProp: '當使用 "{0}" 時,應該設置 "{1}",否則可能會存在功能衝突',
22
23
  unableInsert: '無法插入到指定位置,請檢查參數是否正確',
@@ -17,6 +17,7 @@ export default {
17
17
  groupTag: '分组列头应该使用 "{0}" 而不是 "{1}",这可能会出现错误',
18
18
  scrollErrProp: '启用虚拟滚动后不支持该参数 "{0}"',
19
19
  errConflicts: '参数 "{0}" 与 "{1}" 有冲突',
20
+ modelConflicts: '绑定的字段值 "{0}" 与 "{1}" 存在冲突,将会出现错误',
20
21
  notSupportProp: '当启用参数 "{0}" 时不支持 "{1}",应该为 "{2}",否则将会出现错误',
21
22
  notConflictProp: '当使用 "{0}" 时,应该设置 "{1}",否则可能会存在功能冲突',
22
23
  unableInsert: '无法插入到指定位置,请检查参数是否正确',
@@ -901,7 +901,7 @@ export default {
901
901
  ]
902
902
  : null),
903
903
  h('span', {
904
- class: 'vxe-table--cell-copy-area'
904
+ class: 'vxe-table--cell-clip-area'
905
905
  }),
906
906
  h('span', {
907
907
  class: 'vxe-table--cell-extend-area'
@@ -14,6 +14,8 @@ export class ColumnInfo {
14
14
  const tableProps = $xeTable
15
15
  const $xeGrid = $xeTable.$xeGrid as VxeGridConstructor & GridPrivateMethods
16
16
 
17
+ const { field, editRender } = _vm
18
+
17
19
  const proxyOpts = $xeGrid ? $xeGrid.computeProxyOpts : null
18
20
  const formatter = _vm.formatter
19
21
  const visible = XEUtils.isBoolean(_vm.visible) ? _vm.visible : true
@@ -59,11 +61,20 @@ export class ColumnInfo {
59
61
  }
60
62
  }
61
63
 
64
+ if (field && editRender) {
65
+ if (editRender.startField && `${editRender.startField}`.indexOf(field) >= 0) {
66
+ errLog('vxe.error.modelConflicts', [`field=${field}`, `edit-render.startField=${editRender.startField}`])
67
+ }
68
+ if (editRender.endField && `${editRender.endField}`.indexOf(field) >= 0) {
69
+ errLog('vxe.error.modelConflicts', [`field=${field}`, `edit-render.endField=${editRender.endField}`])
70
+ }
71
+ }
72
+
62
73
  Object.assign(this, {
63
74
  // 基本属性
64
75
  type: _vm.type,
65
76
  property: _vm.field,
66
- field: _vm.field,
77
+ field: field,
67
78
  title: _vm.title,
68
79
  width: _vm.width,
69
80
  minWidth: _vm.minWidth,
@@ -100,7 +111,7 @@ export class ColumnInfo {
100
111
  rowResize: _vm.rowResize,
101
112
  cellType: _vm.cellType,
102
113
  cellRender: _vm.cellRender,
103
- editRender: _vm.editRender,
114
+ editRender: editRender,
104
115
  contentRender: _vm.contentRender,
105
116
  headerExportMethod: _vm.headerExportMethod,
106
117
  exportMethod: _vm.exportMethod,
@@ -387,7 +387,7 @@ export default {
387
387
  class: 'vxe-table--cell-main-area'
388
388
  }),
389
389
  h('span', {
390
- class: 'vxe-table--cell-copy-area'
390
+ class: 'vxe-table--cell-clip-area'
391
391
  }),
392
392
  h('span', {
393
393
  class: 'vxe-table--cell-extend-area'
@@ -1059,9 +1059,12 @@ export default {
1059
1059
  return Object.assign({}, getConfig().table.clipConfig, this.clipConfig)
1060
1060
  },
1061
1061
  fnrOpts () {
1062
- return this.computeFNROpts
1062
+ return this.computeFnrOpts
1063
1063
  },
1064
1064
  computeFNROpts () {
1065
+ return this.computeFnrOpts
1066
+ },
1067
+ computeFnrOpts () {
1065
1068
  return Object.assign({}, getConfig().table.fnrConfig, this.fnrConfig)
1066
1069
  },
1067
1070
  headerCtxMenu () {
@@ -307,6 +307,7 @@ $btnThemeList: (
307
307
 
308
308
  .vxe-table--checkbox-range,
309
309
  .vxe-table--cell-main-area,
310
+ .vxe-table--cell-item-area,
310
311
  .vxe-table--cell-extend-area,
311
312
  .vxe-table--cell-active-area,
312
313
  .vxe-table--cell-copy-area,
@@ -329,6 +330,7 @@ $btnThemeList: (
329
330
  .vxe-table--fixed-right-wrapper {
330
331
  .vxe-table--checkbox-range,
331
332
  .vxe-table--cell-main-area,
333
+ .vxe-table--cell-item-area,
332
334
  .vxe-table--cell-extend-area,
333
335
  .vxe-table--cell-active-area,
334
336
  .vxe-table--cell-copy-area,
@@ -340,6 +342,7 @@ $btnThemeList: (
340
342
 
341
343
  .vxe-table--fixed-left-wrapper {
342
344
  .vxe-table--cell-main-area,
345
+ .vxe-table--cell-item-area,
343
346
  .vxe-table--cell-extend-area,
344
347
  .vxe-table--cell-active-area {
345
348
  &[half="1"] {
@@ -348,13 +351,14 @@ $btnThemeList: (
348
351
  }
349
352
  .vxe-table--cell-copy-area {
350
353
  &[half="1"] {
351
- background-size: var(--vxe-ui-table-cell-copy-area-border-width) 12px, 0 12px, 12px var(--vxe-ui-table-cell-copy-area-border-width), 12px var(--vxe-ui-table-cell-copy-area-border-width);
354
+ background-size: var(--vxe-ui-table-cell-clip-area-border-width) 12px, 0 12px, 12px var(--vxe-ui-table-cell-clip-area-border-width), 12px var(--vxe-ui-table-cell-clip-area-border-width);
352
355
  }
353
356
  }
354
357
  }
355
358
 
356
359
  .vxe-table--fixed-right-wrapper {
357
360
  .vxe-table--cell-main-area,
361
+ .vxe-table--cell-item-area,
358
362
  .vxe-table--cell-extend-area,
359
363
  .vxe-table--cell-active-area {
360
364
  &[half="1"] {
@@ -363,7 +367,7 @@ $btnThemeList: (
363
367
  }
364
368
  .vxe-table--cell-copy-area {
365
369
  &[half="1"] {
366
- background-size: 0 12px, var(--vxe-ui-table-cell-copy-area-border-width) 12px, 12px var(--vxe-ui-table-cell-copy-area-border-width), 12px var(--vxe-ui-table-cell-copy-area-border-width);
370
+ background-size: 0 12px, var(--vxe-ui-table-cell-clip-area-border-width) 12px, 12px var(--vxe-ui-table-cell-clip-area-border-width), 12px var(--vxe-ui-table-cell-clip-area-border-width);
367
371
  }
368
372
  }
369
373
  }
@@ -420,11 +424,11 @@ $btnThemeList: (
420
424
  }
421
425
 
422
426
  .vxe-table--cell-copy-area {
423
- background: linear-gradient(0deg, transparent 6px, var(--vxe-ui-table-cell-copy-area-border-color) 6px) repeat-y,
424
- linear-gradient(0deg, transparent 50%, var(--vxe-ui-table-cell-copy-area-border-color) 0) repeat-y,
425
- linear-gradient(90deg, transparent 50%, var(--vxe-ui-table-cell-copy-area-border-color) 0) repeat-x,
426
- linear-gradient(90deg, transparent 50%, var(--vxe-ui-table-cell-copy-area-border-color) 0) repeat-x;
427
- background-size: var(--vxe-ui-table-cell-copy-area-border-width) 12px, var(--vxe-ui-table-cell-copy-area-border-width) 12px, 12px var(--vxe-ui-table-cell-copy-area-border-width), 12px var(--vxe-ui-table-cell-copy-area-border-width);
427
+ background: linear-gradient(0deg, transparent 6px, var(--vxe-ui-table-cell-clip-area-border-color) 6px) repeat-y,
428
+ linear-gradient(0deg, transparent 50%, var(--vxe-ui-table-cell-clip-area-border-color) 0) repeat-y,
429
+ linear-gradient(90deg, transparent 50%, var(--vxe-ui-table-cell-clip-area-border-color) 0) repeat-x,
430
+ linear-gradient(90deg, transparent 50%, var(--vxe-ui-table-cell-clip-area-border-color) 0) repeat-x;
431
+ background-size: var(--vxe-ui-table-cell-clip-area-border-width) 12px, var(--vxe-ui-table-cell-clip-area-border-width) 12px, 12px var(--vxe-ui-table-cell-clip-area-border-width), 12px var(--vxe-ui-table-cell-clip-area-border-width);
428
432
  background-position: 0 0, 100% 0, 0 0, 0 100%;
429
433
  animation: moveCopyCellBorder .5s infinite linear;
430
434
  }
@@ -437,7 +441,7 @@ $btnThemeList: (
437
441
  }
438
442
 
439
443
  .vxe-table--cell-multi-area {
440
- & > .vxe-table--cell-main-area {
444
+ & > .vxe-table--cell-item-area {
441
445
  background-color: var(--vxe-ui-table-cell-area-background-color);
442
446
  }
443
447
  }
@@ -58,10 +58,10 @@
58
58
  --vxe-ui-table-cell-main-area-extension-border-color: #fff;
59
59
  --vxe-ui-table-cell-main-area-extension-background-color: var(--vxe-ui-font-primary-color);
60
60
  --vxe-ui-table-cell-extend-area-border-width: 2px;
61
- --vxe-ui-table-cell-copy-area-border-width: 3px;
61
+ --vxe-ui-table-cell-clip-area-border-width: 3px;
62
62
  --vxe-ui-table-cell-active-area-border-width: 2px;
63
63
  --vxe-ui-table-cell-active-area-background-color: transparent;
64
- --vxe-ui-table-cell-copy-area-border-color: var(--vxe-ui-table-cell-area-border-color);
64
+ --vxe-ui-table-cell-clip-area-border-color: var(--vxe-ui-table-cell-area-border-color);
65
65
  --vxe-ui-table-cell-extend-area-border-color: var(--vxe-ui-table-cell-area-border-color);
66
66
  --vxe-ui-table-cell-active-area-border-color: var(--vxe-ui-table-cell-area-border-color);
67
67
  --vxe-ui-table-cell-area-background-color: rgba(64,158,255,0.2);