doway-coms 2.10.1 → 2.10.3

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
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "doway-coms",
3
- "version": "2.10.1",
3
+ "version": "2.10.3",
4
4
  "description": "doway组件库",
5
5
  "author": "dowaysoft",
6
6
  "main": "packages/index.js",
@@ -2787,29 +2787,36 @@ export default {
2787
2787
  tempRows.push(tempRow)
2788
2788
  }
2789
2789
 
2790
- // console.debug('davis', (1 && null))
2791
2790
 
2792
- let tempTableData = this.$refs.baseGrid.getTableData().fullData
2793
- for (let i = 0; i < tempTableData.length; i++) {
2794
- let tempRow = tempTableData[i]
2795
- // console.debug('232',this.$refs.baseGrid.isInsertByRow(tempRow))
2796
- //注意,isInsertByRow 返回的不是Boolean的值,官方文档有错误,所以不能用于Boolean判断,返回的是一个对象
2797
- //也可以采用替换方案用getInsertRecords方法获取改变的值
2798
- if (this.$refs.baseGrid.isInsertByRow(tempRow)) {
2799
- tempRow['sysRowState'] = 'add'
2800
- tempRows.push(tempRow)
2801
- }
2802
- //判断子项
2803
- // if(tempRow.children && tempRow.children.length>0){
2804
- // //添加子项数据
2805
- // XEUtils.arrayEach(tempRow.children,loopChild=>{
2806
- // if (this.$refs.baseGrid.isInsertByRow(loopChild) === true){
2807
- // loopChild["sysRowState"] = "add";
2808
- // tempRows.push(loopChild);
2809
- // }
2810
- // })
2811
- // }
2791
+ let tempInsertRows = this.$refs.baseGrid.getInsertRecords()
2792
+ for (let i = 0; i < tempInsertRows.length; i++) {
2793
+ let tempRow = tempInsertRows[i]
2794
+ tempRow['sysRowState'] = 'add'
2795
+ tempRows.push(tempRow)
2812
2796
  }
2797
+ // console.debug('davis', (1 && null))
2798
+
2799
+ // let tempTableData = this.$refs.baseGrid.getTableData().fullData
2800
+ // for (let i = 0; i < tempTableData.length; i++) {
2801
+ // let tempRow = tempTableData[i]
2802
+ // // console.debug('232',this.$refs.baseGrid.isInsertByRow(tempRow))
2803
+ // //注意,isInsertByRow 返回的不是Boolean的值,官方文档有错误,所以不能用于Boolean判断,返回的是一个对象
2804
+ // //也可以采用替换方案用getInsertRecords方法获取改变的值
2805
+ // if (this.$refs.baseGrid.isInsertByRow(tempRow)) {
2806
+ // tempRow['sysRowState'] = 'add'
2807
+ // tempRows.push(tempRow)
2808
+ // }
2809
+ // //判断子项
2810
+ // // if(tempRow.children && tempRow.children.length>0){
2811
+ // // //添加子项数据
2812
+ // // XEUtils.arrayEach(tempRow.children,loopChild=>{
2813
+ // // if (this.$refs.baseGrid.isInsertByRow(loopChild) === true){
2814
+ // // loopChild["sysRowState"] = "add";
2815
+ // // tempRows.push(loopChild);
2816
+ // // }
2817
+ // // })
2818
+ // // }
2819
+ // }
2813
2820
 
2814
2821
  let tempUpdateRows = this.$refs.baseGrid.getUpdateRecords()
2815
2822
  for (let i = 0; i < tempUpdateRows.length; i++) {
@@ -3166,8 +3173,8 @@ export default {
3166
3173
  }
3167
3174
  // 初始标签
3168
3175
  this.tagData = JSON.parse(
3169
- JSON.stringify(this.$refs.baseGrid.getCheckedFilters())
3170
- )
3176
+ JSON.stringify(XEUtils.filter(this.$refs.baseGrid.getCheckedFilters(),p=>p.column.params.sysVisible!==false))
3177
+ )
3171
3178
  this.$refs.baseGrid.closeFilter()
3172
3179
  },
3173
3180
  filterMethod({ options, values, cellValue, row, column }) {
@@ -3331,6 +3338,14 @@ export default {
3331
3338
  // 筛选前关闭所有展开行
3332
3339
  this.closeAllExpand()
3333
3340
  if (visible) {
3341
+ if(column.filters[0].data ==undefined){
3342
+ column.filters[0]={
3343
+ data:{
3344
+ displayValues:[],
3345
+ bindingValues:[]
3346
+ }
3347
+ }
3348
+ }
3334
3349
  //重新赋值过滤的显示值
3335
3350
  column.filters[0].data.displayValues = []
3336
3351
  column.filters[0].data.displayValueSearchText = ''