111

src/views/system/tableHead/index.vue

@@ -279,9 +279,29 @@
 			},
 			//重名检测
 			checkName(data) {
-				let checkColumnName = this.tableHeadList.find((item) => item.columnName == data.columnName)
-				let checkUiColumn = this.tableHeadList.find((item) => item.uiColumn == data.uiColumn)
-				let checkApiColum = this.tableHeadList.find((item) => item.apiColum == data.apiColum)
+				if (data.id) {
+				}
+				let checkColumnName = this.tableHeadList.find((item) => {
+					if (data.id) {
+						return item.columnName == data.columnName && item.id != data.id
+					} else {
+						return item.columnName == data.columnName
+					}
+				})
+				let checkUiColumn = this.tableHeadList.find((item) => {
+					if (data.id) {
+						return item.uiColumn == data.uiColumn && item.id != data.id
+					} else {
+						return item.uiColumn == data.uiColumn
+					}
+				})
+				let checkApiColum = this.tableHeadList.find((item) => {
+					if (data.id) {
+						return item.apiColum == data.apiColum && item.id != data.id
+					} else {
+						return item.apiColum == data.apiColum
+					}
+				})
 				if (checkColumnName) {
 					return '列名称重复'
 				}

vue.config.js

@@ -21,7 +21,7 @@ module.exports = {
 		open: true,
 		proxy: {
 			[process.env.VUE_APP_BASE_API]: {
-				target: `http://192.168.0.102:8080`,
+				target: `http://192.168.0.105:8080`,
 				changeOrigin: true,
 				pathRewrite: {
 					['^' + process.env.VUE_APP_BASE_API]: ''