diff --git a/src/components/Form/FormFields/Select2.vue b/src/components/Form/FormFields/Select2.vue index 927156ddb..5e747aa55 100644 --- a/src/components/Form/FormFields/Select2.vue +++ b/src/components/Form/FormFields/Select2.vue @@ -268,7 +268,7 @@ export default { } // 由于在新增时有些 Select 会存在初始值，而有些没有，就会导致动态类名判断出现相反的情况 // 此处强制设置没有初始值的动态类名 - if (this.iValue.length === 0) this.transformed = false + if (Array.isArray(this.iValue) && this.iValue.length === 0) this.transformed = false this.$nextTick(() => { // 因为elform存在问题，这个来清楚验证 diff --git a/src/components/Libs/Krry/paging/index.vue b/src/components/Libs/Krry/paging/index.vue index 69718e946..b42b31ddf 100644 --- a/src/components/Libs/Krry/paging/index.vue +++ b/src/components/Libs/Krry/paging/index.vue @@ -27,21 +27,24 @@
- - + + + + +
@@ -422,13 +425,22 @@ export default { .buttons { vertical-align: middle; } + .opera { position: relative; - display: inline-block; - vertical-align: middle; - text-align: center; - margin: 180px 8px; + display: flex; + justify-content: center; + align-items: center; + margin-left: 10px; width: calc(100% - 5px); + height: 415px; + + .arrow { + width: 1.25em; + height: 1.25em; + color: #888888; + } + @media screen and (max-width: 992px) { margin: 8px 8px; text-align:start diff --git a/src/components/Table/CardTable/index.vue b/src/components/Table/CardTable/index.vue index ebff0ca0a..64607d3de 100644 --- a/src/components/Table/CardTable/index.vue +++ b/src/components/Table/CardTable/index.vue @@ -241,7 +241,7 @@ export default { .el-col, div { .my-card { min-width: 330px; - height: 250px; + //height: 250px; width: 100%; position: relative; margin-bottom: 20px; diff --git a/src/components/Table/TableFormatters/DetailFormatter.vue b/src/components/Table/TableFormatters/DetailFormatter.vue index cf1e80e06..6f8b3198c 100644 --- a/src/components/Table/TableFormatters/DetailFormatter.vue +++ b/src/components/Table/TableFormatters/DetailFormatter.vue @@ -99,7 +99,7 @@ export default { if (routeQuery && typeof routeQuery === 'object') { detailRoute.query = this.formatterArgs.routeQuery if (detailRoute.query.tab) { - detailRoute.query = detailRoute.query.tab + detailRoute.name = detailRoute.query.tab } } return detailRoute diff --git a/src/components/Tree/DataZTree/components/ZTree/index.vue b/src/components/Tree/DataZTree/components/ZTree/index.vue index 2ce1281ca..e816dba82 100644 --- a/src/components/Tree/DataZTree/components/ZTree/index.vue +++ b/src/components/Tree/DataZTree/components/ZTree/index.vue @@ -12,10 +12,9 @@ @input="treeSearchHandle" > - @@ -409,6 +408,11 @@ export default { &:hover { ::v-deep .tree-action-btn { display: inline; + + &:hover { + box-shadow: none; + color: var(--color-text-primary) !important; + } } } @@ -610,14 +614,25 @@ div.rMenu li { border-radius: 4px; background: #fafafa; padding-right: 32px; + color: var(--color-text-primary) } & ::v-deep .el-input__suffix { padding-right: 8px; + + .el-input__suffix-inner:hover { + color: var(--color-text-primary); + } } & ::v-deep .el-input__prefix { - padding-left: 6px; + display: flex; + + .el-input__icon { + display: flex; + justify-content: center; + align-items: center; + } } & ::v-deep .el-input__suffix-inner { diff --git a/src/i18n/i18n.js b/src/i18n/i18n.js index 1ac437f5f..e975d6412 100644 --- a/src/i18n/i18n.js +++ b/src/i18n/i18n.js @@ -10,9 +10,8 @@ import store from '@/store' Vue.use(VueI18n) const cookieLang = VueCookie.get('django_language') -const storeLang = VueCookie.get('lang') -const browserLang = navigator.systemLanguage || navigator.language -let lang = cookieLang || storeLang || browserLang || 'en' +const browserLang = navigator.systemLanguage || navigator.language || navigator.userLanguage +let lang = cookieLang || browserLang || 'en' if (lang === 'zh-hant') { lang = 'zh_hant' } else { diff --git a/src/icons/svg/arrow.svg b/src/icons/svg/arrow.svg new file mode 100644 index 000000000..f0b53b2fd --- /dev/null +++ b/src/icons/svg/arrow.svg @@ -0,0 +1 @@ + diff --git a/src/layout/components/GenericListTableDialog/index.vue b/src/layout/components/GenericListTableDialog/index.vue index 357394599..ac6aed59d 100644 --- a/src/layout/components/GenericListTableDialog/index.vue +++ b/src/layout/components/GenericListTableDialog/index.vue @@ -2,10 +2,10 @@ @@ -54,7 +54,3 @@ export default { } } - - diff --git a/src/layout/components/NavHeader/Language.vue b/src/layout/components/NavHeader/Language.vue index 0fde23a5e..094f921a1 100644 --- a/src/layout/components/NavHeader/Language.vue +++ b/src/layout/components/NavHeader/Language.vue @@ -63,9 +63,6 @@ export default { }, mounted() { this.changeMomentLang() - - const userLang = localStorage.getItem('lang') - document.documentElement.lang = userLang }, methods: { changeLang() { @@ -86,17 +83,13 @@ export default { }, changeLangTo(item) { this.$i18n.locale = item.code - localStorage.setItem('lang', item.code) - this.$cookie.set(this.LANG_COOKIE_NAME, item.cookieCode) + this.$cookie.set(this.LANG_COOKIE_NAME, item.cookieCode, { expires: 365 }) window.location.reload() }, getLangCode() { let langCode = this.$cookie.get(this.LANG_COOKIE_NAME) if (!langCode) { - langCode = localStorage.lang - } - if (!langCode) { - langCode = navigator.language || navigator.userLanguage + langCode = navigator.systemLanguage || navigator.language || navigator.userLanguage } if (langCode === 'zh-hant') { langCode = 'zh_hant' diff --git a/src/views/accounts/Account/AccountDetail/Detail.vue b/src/views/accounts/Account/AccountDetail/Detail.vue index 351f8f008..2fd1ec4f4 100644 --- a/src/views/accounts/Account/AccountDetail/Detail.vue +++ b/src/views/accounts/Account/AccountDetail/Detail.vue @@ -40,7 +40,8 @@ export default { props: { object: { type: Object, - default: () => {} + default: () => { + } } }, data() { @@ -212,7 +213,7 @@ export default { name: 'AssetDetail', params: { id: this.object.asset.id } } - return { value } + return {value?.name} }, su_from: (item, value) => { return {value?.name ? value?.name + `(${value?.username})` : ''} diff --git a/src/views/assets/Asset/AssetDetail/PermUser.vue b/src/views/assets/Asset/AssetDetail/PermUser.vue index 6f08d4250..7720dbe8a 100644 --- a/src/views/assets/Asset/AssetDetail/PermUser.vue +++ b/src/views/assets/Asset/AssetDetail/PermUser.vue @@ -206,10 +206,13 @@ export default { } } } + }, + watch: { + $route: { + handler(newVal) { + newVal.fullPath.includes('/console/perms/asset-permissions/') && (this.GenericListTableDialogConfig.visible = false) + } + } } } - - diff --git a/src/views/assets/Asset/AssetList/DatabaseList.vue b/src/views/assets/Asset/AssetList/DatabaseList.vue index beb8428c7..ab0c940cb 100644 --- a/src/views/assets/Asset/AssetList/DatabaseList.vue +++ b/src/views/assets/Asset/AssetList/DatabaseList.vue @@ -19,7 +19,3 @@ export default { } } - - diff --git a/src/views/assets/Asset/AssetList/components/BaseList.vue b/src/views/assets/Asset/AssetList/components/BaseList.vue index 3deac16c4..40fa80dc6 100644 --- a/src/views/assets/Asset/AssetList/components/BaseList.vue +++ b/src/views/assets/Asset/AssetList/components/BaseList.vue @@ -324,7 +324,3 @@ export default { } } - - diff --git a/src/views/assets/Cloud/Account/components/AccountPanel.vue b/src/views/assets/Cloud/Account/components/AccountPanel.vue index 1b6eaebd1..22bd51fe2 100644 --- a/src/views/assets/Cloud/Account/components/AccountPanel.vue +++ b/src/views/assets/Cloud/Account/components/AccountPanel.vue @@ -8,7 +8,9 @@ - + + + {{ action.name }} @@ -18,15 +20,15 @@ - + - - + + @@ -168,11 +170,12 @@ export default { .account-panel { display: flex; flex-direction: column; - height: 100%; + //height: 100%; cursor: pointer; & .el-row:first-of-type { height: 30px !important; + padding: 0; .el-col-22 { padding-left: 0 !important; @@ -199,6 +202,7 @@ export default { display: flex; align-items: center; margin: 0 !important; + padding: 25px 0; } .el-divider--horizontal { diff --git a/src/views/assets/Cloud/Account/components/CreateDialog.vue b/src/views/assets/Cloud/Account/components/CreateDialog.vue index 771f4a74d..222886922 100644 --- a/src/views/assets/Cloud/Account/components/CreateDialog.vue +++ b/src/views/assets/Cloud/Account/components/CreateDialog.vue @@ -8,7 +8,7 @@ :title="$tc('CloudSyncConfig')" :visible.sync="iVisible" v-bind="$attrs" - width="70%" + width="1051px" v-on="$listeners" > @@ -103,6 +103,10 @@ export default {