From 9e59fd19bc95c5cc21285f22059058c45bd009fd Mon Sep 17 00:00:00 2001
From: XieYongHong <18010623010@163.com>
Date: Tue, 5 Dec 2023 10:44:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                    |  2 ++
 src/components/FRuleEditor-copy/Debug/index.vue |  3 +--
 src/views/system/Menu/index.vue                 | 15 ++++++---------
 yarn.lock                                       | 15 +++++++++++++++
 4 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index dc3a1f35..bbf571d7 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
     "prepare": "husky install"
   },
   "dependencies": {
+    "@ant-design/icons-vue": "^7.0.1",
     "@liveqing/liveplayer-v3": "^3.7.10",
     "@types/marked": "^4.0.8",
     "@vitejs/plugin-vue-jsx": "^3.0.0",
@@ -37,6 +38,7 @@
     "nrm": "^1.2.5",
     "pinia": "^2.0.28",
     "rollup-plugin-copy": "^3.4.0",
+    "rxjs": "^7.8.1",
     "unplugin-auto-import": "^0.12.1",
     "unplugin-vue-components": "^0.22.12",
     "v-clipboard3": "^0.1.4",
diff --git a/src/components/FRuleEditor-copy/Debug/index.vue b/src/components/FRuleEditor-copy/Debug/index.vue
index 757cb47a..fa98f583 100644
--- a/src/components/FRuleEditor-copy/Debug/index.vue
+++ b/src/components/FRuleEditor-copy/Debug/index.vue
@@ -71,7 +71,6 @@
 </template>
 <script setup lang="ts" name="Debug">
 import { PropType } from 'vue';
-import { DeleteOutlined, PlusOutlined } from '@ant-design/icons-vue';
 import { useProductStore } from '@/store/product';
 import { useRuleEditorStore } from '@/store/ruleEditor';
 import moment from 'moment';
@@ -300,4 +299,4 @@ getProperty()
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/system/Menu/index.vue b/src/views/system/Menu/index.vue
index c744ffd2..9265d9c8 100644
--- a/src/views/system/Menu/index.vue
+++ b/src/views/system/Menu/index.vue
@@ -196,17 +196,14 @@ const table = reactive({
                     ],
                 },
                 {
-                terms:[
+                  type: 'or',
+                  terms:[
                     {
-                        terms:[
-                            {
-                                value:"%show\":true%",
-                                termType:"like",
-                                column:"options"
-                            }
-                        ]
+                      value:"%show\":true%",
+                      termType:"like",
+                      column:"options"
                     }
-                ]
+                  ]
             }
             ],
         };
diff --git a/yarn.lock b/yarn.lock
index 093c3df7..810c2ed2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -54,6 +54,14 @@
     "@ant-design/colors" "^6.0.0"
     "@ant-design/icons-svg" "^4.2.1"
 
+"@ant-design/icons-vue@^7.0.1":
+  version "7.0.1"
+  resolved "https://registry.npmjs.org/@ant-design/icons-vue/-/icons-vue-7.0.1.tgz#83de301771fadd03f3890e627314102405c31c22"
+  integrity sha512-eCqY2unfZK6Fe02AwFlDHLfoyEFreP6rBwAZMIJ1LugmfMiVgwWDYlp1YsRugaPtICYOabV1iWxXdP12u9U43Q==
+  dependencies:
+    "@ant-design/colors" "^6.0.0"
+    "@ant-design/icons-svg" "^4.2.1"
+
 "@antfu/utils@^0.7.2":
   version "0.7.2"
   resolved "https://registry.npmjs.org/@antfu/utils/-/utils-0.7.2.tgz"
@@ -5891,6 +5899,13 @@ rxjs@^7.5.7:
   dependencies:
     tslib "^2.1.0"
 
+rxjs@^7.8.1:
+  version "7.8.1"
+  resolved "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543"
+  integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==
+  dependencies:
+    tslib "^2.1.0"
+
 safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.jetlinks.cn/safe-buffer/-/safe-buffer-5.2.1.tgz"