Merge branch 'main' of http://182.92.169.222:3000/zhc077/hnjd_comp

jeecgboot-vue3-master/src/layouts/default/header/index.vue

@@ -24,19 +24,12 @@
     <!-- action  -->
     <div :class="`${prefixCls}-action`">
       <AppSearch :class="`${prefixCls}-action__item `" v-if="getShowSearch" />
-
       <ErrorAction v-if="getUseErrorHandle" :class="`${prefixCls}-action__item error-action`" />
-
       <Notify v-if="getShowNotice" :class="`${prefixCls}-action__item notify-item`" />
-
       <FullScreen v-if="getShowFullScreen" :class="`${prefixCls}-action__item fullscreen-item`" />
-
       <LockScreen v-if="getUseLockPage" />
-
+<!--      <AppLocalePicker v-if="getShowLocalePicker" :reload="true" :showText="false" :class="`${prefixCls}-action__item`" />-->
-      <AppLocalePicker v-if="getShowLocalePicker" :reload="true" :showText="false" :class="`${prefixCls}-action__item`" />
-
       <UserDropDown :theme="getHeaderTheme" />
-
       <SettingDrawer v-if="getShowSetting" :class="`${prefixCls}-action__item`" />
     </div>
   </Header>

jeecgboot-vue3-master/src/settings/projectSetting.ts

@@ -73,7 +73,7 @@ const setting: ProjectConfig = {
     // 主题
     theme: ThemeEnum.LIGHT,
     // 开启锁屏功能
-    useLockPage: true,
+    useLockPage: false,
     // 显示全屏按钮
     showFullScreen: true,
     // 显示文档按钮

jeecgboot-vue3-master/src/views/cms/admin/subweside/SubwesideList.vue

@@ -30,7 +30,7 @@
       </template>
       <!--操作栏-->
       <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+        <TableAction :actions="getTableAction(record)" />
       </template>
       <!--字段回显插槽-->
       <template #htmlSlot="{text}">
@@ -155,13 +155,24 @@
         label: '编辑',
         onClick: handleEdit.bind(null, record),
       },
+      {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        }
+      },
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      }
     ];
   }
    
   /**
    * 下拉操作栏
    */
-  function getDropDownAction(record) {
+/*  function getDropDownAction(record) {
     return [
       {
         label: '详情',
@@ -174,7 +185,7 @@
         }
       }
     ]
-  }
+  }*/
 
   /**
    * 查询