Commit dd8b654b79398416455b42fc7baede7eed765807

Authored by xp.Huang
2 parents 0ee50e50 a0a1ab9c

Merge branch 'local_dev_branch_by_ft' into 'main_dev'

fix: 修改组态管理下的模板列表左上角文本为母版

See merge request yunteng/thingskit-front!976
@@ -23,11 +23,7 @@ @@ -23,11 +23,7 @@
23 import { AuthIcon, CardLayoutButton } from '/@/components/Widget'; 23 import { AuthIcon, CardLayoutButton } from '/@/components/Widget';
24 import AuthDropDown from '/@/components/Widget/AuthDropDown.vue'; 24 import AuthDropDown from '/@/components/Widget/AuthDropDown.vue';
25 import { ShareModal } from '/@/views/common/ShareModal'; 25 import { ShareModal } from '/@/views/common/ShareModal';
26 - import { ViewTypeNameEnum } from '../../common/ShareModal/config';  
27 - import { useModal } from '/@/components/Modal';  
28 - import { ViewType } from '../../visual/board/config/panelDetail';  
29 import { useRole } from '/@/hooks/business/useRole'; 26 import { useRole } from '/@/hooks/business/useRole';
30 - import { useClipboard } from '@vueuse/core';  
31 import { Icon } from '/@/components/Icon'; 27 import { Icon } from '/@/components/Icon';
32 import { createScadaPageLink, ScadaModeEnum } from './help'; 28 import { createScadaPageLink, ScadaModeEnum } from './help';
33 29
@@ -113,10 +109,6 @@ @@ -113,10 +109,6 @@
113 return hasPermission(ConfigurationPermission.DESIGN); 109 return hasPermission(ConfigurationPermission.DESIGN);
114 }); 110 });
115 111
116 - const getShareFlag = computed(() => {  
117 - return hasPermission(ConfigurationPermission.SHARE);  
118 - });  
119 -  
120 const handleCreateOrUpdate = (record?: ConfigurationCenterItemsModal) => { 112 const handleCreateOrUpdate = (record?: ConfigurationCenterItemsModal) => {
121 if (record) { 113 if (record) {
122 openDrawer(true, { 114 openDrawer(true, {
@@ -154,26 +146,6 @@ @@ -154,26 +146,6 @@
154 getListData(); 146 getListData();
155 }; 147 };
156 148
157 - const createShareUrl = (record: ConfigurationCenterItemsModal) => {  
158 - return createScadaPageLink(record, ScadaModeEnum.SHARE, false);  
159 - };  
160 -  
161 - const { copied, copy } = useClipboard({ legacy: true });  
162 - const handleCreateShareUrl = async (record: ConfigurationCenterItemsModal) => {  
163 - if (!unref(getShareFlag)) return;  
164 - const url = createShareUrl(record);  
165 - await copy(url);  
166 - if (unref(copied)) {  
167 - createMessage.success('复制成功~');  
168 - }  
169 - };  
170 -  
171 - const [registerShareModal, { openModal }] = useModal();  
172 -  
173 - const handleOpenShareModal = (record: ConfigurationCenterItemsModal) => {  
174 - openModal(true, { record, href: createShareUrl(record) });  
175 - };  
176 -  
177 const listEl = ref<Nullable<ComponentElRef>>(null); 149 const listEl = ref<Nullable<ComponentElRef>>(null);
178 150
179 onMounted(() => { 151 onMounted(() => {
@@ -228,7 +200,7 @@ @@ -228,7 +200,7 @@
228 <List.Item> 200 <List.Item>
229 <Card 201 <Card
230 :style="{ 202 :style="{
231 - '--viewType': item.viewType === ViewType.PUBLIC_VIEW ? '#1890ff' : '#faad14', 203 + '--viewType': '#1890ff',
232 }" 204 }"
233 hoverable 205 hoverable
234 class="card-container" 206 class="card-container"
@@ -246,7 +218,7 @@ @@ -246,7 +218,7 @@
246 <span 218 <span
247 class="absolute top-0 left-0 text-light-50 transform -rotate-45 translate-y-1" 219 class="absolute top-0 left-0 text-light-50 transform -rotate-45 translate-y-1"
248 > 220 >
249 - {{ ViewTypeNameEnum[item.viewType] || ViewTypeNameEnum.PRIVATE_VIEW }} 221 + 母版
250 </span> 222 </span>
251 </div> 223 </div>
252 </template> 224 </template>
@@ -259,26 +231,10 @@ @@ -259,26 +231,10 @@
259 @click="handleDesign(item)" 231 @click="handleDesign(item)"
260 /> 232 />
261 </Tooltip> 233 </Tooltip>
262 - <Tooltip title="点击复制分享链接">  
263 - <AuthIcon  
264 - :auth="ConfigurationPermission.SHARE"  
265 - :disabled="!item.publicId"  
266 - class="!text-lg"  
267 - icon="ant-design:share-alt-outlined"  
268 - @click="handleCreateShareUrl(item)"  
269 - />  
270 - </Tooltip>  
271 <AuthDropDown 234 <AuthDropDown
272 v-if="!isCustomerUser" 235 v-if="!isCustomerUser"
273 :dropMenuList="[ 236 :dropMenuList="[
274 { 237 {
275 - text: '分享',  
276 - auth: ConfigurationPermission.SHARE,  
277 - icon: 'ant-design:share-alt-outlined',  
278 - event: '',  
279 - onClick: handleOpenShareModal.bind(null, item),  
280 - },  
281 - {  
282 text: '编辑', 238 text: '编辑',
283 auth: ConfigurationPermission.UPDATE, 239 auth: ConfigurationPermission.UPDATE,
284 icon: 'clarity:note-edit-line', 240 icon: 'clarity:note-edit-line',
@@ -47,3 +47,9 @@ @@ -47,3 +47,9 @@
47 <div ref="javaEditorElRef" class="w-full h-full min-h-96"></div> 47 <div ref="javaEditorElRef" class="w-full h-full min-h-96"></div>
48 </BasicModal> 48 </BasicModal>
49 </template> 49 </template>
  50 +
  51 +<style>
  52 + .ace-github .ace_print-margin {
  53 + width: 0;
  54 + }
  55 +</style>