fix(ui):some fix (#370)

* pref(ui)：some bugfix & some style * fix(ui):some fix
veops · Jan 10, 2024 · 996151f · 996151f
1 parent c2ba819
commit 996151f
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 24 deletions.
diff --git a/cmdb-ui/config/plugin.config.js b/cmdb-ui/config/plugin.config.js
@@ -13,7 +13,7 @@ const getAntdSerials = (color) => {
 
 const themePluginOption = {
   fileName: 'css/theme-colors-[contenthash:8].css',
-  matchColors: getAntdSerials('#1890ff'), // 主色系列
+  matchColors: getAntdSerials('#2f54eb'), // 主色系列
   // 改变样式选择器，解决样式覆盖问题
   changeSelector (selector) {
     switch (selector) {

diff --git a/cmdb-ui/src/config/setting.js b/cmdb-ui/src/config/setting.js
@@ -14,7 +14,7 @@
  */
 
 export default {
-  primaryColor: '#1890ff', // primary color of ant design
+  primaryColor: '#2f54eb', // primary color of ant design
   navTheme: 'dark', // theme for nav menu
   layout: 'sidemenu', // nav menu position: sidemenu or topmenu
   contentWidth: 'Fixed', // layout of content: Fluid or Fixed, only works when layout is topmenu

diff --git a/cmdb-ui/src/modules/acl/views/module/resourcePermForm.vue b/cmdb-ui/src/modules/acl/views/module/resourcePermForm.vue
@@ -57,7 +57,7 @@
           </a-tag>
         </template>
       </vxe-column>
-      <vxe-column field="operate" :title="$t('batchOperate')">
+      <vxe-column field="operate" :title="$t('acl.batchOperate')">
         <template #default="{row}">
           <a-button size="small" type="danger" @click="handleClearAll(row)">
             {{ $t('clear') }}

diff --git a/cmdb-ui/src/modules/cmdb/lang/en.js b/cmdb-ui/src/modules/cmdb/lang/en.js
@@ -366,12 +366,12 @@ const cmdb_en = {
     ad: {
         upload: 'Import',
         download: 'Export',
-        accpet: 'Accept',
-        accpetBy: 'Accept By',
+        accept: 'Accept',
+        acceptBy: 'Accept By',
         acceptTime: 'Accept Time',
         confirmAccept: 'Confirm Accept?',
-        accpetSuccess: 'Accept successfully',
-        isAccpet: 'Is accept',
+        acceptSuccess: 'Accept successfully',
+        isAccept: 'Is accept',
         deleteADC: 'Confirm to delete this data?',
         batchDelete: 'Confirm to delete this data?',
         agent: 'Built-in & Plug-ins',

diff --git a/cmdb-ui/src/modules/cmdb/lang/zh.js b/cmdb-ui/src/modules/cmdb/lang/zh.js
@@ -366,12 +366,12 @@ const cmdb_zh = {
     ad: {
         upload: '规则导入',
         download: '规则导出',
-        accpet: '入库',
-        accpetBy: '入库人',
+        accept: '入库',
+        acceptBy: '入库人',
         acceptTime: '入库时间',
         confirmAccept: '确认入库？',
-        accpetSuccess: '入库成功',
-        isAccpet: '是否入库',
+        acceptSuccess: '入库成功',
+        isAccept: '是否入库',
         deleteADC: '确认删除该条数据？',
         batchDelete: '确认删除这些数据？',
         agent: '内置 & 插件',

diff --git a/cmdb-ui/src/modules/cmdb/views/discoveryCI/index.vue b/cmdb-ui/src/modules/cmdb/views/discoveryCI/index.vue
@@ -79,7 +79,7 @@
           <vxe-column
             align="center"
             field="is_accept"
-            :title="$t('cmdb.ad.isAccpet')"
+            :title="$t('cmdb.ad.isAccept')"
             v-bind="columns.length ? { width: '100px' } : { minWidth: '100px' }"
             :filters="[
               { label: $t('yes'), value: true },
@@ -92,7 +92,7 @@
           </vxe-column>
           <vxe-column
             field="accept_by"
-            :title="$t('cmdb.ad.accpetBy')"
+            :title="$t('cmdb.ad.acceptBy')"
             v-bind="columns.length ? { width: '80px' } : { minWidth: '80px' }"
             :filters="[]"
           ></vxe-column>
@@ -186,8 +186,8 @@ export default {
         this.clickSidebar(Number(_currentType))
         return
       }
-      if (res && res.length) {
-        this.clickSidebar(res[0].id)
+      if (res && res.length && res[0].ci_types && res[0].ci_types.length) {
+        this.clickSidebar(res[0].ci_types[0].id)
       }
     })
   },
@@ -246,7 +246,7 @@ export default {
         content: that.$t('cmdb.ad.confirmAccept'),
         onOk() {
           updateADCAccept(row.id).then(() => {
-            that.$message.success(that.$t('cmdb.ad.accpetSuccess'))
+            that.$message.success(that.$t('cmdb.ad.acceptSuccess'))
             that.getAdc(false)
           })
         },

diff --git a/cmdb-ui/src/utils/mixin.js b/cmdb-ui/src/utils/mixin.js
@@ -76,7 +76,8 @@ const AppDeviceEnquire = {
 const mixinPermissions = {
   computed: {
     ...mapState({
-      detailPermissions: state => state.user.detailPermissions
+      detailPermissions: state => state.user.detailPermissions,
+      roles: state => state.user.roles
     })
   },
   methods: {
@@ -85,7 +86,7 @@ const mixinPermissions = {
     hasDetailPermission(appName, resourceName, perms = []) {
       const appNamePer = this.detailPermissions[`${appName}`]
       const _findResourcePermissions = appNamePer.find(item => item.name === resourceName)
-      return _findResourcePermissions.permissions.some(item => perms.includes(item))
+      return this.roles?.permissions.includes('acl_admin') || this.roles?.permissions.includes('backend_admin') || _findResourcePermissions?.permissions.some(item => perms.includes(item))
     }
   }
 }

diff --git a/cmdb-ui/vue.config.js b/cmdb-ui/vue.config.js
@@ -18,7 +18,7 @@ module.exports = {
       // TODO 需要增加根据环境不开启主题需求
       new ThemeColorReplacer({
         fileName: 'css/theme-colors-[contenthash:8].css',
-        matchColors: getAntdSerials('#1890ff'), // 主色系列
+        matchColors: getAntdSerials('#2f54eb'), // 主色系列
         // 改变样式选择器，解决样式覆盖问题
         changeSelector(selector) {
           switch (selector) {
@@ -83,11 +83,9 @@ module.exports = {
       less: {
         modifyVars: {
           /* less 变量覆盖，用于自定义 ant design 主题 */
-          /*
-          'primary-color': '#F5222D',
-          'link-color': '#F5222D',
-          'border-radius-base': '4px',
-          */
+          'primary-color': '#2f54eb',
+          // 'link-color': '#F5222D',
+          // 'border-radius-base': '4px',
         },
         javascriptEnabled: true,
       },