Skip to content

Commit

Permalink
Merge pull request #7275 from yangyy/fix-compapi-deperr
Browse files Browse the repository at this point in the history
fix: 修复依赖包版本问题
  • Loading branch information
ZQHcode authored Jul 31, 2023
2 parents f864b84 + 50fb554 commit f0a28e4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
3 changes: 1 addition & 2 deletions src/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
"@blueking/paas-login": "^0.0.11",
"@blueking/user-selector": "^1.0.6",
"@icon-cool/bk-icon-cmdb-colorful": "0.0.1",
"@vue/composition-api": "^1.6.2",
"await-to-js": "^3.0.0",
"axios": "0.18.0",
"bk-magic-vue": "~2.4.11",
Expand Down Expand Up @@ -103,7 +102,7 @@
"postcss": "^8.2.10",
"postcss-deep-scopable": "0.0.2",
"postcss-loader": "^5.2.0",
"postcss-preset-env": "^7.4.0",
"postcss-preset-env": "7.7.2",
"postcss-scss": "^3.0.5",
"process": "^0.11.10",
"progress-bar-webpack-plugin": "^2.1.0",
Expand Down
7 changes: 2 additions & 5 deletions src/ui/src/views/index/children/full-text-search/use-item.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { computed } from 'vue'
import store from '@/store'
import { t } from '@/i18n'
import routerActions from '@/router/actions'
import { $bkMessage } from '@/magicbox/index.js'
import { $warn } from '@/magicbox/index.js'
import {
MENU_RESOURCE_INSTANCE_DETAILS,
MENU_RESOURCE_BUSINESS_DETAILS,
Expand Down Expand Up @@ -102,10 +102,7 @@ export default function useItem(list) {
const isPauserd = getModelById(source.bk_obj_id).bk_ispaused

if (isPauserd) {
$bkMessage({
message: t('该模型已停用'),
theme: 'warning'
})
$warn(t('该模型已停用'))
return
}

Expand Down

0 comments on commit f0a28e4

Please sign in to comment.