Skip to content

Commit 136c68a

Browse files
committed
releases 4.7.40
1 parent 8e11f85 commit 136c68a

File tree

13 files changed

+107
-3
lines changed

13 files changed

+107
-3
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vxe-table",
3-
"version": "4.7.39",
3+
"version": "4.7.40",
44
"description": "一个基于 vue 的 PC 端表格组件,支持增删改查、虚拟树、列拖拽,懒加载、快捷菜单、数据校验、树形结构、打印、导入导出、自定义模板、渲染器、JSON 配置式...",
55
"scripts": {
66
"update": "npm install --legacy-peer-deps",
@@ -28,7 +28,7 @@
2828
"style": "lib/style.css",
2929
"typings": "types/index.d.ts",
3030
"dependencies": {
31-
"vxe-pc-ui": "^4.0.41"
31+
"vxe-pc-ui": "^4.0.42"
3232
},
3333
"devDependencies": {
3434
"@types/resize-observer-browser": "^0.1.11",

packages/grid/src/grid.ts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1230,6 +1230,19 @@ export default defineComponent({
12301230
})
12311231

12321232
nextTick(() => {
1233+
if (process.env.VUE_APP_VXE_ENV === 'development') {
1234+
if (props.formConfig) {
1235+
if (!VxeUIFormComponent) {
1236+
errLog('vxe.error.reqComp', ['vxe-form'])
1237+
}
1238+
}
1239+
if (props.pagerConfig) {
1240+
if (!VxeUIPagerComponent) {
1241+
errLog('vxe.error.reqComp', ['vxe-pager'])
1242+
}
1243+
}
1244+
}
1245+
12331246
initProxy()
12341247
})
12351248

packages/locale/lang/en-US.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ export default {
2323
useErr: 'Error installing "{0}" module, possibly in the wrong order, dependent modules need to be installed before Table.',
2424
barUnableLink: 'Toolbar cannot associate table.',
2525
expandContent: 'Expand row slot should be "content", please check if it is correct.',
26+
reqComp: 'Require "{0}" component, check whether the install is correct',
2627
reqModule: 'require "{0}" module.',
2728
reqProp: 'Missing the necessary "{0}" parameter, which can cause error.',
2829
emptyProp: 'The property "{0}" is not allowed to be empty.',

packages/locale/lang/es-ES.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ export default {
2323
useErr: 'Error al instalar el módulo "{0}", posiblemente en el orden equivocado, los módulos dependientes deben ser instalados antes de la tabla.',
2424
barUnableLink: 'La barra de herramientas no puede asociarse con la tabla.',
2525
expandContent: 'La ranura de fila expandible debería ser "contenido", por favor revise si está correcta.',
26+
reqComp: 'Require "{0}" component, check whether the install is correct',
2627
reqModule: 'Requerir el módulo "{0}".',
2728
reqProp: 'Falta el parámetro necesario "{0}", lo que puede causar errores.',
2829
emptyProp: 'La propiedad "{0}" no se permite estar vacía.',

packages/locale/lang/ja-JP.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ export default {
2323
useErr: '"{0}" モジュールをインストールする際にエラーが発生し、順序が正しくない可能性がある。依存するモジュールはTableの前にインストールする必要がある',
2424
barUnableLink: 'ツールバーはフォームを関連付けることができない',
2525
expandContent: '拡張行スロットは "content" である必要があります。確認してください',
26+
reqComp: 'Require "{0}" component, check whether the install is correct',
2627
reqModule: '"{0}" モジュールが必要です',
2728
reqProp: '必要な "{0}" パラメーターが欠落しているため、エラーが発生する可能性があります',
2829
emptyProp: '"{0}" プロパティは空白が許可されていません',

packages/locale/lang/pt-BR.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ export default {
2323
useErr: 'Erro ao instalar o módulo "{0}", possivelmente na ordem errada, os módulos dependentes precisam ser instalados antes da Tabela.',
2424
barUnableLink: 'A barra de ferramentas não pode ser associada à tabela.',
2525
expandContent: 'O slot de linha expandida deve ser "content", verifique se está correto.',
26+
reqComp: 'Require "{0}" component, check whether the install is correct',
2627
reqModule: 'requerir o módulo "{0}".',
2728
reqProp: 'Faltando o parâmetro necessário "{0}", o que pode causar um erro.',
2829
emptyProp: 'A propriedade "{0}" não pode estar vazia.',

packages/locale/lang/zh-CN.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ export default {
2323
useErr: '安装 "{0}" 模块时发生错误,可能顺序不正确,依赖的模块需要在 Table 之前安装',
2424
barUnableLink: '工具栏无法关联表格',
2525
expandContent: '展开行的插槽应该是 "content",请检查是否正确',
26+
reqComp: '缺少 "{0}" 组件,请检查是否正确安装',
2627
reqModule: '缺少 "{0}" 模块',
2728
reqProp: '缺少必要的 "{0}" 参数,这可能会导致出现错误',
2829
emptyProp: '参数 "{0}" 不允许为空',

packages/locale/lang/zh-TC.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ export default {
2323
useErr: '安裝 "{0}" 模組時發生錯誤,可能順序不正確,依賴的模組需要在Table之前安裝',
2424
barUnableLink: '工具欄無法關聯表格',
2525
expandContent: '展開行的插槽應該是 “content”,請檢查是否正確',
26+
reqComp: '缺少 "{0}" 組件,請檢查是否正確安裝',
2627
reqModule: '缺少 "{0}" 模組',
2728
reqProp: '缺少必要的 "{0}" 參數,可能會導致出現錯誤',
2829
emptyProp: '參數 "{0}" 不允許為空',

packages/table/module/custom/panel.ts

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
import { defineComponent, h, inject, ref, Ref, VNode, PropType, TransitionGroup, createCommentVNode } from 'vue'
1+
import { defineComponent, h, inject, ref, Ref, VNode, PropType, nextTick, TransitionGroup, createCommentVNode } from 'vue'
22
import { VxeUI } from '../../../ui'
33
import { formatText } from '../../../ui/src/utils'
44
import { addClass, removeClass } from '../../../ui/src/dom'
5+
import { errLog } from '../../../ui/src/log'
56
import XEUtils from 'xe-utils'
67

78
import type { VxeModalComponent, VxeButtonComponent, VxeRadioGroupComponent, VxeTooltipComponent, VxeInputComponent } from 'vxe-pc-ui'
@@ -784,6 +785,26 @@ export default defineComponent({
784785
return renderSimplePanel()
785786
}
786787

788+
if (process.env.VUE_APP_VXE_ENV === 'development') {
789+
nextTick(() => {
790+
if (!VxeUIModalComponent) {
791+
errLog('vxe.error.reqComp', ['vxe-modal'])
792+
}
793+
if (!VxeUIButtonComponent) {
794+
errLog('vxe.error.reqComp', ['vxe-button'])
795+
}
796+
if (!VxeUIInputComponent) {
797+
errLog('vxe.error.reqComp', ['vxe-input'])
798+
}
799+
if (!VxeUITooltipComponent) {
800+
errLog('vxe.error.reqComp', ['vxe-tooltip'])
801+
}
802+
if (!VxeUIRadioGroupComponent) {
803+
errLog('vxe.error.reqComp', ['vxe-radio-group'])
804+
}
805+
})
806+
}
807+
787808
return renderVN
788809
}
789810
})

packages/table/module/export/export-panel.ts

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { defineComponent, h, createCommentVNode, ref, Ref, computed, reactive, i
22
import { VxeUI } from '../../../ui'
33
import XEUtils from 'xe-utils'
44
import { formatText } from '../../../ui/src/utils'
5+
import { errLog } from '../../../ui/src/log'
56

67
import type { VxeModalComponent, VxeInputComponent, VxeCheckboxComponent, VxeSelectComponent, VxeButtonComponent } from 'vxe-pc-ui'
78
import type { VxeTablePrivateMethods, VxeTableConstructor, VxeTableMethods } from '../../../../types'
@@ -442,6 +443,26 @@ export default defineComponent({
442443
: createCommentVNode()
443444
}
444445

446+
if (process.env.VUE_APP_VXE_ENV === 'development') {
447+
nextTick(() => {
448+
if (!VxeUIModalComponent) {
449+
errLog('vxe.error.reqComp', ['vxe-modal'])
450+
}
451+
if (!VxeUIButtonComponent) {
452+
errLog('vxe.error.reqComp', ['vxe-button'])
453+
}
454+
if (!VxeUISelectComponent) {
455+
errLog('vxe.error.reqComp', ['vxe-select'])
456+
}
457+
if (!VxeUIInputComponent) {
458+
errLog('vxe.error.reqComp', ['vxe-input'])
459+
}
460+
if (!VxeUICheckboxComponent) {
461+
errLog('vxe.error.reqComp', ['vxe-checkbox'])
462+
}
463+
})
464+
}
465+
445466
return renderVN
446467
}
447468
})

0 commit comments

Comments
 (0)