Merge branch 'dev-fix-ww' into 'main_dev'

fix: 修复同浏览器下打开分享页面影响当前用户操作

See merge request yunteng/thingskit-front!549

@@ -16,6 +16,7 @@ import {
   UpdateDataComponentParams,
   UpdateDataComponentParams,
 } from './model';
 } from './model';
 import { defHttp } from '/@/utils/http/axios';
 import { defHttp } from '/@/utils/http/axios';
+import { isShareMode } from '/@/views/sys/share/hook';
 
 
 enum DataBoardUrl {
 enum DataBoardUrl {
   GET_DATA_BOARD = '/data_board',
   GET_DATA_BOARD = '/data_board',
@@ -224,7 +225,7 @@ export const sendCommandOneway = (params: SendCommandParams) => {
       url: `${SendCommand.ONEWAY}/${params.deviceId}`,
       url: `${SendCommand.ONEWAY}/${params.deviceId}`,
       params: params.value,
       params: params.value,
     },
     },
-    { joinPrefix: false }
+    { joinPrefix: false, withShareToken: isShareMode() }
   );
   );
 };
 };
 
 

 import { defHttp } from '/@/utils/http/axios';
 import { defHttp } from '/@/utils/http/axios';
 import { ViewTypeEnum } from '/@/views/sys/share/config/config';
 import { ViewTypeEnum } from '/@/views/sys/share/config/config';
+import { isShareMode } from '/@/views/sys/share/hook';
 
 
 enum Api {
 enum Api {
   CHECK = '/share/check',
   CHECK = '/share/check',
@@ -8,9 +9,14 @@ enum Api {
 }
 }
 
 
 export const checkShareAccessToken = (type: ViewTypeEnum, id: string) => {
 export const checkShareAccessToken = (type: ViewTypeEnum, id: string) => {
-  return defHttp.get<Record<'data', boolean>>({
-    url: `${Api.CHECK}/${type}/${id}`,
-  });
+  return defHttp.get<Record<'data', boolean>>(
+    {
+      url: `${Api.CHECK}/${type}/${id}`,
+    },
+    {
+      withShareToken: isShareMode(),
+    }
+  );
 };
 };
 
 
 export const sharePageLogin = (publicId: string) => {
 export const sharePageLogin = (publicId: string) => {
@@ -21,14 +27,20 @@ export const sharePageLogin = (publicId: string) => {
     },
     },
     {
     {
       joinPrefix: false,
       joinPrefix: false,
+      withShareToken: isShareMode(),
     }
     }
   );
   );
 };
 };
 
 
 export const getShareContent = (record: Record<'accessCredentials' | 'id', string>) => {
 export const getShareContent = (record: Record<'accessCredentials' | 'id', string>) => {
   const { id, accessCredentials } = record;
   const { id, accessCredentials } = record;
-  return defHttp.get({
-    url: `${Api.SHARE_CONTENT}/${ViewTypeEnum.DATA_BOARD}/share_data/${id}`,
-    params: { accessCredentials },
-  });
+  return defHttp.get(
+    {
+      url: `${Api.SHARE_CONTENT}/${ViewTypeEnum.DATA_BOARD}/share_data/${id}`,
+      params: { accessCredentials },
+    },
+    {
+      withShareToken: isShareMode(),
+    }
+  );
 };
 };

