diff --git a/.github/workflows/auto-all-publish.yml b/.github/workflows/auto-all-publish.yml index 77992189ce..811f8791bc 100644 --- a/.github/workflows/auto-all-publish.yml +++ b/.github/workflows/auto-all-publish.yml @@ -57,6 +57,9 @@ jobs: - name: Run Build Sass Common run: pnpm build:ui saas-common -t ${{ steps.parseTag.outputs.publishVersion }} -d saas + + - name: Run Build Runtime + run: pnpm build:runtime - name: Run Build Theme run: pnpm build:theme diff --git a/package.json b/package.json index 7faafacd22..d3bf9b7a71 100644 --- a/package.json +++ b/package.json @@ -4,16 +4,7 @@ "private": true, "packageManager": "pnpm@8.3.1", "description": "An enterprise-class UI component library, support both Vue.js 2 and Vue.js 3, as well as PC and mobile.", - "author": "OpenTiny Team", - "license": "MIT", "homepage": "https://opentiny.design/tiny-vue", - "repository": { - "type": "git", - "url": "git@github.com:opentiny/tiny-vue.git" - }, - "bugs": { - "url": "https://github.com/opentiny/tiny-vue/issues" - }, "keywords": [ "vue", "vue3", @@ -25,6 +16,15 @@ "renderless-components", "headless-components" ], + "author": "OpenTiny Team", + "license": "MIT", + "repository": { + "type": "git", + "url": "git@github.com:opentiny/tiny-vue.git" + }, + "bugs": { + "url": "https://github.com/opentiny/tiny-vue/issues" + }, "main": "packages/index.js", "engines": { "node": ">=16", @@ -81,7 +81,7 @@ "pub:themeSaas": "pnpm --filter=\"./packages/theme-saas/dist\" publish --no-git-checks --access=public", "pub:renderless": "pnpm --filter=\"./packages/renderless/dist\" publish --no-git-checks --access=public", "pub:runtime": "pnpm --filter=\"./packages/vue-runtime/\" publish --no-git-checks --access=public", - "pub:all": "pnpm pub2 && pnpm pub3 && pnpm pub:theme && pnpm pub:themeMobile && pnpm pub:themeSaas && pnpm pub:renderless", + "pub:all": "pnpm pub2 && pnpm pub3 && pnpm pub:theme && pnpm pub:themeMobile && pnpm pub:themeSaas && pnpm pub:renderless && pnpm pub:runtime", "pub:site": "pnpm -C examples/sites pub", "// ---------- 自动化发测试包 ----------": "", "auto-build-pub": "pnpm -C internals/automate auto-build-pub", @@ -162,7 +162,6 @@ }, "devDependencies": { "@antfu/eslint-config": "^0.38.6", - "@commitlint/config-conventional": "^18.4.3", "@types/color": "^3.0.3", "@types/eslint": "^8.4.10", "@types/node": "^18.11.18", @@ -172,7 +171,6 @@ "@volar-plugins/prettier": "^2.0.0", "@volar-plugins/prettyhtml": "^2.0.0", "@vue/tsconfig": "^0.4.0", - "commitlint": "^18.4.3", "depcheck": "1.4.3", "eslint": "^8.31.0", "eslint-config-prettier": "^8.8.0", @@ -185,9 +183,11 @@ "gulp-less": "^5.0.0", "gulp-svg-inline": "^1.0.1", "gulp-transform": "^3.0.5", - "husky": "^8.0.3", "lerna": "^6.4.0", "lint-staged": "^15.2.0", + "husky": "^8.0.3", + "commitlint": "^18.4.3", + "@commitlint/config-conventional": "^18.4.3", "minimist": "^1.2.8", "node-xlsx": "^0.21.0", "prettier": "^3.0.0", @@ -265,4 +265,4 @@ "> 1%", "last 2 versions" ] -} +} \ No newline at end of file diff --git a/packages/renderless/src/anchor/index.ts b/packages/renderless/src/anchor/index.ts index 6157e7661f..450e5ed624 100644 --- a/packages/renderless/src/anchor/index.ts +++ b/packages/renderless/src/anchor/index.ts @@ -119,7 +119,7 @@ export const handleScroll = (state: IAnchorRenderlessParams['state']) => () => { state.scrollTimer = window.setTimeout(() => { state.isScroll = false clearTimeout(state.scrollTimer) - }, 200) + }, 2000) } // 设置滚动偏移量 @@ -183,11 +183,6 @@ export const onItersectionObserver = return } - if (state.isScroll) { - api.handleScroll() - return - } - for (let key in state.observerLinks) { if (Object.prototype.hasOwnProperty.call(state.observerLinks, key)) { const item = state.observerLinks[key] @@ -207,7 +202,7 @@ export const onItersectionObserver = } } }, - { root: scrollContainer, threshold: [0, 0.25, 0.5, 1] } + { root: scrollContainer, threshold: [0] } ) addObserver({ props, state }) diff --git a/packages/theme-saas/src/anchor/index.less b/packages/theme-saas/src/anchor/index.less index 192006d72c..e69de29bb2 100644 --- a/packages/theme-saas/src/anchor/index.less +++ b/packages/theme-saas/src/anchor/index.less @@ -1,151 +0,0 @@ -/** -* Copyright (c) 2022 - present TinyVue Authors. -* Copyright (c) 2022 - present Huawei Cloud Computing Technologies Co., Ltd. -* -* Use of this source code is governed by an MIT-style license. -* -* THE OPEN SOURCE SOFTWARE IN THIS PRODUCT IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL, -* BUT WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR -* A PARTICULAR PURPOSE. SEE THE APPLICABLE LICENSES FOR MORE DETAILS. -* -*/ - -@import '../custom.less'; - -@anchor-prefix-cls: ~'@{css-prefix}anchor'; - -.@{anchor-prefix-cls} { - @apply bg-transparent; - @apply w-50; - @apply relative; - @apply text-color-text-primary; - @apply text-sm; - - &__affix { - @apply fixed; - z-index: 1; - } - - &__line { - .@{anchor-prefix-cls}-link + .@{anchor-prefix-cls}-link { - margin-top: 0.5em; - } - - .@{anchor-prefix-cls}-link-mask { - @apply absolute; - @apply max-w-0; - border-top-right-radius: 10px; - border-bottom-right-radius: 10px; - left: 2px; - @apply w-full; - background-color: var(--ti-anchor-link-mask-bg-color); - } - - .@{anchor-prefix-cls}-orbit { - @apply absolute; - left: 0; - top: 0; - bottom: 0; - @apply w-1; - @apply rounded; - @apply bg-color-border; - - &-skid { - @apply absolute; - left: 0; - @apply w-1; - @apply bg-color-brand; - @apply rounded; - &--active { - @apply bg-color-brand; - } - } - } - } - - &-link-title:hover { - @apply text-color-brand; - } - - &-link { - @apply ml-4; - cursor: pointer; - @apply leading-9; - - &-title { - display: block; - @apply max-w-full; - padding: var(--ti-anchor-link-title-padding-vertical) var(--ti-anchor-link-title-padding-right) - var(--ti-anchor-link-title-padding-vertical) var(--ti-anchor-link-title-padding-left); - overflow: hidden; - text-overflow: ellipsis; - display: -webkit-box; - -webkit-box-orient: vertical; - -webkit-line-clamp: 1; - @apply text-color-text-primary; - @apply whitespace-nowrap; - &&--active { - @apply text-color-brand; - } - } - } - - &__dot { - @apply w-50; - - .@{anchor-prefix-cls} { - padding: 0 16px; - } - - .@{anchor-prefix-cls}-link { - @apply relative; - padding-left: 10px; - margin-bottom: 16px; - } - - .@{anchor-prefix-cls}-link-title { - padding-left: 16px; - padding-right: 0; - -webkit-line-clamp: 2; - - &:before { - content: ''; - display: block; - @apply w-2; - @apply h-2; - border: 1px solid var(--ti-anchor-dot-border-color); - @apply absolute; - border-radius: 50%; - left: 0px; - top: 6px; - } - - &:after { - content: ''; - display: block; - width: 1px; - background-color: var(--color-border-base); - @apply bg-color-bg-2; - @apply absolute; - border-radius: 50%; - left: 3.5px; - top: 20px; - bottom: -18px; - } - - &:hover, - &--active { - color: var(--ti-anchor-link-active-text-color); - - &:before { - border-color: var(--ti-anchor-link-active-text-color); - @apply opacity-100; - } - } - } - - .@{anchor-prefix-cls}-link:last-child > .@{anchor-prefix-cls}-link-title:after { - @apply hidden; - } - } -} diff --git a/packages/theme-saas/theme/defaultTheme.js b/packages/theme-saas/theme/defaultTheme.js index 053ffd816e..6db816e77d 100644 --- a/packages/theme-saas/theme/defaultTheme.js +++ b/packages/theme-saas/theme/defaultTheme.js @@ -61,7 +61,6 @@ module.exports = { 60: '15rem', 56: '14rem', 52: '13rem', - 50: '12.5rem', 48: '12rem', 45: '11.25rem', 44: '11rem', diff --git "a/packages/theme/build/edit\342\200\220dir\342\200\220theme.js" "b/packages/theme/build/edit\342\200\220dir\342\200\220theme.js" index 460771e030..06e53ec58a 100644 --- "a/packages/theme/build/edit\342\200\220dir\342\200\220theme.js" +++ "b/packages/theme/build/edit\342\200\220dir\342\200\220theme.js" @@ -11,7 +11,8 @@ const basePath = '/base/' const emptyThemeContent = `@import '../../{{}}/index.less';` -const baseContent = fs.readFileSync('../src/base/basic-var.less', 'utf8') +const baseContent = `@import '../../base/index.less'; +html:root` const scopedTitle = `@import '../../custom.less'; @import '../../{{}}/index.less'; @@ -228,15 +229,14 @@ const createTheme = (callbackFn) => { let newDataStr = dataStr.slice(startIndex, endIndex) const lastIndex = newDataStr.lastIndexOf("'") newDataStr = + baseContent + newDataStr .slice(0, lastIndex) .replace(/\'ti-/g, '--ti-') .replace(/\'/g, '') .replace(/\,\n/g, ';\n') - .replace(/\, \/\//g, '; //') - .replace('{', '') + ';\n}' - - newDataStr = baseContent.replace('}', newDataStr) + .replace(/\, \/\//g, '; //') + + ';\n}' writeFile(buildThemePathMap[fileDir] + '/index.less', newDataStr) } diff --git a/packages/theme/src/base/index.less b/packages/theme/src/base/index.less index cfc07d3a92..dba9ff5241 100644 --- a/packages/theme/src/base/index.less +++ b/packages/theme/src/base/index.less @@ -13,4 +13,5 @@ @import './reset.less'; @import './basic-var.less'; @import './transition.less'; +@import '../error-page/index.less'; @import '../svg/index.less'; diff --git a/packages/theme/src/error-page/index-global.less b/packages/theme/src/error-page/index-global.less new file mode 100644 index 0000000000..a865c111d0 --- /dev/null +++ b/packages/theme/src/error-page/index-global.less @@ -0,0 +1,234 @@ +/** + * Copyright (c) 2022 - present TinyVue Authors. + * Copyright (c) 2022 - present Huawei Cloud Computing Technologies Co., Ltd. + * + * Use of this source code is governed by an MIT-style license. + * + * THE OPEN SOURCE SOFTWARE IN THIS PRODUCT IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL, + * BUT WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR + * A PARTICULAR PURPOSE. SEE THE APPLICABLE LICENSES FOR MORE DETAILS. + * + */ +.tiny-popup__wrapper { + z-index: 2147483647 !important; + background: rgba(0, 0, 0, 0.5); + position: fixed; + top: 0; + right: 0; + bottom: 0; + left: 0; + overflow: auto; + margin: 0; + + //错误提示页 + .tiny-errortips__box { + position: absolute; + width: 800px; + min-height: 450px; + max-height: 600px; + top: 0; + left: 0; + right: 0; + bottom: 0; + margin: auto; + overflow: hidden; + background: #fff; + border: 1px solid transparent; + box-shadow: 2px 2px 2px 0 rgba(0, 0, 0, 0.2); + text-align: center; + overflow-y: auto; + + .tiny-errortips__body { + height: 100%; + text-align: initial; + padding: 20px; + color: #5a5e66; + font-size: 14px; + display: table; + margin: auto; + + .errortips { + text-align: center; + display: table-cell; + vertical-align: middle; + + .error-code { + font-size: 100px; + color: #9ac7ef; + margin: 0 auto -45px; + text-shadow: + 0px 2px 0 #fff, + -2px 0px 0 #fff, + 2px 0px 0 #fff; + } + + .error-img { + width: 260px; + height: 180px; + margin: 0 auto; + background: url(./images/errortips-bg.png) no-repeat; + } + + .error-content { + font-size: 16px; + margin: 24px 0; + font-weight: bold; + } + + .error-bottom { + a { + font-weight: 800; + cursor: pointer; + } + + span { + padding-right: 15px; + } + } + } + } + } + + //sso 登录 + .tiny-sso__box { + position: absolute; + background: #fff; + border: 1px solid transparent; + box-shadow: 2px 2px 2px 0 rgba(0, 0, 0, 0.2); + left: 50%; + top: 50%; + transform: translate(-50%, -50%); + .tiny-sso__body { + text-align: initial; + padding: 20px; + color: #5a5e66; + line-height: 32px; + font-size: 14px; + .tiny-sso__body-iframe { + width: 350px; + height: 350px; + height: 460px\9; //兼容ie9-ie10 + overflow: hidden; + + //兼容ie10-ie11 + @media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) { + height: 460px; + } + + //兼容edge + @supports (-ms-ime-align: auto) { + height: 460px; + } + } + } + } + + //非 sso 登录 + &.login-not-sso { + background: #dcdfe4; + background-size: cover; + + .tiny-not-sso__box { + width: 100%; + height: 100%; + overflow: hidden; + + .tiny-not-sso__body { + width: 650px; + height: 400px; + background: #f4f5f9; + position: absolute; + left: 50%; + top: 50%; + transform: translate(-50%, -50%); + text-align: center; + border: 1px solid #d4d5d7; + box-shadow: 0px 2px 4px #989a9e; + + .title { + background: #ecedf1; + background: linear-gradient(to bottom, #ecedf1, #dadde2); + border-bottom: 1px solid #b6babf; + padding: 16px 20px; + font-size: 20px; + } + + .tbl-login { + width: 100%; + border-collapse: collapse; + border-spacing: 0; + font-size: 16px; + margin-top: 28px; + + .form-item { + height: 60px; + line-height: 60px; + + td.label { + width: 30%; + text-align: right; + color: #5a5e66; + } + + td.cell { + width: 70%; + text-align: left; + padding-left: 12px; + + input { + border: 1px solid #bfbfbf; + border-radius: 2px; + outline: none; + width: 75%; + height: 40px; + line-height: 40px; + padding: 0 8px; + background: transparent; + color: #5a5e66; + + &::-webkit-input-placeholder { + color: #999; + } + + &:hover { + border-color: #999; + } + + &:focus::-webkit-input-placeholder { + color: #d9d9d9; + } + + &.text-danger { + border-color: var(--ti-input-border-color-error); + } + } + + button { + width: 75%; + height: 40px; + line-height: 40px; + padding: 0 24px; + text-align: center; + color: #fff; + background-color: var(--ti-common-color-line-active); + border: none; + border-radius: 2px; + transition: 0.3s; + outline: 0; + + &:hover { + background-color: #40a9ff; + } + } + + .errmessage { + color: #f00; + line-height: 20px; + } + } + } + } + } + } + } +} diff --git a/packages/theme/src/error-page/index.js b/packages/theme/src/error-page/index.js new file mode 100644 index 0000000000..d0d4ed0dca --- /dev/null +++ b/packages/theme/src/error-page/index.js @@ -0,0 +1,42 @@ +/** + * Copyright (c) 2022 - present TinyVue Authors. + * Copyright (c) 2022 - present Huawei Cloud Computing Technologies Co., Ltd. + * + * Use of this source code is governed by an MIT-style license. + * + * THE OPEN SOURCE SOFTWARE IN THIS PRODUCT IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL, + * BUT WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR + * A PARTICULAR PURPOSE. SEE THE APPLICABLE LICENSES FOR MORE DETAILS. + * + */ + +export default { + 'tiny-errortips-box-bg-color': '#fff', + 'tiny-errortips-body-text-color': '#5a5e66', + 'tiny-errortips-body-font-size': '14px', + 'tiny-errortips-body-code-font-size': '100px', + 'tiny-errortips-body-code-text-color': '#9ac7ef', + 'tiny-errortips-body-content-font-size': '16px', + 'tiny-errortips-body-bottom-font-weight': '800', + 'tiny-errortips-sso-box-bg-color': '#fff', + 'tiny-errortips-sso-body-text-color': '#5a5e66', + 'tiny-errortips-sso-body-font-size': '14px', + 'tiny-errortips-not-sso-bg-color': '#dcdfe4', + 'tiny-errortips-not-sso-body-bg-color': '#f4f5f9', + 'tiny-errortips-not-sso-body-border-color': '#d4d5d7', + 'tiny-errortips-not-sso-body-title-border-color': '#b6babf', + 'tiny-errortips-not-sso-body-title-font-size': '20px', + 'tiny-errortips-not-sso-body-login-font-size': '16px', + 'tiny-errortips-not-sso-body-text-color': '#5a5e66', + 'tiny-errortips-not-sso-body-input-border-color': '#bfbfbf', + 'tiny-errortips-not-sso-body-input-border-radius': '2px', + 'tiny-errortips-not-sso-body-placeholder-text-color': '#999', + 'tiny-errortips-not-sso-body-input-hover-text-color': '#999', + 'tiny-errortips-not-sso-body-input-focus-text-color': '#d9d9d9', + 'tiny-errortips-not-sso-body-input-danger-border-color': '#f5222d', + 'tiny-errortips-not-sso-body-button-text-color': '#fff', + 'tiny-errortips-not-sso-body-button-bg-color': '#1890ff', + 'tiny-errortips-not-sso-body-button-border-radius': '2px', + 'tiny-errortips-not-sso-body-button-hover-bg-color': '#40a9ff', + 'tiny-errortips-not-sso-body-errmessage-text-color': '#f00' +} diff --git a/packages/theme/src/error-page/index.less b/packages/theme/src/error-page/index.less new file mode 100644 index 0000000000..ff0b24258b --- /dev/null +++ b/packages/theme/src/error-page/index.less @@ -0,0 +1,238 @@ +/** +* Copyright (c) 2022 - present TinyVue Authors. +* Copyright (c) 2022 - present Huawei Cloud Computing Technologies Co., Ltd. +* +* Use of this source code is governed by an MIT-style license. +* +* THE OPEN SOURCE SOFTWARE IN THIS PRODUCT IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL, +* BUT WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR +* A PARTICULAR PURPOSE. SEE THE APPLICABLE LICENSES FOR MORE DETAILS. +* +*/ + +@import './vars.less'; + +.tiny-popup__wrapper { + z-index: 2147483647 !important; + background: rgba(0, 0, 0, 0.5); + position: fixed; + top: 0; + right: 0; + bottom: 0; + left: 0; + overflow: auto; + margin: 0; + + // 错误提示页 + .tiny-errortips__box { + position: absolute; + width: var(--ti-errortips-width); + min-height: var(--ti-errortips-min-height); + max-height: var(--ti-errortips-max-height); + top: 0; + left: 0; + right: 0; + bottom: 0; + margin: auto; + overflow: hidden; + background: var(--ti-errortips-box-bg-color); + border: 1px solid transparent; + box-shadow: 2px 2px 2px 0 rgba(0, 0, 0, 0.2); + text-align: center; + overflow-y: auto; + + .tiny-errortips__body { + height: 100%; + text-align: initial; + padding: 20px; + color: var(--ti-errortips-body-text-color); + font-size: var(--ti-errortips-body-font-size); + display: table; + margin: auto; + + .errortips { + text-align: center; + display: table-cell; + vertical-align: middle; + + .error-code { + font-size: var(--ti-errortips-body-code-font-size); + color: var(--ti-errortips-body-code-text-color); + margin: 0 auto -45px; + text-shadow: + 0px 2px 0 #fff, + -2px 0px 0 #fff, + 2px 0px 0 #fff; + } + + .error-img { + width: 260px; + height: 180px; + margin: 0 auto; + background: url(../images/errortips-bg.png) no-repeat; + } + + .error-content { + font-size: var(--ti-errortips-body-content-font-size); + margin: 24px 0; + font-weight: bold; + } + + .error-bottom { + a { + font-weight: var(--ti-errortips-body-bottom-font-weight); + cursor: pointer; + } + + span { + padding-right: 15px; + } + } + } + } + } + + // sso 登录 + .tiny-sso__box { + position: absolute; + background: var(--ti-errortips-sso-box-bg-color); + border: 1px solid transparent; + box-shadow: 2px 2px 2px 0 rgba(0, 0, 0, 0.2); + left: 50%; + top: 50%; + transform: translate(-50%, -50%); + + .tiny-sso__body { + text-align: initial; + padding: 20px; + color: var(--ti-errortips-sso-body-text-color); + line-height: 32px; + font-size: var(--ti-errortips-sso-body-font-size); + + .tiny-sso__body-iframe { + width: 350px; + height: 350px; + height: 460px\9; // 兼容ie9-ie10 + overflow: hidden; + + // 兼容ie10-ie11 + @media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) { + height: 460px; + } + + // 兼容edge + @supports (-ms-ime-align: auto) { + height: 460px; + } + } + } + } + + // 非 sso 登录 + &.login-not-sso { + background: var(--ti-errortips-not-sso-bg-color); + background-size: cover; + + .tiny-not-sso__box { + width: 100%; + height: 100%; + overflow: hidden; + + .tiny-not-sso__body { + width: 650px; + height: 400px; + background: var(--ti-errortips-not-sso-body-bg-color); + position: absolute; + left: 50%; + top: 50%; + transform: translate(-50%, -50%); + text-align: center; + border: 1px solid var(--ti-errortips-not-sso-body-border-color); + box-shadow: 0px 2px 4px #989a9e; + + .title { + background: linear-gradient(to bottom, #ecedf1, #dadde2); + border-bottom: 1px solid var(--ti-errortips-not-sso-body-title-border-color); + padding: 16px 20px; + font-size: var(--ti-errortips-not-sso-body-title-font-size); + } + + .tbl-login { + width: 100%; + border-collapse: collapse; + border-spacing: 0; + font-size: var(--ti-errortips-not-sso-body-login-font-size); + margin-top: 28px; + + .form-item { + height: 60px; + line-height: 60px; + + td.label { + width: 30%; + text-align: right; + color: var(--ti-errortips-not-sso-body-text-color); + } + + td.cell { + width: 70%; + text-align: left; + padding-left: 12px; + + input { + border: 1px solid var(--ti-errortips-not-sso-body-input-border-color); + border-radius: var(--ti-errortips-not-sso-body-input-border-radius); + outline: none; + width: 75%; + height: 40px; + line-height: 40px; + padding: 0 8px; + background: transparent; + color: var(--ti-errortips-not-sso-body-text-color); + + &::-webkit-input-placeholder { + color: var(--ti-errortips-not-sso-body-placeholder-text-color); + } + + &:hover { + border-color: var(--ti-errortips-not-sso-body-placeholder-text-color); + } + + &:focus::-webkit-input-placeholder { + color: var(--ti-errortips-not-sso-body-input-focus-text-color); + } + + &.text-danger { + border-color: var(--ti-errortips-not-sso-body-input-danger-border-color); + } + } + + button { + width: 75%; + height: 40px; + line-height: 40px; + padding: 0 24px; + text-align: center; + color: var(--ti-errortips-not-sso-body-button-text-color); + background-color: var(--ti-errortips-not-sso-body-button-bg-color); + border: none; + border-radius: var(--ti-errortips-not-sso-body-button-border-radius); + transition: 0.3s; + outline: 0; + + &:hover { + background-color: var(--ti-errortips-not-sso-body-button-hover-bg-color); + } + } + + .errmessage { + color: var(--ti-errortips-not-sso-body-errmessage-text-color); + line-height: 20px; + } + } + } + } + } + } + } +} diff --git a/packages/theme/src/error-page/vars.less b/packages/theme/src/error-page/vars.less new file mode 100644 index 0000000000..5c566e2067 --- /dev/null +++ b/packages/theme/src/error-page/vars.less @@ -0,0 +1,42 @@ +/** +* Copyright (c) 2022 - present TinyVue Authors. +* Copyright (c) 2022 - present Huawei Cloud Computing Technologies Co., Ltd. +* +* Use of this source code is governed by an MIT-style license. +* +* THE OPEN SOURCE SOFTWARE IN THIS PRODUCT IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL, +* BUT WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR +* A PARTICULAR PURPOSE. SEE THE APPLICABLE LICENSES FOR MORE DETAILS. +* +*/ + +:root { + --ti-errortips-box-bg-color: var(--ti-common-color-light, #fff); + --ti-errortips-body-text-color: #5a5e66; + --ti-errortips-body-font-size: var(--ti-common-font-size-1, 14px); + --ti-errortips-body-code-font-size: 100px; + --ti-errortips-body-code-text-color: #9ac7ef; + --ti-errortips-body-content-font-size: var(--ti-common-font-size-2, 16px); + --ti-errortips-body-bottom-font-weight: var(--ti-common-font-weight-8, 800); + --ti-errortips-sso-box-bg-color: var(--ti-common-color-light, #fff); + --ti-errortips-sso-body-text-color: #5a5e66; + --ti-errortips-sso-body-font-size: var(--ti-common-font-size-1, 14px); + --ti-errortips-not-sso-bg-color: #dcdfe4; + --ti-errortips-not-sso-body-bg-color: #f4f5f9; + --ti-errortips-not-sso-body-border-color: #d4d5d7; + --ti-errortips-not-sso-body-title-border-color: #b6babf; + --ti-errortips-not-sso-body-title-font-size: var(--ti-common-font-size-4, 20px); + --ti-errortips-not-sso-body-login-font-size: var(--ti-common-font-size-2, 16px); + --ti-errortips-not-sso-body-text-color: #5a5e66; + --ti-errortips-not-sso-body-input-border-color: var(--ti-base-color-bg-5, #f5f5f6); + --ti-errortips-not-sso-body-input-border-radius: var(--ti-common-border-radius-normal, 2px); + --ti-errortips-not-sso-body-placeholder-text-color: var(--ti-common-color-placeholder, #adb0b8); + --ti-errortips-not-sso-body-input-hover-text-color: var(--ti-common-color-placeholder, #adb0b8); + --ti-errortips-not-sso-body-input-focus-text-color: var(--ti-common-color-border, #adb0b8); + --ti-errortips-not-sso-body-input-danger-border-color: var(--ti-base-color-bg-8, #c7000b); + --ti-errortips-not-sso-body-button-text-color: var(--ti-common-color-light, #fff); + --ti-errortips-not-sso-body-button-bg-color: var(--ti-base-color-brand-6, #5e7ce0); + --ti-errortips-not-sso-body-button-border-radius: var(--ti-common-border-radius-normal, 2px); + --ti-errortips-not-sso-body-button-hover-bg-color: var(--ti-base-color-brand-5, #7693f5); + --ti-errortips-not-sso-body-errmessage-text-color: #f00; +} diff --git a/packages/theme/src/index.less b/packages/theme/src/index.less index 78bc3b0556..622de4352f 100644 --- a/packages/theme/src/index.less +++ b/packages/theme/src/index.less @@ -67,6 +67,7 @@ @import './dropdown/index.less'; @import './dropdown-item/index.less'; @import './dropdown-menu/index.less'; +@import './error-page/index.less'; @import './espace/index.less'; @import './fall-menu/index.less'; @import './file-upload/index.less'; diff --git a/packages/theme/src/split/smb-theme.js b/packages/theme/src/split/smb-theme.js index 17278723f5..23bfcaab33 100644 --- a/packages/theme/src/split/smb-theme.js +++ b/packages/theme/src/split/smb-theme.js @@ -1,6 +1,4 @@ export const tinySplitSmbTheme = { - // 不显示边框线 - 'ti-split-trigger-button-border-width': '0', - // 不显示背景 - 'ti-split-trigger-button-bg-color': 'var(--ti-base-color-transparent)' + 'ti-split-trigger-button-border-width': '0', // 不显示边框线 + 'ti-split-trigger-button-bg-color': 'var(--ti-base-color-transparent)' // 不显示背景 } diff --git a/packages/theme/src/time-select/vars.less b/packages/theme/src/time-select/vars.less index 1c1aff0f60..9f310241b9 100644 --- a/packages/theme/src/time-select/vars.less +++ b/packages/theme/src/time-select/vars.less @@ -28,5 +28,5 @@ // 时间选择选项悬浮背景色(选中项) --ti-time-select-item-select-hover-bg-color: var(--ti-common-color-selected-background, #5e7ce0); // 时间选择选项字体色(选中项) - --ti-time-select-item-selected-text-color: var(--ti-common-color-text-primary, #252b3a); + --ti-time-select-item-selected-text-color: var(--ti-common-color-text-primary, #252b3a) } diff --git a/packages/vue/src/anchor/package.json b/packages/vue/src/anchor/package.json index 20ace36261..13bcddebd3 100644 --- a/packages/vue/src/anchor/package.json +++ b/packages/vue/src/anchor/package.json @@ -1,24 +1,22 @@ { "name": "@opentiny/vue-anchor", - "type": "module", "version": "3.18.0", "description": "", - "license": "MIT", - "sideEffects": false, "main": "lib/index.js", - "module": "index.ts", + "sideEffects": false, + "type": "module", + "devDependencies": { + "@opentiny-internal/vue-test-utils": "workspace:*", + "vitest": "^0.31.0" + }, "scripts": { "build": "pnpm -w build:ui $npm_package_name", "//postversion": "pnpm build" }, "dependencies": { - "@opentiny/vue-common": "workspace:~", - "@opentiny/vue-directive": "workspace:~", "@opentiny/vue-renderless": "workspace:~", + "@opentiny/vue-common": "workspace:~", "@opentiny/vue-theme": "workspace:~" }, - "devDependencies": { - "@opentiny-internal/vue-test-utils": "workspace:*", - "vitest": "^0.31.0" - } + "license": "MIT" } \ No newline at end of file diff --git a/packages/vue/src/anchor/src/pc.vue b/packages/vue/src/anchor/src/pc.vue index 655864759c..1d6113d498 100644 --- a/packages/vue/src/anchor/src/pc.vue +++ b/packages/vue/src/anchor/src/pc.vue @@ -1,12 +1,10 @@