From bbcedd02baa053a88688a82fc72e87c857c82db2 Mon Sep 17 00:00:00 2001 From: dhb52 Date: Wed, 3 Jan 2024 03:40:39 +0000 Subject: [PATCH 01/13] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dvscode=E5=85=A8?= =?UTF-8?q?=E5=B1=80=E5=B1=9E=E6=80=A7ts=E7=88=86=E7=BA=A2=E9=97=AE?= =?UTF-8?q?=E9=A2=98=20=E5=8F=82=E7=85=A7vuejs=E5=AE=98=E6=96=B9=E6=96=87?= =?UTF-8?q?=E6=A1=A3=EF=BC=8C[=E6=89=A9=E5=B1=95=E5=85=A8=E5=B1=80?= =?UTF-8?q?=E5=B1=9E=E6=80=A7](https://cn.vuejs.org/guide/typescript/optio?= =?UTF-8?q?ns-api.html#augmenting-global-properties)=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ```ts declare module 'vue' { interface ComponentCustomProperties { $http: typeof axios $translate: (key: string) => string } } ``` Signed-off-by: dhb52 --- src/types/module.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/types/module.d.ts b/src/types/module.d.ts index bc2f16b..984df9f 100644 --- a/src/types/module.d.ts +++ b/src/types/module.d.ts @@ -11,7 +11,7 @@ import { download as rd } from '@/utils/request'; export {}; -declare module '@vue/runtime-core' { +declare module 'vue' { interface ComponentCustomProperties { // 全局方法声明 $modal: typeof modal; From bb696b300fb1307998db7e0914f7ad593e2f51ed Mon Sep 17 00:00:00 2001 From: ahao Date: Fri, 5 Jan 2024 11:42:36 +0800 Subject: [PATCH 02/13] =?UTF-8?q?update=20=E5=8D=87=E7=BA=A7=E4=BE=9D?= =?UTF-8?q?=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 45 ++++++++++++++++----------------- src/views/system/user/index.vue | 4 +-- 2 files changed, 24 insertions(+), 25 deletions(-) diff --git a/package.json b/package.json index 1395590..3e412a4 100644 --- a/package.json +++ b/package.json @@ -22,13 +22,13 @@ "@vueup/vue-quill": "1.2.0", "@vueuse/core": "10.7.0", "animate.css": "4.1.1", - "await-to-js": "^3.0.0", - "axios": "^1.6.0", - "crypto-js": "^4.2.0", + "await-to-js": "3.0.0", + "axios": "1.6.0", + "crypto-js": "4.2.0", "echarts": "5.4.3", "element-plus": "2.4.4", "file-saver": "2.0.5", - "fuse.js": "6.6.2", + "fuse.js": "7.0.0", "js-cookie": "3.0.5", "jsencrypt": "3.3.2", "nprogress": "0.2.0", @@ -37,29 +37,28 @@ "pinia": "2.1.7", "screenfull": "6.0.0", "vform3-builds": "3.0.8", - "vue": "3.3.13", + "vue": "3.4.5", "vue-cropper": "1.1.1", - "vue-i18n": "9.2.2", + "vue-i18n": "9.8.0", "vue-router": "4.2.5", "vue-types": "5.1.1" }, "devDependencies": { - "@iconify/json": "^2.2.157", + "@iconify/json": "2.2.157", "@intlify/unplugin-vue-i18n": "1.6.0", - "@types/crypto-js": "^4.2.0", + "@types/crypto-js": "4.2.0", "@types/file-saver": "2.0.5", "@types/js-cookie": "3.0.5", "@types/node": "18.14.2", "@types/nprogress": "0.2.0", - "@types/path-browserify": "^1.0.0", - "@typescript-eslint/eslint-plugin": "6.14.0", - "@typescript-eslint/parser": "6.14.0", - "@unocss/preset-attributify": "^0.58.0", - "@unocss/preset-icons": "^0.58.0", - "@unocss/preset-uno": "^0.58.0", - "@vue/compiler-sfc": "3.3.11", - "@vue/runtime-core": "3.3.11", - "@vitejs/plugin-vue": "4.5.2", + "@types/path-browserify": "1.0.0", + "@typescript-eslint/eslint-plugin": "6.17.0", + "@typescript-eslint/parser": "6.17.0", + "@unocss/preset-attributify": "0.58.3", + "@unocss/preset-icons": "0.58.3", + "@unocss/preset-uno": "0.58.3", + "@vue/compiler-sfc": "3.4.5", + "@vitejs/plugin-vue": "5.0.2", "autoprefixer": "10.4.14", "eslint": "8.55.0", "eslint-config-prettier": "9.1.0", @@ -69,22 +68,22 @@ "eslint-plugin-node": "11.1.0", "eslint-plugin-import": "2.29.0", "eslint-plugin-vue": "9.19.2", - "fast-glob": "^3.2.11", - "husky": "7.0.4", - "postcss": "^8.4.21", + "fast-glob": "3.3.2", + "husky": "8.0.3", + "postcss": "8.4.33", "prettier": "3.1.1", "sass": "1.69.5", "typescript": "5.3.3", - "unocss": "^0.58.0", + "unocss": "0.58.0", "unplugin-auto-import": "0.17.2", "unplugin-icons": "0.18.1", "unplugin-vue-components": "0.26.0", "unplugin-vue-setup-extend-plus": "1.0.0", "vite-plugin-compression": "0.5.1", "vite-plugin-svg-icons": "2.0.1", - "vitest": "^0.29.7", + "vitest": "0.29.7", "vue-eslint-parser": "9.3.2", "vue-tsc": "0.35.0", - "vite": "5.0.5" + "vite": "5.0.10" } } diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 2de26a5..df8b192 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -298,12 +298,12 @@ From d3b630076af2b25603fba7c3adcf2c5313c3bd2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=8A=93=E8=9B=99=E5=B8=88?= <770492966@qq.com> Date: Fri, 5 Jan 2024 14:50:27 +0000 Subject: [PATCH 09/13] =?UTF-8?q?update=20=E5=AF=8C=E6=96=87=E6=9C=AC?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=EF=BC=8C=E4=BF=AE=E5=A4=8D=E4=B8=A4=E4=B8=AA?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE=E9=94=99=E4=B9=B1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 抓蛙师 <770492966@qq.com> --- src/components/Editor/index.vue | 38 ++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/src/components/Editor/index.vue b/src/components/Editor/index.vue index d2467f1..be7f24a 100644 --- a/src/components/Editor/index.vue +++ b/src/components/Editor/index.vue @@ -2,7 +2,6 @@
+
@@ -64,18 +64,30 @@ const options = ref({ debug: 'warn', modules: { // 工具栏配置 - toolbar: [ - ['bold', 'italic', 'underline', 'strike'], // 加粗 斜体 下划线 删除线 - ['blockquote', 'code-block'], // 引用 代码块 - [{ list: 'ordered' }, { list: 'bullet' }], // 有序、无序列表 - [{ indent: '-1' }, { indent: '+1' }], // 缩进 - [{ size: ['small', false, 'large', 'huge'] }], // 字体大小 - [{ header: [1, 2, 3, 4, 5, 6, false] }], // 标题 - [{ color: [] }, { background: [] }], // 字体颜色、字体背景颜色 - [{ align: [] }], // 对齐方式 - ['clean'], // 清除文本格式 - ['link', 'image', 'video'] // 链接、图片、视频 - ] + toolbar: { + container: [ + ["bold", "italic", "underline", "strike"], // 加粗 斜体 下划线 删除线 + ["blockquote", "code-block"], // 引用 代码块 + [{ list: "ordered" }, { list: "bullet" }], // 有序、无序列表 + [{ indent: "-1" }, { indent: "+1" }], // 缩进 + [{ size: ["small", false, "large", "huge"] }], // 字体大小 + [{ header: [1, 2, 3, 4, 5, 6, false] }], // 标题 + [{ color: [] }, { background: [] }], // 字体颜色、字体背景颜色 + [{ align: [] }], // 对齐方式 + ["clean"], // 清除文本格式 + ["link", "image", "video"] // 链接、图片、视频 + ], + handlers: { + image: function (value: any) { + if (value) { + // 调用element图片上传 + proxy?.$refs.uploadRef.click(); + } else { + Quill.format("image", true); + } + }, + }, + } }, placeholder: '请输入内容', readOnly: props.readOnly From 31da01bdd1e4fe8fb8eec41f401d73bcf6cc18b7 Mon Sep 17 00:00:00 2001 From: ahao Date: Sat, 6 Jan 2024 17:27:01 +0800 Subject: [PATCH 10/13] fix https://gitee.com/dromara/RuoYi-Vue-Plus/issues/I8TMAI --- src/components/Editor/index.vue | 35 +++++++++++++++++---------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/src/components/Editor/index.vue b/src/components/Editor/index.vue index be7f24a..fc30c85 100644 --- a/src/components/Editor/index.vue +++ b/src/components/Editor/index.vue @@ -57,6 +57,7 @@ const upload = reactive({ url: import.meta.env.VITE_APP_BASE_API + '/resource/oss/upload' }); const quillEditorRef = ref(); +const uploadRef = ref(); const options = ref({ theme: 'snow', @@ -66,27 +67,27 @@ const options = ref({ // 工具栏配置 toolbar: { container: [ - ["bold", "italic", "underline", "strike"], // 加粗 斜体 下划线 删除线 - ["blockquote", "code-block"], // 引用 代码块 - [{ list: "ordered" }, { list: "bullet" }], // 有序、无序列表 - [{ indent: "-1" }, { indent: "+1" }], // 缩进 - [{ size: ["small", false, "large", "huge"] }], // 字体大小 - [{ header: [1, 2, 3, 4, 5, 6, false] }], // 标题 - [{ color: [] }, { background: [] }], // 字体颜色、字体背景颜色 - [{ align: [] }], // 对齐方式 - ["clean"], // 清除文本格式 - ["link", "image", "video"] // 链接、图片、视频 + ['bold', 'italic', 'underline', 'strike'], // 加粗 斜体 下划线 删除线 + ['blockquote', 'code-block'], // 引用 代码块 + [{ list: 'ordered' }, { list: 'bullet' }], // 有序、无序列表 + [{ indent: '-1' }, { indent: '+1' }], // 缩进 + [{ size: ['small', false, 'large', 'huge'] }], // 字体大小 + [{ header: [1, 2, 3, 4, 5, 6, false] }], // 标题 + [{ color: [] }, { background: [] }], // 字体颜色、字体背景颜色 + [{ align: [] }], // 对齐方式 + ['clean'], // 清除文本格式 + ['link', 'image', 'video'] // 链接、图片、视频 ], handlers: { - image: function (value: any) { + image: (value: boolean) => { if (value) { // 调用element图片上传 - proxy?.$refs.uploadRef.click(); + uploadRef.value.click(); } else { - Quill.format("image", true); + Quill.format('image', true); } - }, - }, + } + } } }, placeholder: '请输入内容', @@ -107,7 +108,7 @@ const styles = computed(() => { const content = ref(''); watch( () => props.modelValue, - (v) => { + (v: string) => { if (v !== content.value) { content.value = v === undefined ? '

' : v; } @@ -129,7 +130,7 @@ const handleUploadSuccess = (res: any) => { quill.setSelection(length + 1); proxy?.$modal.closeLoading(); } else { - proxy?.$modal.msgError("图片插入失败"); + proxy?.$modal.msgError('图片插入失败'); proxy?.$modal.closeLoading(); } }; From 075c02b8c380ce3b565837358d1b2f32cfa6ef94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Sat, 6 Jan 2024 20:58:54 +0800 Subject: [PATCH 11/13] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E7=BF=BB=E8=AF=91=E6=B3=A8=E8=A7=A3=E7=AE=80=E5=8C=96?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9F=A5=E8=AF=A2=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/user/types.ts | 3 +-- src/views/system/user/index.vue | 9 +-------- src/views/system/user/profile/index.vue | 2 +- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/api/system/user/types.ts b/src/api/system/user/types.ts index 77e9c32..3488e9f 100644 --- a/src/api/system/user/types.ts +++ b/src/api/system/user/types.ts @@ -1,4 +1,3 @@ -import { DeptVO } from './../dept/types'; import { RoleVO } from '@/api/system/role/types'; import { PostVO } from '@/api/system/post/types'; @@ -40,7 +39,7 @@ export interface UserVO extends BaseEntity { loginIp: string; loginDate: string; remark: string; - dept: DeptVO; + deptName: string; roles: RoleVO[]; roleIds: any; postIds: any; diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index df8b192..3ea2864 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -101,14 +101,7 @@ - +