From 9385f1ebbd8f3563b21d0b3ec11d4fc5cd5f6f96 Mon Sep 17 00:00:00 2001
From: chilingling <michaelchiling1024@gmail.com>
Date: Tue, 24 Dec 2024 17:27:06 -0800
Subject: [PATCH 1/5] fix: resolve warnings

---
 packages/common/component/MetaCodeEditor.vue  |  3 +-
 packages/common/component/MetaListItems.vue   | 52 ++++++++++---------
 packages/common/component/PluginBlockList.vue |  2 +-
 .../toolbar-built-in/ToolbarBaseButton.vue    |  9 +---
 .../toolbar-built-in/ToolbarBaseIcon.vue      |  9 +---
 .../TabsGroupConfigurator.vue                 |  4 +-
 packages/layout/src/DesignSettings.vue        | 11 ++--
 packages/plugins/i18n/src/Main.vue            |  2 +-
 .../src/meta/block/src/BlockGroup.vue         |  1 +
 .../src/meta/block/src/BlockList.vue          |  1 -
 .../materials/src/meta/layout/src/Main.vue    | 10 ++--
 packages/settings/styles/src/Main.vue         | 30 +++++++----
 .../src/components/border/BorderGroup.vue     |  8 +--
 13 files changed, 69 insertions(+), 73 deletions(-)

diff --git a/packages/common/component/MetaCodeEditor.vue b/packages/common/component/MetaCodeEditor.vue
index d7f86934f..5e730bf8a 100644
--- a/packages/common/component/MetaCodeEditor.vue
+++ b/packages/common/component/MetaCodeEditor.vue
@@ -255,7 +255,8 @@ export default {
         minimap: {
           enabled: false
         }
-      }
+      },
+      locale
     }
   }
 }
diff --git a/packages/common/component/MetaListItems.vue b/packages/common/component/MetaListItems.vue
index 74a451e3f..b770266dc 100644
--- a/packages/common/component/MetaListItems.vue
+++ b/packages/common/component/MetaListItems.vue
@@ -30,31 +30,33 @@
     </vue-draggable-next>
   </template>
   <template v-else>
-    <div v-for="(item, index) in optionsList" :key="index" class="option-item not-draggable">
-      <meta-list-item
-        :item="item"
-        :index="index"
-        :itemClick="itemClick"
-        :dataScource="listItemOption"
-        @changeItem="changeItem"
-        @deleteItem="deleteItem"
-        @editItem="editItem"
-      >
-        <template #content>
-          <slot name="content" :data="item">
-            <span>{{ item[textField] || formatName(item) }}</span>
-          </slot>
-        </template>
-        <template #operate>
-          <slot name="operate" :data="item"></slot>
-        </template>
-        <template #metaForm>
-          <slot name="form" :data="item"></slot>
-        </template>
-        <template #footer>
-          <slot name="footer" :data="item"></slot>
-        </template>
-      </meta-list-item>
+    <div>
+      <div v-for="(item, index) in optionsList" :key="index" class="option-item not-draggable">
+        <meta-list-item
+          :item="item"
+          :index="index"
+          :itemClick="itemClick"
+          :dataScource="listItemOption"
+          @changeItem="changeItem"
+          @deleteItem="deleteItem"
+          @editItem="editItem"
+        >
+          <template #content>
+            <slot name="content" :data="item">
+              <span>{{ item[textField] || formatName(item) }}</span>
+            </slot>
+          </template>
+          <template #operate>
+            <slot name="operate" :data="item"></slot>
+          </template>
+          <template #metaForm>
+            <slot name="form" :data="item"></slot>
+          </template>
+          <template #footer>
+            <slot name="footer" :data="item"></slot>
+          </template>
+        </meta-list-item>
+      </div>
     </div>
   </template>
 </template>
