Merge branch 'dev-fix-ww' into 'main_dev'

fix(dynamic request): 修复动态表单设备选择器拥有别名时显示别名 See merge request yunteng/thingskit-view!49

Merge branch 'dev-fix-ww' into 'main_dev'
fix(dynamic request): 修复动态表单设备选择器拥有别名时显示别名 See merge request yunteng/thingskit-view!49
xp.Huang
2 parents 3df76cd1 c909411a
Showing 2 changed files with 19 additions and 14 deletions
src/views/chart/ContentConfigurations/components/ChartData/external/components/DynamicForm/useDynamicPublicForm.ts
src/views/share/index.vue
--- a/src/views/chart/ContentConfigurations/components/ChartData/external/components/DynamicForm/useDynamicPublicForm.ts
View file @be2ec4a
+++ b/src/views/chart/ContentConfigurations/components/ChartData/external/components/DynamicForm/useDynamicPublicForm.ts
View file @be2ec4a
@@ -107,7 +107,9 @@ export const useDynamicPublicForm = (paramsItemList: Ref<ParamsItemType[]>) => {
   const getDeviceOption = async () => {
     if (!validIsExist(BuiltInVariable.DEVICE_PROFILE_ID) || !validIsExist(BuiltInVariable.ORGANIZATION_ID) || !params[BuiltInVariable.ORGANIZATION_ID]) return
-    optionsSet[BuiltInVariable.ENTITY_ID] = await getDeviceList({ [BuiltInVariable.ORGANIZATION_ID]: params[BuiltInVariable.ORGANIZATION_ID], [BuiltInVariable.DEVICE_PROFILE_ID]: params[BuiltInVariable.DEVICE_PROFILE_ID] })
+    const result: Recordable[] = await getDeviceList({ [BuiltInVariable.ORGANIZATION_ID]: params[BuiltInVariable.ORGANIZATION_ID], [BuiltInVariable.DEVICE_PROFILE_ID]: params[BuiltInVariable.DEVICE_PROFILE_ID] })
+    optionsSet[BuiltInVariable.ENTITY_ID] = result.map(item => ({ ...item, alias: item.alias || item.name }))
+    console.log(optionsSet[BuiltInVariable.ENTITY_ID])
   }
   const getDeviceAttrOption = async () => {
@@ -168,18 +170,18 @@ export const useDynamicPublicForm = (paramsItemList: Ref<ParamsItemType[]>) => {
     }
   })
-   /**
-   * ft 更改设备别名
-   * 修改后的代码在注释之间，并标注好源代码和修改后代码，方便回溯
-   * 源代码   labelField: 'name'
-   * 修改后代码  labelField: 'alias' || 'name'
-   */
+  /**
+  * ft 更改设备别名
+  * 修改后的代码在注释之间，并标注好源代码和修改后代码，方便回溯
+  * 源代码   labelField: 'name'
+  * 修改后代码  labelField: 'alias' || 'name'
+  */
   const getSelectDevice = computed<SelectProps>(() => {
     return {
       ...basicPreset('name'),
       value: params[BuiltInVariable.ENTITY_ID],
       options: unref(optionsSet[BuiltInVariable.ENTITY_ID]),
-      labelField: 'alias' || 'name',
+      labelField: 'alias',
       valueField: 'tbDeviceId',
       onUpdateValue(value) {
         params[BuiltInVariable.ENTITY_ID] = value
@@ -331,7 +333,7 @@ export const useDynamicPublicForm = (paramsItemList: Ref<ParamsItemType[]>) => {
     getDeviceOption()
   }
-  const setParams = (Params: Recordable = {}) => { 
+  const setParams = (Params: Recordable = {}) => {
     for (const { key, value } of unref(getParams)) {
       const splitKeys = value ? value.split(GROUP_SEPARATOR) : key.split(GROUP_SEPARATOR)
       if (isDateComponent(key as BuiltInVariable)) {
@@ -356,7 +358,7 @@ export const useDynamicPublicForm = (paramsItemList: Ref<ParamsItemType[]>) => {
   }
   const setDynamicFormValue = (params: Recordable) => {
-    setParams(params) 
+    setParams(params)
     getOrgOption()
     getDeviceProfileOption()
     getDeviceOption()
--- a/src/views/share/index.vue
View file @be2ec4a
+++ b/src/views/share/index.vue
View file @be2ec4a
 <template>
   <section>
     <preview v-if="!allowLoadPreviewPage" :key="key"></preview>
+    <NEmpty v-if="isEmpty" style="position: absolute;top: 50%;left: 50%;transform: translate(-50%, -50%);" />
     <NModal :show="showModal" :maskClosable="false" :closable="false" style="width: 300px;">
       <NCard>
         <NForm @keyup.enter="handleSubmit">
@@ -9,8 +10,8 @@
               <NInput v-model:value="accessCredentials" show-password-on="mousedown" type="password"
                 style="width: 70%;" />
               <NButton :loading="loading" type="primary" style="width: 30%;" @click="handleSubmit">
-                <svg t="1682068997810" class="icon" viewBox="0 0 1024 1024" version="1.1"
-                  xmlns="http://www.w3.org/2000/svg" p-id="79416" width="24" height="24">
+                <svg style="transform: rotate(180deg);" t="1682068997810" class="icon" viewBox="0 0 1024 1024"
+                  version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="79416" width="24" height="24">
                   <path
                     d="M512 928H128c-19.2 0-32-12.8-32-32V128c0-19.2 12.8-32 32-32h384c19.2 0 32 12.8 32 32s-12.8 32-32 32H160v704h352c19.2 0 32 12.8 32 32s-12.8 32-32 32z"
                     fill="#fff" p-id="79417" />
@@ -30,7 +31,7 @@
 </template>
 <script setup lang="ts">
-import { NModal, NCard, NForm, NFormItem, NInput, NButton, NInputGroup } from 'naive-ui'
+import { NEmpty, NCard, NForm, NFormItem, NInput, NButton, NInputGroup } from 'naive-ui'
 import { getSessionStorageInfo } from '../preview/utils'
 import type { ChartEditStorageType } from '../preview/index.d'
 import { SavePageEnum } from '@/enums/editPageEnum'
@@ -76,6 +77,7 @@ const sharePageHandlerProcess = async () => {
   }
 }
+const isEmpty = ref(false)
 const getSharePageContentData = async () => {
   try {
     const { params } = ROUTE
@@ -83,7 +85,8 @@ const getSharePageContentData = async () => {
     loading.value = true
     const res = await getShareContentData({ id, accessCredentials: unref(accessCredentials) })
     const { dataViewContent, dataViewName, dataViewId } = res.data
-    const content = JSONParse(dataViewContent.content) as ChartEditStorageType
+    if (!dataViewContent.content) isEmpty.value = true
+    const content = JSONParse(dataViewContent.content || '{}') as ChartEditStorageType
     if (content) {
       const { editCanvasConfig, requestGlobalConfig, componentList } = content
       chartEditStore.editCanvasConfig = editCanvasConfig