vxe-table 4.17.1 → 4.17.2
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/table/module/custom/hook.js +2 -4
- package/es/table/module/custom/panel.js +3 -0
- package/es/table/module/menu/hook.js +7 -1
- package/es/table/src/cell.js +4 -5
- package/es/table/src/table.js +5 -4
- package/es/ui/index.js +1 -1
- package/es/ui/src/log.js +1 -1
- package/lib/index.umd.js +20 -15
- package/lib/index.umd.min.js +1 -1
- package/lib/style.css +1 -1
- package/lib/table/module/custom/hook.js +2 -4
- package/lib/table/module/custom/hook.min.js +1 -1
- package/lib/table/module/custom/panel.js +3 -0
- package/lib/table/module/custom/panel.min.js +1 -1
- package/lib/table/module/menu/hook.js +7 -1
- package/lib/table/module/menu/hook.min.js +1 -1
- package/lib/table/src/cell.js +5 -7
- package/lib/table/src/cell.min.js +1 -1
- package/lib/table/src/table.js +1 -1
- 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/table/module/custom/hook.ts +2 -4
- package/packages/table/module/custom/panel.ts +3 -0
- package/packages/table/module/menu/hook.ts +8 -1
- package/packages/table/src/cell.ts +4 -5
- package/packages/table/src/table.ts +5 -4
- /package/es/{iconfont.1761181613193.ttf → iconfont.1761269928256.ttf} +0 -0
- /package/es/{iconfont.1761181613193.woff → iconfont.1761269928256.woff} +0 -0
- /package/es/{iconfont.1761181613193.woff2 → iconfont.1761269928256.woff2} +0 -0
- /package/lib/{iconfont.1761181613193.ttf → iconfont.1761269928256.ttf} +0 -0
- /package/lib/{iconfont.1761181613193.woff → iconfont.1761269928256.woff} +0 -0
- /package/lib/{iconfont.1761181613193.woff2 → iconfont.1761269928256.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.17.
|
|
16
|
+
const version = exports.version = "4.17.2";
|
|
17
17
|
_core.VxeUI.version = version;
|
|
18
18
|
_core.VxeUI.tableVersion = version;
|
|
19
19
|
_core.VxeUI.setConfig({
|
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.17.
|
|
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.17.2",iconPrefix=(_core.VxeUI.version=version,_core.VxeUI.tableVersion=version,_core.VxeUI.setConfig({emptyCell:" ",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,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},headerTooltipConfig:{enterable:!0},footerTooltipConfig:{enterable:!0},validConfig:{showMessage:!0,autoClear:!0,autoPos:!0,message:"inline",msgMode:"single",theme:"beautify"},columnConfig:{autoOptions:{isCalcHeader:!0,isCalcBody:!0,isCalcFooter:!0},maxFixedSize:4},cellConfig:{padding:!0},headerCellConfig:{height:"unset"},footerCellConfig:{height:"unset"},menuConfig:{destroyOnClose:!0},customConfig:{allowVisible:!0,allowResizable:!0,allowFixed:!0,allowSort:!0,showFooter:!0,placement:"top-right",storeOptions:{visible:!0,resizable:!0,sort:!0,fixed:!0},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:{destroyOnClose:!0,multiple:!0,showIcon:!0},floatingFilterConfig:{},aggregateConfig:{padding:!0,rowField:"id",parentField:"_X_ROW_PARENT_KEY",childrenField:"_X_ROW_CHILDREN",mapChildrenField:"_X_ROW_CHILD_LIST",indent:20,showIcon:!0,maxGroupSize:4,showAggFuncTitle:!0},treeConfig:{padding:!0,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:{isAll:!0,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:{gt:24,preSize:1,oSize:0},virtualYConfig:{gt:100,preSize:1,oSize:0},scrollbarConfig:{x:{visible:!0},y:{visible:!0}}},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,showLoading:!0,showResponseMsg:!0,showActionMsg:!0,response:{list:null,result:"result",total:"page.total",message:"message"}}},toolbar:{},gantt:{}}),"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_CHECKBOX_DISABLED_UNCHECKED:iconPrefix+"checkbox-unchecked-fill",TABLE_RADIO_CHECKED:iconPrefix+"radio-checked-fill",TABLE_RADIO_UNCHECKED:iconPrefix+"radio-unchecked",TABLE_RADIO_DISABLED_UNCHECKED:iconPrefix+"radio-unchecked-fill",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_AGG_GROUP:iconPrefix+"grouping",TABLE_DRAG_STATUS_AGG_VALUES:iconPrefix+"values",TABLE_DRAG_STATUS_COLUMN:iconPrefix+"swap",TABLE_DRAG_DISABLED:iconPrefix+"no-drop",TABLE_ROW_GROUP_OPEN:iconPrefix+"arrow-right rotate90",TABLE_ROW_GROUP_CLOSE:iconPrefix+"arrow-right",TABLE_AGGREGATE_GROUPING:iconPrefix+"grouping",TABLE_AGGREGATE_VALUES:iconPrefix+"values",TABLE_AGGREGATE_SORT:iconPrefix+"drag-handle",TABLE_AGGREGATE_DELETE:iconPrefix+"close",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.17.
|
|
11
|
+
const version = `table v${"4.17.2"}`;
|
|
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.17.
|
|
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.17.2",warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "vxe-table",
|
|
3
|
-
"version": "4.17.
|
|
3
|
+
"version": "4.17.2",
|
|
4
4
|
"description": "A PC-end table component based on Vxe UI, supporting copy-paste, data pivot table, and high-performance virtual list table solution.",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"update": "npm install --legacy-peer-deps",
|
|
@@ -5,7 +5,7 @@ import { getColumnList } from '../../src/util'
|
|
|
5
5
|
|
|
6
6
|
import type { TableCustomMethods, TableCustomPrivateMethods, VxeColumnPropTypes, VxeTableDefines } from '../../../../types'
|
|
7
7
|
|
|
8
|
-
const tableCustomMethodKeys: (keyof TableCustomMethods)[] = ['openCustom', 'closeCustom', 'toggleCustom', 'saveCustom', 'cancelCustom', 'resetCustom', 'toggleCustomAllCheckbox', 'setCustomAllCheckbox']
|
|
8
|
+
const tableCustomMethodKeys: (keyof TableCustomMethods)[] = ['openCustom', 'closeCustom', 'getCustomVisible', 'toggleCustom', 'saveCustom', 'cancelCustom', 'resetCustom', 'toggleCustomAllCheckbox', 'setCustomAllCheckbox']
|
|
9
9
|
|
|
10
10
|
VxeUI.hooks.add('tableCustomModule', {
|
|
11
11
|
setupTable ($xeTable) {
|
|
@@ -13,7 +13,6 @@ VxeUI.hooks.add('tableCustomModule', {
|
|
|
13
13
|
const { computeCustomOpts, computeRowGroupFields } = $xeTable.getComputeMaps()
|
|
14
14
|
const { refElem } = $xeTable.getRefMaps()
|
|
15
15
|
|
|
16
|
-
const $xeGrid = $xeTable.xeGrid
|
|
17
16
|
const $xeGantt = $xeTable.xeGantt
|
|
18
17
|
|
|
19
18
|
const calcMaxHeight = () => {
|
|
@@ -289,8 +288,7 @@ VxeUI.hooks.add('tableCustomModule', {
|
|
|
289
288
|
}
|
|
290
289
|
|
|
291
290
|
const emitCustomEvent = (type: VxeTableDefines.CustomType, evnt: Event) => {
|
|
292
|
-
|
|
293
|
-
comp.dispatchEvent('custom', { type }, evnt)
|
|
291
|
+
$xeTable.dispatchEvent('custom', { type }, evnt)
|
|
294
292
|
}
|
|
295
293
|
|
|
296
294
|
const customPrivateMethods: TableCustomPrivateMethods = {
|
|
@@ -91,6 +91,7 @@ export default defineVxeComponent({
|
|
|
91
91
|
$xeTable.saveCustom()
|
|
92
92
|
$xeTable.closeCustom()
|
|
93
93
|
$xeTable.emitCustomEvent('confirm', $event)
|
|
94
|
+
$xeTable.emitCustomEvent('close', $event)
|
|
94
95
|
}
|
|
95
96
|
|
|
96
97
|
const cancelCloseEvent: VxeButtonEvents.Click = ({ $event }) => {
|
|
@@ -102,12 +103,14 @@ export default defineVxeComponent({
|
|
|
102
103
|
$xeTable.cancelCustom()
|
|
103
104
|
$xeTable.closeCustom()
|
|
104
105
|
$xeTable.emitCustomEvent('cancel', $event)
|
|
106
|
+
$xeTable.emitCustomEvent('close', $event)
|
|
105
107
|
}
|
|
106
108
|
|
|
107
109
|
const handleResetCustomEvent = (evnt: Event) => {
|
|
108
110
|
$xeTable.resetCustom(true)
|
|
109
111
|
$xeTable.closeCustom()
|
|
110
112
|
$xeTable.emitCustomEvent('reset', evnt)
|
|
113
|
+
$xeTable.emitCustomEvent('close', evnt)
|
|
111
114
|
}
|
|
112
115
|
|
|
113
116
|
const resetCustomEvent: VxeButtonEvents.Click = ({ $event }) => {
|
|
@@ -16,6 +16,10 @@ hooks.add('tableMenuModule', {
|
|
|
16
16
|
const { refElem, refTableFilter, refTableMenu } = $xeTable.getRefMaps()
|
|
17
17
|
const { computeMouseOpts, computeIsContentMenu, computeMenuOpts } = $xeTable.getComputeMaps()
|
|
18
18
|
|
|
19
|
+
const $xeGrid = $xeTable.xeGrid
|
|
20
|
+
const $xeGantt = $xeTable.xeGantt
|
|
21
|
+
const $xeGGWrapper = $xeGrid || $xeGantt
|
|
22
|
+
|
|
19
23
|
let menuMethods = {} as TableMenuMethods
|
|
20
24
|
let menuPrivateMethods = {} as TableMenuPrivateMethods
|
|
21
25
|
|
|
@@ -38,7 +42,10 @@ hooks.add('tableMenuModule', {
|
|
|
38
42
|
if (!visibleMethod || visibleMethod(params)) {
|
|
39
43
|
evnt.preventDefault()
|
|
40
44
|
$xeTable.updateZindex()
|
|
41
|
-
const el = refElem.value
|
|
45
|
+
const el = $xeGGWrapper ? $xeGGWrapper.getRefMaps().refElem.value : refElem.value
|
|
46
|
+
if (!el) {
|
|
47
|
+
return
|
|
48
|
+
}
|
|
42
49
|
const tableRect = el.getBoundingClientRect()
|
|
43
50
|
const { scrollTop, scrollLeft, visibleHeight, visibleWidth } = getDomNode()
|
|
44
51
|
|
|
@@ -412,11 +412,9 @@ export const Cell = {
|
|
|
412
412
|
const tableReactData = $table.reactData
|
|
413
413
|
const tableInternalData = $table.internalData
|
|
414
414
|
const { isRowGroupStatus } = tableReactData
|
|
415
|
-
const { computeEditOpts } = $table.getComputeMaps()
|
|
416
415
|
const { editConfig } = tableProps
|
|
417
|
-
const
|
|
418
|
-
const
|
|
419
|
-
const renderOpts = editConfig && isEnableConf(editOpts) && editRender ? editRender : cellRender
|
|
416
|
+
const { field, slots, editRender, cellRender, rowGroupNode, aggFunc, formatter } = column
|
|
417
|
+
const renderOpts = editConfig && isEnableConf(editRender) ? editRender : (isEnableConf(cellRender) ? cellRender : null)
|
|
420
418
|
const defaultSlot = slots ? slots.default : null
|
|
421
419
|
const gcSlot = slots ? (slots.groupContent || slots['group-content']) : null
|
|
422
420
|
let cellValue: string | number | null = ''
|
|
@@ -476,7 +474,8 @@ export const Cell = {
|
|
|
476
474
|
if (defaultSlot) {
|
|
477
475
|
return renderCellBaseVNs(params, $table.callSlot(defaultSlot, params))
|
|
478
476
|
}
|
|
479
|
-
|
|
477
|
+
// formatter > (renderTableCell | renderTableDefault)
|
|
478
|
+
if (renderOpts && !formatter) {
|
|
480
479
|
const compConf = renderer.get(renderOpts.name)
|
|
481
480
|
if (compConf) {
|
|
482
481
|
const rtCell = compConf.renderTableCell || compConf.renderCell
|
|
@@ -7557,11 +7557,12 @@ export default defineVxeComponent({
|
|
|
7557
7557
|
// 如果点击自定义列容器
|
|
7558
7558
|
} else {
|
|
7559
7559
|
if (!getEventTargetNode(evnt, document.body, 'vxe-table--ignore-clear').flag) {
|
|
7560
|
-
|
|
7561
|
-
|
|
7560
|
+
if (customStore.visible && $xeTable.closeCustom) {
|
|
7561
|
+
tablePrivateMethods.preventEvent(evnt, 'event.clearCustom', {}, () => {
|
|
7562
7562
|
$xeTable.closeCustom()
|
|
7563
|
-
|
|
7564
|
-
|
|
7563
|
+
$xeTable.dispatchEvent('custom', { type: 'close' }, evnt)
|
|
7564
|
+
})
|
|
7565
|
+
}
|
|
7565
7566
|
}
|
|
7566
7567
|
}
|
|
7567
7568
|
}
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|