Merge branch 'dev' of http://192.168.18.88:8077/sznyb/daimp-front into dev

main/src/components/custom-table-operate/index.vue

@@ -1,7 +1,11 @@
 <template>
   <el-dropdown popper-class="custom-table-operate">
-    <el-icon class="custom-table-operate__more"><More /></el-icon>
-    <template #dropdown>
+    <el-icon class="custom-table-operate__more">
+      <template v-if="show">
+        <More />
+      </template>
+    </el-icon>
+    <template v-if="show" #dropdown>
       <el-dropdown-menu v-if="!isEmpty(actions)">
         <template v-for="item in actions" :key="item.name">
           <el-dropdown-item v-if="onPermission(item)" @click="item.event(data)">
@@ -20,6 +24,7 @@ import { isEmpty } from '@/utils';
 const props = defineProps({
   actions: { type: Array, default: () => [] },
   data: { type: Object, default: () => {} },
+  show: { type: Boolean, default: true },
 });
 
 const onPermission = (row) => {

sub-government-affairs-service/src/apis/system/menu.js

@@ -47,7 +47,6 @@ export function GetMenu(dictType) {
 }
 
 // 查询菜单下拉树结构
-// 返回parentId
 export function GetMenuTree() {
   return request('/system/menu/treeselect', {
     method: 'GET',

sub-government-affairs-service/src/config/index.js

@@ -31,6 +31,7 @@ export const CRUD_OPTIONS = {
   menuWidth: 100,
   actions: [],
   dialogDrag: true,
+  rowKey: 'id',
 };
 
 export const CRUD_VIEW_OPTIONS = {