@@ -47,6 +47,7 @@ export interface TaskRecordType extends CreateTaskRecordType {
   enabled: boolean;
   enabled: boolean;
   state: number;
   state: number;
   lastExecuteTime?: number;
   lastExecuteTime?: number;
+  lastExecuteStr?: string;
   tkDeviceTaskCenter?: {
   tkDeviceTaskCenter?: {
     allowState: number;
     allowState: number;
     taskCenterId: string;
     taskCenterId: string;

 <script lang="ts" setup>
 <script lang="ts" setup>
   import { ReloadOutlined } from '@ant-design/icons-vue';
   import { ReloadOutlined } from '@ant-design/icons-vue';
-  import { Button, List, Tooltip } from 'ant-design-vue';
+  import { Button, List, Space, Tooltip } from 'ant-design-vue';
   import { reactive } from 'vue';
   import { reactive } from 'vue';
   import { ref } from 'vue';
   import { ref } from 'vue';
+  import { BasicForm, useForm } from '../../Form';
+  import { basicListProps } from './props';
+  import { ExtractPropTypes } from 'vue';
+  defineProps<ExtractPropTypes<typeof basicListProps>>();
+
+  const [registerForm] = useForm({
+    schemas: [
+      {
+        field: '123',
+        label: 'test',
+        component: 'Input',
+      },
+    ],
+    labelWidth: 100,
+    layout: 'inline',
+    baseColProps: { span: 8 },
+    showAdvancedButton: true,
+    compact: true,
+  });
 
 
   const listElRef = ref<Nullable<ComponentElRef>>(null);
   const listElRef = ref<Nullable<ComponentElRef>>(null);
 
 
-  const pagination = reactive({});
+  const pagination = reactive({ size: 'small' });
 
 
   const loading = ref(false);
   const loading = ref(false);
 
 
@@ -16,31 +35,48 @@
 </script>
 </script>
 
 
 <template>
 <template>
-  <section class="bg-light-50 my-4 p-4 x dark:text-gray-300 dark:bg-dark-900">
-    <List
-      ref="listElRef"
-      :dataSource="dataSource"
-      :pagination="pagination"
-      :grid="{ gutter: 16, xs: 1, sm: 1, md: 1, lg: 2, xl: 2, xxl: 3, column: 3 }"
-      :loading="loading"
-    >
-      <template #header>
-        <section class="flex justify-between gap-4 min-h-12 items-center">
-          <div class="text-lg font-semibold">
-            <span>任务列表</span>
-          </div>
-          <Tooltip title="刷新">
-            <Button type="primary" @click="getDataSource">
-              <ReloadOutlined :spin="loading" />
-            </Button>
-          </Tooltip>
-        </section>
-      </template>
-      <template #renderItem="{ item }">
-        <List.Item :key="item.id">
-          <slot name="item" :item="item"></slot>
-        </List.Item>
-      </template>
-    </List>
+  <section class="basic-list-container">
+    <section class="mb-4 bg-light-50 p-2 x dark:text-gray-300 dark:bg-dark-900">
+      <BasicForm @register="registerForm" />
+    </section>
+    <section class="bg-light-50 p-2 x dark:text-gray-300 dark:bg-dark-900">
+      <List
+        ref="listElRef"
+        :dataSource="dataSource"
+        :pagination="pagination"
+        :grid="{ gutter: 16, xs: 1, sm: 1, md: 1, lg: 2, xl: 2, xxl: 3, column: 3 }"
+        :loading="loading"
+      >
+        <template #header>
+          <section class="flex px-5 justify-between gap-4 min-h-12 items-center">
+            <div class="text-lg font-semibold">
+              <span>任务列表</span>
+            </div>
+            <Space>
+              <slot name="toolbar"></slot>
+              <Tooltip title="刷新">
+                <Button type="primary" @click="getDataSource">
+                  <ReloadOutlined :spin="loading" />
+                </Button>
+              </Tooltip>
+            </Space>
+          </section>
+        </template>
+        <template #renderItem="{ item }">
+          <List.Item :key="item.id">
+            <slot name="item" :item="item"></slot>
+          </List.Item>
+        </template>
+      </List>
+    </section>
   </section>
   </section>
 </template>
 </template>
+
+<style lang="less" scoped>
+  .basic-list-container {
+    :deep(.ant-list-header) {
+      padding-top: 0;
+      padding-bottom: 8px;
+    }
+  }
+</style>

+import type { ComputedRef, Slots } from 'vue';
+import type { BasicTableProps, FetchParams } from '../types/table';
+import { unref, computed } from 'vue';
+import type { FormProps } from '/@/components/Form';
+import { isFunction } from '/@/utils/is';
+
+export function useTableForm(
+  propsRef: ComputedRef<BasicTableProps>,
+  slots: Slots,
+  fetch: (opt?: FetchParams | undefined) => Promise<void>,
+  getLoading: ComputedRef<boolean | undefined>
+) {
+  const getFormProps = computed((): Partial<FormProps> => {
+    const { formConfig } = unref(propsRef);
+    const { submitButtonOptions } = formConfig || {};
+    return {
+      showAdvancedButton: true,
+      ...formConfig,
+      submitButtonOptions: { loading: unref(getLoading), ...submitButtonOptions },
+      compact: true,
+    };
+  });
+
+  const getFormSlotKeys: ComputedRef<string[]> = computed(() => {
+    const keys = Object.keys(slots);
+    return keys
+      .map((item) => (item.startsWith('form-') ? item : null))
+      .filter((item) => !!item) as string[];
+  });
+
+  function replaceFormSlotKey(key: string) {
+    if (!key) return '';
+    return key?.replace?.(/form\-/, '') ?? '';
+  }
+
+  function handleSearchInfoChange(info: Recordable) {
+    const { handleSearchInfoFn } = unref(propsRef);
+    if (handleSearchInfoFn && isFunction(handleSearchInfoFn)) {
+      info = handleSearchInfoFn(info) || info;
+    }
+    fetch({ searchInfo: info, page: 1 });
+  }
+
+  return {
+    getFormProps,
+    replaceFormSlotKey,
+    getFormSlotKeys,
+    handleSearchInfoChange,
+  };
+}

-import { ComponentPropsOptions } from 'vue';
+import { FormProps } from '../../Form';
 
 
-export const props = {
+export const basicListProps = {
+  immediate: {
+    type: Boolean,
+    default: true,
+  },
+  searchInfo: {
+    type: Object as PropType<Recordable>,
+  },
+  formConfig: {
+    type: Object as PropType<Partial<FormProps>>,
+    default: null,
+  },
   title: {
   title: {
     type: String,
     type: String,
   },
   },
-} as ComponentPropsOptions;
+  titleHelpMessage: {
+    type: [String, Array] as PropType<string | string[]>,
+  },
+  autoCreateKey: {
+    type: Boolean,
+    default: true,
+  },
+  api: {
+    type: Function as PropType<Fn<any, Promise<any>>>,
+  },
+  beforeFetch: {
+    type: Function as PropType<Fn>,
+  },
+  afterFetch: {
+    type: Function as PropType<Fn>,
+  },
+  handleSearchInfoFn: {
+    type: Function as PropType<Fn>,
+  },
+};

+import { FormProps } from 'ant-design-vue/es/form/Form';
+
+export interface BasicListProps {
+  /**
+   * @description 立即执行
+   */
+  immediate?: boolean;
+
+  /**
+   * @description 额外的请求参数
+   */
+  searchInfo?: Recordable;
+
+  /**
+   * @description 搜索表单
+   */
+  formConfig?: Partial<FormProps>;
+
+  /**
+   * @description 列表名
+   */
+  title?: string;
+
+  /**
+   * @description 列表标题帮助信息
+   */
+  titleHelpMessage?: string | string[];
+
+  /**
+   * @description 自动创建key
+   */
+  autoCreateKey?: boolean;
+
+  /**
+   * @description 请求接口
+   * @param args
+   * @returns
+   */
+  api?: (...args: any) => Promise<any>;
+
+  /**
+   * @description 请求前对参数处理
+   */
+  beforeFetch?: Fn;
+
+  /**
+   * @description 请求后对结果处理
+   */
+  afterFetch?: Fn;
+
+  /**
+   * @description 请求前处理搜索参数
+   */
+  handleSearchInfoFn?: Fn;
+}

@@ -5,6 +5,10 @@ export const JWT_TOKEN_KEY = 'JWT_TOKEN';
 
 
 export const REFRESH_TOKEN_KEY = 'REFRESH_TOKEN';
 export const REFRESH_TOKEN_KEY = 'REFRESH_TOKEN';
 
 
+export const SHARE_JWT_TOKEN_KEY = 'SHARE_JWT_TOKEN';
+
+export const SHARE_REFRESH_TOKEN_KEY = 'SHARE_REFRESH_TOKEN';
+
 export const LOCALE_KEY = 'LOCALE__';
 export const LOCALE_KEY = 'LOCALE__';
 
 
 // user info key
 // user info key

@@ -224,7 +224,7 @@ export const usePermissionStore = defineStore({
           // !Simulate to obtain permission codes from the background,
           // !Simulate to obtain permission codes from the background,
           // this function may only need to be executed once, and the actual project can be put at the right time by itself
           // this function may only need to be executed once, and the actual project can be put at the right time by itself
           let routeList: AppRouteRecordRaw[] = [];
           let routeList: AppRouteRecordRaw[] = [];
-          const userInfo: any = getAuthCache(USER_INFO_KEY);
+          const userInfo: any = getAuthCache(USER_INFO_KEY) || { roles: [] };
           const filterMenu = (allMenuList, menuIdsList) => {
           const filterMenu = (allMenuList, menuIdsList) => {
             return allMenuList
             return allMenuList
               .filter((item) => {
               .filter((item) => {

@@ -4,7 +4,14 @@ import { defineStore } from 'pinia';
 import { store } from '/@/store';
 import { store } from '/@/store';
 import { RoleEnum } from '/@/enums/roleEnum';
 import { RoleEnum } from '/@/enums/roleEnum';
 import { PageEnum } from '/@/enums/pageEnum';
 import { PageEnum } from '/@/enums/pageEnum';
-import { JWT_TOKEN_KEY, REFRESH_TOKEN_KEY, ROLES_KEY, USER_INFO_KEY } from '/@/enums/cacheEnum';
+import {
+  JWT_TOKEN_KEY,
+  REFRESH_TOKEN_KEY,
+  ROLES_KEY,
+  SHARE_JWT_TOKEN_KEY,
+  SHARE_REFRESH_TOKEN_KEY,
+  USER_INFO_KEY,
+} from '/@/enums/cacheEnum';
 import { getAuthCache, setAuthCache } from '/@/utils/auth';
 import { getAuthCache, setAuthCache } from '/@/utils/auth';
 import {
 import {
   LoginParams,
   LoginParams,
@@ -33,6 +40,8 @@ interface UserState {
   lastUpdateTime: number;
   lastUpdateTime: number;
   jwtToken?: string;
   jwtToken?: string;
   refreshToken?: string;
   refreshToken?: string;
+  shareJwtToken?: string;
+  shareRefreshToken?: string;
   outTarget?: string;
   outTarget?: string;
 }
 }
 
 
@@ -100,6 +109,13 @@ export const useUserStore = defineStore({
       setAuthCache(JWT_TOKEN_KEY, jwtToken);
       setAuthCache(JWT_TOKEN_KEY, jwtToken);
       setAuthCache(REFRESH_TOKEN_KEY, refreshToken);
       setAuthCache(REFRESH_TOKEN_KEY, refreshToken);
     },
     },
+
+    storeShareToken(jwtToken: string, refreshToken: string) {
+      this.shareJwtToken = jwtToken;
+      this.shareRefreshToken = refreshToken;
+      setAuthCache(SHARE_JWT_TOKEN_KEY, jwtToken);
+      setAuthCache(SHARE_REFRESH_TOKEN_KEY, refreshToken);
+    },
     setToken(info: string | undefined) {
     setToken(info: string | undefined) {
       this.jwtToken = info;
       this.jwtToken = info;
       setAuthCache(JWT_TOKEN_KEY, info);
       setAuthCache(JWT_TOKEN_KEY, info);
@@ -232,6 +248,18 @@ export const useUserStore = defineStore({
       }
       }
     },
     },
 
 
+    async doShareRefresh() {
+      try {
+        const req = { refreshToken: this.shareRefreshToken } as RefreshTokenParams;
+        const data = await doRefreshToken(req);
+        const { token, refreshToken } = data;
+        this.storeToken(token, refreshToken);
+      } catch (error) {
+        window.location.reload();
+        throw error;
+      }
+    },
+
     /**
     /**
      * @description: Confirm before logging out
      * @description: Confirm before logging out
      */
      */

 import { Persistent, BasicKeys } from '/@/utils/cache/persistent';
 import { Persistent, BasicKeys } from '/@/utils/cache/persistent';
-import { CacheTypeEnum } from '/@/enums/cacheEnum';
+import { CacheTypeEnum, SHARE_JWT_TOKEN_KEY, SHARE_REFRESH_TOKEN_KEY } from '/@/enums/cacheEnum';
 import projectSetting from '/@/settings/projectSetting';
 import projectSetting from '/@/settings/projectSetting';
 import { JWT_TOKEN_KEY, REFRESH_TOKEN_KEY } from '/@/enums/cacheEnum';
 import { JWT_TOKEN_KEY, REFRESH_TOKEN_KEY } from '/@/enums/cacheEnum';
 
 
@@ -26,3 +26,11 @@ export function getJwtToken() {
 export function getRefreshToken() {
 export function getRefreshToken() {
   return getAuthCache(REFRESH_TOKEN_KEY);
   return getAuthCache(REFRESH_TOKEN_KEY);
 }
 }
+
+export function getShareJwtToken() {
+  return getAuthCache(SHARE_JWT_TOKEN_KEY);
+}
+
+export function getShareRefreshToken() {
+  return getAuthCache(SHARE_REFRESH_TOKEN_KEY);
+}

@@ -17,6 +17,8 @@ import {
   APP_SESSION_CACHE_KEY,
   APP_SESSION_CACHE_KEY,
   MULTIPLE_TABS_KEY,
   MULTIPLE_TABS_KEY,
   MENU_LIST,
   MENU_LIST,
+  SHARE_JWT_TOKEN_KEY,
+  SHARE_REFRESH_TOKEN_KEY,
 } from '/@/enums/cacheEnum';
 } from '/@/enums/cacheEnum';
 import { DEFAULT_CACHE_TIME } from '/@/settings/encryptionSetting';
 import { DEFAULT_CACHE_TIME } from '/@/settings/encryptionSetting';
 import { toRaw } from 'vue';
 import { toRaw } from 'vue';
@@ -33,6 +35,8 @@ interface BasicStore {
   [PROJ_CFG_KEY]: ProjectConfig;
   [PROJ_CFG_KEY]: ProjectConfig;
   [MULTIPLE_TABS_KEY]: RouteLocationNormalized[];
   [MULTIPLE_TABS_KEY]: RouteLocationNormalized[];
   [MENU_LIST]: any[];
   [MENU_LIST]: any[];
+  [SHARE_JWT_TOKEN_KEY]: string;
+  [SHARE_REFRESH_TOKEN_KEY]: string;
 }
 }
 
 
 type LocalStore = BasicStore;
 type LocalStore = BasicStore;

@@ -80,7 +80,6 @@ export class VAxios {
   private refreshTokenBeforeReq(doRefreshTokenApi: () => Promise<unknown>): Promise<unknown> {
   private refreshTokenBeforeReq(doRefreshTokenApi: () => Promise<unknown>): Promise<unknown> {
     // 创建一个未完成的promise，把改变状态的resolve方法交给请求token结束后执行
     // 创建一个未完成的promise，把改变状态的resolve方法交给请求token结束后执行
     const promise = new Promise((resolve) => {
     const promise = new Promise((resolve) => {
-      console.log('等待新token');
       // 等待队列放的是一个回调函数，来延迟resolve的执行，以此控制promise状态的改变
       // 等待队列放的是一个回调函数，来延迟resolve的执行，以此控制promise状态的改变
       this.waitingQueue.push(() => resolve(null));
       this.waitingQueue.push(() => resolve(null));
     });
     });
@@ -88,7 +87,6 @@ export class VAxios {
       this.refreshing = true;
       this.refreshing = true;
       // 模拟请求刷新Token接口，当接口返回数据时执行then方法 TODO 添加catch捕获异常
       // 模拟请求刷新Token接口，当接口返回数据时执行then方法 TODO 添加catch捕获异常
       doRefreshTokenApi().then(() => {
       doRefreshTokenApi().then(() => {
-        console.log('刷新token成功，放行队列中的请求', this.waitingQueue.length);
         this.refreshing = false;
         this.refreshing = false;
         this.waitingQueue.forEach((cb) => cb());
         this.waitingQueue.forEach((cb) => cb());
         this.waitingQueue.length = 0;
         this.waitingQueue.length = 0;
@@ -117,12 +115,19 @@ export class VAxios {
     this.axiosInstance.interceptors.request.use(async (config: AxiosRequestConfig) => {
     this.axiosInstance.interceptors.request.use(async (config: AxiosRequestConfig) => {
       // If cancel repeat request is turned on, then cancel repeat request is prohibited
       // If cancel repeat request is turned on, then cancel repeat request is prohibited
       const userStore = useUserStore();
       const userStore = useUserStore();
-      if (userStore && userStore.jwtToken) {
+      if (userStore) {
         try {
         try {
-          const res = jwt_decode(userStore.jwtToken) as JwtModel;
-          const currentTime = (new Date().getTime() + (config.timeout || 0)) / 1000;
-          if (currentTime >= res.exp && this.isNeedTokenURL(config.url)) {
-            await this.refreshTokenBeforeReq(userStore.doRefresh);
+          const { requestOptions = {} } = config;
+          const { withShareToken, withToken } = requestOptions;
+          const token = withShareToken && withToken ? userStore.shareJwtToken : userStore.jwtToken;
+          const doRefresh =
+            withShareToken && withToken ? userStore.doShareRefresh : userStore.doRefresh;
+          if (token) {
+            const res = jwt_decode(token) as JwtModel;
+            const currentTime = (new Date().getTime() + (config.timeout || 0)) / 1000;
+            if (currentTime >= res.exp && this.isNeedTokenURL(config.url!)) {
+              await this.refreshTokenBeforeReq(doRefresh);
+            }
           }
           }
         } catch (error) {
         } catch (error) {
           userStore.logout();
           userStore.logout();
@@ -244,7 +249,6 @@ export class VAxios {
     const { requestOptions } = this.options;
     const { requestOptions } = this.options;
 
 
     const opt: RequestOptions = Object.assign({}, requestOptions, options);
     const opt: RequestOptions = Object.assign({}, requestOptions, options);
-
     const { beforeRequestHook, requestCatchHook, transformRequestHook } = transform || {};
     const { beforeRequestHook, requestCatchHook, transformRequestHook } = transform || {};
     if (beforeRequestHook && isFunction(beforeRequestHook)) {
     if (beforeRequestHook && isFunction(beforeRequestHook)) {
       conf = beforeRequestHook(conf, opt);
       conf = beforeRequestHook(conf, opt);

 /**
 /**
  * Data processing class, can be configured according to the project
  * Data processing class, can be configured according to the project
  */
  */
-import type { AxiosRequestConfig, AxiosResponse } from 'axios';
+import type { AxiosRequestConfig as OriginalAxiosRequestConfig, AxiosResponse } from 'axios';
 import type { RequestOptions, Result } from '/#/axios';
 import type { RequestOptions, Result } from '/#/axios';
 
 
 export interface CreateAxiosOptions extends AxiosRequestConfig {
 export interface CreateAxiosOptions extends AxiosRequestConfig {
@@ -10,6 +10,7 @@ export interface CreateAxiosOptions extends AxiosRequestConfig {
   transform?: AxiosTransform;
   transform?: AxiosTransform;
   requestOptions?: RequestOptions;
   requestOptions?: RequestOptions;
 }
 }
+export type AxiosRequestConfig = OriginalAxiosRequestConfig & { requestOptions?: RequestOptions };
 
 
 export abstract class AxiosTransform {
 export abstract class AxiosTransform {
   /**
   /**

@@ -10,7 +10,7 @@ import { useGlobSetting } from '/@/hooks/setting';
 import { useMessage } from '/@/hooks/web/useMessage';
 import { useMessage } from '/@/hooks/web/useMessage';
 import { RequestEnum, ContentTypeEnum } from '/@/enums/httpEnum';
 import { RequestEnum, ContentTypeEnum } from '/@/enums/httpEnum';
 import { isString } from '/@/utils/is';
 import { isString } from '/@/utils/is';
-import { getJwtToken } from '/@/utils/auth';
+import { getJwtToken, getShareJwtToken } from '/@/utils/auth';
 import { setObjToUrlParams, deepMerge } from '/@/utils';
 import { setObjToUrlParams, deepMerge } from '/@/utils';
 import { useErrorLogStoreWithOut } from '/@/store/modules/errorLog';
 import { useErrorLogStoreWithOut } from '/@/store/modules/errorLog';
 import { useI18n } from '/@/hooks/web/useI18n';
 import { useI18n } from '/@/hooks/web/useI18n';
@@ -92,12 +92,23 @@ const transform: AxiosTransform = {
    */
    */
   requestInterceptors: (config, options) => {
   requestInterceptors: (config, options) => {
     // 请求之前处理config
     // 请求之前处理config
-    const token = getJwtToken();
-    if (token && (config as Recordable)?.requestOptions?.withToken !== false) {
-      // jwt token
-      config.headers['X-Authorization'] = options.authenticationScheme
-        ? `${options.authenticationScheme} ${token}`
-        : token;
+    const { requestOptions } = config;
+    const { withShareToken } = requestOptions || {};
+    const { requestOptions: { withToken } = {} } = options;
+    if (withToken !== false) {
+      const shareToken = getShareJwtToken();
+      if (withShareToken && shareToken) {
+        config.headers['X-Authorization'] = options.authenticationScheme
+          ? `${options.authenticationScheme} ${shareToken}`
+          : shareToken;
+      } else {
+        const token = getJwtToken();
+        if (token) {
+          config.headers['X-Authorization'] = options.authenticationScheme
+            ? `${options.authenticationScheme} ${token}`
+            : token;
+        }
+      }
     }
     }
     return config;
     return config;
   },
   },
@@ -194,7 +205,7 @@ function createAxios(opt?: Partial<CreateAxiosOptions>) {
           ignoreCancelToken: true,
           ignoreCancelToken: true,
           // 是否携带token
           // 是否携带token
           withToken: true,
           withToken: true,
-        },
+        } as RequestOptions,
       },
       },
       opt || {}
       opt || {}
     )
     )

@@ -25,7 +25,7 @@ export const schemas: FormSchema[] = [
   {
   {
     field: FieldsEnum.ACCESS_CREDENTIALS,
     field: FieldsEnum.ACCESS_CREDENTIALS,
     label: '访问凭证',
     label: '访问凭证',
-    component: 'Input',
+    component: 'InputPassword',
     ifShow: ({ model }) => model[FieldsEnum.IS_SHARE],
     ifShow: ({ model }) => model[FieldsEnum.IS_SHARE],
     componentProps: {
     componentProps: {
       maxLength: 64,
       maxLength: 64,

+export const isShareMode = () => {
+  const sharePageReg = /^\/share\/[^/]+\/[^/]+\/[^/]+$/;
+  const { pathname } = location;
+  return sharePageReg.test(pathname);
+};

 <script lang="ts" setup>
 <script lang="ts" setup>
   import { onMounted } from 'vue';
   import { onMounted } from 'vue';
-  import { BasicModal, useModal } from '/@/components/Modal';
-  import { Spin } from 'ant-design-vue';
+  import { Spin, Modal, Button, Input, Row, Col } from 'ant-design-vue';
   import { ref } from 'vue';
   import { ref } from 'vue';
   import { useRoute } from 'vue-router';
   import { useRoute } from 'vue-router';
   import { checkShareAccessToken, sharePageLogin, getShareContent } from '/@/api/sys/share';
   import { checkShareAccessToken, sharePageLogin, getShareContent } from '/@/api/sys/share';
@@ -16,7 +15,9 @@
   const contentData = ref<any>();
   const contentData = ref<any>();
   const canLoadComponent = ref(false);
   const canLoadComponent = ref(false);
 
 
-  const [register, { openModal }] = useModal();
+  const modelVisable = ref(false);
+
+  // const [register, { openModal }] = useModal();
 
 
   const [registerForm, { getFieldsValue }] = useForm({
   const [registerForm, { getFieldsValue }] = useForm({
     schemas: [
     schemas: [
@@ -24,11 +25,15 @@
         field: FieldsEnum.ACCESS_CREDENTIALS,
         field: FieldsEnum.ACCESS_CREDENTIALS,
         component: 'Input',
         component: 'Input',
         label: '访问令牌',
         label: '访问令牌',
+        slot: 'tokenInput',
+        componentProps: {
+          placeholder: '请输入访问令牌',
+        },
       },
       },
     ],
     ],
     showActionButtonGroup: false,
     showActionButtonGroup: false,
-    layout: 'inline',
-    labelWidth: 100,
+    layout: 'vertical',
+    baseColProps: { span: 24 },
   });
   });
 
 
   const userStore = useUserStore();
   const userStore = useUserStore();
@@ -37,7 +42,7 @@
     const { params } = ROUTE;
     const { params } = ROUTE;
     const { publicId } = params as Partial<ShareRouteParams>;
     const { publicId } = params as Partial<ShareRouteParams>;
     const { token, refreshToken } = await sharePageLogin(publicId!);
     const { token, refreshToken } = await sharePageLogin(publicId!);
-    userStore.storeToken(token, refreshToken);
+    userStore.storeShareToken(token, refreshToken);
   };
   };
 
 
   const getCheckNeedAccessToken = async () => {
   const getCheckNeedAccessToken = async () => {
@@ -45,7 +50,7 @@
     loading.value = true;
     loading.value = true;
     const { viewType, id } = params as Partial<ShareRouteParams>;
     const { viewType, id } = params as Partial<ShareRouteParams>;
     const { data } = await checkShareAccessToken(viewType!, id!);
     const { data } = await checkShareAccessToken(viewType!, id!);
-    data ? openModal(data) : await getContentData();
+    data ? (modelVisable.value = true) : await getContentData();
   };
   };
 
 
   const getContentLoading = ref(false);
   const getContentLoading = ref(false);
@@ -59,7 +64,8 @@
       contentData.value = result;
       contentData.value = result;
       loading.value = false;
       loading.value = false;
       canLoadComponent.value = true;
       canLoadComponent.value = true;
-      openModal(false);
+      // openModal(false);
+      modelVisable.value = false;
     } catch (error) {
     } catch (error) {
     } finally {
     } finally {
       getContentLoading.value = false;
       getContentLoading.value = false;
@@ -77,15 +83,64 @@
 </script>
 </script>
 
 
 <template>
 <template>
-  <BasicModal
-    @register="register"
-    title="公开"
-    @ok="handleSubmit"
-    :showCancelBtn="false"
-    :okButtonProps="{ loading: getContentLoading }"
+  <Modal
+    v-model:visible="modelVisable"
+    centered
+    :title="null"
+    :close-icon="null"
+    width="350px"
+    :footer="null"
+    wrapClassName="share-page-token-modal"
   >
   >
-    <BasicForm @register="registerForm" />
-  </BasicModal>
+    <section class="w-full h-full flex flex-col p-8 justify-center items-center">
+      <BasicForm @register="registerForm" class="w-full" @keyup.enter="handleSubmit">
+        <template #tokenInput="{ field, model }">
+          <Input.Group>
+            <Row>
+              <Col :span="18">
+                <Input.Password v-model:value="model[field]" placeholder="请输入访问令牌" />
+              </Col>
+              <Col :span="6">
+                <Button
+                  class="w-full !flex justify-center items-center"
+                  :loading="getContentLoading"
+                  type="primary"
+                  @click="handleSubmit"
+                >
+                  <svg
+                    t="1682068997810"
+                    class="icon"
+                    viewBox="0 0 1024 1024"
+                    version="1.1"
+                    xmlns="http://www.w3.org/2000/svg"
+                    p-id="79416"
+                    width="24"
+                    height="24"
+                  >
+                    <path
+                      d="M512 928H128c-19.2 0-32-12.8-32-32V128c0-19.2 12.8-32 32-32h384c19.2 0 32 12.8 32 32s-12.8 32-32 32H160v704h352c19.2 0 32 12.8 32 32s-12.8 32-32 32z"
+                      fill="#fff"
+                      p-id="79417"
+                    />
+                    <path
+                      d="M534.4 736c-9.6 0-16-3.2-22.4-9.6l-192-192c-12.8-12.8-12.8-32 0-44.8l192-192c12.8-12.8 32-12.8 44.8 0 12.8 12.8 12.8 32 0 44.8L387.2 512l169.6 169.6c12.8 12.8 12.8 32 0 44.8-6.4 6.4-16 9.6-22.4 9.6z"
+                      fill="#fff"
+                      p-id="79418"
+                    />
+                    <path
+                      d="M896 544H342.4c-19.2 0-32-12.8-32-32s12.8-32 32-32H896c19.2 0 32 12.8 32 32s-12.8 32-32 32z"
+                      fill="#fff"
+                      p-id="79419"
+                    />
+                  </svg>
+                </Button>
+              </Col>
+            </Row>
+          </Input.Group>
+        </template>
+      </BasicForm>
+    </section>
+  </Modal>
   <Spin
   <Spin
     :spinning="loading"
     :spinning="loading"
     tip="正在加载中..."
     tip="正在加载中..."
@@ -96,4 +151,10 @@
   </Spin>
   </Spin>
 </template>
 </template>
 
 
-<style lang="less" scoped></style>
+<style lang="less">
+  .share-page-token-modal {
+    .ant-modal-close {
+      display: none;
+    }
+  }
+</style>

@@ -213,11 +213,7 @@
       >
       >
         <div class="text-gray-400 text-xs truncate">
         <div class="text-gray-400 text-xs truncate">
           <span class="mr-2">最近执行</span>
           <span class="mr-2">最近执行</span>
-          <span>{{
-            getLastExecuteTime.value > 0
-              ? `${getLastExecuteTime.value}${getLastExecuteTime.unitName}前`
-              : '刚刚'
-          }}</span>
+          <span>{{ getRecord.lastExecuteStr }}</span>
         </div>
         </div>
       </Tooltip>
       </Tooltip>
     </div>
     </div>

 import { useWebSocket } from '@vueuse/core';
 import { useWebSocket } from '@vueuse/core';
 import { Ref, unref } from 'vue';
 import { Ref, unref } from 'vue';
 import { DataBoardLayoutInfo } from '../types/type';
 import { DataBoardLayoutInfo } from '../types/type';
-import { JWT_TOKEN_KEY } from '/@/enums/cacheEnum';
 import { useGlobSetting } from '/@/hooks/setting';
 import { useGlobSetting } from '/@/hooks/setting';
-import { getAuthCache } from '/@/utils/auth';
 import { isNullAndUnDef } from '/@/utils/is';
 import { isNullAndUnDef } from '/@/utils/is';
+import { getJwtToken, getShareJwtToken } from '/@/utils/auth';
+import { isShareMode } from '/@/views/sys/share/hook';
 
 
 interface SocketMessage {
 interface SocketMessage {
   tsSubCmds: SocketMessageItem[];
   tsSubCmds: SocketMessageItem[];
@@ -50,7 +50,7 @@ const generateMessage = (deviceId: string, cmdId: number, attr: string): SocketM
 };
 };
 
 
 export function useSocketConnect(dataSourceRef: Ref<DataBoardLayoutInfo[]>) {
 export function useSocketConnect(dataSourceRef: Ref<DataBoardLayoutInfo[]>) {
-  const token = getAuthCache(JWT_TOKEN_KEY);
+  const token = isShareMode() ? getShareJwtToken() : getJwtToken();
 
 
   const cmdIdMapping = new Map<number, GroupMappingRecord[]>();
   const cmdIdMapping = new Map<number, GroupMappingRecord[]>();
 
 

@@ -21,6 +21,8 @@ export interface RequestOptions {
   ignoreCancelToken?: boolean;
   ignoreCancelToken?: boolean;
   // Whether to send token in header
   // Whether to send token in header
   withToken?: boolean;
   withToken?: boolean;
+  // Carry and share token 携带分享的访问令牌
+  withShareToken?: boolean;
 }
 }
 
 
 export interface Result<T = any> {
 export interface Result<T = any> {