Merge branch 'perf/configuration-center' into 'main_dev'

fix: 修复组态创建链接的代理路径不一致

See merge request yunteng/thingskit-front!961

+import { Platform } from './center.data';
+import { ConfigurationCenterItemsModal } from '/@/api/configuration/center/model/configurationCenterModal';
+import { useGlobSetting } from '/@/hooks/setting';
+
+export enum ScadaModeEnum {
+  LIGHTBOX = 'lightbox',
+  DESIGN = 'design',
+  SHARE = 'share',
+}
+
+interface ScadaLinkParamsType {
+  configurationId: string;
+  organizationId: string;
+  mode: ScadaModeEnum;
+  platform: Platform;
+  publicId?: string;
+}
+
 const getRandomString = () => Number(Math.random().toString().substring(2)).toString(36);
 const getRandomString = () => Number(Math.random().toString().substring(2)).toString(36);
 
 
 export const encode = (record: Recordable) => {
 export const encode = (record: Recordable) => {
@@ -13,3 +31,27 @@ export const encode = (record: Recordable) => {
   hash = window.btoa(hash);
   hash = window.btoa(hash);
   return hash;
   return hash;
 };
 };
+
+export const createScadaPageLink = (
+  record: ConfigurationCenterItemsModal,
+  mode: ScadaModeEnum = ScadaModeEnum.DESIGN,
+  open = true
+) => {
+  const { configurationPrefix } = useGlobSetting();
+  const params: ScadaLinkParamsType = {
+    configurationId: record.id,
+    organizationId: record.organizationId!,
+    mode: mode,
+    platform: record.platform as Platform,
+  };
+
+  if (mode === ScadaModeEnum.SHARE) {
+    params.publicId = record.publicId;
+  }
+
+  const href = new URL(location.origin);
+  href.pathname = configurationPrefix;
+  href.hash = encode(params);
+  open && window.open(href.href);
+  return href.href;
+};

@@ -14,14 +14,12 @@
   import { ConfigurationPermission, Platform, searchFormSchema } from './center.data';
   import { ConfigurationPermission, Platform, searchFormSchema } from './center.data';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { Authority } from '/@/components/Authority';
   import { Authority } from '/@/components/Authority';
-  import { isDevMode } from '/@/utils/env';
   import ConfigurationCenterDrawer from './ConfigurationCenterDrawer.vue';
   import ConfigurationCenterDrawer from './ConfigurationCenterDrawer.vue';
   import { useDrawer } from '/@/components/Drawer';
   import { useDrawer } from '/@/components/Drawer';
   import { getBoundingClientRect } from '/@/utils/domUtils';
   import { getBoundingClientRect } from '/@/utils/domUtils';
   import configurationSrc from '/@/assets/icons/configuration.svg';
   import configurationSrc from '/@/assets/icons/configuration.svg';
   import { cloneDeep } from 'lodash';
   import { cloneDeep } from 'lodash';
   import { usePermission } from '/@/hooks/web/usePermission';
   import { usePermission } from '/@/hooks/web/usePermission';
-  import { useGlobSetting } from '/@/hooks/setting';
   import { AuthIcon, CardLayoutButton } from '/@/components/Widget';
   import { AuthIcon, CardLayoutButton } from '/@/components/Widget';
   import AuthDropDown from '/@/components/Widget/AuthDropDown.vue';
   import AuthDropDown from '/@/components/Widget/AuthDropDown.vue';
   import { ShareModal } from '/@/views/common/ShareModal';
   import { ShareModal } from '/@/views/common/ShareModal';
@@ -31,7 +29,7 @@
   import { useRole } from '/@/hooks/business/useRole';
   import { useRole } from '/@/hooks/business/useRole';
   import { useClipboard } from '@vueuse/core';
   import { useClipboard } from '@vueuse/core';
   import { Icon } from '/@/components/Icon';
   import { Icon } from '/@/components/Icon';
-  import { encode } from './help';
+  import { createScadaPageLink, ScadaModeEnum } from './help';
 
 
   const listColumn = ref(5);
   const listColumn = ref(5);
 
 
@@ -131,49 +129,15 @@
     }
     }
   };
   };
 
 
-  const { configurationPrefix } = useGlobSetting();
-  const isDev = isDevMode();
-
   const handlePreview = (record: ConfigurationCenterItemsModal) => {
   const handlePreview = (record: ConfigurationCenterItemsModal) => {
     if (!unref(getPreviewFlag)) return;
     if (!unref(getPreviewFlag)) return;
-    // window.open(
-    //   `${configurationPrefix}/${isDev ? '?dev=1&' : '?'}configurationId=${
-    //     record!.id
-    //   }&lightbox=1&organizationId=${record.organizationId}`
-    // );
-
-    const params = {
-      configurationId: record.id,
-      organizationId: record.organizationId,
-      mode: 'lightbox',
-      platform: record.platform,
-    };
-
-    const href = new URL(location.origin);
-    href.pathname = '/drawio';
-    href.hash = encode(params);
-    window.open(href.href);
+    createScadaPageLink(record, ScadaModeEnum.LIGHTBOX);
   };
   };
 
 
   const handleDesign = (record: ConfigurationCenterItemsModal) => {
   const handleDesign = (record: ConfigurationCenterItemsModal) => {
     if (!unref(getDesignFlag)) return;
     if (!unref(getDesignFlag)) return;
-    // window.open(
-    //   `${configurationPrefix}/${isDev ? '?dev=1&' : '?'}configurationId=${
-    //     record!.id
-    //   }&organizationId=${record.organizationId}`
-    // );
-
-    const params = {
-      configurationId: record.id,
-      organizationId: record.organizationId,
-      mode: 'design',
-      platform: record.platform,
-    };
-
-    const href = new URL(location.origin);
-    href.pathname = '/drawio';
-    href.hash = encode(params);
-    window.open(href.href);
+
+    createScadaPageLink(record, ScadaModeEnum.DESIGN);
   };
   };
 
 
   const handleDelete = async (record: ConfigurationCenterItemsModal) => {
   const handleDelete = async (record: ConfigurationCenterItemsModal) => {
@@ -190,14 +154,7 @@
   };
   };
 
 
   const createShareUrl = (record: ConfigurationCenterItemsModal) => {
   const createShareUrl = (record: ConfigurationCenterItemsModal) => {
-    const searchParams = new URLSearchParams();
-    isDev && searchParams.set('dev', '1');
-    searchParams.set('share', 'SCADA');
-    searchParams.set('configurationId', record.id);
-    searchParams.set('publicId', record.publicId || '');
-    searchParams.set('lightbox', '1');
-    searchParams.set('organizationId', record!.organizationId || '');
-    return `${origin}${configurationPrefix}/?${searchParams.toString()}`;
+    return createScadaPageLink(record, ScadaModeEnum.SHARE, false);
   };
   };
 
 
   const { copied, copy } = useClipboard({ legacy: true });
   const { copied, copy } = useClipboard({ legacy: true });