From 821c84246a223b4dc19fa60903e4765a221c23f9 Mon Sep 17 00:00:00 2001
From: lizhijie429 <632163606@qq.com>
Date: Wed, 29 Nov 2023 10:34:22 +0800
Subject: [PATCH 1/5] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E5=B1=9E=E6=80=A7=E6=96=B0=E5=A2=9E=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/component/MetaHtmlAttributes.vue   | 94 ++++++++++---------
 1 file changed, 49 insertions(+), 45 deletions(-)

diff --git a/packages/common/component/MetaHtmlAttributes.vue b/packages/common/component/MetaHtmlAttributes.vue
index 08c27f978f..46c5b7f012 100644
--- a/packages/common/component/MetaHtmlAttributes.vue
+++ b/packages/common/component/MetaHtmlAttributes.vue
@@ -1,56 +1,58 @@
 <template>
-  <div class="attr-header">
-    <span class="header-title">自定义属性</span>
-    <tiny-popover
-      v-model="state.visible"
-      placement="bottom"
-      title=""
-      width="200"
-      popper-class="option-popper"
-      trigger="manual"
-    >
-      <div class="attr-form">
-        <icon-close class="icon-close" @click="closePopover"></icon-close>
-        <tiny-form label-position="left" label-width="53px">
-          <tiny-form-item label="name">
-            <tiny-input v-model="state.formData.key"></tiny-input>
-          </tiny-form-item>
-          <tiny-form-item label="value">
-            <tiny-input v-model="state.formData.value"></tiny-input>
-          </tiny-form-item>
-          <div class="footer">
-            <tiny-button size="small" @click="cancel">取消</tiny-button>
-            <tiny-button size="small" type="primary" @click="save">保存</tiny-button>
-          </div>
-        </tiny-form>
+  <div>
+    <div class="attr-header">
+      <span class="header-title">自定义属性</span>
+      <tiny-popover
+        v-model="state.visible"
+        placement="bottom"
+        title=""
+        width="200"
+        popper-class="option-popper"
+        trigger="manual"
+      >
+        <div class="attr-form">
+          <icon-close class="icon-close" @click="closePopover"></icon-close>
+          <tiny-form label-position="left" label-width="53px">
+            <tiny-form-item label="name">
+              <tiny-input v-model="state.formData.key"></tiny-input>
+            </tiny-form-item>
+            <tiny-form-item label="value">
+              <tiny-input v-model="state.formData.value"></tiny-input>
+            </tiny-form-item>
+            <div class="footer">
+              <tiny-button size="small" @click="cancel">取消</tiny-button>
+              <tiny-button size="small" type="primary" @click="save">保存</tiny-button>
+            </div>
+          </tiny-form>
+        </div>
+
+        <template #reference>
+          <tiny-tooltip class="item" effect="dark" content="新增原生属性" placement="top">
+            <span class="icon-wrap"><IconPlus @click="addAttr"></IconPlus></span>
+          </tiny-tooltip>
+        </template>
+      </tiny-popover>
+    </div>
+    <div class="attr-list">
+      <div v-for="item in attrs" :key="item" class="list-item">
+        <div class="item-content">{{ item.text }}</div>
+        <div class="item-controller">
+          <icon-edit @click="edit(item)"></icon-edit>
+          <icon-del @click="deleteAttr(item)"></icon-del>
+        </div>
       </div>
-
-      <template #reference>
-        <tiny-tooltip class="item" effect="dark" content="新增原生属性" placement="top">
-          <span class="icon-wrap"><IconPlus @click="addAttr"></IconPlus></span>
-        </tiny-tooltip>
-      </template>
-    </tiny-popover>
-  </div>
-  <div class="attr-list">
-    <div v-for="item in attrs" :key="item" class="list-item">
-      <div class="item-content">{{ item.text }}</div>
-      <div class="item-controller">
-        <icon-edit @click="edit(item)"></icon-edit>
-        <icon-del @click="deleteAttr(item)"></icon-del>
+      <div v-if="!attrs.length" class="list-item">
+        <div class="item-content">无数据</div>
       </div>
     </div>
-    <div v-if="!attrs.length" class="list-item">
-      <div class="item-content">无数据</div>
-    </div>
+    <div class="attr-popover"></div>
   </div>
-  <div class="attr-popover"></div>
 </template>
 <script>
 import { reactive, ref, watchEffect } from 'vue'
 import { useProperties, useResource } from '@opentiny/tiny-engine-controller'
