doway-coms 1.7.8 → 1.8.0

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.
Files changed (2) hide show
  1. package/package.json +1 -1
  2. package/packages/BasePulldown/src/index.vue +2 -2
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "doway-coms",
3
- "version": "1.7.8",
3
+ "version": "1.8.0",
4
4
  "description": "doway组件库",
5
5
  "author": "dowaysoft",
6
6
  "main": "packages/index.js",
package/packages/BasePulldown/src/index.vue CHANGED
@@ -900,7 +900,7 @@ export default {
900
900
  })
901
901
  }
902
902
  // 若当前表格内只有一行，则不进行判断
903
- if (vm.propTableData.length == 1) {
903
+ if (vm.propTableData.length == 1 && !this.contrasts.length) {
904
904
  return
905
905
  }
906
906
  // 设置字段sysRepeat后，所定字段的值全部相同则不可选择
@@ -962,7 +962,7 @@ export default {
962
962
  XEUtils.arrayEach(this.propTableData, (item) => {
963
963
  if (item[this.field] === info[this.field]) {
964
964
  XEUtils.arrayEach(this.contrasts, (loop) => {
965
- if (item[loop] === this.row[loop]) {
965
+ if (item[loop] === this.row[loop] && item.id !== this.row.id) {
966
966
  flag++
967
967
  }
968
968
  })