Commit 8353a1e2eb0818000626d28aa7284d92695fd1ee

Authored by fengtao
2 parents 98e17d75 bc1c459d

Merge branch 'main_dev' into local_dev_ft

@@ -14,14 +14,12 @@ @@ -14,14 +14,12 @@
14 import { ConfigurationPermission, Platform, searchFormSchema } from './center.data'; 14 import { ConfigurationPermission, Platform, searchFormSchema } from './center.data';
15 import { useMessage } from '/@/hooks/web/useMessage'; 15 import { useMessage } from '/@/hooks/web/useMessage';
16 import { Authority } from '/@/components/Authority'; 16 import { Authority } from '/@/components/Authority';
17 - import { isDevMode } from '/@/utils/env';  
18 import ConfigurationCenterDrawer from './ConfigurationCenterDrawer.vue'; 17 import ConfigurationCenterDrawer from './ConfigurationCenterDrawer.vue';
19 import { useDrawer } from '/@/components/Drawer'; 18 import { useDrawer } from '/@/components/Drawer';
20 import { getBoundingClientRect } from '/@/utils/domUtils'; 19 import { getBoundingClientRect } from '/@/utils/domUtils';
21 import configurationSrc from '/@/assets/icons/configuration.svg'; 20 import configurationSrc from '/@/assets/icons/configuration.svg';
22 import { cloneDeep } from 'lodash'; 21 import { cloneDeep } from 'lodash';
23 import { usePermission } from '/@/hooks/web/usePermission'; 22 import { usePermission } from '/@/hooks/web/usePermission';
24 - import { useGlobSetting } from '/@/hooks/setting';  
25 import { AuthIcon, CardLayoutButton } from '/@/components/Widget'; 23 import { AuthIcon, CardLayoutButton } from '/@/components/Widget';
26 import AuthDropDown from '/@/components/Widget/AuthDropDown.vue'; 24 import AuthDropDown from '/@/components/Widget/AuthDropDown.vue';
27 import { ShareModal } from '/@/views/common/ShareModal'; 25 import { ShareModal } from '/@/views/common/ShareModal';
@@ -31,6 +29,7 @@ @@ -31,6 +29,7 @@
31 import { useRole } from '/@/hooks/business/useRole'; 29 import { useRole } from '/@/hooks/business/useRole';
32 import { useClipboard } from '@vueuse/core'; 30 import { useClipboard } from '@vueuse/core';
33 import { Icon } from '/@/components/Icon'; 31 import { Icon } from '/@/components/Icon';
  32 + import { createScadaPageLink, ScadaModeEnum } from './help';
34 33
35 const listColumn = ref(5); 34 const listColumn = ref(5);
36 35
@@ -130,25 +129,15 @@ @@ -130,25 +129,15 @@
130 } 129 }
131 }; 130 };
132 131
133 - const { configurationPrefix } = useGlobSetting();  
134 - const isDev = isDevMode();  
135 -  
136 const handlePreview = (record: ConfigurationCenterItemsModal) => { 132 const handlePreview = (record: ConfigurationCenterItemsModal) => {
137 if (!unref(getPreviewFlag)) return; 133 if (!unref(getPreviewFlag)) return;
138 - window.open(  
139 - `${configurationPrefix}/${isDev ? '?dev=1&' : '?'}configurationId=${  
140 - record!.id  
141 - }&lightbox=1&organizationId=${record.organizationId}`  
142 - ); 134 + createScadaPageLink(record, ScadaModeEnum.LIGHTBOX);
143 }; 135 };
144 136
145 const handleDesign = (record: ConfigurationCenterItemsModal) => { 137 const handleDesign = (record: ConfigurationCenterItemsModal) => {
146 if (!unref(getDesignFlag)) return; 138 if (!unref(getDesignFlag)) return;
147 - window.open(  
148 - `${configurationPrefix}/${isDev ? '?dev=1&' : '?'}configurationId=${  
149 - record!.id  
150 - }&organizationId=${record.organizationId}`  
151 - ); 139 +
  140 + createScadaPageLink(record, ScadaModeEnum.DESIGN);
152 }; 141 };
153 142
154 const handleDelete = async (record: ConfigurationCenterItemsModal) => { 143 const handleDelete = async (record: ConfigurationCenterItemsModal) => {
@@ -165,14 +154,7 @@ @@ -165,14 +154,7 @@
165 }; 154 };
166 155
167 const createShareUrl = (record: ConfigurationCenterItemsModal) => { 156 const createShareUrl = (record: ConfigurationCenterItemsModal) => {
168 - const searchParams = new URLSearchParams();  
169 - isDev && searchParams.set('dev', '1');  
170 - searchParams.set('share', 'SCADA');  
171 - searchParams.set('configurationId', record.id);  
172 - searchParams.set('publicId', record.publicId || '');  
173 - searchParams.set('lightbox', '1');  
174 - searchParams.set('organizationId', record!.organizationId || '');  
175 - return `${origin}${configurationPrefix}/?${searchParams.toString()}`; 157 + return createScadaPageLink(record, ScadaModeEnum.SHARE, false);
176 }; 158 };
177 159
178 const { copied, copy } = useClipboard({ legacy: true }); 160 const { copied, copy } = useClipboard({ legacy: true });