diff --git a/src/pages/package.json b/src/pages/package.json index 7d5f0df2e..412f6483a 100644 --- a/src/pages/package.json +++ b/src/pages/package.json @@ -26,7 +26,7 @@ "acorn": "8.10.0", "art-template": "^4.13.2", "axios": "^1.4.0", - "bkui-vue": "0.0.2-beta.124", + "bkui-vue": "^0.0.2-beta.124", "connect-history-api-fallback": "^2.0.0", "cookie": "^0.5.0", "cookie-parser": "^1.4.5", diff --git a/src/pages/src/components/layouts/DataSourceCard.vue b/src/pages/src/components/layouts/DataSourceCard.vue index a49b80093..b9d53f73c 100644 --- a/src/pages/src/components/layouts/DataSourceCard.vue +++ b/src/pages/src/components/layouts/DataSourceCard.vue @@ -56,7 +56,7 @@ diff --git a/src/pages/src/views/setting/auth-config/LocalView.vue b/src/pages/src/views/setting/auth-config/LocalView.vue new file mode 100644 index 000000000..77bb63079 --- /dev/null +++ b/src/pages/src/views/setting/auth-config/LocalView.vue @@ -0,0 +1,129 @@ + + + + + diff --git a/src/pages/src/views/setting/auth-config/ViewDetails.vue b/src/pages/src/views/setting/auth-config/ViewDetails.vue deleted file mode 100644 index fae30d7ba..000000000 --- a/src/pages/src/views/setting/auth-config/ViewDetails.vue +++ /dev/null @@ -1,410 +0,0 @@ - - - - - diff --git a/src/pages/src/views/setting/auth-config/WeCom.less b/src/pages/src/views/setting/auth-config/WeCom.less index bb369a5fb..f0042da1a 100644 --- a/src/pages/src/views/setting/auth-config/WeCom.less +++ b/src/pages/src/views/setting/auth-config/WeCom.less @@ -1,217 +1,68 @@ .details-wrapper { - height: calc(100vh - 52px); + height: calc(100vh - 85px); + padding: 20px 24px; background: #F5F7FA; - .box { - height: calc(100% - 48px); - padding: 20px 24px; - margin-bottom: 48px; - } - - .details-type { + .item-flex-header { display: flex; - padding: 10px 16px; - margin-bottom: 16px; - background: #FFF; - border-radius: 2px; align-items: center; - .title { + ::v-deep .bk-form-item { + padding: 0; + margin-bottom: 0; + margin-left: 0; font-size: 14px; - color: #313238; - } - .subtitle { - font-size: 12px; - color: #979BA5; + &:last-child { + margin-left: 12px; + } } } - .auth-source-form { - .content-item { - margin-bottom: 16px; - background: #fff; - border-radius: 2px; - box-shadow: 0 2px 4px 0 #1919290d; - - .item-title { - padding: 16px 24px; - font-size: 14px; - font-weight: 700; - } - - ::v-deep .bk-form-item { - padding: 0 24px 24px; - margin-bottom: 0; - font-size: 14px; - - &:last-child { - margin-bottom: 16px; - } - - .bk-radio-button { - .bk-radio-button-label { - font-size: 14px !important; - } - } - - .bk-radio-label { - font-size: 14px !important; - } - - .error-text { - font-size: 12px; - line-height: 1; - color: #ea3636; - animation: form-error-appear-animation .15s; - } - } - - .data-source-matching { - padding: 0 24px; - border-radius: 2px; - - ::v-deep .bk-form-item { - padding: 0; - } - - .hover-item { - cursor: pointer; - } - - .matching-item { - position: relative; - margin-bottom: 16px; - - .bk-sq-icon { - position: absolute; - top: -6px; - right: -6px; - font-size: 20px; - color: #EA3636; - } - - ::v-deep .bk-form-item { - padding-bottom: 24px; - margin-bottom: 0; - margin-left: 0; - font-size: 14px; - - &:last-child { - margin-bottom: 0; - } - } - - .item-flex-header { - display: flex; - align-items: center; - - ::v-deep .bk-form-item { - padding: 0; - margin-bottom: 0; - margin-left: 0; - font-size: 14px; - - &:last-child { - margin-left: 12px; - } - } - } - - .item-flex { - position: relative; - display: flex; - padding-bottom: 8px; - align-items: center; - - ::v-deep .bk-form-item { - padding-bottom: 0; - margin-bottom: 0; - margin-left: 0; - font-size: 14px; - } - - .auth-source-fields { - margin-left: 12px; - } - - .user-icon { - font-size: 16px; - color: #dcdee5; - - &:hover { - color: #c4c6cc; - } - - &.forbid { - color: #EAEBF0; - } - } - - .icon-plus-fill { - position: absolute; - top: 7px; - right: 30px; - } + .item-flex { + position: relative; + display: flex; + padding-bottom: 8px; + align-items: center; - .icon-minus-fill { - position: absolute; - top: 7px; - right: 4px; - } - } - } - } + ::v-deep .bk-form-item { + padding-bottom: 0; + margin-bottom: 0; + margin-left: 0; + font-size: 14px; + } - .add-data-source { - display: flex; - height: 32px; - margin: 0 24px; - font-size: 14px; - color: #3A84FF; - cursor: pointer; - background: #F0F5FF; - border: 1px dashed #A3C5FD; - border-radius: 2px; - align-items: center; - justify-content: center; + .auth-source-fields { + margin-left: 12px; + } - span { - margin-left: 5px; - } - } + .user-icon { + font-size: 16px; + color: #dcdee5; - .forbid-data-source { - color: #fff; - cursor: not-allowed; - background-color: #dcdee5; - border: 1px dashed #dcdee5; + &:hover { + color: #c4c6cc; } - ::v-deep .bk-schema-form { - .bk-form-item { - width: 600px; - padding-bottom: 0; - font-size: 14px; - - &:last-child { - padding-bottom: 24px; - } - } + &.forbid { + color: #EAEBF0; } } - } - .footer { - position: absolute; + .icon-plus-fill { + position: absolute; + top: 7px; + right: 30px; + } - .bk-button { - width: 88px; - margin-right: 8px; + .icon-minus-fill { + position: absolute; + top: 7px; + right: 4px; } } - .fixed { + .footer { position: fixed; bottom: 0; left: 0; @@ -223,6 +74,11 @@ line-height: 48px; background: #FAFBFD; box-shadow: 0 -1px 0 0 #DCDEE5; + + .bk-button { + width: 88px; + margin-right: 8px; + } } } diff --git a/src/pages/src/views/setting/auth-config/WeCom.vue b/src/pages/src/views/setting/auth-config/WeCom.vue index 38afcbe53..4988a8807 100644 --- a/src/pages/src/views/setting/auth-config/WeCom.vue +++ b/src/pages/src/views/setting/auth-config/WeCom.vue @@ -1,161 +1,109 @@ diff --git a/src/pages/src/views/setting/data-source/Success.vue b/src/pages/src/views/setting/data-source/Success.vue index 21a7fb4ce..4fbeab585 100644 --- a/src/pages/src/views/setting/data-source/Success.vue +++ b/src/pages/src/views/setting/data-source/Success.vue @@ -40,13 +40,18 @@ defineProps({ const { handleOperationsSync } = useDataSource(); +// 同步数据后跳转到数据源配置页面 const handleSync = () => { handleOperationsSync(); router.push({ name: 'dataSource' }); }; -const loginConfig = () => {}; +// 跳转到登录配置页面 +const loginConfig = () => { + router.push({ name: 'login' }); +}; +// 跳转到组织架构页面 const viewOrganization = () => { router.push({ name: 'organization' }); }; diff --git a/src/pages/src/views/tenant/OperationDetails.vue b/src/pages/src/views/tenant/OperationDetails.vue index 35a079bae..d71a0f2f8 100644 --- a/src/pages/src/views/tenant/OperationDetails.vue +++ b/src/pages/src/views/tenant/OperationDetails.vue @@ -46,7 +46,7 @@ diff --git a/src/pages/src/views/tenant/index.vue b/src/pages/src/views/tenant/index.vue index 6b32e54d8..01dbeee68 100644 --- a/src/pages/src/views/tenant/index.vue +++ b/src/pages/src/views/tenant/index.vue @@ -199,7 +199,7 @@ {{ $t('邮箱') }} - + {{ $t('短信') }} diff --git a/src/pages/src/views/virtual-account/index.vue b/src/pages/src/views/virtual-account/index.vue index 3dd9ae3ad..a835c9f15 100644 --- a/src/pages/src/views/virtual-account/index.vue +++ b/src/pages/src/views/virtual-account/index.vue @@ -197,7 +197,7 @@ watch(() => detailsConfig.isShow, (val) => { } }); -const handleClick = async (type: string, id: string) => { +const handleClick = async (type: string, id?: string) => { if (type !== 'add') { const res = await getVirtualUsersDetail(id); detailsInfo.value = res.data; diff --git a/src/pages/static/login_success.html b/src/pages/static/login_success.html index 6b6425626..e3abdcf92 100644 --- a/src/pages/static/login_success.html +++ b/src/pages/static/login_success.html @@ -9,6 +9,7 @@ diff --git a/src/pages/yarn.lock b/src/pages/yarn.lock index a4356013a..8dd7baa7f 100644 --- a/src/pages/yarn.lock +++ b/src/pages/yarn.lock @@ -2765,7 +2765,7 @@ binary-extensions@^2.0.0: resolved "https://mirrors.tencent.com/npm/binary-extensions/-/binary-extensions-2.3.0.tgz" integrity sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw== -bkui-vue@0.0.2-beta.124: +bkui-vue@^0.0.2-beta.124: version "0.0.2-beta.124" resolved "https://mirrors.tencent.com/npm/bkui-vue/-/bkui-vue-0.0.2-beta.124.tgz" integrity sha512-Nv8D8UiUonnhTB8PJ5KNEKhLHDypjO8fJ+wkWH4qcJk4SHTQ6+Bud6W/6f8+RFxGq3VCYVSNpIqEGYUiEe/6fQ==