From a5efd5d9c45bb4c9132e80aeb3a7c3ce3183ec21 Mon Sep 17 00:00:00 2001
From: SonyLeo <746591437@qq.com>
Date: Wed, 1 Jan 2025 23:24:37 -0800
Subject: [PATCH 1/3] fix: resolve block search exceptions

---
 .../src/meta/block/src/BlockGroupPanel.vue    | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/packages/plugins/materials/src/meta/block/src/BlockGroupPanel.vue b/packages/plugins/materials/src/meta/block/src/BlockGroupPanel.vue
index 0869591a91..61bb62b43d 100644
--- a/packages/plugins/materials/src/meta/block/src/BlockGroupPanel.vue
+++ b/packages/plugins/materials/src/meta/block/src/BlockGroupPanel.vue
@@ -10,14 +10,9 @@
       <div class="block-add-content">
         <div class="block-add-content-title">区块列表</div>
         <block-group-filters :filters="state.filters" @search="searchBlocks"></block-group-filters>
-        <block-group-transfer v-model:blockList="state.blockList">
+        <block-group-transfer v-model:blockList="filterBlocks">
           <template #search>
-            <tiny-search
-              class="transfer-order-search"
-              v-model="state.searchValue"
-              placeholder="请输入关键词"
-              @update:modelValue="searchBlocks"
-            >
+            <tiny-search class="transfer-order-search" v-model="state.searchValue" placeholder="请输入关键词">
               <template #prefix>
                 <tiny-icon-search />
               </template>
@@ -29,7 +24,7 @@
   </plugin-setting>
 </template>
 <script>
-import { nextTick, reactive, watch, provide, inject, ref } from 'vue'
+import { nextTick, reactive, watch, provide, inject, ref, computed } from 'vue'
 import { Search } from '@opentiny/vue'
 import { iconSearch } from '@opentiny/vue-icon'
 import { PluginSetting } from '@opentiny/tiny-engine-common'
@@ -109,6 +104,18 @@ export default {
       ]
     })
 
+    const filterBlocks = computed(() => {
+      if (!state.searchValue) {
+        return state.blockList
+      }
+
+      const pattern = new RegExp(state.searchValue, 'i')
+
+      return state.blockList.filter((block) => {
+        return pattern.test(block?.name_cn) || pattern.test(block?.label) || pattern.test(block?.description)
+      })
+    })
+
     const addBlocks = () => {
       const groupId = selectedGroup.value.groupId
       fetchGroupBlocksById({ groupId })
@@ -260,6 +267,7 @@ export default {
       selectedGroup,
       state,
       panel,
+      filterBlocks,
       closeGroupPanel,
       addBlocks,
       searchBlocks

From a8f8226a26c26057440e98b200f3fe047edc2124 Mon Sep 17 00:00:00 2001
From: SonyLeo <746591437@qq.com>
Date: Thu, 2 Jan 2025 02:05:12 -0800
Subject: [PATCH 2/3] fix: optimize grammar and writing

---
 .../materials/src/meta/block/src/BlockGroupPanel.vue  | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/plugins/materials/src/meta/block/src/BlockGroupPanel.vue b/packages/plugins/materials/src/meta/block/src/BlockGroupPanel.vue
index 61bb62b43d..625de9a967 100644
--- a/packages/plugins/materials/src/meta/block/src/BlockGroupPanel.vue
+++ b/packages/plugins/materials/src/meta/block/src/BlockGroupPanel.vue
@@ -10,7 +10,7 @@
       <div class="block-add-content">
         <div class="block-add-content-title">区块列表</div>
         <block-group-filters :filters="state.filters" @search="searchBlocks"></block-group-filters>
-        <block-group-transfer v-model:blockList="filterBlocks">
+        <block-group-transfer :blockList="filteredBlocks">
           <template #search>
             <tiny-search class="transfer-order-search" v-model="state.searchValue" placeholder="请输入关键词">
               <template #prefix>
@@ -37,6 +37,7 @@ import {
   getMetaApi,
   META_SERVICE
 } from '@opentiny/tiny-engine-meta-register'
+import { utils } from '@opentiny/tiny-engine-utils'
 import BlockGroupTransfer from './BlockGroupTransfer.vue'
 import BlockGroupFilters from './BlockGroupFilters.vue'
 
@@ -80,6 +81,8 @@ export default {
     const blockUsers = ref([])
     provide('blockUsers', blockUsers)
 
+    const { escapeRegExp } = utils
+
     const state = reactive({
       searchValue: '',
       blockList: [],
@@ -104,12 +107,12 @@ export default {
       ]
     })
 
-    const filterBlocks = computed(() => {
+    const filteredBlocks = computed(() => {
       if (!state.searchValue) {
         return state.blockList
       }
 
-      const pattern = new RegExp(state.searchValue, 'i')
+      const pattern = new RegExp(escapeRegExp(state.searchValue), 'i')
 
       return state.blockList.filter((block) => {
         return pattern.test(block?.name_cn) || pattern.test(block?.label) || pattern.test(block?.description)
@@ -267,7 +270,7 @@ export default {
       selectedGroup,
       state,
       panel,
-      filterBlocks,
+      filteredBlocks,
       closeGroupPanel,
       addBlocks,
       searchBlocks

From e143b397a4aab247c0f50516be6eaf96626abcdb Mon Sep 17 00:00:00 2001
From: SonyLeo <746591437@qq.com>
Date: Thu, 2 Jan 2025 02:25:05 -0800
Subject: [PATCH 3/3] fix: remove invalid spaces

---
 .../plugins/materials/src/meta/block/src/BlockGroupPanel.vue   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/plugins/materials/src/meta/block/src/BlockGroupPanel.vue b/packages/plugins/materials/src/meta/block/src/BlockGroupPanel.vue
index 625de9a967..87b4829e68 100644
--- a/packages/plugins/materials/src/meta/block/src/BlockGroupPanel.vue
+++ b/packages/plugins/materials/src/meta/block/src/BlockGroupPanel.vue
@@ -112,7 +112,8 @@ export default {
         return state.blockList
       }
 
-      const pattern = new RegExp(escapeRegExp(state.searchValue), 'i')
+      const searchValue = state.searchValue.trim()
+      const pattern = new RegExp(escapeRegExp(searchValue), 'i')
 
       return state.blockList.filter((block) => {
         return pattern.test(block?.name_cn) || pattern.test(block?.label) || pattern.test(block?.description)