From 3bd5997cb75ac72167c0fa16f5d0d03d3069fd3b Mon Sep 17 00:00:00 2001 From: sx1989827 <395414574@qq.com> Date: Thu, 29 Jun 2023 15:47:54 +0800 Subject: [PATCH] add --- code/client/package.json | 13 +- .../common/component/field/fieldInput.vue | 14 +- .../common/component/richEditor/event.ts | 518 +++- .../richEditor/font/css/font-awesome.css | 2337 ++++++++++++++ .../richEditor/font/css/font-awesome.min.css | 4 + .../richEditor/font/fonts/FontAwesome.otf | Bin 0 -> 134808 bytes .../font/fonts/fontawesome-webfont.eot | Bin 0 -> 165742 bytes .../font/fonts/fontawesome-webfont.svg | 2671 +++++++++++++++++ .../font/fonts/fontawesome-webfont.ttf | Bin 0 -> 165548 bytes .../font/fonts/fontawesome-webfont.woff | Bin 0 -> 98024 bytes .../font/fonts/fontawesome-webfont.woff2 | Bin 0 -> 77160 bytes .../common/component/richEditor/func.ts | 71 +- .../common/component/richEditor/handle.ts | 84 +- .../common/component/richEditor/popMenu.vue | 46 + .../component/richEditor/richEditor.vue | 86 +- .../common/component/richEditor/type.ts | 26 - .../controller/app/finder/finderContent.vue | 3 +- .../controller/app/finder/finderHandle.ts | 2 +- .../app/project/issue/projectIssueBind.vue | 4 +- .../app/project/issue/projectIssueList.vue | 16 +- .../app/setting/issue/FieldCopyFrom.vue | 2 +- .../app/wiki/popMenu/projectFilter.vue | 15 + .../controller/app/wiki/wikiItemContent.vue | 106 +- code/client/src/main.ts | 3 + code/common/model/wiki_item_content.ts | 36 + code/common/routes/calendar.ts | 18 +- code/common/routes/file.ts | 1 + code/common/routes/issue.ts | 6 +- code/common/routes/release.ts | 2 +- code/common/routes/response.ts | 30 +- code/common/routes/wiki.ts | 20 +- code/common/status/error.ts | 4 + code/server/auth/event/permission.ts | 6 + code/server/calendar/http/calendar.ts | 6 + code/server/calendar/mapper/calendar.ts | 58 + code/server/calendar/service/calendar.ts | 5 + code/server/common/event/types.ts | 5 +- code/server/cooperation/http/issue.ts | 6 +- code/server/cooperation/http/project.ts | 7 + code/server/cooperation/http/release.ts | 4 +- code/server/cooperation/mapper/issue.ts | 45 +- code/server/cooperation/mapper/release.ts | 110 +- code/server/cooperation/service/issue.ts | 4 +- code/server/cooperation/service/release.ts | 4 +- code/server/file/event/file.ts | 8 +- code/server/file/http/file.ts | 6 +- code/server/tsconfig.json | 2 +- code/server/user/service/organization.ts | 2 + code/server/wiki/http/wiki.ts | 6 + code/server/wiki/mapper/wiki.ts | 57 + code/server/wiki/service/wiki.ts | 59 + 51 files changed, 6177 insertions(+), 361 deletions(-) create mode 100644 code/client/src/business/common/component/richEditor/font/css/font-awesome.css create mode 100644 code/client/src/business/common/component/richEditor/font/css/font-awesome.min.css create mode 100644 code/client/src/business/common/component/richEditor/font/fonts/FontAwesome.otf create mode 100644 code/client/src/business/common/component/richEditor/font/fonts/fontawesome-webfont.eot create mode 100644 code/client/src/business/common/component/richEditor/font/fonts/fontawesome-webfont.svg create mode 100644 code/client/src/business/common/component/richEditor/font/fonts/fontawesome-webfont.ttf create mode 100644 code/client/src/business/common/component/richEditor/font/fonts/fontawesome-webfont.woff create mode 100644 code/client/src/business/common/component/richEditor/font/fonts/fontawesome-webfont.woff2 create mode 100644 code/client/src/business/common/component/richEditor/popMenu.vue delete mode 100644 code/client/src/business/common/component/richEditor/type.ts create mode 100644 code/client/src/business/controller/app/wiki/popMenu/projectFilter.vue diff --git a/code/client/package.json b/code/client/package.json index a446426..2e062de 100644 --- a/code/client/package.json +++ b/code/client/package.json @@ -9,17 +9,20 @@ "preview": "vite preview" }, "dependencies": { + "@fortawesome/fontawesome-svg-core": "^6.4.0", + "@fortawesome/free-regular-svg-icons": "^6.4.0", + "@fortawesome/vue-fontawesome": "^3.0.3", "@logicflow/core": "^1.1.31", "blueimp-md5": "^2.19.0", "eventemitter3": "^5.0.0", "mediasoup-client": "^3.6.84", "moment": "^2.29.4", "moment-timezone": "^0.5.42", - "pinia": "^2.0.28", + "pinia": "^2.1.4", "socket.io-client": "^4.6.1", "uuid": "^9.0.0", "vue": "^3.3.4", - "vue-router": "^4.1.6" + "vue-router": "^4.2.2" }, "devDependencies": { "@arco-design/web-vue": "^2.47.1", @@ -27,14 +30,14 @@ "@types/blueimp-md5": "^2.18.0", "@types/node": "^18.15.11", "@types/uuid": "^9.0.0", - "@vitejs/plugin-vue": "^4.2.0", + "@vitejs/plugin-vue": "^4.2.3", "rollup-plugin-typescript2": "^0.34.1", "tslib": "^2.4.1", "ttypescript": "^1.5.15", "typescript": "^4.6.4", - "vite": "^4.3.2", + "vite": "^4.3.9", "vite-plugin-compression": "^0.5.1", "vite-plugin-typescript": "^1.0.4", - "vue-tsc": "^1.4.4" + "vue-tsc": "^1.8.2" } } diff --git a/code/client/src/business/common/component/field/fieldInput.vue b/code/client/src/business/common/component/field/fieldInput.vue index 839753c..2ec9819 100644 --- a/code/client/src/business/common/component/field/fieldInput.vue +++ b/code/client/src/business/common/component/field/fieldInput.vue @@ -23,15 +23,15 @@ + + \ No newline at end of file diff --git a/code/client/src/business/common/component/richEditor/richEditor.vue b/code/client/src/business/common/component/richEditor/richEditor.vue index 20b5aba..2010bd2 100644 --- a/code/client/src/business/common/component/richEditor/richEditor.vue +++ b/code/client/src/business/common/component/richEditor/richEditor.vue @@ -1,6 +1,6 @@ \ No newline at end of file diff --git a/code/client/src/business/common/component/richEditor/type.ts b/code/client/src/business/common/component/richEditor/type.ts deleted file mode 100644 index b32f229..0000000 --- a/code/client/src/business/common/component/richEditor/type.ts +++ /dev/null @@ -1,26 +0,0 @@ -export enum ELineConfigType { - TEXT, - LINK, - IMAGE -} -export type LineStyle={ - fontStyle?:string - fontWeight?:string, - color?:string, - backgroundColor?:string, - textDecoration?:string, - fontSize?:string -} - -export type LineConfig={ - style?:LineStyle, - value:string - link?:string, - type:ELineConfigType, - width?:number -} -export type Line={ - arr:LineConfig[], - selectStartIndexPath?:number[], - selectEndIndexPath?:number[] -} \ No newline at end of file diff --git a/code/client/src/business/controller/app/finder/finderContent.vue b/code/client/src/business/controller/app/finder/finderContent.vue index 2611c3b..f2684a5 100644 --- a/code/client/src/business/controller/app/finder/finderContent.vue +++ b/code/client/src/business/controller/app/finder/finderContent.vue @@ -1,5 +1,5 @@