Merge branch 'main_dev' into ft

@@ -48,6 +48,7 @@
       'update:value',
       'change',
       'check',
+      'unSelectAll',
       'update:searchValue',
     ],
     setup(props, { attrs, slots, emit, expose }) {
@@ -188,6 +189,7 @@
       }
 
       function checkAll(checkAll: boolean) {
+        if (!checkAll) emit('unSelectAll');
         state.checkedKeys = checkAll ? getEnabledKeys() : ([] as Keys);
       }
 

@@ -22,6 +22,16 @@ export enum ConfigurationPermission {
   PREVIEW = 'api:yt:dataview:center:get_configuration_info:preview',
   PUBLISH = 'api:yt:dataview:center:publish',
   // CANCEL_PUBLISH = 'api:yt:dataview:center:cancel_publish',
+  PUBLISH_INTERFACE = 'api:yt:dataview:center:public_interface',
+}
+
+export enum PublicInterface {
+  CREATE = 'api:yt:dataview:center:public_interface:post',
+  LIST = 'api:yt:dataview:center:public_interface:list',
+  UPDATE = 'api:yt:dataview:center:public_interface:update',
+  DELETE = 'api:yt:dataview:center:public_interface:delete',
+  PUBLISH = 'api:yt:dataview:center:public_interface:publish',
+  CANCEL_PUBLISH = 'api:yt:dataview:center:public_interface:cancel',
 }
 
 // 查询字段

@@ -218,7 +218,10 @@
             <Authority v-if="!isCustomerUser" :value="ConfigurationPermission.CREATE">
               <Button type="primary" @click="handleCreateOrUpdate()"> 新增大屏 </Button>
             </Authority>
-            <Authority v-if="hasPublicInterfacePermission" :value="ConfigurationPermission.CREATE">
+            <Authority
+              v-if="hasPublicInterfacePermission"
+              :value="ConfigurationPermission.PUBLISH_INTERFACE"
+            >
               <Button type="primary" @click="handleCreateOrUpdatePublicApi()">公共接口管理</Button>
             </Authority>
             <CardLayoutButton v-model:value="listColumn" @change="handleCardLayoutChange" />

@@ -9,23 +9,30 @@
         <a-button type="link" class="ml-2" @click="handleRecordContent(record)"> 查看 </a-button>
       </template>
       <template #toolbar>
-        <a-button type="primary" @click="handleCreateOrEdit(null)"> 新增公共接口 </a-button>
-        <Popconfirm
-          title="您确定要批量删除数据"
-          ok-text="确定"
-          cancel-text="取消"
-          @confirm="handleDeleteOrBatchDelete(null)"
-        >
-          <a-button color="error" :disabled="hasBatchDelete"> 批量删除 </a-button>
-        </Popconfirm>
-        <Popconfirm
-          title="您确定要批量发布"
-          ok-text="确定"
-          cancel-text="取消"
-          @confirm="handleBatchPublish('batchPublish')"
-        >
-          <a-button color="error" :disabled="hasBatchPublish"> 批量发布 </a-button>
-        </Popconfirm>
+        <Authority :value="PublicInterface.CREATE">
+          <a-button type="primary" @click="handleCreateOrEdit(null)"> 新增公共接口 </a-button>
+        </Authority>
+
+        <Authority :value="PublicInterface.DELETE">
+          <Popconfirm
+            title="您确定要批量删除数据"
+            ok-text="确定"
+            cancel-text="取消"
+            @confirm="handleDeleteOrBatchDelete(null)"
+          >
+            <a-button color="error" :disabled="hasBatchDelete"> 批量删除 </a-button>
+          </Popconfirm>
+        </Authority>
+        <Authority :value="PublicInterface.PUBLISH">
+          <Popconfirm
+            title="您确定要批量发布"
+            ok-text="确定"
+            cancel-text="取消"
+            @confirm="handleBatchPublish('batchPublish')"
+          >
+            <a-button color="error" :disabled="hasBatchPublish"> 批量发布 </a-button>
+          </Popconfirm>
+        </Authority>
         <!-- <Popconfirm
           title="您确定要批量取消发布"
           ok-text="确定"
