feat: 新增看板管理公共看板

@@ -12,6 +12,7 @@
     "MQTT",
     "notif",
     "PROTOBUF",
+    "SCADA",
     "SNMP",
     "unref",
     "vben",

@@ -22,6 +22,7 @@ enum DataBoardUrl {
   DELETE_DATA_BOARD = '/data_board',
   UPDATE_DATA_BOARD = '/data_board/update',
   UPDATE_DATA_BOARD_LAYOUT = '/data_board',
+  SHARE_DATA_BOARD = '/data_board/share',
 }
 
 enum DataComponentUrl {
@@ -232,3 +233,16 @@ export const getDeviceRelation = (params: { deviceId: string; isSlave: boolean }
     params,
   });
 };
+
+export const shareBoard = (record: {
+  id: string;
+  accessCredentials?: string;
+  isShare?: boolean;
+}) => {
+  const { id, isShare, accessCredentials } = record;
+  return defHttp.post({
+    url: `${DataBoardUrl.SHARE_DATA_BOARD}/${id}?isShare=${isShare}${
+      accessCredentials ? `&accessCredentials=${accessCredentials}` : ''
+    }`,
+  });
+};

@@ -48,6 +48,8 @@ export interface DataBoardRecord {
   layout: Layout[];
   defaultConfig: string;
   tenantStatus: string;
+  publicId: string;
+  accessCredentials?: string;
 }
 
 export interface DataBoardList {

+import { ViewTypeEnum } from '/@/views/sys/share/config/config';
+
+export interface ShareRouteParams {
+  id: string;
+  viewType: ViewTypeEnum;
+  publicId: string;
+}

+import { defHttp } from '/@/utils/http/axios';
+import { ViewTypeEnum } from '/@/views/sys/share/config/config';
+
+enum Api {
+  CHECK = '/share/check',
+  PUBLIC_LOGIN = '/auth/login/public',
+  SHARE_CONTENT = '/share',
+}
+
+export const checkShareAccessToken = (type: ViewTypeEnum, id: string) => {
+  return defHttp.get<Record<'data', boolean>>({
+    url: `${Api.CHECK}/${type}/${id}`,
+  });
+};
+
+export const sharePageLogin = (publicId: string) => {
+  return defHttp.post<Record<'token' | 'refreshToken', string>>(
+    {
+      url: Api.PUBLIC_LOGIN,
+      data: { publicId },
+    },
+    {
+      joinPrefix: false,
+    }
+  );
+};
+
+export const getShareContent = (record: Record<'accessCredentials' | 'id', string>) => {
+  const { id, accessCredentials } = record;
+  return defHttp.get({
+    url: `${Api.SHARE_CONTENT}/${ViewTypeEnum.DATA_BOARD}/share_data/${id}`,
+    params: { accessCredentials },
+  });
+};

@@ -14,4 +14,6 @@ export const PageEnum = {
   //设备配置
   DEVICE_PROFILE: '/product/profiles',
   DEVICE_LIST: '/device/list',
+
+  SHARE_PAGE: '/share/:viewType/:id/:publicId',
 };

@@ -10,7 +10,8 @@ import { getAuthCache } from '/@/utils/auth';
 
 const LOGIN_PATH = PageEnum.BASE_LOGIN;
 const ROOT_PATH = RootRoute.path;
-const whitePathList: string[] = [LOGIN_PATH];
+const SHARE_PATH = PageEnum.SHARE_PAGE;
+const whitePathList: string[] = [LOGIN_PATH, SHARE_PATH];
 // const userInfo1 = getAuthCache(USER_INFO_KEY);
 // const userInfo = ref(userInfo1);
 
@@ -32,7 +33,7 @@ export function createPermissionGuard(router: Router) {
     const token = userStore.getJwtToken;
     // Whitelist can be directly entered
     // 路由守卫拦截, 如果是已经登陆情况, 就不要回到登陆页面了;
-    if (whitePathList.includes(to.path as PageEnum)) {
+    if (to.matched.find((item) => whitePathList.includes(item.path))) {
       if (to.path === LOGIN_PATH && token) {
         const isSessionTimeout = userStore.getSessionTimeout;
         try {

@@ -4,6 +4,7 @@ import { mainOutRoutes } from './mainOut';
 import { PageEnum } from '/@/enums/pageEnum';
 import { t } from '/@/hooks/web/useI18n';
 import { LAYOUT } from '../constant';
+import { PUBLIC_PAGE_ROUTER } from './public';
 
 const modules = import.meta.globEager('./modules/**/*.ts');
 const routeModuleList: AppRouteModule[] = [];
@@ -86,4 +87,5 @@ export const basicRoutes = [
   REDIRECT_ROUTE,
   PAGE_NOT_FOUND_ROUTE,
   DATA_BOARD_SHARE,
+  PUBLIC_PAGE_ROUTER,
 ];

+import { AppRouteRecordRaw } from '../types';
+import { PageEnum } from '/@/enums/pageEnum';
+
+export const PUBLIC_PAGE_ROUTER: AppRouteRecordRaw = {
+  path: PageEnum.SHARE_PAGE,
+  name: 'publicPage',
+  component: () => import('/@/views/sys/share/index.vue'),
+  meta: {
+    title: '公开',
+    hideBreadcrumb: true,
+    hideChildrenInMenu: true,
+  },
+};

+import { useRouter } from 'vue-router';
+
+export enum ViewTypeEnum {
+  DATA_BOARD = 'DATA_BOARD',
+  LARGE_SCREEN = 'LARGE_SCREEN',
+  SCADA = 'SCADA',
+}
+
+export const goShareUrl = (options: { type: ViewTypeEnum; id: string }, openNew?: false) => {
+  const { type, id } = options;
+  const ROUTER = useRouter();
+  const { origin } = location;
+  const path = `/share/${type}/${id}`;
+  openNew ? ROUTER.push(path) : open(`${origin}${path}`);
+};

+<script lang="ts" setup>
+  import { onMounted } from 'vue';
+  import { BasicModal, useModal } from '/@/components/Modal';
+  import { Spin } from 'ant-design-vue';
+  import { ref } from 'vue';
+  import { useRoute } from 'vue-router';
+  import { checkShareAccessToken, sharePageLogin, getShareContent } from '/@/api/sys/share';
+  import { ShareRouteParams } from '/@/api/sys/model/shareModel';
+  import { useUserStore } from '/@/store/modules/user';
+  import { BasicForm, useForm } from '/@/components/Form';
+  import { FieldsEnum } from '../../visual/board/config/share';
+  import BoardDetail from '/@/views/visual/board/detail/index.vue';
+
+  const loading = ref(true);
+  const ROUTE = useRoute();
+  const contentData = ref<any>();
+  const canLoadComponent = ref(false);
+
+  const [register, { openModal }] = useModal();
+
+  const [registerForm, { getFieldsValue }] = useForm({
+    schemas: [
+      {
+        field: FieldsEnum.ACCESS_CREDENTIALS,
+        component: 'Input',
+        label: '访问令牌',
+      },
+    ],
+    showActionButtonGroup: false,
+    layout: 'inline',
+    labelWidth: 100,
+  });
+
+  const userStore = useUserStore();
+
+  const getShareToken = async () => {
+    const { params } = ROUTE;
+    const { publicId } = params as Partial<ShareRouteParams>;
+    const { token, refreshToken } = await sharePageLogin(publicId!);
+    userStore.storeToken(token, refreshToken);
+  };
+
+  const getCheckNeedAccessToken = async () => {
+    const { params } = ROUTE;
+    loading.value = true;
+    const { viewType, id } = params as Partial<ShareRouteParams>;
+    const { data } = await checkShareAccessToken(viewType!, id!);
+    data ? openModal(data) : await getContentData();
+  };
+
+  const getContentLoading = ref(false);
+  const getContentData = async () => {
+    try {
+      getContentLoading.value = true;
+      const { params } = ROUTE;
+      const { id } = params as unknown as ShareRouteParams;
+      const value = getFieldsValue() as Record<'accessCredentials', string>;
+      const result = await getShareContent({ id, ...value });
+      contentData.value = result;
+      loading.value = false;
+      canLoadComponent.value = true;
+      openModal(false);
+    } catch (error) {
+    } finally {
+      getContentLoading.value = false;
+    }
+  };
+
+  const handleSubmit = async () => {
+    await getContentData();
+  };
+
+  onMounted(async () => {
+    await getShareToken();
+    await getCheckNeedAccessToken();
+  });
+</script>
+
+<template>
+  <BasicModal
+    @register="register"
+    title="公开"
+    @ok="handleSubmit"
+    :showCancelBtn="false"
+    :okButtonProps="{ loading: getContentLoading }"
+  >
+    <BasicForm @register="registerForm" />
+  </BasicModal>
+  <Spin
+    :spinning="loading"
+    tip="正在加载中..."
+    size="large"
+    class="!flex justify-center items-center w-full h-full share-full-loading"
+  >
+    <BoardDetail v-if="canLoadComponent" :value="contentData" />
+  </Spin>
+</template>
+
+<style lang="less" scoped></style>

@@ -30,10 +30,18 @@
 
   const { createMessage } = useMessage();
 
+  const handleSubmitValue = (value: Recordable) => {
+    if (!Reflect.get(value, 'accessCredentials')) {
+      Reflect.deleteProperty(value, 'accessCredentials');
+    }
+    return value as any;
+  };
+
   const handleCreatePanel = async () => {
     await method.validate();
     try {
-      const value = method.getFieldsValue() as AddDataBoardParams;
+      let value = method.getFieldsValue() as AddDataBoardParams;
+      value = handleSubmitValue(value);
       loading.value = true;
       changeLoading(true);
       await addDataBoard(value);
@@ -52,7 +60,8 @@
     await method.validate();
     try {
       loading.value = true;
-      const value = method.getFieldsValue() as UpdateDataBoardParams;
+      let value = method.getFieldsValue() as UpdateDataBoardParams;
+      value = handleSubmitValue(value);
       value.id = unref(recordId) as string;
       changeLoading(true);
       await updateDataBoard(value);

+<script lang="ts" setup>
+  import { BasicForm, useForm } from '/@/components/Form';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { FieldsEnum, schemas } from '../config/share';
+  import { DataBoardRecord } from '/@/api/dataBoard/model';
+  import { Alert } from 'ant-design-vue';
+  import { ref, unref } from 'vue';
+  import { shareBoard } from '/@/api/dataBoard';
+  import { ViewType } from '../config/panelDetail';
+  import { nextTick } from 'vue';
+
+  const loading = ref(false);
+  const record = ref<DataBoardRecord>({} as unknown as DataBoardRecord);
+
+  const [register, { closeModal }] = useModalInner(async (data: DataBoardRecord) => {
+    record.value = data;
+    await nextTick();
+    setFieldsValue({
+      [FieldsEnum.IS_SHARE]: data.viewType === ViewType.PUBLIC_VIEW,
+      [FieldsEnum.ACCESS_CREDENTIALS]: data.accessCredentials,
+    });
+  });
+
+  const [registerForm, { getFieldsValue, setFieldsValue }] = useForm({
+    schemas,
+    showActionButtonGroup: false,
+    layout: 'inline',
+    labelWidth: 120,
+  });
+
+  const emit = defineEmits(['register', 'success']);
+
+  const handleSubmit = async () => {
+    try {
+      loading.value = true;
+      const value = getFieldsValue();
+      const { id } = unref(record);
+      await shareBoard({ id, ...value });
+      closeModal();
+      emit('success');
+    } finally {
+      loading.value = false;
+    }
+  };
+</script>
+
+<template>
+  <BasicModal title="分享" @register="register" @ok="handleSubmit" :loading="loading">
+    <Alert
+      class="!mb-4"
+      type="info"
+      message="私有视图只有项目成员可以浏览,公开视图拥有一个公开的 URL,任何人无需登录即可浏览."
+    />
+    <BasicForm @register="registerForm" />
+  </BasicModal>
+</template>

+import { ViewTypeEnum } from '/@/views/sys/share/config/config';
+
 export enum MoreActionEvent {
   EDIT = 'edit',
   COPY = 'copy',
   DELETE = 'delete',
+  SHARE = 'share',
 }
 
 export enum VisualBoardPermission {
@@ -24,11 +27,8 @@ export const DEFAULT_WIDGET_HEIGHT = 6;
 export const DEFAULT_MIN_HEIGHT = 5;
 export const DEFAULT_MIN_WIDTH = 3;
 
-export const DATA_BOARD_SHARE_URL = (
-  boardId = ':boardId',
-  tenantId = ':tenantId',
-  name = ':boardName?'
-) => `/data/board/share/${boardId}/${tenantId}/${name}`;
+export const DATA_BOARD_SHARE_URL = (id: string, publicId: string) =>
+  `/share/${ViewTypeEnum.DATA_BOARD}/${id}/${publicId}`;
 
 export const isBataBoardSharePage = (url: string) => {
   const reg = /^\/data\/board\/share/g;

@@ -35,22 +35,6 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
-    field: 'viewType',
-    label: '公开性',
-    component: 'RadioGroup',
-    defaultValue: ViewType.PRIVATE_VIEW,
-    helpMessage: [
-      '私有视图只有项目成员可以浏览。公开视图拥有一个公开的 URL,任何人无需登录即可浏览。    ',
-    ],
-    componentProps: {
-      placeholder: '请选择公开性',
-      options: [
-        { label: '私有看板', value: ViewType.PRIVATE_VIEW },
-        { label: '公开看板', value: ViewType.PUBLIC_VIEW, disabled: true },
-      ],
-    },
-  },
-  {
     field: 'remark',
     label: '备注',
     component: 'InputTextArea',

+import { FormSchema } from '/@/components/Form';
+
+export enum FieldsEnum {
+  IS_SHARE = 'isShare',
+  ACCESS_CREDENTIALS = 'accessCredentials',
+}
+
+export const schemas: FormSchema[] = [
+  {
+    field: FieldsEnum.IS_SHARE,
+    label: '公开性',
+    component: 'Switch',
+    defaultValue: false,
+  },
+  {
+    field: FieldsEnum.ACCESS_CREDENTIALS,
+    label: '访问凭证',
+    component: 'Input',
+    ifShow: ({ model }) => model[FieldsEnum.IS_SHARE],
+    componentProps: {
+      maxLength: 64,
+    },
+  },
+];

@@ -14,7 +14,6 @@
     DEFAULT_MIN_WIDTH,
     DEFAULT_WIDGET_HEIGHT,
     DEFAULT_WIDGET_WIDTH,
-    isBataBoardSharePage,
     MoreActionEvent,
     VisualComponentPermission,
   } from '../config/config';
@@ -22,7 +21,6 @@
     addDataComponent,
     deleteDataComponent,
     getDataComponent,
-    getShareBoardComponentInfo,
     updateDataBoardLayout,
   } from '/@/api/dataBoard';
   import { useRoute, useRouter } from 'vue-router';
@@ -48,6 +46,10 @@
   import { useScript } from '/@/hooks/web/useScript';
   import { BAI_DU_MAP_GL_LIB, BAI_DU_MAP_TRACK_ANIMATION } from '/@/utils/fnUtils';
 
+  const props = defineProps<{
+    value: Recordable;
+  }>();
+
   const ROUTE = useRoute();
 
   const ROUTER = useRouter();
@@ -67,13 +69,12 @@
     return decode((ROUTE.params as { boardName: string }).boardName || '');
   });
 
-  const getSharePageParams = computed(() => {
-    const { boardId, tenantId } = ROUTE.params as { boardId: string; tenantId: string };
-    return { boardId: decode(boardId), tenantId: decode(tenantId) };
+  const getSharePageData = computed(() => {
+    return props.value;
   });
 
   const getIsSharePage = computed(() => {
-    return isBataBoardSharePage(ROUTE.path);
+    return ROUTE.matched.find((item) => item.path === '/share/:viewType/:id/:publicId');
   });
 
   const widgetEl = new Map<string, Fn>();
@@ -220,19 +221,9 @@
     return {} as ComponentInfoDetail;
   };
 
-  const getSharePageComponentData = async () => {
-    try {
-      const params = unref(getSharePageParams);
-      return await getShareBoardComponentInfo(params);
-    } catch (error) {}
-    return {} as ComponentInfoDetail;
-  };
-
   const getDataBoradDetail = async () => {
     try {
-      return unref(getIsSharePage)
-        ? await getSharePageComponentData()
-        : await getBasePageComponentData();
+      return unref(getIsSharePage) ? unref(getSharePageData) : await getBasePageComponentData();
     } catch (error) {}
     return {} as ComponentInfoDetail;
   };
@@ -388,7 +379,7 @@
 
 <template>
   <section class="flex flex-col overflow-hidden h-full w-full board-detail">
-    <PageHeader>
+    <PageHeader v-if="!getIsSharePage">
       <template #title>
         <div class="flex items-center">
           <img

@@ -21,6 +21,7 @@
   import { encode } from './config/config';
   import { useForm, BasicForm } from '/@/components/Form';
   import { formSchema } from './config/searchForm';
+  import ShareModal from './components/ShareModal.vue';
 
   const ListItem = List.Item;
   const router = useRouter();
@@ -77,14 +78,15 @@
     getDatasource();
   }
 
-  const createShareUrl = (boardId: string, tenantId: string, name: string) => {
+  const createShareUrl = (record: DataBoardRecord) => {
     const { origin } = location;
-    return `${origin}${DATA_BOARD_SHARE_URL(encode(boardId), encode(tenantId), encode(name))}`;
+    const { id, publicId } = record;
+    return `${origin}${DATA_BOARD_SHARE_URL(id, publicId)}`;
   };
 
   const { clipboardRef } = useCopyToClipboard();
   const handleCopyShareUrl = (record: DataBoardRecord) => {
-    clipboardRef.value = createShareUrl(record.id, record.tenantId, record.name);
+    clipboardRef.value = createShareUrl(record);
     unref(clipboardRef) ? createMessage.success('复制成功') : createMessage.error('未找到分享链接');
   };
 
@@ -92,7 +94,13 @@
   const dropMenuList = computed<DropMenu[]>(() => {
     const hasUpdatePermission = hasPermission(VisualBoardPermission.UPDATE);
     const hasDeletePermission = hasPermission(VisualBoardPermission.DELETE);
-    const basicMenu: DropMenu[] = [];
+    const basicMenu: DropMenu[] = [
+      {
+        text: '分享',
+        event: MoreActionEvent.SHARE,
+        icon: 'ant-design:share-alt-outlined',
+      },
+    ];
     if (hasUpdatePermission)
       basicMenu.push({
         text: '编辑',
@@ -124,6 +132,10 @@
     }
   };
 
+  const handleOpenShareModal = (record: DataBoardRecord) => {
+    openShareModal(true, record);
+  };
+
   const handleMenuEvent = (event: DropMenu, record: DataBoardRecord) => {
     if (event.event === MoreActionEvent.EDIT) handleEdit(record);
     if (event.event === MoreActionEvent.DELETE) {
@@ -133,6 +145,7 @@
         onOk: () => handleRemove(record),
       });
     }
+    if (event.event === MoreActionEvent.SHARE) handleOpenShareModal(record);
   };
 
   const handleEdit = (record: DataBoardRecord) => {
@@ -156,6 +169,8 @@
 
   const [registerModal, { openModal }] = useModal();
 
+  const [registerShareModal, { openModal: openShareModal }] = useModal();
+
   const handleViewBoard = (record: DataBoardRecord) => {
     const hasDetailPermission = hasPermission(VisualBoardPermission.DETAIL);
     if (hasDetailPermission) {
@@ -238,10 +253,7 @@
                     <span>
                       {{ item.viewType === ViewType.PRIVATE_VIEW ? '私有看板' : '公共看板' }}
                     </span>
-                    <span
-                      style="display: none"
-                      v-if="item.viewType === ViewType.PUBLIC_VIEW && false"
-                    >
+                    <span v-if="item.viewType === ViewType.PUBLIC_VIEW">
                       <Tooltip title="点击复制分享链接">
                         <ShareAltOutlined class="ml-2" @click.stop="handleCopyShareUrl(item)" />
                       </Tooltip>
@@ -255,6 +267,7 @@
         </template>
       </List>
     </Spin>
+    <ShareModal @register="registerShareModal" @success="getDatasource" />
     <PanelDetailModal @register="registerModal" @change="getDatasource" />
   </PageWrapper>
 </template>