-import { IconDel, IconEdit, IconClose } from '@opentiny/vue-icon'
-import { Form, FormItem, Input, Button, Popover } from '@opentiny/vue'
+import { IconDel, IconEdit, IconClose, IconPlus } from '@opentiny/vue-icon'
+import { Form, FormItem, Input, Button, Popover, Tooltip } from '@opentiny/vue'
 import { utils } from '@opentiny/tiny-engine-utils'
 
 export default {
@@ -62,7 +64,9 @@ export default {
     IconEdit: IconEdit(),
     IconDel: IconDel(),
     TinyPopover: Popover,
-    IconClose: IconClose()
+    IconClose: IconClose(),
+    IconPlus: IconPlus(),
+    TinyTooltip: Tooltip
   },
   props: {
     modelValue: {

From c1d621903b95fd9e9aea7d1aa5b96c24f8272e6a Mon Sep 17 00:00:00 2001
From: lizhijie429 <632163606@qq.com>
Date: Wed, 29 Nov 2023 10:40:30 +0800
Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DMetaHtmlText?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=8E=A7=E5=88=B6=E5=8F=B0=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/common/component/MetaHtmlText.vue | 24 ++++++++++++----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/packages/common/component/MetaHtmlText.vue b/packages/common/component/MetaHtmlText.vue
index 3b453246c5..ec992cfea6 100644
--- a/packages/common/component/MetaHtmlText.vue
+++ b/packages/common/component/MetaHtmlText.vue
@@ -1,16 +1,18 @@
 <template>
-  <div v-if="state.show" class="tiny-radio-buttons">
-    <div
-      v-for="(item, index) in data"
-      :key="item"
-      :class="['tiny-radio-button', state.active === index ? 'active' : '']"
-      @click="triggerType(item, index, $event)"
-    >
-      <span>{{ item }}</span>
+  <div>
+    <div v-if="state.show" class="tiny-radio-buttons">
+      <div
+        v-for="(item, index) in data"
+        :key="item"
+        :class="['tiny-radio-button', state.active === index ? 'active' : '']"
+        @click="triggerType(item, index, $event)"
+      >
+        <span>{{ item }}</span>
+      </div>
+    </div>
+    <div class="head-content">
+      <meta-input v-model="state.text" type="textarea" @change="change"></meta-input>
     </div>
-  </div>
-  <div class="head-content">
-    <meta-input v-model="state.text" type="textarea" @change="change"></meta-input>
   </div>
 </template>
 <script>

From 6e1ae41d2ccca0960e67b39de59e0d6c1584d852 Mon Sep 17 00:00:00 2001
From: lizhijie429 <632163606@qq.com>
Date: Thu, 30 Nov 2023 09:49:59 +0800
Subject: [PATCH 3/5] =?UTF-8?q?fix=EF=BC=9A=E8=B0=83=E6=95=B4=E9=80=8F?=
 =?UTF-8?q?=E4=BC=A0Attributes=E8=AD=A6=E5=91=8A=E8=A7=A3=E5=86=B3?=
 =?UTF-8?q?=E6=96=B9=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/component/MetaHtmlAttributes.vue   | 86 +++++++++----------
 1 file changed, 42 insertions(+), 44 deletions(-)

diff --git a/packages/common/component/MetaHtmlAttributes.vue b/packages/common/component/MetaHtmlAttributes.vue
index 46c5b7f012..a6e21380f4 100644
--- a/packages/common/component/MetaHtmlAttributes.vue
+++ b/packages/common/component/MetaHtmlAttributes.vue
@@ -1,52 +1,50 @@
 <template>
-  <div>
-    <div class="attr-header">
-      <span class="header-title">自定义属性</span>
-      <tiny-popover
-        v-model="state.visible"
-        placement="bottom"
-        title=""
-        width="200"
-        popper-class="option-popper"
-        trigger="manual"
-      >
-        <div class="attr-form">
-          <icon-close class="icon-close" @click="closePopover"></icon-close>
-          <tiny-form label-position="left" label-width="53px">
-            <tiny-form-item label="name">
-              <tiny-input v-model="state.formData.key"></tiny-input>
-            </tiny-form-item>
-            <tiny-form-item label="value">
-              <tiny-input v-model="state.formData.value"></tiny-input>
-            </tiny-form-item>
-            <div class="footer">
-              <tiny-button size="small" @click="cancel">取消</tiny-button>
-              <tiny-button size="small" type="primary" @click="save">保存</tiny-button>
-            </div>
-          </tiny-form>
-        </div>
-
-        <template #reference>
-          <tiny-tooltip class="item" effect="dark" content="新增原生属性" placement="top">
-            <span class="icon-wrap"><IconPlus @click="addAttr"></IconPlus></span>
-          </tiny-tooltip>
-        </template>
-      </tiny-popover>
-    </div>
-    <div class="attr-list">
-      <div v-for="item in attrs" :key="item" class="list-item">
-        <div class="item-content">{{ item.text }}</div>
-        <div class="item-controller">
-          <icon-edit @click="edit(item)"></icon-edit>
-          <icon-del @click="deleteAttr(item)"></icon-del>
-        </div>
+  <div class="attr-header">
+    <span class="header-title">自定义属性</span>
+    <tiny-popover
+      v-model="state.visible"
+      placement="bottom"
+      title=""
+      width="200"
+      popper-class="option-popper"
+      trigger="manual"
+    >
+      <div class="attr-form">
+        <icon-close class="icon-close" @click="closePopover"></icon-close>
+        <tiny-form label-position="left" label-width="53px">
+          <tiny-form-item label="name">
+            <tiny-input v-model="state.formData.key"></tiny-input>
+          </tiny-form-item>
+          <tiny-form-item label="value">
+            <tiny-input v-model="state.formData.value"></tiny-input>
+          </tiny-form-item>
+          <div class="footer">
+            <tiny-button size="small" @click="cancel">取消</tiny-button>
+            <tiny-button size="small" type="primary" @click="save">保存</tiny-button>
+          </div>
+        </tiny-form>
       </div>
-      <div v-if="!attrs.length" class="list-item">
-        <div class="item-content">无数据</div>
+
+      <template #reference>
+        <tiny-tooltip class="item" effect="dark" content="新增原生属性" placement="top">
+          <span class="icon-wrap"><IconPlus @click="addAttr"></IconPlus></span>
+        </tiny-tooltip>
+      </template>
+    </tiny-popover>
+  </div>
+  <div class="attr-list" v-bind="$attrs">
+    <div v-for="item in attrs" :key="item" class="list-item">
+      <div class="item-content">{{ item.text }}</div>
+      <div class="item-controller">
+        <icon-edit @click="edit(item)"></icon-edit>
+        <icon-del @click="deleteAttr(item)"></icon-del>
       </div>
     </div>
-    <div class="attr-popover"></div>
+    <div v-if="!attrs.length" class="list-item">
+      <div class="item-content">无数据</div>
+    </div>
   </div>
+  <div class="attr-popover"></div>
 </template>
 <script>
 import { reactive, ref, watchEffect } from 'vue'

From 8281b18d5d6cb4978a5bbe46eefbe3d270280b87 Mon Sep 17 00:00:00 2001
From: lizhijie429 <632163606@qq.com>
Date: Thu, 30 Nov 2023 13:57:29 +0800
Subject: [PATCH 4/5] =?UTF-8?q?fix=EF=BC=9A=E8=B0=83=E6=95=B4=E9=80=8F?=
 =?UTF-8?q?=E4=BC=A0Attributes=E8=AD=A6=E5=91=8A=E8=A7=A3=E5=86=B3?=
 =?UTF-8?q?=E6=96=B9=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/common/component/MetaHtmlText.vue | 25 +++++++++++-----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/packages/common/component/MetaHtmlText.vue b/packages/common/component/MetaHtmlText.vue
index ec992cfea6..bb8a28d391 100644
--- a/packages/common/component/MetaHtmlText.vue
+++ b/packages/common/component/MetaHtmlText.vue
@@ -1,19 +1,17 @@
 <template>
-  <div>
-    <div v-if="state.show" class="tiny-radio-buttons">
-      <div
-        v-for="(item, index) in data"
-        :key="item"
-        :class="['tiny-radio-button', state.active === index ? 'active' : '']"
-        @click="triggerType(item, index, $event)"
-      >
-        <span>{{ item }}</span>
-      </div>
-    </div>
-    <div class="head-content">
-      <meta-input v-model="state.text" type="textarea" @change="change"></meta-input>
+  <div v-if="state.show" class="tiny-radio-buttons">
+    <div
+      v-for="(item, index) in data"
+      :key="item"
+      :class="['tiny-radio-button', state.active === index ? 'active' : '']"
+      @click="triggerType(item, index, $event)"
+    >
+      <span>{{ item }}</span>
     </div>
   </div>
+  <div class="head-content">
+    <meta-input v-model="state.text" type="textarea" @change="change"></meta-input>
+  </div>
 </template>
 <script>
 import { reactive, computed } from 'vue'
@@ -21,6 +19,7 @@ import { useProperties } from '@opentiny/tiny-engine-controller'
 import MetaInput from './MetaInput.vue'
 
 export default {
+  inheritAttrs: false,
   components: {
     MetaInput
   },

From d594b560db950a68c300a6738a625577302fc222 Mon Sep 17 00:00:00 2001
From: lizhijie429 <632163606@qq.com>
Date: Thu, 30 Nov 2023 14:04:13 +0800
Subject: [PATCH 5/5] =?UTF-8?q?fix=EF=BC=9A=E8=B0=83=E6=95=B4=E9=80=8F?=
 =?UTF-8?q?=E4=BC=A0Attributes=E8=AD=A6=E5=91=8A=E8=A7=A3=E5=86=B3?=
 =?UTF-8?q?=E6=96=B9=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/common/component/MetaHtmlAttributes.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/common/component/MetaHtmlAttributes.vue b/packages/common/component/MetaHtmlAttributes.vue
index a6e21380f4..f98c7f3bac 100644
--- a/packages/common/component/MetaHtmlAttributes.vue
+++ b/packages/common/component/MetaHtmlAttributes.vue
@@ -32,7 +32,7 @@
       </template>
     </tiny-popover>
   </div>
-  <div class="attr-list" v-bind="$attrs">
+  <div class="attr-list">
     <div v-for="item in attrs" :key="item" class="list-item">
       <div class="item-content">{{ item.text }}</div>
       <div class="item-controller">
@@ -54,6 +54,7 @@ import { Form, FormItem, Input, Button, Popover, Tooltip } from '@opentiny/vue'
 import { utils } from '@opentiny/tiny-engine-utils'
 
 export default {
+  inheritAttrs: false,
   components: {
     TinyForm: Form,
     TinyFormItem: FormItem,