Merge pull request #2918 from emqx/dev/1.10.0

Sync code from refs/heads/dev/1.10.0 to enterprise
emqx · Aug 23, 2024 · 99f4f14 · 99f4f14
2 parents d8fbd16 + 9cd4319
commit 99f4f14
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 19 deletions.
diff --git a/src/hooks/Plugins/useRenderPluginForm.ts b/src/hooks/Plugins/useRenderPluginForm.ts
@@ -160,7 +160,8 @@ export default function usePluginRenderForm(): PluginUI {
   const uiConfigs = ref<PluginUIConfigs | null>(null)
   const i18nConfigs = ref<Record<string, any> | null>(null)
   const schema = ref<AvroSchema | null>(null)
-  const schemaLoading = ref(false)
+  // Default true to prevent UI display before schema loads
+  const schemaLoading = ref(true)
 
   const store = useStore()
 

diff --git a/src/views/Plugins/PluginDetail.vue b/src/views/Plugins/PluginDetail.vue
@@ -49,10 +49,14 @@
         </el-tab-pane>
         <el-tab-pane :label="tl('infoPlugin')" name="readme" :lazy="true">
           <el-card class="app-card">
-            <div class="plugin-info-bd">
-              <MarkdownContent class="plugin-content" :content="pluginInfo.readme" />
-              <PluginInfo :plugin-data="pluginInfo" />
-            </div>
+            <el-row class="plugin-info-bd" :gutter="20">
+              <el-col :span="16">
+                <MarkdownContent class="plugin-content" :content="pluginInfo.readme" />
+              </el-col>
+              <el-col :span="8">
+                <PluginInfo :plugin-data="pluginInfo" />
+              </el-col>
+            </el-row>
           </el-card>
         </el-tab-pane>
       </div>
@@ -124,7 +128,6 @@ getPluginDetail()
 </script>
 
 <style lang="scss" scoped>
-@import './style/pluginInfo.scss';
 .plugin-detail {
   .el-tag {
     margin-right: 12px;

diff --git a/src/views/Plugins/components/PluginInfo.vue b/src/views/Plugins/components/PluginInfo.vue
@@ -69,8 +69,9 @@ const { getPluginAuthorString } = usePluginItem()
 
 <style lang="scss" scoped>
 .plugin-info {
-  padding: 28px 24px;
+  padding: 20px;
   background: linear-gradient(33deg, #1bcba90c 0%, #2369ff0c 46%, #876eff0c 100%);
+  border-radius: 10px;
 }
 .plugin-info-hd {
   margin-top: 0;

diff --git a/src/views/Plugins/components/PluginInfoItem.vue b/src/views/Plugins/components/PluginInfoItem.vue
@@ -35,6 +35,8 @@ defineProps({
   }
   .content {
     color: var(--color-title-primary);
+    word-break: break-all;
+    white-space: pre-wrap;
   }
 }
 </style>
diff --git a/src/views/Plugins/style/pluginInfo.scss b/src/views/Plugins/style/pluginInfo.scss