vxe-table 4.7.68 → 4.7.70
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/components.js +5 -7
- package/es/locale/lang/en-US.js +20 -3
- package/es/locale/lang/es-ES.js +20 -3
- package/es/locale/lang/hu-HU.js +22 -1
- package/es/locale/lang/ja-JP.js +19 -2
- package/es/locale/lang/ko-KR.js +18 -1
- package/es/locale/lang/pt-BR.js +18 -1
- package/es/locale/lang/ru-RU.js +18 -1
- package/es/locale/lang/vi-VN.js +18 -1
- package/es/locale/lang/zh-CN.js +18 -1
- package/es/locale/lang/zh-TC.js +45 -28
- package/es/style.css +1 -1
- package/es/table/render/index.js +4 -5
- package/es/table/src/table.js +27 -37
- package/es/ui/index.js +2 -2
- package/es/ui/src/log.js +1 -1
- package/lib/components.js +5 -7
- package/lib/components.min.js +1 -1
- package/lib/index.umd.js +57 -52
- package/lib/index.umd.min.js +1 -1
- package/lib/locale/lang/en-US.js +20 -3
- package/lib/locale/lang/en-US.min.js +1 -1
- package/lib/locale/lang/en-US.umd.js +20 -3
- package/lib/locale/lang/es-ES.js +20 -3
- package/lib/locale/lang/es-ES.min.js +1 -1
- package/lib/locale/lang/es-ES.umd.js +20 -3
- package/lib/locale/lang/hu-HU.js +22 -1
- package/lib/locale/lang/hu-HU.min.js +1 -1
- package/lib/locale/lang/ja-JP.js +19 -2
- package/lib/locale/lang/ja-JP.min.js +1 -1
- package/lib/locale/lang/ja-JP.umd.js +19 -2
- package/lib/locale/lang/ko-KR.js +18 -1
- package/lib/locale/lang/ko-KR.min.js +1 -1
- package/lib/locale/lang/pt-BR.js +18 -1
- package/lib/locale/lang/pt-BR.min.js +1 -1
- package/lib/locale/lang/pt-BR.umd.js +18 -1
- package/lib/locale/lang/ru-RU.js +18 -1
- package/lib/locale/lang/ru-RU.min.js +1 -1
- package/lib/locale/lang/vi-VN.js +18 -1
- package/lib/locale/lang/vi-VN.min.js +1 -1
- package/lib/locale/lang/zh-CN.js +18 -1
- package/lib/locale/lang/zh-CN.min.js +1 -1
- package/lib/locale/lang/zh-CN.umd.js +18 -1
- package/lib/locale/lang/zh-HK.min.js +1 -1
- package/lib/locale/lang/zh-HK.umd.js +45 -28
- package/lib/locale/lang/zh-MO.min.js +1 -1
- package/lib/locale/lang/zh-MO.umd.js +45 -28
- package/lib/locale/lang/zh-TC.js +45 -28
- package/lib/locale/lang/zh-TC.min.js +1 -1
- package/lib/locale/lang/zh-TC.umd.js +45 -28
- package/lib/locale/lang/zh-TW.min.js +1 -1
- package/lib/locale/lang/zh-TW.umd.js +45 -28
- package/lib/style.css +1 -1
- package/lib/table/render/index.js +4 -4
- package/lib/table/render/index.min.js +1 -1
- package/lib/table/src/table.js +27 -37
- 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/components.ts +5 -7
- package/packages/locale/lang/en-US.ts +20 -3
- package/packages/locale/lang/es-ES.ts +20 -3
- package/packages/locale/lang/hu-HU.ts +22 -1
- package/packages/locale/lang/ja-JP.ts +19 -2
- package/packages/locale/lang/ko-KR.ts +18 -1
- package/packages/locale/lang/pt-BR.ts +18 -1
- package/packages/locale/lang/ru-RU.ts +18 -1
- package/packages/locale/lang/vi-VN.ts +18 -1
- package/packages/locale/lang/zh-CN.ts +18 -1
- package/packages/locale/lang/zh-TC.ts +45 -28
- package/packages/table/render/index.ts +4 -4
- package/packages/table/src/table.ts +27 -37
- /package/es/{iconfont.1724292790389.ttf → iconfont.1724578101191.ttf} +0 -0
- /package/es/{iconfont.1724292790389.woff → iconfont.1724578101191.woff} +0 -0
- /package/es/{iconfont.1724292790389.woff2 → iconfont.1724578101191.woff2} +0 -0
- /package/lib/{iconfont.1724292790389.ttf → iconfont.1724578101191.ttf} +0 -0
- /package/lib/{iconfont.1724292790389.woff → iconfont.1724578101191.woff} +0 -0
- /package/lib/{iconfont.1724292790389.woff2 → iconfont.1724578101191.woff2} +0 -0
package/es/table/src/table.js
CHANGED
|
@@ -1349,7 +1349,7 @@ export default defineComponent({
|
|
|
1349
1349
|
const { filterMethod, filterRender } = column;
|
|
1350
1350
|
const compConf = isEnableConf(filterRender) ? renderer.get(filterRender.name) : null;
|
|
1351
1351
|
const compFilterMethod = compConf ? (compConf.tableFilterMethod || compConf.filterMethod) : null;
|
|
1352
|
-
const tdFilterMethod = compConf ? (compConf.defaultTableFilterMethod || compConf.defaultFilterMethod) : null;
|
|
1352
|
+
const tdFilterMethod = compConf ? (compConf.tableFilterDefaultMethod || compConf.defaultTableFilterMethod || compConf.defaultFilterMethod) : null;
|
|
1353
1353
|
const cellValue = getCellValue(row, column);
|
|
1354
1354
|
if (filterMethod) {
|
|
1355
1355
|
return itemList.some((item) => filterMethod({ value: item.value, option: item, cellValue, row, column, $table: $xeTable }));
|
|
@@ -4922,7 +4922,6 @@ export default defineComponent({
|
|
|
4922
4922
|
const operCtxMenu = isMenu && ctxMenuStore.visible && (isEnter || isSpacebar || operArrow);
|
|
4923
4923
|
const isEditStatus = isEnableConf(editConfig) && actived.column && actived.row;
|
|
4924
4924
|
const beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
|
|
4925
|
-
let params;
|
|
4926
4925
|
if (operCtxMenu) {
|
|
4927
4926
|
// 如果配置了右键菜单; 支持方向键操作、回车
|
|
4928
4927
|
evnt.preventDefault();
|
|
@@ -4986,7 +4985,7 @@ export default defineComponent({
|
|
|
4986
4985
|
if (hasCtrlKey) {
|
|
4987
4986
|
// 如果是激活编辑状态,则取消编辑
|
|
4988
4987
|
if (actived.row) {
|
|
4989
|
-
params = actived.args;
|
|
4988
|
+
const params = actived.args;
|
|
4990
4989
|
$xeTable.clearEdit(evnt);
|
|
4991
4990
|
// 如果配置了选中功能,则为选中状态
|
|
4992
4991
|
if (mouseOpts.selected) {
|
|
@@ -5021,7 +5020,7 @@ export default defineComponent({
|
|
|
5021
5020
|
if (childrens && childrens.length) {
|
|
5022
5021
|
evnt.preventDefault();
|
|
5023
5022
|
const targetRow = childrens[0];
|
|
5024
|
-
params = {
|
|
5023
|
+
const params = {
|
|
5025
5024
|
$table: $xeTable,
|
|
5026
5025
|
row: targetRow,
|
|
5027
5026
|
rowIndex: tableMethods.getRowIndex(targetRow),
|
|
@@ -5059,24 +5058,25 @@ export default defineComponent({
|
|
|
5059
5058
|
// 如果是删除键
|
|
5060
5059
|
if (!isEditStatus) {
|
|
5061
5060
|
const { delMethod } = keyboardOpts;
|
|
5062
|
-
const
|
|
5061
|
+
const params = {
|
|
5063
5062
|
row: selected.row,
|
|
5064
5063
|
rowIndex: tableMethods.getRowIndex(selected.row),
|
|
5065
5064
|
column: selected.column,
|
|
5066
5065
|
columnIndex: tableMethods.getColumnIndex(selected.column),
|
|
5067
|
-
$table: $xeTable
|
|
5066
|
+
$table: $xeTable,
|
|
5067
|
+
$grid: $xeGrid
|
|
5068
5068
|
};
|
|
5069
5069
|
// 是否被禁用
|
|
5070
5070
|
if (!beforeEditMethod || beforeEditMethod(params)) {
|
|
5071
5071
|
if (delMethod) {
|
|
5072
|
-
delMethod(
|
|
5072
|
+
delMethod(params);
|
|
5073
5073
|
}
|
|
5074
5074
|
else {
|
|
5075
5075
|
setCellValue(selected.row, selected.column, null);
|
|
5076
5076
|
}
|
|
5077
5077
|
// 如果按下 del 键,更新表尾数据
|
|
5078
5078
|
tableMethods.updateFooter();
|
|
5079
|
-
$xeTable.dispatchEvent('cell-delete-value',
|
|
5079
|
+
$xeTable.dispatchEvent('cell-delete-value', params, evnt);
|
|
5080
5080
|
}
|
|
5081
5081
|
}
|
|
5082
5082
|
}
|
|
@@ -5085,29 +5085,24 @@ export default defineComponent({
|
|
|
5085
5085
|
const { backMethod } = keyboardOpts;
|
|
5086
5086
|
// 如果是删除键
|
|
5087
5087
|
if (keyboardOpts.isDel && isEnableConf(editConfig) && (selected.row || selected.column)) {
|
|
5088
|
-
const
|
|
5088
|
+
const params = {
|
|
5089
5089
|
row: selected.row,
|
|
5090
5090
|
rowIndex: tableMethods.getRowIndex(selected.row),
|
|
5091
5091
|
column: selected.column,
|
|
5092
5092
|
columnIndex: tableMethods.getColumnIndex(selected.column),
|
|
5093
|
-
$table: $xeTable
|
|
5093
|
+
$table: $xeTable,
|
|
5094
|
+
$grid: $xeGrid
|
|
5094
5095
|
};
|
|
5095
5096
|
// 是否被禁用
|
|
5096
5097
|
if (!beforeEditMethod || beforeEditMethod(params)) {
|
|
5097
5098
|
if (backMethod) {
|
|
5098
|
-
backMethod(
|
|
5099
|
-
row: selected.row,
|
|
5100
|
-
rowIndex: tableMethods.getRowIndex(selected.row),
|
|
5101
|
-
column: selected.column,
|
|
5102
|
-
columnIndex: tableMethods.getColumnIndex(selected.column),
|
|
5103
|
-
$table: $xeTable
|
|
5104
|
-
});
|
|
5099
|
+
backMethod(params);
|
|
5105
5100
|
}
|
|
5106
5101
|
else {
|
|
5107
5102
|
setCellValue(selected.row, selected.column, null);
|
|
5108
5103
|
$xeTable.handleActived(selected.args, evnt);
|
|
5109
5104
|
}
|
|
5110
|
-
$xeTable.dispatchEvent('cell-backspace-value',
|
|
5105
|
+
$xeTable.dispatchEvent('cell-backspace-value', params, evnt);
|
|
5111
5106
|
}
|
|
5112
5107
|
}
|
|
5113
5108
|
}
|
|
@@ -5117,11 +5112,12 @@ export default defineComponent({
|
|
|
5117
5112
|
const { parent: parentRow } = XEUtils.findTree(internalData.afterTreeFullData, item => item === currentRow, { children: childrenField });
|
|
5118
5113
|
if (parentRow) {
|
|
5119
5114
|
evnt.preventDefault();
|
|
5120
|
-
params = {
|
|
5121
|
-
$table: $xeTable,
|
|
5115
|
+
const params = {
|
|
5122
5116
|
row: parentRow,
|
|
5123
5117
|
rowIndex: tableMethods.getRowIndex(parentRow),
|
|
5124
|
-
$rowIndex: tableMethods.getVMRowIndex(parentRow)
|
|
5118
|
+
$rowIndex: tableMethods.getVMRowIndex(parentRow),
|
|
5119
|
+
$table: $xeTable,
|
|
5120
|
+
$grid: $xeGrid
|
|
5125
5121
|
};
|
|
5126
5122
|
tableMethods.setTreeExpand(parentRow, false)
|
|
5127
5123
|
.then(() => tableMethods.scrollToRow(parentRow))
|
|
@@ -5137,16 +5133,17 @@ export default defineComponent({
|
|
|
5137
5133
|
// 如果是按下非功能键之外允许直接编辑
|
|
5138
5134
|
if (selected.column && selected.row && isEnableConf(selected.column.editRender)) {
|
|
5139
5135
|
const beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
|
|
5136
|
+
const params = {
|
|
5137
|
+
row: selected.row,
|
|
5138
|
+
rowIndex: tableMethods.getRowIndex(selected.row),
|
|
5139
|
+
column: selected.column,
|
|
5140
|
+
columnIndex: tableMethods.getColumnIndex(selected.column),
|
|
5141
|
+
$table: $xeTable,
|
|
5142
|
+
$grid: $xeGrid
|
|
5143
|
+
};
|
|
5140
5144
|
if (!beforeEditMethod || beforeEditMethod(Object.assign(Object.assign({}, selected.args), { $table: $xeTable, $grid: $xeGrid }))) {
|
|
5141
5145
|
if (editMethod) {
|
|
5142
|
-
editMethod(
|
|
5143
|
-
row: selected.row,
|
|
5144
|
-
rowIndex: tableMethods.getRowIndex(selected.row),
|
|
5145
|
-
column: selected.column,
|
|
5146
|
-
columnIndex: tableMethods.getColumnIndex(selected.column),
|
|
5147
|
-
$table: $xeTable,
|
|
5148
|
-
$grid: $xeGrid
|
|
5149
|
-
});
|
|
5146
|
+
editMethod(params);
|
|
5150
5147
|
}
|
|
5151
5148
|
else {
|
|
5152
5149
|
setCellValue(selected.row, selected.column, null);
|
|
@@ -5155,14 +5152,7 @@ export default defineComponent({
|
|
|
5155
5152
|
const afterEditMethod = editOpts.afterEditMethod;
|
|
5156
5153
|
if (afterEditMethod) {
|
|
5157
5154
|
nextTick(() => {
|
|
5158
|
-
afterEditMethod(
|
|
5159
|
-
row: selected.row,
|
|
5160
|
-
rowIndex: tableMethods.getRowIndex(selected.row),
|
|
5161
|
-
column: selected.column,
|
|
5162
|
-
columnIndex: tableMethods.getColumnIndex(selected.column),
|
|
5163
|
-
$table: $xeTable,
|
|
5164
|
-
$grid: $xeGrid
|
|
5165
|
-
});
|
|
5155
|
+
afterEditMethod(params);
|
|
5166
5156
|
});
|
|
5167
5157
|
}
|
|
5168
5158
|
}
|
package/es/ui/index.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { VxeUI } from '@vxe-ui/core';
|
|
2
2
|
import { getFuncText } from './src/utils';
|
|
3
|
-
export const version = "4.7.
|
|
3
|
+
export const version = "4.7.70";
|
|
4
4
|
VxeUI.version = version;
|
|
5
|
-
VxeUI.tableVersion = "4.7.
|
|
5
|
+
VxeUI.tableVersion = "4.7.70";
|
|
6
6
|
VxeUI.setConfig({
|
|
7
7
|
emptyCell: ' ',
|
|
8
8
|
table: {
|
package/es/ui/src/log.js
CHANGED
package/lib/components.js
CHANGED
|
@@ -89,13 +89,11 @@ function install(app, options) {
|
|
|
89
89
|
components.forEach(component => component.install(app));
|
|
90
90
|
}
|
|
91
91
|
// 保留兼容老版本
|
|
92
|
+
if (!_core.VxeUI.hasLanguage('zh-CN')) {
|
|
93
|
+
const defaultLanguage = 'zh-CN';
|
|
94
|
+
_core.VxeUI.setI18n(defaultLanguage, _zhCN.default);
|
|
95
|
+
_core.VxeUI.setLanguage(defaultLanguage);
|
|
96
|
+
}
|
|
92
97
|
_core.VxeUI.setTheme('light');
|
|
93
|
-
setTimeout(() => {
|
|
94
|
-
if (!_core.VxeUI.hasLanguage('zh-CN')) {
|
|
95
|
-
const defaultLanguage = 'zh-CN';
|
|
96
|
-
_core.VxeUI.setI18n(defaultLanguage, _zhCN.default);
|
|
97
|
-
_core.VxeUI.setLanguage(defaultLanguage);
|
|
98
|
-
}
|
|
99
|
-
});
|
|
100
98
|
|
|
101
99
|
// Components
|
package/lib/components.min.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={install:!0},_core=(exports.install=install,require("@vxe-ui/core")),_column=require("./column"),_colgroup=(Object.keys(_column).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_column[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _column[e]}})}),require("./colgroup")),_grid=(Object.keys(_colgroup).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_colgroup[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _colgroup[e]}})}),require("./grid")),_table=(Object.keys(_grid).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_grid[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _grid[e]}})}),require("./table")),_toolbar=(Object.keys(_table).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_table[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _table[e]}})}),require("./toolbar")),_zhCN=(Object.keys(_toolbar).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_toolbar[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _toolbar[e]}})}),_interopRequireDefault(require("./locale/lang/zh-CN"))),_ui=require("./ui");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}Object.keys(_ui).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_ui[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _ui[e]}})});const components=[_column.VxeColumn,_colgroup.VxeColgroup,_grid.VxeGrid,_table.VxeTable,_toolbar.VxeToolbar];function install(t,e){_core.VxeUI.setConfig(e),components.forEach(e=>e.install(t))}_core.VxeUI.
|
|
1
|
+
"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={install:!0},_core=(exports.install=install,require("@vxe-ui/core")),_column=require("./column"),_colgroup=(Object.keys(_column).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_column[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _column[e]}})}),require("./colgroup")),_grid=(Object.keys(_colgroup).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_colgroup[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _colgroup[e]}})}),require("./grid")),_table=(Object.keys(_grid).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_grid[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _grid[e]}})}),require("./table")),_toolbar=(Object.keys(_table).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_table[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _table[e]}})}),require("./toolbar")),_zhCN=(Object.keys(_toolbar).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_toolbar[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _toolbar[e]}})}),_interopRequireDefault(require("./locale/lang/zh-CN"))),_ui=require("./ui");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}Object.keys(_ui).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_ui[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _ui[e]}})});const components=[_column.VxeColumn,_colgroup.VxeColgroup,_grid.VxeGrid,_table.VxeTable,_toolbar.VxeToolbar];function install(t,e){_core.VxeUI.setConfig(e),components.forEach(e=>e.install(t))}if(!_core.VxeUI.hasLanguage("zh-CN")){const k="zh-CN";_core.VxeUI.setI18n(k,_zhCN.default),_core.VxeUI.setLanguage(k)}_core.VxeUI.setTheme("light");
|
package/lib/index.umd.js
CHANGED
|
@@ -1951,9 +1951,9 @@ function eqEmptyValue(cellValue) {
|
|
|
1951
1951
|
;// CONCATENATED MODULE: ./packages/ui/index.ts
|
|
1952
1952
|
|
|
1953
1953
|
|
|
1954
|
-
const version = "4.7.
|
|
1954
|
+
const version = "4.7.70";
|
|
1955
1955
|
core_.VxeUI.version = version;
|
|
1956
|
-
core_.VxeUI.tableVersion = "4.7.
|
|
1956
|
+
core_.VxeUI.tableVersion = "4.7.70";
|
|
1957
1957
|
core_.VxeUI.setConfig({
|
|
1958
1958
|
emptyCell: ' ',
|
|
1959
1959
|
table: {
|
|
@@ -2334,7 +2334,7 @@ var es_array_push = __webpack_require__(4114);
|
|
|
2334
2334
|
const {
|
|
2335
2335
|
log: log_log
|
|
2336
2336
|
} = core_.VxeUI;
|
|
2337
|
-
const log_version = `table v${"4.7.
|
|
2337
|
+
const log_version = `table v${"4.7.70"}`;
|
|
2338
2338
|
const warnLog = log_log.create('warn', log_version);
|
|
2339
2339
|
const errLog = log_log.create('error', log_version);
|
|
2340
2340
|
;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
|
|
@@ -9757,7 +9757,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
|
|
|
9757
9757
|
} = column;
|
|
9758
9758
|
const compConf = isEnableConf(filterRender) ? table_renderer.get(filterRender.name) : null;
|
|
9759
9759
|
const compFilterMethod = compConf ? compConf.tableFilterMethod || compConf.filterMethod : null;
|
|
9760
|
-
const tdFilterMethod = compConf ? compConf.defaultTableFilterMethod || compConf.defaultFilterMethod : null;
|
|
9760
|
+
const tdFilterMethod = compConf ? compConf.tableFilterDefaultMethod || compConf.defaultTableFilterMethod || compConf.defaultFilterMethod : null;
|
|
9761
9761
|
const cellValue = getCellValue(row, column);
|
|
9762
9762
|
if (filterMethod) {
|
|
9763
9763
|
return itemList.some(item => filterMethod({
|
|
@@ -13938,7 +13938,6 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
|
|
|
13938
13938
|
const operCtxMenu = isMenu && ctxMenuStore.visible && (isEnter || isSpacebar || operArrow);
|
|
13939
13939
|
const isEditStatus = isEnableConf(editConfig) && actived.column && actived.row;
|
|
13940
13940
|
const beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
|
|
13941
|
-
let params;
|
|
13942
13941
|
if (operCtxMenu) {
|
|
13943
13942
|
// 如果配置了右键菜单; 支持方向键操作、回车
|
|
13944
13943
|
evnt.preventDefault();
|
|
@@ -13994,7 +13993,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
|
|
|
13994
13993
|
if (hasCtrlKey) {
|
|
13995
13994
|
// 如果是激活编辑状态,则取消编辑
|
|
13996
13995
|
if (actived.row) {
|
|
13997
|
-
params = actived.args;
|
|
13996
|
+
const params = actived.args;
|
|
13998
13997
|
$xeTable.clearEdit(evnt);
|
|
13999
13998
|
// 如果配置了选中功能,则为选中状态
|
|
14000
13999
|
if (mouseOpts.selected) {
|
|
@@ -14024,7 +14023,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
|
|
|
14024
14023
|
if (childrens && childrens.length) {
|
|
14025
14024
|
evnt.preventDefault();
|
|
14026
14025
|
const targetRow = childrens[0];
|
|
14027
|
-
params = {
|
|
14026
|
+
const params = {
|
|
14028
14027
|
$table: $xeTable,
|
|
14029
14028
|
row: targetRow,
|
|
14030
14029
|
rowIndex: tableMethods.getRowIndex(targetRow),
|
|
@@ -14057,23 +14056,24 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
|
|
|
14057
14056
|
const {
|
|
14058
14057
|
delMethod
|
|
14059
14058
|
} = keyboardOpts;
|
|
14060
|
-
const
|
|
14059
|
+
const params = {
|
|
14061
14060
|
row: selected.row,
|
|
14062
14061
|
rowIndex: tableMethods.getRowIndex(selected.row),
|
|
14063
14062
|
column: selected.column,
|
|
14064
14063
|
columnIndex: tableMethods.getColumnIndex(selected.column),
|
|
14065
|
-
$table: $xeTable
|
|
14064
|
+
$table: $xeTable,
|
|
14065
|
+
$grid: $xeGrid
|
|
14066
14066
|
};
|
|
14067
14067
|
// 是否被禁用
|
|
14068
14068
|
if (!beforeEditMethod || beforeEditMethod(params)) {
|
|
14069
14069
|
if (delMethod) {
|
|
14070
|
-
delMethod(
|
|
14070
|
+
delMethod(params);
|
|
14071
14071
|
} else {
|
|
14072
14072
|
setCellValue(selected.row, selected.column, null);
|
|
14073
14073
|
}
|
|
14074
14074
|
// 如果按下 del 键,更新表尾数据
|
|
14075
14075
|
tableMethods.updateFooter();
|
|
14076
|
-
$xeTable.dispatchEvent('cell-delete-value',
|
|
14076
|
+
$xeTable.dispatchEvent('cell-delete-value', params, evnt);
|
|
14077
14077
|
}
|
|
14078
14078
|
}
|
|
14079
14079
|
} else if (hasBackspaceKey && keyboardConfig && keyboardOpts.isBack && isEnableConf(editConfig) && (selected.row || selected.column)) {
|
|
@@ -14083,28 +14083,23 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
|
|
|
14083
14083
|
} = keyboardOpts;
|
|
14084
14084
|
// 如果是删除键
|
|
14085
14085
|
if (keyboardOpts.isDel && isEnableConf(editConfig) && (selected.row || selected.column)) {
|
|
14086
|
-
const
|
|
14086
|
+
const params = {
|
|
14087
14087
|
row: selected.row,
|
|
14088
14088
|
rowIndex: tableMethods.getRowIndex(selected.row),
|
|
14089
14089
|
column: selected.column,
|
|
14090
14090
|
columnIndex: tableMethods.getColumnIndex(selected.column),
|
|
14091
|
-
$table: $xeTable
|
|
14091
|
+
$table: $xeTable,
|
|
14092
|
+
$grid: $xeGrid
|
|
14092
14093
|
};
|
|
14093
14094
|
// 是否被禁用
|
|
14094
14095
|
if (!beforeEditMethod || beforeEditMethod(params)) {
|
|
14095
14096
|
if (backMethod) {
|
|
14096
|
-
backMethod(
|
|
14097
|
-
row: selected.row,
|
|
14098
|
-
rowIndex: tableMethods.getRowIndex(selected.row),
|
|
14099
|
-
column: selected.column,
|
|
14100
|
-
columnIndex: tableMethods.getColumnIndex(selected.column),
|
|
14101
|
-
$table: $xeTable
|
|
14102
|
-
});
|
|
14097
|
+
backMethod(params);
|
|
14103
14098
|
} else {
|
|
14104
14099
|
setCellValue(selected.row, selected.column, null);
|
|
14105
14100
|
$xeTable.handleActived(selected.args, evnt);
|
|
14106
14101
|
}
|
|
14107
|
-
$xeTable.dispatchEvent('cell-backspace-value',
|
|
14102
|
+
$xeTable.dispatchEvent('cell-backspace-value', params, evnt);
|
|
14108
14103
|
}
|
|
14109
14104
|
}
|
|
14110
14105
|
}
|
|
@@ -14117,11 +14112,12 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
|
|
|
14117
14112
|
});
|
|
14118
14113
|
if (parentRow) {
|
|
14119
14114
|
evnt.preventDefault();
|
|
14120
|
-
params = {
|
|
14121
|
-
$table: $xeTable,
|
|
14115
|
+
const params = {
|
|
14122
14116
|
row: parentRow,
|
|
14123
14117
|
rowIndex: tableMethods.getRowIndex(parentRow),
|
|
14124
|
-
$rowIndex: tableMethods.getVMRowIndex(parentRow)
|
|
14118
|
+
$rowIndex: tableMethods.getVMRowIndex(parentRow),
|
|
14119
|
+
$table: $xeTable,
|
|
14120
|
+
$grid: $xeGrid
|
|
14125
14121
|
};
|
|
14126
14122
|
tableMethods.setTreeExpand(parentRow, false).then(() => tableMethods.scrollToRow(parentRow)).then(() => tablePrivateMethods.triggerCurrentRowEvent(evnt, params));
|
|
14127
14123
|
}
|
|
@@ -14136,20 +14132,21 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
|
|
|
14136
14132
|
// 如果是按下非功能键之外允许直接编辑
|
|
14137
14133
|
if (selected.column && selected.row && isEnableConf(selected.column.editRender)) {
|
|
14138
14134
|
const beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
|
|
14135
|
+
const params = {
|
|
14136
|
+
row: selected.row,
|
|
14137
|
+
rowIndex: tableMethods.getRowIndex(selected.row),
|
|
14138
|
+
column: selected.column,
|
|
14139
|
+
columnIndex: tableMethods.getColumnIndex(selected.column),
|
|
14140
|
+
$table: $xeTable,
|
|
14141
|
+
$grid: $xeGrid
|
|
14142
|
+
};
|
|
14139
14143
|
if (!beforeEditMethod || beforeEditMethod({
|
|
14140
14144
|
...selected.args,
|
|
14141
14145
|
$table: $xeTable,
|
|
14142
14146
|
$grid: $xeGrid
|
|
14143
14147
|
})) {
|
|
14144
14148
|
if (editMethod) {
|
|
14145
|
-
editMethod(
|
|
14146
|
-
row: selected.row,
|
|
14147
|
-
rowIndex: tableMethods.getRowIndex(selected.row),
|
|
14148
|
-
column: selected.column,
|
|
14149
|
-
columnIndex: tableMethods.getColumnIndex(selected.column),
|
|
14150
|
-
$table: $xeTable,
|
|
14151
|
-
$grid: $xeGrid
|
|
14152
|
-
});
|
|
14149
|
+
editMethod(params);
|
|
14153
14150
|
} else {
|
|
14154
14151
|
setCellValue(selected.row, selected.column, null);
|
|
14155
14152
|
$xeTable.handleActived(selected.args, evnt);
|
|
@@ -14157,14 +14154,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
|
|
|
14157
14154
|
const afterEditMethod = editOpts.afterEditMethod;
|
|
14158
14155
|
if (afterEditMethod) {
|
|
14159
14156
|
(0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
|
|
14160
|
-
afterEditMethod(
|
|
14161
|
-
row: selected.row,
|
|
14162
|
-
rowIndex: tableMethods.getRowIndex(selected.row),
|
|
14163
|
-
column: selected.column,
|
|
14164
|
-
columnIndex: tableMethods.getColumnIndex(selected.column),
|
|
14165
|
-
$table: $xeTable,
|
|
14166
|
-
$grid: $xeGrid
|
|
14167
|
-
});
|
|
14157
|
+
afterEditMethod(params);
|
|
14168
14158
|
});
|
|
14169
14159
|
}
|
|
14170
14160
|
}
|
|
@@ -21253,6 +21243,7 @@ function getChangeEvent(renderOpts) {
|
|
|
21253
21243
|
case 'input':
|
|
21254
21244
|
case 'textarea':
|
|
21255
21245
|
case 'VxeInput':
|
|
21246
|
+
case 'VxeNumberInput':
|
|
21256
21247
|
case 'VxeTextarea':
|
|
21257
21248
|
case '$input':
|
|
21258
21249
|
case '$textarea':
|
|
@@ -21456,15 +21447,14 @@ function getEditOns(renderOpts, params) {
|
|
|
21456
21447
|
const isImmediate = isImmediateCell(renderOpts, params);
|
|
21457
21448
|
return getComponentOns(renderOpts, params, cellValue => {
|
|
21458
21449
|
// 处理 model 值双向绑定
|
|
21450
|
+
model.update = true;
|
|
21451
|
+
model.value = cellValue;
|
|
21459
21452
|
if (isImmediate) {
|
|
21460
21453
|
setCellValue(row, column, cellValue);
|
|
21461
|
-
} else {
|
|
21462
|
-
model.update = true;
|
|
21463
|
-
model.value = cellValue;
|
|
21464
21454
|
}
|
|
21465
21455
|
}, eventParams => {
|
|
21466
21456
|
// 处理 change 事件相关逻辑
|
|
21467
|
-
if (!isImmediate && ['VxeInput', 'VxeTextarea', '$input', '$textarea'].includes(name)) {
|
|
21457
|
+
if (!isImmediate && ['VxeInput', 'VxeNumberInput', 'VxeTextarea', '$input', '$textarea'].includes(name)) {
|
|
21468
21458
|
const cellValue = eventParams.value;
|
|
21469
21459
|
model.update = true;
|
|
21470
21460
|
model.value = cellValue;
|
|
@@ -24336,6 +24326,7 @@ const Grid = VxeGrid;
|
|
|
24336
24326
|
text: '加载中...'
|
|
24337
24327
|
},
|
|
24338
24328
|
error: {
|
|
24329
|
+
downErr: '下载失败',
|
|
24339
24330
|
groupFixed: '如果使用分组表头,冻结列必须按组设置',
|
|
24340
24331
|
groupMouseRange: '分组表头与 "{0}" 不能同时使用,这可能会出现错误',
|
|
24341
24332
|
groupTag: '分组列头应该使用 "{0}" 而不是 "{1}",这可能会出现错误',
|
|
@@ -24361,6 +24352,7 @@ const Grid = VxeGrid;
|
|
|
24361
24352
|
notProp: '不支持的参数 "{0}"',
|
|
24362
24353
|
checkProp: '当数据量过大时可能会导致复选框卡顿,建议设置参数 "{0}" 提升渲染速度',
|
|
24363
24354
|
coverProp: '"{0}" 的参数 "{1}" 重复定义,这可能会出现错误',
|
|
24355
|
+
uniField: '字段名 "{0}" 重复定义,这可能会出现错误',
|
|
24364
24356
|
delFunc: '方法 "{0}" 已废弃,请使用 "{1}"',
|
|
24365
24357
|
delProp: '参数 "{0}" 已废弃,请使用 "{1}"',
|
|
24366
24358
|
delEvent: '事件 "{0}" 已废弃,请使用 "{1}"',
|
|
@@ -24410,6 +24402,7 @@ const Grid = VxeGrid;
|
|
|
24410
24402
|
},
|
|
24411
24403
|
pager: {
|
|
24412
24404
|
goto: '前往',
|
|
24405
|
+
gotoTitle: '页数',
|
|
24413
24406
|
pagesize: '{0}条/页',
|
|
24414
24407
|
total: '共 {0} 条记录',
|
|
24415
24408
|
pageClassifier: '页',
|
|
@@ -24641,6 +24634,10 @@ const Grid = VxeGrid;
|
|
|
24641
24634
|
defFormTitle: '未命名的表单',
|
|
24642
24635
|
widgetPropTab: '控件属性',
|
|
24643
24636
|
widgetFormTab: '表单属性',
|
|
24637
|
+
error: {
|
|
24638
|
+
wdFormUni: '该类型的控件在表单中只允许添加一个',
|
|
24639
|
+
wdSubUni: '该类型的控件在子表中只允许添加一个'
|
|
24640
|
+
},
|
|
24644
24641
|
styleSetting: {
|
|
24645
24642
|
btn: '样式设置',
|
|
24646
24643
|
title: '表单的样式设置',
|
|
@@ -24666,6 +24663,8 @@ const Grid = VxeGrid;
|
|
|
24666
24663
|
base: '基础控件',
|
|
24667
24664
|
layout: '布局控件',
|
|
24668
24665
|
system: '系统控件',
|
|
24666
|
+
module: '模块控件',
|
|
24667
|
+
chart: '图表控件',
|
|
24669
24668
|
advanced: '高级控件'
|
|
24670
24669
|
},
|
|
24671
24670
|
copyTitle: '副本_{0}',
|
|
@@ -24749,10 +24748,18 @@ const Grid = VxeGrid;
|
|
|
24749
24748
|
},
|
|
24750
24749
|
listDesign: {
|
|
24751
24750
|
fieldSettingTab: '字段设置',
|
|
24752
|
-
listSettingTab: '
|
|
24751
|
+
listSettingTab: '参数设置',
|
|
24752
|
+
searchTitle: '查询条件',
|
|
24753
|
+
listTitle: '列表字段',
|
|
24754
|
+
searchField: '查询字段',
|
|
24755
|
+
listField: '列表字段',
|
|
24753
24756
|
activeBtn: {
|
|
24754
24757
|
ActionButtonUpdate: '编辑',
|
|
24755
24758
|
ActionButtonDelete: '删除'
|
|
24759
|
+
},
|
|
24760
|
+
search: {
|
|
24761
|
+
addBtn: '编辑',
|
|
24762
|
+
emptyText: '未配置查询条件'
|
|
24756
24763
|
}
|
|
24757
24764
|
},
|
|
24758
24765
|
text: {
|
|
@@ -24973,14 +24980,12 @@ function install(app, options) {
|
|
|
24973
24980
|
components.forEach(component => component.install(app));
|
|
24974
24981
|
}
|
|
24975
24982
|
// 保留兼容老版本
|
|
24983
|
+
if (!core_.VxeUI.hasLanguage('zh-CN')) {
|
|
24984
|
+
const defaultLanguage = 'zh-CN';
|
|
24985
|
+
core_.VxeUI.setI18n(defaultLanguage, zh_CN);
|
|
24986
|
+
core_.VxeUI.setLanguage(defaultLanguage);
|
|
24987
|
+
}
|
|
24976
24988
|
core_.VxeUI.setTheme('light');
|
|
24977
|
-
setTimeout(() => {
|
|
24978
|
-
if (!core_.VxeUI.hasLanguage('zh-CN')) {
|
|
24979
|
-
const defaultLanguage = 'zh-CN';
|
|
24980
|
-
core_.VxeUI.setI18n(defaultLanguage, zh_CN);
|
|
24981
|
-
core_.VxeUI.setLanguage(defaultLanguage);
|
|
24982
|
-
}
|
|
24983
|
-
});
|
|
24984
24989
|
|
|
24985
24990
|
// Components
|
|
24986
24991
|
|