vxe-table 4.7.11 → 4.7.12
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.
- package/es/style.css +1 -1
- package/es/style.min.css +1 -1
- package/es/table/src/table.js +8 -4
- package/es/ui/index.js +2 -2
- package/es/ui/src/log.js +1 -1
- package/lib/index.umd.js +11 -7
- package/lib/index.umd.min.js +1 -1
- package/lib/style.css +1 -1
- package/lib/style.min.css +1 -1
- package/lib/table/src/table.js +8 -4
- package/lib/table/src/table.min.js +1 -1
- package/lib/ui/index.js +2 -2
- package/lib/ui/index.min.js +1 -1
- package/lib/ui/src/log.js +1 -1
- package/lib/ui/src/log.min.js +1 -1
- package/package.json +2 -2
- package/packages/table/src/table.ts +8 -4
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "vxe-table",
|
|
3
|
-
"version": "4.7.
|
|
3
|
+
"version": "4.7.12",
|
|
4
4
|
"description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟树、列拖拽，懒加载、快捷菜单、数据校验、树形结构、打印、导入导出、自定义模板、渲染器、JSON 配置式...",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"update": "npm install --legacy-peer-deps",
|
|
@@ -28,7 +28,7 @@
|
|
|
28
28
|
"style": "lib/style.css",
|
|
29
29
|
"typings": "types/index.d.ts",
|
|
30
30
|
"dependencies": {
|
|
31
|
-
"vxe-pc-ui": "^4.0.
|
|
31
|
+
"vxe-pc-ui": "^4.0.10"
|
|
32
32
|
},
|
|
33
33
|
"devDependencies": {
|
|
34
34
|
"@types/resize-observer-browser": "^0.1.11",
|
|
@@ -249,7 +249,8 @@ export default defineComponent({
|
|
|
249
249
|
isFooter: false
|
|
250
250
|
},
|
|
251
251
|
scrollVMLoading: false,
|
|
252
|
-
_isResize: false
|
|
252
|
+
_isResize: false,
|
|
253
|
+
_isLoading: false
|
|
253
254
|
})
|
|
254
255
|
|
|
255
256
|
const internalData: TableInternalData = {
|
|
@@ -2493,8 +2494,10 @@ export default defineComponent({
|
|
|
2493
2494
|
internalData.collectColumn = collectColumn
|
|
2494
2495
|
const tableFullColumn = getColumnList(collectColumn)
|
|
2495
2496
|
internalData.tableFullColumn = tableFullColumn
|
|
2497
|
+
reactData._isLoading = true
|
|
2496
2498
|
initColumnSort()
|
|
2497
2499
|
return restoreCustomStorage().then(() => {
|
|
2500
|
+
reactData._isLoading = false
|
|
2498
2501
|
cacheColumnMap()
|
|
2499
2502
|
parseColumns().then(() => {
|
|
2500
2503
|
if (reactData.scrollXLoad) {
|
|
@@ -6751,6 +6754,7 @@ export default defineComponent({
|
|
|
6751
6754
|
const validTipOpts = computeValidTipOpts.value
|
|
6752
6755
|
const loadingOpts = computeLoadingOpts.value
|
|
6753
6756
|
const isMenu = computeIsMenu.value
|
|
6757
|
+
const currLoading = reactData._isLoading || loading
|
|
6754
6758
|
return h('div', {
|
|
6755
6759
|
ref: refElem,
|
|
6756
6760
|
class: ['vxe-table', 'vxe-table--render-default', `tid_${xID}`, `border--${tableBorder}`, {
|
|
@@ -6772,8 +6776,8 @@ export default defineComponent({
|
|
|
6772
6776
|
'is--animat': !!props.animat,
|
|
6773
6777
|
'is--round': props.round,
|
|
6774
6778
|
'is--stripe': !treeConfig && stripe,
|
|
6775
|
-
'is--loading':
|
|
6776
|
-
'is--empty': !
|
|
6779
|
+
'is--loading': currLoading,
|
|
6780
|
+
'is--empty': !currLoading && !tableData.length,
|
|
6777
6781
|
'is--scroll-y': overflowY,
|
|
6778
6782
|
'is--scroll-x': overflowX,
|
|
6779
6783
|
'is--virtual-x': scrollXLoad,
|
|
@@ -6870,7 +6874,7 @@ export default defineComponent({
|
|
|
6870
6874
|
*/
|
|
6871
6875
|
h(resolveComponent('vxe-loading') as VxeLoadingComponent, {
|
|
6872
6876
|
class: 'vxe-table--loading',
|
|
6873
|
-
modelValue:
|
|
6877
|
+
modelValue: currLoading,
|
|
6874
6878
|
icon: loadingOpts.icon,
|
|
6875
6879
|
text: loadingOpts.text
|
|
6876
6880
|
}, loadingSlot
|