Merge remote-tracking branch 'origin/master'

base-manager-ui/admin/src/pages/basicset/appmarket/components/MoveApp.vue

@@ -376,10 +376,12 @@ export default {
     },
     // 过滤分类展示
     filterItems(appThemeName) {
-      return (
-        this.categoryList.find((v) => v.id == appThemeName)?.categoryName ||
-        "--"
-      );
+      let row = this.categoryList.find((v) => v.id == appThemeName);
+      let str = "--";
+      if (row) {
+        str = row.categoryName;
+      }
+      return str;
     },
     // 预览图片
     handlePreview(url) {

base-manager-ui/admin/src/pages/basicset/appmarket/components/TerminalApp.vue

@@ -360,10 +360,12 @@ export default {
     },
     // 过滤分类展示
     filterItems(appThemeName) {
-      return (
-        this.categoryList.find((v) => v.id == appThemeName)?.categoryName ||
-        "--"
-      );
+      let row = this.categoryList.find((v) => v.id == appThemeName);
+      let str = "--";
+      if (row) {
+        str = row.categoryName;
+      }
+      return str;
     },
     // 预览图片
     handlePreview(url) {