Merge branch 'master' into positec

king

2025-01-02 2ba283d7a47e504774e97e3051bdad79ecec95f8

Merge branch 'master' into positec

 src/views/rolemanage/filtermenu/index.jsx

@@ -306,6 +306,11 @@
          }
        })
      } else if (['card', 'carousel', 'timeline'].includes(item.type)) {
        if (item.subtype === 'propcard') {
          if (item.wrap.jump === 'menu' && item.wrap.menu) {
            menus.push(item.wrap.menu)
          }
        }
        item.subcards.forEach(card => {
          if (card.setting.click === 'menu' && typeof(card.setting.menu) === 'string') {
            menus.push(card.setting.menu)