Merge pull request #3222 from jumpserver/dev

v3.4.0

src/components/FormFields/JSONManyToManySelect/ValueField.vue

@@ -54,9 +54,9 @@ export default {
       this.$emit('input', value)
     },
     setTypeAndValue() {
-      this.loading = false
+      this.loading = true
       this.type = this.getType()
-      this.$log.debug('ValueField: Type: ', this.type, 'Value: ', this.value)
+      this.$log.debug('ValueField: Type: ', this.type, 'Value: ', this.value, 'attr: ', this.attr)
       if (['select', 'array'].includes(this.type) && typeof this.value === 'string') {
         const value = this.value ? this.value.split(',') : []
         this.handleInput(value)

src/utils/org.js

@@ -35,7 +35,10 @@ async function changeOrg(org, reload = true, vm = null) {
   }
   // 替换 Path 中的 UUID
   const idRegex = /\/?([a-fA-F0-9]{8}-(?:[a-fA-F0-9]{4}-){3}[a-fA-F0-9]{12})|(-?\d+(\.\d+)?)\/?/
-  path = path.replace(idRegex, '')
+  const i = path.search(idRegex)
+  if (i !== -1) {
+    path = path.slice(0, i + 1)
+  }
 
   // 替换 Query 中的 UUID
   const newQuery = {}