vxe-table 3.15.29 → 3.15.31
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/grid/src/grid.js +39 -42
- package/es/style.css +1 -1
- package/es/table/module/edit/mixin.js +11 -27
- package/es/table/module/export/mixin.js +75 -143
- package/es/table/module/menu/mixin.js +2 -6
- package/es/table/module/validator/mixin.js +99 -41
- package/es/table/src/methods.js +12 -36
- package/es/table/src/table.js +6 -8
- package/es/ui/index.js +1 -1
- package/es/ui/src/log.js +1 -1
- package/lib/grid/src/grid.js +24 -26
- package/lib/grid/src/grid.min.js +1 -1
- package/lib/index.umd.js +271 -572
- package/lib/index.umd.min.js +1 -1
- package/lib/style.css +1 -1
- package/lib/table/module/edit/mixin.js +11 -27
- package/lib/table/module/edit/mixin.min.js +1 -1
- package/lib/table/module/export/mixin.js +101 -184
- package/lib/table/module/export/mixin.min.js +1 -1
- package/lib/table/module/menu/mixin.js +2 -6
- package/lib/table/module/menu/mixin.min.js +1 -1
- package/lib/table/module/validator/mixin.js +97 -40
- package/lib/table/module/validator/mixin.min.js +1 -1
- package/lib/table/src/methods.js +12 -36
- package/lib/table/src/methods.min.js +1 -1
- package/lib/table/src/table.js +8 -10
- package/lib/table/src/table.min.js +1 -1
- package/lib/ui/index.js +1 -1
- 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 +1 -1
- package/packages/grid/src/grid.ts +39 -41
- package/packages/table/module/edit/mixin.ts +11 -27
- package/packages/table/module/export/mixin.ts +105 -162
- package/packages/table/module/menu/mixin.ts +2 -6
- package/packages/table/module/validator/mixin.ts +101 -40
- package/packages/table/src/methods.ts +12 -36
- package/packages/table/src/table.ts +6 -8
- /package/es/{iconfont.1747286367921.ttf → iconfont.1747621179042.ttf} +0 -0
- /package/es/{iconfont.1747286367921.woff → iconfont.1747621179042.woff} +0 -0
- /package/es/{iconfont.1747286367921.woff2 → iconfont.1747621179042.woff2} +0 -0
- /package/lib/{iconfont.1747286367921.ttf → iconfont.1747621179042.ttf} +0 -0
- /package/lib/{iconfont.1747286367921.woff → iconfont.1747621179042.woff} +0 -0
- /package/lib/{iconfont.1747286367921.woff2 → iconfont.1747621179042.woff2} +0 -0
package/es/grid/src/grid.js
CHANGED
|
@@ -101,13 +101,11 @@ function getToolbarSlots(_vm) {
|
|
|
101
101
|
let buttonsSlot;
|
|
102
102
|
let toolsSlot;
|
|
103
103
|
const slots = {};
|
|
104
|
-
if (
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
warnLog('vxe.error.reqProp', ['toolbar-config.slots.tools']);
|
|
110
|
-
}
|
|
104
|
+
if ($scopedSlots.buttons && (!toolbarOptSlots || toolbarOptSlots.buttons !== 'buttons')) {
|
|
105
|
+
warnLog('vxe.error.reqProp', ['toolbar-config.slots.buttons']);
|
|
106
|
+
}
|
|
107
|
+
if ($scopedSlots.tools && (!toolbarOptSlots || toolbarOptSlots.tools !== 'tools')) {
|
|
108
|
+
warnLog('vxe.error.reqProp', ['toolbar-config.slots.tools']);
|
|
111
109
|
}
|
|
112
110
|
if (toolbarOptSlots) {
|
|
113
111
|
buttonsSlot = getFuncSlot(_vm, toolbarOptSlots, 'buttons');
|
|
@@ -551,17 +549,15 @@ export default {
|
|
|
551
549
|
// if (proxyConfig && (data || (proxyOpts.form && formOpts.data))) {
|
|
552
550
|
// errLog('vxe.error.errConflicts', ['grid.data', 'grid.proxy-config'])
|
|
553
551
|
// }
|
|
554
|
-
if (
|
|
555
|
-
|
|
556
|
-
|
|
557
|
-
|
|
558
|
-
|
|
559
|
-
warnLog('vxe.error.errProp', [`grid.toolbar-config=${this.toolbarConfig}`, 'grid.toolbar-config={}']);
|
|
560
|
-
}
|
|
561
|
-
// if (proxyOpts.props) {
|
|
562
|
-
// warnLog('vxe.error.delProp', ['proxy-config.props', 'proxy-config.response'])
|
|
563
|
-
// }
|
|
552
|
+
if (this.toolbar) {
|
|
553
|
+
warnLog('vxe.error.delProp', ['grid.toolbar', 'grid.toolbar-config']);
|
|
554
|
+
}
|
|
555
|
+
if (this.toolbarConfig && !XEUtils.isObject(this.toolbarConfig)) {
|
|
556
|
+
warnLog('vxe.error.errProp', [`grid.toolbar-config=${this.toolbarConfig}`, 'grid.toolbar-config={}']);
|
|
564
557
|
}
|
|
558
|
+
// if (proxyOpts.props) {
|
|
559
|
+
// warnLog('vxe.error.delProp', ['proxy-config.props', 'proxy-config.response'])
|
|
560
|
+
// }
|
|
565
561
|
// 使用已安装的组件,如果未安装则不渲染
|
|
566
562
|
const VxeUIFormComponent = VxeUI.getComponent('VxeForm');
|
|
567
563
|
const VxeUIPagerComponent = VxeUI.getComponent('VxePager');
|
|
@@ -608,7 +604,7 @@ export default {
|
|
|
608
604
|
style: styles
|
|
609
605
|
}, renderLayout(h, $xeGrid));
|
|
610
606
|
},
|
|
611
|
-
methods: Object.assign(Object.assign(
|
|
607
|
+
methods: Object.assign(Object.assign({}, methods), { callSlot(slotFunc, params, h, vNodes) {
|
|
612
608
|
const $xeGrid = this;
|
|
613
609
|
const slots = $xeGrid.$scopedSlots;
|
|
614
610
|
if (slotFunc) {
|
|
@@ -1229,8 +1225,9 @@ export default {
|
|
|
1229
1225
|
});
|
|
1230
1226
|
},
|
|
1231
1227
|
getProxyInfo() {
|
|
1232
|
-
const
|
|
1233
|
-
const $xeTable = $refs.xTable;
|
|
1228
|
+
const $xeGrid = this;
|
|
1229
|
+
const $xeTable = $xeGrid.$refs.xTable;
|
|
1230
|
+
const { sortData, proxyConfig } = this;
|
|
1234
1231
|
if (proxyConfig) {
|
|
1235
1232
|
return {
|
|
1236
1233
|
data: $xeTable ? $xeTable.getFullData() : [],
|
|
@@ -1243,27 +1240,27 @@ export default {
|
|
|
1243
1240
|
};
|
|
1244
1241
|
}
|
|
1245
1242
|
return null;
|
|
1246
|
-
}
|
|
1247
|
-
|
|
1248
|
-
|
|
1249
|
-
|
|
1250
|
-
|
|
1251
|
-
|
|
1252
|
-
|
|
1253
|
-
|
|
1254
|
-
|
|
1255
|
-
|
|
1256
|
-
|
|
1243
|
+
},
|
|
1244
|
+
loadColumn(columns) {
|
|
1245
|
+
const $xeGrid = this;
|
|
1246
|
+
const $xeTable = $xeGrid.$refs.xTable;
|
|
1247
|
+
const { $scopedSlots } = this;
|
|
1248
|
+
XEUtils.eachTree(columns, column => {
|
|
1249
|
+
if (column.slots) {
|
|
1250
|
+
XEUtils.each(column.slots, (func) => {
|
|
1251
|
+
if (!XEUtils.isFunction(func)) {
|
|
1252
|
+
if (!$scopedSlots[func]) {
|
|
1253
|
+
errLog('vxe.error.notSlot', [func]);
|
|
1257
1254
|
}
|
|
1258
|
-
}
|
|
1259
|
-
}
|
|
1260
|
-
}
|
|
1261
|
-
|
|
1262
|
-
|
|
1263
|
-
|
|
1264
|
-
|
|
1265
|
-
|
|
1266
|
-
|
|
1267
|
-
|
|
1268
|
-
|
|
1255
|
+
}
|
|
1256
|
+
});
|
|
1257
|
+
}
|
|
1258
|
+
});
|
|
1259
|
+
return $xeTable.loadColumn(columns);
|
|
1260
|
+
},
|
|
1261
|
+
reloadColumn(columns) {
|
|
1262
|
+
const $xeGrid = this;
|
|
1263
|
+
$xeGrid.clearAll();
|
|
1264
|
+
return $xeGrid.loadColumn(columns);
|
|
1265
|
+
} })
|
|
1269
1266
|
};
|