Merge branch 'perf/editor/10-24/2024' into 'main_dev'

ferf(src/packages): 修改3D编辑器，携带id为uuidv4版本 See merge request yunteng/thingskit-view!299

Merge branch 'perf/editor/10-24/2024' into 'main_dev'
ferf(src/packages): 修改3D编辑器，携带id为uuidv4版本 See merge request yunteng/thingskit-view!299
fengtao
2 parents bc87ffca e42540bc
Showing 3 changed files with 63 additions and 24 deletions
src/utils/utils.ts
src/views/three/items/components/ProjectItemsCard/index.vue
src/views/three/items/components/ProjectItemsList/index.vue
--- a/src/utils/utils.ts
View file @4c8ed34
+++ b/src/utils/utils.ts
View file @4c8ed34
@@ -32,6 +32,35 @@ export const getUUID = (randomLength = 10) => {
 }
 /**
+ * 生成一个UUIDv4版本的
+ */
+
+export function generateUUIDv4() {
+  const len = 32 //32长度
+  let radix = 16 //16进制
+  const chars = '0123456789abcdefghijklmnopqrstuvwxyz'.split('')
+  const uuid = []
+  let i
+  radix = radix || chars.length
+  if (len) {
+    for (i = 0; i < len; i++) {
+      uuid[i] = chars[0 | (Math.random() * radix)]
+    }
+  } else {
+    let r
+    uuid[8] = uuid[13] = uuid[18] = uuid[23] = '-'
+    uuid[14] = '4'
+    for (i = 0; i < 36; i++) {
+      if (!uuid[i]) {
+        r = 0 | (Math.random() * 16)
+        uuid[i] = chars[i == 19 ? (r & 0x3) | 0x8 : r]
+      }
+    }
+  }
+  return uuid.join('')
+}
+
+/**
  * * render 图标
  *  @param icon 图标
  *  @param set 设置项
@@ -359,24 +388,22 @@ export const setTitle = (title?: string) => {
   title && (document.title = title)
 }
-
-
-export const  getUrlSearch = (name: string)  =>{
+export const getUrlSearch = (name: string) => {
   // 未传参，返回空
-  if (!name) return null;
+  if (!name) return null
   // 查询参数：先通过search取值，如果取不到就通过hash来取
-  let after = window.location.search;
-  after = after.substr(1) || window.location.hash.split('?')[1];
+  let after = window.location.search
+  after = after.substr(1) || window.location.hash.split('?')[1]
   // 地址栏URL没有查询参数，返回空
-  if (!after) return null;
+  if (!after) return null
   // 如果查询参数中没有"name"，返回空
-  if (after.indexOf(name) === -1) return null;
- 
-  const reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)');
+  if (after.indexOf(name) === -1) return null
+
+  const reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)')
   // 当地址栏参数存在中文时，需要解码，不然会乱码
-  const r = decodeURI(after).match(reg);
+  const r = decodeURI(after).match(reg)
   // 如果url中"name"没有值，返回空
-  if (!r) return null;
- 
-  return r[2];
-}
+  if (!r) return null
+
+  return r[2]
+}
--- a/src/views/three/items/components/ProjectItemsCard/index.vue
View file @4c8ed34
+++ b/src/views/three/items/components/ProjectItemsCard/index.vue
View file @4c8ed34
@@ -5,7 +5,7 @@
         <n-checkbox v-model:checked="cardData.checkedValue"> </n-checkbox>
       </template>
       <div class="list-content">
-        <div class="list-content-img">
+        <div class="list-content-img" @click="editHandle()">
           <n-image
             object-fit="fill"
             height="180"
@@ -20,15 +20,19 @@
       <template #action>
         <div class="go-flex-items-center list-footer" justify="space-between">
           <div style="display: flex; flex-direction: column; align-items: start">
-            <n-text @click="handleFocus">
-              <n-button v-show="!focus" secondary size="tiny">
+            <n-text v-if="!focus" @click="handleFocus">
+              <n-button
+                class="list-footer-button"
+                secondary
+                size="tiny"
+              >
                 <span class="title">
                   {{ cardData.name || cardData.id }}
                 </span>
               </n-button>
             </n-text>
             <n-input
-              v-show="focus"
+              v-else
               ref="inputInstRef"
               size="small"
               type="text"
@@ -102,7 +106,7 @@ const emit = defineEmits(['delete', 'resize', 'edit', 'release', 'inputUpdateCar
 const props = defineProps({
   cardData: Object as PropType<ChartType>,
-  operationKey: String,
+  operationKey: String
 })
 // 处理url获取
@@ -234,6 +238,14 @@ $contentHeight: 180px;
       justify-content: flex-end;
       min-width: 180px;
     }
+    .list-footer-button {
+      display: flex;
+      // justify-content: flex-start;
+      width: 135px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
   }
 }
 </style>
--- a/src/views/three/items/components/ProjectItemsList/index.vue
View file @4c8ed34
+++ b/src/views/three/items/components/ProjectItemsList/index.vue
View file @4c8ed34
@@ -100,7 +100,7 @@ import { useDataListInit } from './hooks/useData.hook'
 import { ref } from 'vue'
 import type { FormInst } from 'naive-ui'
 import { icon } from '@/plugins'
-import { getUUID } from '@/utils/utils'
+import { generateUUIDv4 } from '@/utils/utils'
 import { threeJsDeleteApi, putReleaseThreeJsModel } from '@/api/external/contentSave/content'
 import { ChartType } from '../..'
 import { DialogEnum } from '@/enums/pluginEnum'
@@ -170,7 +170,7 @@ const releaseGoDialog = (message: string, state: number, messageText: string) =>
       window['$message'].success(window['$t'](messageText))
       handleSearchClick()
       isBulkOperationFlag.value = true
-      selectAllTextFlag.value = false
+      selectAllTextFlag.value = true
       operationKey.value = ''
       resetSelect(list.value, false)
     }
@@ -197,7 +197,7 @@ const handleOperationSelect = async (key: string) => {
           window['$message'].success(window['$t']('common.deleteSuccessText'))
           handleSearchClick()
           isBulkOperationFlag.value = true
-          selectAllTextFlag.value = false
+          selectAllTextFlag.value = true
           operationKey.value = ''
           resetSelect(list.value, false)
         }
@@ -249,7 +249,7 @@ const handleResetClick = () => {
 const handleOpenThreeEditor = () => {
   const { host, protocol, pathname } = location
-  const randomId = getUUID(32)
+  const randomId = generateUUIDv4()
   window.open(`${protocol}//${host}${pathname}editor/?three_file_uuid=${randomId}&action_type=create`)
 }
 </script>