Commit bc1c459dd52a86b09f0b69ee8482f3d6926ef419

Authored by xp.Huang
2 parents 93c86cac 9206658b

Merge branch 'perf/configuration-center-new-jump-way' into 'main_dev'

perf: 组态中心跳转方式变更

See merge request yunteng/thingskit-front!967
... ... @@ -14,14 +14,12 @@
14 14 import { ConfigurationPermission, Platform, searchFormSchema } from './center.data';
15 15 import { useMessage } from '/@/hooks/web/useMessage';
16 16 import { Authority } from '/@/components/Authority';
17   - import { isDevMode } from '/@/utils/env';
18 17 import ConfigurationCenterDrawer from './ConfigurationCenterDrawer.vue';
19 18 import { useDrawer } from '/@/components/Drawer';
20 19 import { getBoundingClientRect } from '/@/utils/domUtils';
21 20 import configurationSrc from '/@/assets/icons/configuration.svg';
22 21 import { cloneDeep } from 'lodash';
23 22 import { usePermission } from '/@/hooks/web/usePermission';
24   - import { useGlobSetting } from '/@/hooks/setting';
25 23 import { AuthIcon, CardLayoutButton } from '/@/components/Widget';
26 24 import AuthDropDown from '/@/components/Widget/AuthDropDown.vue';
27 25 import { ShareModal } from '/@/views/common/ShareModal';
... ... @@ -31,6 +29,7 @@
31 29 import { useRole } from '/@/hooks/business/useRole';
32 30 import { useClipboard } from '@vueuse/core';
33 31 import { Icon } from '/@/components/Icon';
  32 + import { createScadaPageLink, ScadaModeEnum } from './help';
34 33
35 34 const listColumn = ref(5);
36 35
... ... @@ -130,25 +129,15 @@
130 129 }
131 130 };
132 131
133   - const { configurationPrefix } = useGlobSetting();
134   - const isDev = isDevMode();
135   -
136 132 const handlePreview = (record: ConfigurationCenterItemsModal) => {
137 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 137 const handleDesign = (record: ConfigurationCenterItemsModal) => {
146 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 143 const handleDelete = async (record: ConfigurationCenterItemsModal) => {
... ... @@ -165,14 +154,7 @@
165 154 };
166 155
167 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 160 const { copied, copy } = useClipboard({ legacy: true });
... ...