vxe-table 4.11.15 → 4.12.0-beta.0
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/README.md +4 -3
- package/es/grid/src/grid.js +20 -13
- package/es/style.css +1 -1
- package/es/table/module/edit/hook.js +3 -1
- package/es/table/src/table.js +272 -158
- package/es/ui/index.js +5 -5
- package/es/ui/src/log.js +1 -1
- package/lib/grid/src/grid.js +20 -14
- package/lib/grid/src/grid.min.js +1 -1
- package/lib/index.umd.js +2170 -1954
- package/lib/index.umd.min.js +1 -1
- package/lib/style.css +1 -1
- package/lib/table/module/edit/hook.js +3 -1
- package/lib/table/module/edit/hook.min.js +1 -1
- package/lib/table/src/table.js +282 -160
- package/lib/table/src/table.min.js +1 -1
- package/lib/ui/index.js +5 -5
- 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 +20 -13
- package/packages/table/module/edit/hook.ts +3 -1
- package/packages/table/src/table.ts +279 -161
- package/packages/ui/index.ts +4 -4
- /package/es/{iconfont.1740723830079.ttf → iconfont.1740732137800.ttf} +0 -0
- /package/es/{iconfont.1740723830079.woff → iconfont.1740732137800.woff} +0 -0
- /package/es/{iconfont.1740723830079.woff2 → iconfont.1740732137800.woff2} +0 -0
- /package/lib/{iconfont.1740723830079.ttf → iconfont.1740732137800.ttf} +0 -0
- /package/lib/{iconfont.1740723830079.woff → iconfont.1740732137800.woff} +0 -0
- /package/lib/{iconfont.1740723830079.woff2 → iconfont.1740732137800.woff2} +0 -0
package/lib/ui/index.js
CHANGED
|
@@ -13,7 +13,7 @@ Object.defineProperty(exports, "VxeUI", {
|
|
|
13
13
|
exports.version = exports.validators = exports.use = exports.t = exports.setup = exports.setTheme = exports.setLanguage = exports.setIcon = exports.setI18n = exports.setConfig = exports.saveFile = exports.renderer = exports.readFile = exports.print = exports.modal = exports.menus = exports.log = exports.interceptor = exports.hooks = exports.globalResize = exports.globalEvents = exports.getTheme = exports.getIcon = exports.getI18n = exports.getConfig = exports.formats = exports.default = exports.config = exports.commands = exports.clipboard = exports._t = void 0;
|
|
14
14
|
var _core = require("@vxe-ui/core");
|
|
15
15
|
var _utils = require("./src/utils");
|
|
16
|
-
const version = exports.version = "4.
|
|
16
|
+
const version = exports.version = "4.12.0-beta.0";
|
|
17
17
|
_core.VxeUI.version = version;
|
|
18
18
|
_core.VxeUI.tableVersion = version;
|
|
19
19
|
_core.VxeUI.setConfig({
|
|
@@ -204,14 +204,14 @@ _core.VxeUI.setConfig({
|
|
|
204
204
|
virtualXConfig: {
|
|
205
205
|
enabled: true,
|
|
206
206
|
gt: 60,
|
|
207
|
-
preSize:
|
|
208
|
-
oSize:
|
|
207
|
+
preSize: 1,
|
|
208
|
+
oSize: 2
|
|
209
209
|
},
|
|
210
210
|
virtualYConfig: {
|
|
211
211
|
enabled: true,
|
|
212
212
|
gt: 100,
|
|
213
|
-
preSize:
|
|
214
|
-
oSize:
|
|
213
|
+
preSize: 1,
|
|
214
|
+
oSize: 2
|
|
215
215
|
},
|
|
216
216
|
scrollbarConfig: {
|
|
217
217
|
// width: 0,
|
package/lib/ui/index.min.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
Object.defineProperty(exports,"__esModule",{value:!0}),exports.VXETable=void 0,Object.defineProperty(exports,"VxeUI",{enumerable:!0,get:function(){return _core.VxeUI}}),exports.version=exports.validators=exports.use=exports.t=exports.setup=exports.setTheme=exports.setLanguage=exports.setIcon=exports.setI18n=exports.setConfig=exports.saveFile=exports.renderer=exports.readFile=exports.print=exports.modal=exports.menus=exports.log=exports.interceptor=exports.hooks=exports.globalResize=exports.globalEvents=exports.getTheme=exports.getIcon=exports.getI18n=exports.getConfig=exports.formats=exports.default=exports.config=exports.commands=exports.clipboard=exports._t=void 0;var _core=require("@vxe-ui/core"),_utils=require("./src/utils");let version=exports.version="4.
|
|
1
|
+
Object.defineProperty(exports,"__esModule",{value:!0}),exports.VXETable=void 0,Object.defineProperty(exports,"VxeUI",{enumerable:!0,get:function(){return _core.VxeUI}}),exports.version=exports.validators=exports.use=exports.t=exports.setup=exports.setTheme=exports.setLanguage=exports.setIcon=exports.setI18n=exports.setConfig=exports.saveFile=exports.renderer=exports.readFile=exports.print=exports.modal=exports.menus=exports.log=exports.interceptor=exports.hooks=exports.globalResize=exports.globalEvents=exports.getTheme=exports.getIcon=exports.getI18n=exports.getConfig=exports.formats=exports.default=exports.config=exports.commands=exports.clipboard=exports._t=void 0;var _core=require("@vxe-ui/core"),_utils=require("./src/utils");let version=exports.version="4.12.0-beta.0",iconPrefix=(_core.VxeUI.version=version,_core.VxeUI.tableVersion=version,_core.VxeUI.setConfig({emptyCell:" ",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,minHeight:144,resizeConfig:{},resizableConfig:{dragMode:"auto",showDragTip:!0,isSyncAutoHeight:!0,isSyncAutoWidth:!0,minHeight:18},radioConfig:{strict:!0},rowDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0,showDragTip:!0},columnDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0,showDragTip:!0},checkboxConfig:{strict:!0},tooltipConfig:{enterable:!0},validConfig:{showMessage:!0,autoClear:!0,autoPos:!0,message:"inline",msgMode:"single",theme:"beautify"},columnConfig:{maxFixedSize:4},cellConfig:{padding:!0},headerCellConfig:{height:"unset"},footerCellConfig:{height:"unset"},customConfig:{allowVisible:!0,allowResizable:!0,allowFixed:!0,allowSort:!0,showFooter:!0,placement:"top-right",modalOptions:{showMaximize:!0,mask:!0,lockView:!0,resize:!0,escClosable:!0},drawerOptions:{mask:!0,lockView:!0,escClosable:!0,resize:!0}},sortConfig:{showIcon:!0,allowClear:!0,allowBtn:!0,iconLayout:"vertical"},filterConfig:{showIcon:!0},treeConfig:{rowField:"id",parentField:"parentId",childrenField:"children",hasChildField:"hasChild",mapChildrenField:"_X_ROW_CHILD",indent:20,showIcon:!0},expandConfig:{showIcon:!0,mode:"fixed"},editConfig:{showIcon:!0,showAsterisk:!0,autoFocus:!0},importConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},exportConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},printConfig:{},mouseConfig:{extension:!0},keyboardConfig:{isEsc:!0},areaConfig:{autoClear:!0,selectCellByHeader:!0,selectCellByBody:!0,extendDirection:{top:!0,left:!0,bottom:!0,right:!0}},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},virtualXConfig:{enabled:!0,gt:60,preSize:1,oSize:2},virtualYConfig:{enabled:!0,gt:100,preSize:1,oSize:2},scrollbarConfig:{}},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,showResponseMsg:!0,showActiveMsg:!0,props:{list:null,result:"result",total:"page.total",message:"message"}}},toolbar:{}}),"vxe-table-icon-"),setTheme=(_core.VxeUI.setIcon({TABLE_SORT_ASC:iconPrefix+"caret-up",TABLE_SORT_DESC:iconPrefix+"caret-down",TABLE_FILTER_NONE:iconPrefix+"funnel",TABLE_FILTER_MATCH:iconPrefix+"funnel",TABLE_EDIT:iconPrefix+"edit",TABLE_TITLE_PREFIX:iconPrefix+"question-circle-fill",TABLE_TITLE_SUFFIX:iconPrefix+"question-circle-fill",TABLE_TREE_LOADED:iconPrefix+"spinner roll",TABLE_TREE_OPEN:iconPrefix+"caret-right rotate90",TABLE_TREE_CLOSE:iconPrefix+"caret-right",TABLE_EXPAND_LOADED:iconPrefix+"spinner roll",TABLE_EXPAND_OPEN:iconPrefix+"arrow-right rotate90",TABLE_EXPAND_CLOSE:iconPrefix+"arrow-right",TABLE_CHECKBOX_CHECKED:iconPrefix+"checkbox-checked-fill",TABLE_CHECKBOX_UNCHECKED:iconPrefix+"checkbox-unchecked",TABLE_CHECKBOX_INDETERMINATE:iconPrefix+"checkbox-indeterminate-fill",TABLE_RADIO_CHECKED:iconPrefix+"radio-checked-fill",TABLE_RADIO_UNCHECKED:iconPrefix+"radio-unchecked",TABLE_CUSTOM_SORT:iconPrefix+"drag-handle",TABLE_MENU_OPTIONS:iconPrefix+"arrow-right",TABLE_DRAG_ROW:iconPrefix+"drag-handle",TABLE_DRAG_COLUMN:iconPrefix+"drag-handle",TABLE_DRAG_STATUS_ROW:iconPrefix+"sort",TABLE_DRAG_STATUS_SUB_ROW:iconPrefix+"add-sub",TABLE_DRAG_STATUS_COLUMN:iconPrefix+"swap",TABLE_DRAG_DISABLED:iconPrefix+"no-drop",TOOLBAR_TOOLS_REFRESH:iconPrefix+"repeat",TOOLBAR_TOOLS_REFRESH_LOADING:iconPrefix+"repeat roll",TOOLBAR_TOOLS_IMPORT:iconPrefix+"upload",TOOLBAR_TOOLS_EXPORT:iconPrefix+"download",TOOLBAR_TOOLS_PRINT:iconPrefix+"print",TOOLBAR_TOOLS_FULLSCREEN:iconPrefix+"fullscreen",TOOLBAR_TOOLS_MINIMIZE:iconPrefix+"minimize",TOOLBAR_TOOLS_CUSTOM:iconPrefix+"custom-column",TOOLBAR_TOOLS_FIXED_LEFT:iconPrefix+"fixed-left",TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE:iconPrefix+"fixed-left-fill",TOOLBAR_TOOLS_FIXED_RIGHT:iconPrefix+"fixed-right",TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE:iconPrefix+"fixed-right-fill"}),exports.setTheme=_core.VxeUI.setTheme),getTheme=exports.getTheme=_core.VxeUI.getTheme,setConfig=exports.setConfig=_core.VxeUI.setConfig,getConfig=exports.getConfig=_core.VxeUI.getConfig,setIcon=exports.setIcon=_core.VxeUI.setIcon,getIcon=exports.getIcon=_core.VxeUI.getIcon,setLanguage=exports.setLanguage=_core.VxeUI.setLanguage,setI18n=exports.setI18n=_core.VxeUI.setI18n,getI18n=exports.getI18n=_core.VxeUI.getI18n,globalEvents=exports.globalEvents=_core.VxeUI.globalEvents,globalResize=exports.globalResize=_core.VxeUI.globalResize,renderer=exports.renderer=_core.VxeUI.renderer,validators=exports.validators=_core.VxeUI.validators,menus=exports.menus=_core.VxeUI.menus,formats=exports.formats=_core.VxeUI.formats,commands=exports.commands=_core.VxeUI.commands,interceptor=exports.interceptor=_core.VxeUI.interceptor,clipboard=exports.clipboard=_core.VxeUI.clipboard,log=exports.log=_core.VxeUI.log,hooks=exports.hooks=_core.VxeUI.hooks,use=exports.use=_core.VxeUI.use,setup=e=>_core.VxeUI.setConfig(e),config=(exports.setup=setup,_core.VxeUI.setup=setup,e=>_core.VxeUI.setConfig(e)),t=(exports.config=config,_core.VxeUI.config=config,(e,o)=>_core.VxeUI.getI18n(e,o)),_t=(exports.t=t,_core.VxeUI.t=t,(e,o)=>(0,_utils.getFuncText)(e,o)),VXETable=(exports._t=_t,_core.VxeUI._t=_t,exports.VXETable=_core.VxeUI),saveFile=e=>_core.VxeUI.saveFile(e),readFile=(exports.saveFile=saveFile,e=>_core.VxeUI.readFile(e)),print=(exports.readFile=readFile,e=>_core.VxeUI.print(e)),modal=(exports.print=print,exports.modal={get(e){return _core.VxeUI.modal.get(e)},close(e){return _core.VxeUI.modal.close(e)},open(e){return _core.VxeUI.modal.open(e)},alert(e,o,r){return _core.VxeUI.modal.alert(e,o,r)},confirm(e,o,r){return _core.VxeUI.modal.confirm(e,o,r)},message(e,o){return _core.VxeUI.modal.message(e,o)},notification(e,o,r){return _core.VxeUI.modal.notification(e,o,r)}});var _default=exports.default=_core.VxeUI;
|
package/lib/ui/src/log.js
CHANGED
|
@@ -8,6 +8,6 @@ var _core = require("@vxe-ui/core");
|
|
|
8
8
|
const {
|
|
9
9
|
log
|
|
10
10
|
} = _core.VxeUI;
|
|
11
|
-
const version = `table v${"4.
|
|
11
|
+
const version = `table v${"4.12.0-beta.0"}`;
|
|
12
12
|
const warnLog = exports.warnLog = log.create('warn', version);
|
|
13
13
|
const errLog = exports.errLog = log.create('error', version);
|
package/lib/ui/src/log.min.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");let log=_core.VxeUI.log,version="table v4.
|
|
1
|
+
Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");let log=_core.VxeUI.log,version="table v4.12.0-beta.0",warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);
|
package/package.json
CHANGED
|
@@ -175,29 +175,28 @@ export default defineComponent({
|
|
|
175
175
|
|
|
176
176
|
const computeTableProps = computed(() => {
|
|
177
177
|
const { seqConfig, pagerConfig, loading, editConfig, proxyConfig } = props
|
|
178
|
-
const { isZMax, tableLoading, tablePage
|
|
178
|
+
const { isZMax, tableLoading, tablePage } = reactData
|
|
179
179
|
const tableExtendProps = computeTableExtendProps.value
|
|
180
180
|
const proxyOpts = computeProxyOpts.value
|
|
181
181
|
const pagerOpts = computePagerOpts.value
|
|
182
|
-
const
|
|
182
|
+
const tProps = Object.assign({}, tableExtendProps)
|
|
183
183
|
if (isZMax) {
|
|
184
184
|
if (tableExtendProps.maxHeight) {
|
|
185
|
-
|
|
185
|
+
tProps.maxHeight = '100%'
|
|
186
186
|
} else {
|
|
187
|
-
|
|
187
|
+
tProps.height = '100%'
|
|
188
188
|
}
|
|
189
189
|
}
|
|
190
190
|
if (proxyConfig && isEnableConf(proxyOpts)) {
|
|
191
|
-
|
|
192
|
-
tableProps.data = tableData
|
|
191
|
+
tProps.loading = loading || tableLoading
|
|
193
192
|
if (pagerConfig && proxyOpts.seq && isEnableConf(pagerOpts)) {
|
|
194
|
-
|
|
193
|
+
tProps.seqConfig = Object.assign({}, seqConfig, { startIndex: (tablePage.currentPage - 1) * tablePage.pageSize })
|
|
195
194
|
}
|
|
196
195
|
}
|
|
197
196
|
if (editConfig) {
|
|
198
|
-
|
|
197
|
+
tProps.editConfig = Object.assign({}, editConfig)
|
|
199
198
|
}
|
|
200
|
-
return
|
|
199
|
+
return tProps
|
|
201
200
|
})
|
|
202
201
|
|
|
203
202
|
const computeCurrLayoutConf = computed(() => {
|
|
@@ -967,6 +966,7 @@ export default defineComponent({
|
|
|
967
966
|
reactData.tableLoading = true
|
|
968
967
|
return Promise.resolve((beforeQuery || ajaxMethods)(commitParams, ...args))
|
|
969
968
|
.then(rest => {
|
|
969
|
+
let tableData: any[] = []
|
|
970
970
|
reactData.tableLoading = false
|
|
971
971
|
if (rest) {
|
|
972
972
|
if (pagerConfig && isEnableConf(pagerOpts)) {
|
|
@@ -974,7 +974,7 @@ export default defineComponent({
|
|
|
974
974
|
const total = (XEUtils.isFunction(totalProp) ? totalProp({ data: rest, $grid: $xeGrid }) : XEUtils.get(rest, totalProp || 'page.total')) || 0
|
|
975
975
|
tablePage.total = XEUtils.toNumber(total)
|
|
976
976
|
const resultProp = resConfigs.result
|
|
977
|
-
|
|
977
|
+
tableData = (XEUtils.isFunction(resultProp) ? resultProp({ data: rest, $grid: $xeGrid }) : XEUtils.get(rest, resultProp || 'result')) || []
|
|
978
978
|
// 检验当前页码，不能超出当前最大页数
|
|
979
979
|
const pageCount = Math.max(Math.ceil(total / tablePage.pageSize), 1)
|
|
980
980
|
if (tablePage.currentPage > pageCount) {
|
|
@@ -982,10 +982,17 @@ export default defineComponent({
|
|
|
982
982
|
}
|
|
983
983
|
} else {
|
|
984
984
|
const listProp = resConfigs.list
|
|
985
|
-
|
|
985
|
+
tableData = (listProp ? (XEUtils.isFunction(listProp) ? listProp({ data: rest, $grid: $xeGrid }) : XEUtils.get(rest, listProp)) : rest) || []
|
|
986
986
|
}
|
|
987
|
+
}
|
|
988
|
+
if ($xeTable as any) {
|
|
989
|
+
$xeTable.loadData(tableData)
|
|
987
990
|
} else {
|
|
988
|
-
|
|
991
|
+
nextTick(() => {
|
|
992
|
+
if ($xeTable) {
|
|
993
|
+
$xeTable.loadData(tableData)
|
|
994
|
+
}
|
|
995
|
+
})
|
|
989
996
|
}
|
|
990
997
|
if (afterQuery) {
|
|
991
998
|
afterQuery(commitParams, ...args)
|
|
@@ -1190,7 +1197,7 @@ export default defineComponent({
|
|
|
1190
1197
|
if (props.proxyConfig) {
|
|
1191
1198
|
const { sortData } = reactData
|
|
1192
1199
|
return {
|
|
1193
|
-
data:
|
|
1200
|
+
data: $xeTable ? $xeTable.getFullData() : [],
|
|
1194
1201
|
filter: reactData.filterData,
|
|
1195
1202
|
form: getFormData(),
|
|
1196
1203
|
sort: sortData.length ? sortData[0] : {},
|
|
@@ -779,7 +779,9 @@ hooks.add('tableEditModule', {
|
|
|
779
779
|
let isPos = false
|
|
780
780
|
if (fieldOrColumn) {
|
|
781
781
|
isPos = true
|
|
782
|
-
|
|
782
|
+
if (fieldOrColumn !== true) {
|
|
783
|
+
column = XEUtils.isString(fieldOrColumn) ? $xeTable.getColumnByField(fieldOrColumn) : fieldOrColumn
|
|
784
|
+
}
|
|
783
785
|
}
|
|
784
786
|
return handleEditCell(row, column, isPos)
|
|
785
787
|
},
|