Merge pull request #6706 from easy-mj/bugfix/mj-r-master-9949

fix(3.11/9949): 物理机转宿主机时，磁盘分区挂载点可以有多个/opt/cloud/workspace
yunionio · Jun 17, 2024 · a971b6b · a971b6b
2 parents fa7c1d7 + 1bf9065
commit a971b6b
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/containers/Compute/views/baremetal/dialogs/DiskOptionsUpdate.vue b/containers/Compute/views/baremetal/dialogs/DiskOptionsUpdate.vue
@@ -158,6 +158,10 @@ export default {
     },
     checkMountpoint (rule, value, callback) {
       const pathReg = new RegExp('^(/[^/ ]*)+')
+      const checkName = this.params.nameArr.filter(item => item.name === `${this.prefix}${value}`)
+      if (this.params.title === this.$t('compute.text_317') && checkName.length > 0) {
+        callback(new Error(this.$t('compute.text_337')))
+      }
       if (value) {
         if (!pathReg.test(value)) {
           callback(new Error(this.$t('compute.text_335')))
@@ -166,9 +170,6 @@ export default {
         if (this.params.title === this.$t('compute.text_318') && checkName.length > 1) {
           callback(new Error(this.$t('compute.text_337')))
         }
-        if (this.params.title === this.$t('compute.text_317') && checkName.length > 0) {
-          callback(new Error(this.$t('compute.text_337')))
-        }
       }
       callback()
     },