Bladeren bron

feat: fix

gemercheung 6 maanden geleden
bovenliggende
commit
f81d4f0b50

+ 13 - 13
packages/frontend/src/views/article/add.vue

@@ -7,50 +7,50 @@
     </template>
 
     <div class="editor-wrap">
-      <n-form
+      <n-form
         ref="modalFormRef" class="form wh-full" label-placement="left" label-align="left" :label-width="80"
-        :model="modalForm"
+        :model="modalForm"
       >
-        <n-form-item
+        <n-form-item
           label="文章名称" path="title" :rule="{
             required: true,
             message: '请输入文章名称',
             trigger: ['input', 'blur'],
-          }"
+          }"
         >
           <n-input v-model:value="modalForm.title" />
         </n-form-item>
 
-        <n-form-item
+        <n-form-item
           label="文章分类" path="categoryId" :rule="{
             required: true,
             type: 'number',
             trigger: ['change', 'blur'],
             message: '请输入文章分类',
-          }"
+          }"
         >
-          <n-tree-select
+          <n-tree-select
             v-model:value="modalForm.categoryId" :options="allCategory" label-field="title" key-field="id"
-            placeholder="根分类" clearable style="max-width: 300px;"
+            placeholder="根分类" clearable style="max-width: 300px;"
           />
         </n-form-item>
 
         <n-tabs type="line" animated>
           <template v-for="(lang, index) in langs" :key="lang">
             <n-tab-pane :name="lang" :tab="langLabel[lang]" :index="index">
-              <n-form-item
+              <n-form-item
                 label="文章名称" path="title" :rule="{
                   required: true,
                   message: '请输入文章名称',
                   trigger: ['input', 'blur'],
-                }"
+                }"
               >
                 <n-input v-model:value="modalForm.translations[index].title" />
               </n-form-item>
               <div class="h-450">
-                <VividEditor
+                <VividEditor
                   v-model="modalForm.translations[index].content" :dark="isDark"
-                  :handle-image-upload="handleUpload" :handle-video-upload="handleVideoUpload"
+                  :handle-image-upload="handleUpload" :handle-video-upload="handleVideoUpload"
                 >
                   <SlashCommand />
                   <DragHandle />
@@ -126,7 +126,7 @@ function handleUpload(file) {
   return new Promise(async (resolve) => {
     // console.log('handleUpload', file)
     const data = new FormData()
-    // data.append('file', file)
+    data.append('file', file)
     const res = await articleApi.uploadImage(data)
     // console.log('res', res)
     resolve(res.data)

+ 19 - 55
packages/frontend/src/views/pms/user/index.vue

@@ -15,20 +15,9 @@
       </NButton>
     </template>
 
-    <MeCrud
-      ref="$table"
-      v-model:query-items="queryItems"
-      :scroll-x="1200"
-      :columns="columns"
-      :get-data="api.read"
-    >
+    <MeCrud ref="$table" v-model:query-items="queryItems" :scroll-x="1200" :columns="columns" :get-data="api.read">
       <MeQueryItem label="用户名" :label-width="50">
-        <n-input
-          v-model:value="queryItems.username"
-          type="text"
-          placeholder="请输入用户名"
-          clearable
-        />
+        <n-input v-model:value="queryItems.username" type="text" placeholder="请输入用户名" clearable />
       </MeQueryItem>
 
       <MeQueryItem label="性别" :label-width="50">
@@ -36,60 +25,35 @@
       </MeQueryItem>
 
       <MeQueryItem label="状态" :label-width="50">
-        <n-select
-          v-model:value="queryItems.enable"
-          clearable
-          :options="[
-            { label: '启用', value: 1 },
-            { label: '停用', value: 0 },
-          ]"
-        />
+        <n-select v-model:value="queryItems.enable" clearable :options="[
+          { label: '启用', value: 1 },
+          { label: '停用', value: 0 },
+        ]" />
       </MeQueryItem>
     </MeCrud>
 
     <MeModal ref="modalRef" width="520px">
-      <n-form
-        ref="modalFormRef"
-        label-placement="left"
-        label-align="left"
-        :label-width="80"
-        :model="modalForm"
-        :disabled="modalAction === 'view'"
-      >
-        <n-form-item
-          label="用户名"
-          path="username"
-          :rule="{
-            required: true,
-            message: '请输入用户名',
-            trigger: ['input', 'blur'],
-          }"
-        >
+      <n-form ref="modalFormRef" label-placement="left" label-align="left" :label-width="80" :model="modalForm"
+        :disabled="modalAction === 'view'">
+        <n-form-item label="用户名" path="username" :rule="{
+          required: true,
+          message: '请输入用户名',
+          trigger: ['input', 'blur'],
+        }">
           <n-input v-model:value="modalForm.username" :disabled="modalAction !== 'add'" />
         </n-form-item>
-        <n-form-item
-          v-if="['add', 'reset'].includes(modalAction)"
-          :label="modalAction === 'reset' ? '重置密码' : '初始密码'"
-          path="password"
-          :rule="{
+        <n-form-item v-if="['add', 'reset'].includes(modalAction)" :label="modalAction === 'reset' ? '重置密码' : '初始密码'"
+          path="password" :rule="{
             required: true,
             message: '请输入密码',
             trigger: ['input', 'blur'],
-          }"
-        >
+          }">
           <n-input v-model:value="modalForm.password" />
         </n-form-item>
 
         <n-form-item v-if="['add', 'setRole'].includes(modalAction)" label="角色" path="roleIds">
-          <n-select
-            v-model:value="modalForm.roleIds"
-            :options="roles"
-            label-field="name"
-            value-field="id"
-            clearable
-            filterable
-            multiple
-          />
+          <n-select v-model:value="modalForm.roleIds" :options="roles" label-field="name" value-field="id" clearable
+            filterable multiple />
         </n-form-item>
         <n-form-item v-if="modalAction === 'add'" label="状态" path="enable">
           <NSwitch v-model:value="modalForm.enable">
@@ -170,7 +134,7 @@ const columns = [
     ellipsis: { tooltip: true },
     render: ({ roles }) => {
       if (roles?.length) {
-        return roles.map((item, index) =>
+        return roles.slice(0, 2).map((item, index) =>
           h(
             NTag,
             { type: 'success', style: index > 0 ? 'margin-left: 8px;' : '' },

+ 1 - 1
packages/web/src/pages/index.vue

@@ -179,7 +179,7 @@ const onSlideChange = (index: number) => {
 
 const handleToDoc = (child: ArticleDetailType) => {
   const { articleId, categoryId } = child
-  console.log(articleId, categoryId)
+  console.log("handleToDoc", articleId, categoryId)
   if (articleId) {
     router.push({ path: `/showdoc/${articleId}` })
   } else {