From aae79386a5a3b4de19dd91389c0e5ee68b766421 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=90=A6?= <993284758@qq.com> Date: Fri, 17 Jan 2025 16:26:05 +0800 Subject: [PATCH 01/20] config: cover iview css --- .gitignore | 1 + taskman-ui/src/main.js | 4 +++- taskman-ui/src/styles/button.less | 0 taskman-ui/src/styles/index.less | 39 +++++++++++++++++++++++++++++++ taskman-ui/src/styles/select.less | 0 taskman-ui/vue.config.js | 6 +++++ 6 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 taskman-ui/src/styles/button.less create mode 100644 taskman-ui/src/styles/index.less create mode 100644 taskman-ui/src/styles/select.less diff --git a/.gitignore b/.gitignore index d5153b27..a23a7405 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ .vscode .DS_Store +.env # ignore file taskman-server/taskman-server taskman-server/logs diff --git a/taskman-ui/src/main.js b/taskman-ui/src/main.js index 3d4b53d8..d616bc5a 100755 --- a/taskman-ui/src/main.js +++ b/taskman-ui/src/main.js @@ -3,8 +3,10 @@ import Vue from 'vue' import App from './App.vue' import router from './router' import ViewUI from 'view-design' -import 'view-design/dist/styles/iview.css' import VueI18n from 'vue-i18n' + +import './styles/index.less' + import { i18n } from './locale/i18n/index.js' import viewDesignEn from 'view-design/dist/locale/en-US' import viewDesignZh from 'view-design/dist/locale/zh-CN' diff --git a/taskman-ui/src/styles/button.less b/taskman-ui/src/styles/button.less new file mode 100644 index 00000000..e69de29b diff --git a/taskman-ui/src/styles/index.less b/taskman-ui/src/styles/index.less new file mode 100644 index 00000000..aa4f120a --- /dev/null +++ b/taskman-ui/src/styles/index.less @@ -0,0 +1,39 @@ +@import '~view-design/src/styles/index.less'; + +// Color +@primary-color : #5384FF; + +@success-color : #00CB91; +@processing-color : @primary-color; +@warning-color : #F29360; +@error-color : #FF4D4F; + +// Border color +@border-color-base : #CFD0D3; // outside +@border-color-split : #e8eaec; // inside +@border-width-base : 1px; // width of the border for a component + + +// Button + +@btn-disable-color : #c5c8ce; +@btn-disable-bg : @background-color-base; +@btn-disable-border : @border-color-base; + +@btn-default-color : @text-color; +@btn-default-bg : #fff; +@btn-default-border : @border-color-base; + + + +@btn-ghost-color : @text-color; +@btn-ghost-bg : #fff; +@btn-ghost-border : @border-color-base; + +@btn-circle-size : @btn-height-base; +@btn-circle-size-large : @btn-height-large; +@btn-circle-size-small : @btn-height-small; + +@btn-square-size : @btn-height-base; +@btn-square-size-large : @btn-height-large; +@btn-square-size-small : @btn-height-small; \ No newline at end of file diff --git a/taskman-ui/src/styles/select.less b/taskman-ui/src/styles/select.less new file mode 100644 index 00000000..e69de29b diff --git a/taskman-ui/vue.config.js b/taskman-ui/vue.config.js index d9568357..b3e00fd8 100755 --- a/taskman-ui/vue.config.js +++ b/taskman-ui/vue.config.js @@ -104,7 +104,13 @@ module.exports = { // selector: '.taskman-wrap' }) ] : [] + }, + less: { + lessOptions: { // 将 javascriptEnabled 放在 lessOptions 内部 + javascriptEnabled: true + } } } } + } From 9aab8237a071209c88c2dc74ff993de3d2a2fe45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=90=A6?= <993284758@qq.com> Date: Fri, 17 Jan 2025 18:10:20 +0800 Subject: [PATCH 02/20] cover Switch css --- .../src/pages/components/base-search.vue | 7 +++- taskman-ui/src/styles/custom.less | 37 ++++++++++++++++++ taskman-ui/src/styles/index.less | 38 ++----------------- taskman-ui/src/styles/switch.less | 13 +++++++ 4 files changed, 59 insertions(+), 36 deletions(-) create mode 100644 taskman-ui/src/styles/custom.less create mode 100644 taskman-ui/src/styles/switch.less diff --git a/taskman-ui/src/pages/components/base-search.vue b/taskman-ui/src/pages/components/base-search.vue index b92afc4e..e0665e6d 100644 --- a/taskman-ui/src/pages/components/base-search.vue +++ b/taskman-ui/src/pages/components/base-search.vue @@ -98,8 +98,9 @@ v-model="value[i.key]" @on-change="handleSearch" style="margin-right:32px;" + button-style="solid" > - {{ j.label }} + {{ j.label }}
@@ -110,8 +111,10 @@ type="button" size="small" style="margin-top:-2px;" + button-style="solid" + > - {{ j.label }} + {{ j.label }}
Date: Mon, 20 Jan 2025 15:25:34 +0800 Subject: [PATCH 03/20] cover iview table & shadow css --- taskman-ui/src/styles/custom.less | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/taskman-ui/src/styles/custom.less b/taskman-ui/src/styles/custom.less index 529781f1..7b137a28 100644 --- a/taskman-ui/src/styles/custom.less +++ b/taskman-ui/src/styles/custom.less @@ -6,11 +6,33 @@ @warning-color : #F29360; @error-color : #FF4D4F; +// Base + +@text-color : #0F1222; +@link-color : #5384FF; + + + // Border color @border-color-base : #CFD0D3; // outside -@border-color-split : #e8eaec; // inside +@border-color-split : #F7F7F8; // inside @border-width-base : 1px; // width of the border for a component +// Background color +@table-thead-bg : #F7F7F8; +@table-td-stripe-bg : #f8f8f9; +@table-td-hover-bg : rgba(83, 132, 255, 0.06); +@table-td-highlight-bg : #ebf7ff; + + +// Shadow +@shadow-color : rgba(#0F1222,0.1); +@shadow-base : @shadow-card; +@shadow-card : 0 2px 12px 0 @shadow-color; +@shadow-up : 0 -1px 6px @shadow-color; +@shadow-down : 0 1px 6px @shadow-color; +@shadow-left : -1px 0 6px @shadow-color; +@shadow-right : 1px 0 6px @shadow-color; // Button From 299dda331d9c3abd5a1b2635315f9809f7eb1d16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=90=A6?= <993284758@qq.com> Date: Mon, 20 Jan 2025 15:45:29 +0800 Subject: [PATCH 04/20] cover iview input css --- taskman-ui/src/styles/index.less | 1 + taskman-ui/src/styles/input.less | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 taskman-ui/src/styles/input.less diff --git a/taskman-ui/src/styles/index.less b/taskman-ui/src/styles/index.less index 109eb384..74015b15 100644 --- a/taskman-ui/src/styles/index.less +++ b/taskman-ui/src/styles/index.less @@ -4,6 +4,7 @@ @import '~view-design/src/styles/index.less'; @import './custom.less'; @import './switch.less'; +@import './input.less'; diff --git a/taskman-ui/src/styles/input.less b/taskman-ui/src/styles/input.less new file mode 100644 index 00000000..48a36c41 --- /dev/null +++ b/taskman-ui/src/styles/input.less @@ -0,0 +1,27 @@ +.hover(@color: @input-hover-border-color) { + border-color: @color; +} +.hover-error() { + border-color: @error-color; +} + +.active(@color: @input-hover-border-color) { + border-color: @color; + outline: 0; + box-shadow: 0 0 0 2px fade(@color, 20%); +} +.active-error() { + border-color: @error-color; + outline: 0; + box-shadow: 0 0 0 2px fade(@error-color, 20%); +} + +.disabled() { + background-color: @input-disabled-bg; + opacity: 1; + cursor: @cursor-disabled; + color: #ccc; + &:hover { + .hover(@input-border-color); + } +} \ No newline at end of file From 22a2ab853376e183d9559d1c8e29cf1d52fe5274 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=90=A6?= <993284758@qq.com> Date: Mon, 20 Jan 2025 16:24:41 +0800 Subject: [PATCH 05/20] cover background-color-select-hover --- taskman-ui/src/styles/custom.less | 1 + 1 file changed, 1 insertion(+) diff --git a/taskman-ui/src/styles/custom.less b/taskman-ui/src/styles/custom.less index 7b137a28..125e61b6 100644 --- a/taskman-ui/src/styles/custom.less +++ b/taskman-ui/src/styles/custom.less @@ -19,6 +19,7 @@ @border-width-base : 1px; // width of the border for a component // Background color +@background-color-select-hover: fade(@primary-color, 6%); @table-thead-bg : #F7F7F8; @table-td-stripe-bg : #f8f8f9; @table-td-hover-bg : rgba(83, 132, 255, 0.06); From b3d4165ded269e1fac1a73cc5d343da6cf1272e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=90=A6?= <993284758@qq.com> Date: Mon, 20 Jan 2025 17:39:19 +0800 Subject: [PATCH 06/20] cover iview message text color --- taskman-ui/src/styles/custom.less | 1 + taskman-ui/src/styles/index.less | 1 + taskman-ui/src/styles/message.less | 24 ++++++++++++++++++++++++ 3 files changed, 26 insertions(+) create mode 100644 taskman-ui/src/styles/message.less diff --git a/taskman-ui/src/styles/custom.less b/taskman-ui/src/styles/custom.less index 125e61b6..72c0d96f 100644 --- a/taskman-ui/src/styles/custom.less +++ b/taskman-ui/src/styles/custom.less @@ -24,6 +24,7 @@ @table-td-stripe-bg : #f8f8f9; @table-td-hover-bg : rgba(83, 132, 255, 0.06); @table-td-highlight-bg : #ebf7ff; +// @menu-dark-active-bg : #0F1222; // Shadow diff --git a/taskman-ui/src/styles/index.less b/taskman-ui/src/styles/index.less index 74015b15..6513af6a 100644 --- a/taskman-ui/src/styles/index.less +++ b/taskman-ui/src/styles/index.less @@ -5,6 +5,7 @@ @import './custom.less'; @import './switch.less'; @import './input.less'; +@import './message.less'; diff --git a/taskman-ui/src/styles/message.less b/taskman-ui/src/styles/message.less new file mode 100644 index 00000000..3d39f617 --- /dev/null +++ b/taskman-ui/src/styles/message.less @@ -0,0 +1,24 @@ +@message-prefix-cls: ~"@{css-prefix}message"; +@icon-prefix-cls: ~"@{css-prefix}icon"; + +.@{message-prefix-cls} { + + &-success { + color: @success-color; + } + + &-error { + color: @error-color; + } + + &-warning { + color: @warning-color; + } + + &-info, + &-loading { + color: @primary-color; + } + + +} From 5d4ac150e000c036658fa202812ec64d3406fc3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=90=A6?= <993284758@qq.com> Date: Tue, 21 Jan 2025 15:03:53 +0800 Subject: [PATCH 07/20] cover iview modal --- taskman-ui/src/App.vue | 4 ++-- taskman-ui/src/styles/custom.less | 2 -- taskman-ui/src/styles/index.less | 1 + taskman-ui/src/styles/modal.less | 23 +++++++++++++++++++++++ 4 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 taskman-ui/src/styles/modal.less diff --git a/taskman-ui/src/App.vue b/taskman-ui/src/App.vue index 3c532a4c..db2adc0c 100755 --- a/taskman-ui/src/App.vue +++ b/taskman-ui/src/App.vue @@ -20,7 +20,7 @@ export default { font-family: 'Avenir', Helvetica, Arial, sans-serif; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; - color: #2c3e50; + color: #0F1222; // Fes字体颜色规范 height: 100%; min-width: 1280px; @@ -32,7 +32,7 @@ export default { padding: 30px; a { font-weight: bold; - color: #2c3e50; + color: #0F1222; // Fes字体颜色规范 &.router-link-exact-active { color: #42b983; } diff --git a/taskman-ui/src/styles/custom.less b/taskman-ui/src/styles/custom.less index 72c0d96f..5ee0421b 100644 --- a/taskman-ui/src/styles/custom.less +++ b/taskman-ui/src/styles/custom.less @@ -15,7 +15,6 @@ // Border color @border-color-base : #CFD0D3; // outside -@border-color-split : #F7F7F8; // inside @border-width-base : 1px; // width of the border for a component // Background color @@ -24,7 +23,6 @@ @table-td-stripe-bg : #f8f8f9; @table-td-hover-bg : rgba(83, 132, 255, 0.06); @table-td-highlight-bg : #ebf7ff; -// @menu-dark-active-bg : #0F1222; // Shadow diff --git a/taskman-ui/src/styles/index.less b/taskman-ui/src/styles/index.less index 6513af6a..1e43eaa2 100644 --- a/taskman-ui/src/styles/index.less +++ b/taskman-ui/src/styles/index.less @@ -6,6 +6,7 @@ @import './switch.less'; @import './input.less'; @import './message.less'; +@import './modal.less'; diff --git a/taskman-ui/src/styles/modal.less b/taskman-ui/src/styles/modal.less new file mode 100644 index 00000000..5dbd29eb --- /dev/null +++ b/taskman-ui/src/styles/modal.less @@ -0,0 +1,23 @@ +@modal-prefix-cls: ~"@{css-prefix}modal"; +@confirm-prefix-cls: ~"@{css-prefix}modal-confirm"; + +.@{modal-prefix-cls} { + + + + + + &-header { + border-bottom: none; + padding-left: 24px; + } + + + &-footer { + border-top: none; + padding: 12px 24px 24px 18px; + } +} + + + From c92595d0e63f0d5e330b50ee8f9eb77db090ba32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=90=A6?= <993284758@qq.com> Date: Tue, 21 Jan 2025 16:24:35 +0800 Subject: [PATCH 08/20] cover iview slider --- taskman-ui/src/styles/custom.less | 11 +++-------- taskman-ui/src/styles/index.less | 1 + taskman-ui/src/styles/slider.less | 16 ++++++++++++++++ 3 files changed, 20 insertions(+), 8 deletions(-) create mode 100644 taskman-ui/src/styles/slider.less diff --git a/taskman-ui/src/styles/custom.less b/taskman-ui/src/styles/custom.less index 5ee0421b..4b6fc813 100644 --- a/taskman-ui/src/styles/custom.less +++ b/taskman-ui/src/styles/custom.less @@ -44,16 +44,11 @@ @btn-default-bg : #fff; @btn-default-border : @border-color-base; - - @btn-ghost-color : @text-color; @btn-ghost-bg : #fff; @btn-ghost-border : @border-color-base; -@btn-circle-size : @btn-height-base; -@btn-circle-size-large : @btn-height-large; -@btn-circle-size-small : @btn-height-small; -@btn-square-size : @btn-height-base; -@btn-square-size-large : @btn-height-large; -@btn-square-size-small : @btn-height-small; \ No newline at end of file +// Slider +@slider-color : @primary-color; +@slider-disabled-color : #B7B7BC; \ No newline at end of file diff --git a/taskman-ui/src/styles/index.less b/taskman-ui/src/styles/index.less index 1e43eaa2..204344f6 100644 --- a/taskman-ui/src/styles/index.less +++ b/taskman-ui/src/styles/index.less @@ -7,6 +7,7 @@ @import './input.less'; @import './message.less'; @import './modal.less'; +@import './slider.less'; diff --git a/taskman-ui/src/styles/slider.less b/taskman-ui/src/styles/slider.less new file mode 100644 index 00000000..ee5eb88d --- /dev/null +++ b/taskman-ui/src/styles/slider.less @@ -0,0 +1,16 @@ +@slider-prefix-cls: ~"@{css-prefix}slider"; + +.@{slider-prefix-cls} { + &-wrap{ + background-color: #E7E7E8; + } + + + &-button{ + width: 14px; + height: 14px; + border: none; + box-shadow:0 1px 4px 0 rgba(@text-color, 0.2); + } +} + From 19d5de04fef747007c803c431928c82963bec237 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=90=A6?= <993284758@qq.com> Date: Tue, 21 Jan 2025 18:08:47 +0800 Subject: [PATCH 09/20] cover iview alert --- taskman-ui/src/styles/alert.less | 40 ++++++++++++++++++++++++++++++++ taskman-ui/src/styles/index.less | 1 + 2 files changed, 41 insertions(+) create mode 100644 taskman-ui/src/styles/alert.less diff --git a/taskman-ui/src/styles/alert.less b/taskman-ui/src/styles/alert.less new file mode 100644 index 00000000..c74275c9 --- /dev/null +++ b/taskman-ui/src/styles/alert.less @@ -0,0 +1,40 @@ +@alert-prefix-cls: ~"@{css-prefix}alert"; +@icon-prefix-cls: ~"@{css-prefix}icon"; + +.@{alert-prefix-cls}{ + + &-success { + border: @border-width-base @border-style-base @success-color; + background-color: fade(@success-color, 6); + color: @success-color; + } + + &-info { + border: @border-width-base @border-style-base @primary-color; + background-color: fade(@primary-color, 6); + color: @primary-color; + } + + &-warning { + border: @border-width-base @border-style-base @warning-color; + background-color: fade(@warning-color, 6); + color: @warning-color; + } + + &-error { + border: @border-width-base @border-style-base @error-color; + background-color: fade(@error-color, 6); + color: @error-color; + } + + + &-with-desc &-desc{ + color: inherit; + opacity: 0.45; + } + + &-with-desc &-message { + color: inherit; + } + +} diff --git a/taskman-ui/src/styles/index.less b/taskman-ui/src/styles/index.less index 204344f6..84a127ec 100644 --- a/taskman-ui/src/styles/index.less +++ b/taskman-ui/src/styles/index.less @@ -8,6 +8,7 @@ @import './message.less'; @import './modal.less'; @import './slider.less'; +@import './alert.less'; From df2b6a52b60657fff8fdc0a9901c9f20206b25af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=90=A6?= <993284758@qq.com> Date: Tue, 21 Jan 2025 20:06:57 +0800 Subject: [PATCH 10/20] cover Collapse title color --- taskman-ui/src/styles/collapse.less | 14 ++++++++++++++ taskman-ui/src/styles/index.less | 1 + 2 files changed, 15 insertions(+) create mode 100644 taskman-ui/src/styles/collapse.less diff --git a/taskman-ui/src/styles/collapse.less b/taskman-ui/src/styles/collapse.less new file mode 100644 index 00000000..c10882d9 --- /dev/null +++ b/taskman-ui/src/styles/collapse.less @@ -0,0 +1,14 @@ +@collapse-prefix-cls: ~"@{css-prefix}collapse"; + +.@{collapse-prefix-cls}{ + + + & > &-item{ + + > .@{collapse-prefix-cls}-header{ + + color: @text-color; + + } + } +} diff --git a/taskman-ui/src/styles/index.less b/taskman-ui/src/styles/index.less index 84a127ec..a425e2cd 100644 --- a/taskman-ui/src/styles/index.less +++ b/taskman-ui/src/styles/index.less @@ -9,6 +9,7 @@ @import './modal.less'; @import './slider.less'; @import './alert.less'; +@import './collapse.less'; From 28f4ca199e6087cbdddbbebf21d301eab74883ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=90=A6?= <993284758@qq.com> Date: Tue, 21 Jan 2025 20:28:15 +0800 Subject: [PATCH 11/20] cover iview back top --- taskman-ui/src/App.vue | 27 ++++++++++++++++++++++++++- taskman-ui/src/images/icon/fes_up.svg | 5 +++++ 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 taskman-ui/src/images/icon/fes_up.svg diff --git a/taskman-ui/src/App.vue b/taskman-ui/src/App.vue index db2adc0c..cd8b7ab9 100755 --- a/taskman-ui/src/App.vue +++ b/taskman-ui/src/App.vue @@ -1,13 +1,24 @@