Merge remote-tracking branch 'ruoyi-vue/master' into dev

疯狂的狮子Li

2022-10-12 95010d4a4c21cd53b78f51cbd518a315a8861fbc

 ruoyi-ui/src/views/tool/build/RightPanel.vue

@@ -486,7 +486,7 @@
            </el-tree>

          </template>



          <template v-if="activeData.layout === 'colFormItem'">

          <template v-if="activeData.layout === 'colFormItem' && activeData.tag !== 'el-button'">

            <el-divider>正则校验</el-divider>

            <div

              v-for="(item, index) in activeData.regList"