diff --git a/frontend/package.json b/frontend/package.json index 1182f51e38..231f8fb793 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -37,8 +37,8 @@ "dependencies": { "@7polo/kity": "2.0.8", "@7polo/kityminder-core": "1.4.53", - "@arco-design/web-vue": "^2.51.1", - "@arco-themes/vue-ms-theme-default": "^0.0.29", + "@arco-design/web-vue": "^2.51.2", + "@arco-themes/vue-ms-theme-default": "^0.0.30", "@form-create/arco-design": "^3.1.23", "@types/color": "^3.0.4", "@vueuse/core": "^10.4.1", diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 019736034b..55cade69db 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -83,7 +83,7 @@ onMounted(async () => { await getPublicKey(); - if (WHITE_LIST.find((el) => el.name === route.name) === undefined) { + if (WHITE_LIST.find((el) => el.path === window.location.hash.split('#')[1]) === undefined) { await checkIsLogin(); } const { height } = useWindowSize(); diff --git a/frontend/src/assets/style/arco-reset.less b/frontend/src/assets/style/arco-reset.less index e36dd123a2..732bf5f7fb 100644 --- a/frontend/src/assets/style/arco-reset.less +++ b/frontend/src/assets/style/arco-reset.less @@ -96,6 +96,11 @@ padding: 8px 0; } } +.ms-modal-no-padding { + .arco-modal-body { + padding: 0; + } +} .ms-modal-upload { .arco-modal-body { padding: 2px 0; @@ -178,6 +183,12 @@ .btn-outline-sec-active(); .btn-outline-sec-disabled(); } +.arco-btn-outline--danger { + .btn-outline-danger-default(); + .btn-outline-danger-hover(); + .btn-outline-danger-active(); + .btn-outline-danger-disabled(); +} /** 输入框,选择器,文本域 **/ .arco-select { @@ -269,6 +280,9 @@ } } } +.arco-textarea { + .ms-scroll-bar(); +} /** form-item **/ .arco-form-item-content-flex { @@ -696,6 +710,9 @@ } /** tooltip **/ +.arco-tooltip-content { + @apply break-all; +} .arco-trigger-arrow { border-bottom-right-radius: var(--border-radius-mini) !important; } @@ -726,18 +743,3 @@ white-space: nowrap; } } - -/** 隐藏drawer-mask **/ -.ms-drawer-no-mask { - left: auto; - .arco-drawer { - box-shadow: -1px 0 4px 0 rgb(2 2 2 / 10%); - &-header { - .arco-drawer-title { - font-size: 16px; - font-weight: 600; - color: var(--color-text-1); - } - } - } -} diff --git a/frontend/src/assets/style/var.less b/frontend/src/assets/style/var.less index e8e0e396a1..83e6148be1 100644 --- a/frontend/src/assets/style/var.less +++ b/frontend/src/assets/style/var.less @@ -4,7 +4,6 @@ @border-radius-large: 12px; @color-white: #fff; -@color-fill-2: rgb(var(--primary-9)); @color-text-5: #aeaeb2; /** 常用颜色类 **/ @@ -59,6 +58,10 @@ color: var(--color-text-4) !important; } } +.btn-outline-danger-default() { + border-color: rgb(var(--danger-6)) !important; + color: rgb(var(--danger-6)) !important; +} .btn-outline-danger-hover() { &:not(:disabled):hover { border-color: rgb(var(--danger-5)) !important; @@ -183,3 +186,36 @@ } } } + +/** 容器内部上下阴影类 **/ +.ms-container--shadow() { + @apply relative; + &::before { + position: absolute; + top: 0; + z-index: 1; + width: 100%; + height: 10px; + box-shadow: none; + transition: box-shadow 0.1s cubic-bezier(0, 0, 1, 1); + content: ''; + pointer-events: none; + } + &-shadow-top::before { + box-shadow: inset 0 10px 6px -10px rgb(0 0 0 / 15%); + } + &::after { + position: absolute; + bottom: 0; + z-index: 1; + width: 100%; + height: 10px; + box-shadow: none; + transition: box-shadow 0.1s cubic-bezier(0, 0, 1, 1); + content: ''; + pointer-events: none; + } + &-shadow-bottom::after { + box-shadow: inset 0 -10px 6px -10px rgb(0 0 0 / 15%); + } +} diff --git a/frontend/src/components/business/ms-card-list/index.vue b/frontend/src/components/business/ms-card-list/index.vue new file mode 100644 index 0000000000..f160e9cb77 --- /dev/null +++ b/frontend/src/components/business/ms-card-list/index.vue @@ -0,0 +1,240 @@ + + + + + + + + + + + + + + + + + + + diff --git a/frontend/src/components/business/ms-form-item-sub/index.vue b/frontend/src/components/business/ms-form-item-sub/index.vue index 8aa2a92ef6..d6253411b3 100644 --- a/frontend/src/components/business/ms-form-item-sub/index.vue +++ b/frontend/src/components/business/ms-form-item-sub/index.vue @@ -11,6 +11,8 @@ + + diff --git a/frontend/src/components/business/ms-tree/index.vue b/frontend/src/components/business/ms-tree/index.vue index 8266768208..9a83555a47 100644 --- a/frontend/src/components/business/ms-tree/index.vue +++ b/frontend/src/components/business/ms-tree/index.vue @@ -1,65 +1,68 @@ - - - - - - - - - - - - - - - - - - - + - {{ props.emptyText }} - - + + + + + + + + + + + + + + + + + + + {{ props.emptyText }} + + + diff --git a/frontend/src/components/pure/ms-popconfirm/index.vue b/frontend/src/components/pure/ms-popconfirm/index.vue index b98f0c1cda..fae5f1aef0 100644 --- a/frontend/src/components/pure/ms-popconfirm/index.vue +++ b/frontend/src/components/pure/ms-popconfirm/index.vue @@ -29,6 +29,7 @@