doway-coms 2.11.69 → 2.11.71
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/package.json
CHANGED
|
@@ -3400,7 +3400,7 @@ export default {
|
|
|
3400
3400
|
rowKeyField= this.rowConfig.keyField
|
|
3401
3401
|
}
|
|
3402
3402
|
|
|
3403
|
-
// console.debug('columnIndex',scope
|
|
3403
|
+
// console.debug('columnIndex',scope._columnIndex,scope.columnIndex)
|
|
3404
3404
|
// console.debug(XEUtils.map(this.$refs.baseGrid.getColumns(),p=>p.field))
|
|
3405
3405
|
|
|
3406
3406
|
|
|
@@ -3410,8 +3410,8 @@ export default {
|
|
|
3410
3410
|
if(scope.$event.ctrlKey===true){
|
|
3411
3411
|
//按住了ctrl键后的点击
|
|
3412
3412
|
this.selectedCells.push({
|
|
3413
|
-
columnIndex:scope
|
|
3414
|
-
rowIndex:scope
|
|
3413
|
+
columnIndex:scope._columnIndex,
|
|
3414
|
+
rowIndex:scope._rowIndex
|
|
3415
3415
|
})
|
|
3416
3416
|
|
|
3417
3417
|
}else if(scope.$event.shiftKey===true && this.selectedCells.length>0){
|
|
@@ -3422,8 +3422,8 @@ export default {
|
|
|
3422
3422
|
|
|
3423
3423
|
}else{
|
|
3424
3424
|
this.selectedCells = [{
|
|
3425
|
-
columnIndex:scope
|
|
3426
|
-
rowIndex:scope
|
|
3425
|
+
columnIndex:scope._columnIndex,
|
|
3426
|
+
rowIndex:scope._rowIndex
|
|
3427
3427
|
}]
|
|
3428
3428
|
}
|
|
3429
3429
|
// console.debug('this.selectedCells',this.selectedCells)
|
|
@@ -3505,9 +3505,9 @@ export default {
|
|
|
3505
3505
|
return
|
|
3506
3506
|
}
|
|
3507
3507
|
let startRowIndex = this.selectedCells[0].rowIndex
|
|
3508
|
-
let endRowIndex = scope
|
|
3508
|
+
let endRowIndex = scope._rowIndex
|
|
3509
3509
|
let startColumnIndex = this.selectedCells[0].columnIndex
|
|
3510
|
-
let endColumnIndex = scope
|
|
3510
|
+
let endColumnIndex = scope._columnIndex
|
|
3511
3511
|
//清空除第一个的坐标
|
|
3512
3512
|
this.selectedCells.splice(1)
|
|
3513
3513
|
if(startRowIndex>endRowIndex){
|
|
@@ -3612,7 +3612,7 @@ export default {
|
|
|
3612
3612
|
}
|
|
3613
3613
|
|
|
3614
3614
|
//设置选中列样式
|
|
3615
|
-
let selectedCell = XEUtils.find(this.selectedCells,p=>p.rowIndex===scope
|
|
3615
|
+
let selectedCell = XEUtils.find(this.selectedCells,p=>p.rowIndex===scope._rowIndex && p.columnIndex===scope._columnIndex)
|
|
3616
3616
|
if(selectedCell){
|
|
3617
3617
|
// console.debug('scope',scope.column.property,scope.row.id,this.selectedCells)
|
|
3618
3618
|
customStyle.border = '1px solid #409eff'
|
|
@@ -444,7 +444,7 @@ export function secondDisplayTime(value) {
|
|
|
444
444
|
export function gridDefaultValueDisplay(rowInfo,colInfo){
|
|
445
445
|
|
|
446
446
|
//获取全局配置,数字是否显示小数点补零
|
|
447
|
-
let girdNumberPointZero =
|
|
447
|
+
let girdNumberPointZero = 0
|
|
448
448
|
if(store.getters.baseSetting && store.getters.baseSetting.pointZero){
|
|
449
449
|
girdNumberPointZero = XEUtils.toInteger(store.getters.baseSetting.pointZero)
|
|
450
450
|
}
|