Skip to content

Commit

Permalink
【JVxeTable】修复动态更改columns不生效的问题（变量名不能以下划线开头）
Browse files Browse the repository at this point in the history
  • Loading branch information
@zhangdaiscott
zhangdaiscott committed Nov 3, 2022
1 parent 0dbe3f6 commit dc1059e
Showing 1 changed file with 29 additions and 29 deletions.
58 changes: 29 additions & 29 deletions src/components/jeecg/JVxeTable/components/JVxeTable.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,9 @@ export default {
// caseId，表格唯一标识
caseId: `_j-vxe-${randomString(8)}_`,
// 内置columns
_innerColumns: [],
innerColumns: [],
// 内置 EditRules
_innerEditRules: [],
innerEditRules: [],
// 记录滚动条位置
scroll: {top: 0, left: 0},
// 当前是否正在滚动
Expand Down Expand Up @@ -156,14 +156,14 @@ export default {
excludeCode:[],
// 联动下拉选项（用于隔离不同的下拉选项）
// 内部联动配置，map
_innerLinkageConfig: null,
innerLinkageConfig: null,
}
},
computed: {

// vxe 最终 columns
vxeColumns() {
this._innerColumns.forEach(column => {
this.innerColumns.forEach(column => {
let renderOptions = {
caseId: this.caseId,
bordered: this.bordered,
Expand All @@ -184,11 +184,11 @@ export default {
}
}
// 处理联动列，联动列只能作用于 select 组件
if (column.$type === JVXETypes.select && this._innerLinkageConfig != null) {
if (column.$type === JVXETypes.select && this.innerLinkageConfig != null) {
// 判断当前列是否是联动列
if (this._innerLinkageConfig.has(column.key)) {
if (this.innerLinkageConfig.has(column.key)) {
renderOptions.linkage = {
config: this._innerLinkageConfig.get(column.key),
config: this.innerLinkageConfig.get(column.key),
getLinkageOptionsSibling: this.getLinkageOptionsSibling,
getLinkageOptionsAsync: this.getLinkageOptionsAsync,
linkageSelectChange: this.linkageSelectChange,
Expand Down Expand Up @@ -224,11 +224,11 @@ export default {
}
// update--end--autor:lvdandan-----date:20201211------for:JT-118 【online】 日期、时间控件长度较小
})
return this._innerColumns
return this.innerColumns
},
// vxe 最终 editRules
vxeEditRules() {
return Object.assign({}, this.editRules, this._innerEditRules)
return Object.assign({}, this.editRules, this.innerEditRules)
},
// vxe 最终 props
vxeProps() {
Expand Down Expand Up @@ -302,8 +302,8 @@ export default {
this.$set(data, this.dragSortKey, idx + 1)
}
// 处理联动回显数据
if (this._innerLinkageConfig != null) {
for (let configItem of this._innerLinkageConfig.values()) {
if (this.innerLinkageConfig != null) {
for (let configItem of this.innerLinkageConfig.values()) {
this.autoSetLinkageOptionsByData(data, '', configItem, 0)
}
}
Expand Down Expand Up @@ -341,8 +341,8 @@ export default {
handler(columns) {
//获取不需要显示列
this.loadExcludeCode()
let _innerColumns = []
let _innerEditRules = {}
let innerColumns = []
let innerEditRules = {}
let {rowNumber, rowSelection, rowExpand, dragSort} = this
let expandColumn, seqColumn, checkboxColumn, radioColumn, dragSortColumn
if (Array.isArray(columns)) {
Expand Down Expand Up @@ -422,7 +422,7 @@ export default {
rules.push(Object.assign({}, rule, replace))
}
}
_innerEditRules[col.key] = rules
innerEditRules[col.key] = rules
}
// 处理统计列
// sum = 求和、average = 平均值
Expand All @@ -435,7 +435,7 @@ export default {
}
})
}
_innerColumns.push(col)
innerColumns.push(col)
}
})
}
Expand All @@ -445,7 +445,7 @@ export default {
if (seqColumn) {
col = Object.assign(col, seqColumn, {type: 'seq'})
}
_innerColumns.unshift(col)
innerColumns.unshift(col)
}
// 判断是否开启了可选择行
if (rowSelection) {
Expand All @@ -462,7 +462,7 @@ export default {
if (this.rowSelectionType === 'checkbox' && checkboxColumn) {
col = Object.assign(col, checkboxColumn, {type: 'checkbox'})
}
_innerColumns.unshift(col)
innerColumns.unshift(col)
}
// 是否可展开行
if (rowExpand) {
Expand All @@ -474,7 +474,7 @@ export default {
if (expandColumn) {
col = Object.assign(col, expandColumn, {type: 'expand'})
}
_innerColumns.unshift(col)
innerColumns.unshift(col)
}
// 是否可拖动排序
if (dragSort) {
Expand All @@ -486,11 +486,11 @@ export default {
if (dragSortColumn) {
col = Object.assign(col, dragSortColumn, {type: JVXETypes.rowDragSort})
}
_innerColumns.unshift(col)
innerColumns.unshift(col)
}

this._innerColumns = _innerColumns
this._innerEditRules = _innerEditRules
this.innerColumns = innerColumns
this.innerEditRules = innerEditRules
}
},
// watch linkageConfig
Expand All @@ -501,7 +501,7 @@ export default {
if (Array.isArray(this.linkageConfig) && this.linkageConfig.length > 0) {
// 获取联动的key顺序
let getLcKeys = (key, arr) => {
let col = this._innerColumns.find(col => col.key === key)
let col = this.innerColumns.find(col => col.key === key)
if (col) {
arr.push(col.key)
if (col.linkageKey) {
Expand All @@ -520,9 +520,9 @@ export default {
}
keys.forEach(k => configMap.set(k, configItem))
})
this._innerLinkageConfig = configMap
this.innerLinkageConfig = configMap
} else {
this._innerLinkageConfig = null
this.innerLinkageConfig = null
}
}
},
Expand Down Expand Up @@ -734,8 +734,8 @@ export default {
this.$set(data, this.dragSortKey, idx + 1)
}
// 处理联动回显数据
if (this._innerLinkageConfig != null) {
for (let configItem of this._innerLinkageConfig.values()) {
if (this.innerLinkageConfig != null) {
for (let configItem of this.innerLinkageConfig.values()) {
this.autoSetLinkageOptionsByData(data, '', configItem, 0)
}
}
Expand Down Expand Up @@ -1253,10 +1253,10 @@ export default {
record[col.key] = createValue({row: record, column, $table: xTable})
}
// update-begin--author:sunjianlei---date:20210819------for: 处理联动列，联动列只能作用于 select 组件
if (col.$type === JVXETypes.select && this._innerLinkageConfig != null) {
if (col.$type === JVXETypes.select && this.innerLinkageConfig != null) {
// 判断当前列是否是联动列
if (this._innerLinkageConfig.has(col.key)) {
let configItem = this._innerLinkageConfig.get(col.key)
if (this.innerLinkageConfig.has(col.key)) {
let configItem = this.innerLinkageConfig.get(col.key)
this.getLinkageOptionsAsync(configItem, '')
}
}
Expand Down

0 comments on commit dc1059e

Please sign in to comment.