vxe-table 3.13.0-beta.5 → 3.13.0-beta.7
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/locale/lang/id-ID.js +695 -0
- package/es/style.css +1 -1
- package/es/table/src/methods.js +10 -11
- package/es/table/src/table.js +7 -3
- package/es/ui/index.js +1 -1
- package/es/ui/src/log.js +1 -1
- package/lib/index.umd.js +27 -16
- package/lib/index.umd.min.js +1 -1
- package/lib/locale/lang/id-ID.js +701 -0
- package/lib/locale/lang/id-ID.min.js +1 -0
- package/lib/style.css +1 -1
- package/lib/table/src/methods.js +14 -11
- package/lib/table/src/methods.min.js +1 -1
- package/lib/table/src/table.js +11 -3
- 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 +2 -2
- package/packages/locale/lang/id-ID.ts +695 -0
- package/packages/table/src/methods.ts +12 -11
- package/packages/table/src/table.ts +8 -3
- /package/es/{iconfont.1739613256361.ttf → iconfont.1739756501176.ttf} +0 -0
- /package/es/{iconfont.1739613256361.woff → iconfont.1739756501176.woff} +0 -0
- /package/es/{iconfont.1739613256361.woff2 → iconfont.1739756501176.woff2} +0 -0
- /package/lib/{iconfont.1739613256361.ttf → iconfont.1739756501176.ttf} +0 -0
- /package/lib/{iconfont.1739613256361.woff → iconfont.1739756501176.woff} +0 -0
- /package/lib/{iconfont.1739613256361.woff2 → iconfont.1739756501176.woff2} +0 -0
package/lib/table/src/methods.js
CHANGED
|
@@ -220,7 +220,8 @@ function cacheColumnMap($xeTable) {
|
|
|
220
220
|
} = internalData;
|
|
221
221
|
const fullColumnIdData = internalData.fullColumnIdData = {};
|
|
222
222
|
const fullColumnFieldData = internalData.fullColumnFieldData = {};
|
|
223
|
-
|
|
223
|
+
const mouseOpts = $xeTable.computeMouseOpts;
|
|
224
|
+
const expandOpts = $xeTable.computeExpandOpts;
|
|
224
225
|
const columnOpts = $xeTable.computeColumnOpts;
|
|
225
226
|
const columnDragOpts = $xeTable.computeColumnDragOpts;
|
|
226
227
|
const {
|
|
@@ -326,11 +327,9 @@ function cacheColumnMap($xeTable) {
|
|
|
326
327
|
} else {
|
|
327
328
|
tableFullColumn.forEach(handleFunc);
|
|
328
329
|
}
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
// }
|
|
333
|
-
// }
|
|
330
|
+
if (expandColumn && expandOpts.mode !== 'fixed' && mouseOpts.area) {
|
|
331
|
+
(0, _log.errLog)('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand']);
|
|
332
|
+
}
|
|
334
333
|
if (process.env.NODE_ENV === 'developmeznt') {
|
|
335
334
|
if (htmlColumn) {
|
|
336
335
|
if (!columnOpts.useKey) {
|
|
@@ -1910,6 +1909,7 @@ function handleColumn($xeTable, collectColumn) {
|
|
|
1910
1909
|
const $xeToolbar = $xeTable.$refs.$xeToolbar;
|
|
1911
1910
|
const reactData = $xeTable;
|
|
1912
1911
|
const internalData = $xeTable;
|
|
1912
|
+
const expandOpts = $xeTable.computeExpandOpts;
|
|
1913
1913
|
internalData.collectColumn = collectColumn;
|
|
1914
1914
|
const tableFullColumn = getColumnList(collectColumn);
|
|
1915
1915
|
internalData.tableFullColumn = tableFullColumn;
|
|
@@ -1917,6 +1917,11 @@ function handleColumn($xeTable, collectColumn) {
|
|
|
1917
1917
|
reactData.isDragColMove = false;
|
|
1918
1918
|
initColumnSort($xeTable);
|
|
1919
1919
|
return Promise.resolve(restoreCustomStorage($xeTable)).then(() => {
|
|
1920
|
+
const {
|
|
1921
|
+
scrollXLoad,
|
|
1922
|
+
scrollYLoad,
|
|
1923
|
+
expandColumn
|
|
1924
|
+
} = reactData;
|
|
1920
1925
|
cacheColumnMap($xeTable);
|
|
1921
1926
|
parseColumns($xeTable, true).then(() => {
|
|
1922
1927
|
if (reactData.scrollXLoad) {
|
|
@@ -1926,11 +1931,9 @@ function handleColumn($xeTable, collectColumn) {
|
|
|
1926
1931
|
$xeTable.clearMergeCells();
|
|
1927
1932
|
$xeTable.clearMergeFooterItems();
|
|
1928
1933
|
$xeTable.handleTableData(true);
|
|
1929
|
-
|
|
1930
|
-
|
|
1931
|
-
|
|
1932
|
-
// }
|
|
1933
|
-
// }
|
|
1934
|
+
if ((scrollXLoad || scrollYLoad) && expandColumn && expandOpts.mode !== 'fixed') {
|
|
1935
|
+
(0, _log.warnLog)('vxe.error.scrollErrProp', ['column.type=expand']);
|
|
1936
|
+
}
|
|
1934
1937
|
return $xeTable.$nextTick().then(() => {
|
|
1935
1938
|
if ($xeToolbar) {
|
|
1936
1939
|
$xeToolbar.syncUpdate({
|