diff --git a/packages/common/component/PluginBlockList.vue b/packages/common/component/PluginBlockList.vue
index c1f34c5ee..04a566d6d 100644
--- a/packages/common/component/PluginBlockList.vue
+++ b/packages/common/component/PluginBlockList.vue
@@ -205,7 +205,7 @@ export default {
   emits: ['click', 'iconClick', 'add', 'deleteBlock', 'openVersionPanel', 'editBlock', 'checkAll', 'cancelCheckAll'],
   setup(props, { emit }) {
     const panelState = inject('panelState', {})
-    const blockUsers = inject('blockUsers')
+    const blockUsers = inject('blockUsers', [])
     const state = reactive({
       activeIndex: -1,
       data: computed(() => props.data),
diff --git a/packages/common/component/toolbar-built-in/ToolbarBaseButton.vue b/packages/common/component/toolbar-built-in/ToolbarBaseButton.vue
index 3ddfd0c20..30a4051bd 100644
--- a/packages/common/component/toolbar-built-in/ToolbarBaseButton.vue
+++ b/packages/common/component/toolbar-built-in/ToolbarBaseButton.vue
@@ -1,5 +1,5 @@
 <template>
-  <tiny-button v-bind="extendAttrs" class="toolbar-button">
+  <tiny-button class="toolbar-button">
     <span class="svg-wrap">
       <svg-icon v-if="icon" :name="icon"></svg-icon>
       <span v-if="options?.showDots" class="dots"></span>
@@ -9,7 +9,6 @@
   </tiny-button>
 </template>
 <script>
-import { inject } from 'vue'
 import { Button } from '@opentiny/vue'
 
 export default {
@@ -29,12 +28,6 @@ export default {
       type: Object,
       default: () => ({})
     }
-  },
-  setup() {
-    const extendAttrs = inject('extend-attributes') || {}
-    return {
-      extendAttrs
-    }
   }
 }
 </script>
diff --git a/packages/common/component/toolbar-built-in/ToolbarBaseIcon.vue b/packages/common/component/toolbar-built-in/ToolbarBaseIcon.vue
index b763a5059..59b69b63e 100644
--- a/packages/common/component/toolbar-built-in/ToolbarBaseIcon.vue
+++ b/packages/common/component/toolbar-built-in/ToolbarBaseIcon.vue
@@ -8,7 +8,7 @@
   >
     <template #reference>
       <span class="icon">
-        <span class="icon-hides" v-bind="extendAttrs">
+        <span class="icon-hides" v-bind="$attrs">
           <svg-icon :name="icon"></svg-icon>
           <span v-if="options?.showDots" class="dots"></span>
         </span>
@@ -17,7 +17,6 @@
   </tiny-popover>
 </template>
 <script>
-import { inject } from 'vue'
 import { Popover } from '@opentiny/vue'
 
 export default {
@@ -37,12 +36,6 @@ export default {
       type: Object,
       default: () => {}
     }
-  },
-  setup() {
-    const extendAttrs = inject('extend-attributes') || {}
-    return {
-      extendAttrs
-    }
   }
 }
 </script>
diff --git a/packages/configurator/src/tabs-group-configurator/TabsGroupConfigurator.vue b/packages/configurator/src/tabs-group-configurator/TabsGroupConfigurator.vue
index 952331936..3d22853b7 100644
--- a/packages/configurator/src/tabs-group-configurator/TabsGroupConfigurator.vue
+++ b/packages/configurator/src/tabs-group-configurator/TabsGroupConfigurator.vue
@@ -78,8 +78,8 @@ const props = defineProps({
   },
   // tabItem宽度
   labelWidth: {
-    type: Number,
-    default: 63
+    type: [Number, String],
+    default: '63'
   },
   // tab的选项，如果选项中包含collapsed，则会折叠为下拉
   options: {
diff --git a/packages/layout/src/DesignSettings.vue b/packages/layout/src/DesignSettings.vue
index c79bcaeda..17e7d4f37 100644
--- a/packages/layout/src/DesignSettings.vue
+++ b/packages/layout/src/DesignSettings.vue
@@ -2,7 +2,7 @@
   <div id="tiny-right-panel">
     <tiny-tabs v-model="layoutState.settings.render">
       <tiny-tab-item v-for="(setting, index) in settings" :key="index" :title="setting.title" :name="setting.name">
-        <component :is="setting.entry" :is-collapsed="isCollapsed"></component>
+        <component :is="setting.entry"></component>
         <div v-show="activating" class="active"></div>
       </tiny-tab-item>
     </tiny-tabs>
@@ -15,14 +15,15 @@
 </template>
 
 <script>
-import { computed, ref } from 'vue'
-import { Tabs, TabItem } from '@opentiny/vue'
+import { computed, provide, ref } from 'vue'
+import { Tabs, TabItem, Tooltip } from '@opentiny/vue'
 import { useLayout } from '@opentiny/tiny-engine-meta-register'
 
 export default {
   components: {
     TinyTabs: Tabs,
-    TinyTabItem: TabItem
+    TinyTabItem: TabItem,
+    TinyTooltip: Tooltip
   },
   props: {
     settings: {
@@ -37,6 +38,8 @@ export default {
     const isCollapsed = ref(false)
     const settingIcon = computed(() => (isCollapsed.value ? 'style-panel-collapsed' : 'style-panel-expand'))
 
+    provide('isCollapsed', isCollapsed)
+
     return {
       showMask,
       isCollapsed,
diff --git a/packages/plugins/i18n/src/Main.vue b/packages/plugins/i18n/src/Main.vue
index 40772c8a3..64d7da17c 100644
--- a/packages/plugins/i18n/src/Main.vue
+++ b/packages/plugins/i18n/src/Main.vue
@@ -114,7 +114,7 @@
           </tiny-grid-column>
           <template #empty>
             <div v-if="isLoading" id="empty-loading-box" class="i18n-loading"></div>
-            <search-empty isShow="!isLoading" />
+            <search-empty v-else />
           </template>
         </tiny-grid>
       </div>
diff --git a/packages/plugins/materials/src/meta/block/src/BlockGroup.vue b/packages/plugins/materials/src/meta/block/src/BlockGroup.vue
index 11a0c71d8..e9715b6c3 100644
--- a/packages/plugins/materials/src/meta/block/src/BlockGroup.vue
+++ b/packages/plugins/materials/src/meta/block/src/BlockGroup.vue
@@ -168,6 +168,7 @@ export default {
       default: () => []
     }
   },
+  emits: ['changeGroup'],
   setup(props) {
     const validateIcon = iconError()
     const panelState = inject('panelState', {})
diff --git a/packages/plugins/materials/src/meta/block/src/BlockList.vue b/packages/plugins/materials/src/meta/block/src/BlockList.vue
index edfe0b4bb..de6b6613a 100644
--- a/packages/plugins/materials/src/meta/block/src/BlockList.vue
+++ b/packages/plugins/materials/src/meta/block/src/BlockList.vue
@@ -1,6 +1,5 @@
 <template>
   <plugin-block-list
-    class="block-list-wrap"
     ref="blockRef"
     :data="blockList"
     :show-add-button="state.showAddButton"
diff --git a/packages/plugins/materials/src/meta/layout/src/Main.vue b/packages/plugins/materials/src/meta/layout/src/Main.vue
index 35692b1ba..2ec25b894 100644
--- a/packages/plugins/materials/src/meta/layout/src/Main.vue
+++ b/packages/plugins/materials/src/meta/layout/src/Main.vue
@@ -2,7 +2,7 @@
   <plugin-panel :title="shortcut ? '' : title" @close="$emit('close')">
     <template #header>
       <component
-        :is="headerComponent"
+        :is="registryData?.components?.header"
         :fixedPanels="fixedPanels"
         @fix-panel="(id) => $emit('fix-panel', id)"
       ></component>
@@ -52,14 +52,11 @@ export default {
     })
     provide('panelState', panelState) // 使用provide传给子组件,后续可能会有调整，先暂定
 
-    const pluginRegistryData = ref(props.registryData)
     const rightPanelRef = ref(null)
-    const displayComponentIds = pluginRegistryData.value.options.displayComponentIds || []
-    const headerComponent = pluginRegistryData.value.components?.header
+    const displayComponentIds = props.registryData.options.displayComponentIds || []
     const onlyShowDefault = ref(displayComponentIds.length === 1)
     const activeTabId =
-      displayComponentIds.find((item) => item === pluginRegistryData.value.options?.defaultTabId) ||
-      displayComponentIds[0]
+      displayComponentIds.find((item) => item === props.registryData.options?.defaultTabId) || displayComponentIds[0]
 
     const activeName = ref(activeTabId)
     const defaultComponent = getMergeMeta(activeName.value)?.entry
@@ -75,7 +72,6 @@ export default {
     const title = ref(props.registryData?.title)
 
     return {
-      headerComponent,
       title,
       activeName,
       defaultComponent,
diff --git a/packages/settings/styles/src/Main.vue b/packages/settings/styles/src/Main.vue
index f1f31f013..c1f1bb69a 100644
--- a/packages/settings/styles/src/Main.vue
+++ b/packages/settings/styles/src/Main.vue
@@ -65,7 +65,7 @@
 </template>
 
 <script>
-import { computed, watch } from 'vue'
+import { watch, inject, ref } from 'vue'
 import { Collapse, CollapseItem, Input } from '@opentiny/vue'
 import { useHistory, useCanvas, useProperties } from '@opentiny/tiny-engine-meta-register'
 import { CodeConfigurator, VariableConfigurator } from '@opentiny/tiny-engine-configurator'
@@ -105,13 +105,8 @@ export default {
     TinyInput: Input,
     VariableConfigurator
   },
-  props: {
-    isCollapsed: {
-      type: Boolean,
-      default: false
-    }
-  },
-  setup(props) {
+  props: {},
+  setup() {
     const styleCategoryGroup = [
       'layout',
       'spacing',
@@ -122,7 +117,8 @@ export default {
       'borders',
       'effects'
     ]
-    const activeNames = computed(() => (props.isCollapsed ? [styleCategoryGroup[0]] : styleCategoryGroup))
+    const isCollapsed = inject('isCollapsed')
+    const activeNames = ref(styleCategoryGroup)
     const { getCurrentSchema } = useCanvas()
     // 获取当前节点 style 对象
     const { state, updateStyle } = useStyle() // updateStyle
@@ -130,7 +126,7 @@ export default {
     const { getSchema, setProp } = useProperties()
 
     const handoverGroup = (actives) => {
-      if (props.isCollapsed) {
+      if (isCollapsed.value) {
         activeNames.value = actives.length > 1 ? actives.shift() : actives
       }
     }
@@ -200,6 +196,17 @@ export default {
       }
     )
 
+    watch(
+      () => isCollapsed.value,
+      () => {
+        if (isCollapsed.value) {
+          activeNames.value = [styleCategoryGroup[0]]
+        } else {
+          activeNames.value = styleCategoryGroup
+        }
+      }
+    )
+
     return {
       state,
       activeNames,
@@ -209,7 +216,8 @@ export default {
       save,
       close,
       updateStyle,
-      setConfig
+      setConfig,
+      isCollapsed
     }
   }
 }
diff --git a/packages/settings/styles/src/components/border/BorderGroup.vue b/packages/settings/styles/src/components/border/BorderGroup.vue
index 241750891..11a0ed7f2 100644
--- a/packages/settings/styles/src/components/border/BorderGroup.vue
+++ b/packages/settings/styles/src/components/border/BorderGroup.vue
@@ -38,7 +38,7 @@
         <numeric-select
           :name="getProperty(BORDER_RADIUS_PROPERTY.BorderTopLeftRadius).name"
           :numericalText="borderRadius.BorderTopLeftRadius"
-          :placeholder="0"
+          placeholder="0"
           @update="updateStyle"
         />
       </div>
@@ -51,7 +51,7 @@
         <numeric-select
           :name="getProperty(BORDER_RADIUS_PROPERTY.BorderTopRightRadius).name"
           :numericalText="borderRadius.BorderTopRightRadius"
-          :placeholder="0"
+          placeholder="0"
           @update="updateStyle"
         />
       </div>
@@ -64,7 +64,7 @@
         <numeric-select
           :name="getProperty(BORDER_RADIUS_PROPERTY.BorderBottomLeftRadius).name"
           :numericalText="borderRadius.BorderBottomLeftRadius"
-          :placeholder="0"
+          placeholder="0"
           @update="updateStyle"
         />
       </div>
@@ -76,7 +76,7 @@
         </tiny-tooltip>
         <numeric-select
           :name="getProperty(BORDER_RADIUS_PROPERTY.BorderBottomRightRadius).name"
-          :placeholder="0"
+          placeholder="0"
           :numericalText="borderRadius.BorderBottomRightRadius"
           @update="updateStyle"
         />

From 96f247cc17d5d11fc10de365f16f3b5c2919fa37 Mon Sep 17 00:00:00 2001
From: chilingling <michaelchiling1024@gmail.com>
Date: Tue, 24 Dec 2024 17:36:56 -0800
Subject: [PATCH 2/5] fix: add access guard avoid runtime errors

---
 packages/plugins/materials/src/meta/layout/src/Main.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/plugins/materials/src/meta/layout/src/Main.vue b/packages/plugins/materials/src/meta/layout/src/Main.vue
index 2ec25b894..61a5bdcd5 100644
--- a/packages/plugins/materials/src/meta/layout/src/Main.vue
+++ b/packages/plugins/materials/src/meta/layout/src/Main.vue
@@ -53,10 +53,10 @@ export default {
     provide('panelState', panelState) // 使用provide传给子组件,后续可能会有调整，先暂定
 
     const rightPanelRef = ref(null)
-    const displayComponentIds = props.registryData.options.displayComponentIds || []
+    const displayComponentIds = props.registryData?.options?.displayComponentIds || []
     const onlyShowDefault = ref(displayComponentIds.length === 1)
     const activeTabId =
-      displayComponentIds.find((item) => item === props.registryData.options?.defaultTabId) || displayComponentIds[0]
+      displayComponentIds.find((item) => item === props.registryData?.options?.defaultTabId) || displayComponentIds[0]
 
     const activeName = ref(activeTabId)
     const defaultComponent = getMergeMeta(activeName.value)?.entry

From 5ffec86a45c5ac1fa2acc79b8455d0ee09980511 Mon Sep 17 00:00:00 2001
From: chilingling <michaelchiling1024@gmail.com>
Date: Tue, 24 Dec 2024 19:23:00 -0800
Subject: [PATCH 3/5] fix: change placeholder prop type

---
 .../settings/styles/src/components/inputs/NumericSelect.vue     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/settings/styles/src/components/inputs/NumericSelect.vue b/packages/settings/styles/src/components/inputs/NumericSelect.vue
index 9d737afa2..eb8e1ea95 100644
--- a/packages/settings/styles/src/components/inputs/NumericSelect.vue
+++ b/packages/settings/styles/src/components/inputs/NumericSelect.vue
@@ -41,7 +41,7 @@ export default {
       default: false
     },
     placeholder: {
-      type: [String, Number],
+      type: [String],
       default: ''
     },
     suffix: {

From c23b4906f38acdea975e2d8c1d31d6bd442d00e2 Mon Sep 17 00:00:00 2001
From: chilingling <michaelchiling1024@gmail.com>
Date: Wed, 25 Dec 2024 03:49:24 -0800
Subject: [PATCH 4/5] fix: resolve type check

---
 .../settings/styles/src/components/inputs/NumericSelect.vue     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/settings/styles/src/components/inputs/NumericSelect.vue b/packages/settings/styles/src/components/inputs/NumericSelect.vue
index eb8e1ea95..7d8403670 100644
--- a/packages/settings/styles/src/components/inputs/NumericSelect.vue
+++ b/packages/settings/styles/src/components/inputs/NumericSelect.vue
@@ -41,7 +41,7 @@ export default {
       default: false
     },
     placeholder: {
-      type: [String],
+      type: String,
       default: ''
     },
     suffix: {

From 152cb71a9034b88a7374bcecc1dd7a5663073988 Mon Sep 17 00:00:00 2001
From: chilingling <michaelchiling1024@gmail.com>
Date: Wed, 25 Dec 2024 04:42:46 -0800
Subject: [PATCH 5/5] fix: toolbarbaseicon props default value

---
 packages/common/component/toolbar-built-in/ToolbarBaseIcon.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/common/component/toolbar-built-in/ToolbarBaseIcon.vue b/packages/common/component/toolbar-built-in/ToolbarBaseIcon.vue
index 59b69b63e..2404f3903 100644
--- a/packages/common/component/toolbar-built-in/ToolbarBaseIcon.vue
+++ b/packages/common/component/toolbar-built-in/ToolbarBaseIcon.vue
@@ -34,7 +34,7 @@ export default {
     },
     options: {
       type: Object,
-      default: () => {}
+      default: () => ({})
     }
   }
 }