fix: shows missing macro parameters (fluidd-core#566)

Signed-off-by: Pedro Lamas <[email protected]>
Co-authored-by: Mathis Mensing <[email protected]>

src/components/ui/AppMacroBtn.vue

@@ -129,19 +129,15 @@ export default class AppMacroBtn extends Mixins(StateMixin) {
   mounted () {
     if (!this.macro.config || !this.macro.config.gcode) return []
     if (this.macro.config.gcode) {
-      const regex = /params\.(\w+).*\|\s*default\s*\(\s*([^,)]+)/gmi
-      let match = regex.exec(this.macro.config.gcode)
-      do {
-        if (match && match[1]) {
-          const name = match[1]
-          const value = (match[2] || '').trim()
-          if (!this.params[name]) {
-            this.$set(this.params, name, { value, reset: value })
-          }
+      for (const [, name, rest] of this.macro.config.gcode.matchAll(/params\.(\w+)(.*)/gi)) {
+        const valueMatch = /\|\s*default\s*\(\s*([^,)]+)/i.exec(rest)
+
+        const value = ((valueMatch && valueMatch[1]) || '').trim()
+
+        if (!this.params[name]) {
+          this.$set(this.params, name, { value, reset: value })
         }
-      } while (
-        (match = regex.exec(this.macro.config.gcode)) !== null
-      )
+      }
     }
   }
 }