From 7783fb5962361983607c31012885f6bc47894ba2 Mon Sep 17 00:00:00 2001 From: icssoa <615206459@qq.com> Date: Tue, 3 Jan 2023 16:01:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/cool/module/index.ts | 2 +- src/cool/utils/data.ts | 1 - .../base/components/codemirror/index.vue | 37 +++--- src/modules/base/components/select/index.vue | 11 +- src/modules/base/store/user.ts | 20 +--- src/modules/chat/components/message.vue | 4 +- src/modules/demo/views/editor-quill.vue | 8 +- src/modules/demo/views/upload.vue | 91 +++++++-------- src/modules/upload/components/index.vue | 27 ++--- src/modules/upload/components/space.vue | 57 +++++---- .../upload/components/space/category.vue | 29 +++-- .../space/{file-item.vue => file.vue} | 79 +++++++++---- .../upload/components/space/item-video.vue | 108 ++++++++++++++++++ src/modules/upload/hooks/index.ts | 8 ++ src/modules/upload/types/index.d.ts | 22 ++++ src/modules/upload/utils/index.ts | 69 ++++++----- 17 files changed, 373 insertions(+), 202 deletions(-) rename src/modules/upload/components/space/{file-item.vue => file.vue} (74%) create mode 100644 src/modules/upload/components/space/item-video.vue create mode 100644 src/modules/upload/hooks/index.ts create mode 100644 src/modules/upload/types/index.d.ts diff --git a/package.json b/package.json index ffe0704..802a25c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "front-next", - "version": "5.12.0", + "version": "5.12.1", "scripts": { "dev": "vite --host", "build": "vite build", diff --git a/src/cool/module/index.ts b/src/cool/module/index.ts index 5b2bf37..92edf0d 100644 --- a/src/cool/module/index.ts +++ b/src/cool/module/index.ts @@ -1,4 +1,3 @@ -// @ts-nocheck import { Module } from "../types"; import { Data } from "../utils"; @@ -10,6 +9,7 @@ const module = { list, req: Promise.resolve(), get(name: string): Module { + // @ts-ignore return this.list.find((e) => e.name == name); }, add(data: Module) { diff --git a/src/cool/utils/data.ts b/src/cool/utils/data.ts index 2661ad4..e8a3aed 100644 --- a/src/cool/utils/data.ts +++ b/src/cool/utils/data.ts @@ -1,4 +1,3 @@ -// @ts-nocheck const d: any = window; // window 数据临时存储,解决热更新后失效问题 diff --git a/src/modules/base/components/codemirror/index.vue b/src/modules/base/components/codemirror/index.vue index efed5ad..bbd544d 100644 --- a/src/modules/base/components/codemirror/index.vue +++ b/src/modules/base/components/codemirror/index.vue @@ -4,7 +4,7 @@ ref="Editor" v-model="content" :placeholder="placeholder" - :style="{ height, fontSize }" + :style="style" autofocus :disabled="disabled" indent-with-tab @@ -21,16 +21,17 @@ import { javascript } from "@codemirror/lang-javascript"; import { oneDark } from "@codemirror/theme-one-dark"; import { ref, watch, computed, defineComponent } from "vue"; import { useDark } from "@vueuse/core"; -import { isNumber } from "lodash-es"; +import { useComm } from "/@/cool"; export default defineComponent({ name: "cl-codemirror", + components: { + Codemirror + }, + props: { - modelValue: { - type: String, - required: true - }, + modelValue: String, placeholder: { type: String, default: "请输入" @@ -40,29 +41,22 @@ export default defineComponent({ default: 400 }, fontSize: { - type: String, - default: "14px" + type: [String, Number], + default: 14 }, disabled: Boolean }, emits: ["update:modelValue", "change"], - components: { - Codemirror - }, - setup(props, { emit }) { + const { px } = useComm(); + const Editor = ref(); // 是否暗黑模式 const isDark = ref(useDark()); - // 高度 - const height = computed(() => - isNumber(props.height) ? `${props.height}px` : props.height - ); - // 插件 const extensions: any[] = [javascript()]; @@ -73,6 +67,11 @@ export default defineComponent({ // 内容 const content = ref(""); + // 样式 + const style = computed(() => { + return { height: px(props.height), fontSize: px(props.fontSize) }; + }); + // 值改变 function onChange(value: string) { emit("update:modelValue", value); @@ -83,7 +82,7 @@ export default defineComponent({ watch( () => props.modelValue, (val) => { - content.value = val; + content.value = val || ""; }, { immediate: true @@ -93,7 +92,7 @@ export default defineComponent({ return { Editor, isDark, - height, + style, content, extensions, onChange diff --git a/src/modules/base/components/select/index.vue b/src/modules/base/components/select/index.vue index 316adfd..6a92ab8 100644 --- a/src/modules/base/components/select/index.vue +++ b/src/modules/base/components/select/index.vue @@ -1,10 +1,11 @@ @@ -22,6 +23,10 @@ export default defineComponent({ type: [Array, Object], default: () => [] }, + clearable: { + type: Boolean, + default: true + }, prop: String }, @@ -30,7 +35,11 @@ export default defineComponent({ setup(props, { emit }) { // cl-crud const Crud = useCrud(); + + // 选中值 const value = ref(); + + // 列表 const list = computed(() => isRef(props.options) ? props.options.value : props.options ); diff --git a/src/modules/base/store/user.ts b/src/modules/base/store/user.ts index facf701..92dae2b 100644 --- a/src/modules/base/store/user.ts +++ b/src/modules/base/store/user.ts @@ -3,20 +3,6 @@ import { ref } from "vue"; import { storage } from "/@/cool/utils"; import { service, config, router } from "/@/cool"; -interface User { - id: number; - name: string; - username: string; - nickName: string; - phone: string; - headImg: string; - email: string; - status: 0 | 1; - departmentId: string; - createTime: Date; - [key: string]: any; -} - // 本地缓存 const data = storage.info(); @@ -27,9 +13,9 @@ export const useUserStore = defineStore("user", function () { // 设置标识 function setToken(data: { token: string; - expire: string; + expire: number; refreshToken: string; - refreshExpire: string; + refreshExpire: number; }) { // 请求的唯一标识 token.value = data.token; @@ -58,7 +44,7 @@ export const useUserStore = defineStore("user", function () { } // 用户信息 - const info = ref(data.userInfo); + const info = ref(data.userInfo); // 设置用户信息 function set(value: any) { diff --git a/src/modules/chat/components/message.vue b/src/modules/chat/components/message.vue index 662cab2..13b19b6 100644 --- a/src/modules/chat/components/message.vue +++ b/src/modules/chat/components/message.vue @@ -63,7 +63,7 @@
  • - +
  • @@ -101,7 +101,7 @@ import { computed, ref } from "vue"; import { useChat } from "../hooks"; import { useStore } from "../store"; -import { Picture, VideoCamera, Microphone } from "@element-plus/icons-vue"; +import { PictureFilled, VideoCamera, Microphone } from "@element-plus/icons-vue"; import { useBase } from "/$/base"; import { ContextMenu } from "@cool-vue/crud"; import { useClipboard } from "@vueuse/core"; diff --git a/src/modules/demo/views/editor-quill.vue b/src/modules/demo/views/editor-quill.vue index b40da32..d84ad9e 100644 --- a/src/modules/demo/views/editor-quill.vue +++ b/src/modules/demo/views/editor-quill.vue @@ -1,6 +1,6 @@