doway-coms 2.3.4 → 2.3.6

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.3.4",
3
+ "version": "2.3.6",
4
4
  "description": "doway组件库",
5
5
  "author": "dowaysoft",
6
6
  "main": "packages/index.js",
@@ -2338,6 +2338,10 @@ export default {
2338
2338
  editActived(scope) {
2339
2339
  let colElId = scope.column.id
2340
2340
  let rowElId = scope.row._X_ROW_KEY
2341
+ //如果用了rowConfig里的keyField
2342
+ if(this.rowConfig.keyField){
2343
+ rowElId=scope.row[this.rowConfig.keyField]
2344
+ }
2341
2345
  //延迟设置输入框自动获取焦点以及选中
2342
2346
  this.$nextTick(() => {
2343
2347
  let cellEl = scope.$table.$el.querySelector(
@@ -1030,6 +1030,11 @@ export default {
1030
1030
  if(loopItem.sysRepeat===true) return
1031
1031
  //循环弹出查询返回的数据是否已经存在于表格中
1032
1032
  loopItem.sysRepeat = XEUtils.some(vm.propTableData,(loopTableItem)=>{
1033
+ //判断表格行数据是当前输入行就返回false,无需重复验证
1034
+ if(loopTableItem['id']===vm.row['id']){
1035
+ return false
1036
+ }
1037
+
1033
1038
  for(let i=0;i<repeatCols.length;i++){
1034
1039
  let tempRepeatColInfo = repeatCols[i]
1035
1040
  //弹出数据列值
package/packages/index.js CHANGED
@@ -73,7 +73,7 @@ const popupInterceptor = (params) => {
73
73
  while (true) {
74
74
  // console.debug(parentElement)
75
75
  if (
76
- parentElement &&
76
+ parentElement && typeof parentElement.className === 'string' &&
77
77
  (parentElement.className.indexOf('vxe-modal--wrapper') > -1 ||
78
78
  parentElement.className.indexOf('ant-calendar') > -1 ||
79
79
  parentElement.className.indexOf('ant-select-dropdown-menu-item') > -1 ||