@@ -41,6 +48,7 @@
             {
               label: '发布',
               icon: 'ant-design:node-expand-outlined',
+              auth: PublicInterface.PUBLISH,
               onClick: handlePublish.bind(null, 'publish', record),
               ifShow: () => {
                 return record.state === 0 && record.creator === userId;
@@ -49,6 +57,7 @@
             {
               label: '取消发布',
               icon: 'ant-design:node-collapse-outlined',
+              auth: PublicInterface.CANCEL_PUBLISH,
               onClick: handlePublish.bind(null, 'canelPublish', record),
               ifShow: () => {
                 return record.state === 1 && record.creator === userId;
@@ -57,6 +66,7 @@
             {
               label: '修改',
               icon: 'clarity:note-edit-line',
+              auth: PublicInterface.UPDATE,
               onClick: handleCreateOrEdit.bind(null, record),
               ifShow: () => {
                 return record.state === 0 && record.creator === userId;
@@ -65,6 +75,7 @@
             {
               label: '删除',
               icon: 'ant-design:delete-outlined',
+              auth: PublicInterface.DELETE,
               color: 'error',
               ifShow: () => {
                 return record.state === 0 && record.creator === userId;
@@ -99,6 +110,8 @@
   import { useMessage } from '/@/hooks/web/useMessage';
   import { USER_INFO_KEY } from '/@/enums/cacheEnum';
   import { getAuthCache } from '/@/utils/auth';
+  import { PublicInterface } from '../config';
+  import { Authority } from '/@/components/Authority';
 
   const userInfo = getAuthCache(USER_INFO_KEY) as any;
 
@@ -119,7 +132,7 @@
     },
     useSearchForm: true,
     actionColumn: {
-      width: 150,
+      width: 180,
       title: '操作',
       dataIndex: 'action',
       slots: { customRender: 'action' },

@@ -16,6 +16,7 @@
             :replaceFields="{ title: 'name', key: 'id' }"
             :checkedKeys="roleMenus"
             @check="handleCheckClick"
+            @unSelectAll="handleUnSelectAll"
             checkable
             toolbar
             ref="treeRef"
@@ -128,6 +129,11 @@
       });
       const getTitle = computed(() => (!unref(isUpdate) ? '新增角色' : '编辑角色'));
 
+      // 取消全部的时候清除回显时获取的
+      const handleUnSelectAll = () => {
+        checkedKeysWithHalfChecked.value = [];
+      };
+
       async function handleSubmit() {
         setDrawerProps({ loading: true, confirmLoading: true });
         const { createMessage } = useMessage();
@@ -143,7 +149,8 @@
             roleType: RoleEnum.TENANT_ADMIN,
             menu,
           };
-          if (req.menu == undefined) return createMessage.error('请勾选权限菜单');
+          if (req.menu == undefined || !req.menu.length)
+            return createMessage.error('请勾选权限菜单');
           const res = await saveOrUpdateRoleInfoWithMenu(req);
           if (res) {
             closeDrawer();
@@ -247,6 +254,7 @@
         roleMenus,
         treeRef,
         handleCheckClick,
+        handleUnSelectAll,
       };
     },
   });

@@ -9,6 +9,7 @@ export enum VisualBoardPermission {
   UPDATE = 'api:yt:data_board:update:update',
   DELETE = 'api:yt:data_board:delete',
   CREATE = '',
+  SHARE = 'api:yt:data_board:share',
   DETAIL = 'api:yt:data_component:list',
 }
 

@@ -99,19 +99,22 @@
   const dropMenuList = computed<DropMenu[]>(() => {
     const hasUpdatePermission = hasPermission(VisualBoardPermission.UPDATE);
     const hasDeletePermission = hasPermission(VisualBoardPermission.DELETE);
-    const basicMenu: DropMenu[] = [
-      {
-        text: '分享',
-        event: MoreActionEvent.SHARE,
-        icon: 'ant-design:share-alt-outlined',
-      },
-    ];
+    const hasSharePermission = hasPermission(VisualBoardPermission.SHARE);
+    let basicMenu: DropMenu[] = [];
     if (hasUpdatePermission)
       basicMenu.push({
         text: '编辑',
         event: MoreActionEvent.EDIT,
         icon: 'ant-design:edit-outlined',
       });
+    if (hasSharePermission) {
+      basicMenu.push({
+        text: '分享',
+        event: MoreActionEvent.SHARE,
+        icon: 'ant-design:share-alt-outlined',
+      });
+    }
+
     if (hasDeletePermission)
       basicMenu.push({
         text: '删除',

@@ -99,6 +99,7 @@
           componentKey: TextComponent1Config.key,
           categoryKey: PackagesCategoryEnum.TEXT,
         };
+        activeKey.value = TabKeyEnum.BASIC;
         dataSource.value = [genNewDataSourceItem()];
       }
     }