From c109a2cb409a984e8e6dab080701d09ffe6dd56e Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 23 May 2024 16:34:53 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):=20?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=BD=91=E9=A1=B5=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data-visualization/DvToolbar.vue          |  2 +-
 .../component-group/MoreComGroup.vue          | 20 +++++++++++--------
 .../custom-component/de-frame/FrameLinks.vue  |  2 +-
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/core/core-frontend/src/components/data-visualization/DvToolbar.vue b/core/core-frontend/src/components/data-visualization/DvToolbar.vue
index 506b1df64e..9cbb7ca1b6 100644
--- a/core/core-frontend/src/components/data-visualization/DvToolbar.vue
+++ b/core/core-frontend/src/components/data-visualization/DvToolbar.vue
@@ -239,7 +239,7 @@ eventBus.on('clearCanvas', clearCanvas)
           >
             <media-group></media-group>
           </component-group>
-          <component-group is-label :base-width="115" icon-name="dv-more-com" title="更多">
+          <component-group is-label :base-width="215" icon-name="dv-more-com" title="更多">
             <more-com-group></more-com-group>
           </component-group>
           <component-group is-label :base-width="410" icon-name="dv-material" title="素材">
diff --git a/core/core-frontend/src/custom-component/component-group/MoreComGroup.vue b/core/core-frontend/src/custom-component/component-group/MoreComGroup.vue
index e69b69294c..39cbaa2cdc 100644
--- a/core/core-frontend/src/custom-component/component-group/MoreComGroup.vue
+++ b/core/core-frontend/src/custom-component/component-group/MoreComGroup.vue
@@ -28,8 +28,8 @@ const props = defineProps({
 })
 
 const { dvModel } = toRefs(props)
-const newComponent = () => {
-  eventBus.emit('handleNew', { componentName: 'DeTimeClock', innerType: 'DeTimeClock' })
+const newComponent = params => {
+  eventBus.emit('handleNew', { componentName: params, innerType: params })
 }
 
 const handleDragStart = e => {
@@ -42,17 +42,20 @@ const handleDragEnd = e => {
 </script>
 
 <template>
-  <div
-    class="group"
-    @dragstart="handleDragStart"
-    @dragend="handleDragEnd"
-    v-on:click="newComponent"
-  >
+  <div class="group" @dragstart="handleDragStart" @dragend="handleDragEnd">
     <drag-component
       :themes="themes"
       name="YYYY-MM-DD 08:00:00"
       label="日期时间"
       drag-info="DeTimeClock&DeTimeClock"
+      v-on:click="newComponent('DeTimeClock')"
+    ></drag-component>
+    <drag-component
+      :themes="themes"
+      icon="db-more-web"
+      label="网页"
+      drag-info="DeFrame&DeFrame"
+      v-on:click="newComponent('DeFrame')"
     ></drag-component>
   </div>
 </template>
@@ -60,5 +63,6 @@ const handleDragEnd = e => {
 <style lang="less" scoped>
 .group {
   padding: 12px 8px;
+  display: inline-flex;
 }
 </style>
diff --git a/core/core-frontend/src/custom-component/de-frame/FrameLinks.vue b/core/core-frontend/src/custom-component/de-frame/FrameLinks.vue
index a7838f85af..09d3592197 100644
--- a/core/core-frontend/src/custom-component/de-frame/FrameLinks.vue
+++ b/core/core-frontend/src/custom-component/de-frame/FrameLinks.vue
@@ -19,7 +19,7 @@
             </el-tooltip>
           </span>
         </template>
-        <el-input v-model="state.linkInfoTemp.src" @blur="onBlur" />
+        <el-input :effect="themes" v-model="state.linkInfoTemp.src" @blur="onBlur" />
       </el-form-item>
     </el-form>
   </el-row>