Merge pull request rocboss#9 from pohunchn/main

前端优化ts代码

paopao-web/package.json

@@ -30,6 +30,7 @@
   },
   "devDependencies": {
     "@types/node": "^17.0.35",
+    "@types/qrcode": "^1.4.2",
     "@vitejs/plugin-vue": "^2.3.1",
     "@vue/compiler-sfc": "^3.2.36",
     "typescript": "^4.7.2",

paopao-web/src/api/post.ts

@@ -112,12 +112,12 @@ export const getPostComments = (params: NetParams.PostGetPostComments) => {
  *  - @param {array} tags 话题
  * @returns Promise
  */
-export const createPost = (data: any) => {
+export const createPost = (data: NetParams.PostCreatePost) => {
     return request({
         method: 'post',
         url: '/post',
         data
-    });
+    }) as unknown as Promise<NetReq.PostCreatePost>;
 };
 
 /**

paopao-web/src/components/auth.vue

@@ -79,7 +79,7 @@
                                         message: '请输入密码',
                                     },
                                     {
-                                        validator(rule: FormItemRule, value: any) {
+                                        validator: (rule: FormItemRule, value: any) => {
                                             return (
                                                 !!registerForm.password &&
                                                 registerForm.password.startsWith(

paopao-web/src/components/comment-item.vue

@@ -112,7 +112,9 @@ const replyAtUserID = ref(0);
 const replyAtUsername = ref('');
 const replyComposeRef = ref();
 
-const emit = defineEmits(['reload']);
+const emit = defineEmits<{
+    (e: "reload"): void
+}>();
 const props = withDefaults(defineProps<{
     comment: Item.CommentProps
 }>(), {})

paopao-web/src/components/compose-comment.vue

@@ -169,7 +169,9 @@ import { getSuggestUsers } from '@/api/user';
 import { parsePostTag } from '@/utils/content';
 import type { MentionOption, UploadFileInfo, UploadInst } from 'naive-ui';
 
-const emit = defineEmits(['post-success']);
+const emit = defineEmits<{
+    (e: "post-success"): void
+}>();
 const props = withDefaults(defineProps<{
     lock: number,
     postId: number,

paopao-web/src/components/compose-reply.vue

@@ -43,21 +43,19 @@ import { ref } from 'vue';
 import { createCommentReply } from '@/api/post';
 import { InputInst } from 'naive-ui';
 
-const props = defineProps({
-    commentId: {
-        type: Number,
-        default: 0,
-    },
-    atUserid: {
-        type: Number,
-        default: 0,
-    },
-    atUsername: {
-        type: String,
-        default: '',
-    },
+const props = withDefaults(defineProps<{
+    commentId: number,
+    atUserid: number,
+    atUsername: string,
+}>(), {
+    commentId: 0,
+    atUserid: 0,
+    atUsername: ""
 });
-const emit = defineEmits(['reload', 'reset']);
+const emit = defineEmits<{
+    (e: "reload"): void,
+    (e: "reset"): void
+}>();
 const inputInstRef = ref<InputInst>();
 const showReply = ref(false);
 const replyContent = ref('');

paopao-web/src/components/compose.vue

@@ -248,7 +248,7 @@ import { parsePostTag } from '@/utils/content';
 import type { MentionOption, UploadFileInfo, UploadInst } from 'naive-ui';
 
 const emit = defineEmits<{
-    (e: 'post-success', post: AnyObject): void
+    (e: 'post-success', post: Item.PostProps): void
 }>();
 
 const store = useStore();

paopao-web/src/components/main-nav.vue

@@ -42,15 +42,12 @@ import { DarkModeOutlined, ChevronLeftRound } from '@vicons/material';
 const store = useStore();
 const router = useRouter();
 
-const props = defineProps({
-    title: {
-        type: String,
-        default: '',
-    },
-    back: {
-        type: Boolean,
-        default: false,
-    },
+const props = withDefaults(defineProps<{
+    title: string,
+    back: boolean,
+}>(), {
+    title: "",
+    back: false
 });
 const switchTheme = (theme: boolean) => {
     if (theme) {

paopao-web/src/components/post-detail.vue

@@ -167,7 +167,9 @@ const showDelModal = ref(false);
 const showLockModal = ref(false);
 const loading = ref(false);
 
-const emit = defineEmits(['reload']);
+const emit = defineEmits<{
+    (e: "reload"): void
+}>();
 
 const post = computed({
     get: () => {

paopao-web/src/components/reply-item.vue

@@ -75,7 +75,10 @@ const props = withDefaults(defineProps<{
     reply: Item.ReplyProps,
 }>(), {});
 const store = useStore();
-const emit = defineEmits(['focusReply', 'reload']);
+const emit = defineEmits<{
+    (e: "focusReply", reply: Item.ReplyProps): void,
+    (e: "reload"): void
+}>();
 
 const focusReply = () => {
     emit('focusReply', props.reply);

paopao-web/src/types/NetParams.d.ts

@@ -103,5 +103,16 @@ declare module NetParams {
     interface PostGetPostComments {
         id: number
     }
+
+    interface PostCreatePost {
+        contents: {
+            content: string,
+            type: number,
+            sort: number
+        }[],
+        tags: string[],
+        users: string[],
+        attachment_price: number
+    }
 
 }

paopao-web/src/types/NetReq.d.ts

@@ -95,4 +95,6 @@ declare module NetReq {
         list: Item.PostProps[]
     }
 
+    type PostCreatePost = Item.PostProps
+
 }

paopao-web/src/vite-env.d.ts

@@ -1,3 +1,4 @@
 /// <reference types="vite/client" />
 /// <reference types="vue/ref-macros" />
-/// <reference types="naive-ui/volar" />
+/// <reference types="naive-ui/volar" />
+/// <reference types="@types/qrcode" />

paopao-web/yarn.lock

@@ -104,7 +104,7 @@
   resolved "https://registry.npmmirror.com/@types/lodash/-/lodash-4.14.181.tgz"
   integrity sha512-n3tyKthHJbkiWhDZs3DkhkCzt2MexYHXlX0td5iMplyfwketaOeKboEVBqzceH7juqvEg3q5oUoBFxSLu7zFag==
 
-"@types/node@^17.0.35", "@types/node@~17.0.5":
+"@types/node@*", "@types/node@^17.0.35", "@types/node@~17.0.5":
   version "17.0.35"
   resolved "https://registry.npmmirror.com/@types/node/-/node-17.0.35.tgz"
   integrity sha512-vu1SrqBjbbZ3J6vwY17jBs8Sr/BKA+/a/WtjRG+whKg1iuLFOosq872EXS0eXWILdO36DHQQeku/ZcL6hz2fpg==
@@ -114,6 +114,13 @@
   resolved "https://registry.npmmirror.com/@types/parse-json/-/parse-json-4.0.0.tgz"
   integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
 
+"@types/qrcode@^1.4.2":
+  version "1.4.2"
+  resolved "https://registry.npmmirror.com/@types/qrcode/-/qrcode-1.4.2.tgz"
+  integrity sha512-7uNT9L4WQTNJejHTSTdaJhfBSCN73xtXaHFyBJ8TSwiLhe4PRuTue7Iph0s2nG9R/ifUaSnGhLUOZavlBEqDWQ==
+  dependencies:
+    "@types/node" "*"
+
 "@vicons/carbon@^0.12.0":
   version "0.12.0"
   resolved "https://registry.npmmirror.com/@vicons/carbon/-/carbon-0.12.0.tgz"