Merge branch 'feature/monitor2' into dev

src/views/home/components/EditItem/IconEditor.vue

@@ -41,6 +41,7 @@ const itemIconInfo = computed({
     return v
   },
   set() {
+    console.log('aaaa')
     handleChange()
   },
 })
@@ -52,6 +53,7 @@ function handleIconTypeRadioChange(type: number) {
 }
 
 function handleChange() {
+  console.log('21222')
   emit('update:itemIcon', itemIconInfo.value || null)
 }
 

src/views/home/index.vue

@@ -333,9 +333,6 @@ function handleAddItem(itemIconGroupId?: number) {
     />
     <div class="mask" :style="{ backgroundColor: `rgba(0,0,0,${panelState.panelConfig.backgroundMaskNumber})` }" />
     <div ref="scrollContainerRef" class="absolute w-full h-full overflow-auto">
-      <div v-if="panelState.panelConfig.searchBoxShow" class="flex mx-auto ">
-        <SystemMonitor @itemSearch="itemFrontEndSearch" />
-      </div>
       <div
         class="p-2.5 mx-auto"
         :style="{
@@ -365,10 +362,11 @@ function handleAddItem(itemIconGroupId?: number) {
         </div>
 
         <!-- 应用盒子 -->
-        <div class="mt-[50px]" :style="{ marginLeft: `${panelState.panelConfig.marginX}px`, marginRight: `${panelState.panelConfig.marginX}px` }">
-          <!-- <div v-if="panelState.panelConfig.searchBoxShow" class="flex mt-[20px] mx-auto ">
-            <SystemMonitor @itemSearch="itemFrontEndSearch" />
-          </div> -->
+        <div :style="{ marginLeft: `${panelState.panelConfig.marginX}px`, marginRight: `${panelState.panelConfig.marginX}px` }">
+          <!-- 系统状态 -->
+          <div v-if="panelState.panelConfig.searchBoxShow" class="flex mx-auto ">
+            <SystemMonitor allow-edit />
+          </div>
 
           <!-- 组纵向排列 -->
           <div
@@ -437,7 +435,7 @@ function handleAddItem(itemIconGroupId?: number) {
             <div v-if="panelState.panelConfig.iconStyle === PanelPanelConfigStyleEnum.icon">
               <div v-if="itemGroup.items">
                 <VueDraggable
-                  v-model="itemGroup.items" item-key="id" :animation="300"
+                  v-model="itemGroup.items" item-key="sort" :animation="300"
                   class="icon-small-box"
 
                   filter=".not-drag"