Merge branch 'dev' of http://192.168.0.115:3000/4dkankan/4dkankan_bim into dev

src/components/files/TagEditor.vue

@@ -167,6 +167,8 @@ const handlerUpload = async data => {
                 pushData.status = tag.status
                 pushData.content = tag.content
                 pushData.members = tag.members
+                pushData.createTime = response.data.createTime
+                console.error(pushData)
                 tags.value.push(pushData)
                 pushData = null
             }

src/components/files/content/TagMsg.vue

@@ -4,28 +4,28 @@
         <UiAudio v-if="notify.type == 'audio'" :src="notify.media?.[notify.type][0].src" />
 
         <div class="content-item">
-            <div class="item-title">{{$t('tag.createTime')}}</div>
+            <div class="item-title">{{ $t('tag.createTime') }}</div>
             <span class="content-desc">{{ notify.createTime }}</span>
         </div>
         <div class="content-item">
-            <div class="item-title">{{$t('tag.creater')}}</div>
-            <span class="content-desc">{{ notify.lastCreateBy }}</span>
+            <div class="item-title">{{ $t('tag.creater') }}</div>
+            <span class="content-desc">{{ notify.lastCreateBy || $t('tag.unkownUser') }}</span>
         </div>
         <div class="content-item">
-            <div class="item-title">{{$t('tag.status')}}</div>
+            <div class="item-title">{{ $t('tag.status') }}</div>
             <span class="content-desc" v-for="i in data.status">
                 <span v-if="i.value == form.status">{{ i.text }}</span></span
             >
         </div>
         <div class="content-item">
-            <div class="item-title">{{$t('tag.member')}}</div>
+            <div class="item-title">{{ $t('tag.member') }}</div>
             <span class="content-desc" v-for="(i, index) in form.members"
                 ><span>{{ i.text }}</span>
                 <span v-if="index < form.members.length - 1">、</span>
             </span>
         </div>
         <div class="content-item">
-            <div class="item-title">{{$t('tag.desc')}}</div>
+            <div class="item-title">{{ $t('tag.desc') }}</div>
             <span class="content-desc">{{ form.describe }}</span>
         </div>
         <div class="media-box" :class="{ nor: notify.type == 'link', 'zoom-in': notify.type != 'video' }" @click="openView = true" v-if="notify.media?.[notify.type]?.length && notify.type != 'audio'">

src/components/form/SelectList.vue

@@ -4,7 +4,7 @@
             <div class="place" :class="{ placeholder: !modelValue.length }">
                 <ul v-if="modelValue.length">
                     <li v-for="item in modelValue" @click.stop>
-                        <span>{{ item.text }}</span
+                        <span>{{ item.text || $t('tag.unkownUser') }}</span
                         ><i class="iconfont icon-close" @click="onselecterChange(item)"></i>
                     </li>
                 </ul>
@@ -16,7 +16,7 @@
             <div class="panel" v-show="selecterShow">
                 <ul>
                     <li v-for="item in data" @click.stop="onselecterChange(item)">
-                        <div><span class="checkbox" :class="{ checked: modelValue.includes(item) }"></span>{{ item.text }}</div>
+                        <div><span class="checkbox" :class="{ checked: modelValue.includes(item) }"></span>{{ item.text || $t('tag.unkownUser') }}</div>
                     </li>
                 </ul>
             </div>
@@ -56,7 +56,7 @@ const onselecterChange = data => {
     } else {
         props.modelValue.splice(index, 1)
     }
-    emits('change',  props.modelValue)
+    emits('change', props.modelValue)
 }
 const onOutside = () => {
     selecterShow.value = false