Merge branch 'sso' of shuzhihua/randd-vue into master

src/views/news/list/index.vue

@@ -69,7 +69,7 @@
     />
   </ContentWrap>
 
-  <Dialog v-model="dialogVisible" :title="dialogTitle" width="800px" destroy-on-close>
+  <Dialog v-model="dialogVisible" :title="dialogTitle" width="60%" destroy-on-close>
     <el-form
       ref="formRef"
       v-loading="formLoading"
@@ -100,7 +100,7 @@
     </template>
   </Dialog>
 
-  <Dialog v-model="detailVisible" title="资讯详情" width="800px" destroy-on-close>
+  <Dialog v-model="detailVisible" title="资讯详情" width="75%" destroy-on-close>
     <div v-loading="detailLoading" class="news-detail">
       <h2>{{ detailData.newsName }}</h2>
       <div class="news-detail-meta">
@@ -198,7 +198,15 @@ const openForm = async (type: 'create' | 'update', id?: number) => {
   if (type === 'update' && id) {
     formLoading.value = true
     try {
-      formData.value = { ...createDefaultFormData(), ...(await getNewsDetail(id)) }
+      const detail = await getNewsDetail(id)
+      formData.value = {
+        ...createDefaultFormData(),
+        ...detail,
+        newsCategory:
+          detail.newsCategory === undefined || detail.newsCategory === null
+            ? undefined
+            : Number(detail.newsCategory)
+      }
     } finally {
       formLoading.value = false
     }