Merge remote-tracking branch 'origin/master'

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

@@ -23,7 +23,7 @@
         }"
         :loading="loading"
         bordered
-        :scroll="{ y: 580 }"
+        :scroll="{ y: 560 }"
         :columns="columns"
         :pagination="{
           showTotal: (total) => `共 ${total} 条`,
@@ -377,7 +377,8 @@ export default {
     // 过滤分类展示
     filterItems(appThemeName) {
       return (
-        this.categoryList.find((v) => v.id == appThemeName).categoryName || "--"
+        this.categoryList.find((v) => v.id == appThemeName)?.categoryName ||
+        "--"
       );
     },
     // 预览图片

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

@@ -23,7 +23,7 @@
         }"
         :loading="loading"
         bordered
-        :scroll="{ y: 580 }"
+        :scroll="{ y: 560 }"
         :columns="columns"
         :pagination="{
           showTotal: (total) => `共 ${total} 条`,
@@ -361,7 +361,8 @@ export default {
     // 过滤分类展示
     filterItems(appThemeName) {
       return (
-        this.categoryList.find((v) => v.id == appThemeName).categoryName || "--"
+        this.categoryList.find((v) => v.id == appThemeName)?.categoryName ||
+        "--"
       );
     },
     // 预览图片

base-manager-ui/admin/src/pages/basicset/deploy/deploy.vue

@@ -30,7 +30,7 @@
           :loading="loading"
           bordered
           :columns="columns"
-          :scroll="{ y: 580 }"
+          :scroll="{ y: 560 }"
           :pagination="{
             showTotal: (total) => `共 ${total} 条`,
             current: current,

base-manager-ui/admin/src/pages/basicset/dept/department.vue

@@ -125,7 +125,7 @@
           <div class="table-content">
             <!-- 表格 -->
             <a-table
-              :scroll="{ y: 560 }"
+              :scroll="{ y: 550 }"
               :loading="loading"
               bordered
               :columns="columns"

base-manager-ui/admin/src/pages/basicset/workman/personnel.vue

@@ -206,7 +206,7 @@
               onShowSizeChange: showSizeChange,
             }"
             bordered
-            :scroll="{ y: 510 }"
+            :scroll="{ y: 500 }"
             :loading="loading"
             :columns="columns"
             :data-source="WorkmanData"