Skip to content

Commit

Permalink
Merge pull request #2627 from hLinx/hotfix_master
Browse files Browse the repository at this point in the history 
Hotfix master
  • Loading branch information
@hLinx
hLinx authored Nov 22, 2023
2 parents 5320085 + 03b1b6e commit db8e5af
Show file tree
Hide file tree
Showing 2 changed files with 68 additions and 56 deletions.
100 changes: 50 additions & 50 deletions src/frontend/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,27 +14,27 @@
"keywords": [],
"license": "ISC",
"dependencies": {
"@blueking/ip-selector": "0.0.1-beta.138",
"@blueking/ip-selector": "0.2.0-beta",
"@blueking/paas-login": "0.0.11",
"@blueking/user-selector": "1.0.7",
"@blueking/user-selector": "1.0.11",
"@vue/babel-preset-jsx": "1.4.0",
"@vue/composition-api": "1.5.0",
"ace-builds": "1.23.4",
"axios": "1.4.0",
"@vue/composition-api": "1.7.2",
"ace-builds": "1.31.2",
"axios": "1.6.2",
"bk-magic-vue": "2.5.8-beta.6",
"core-js": "3.31.1",
"core-js": "3.33.2",
"cron-parser-custom": "2.13.0",
"diff": "5.0.0",
"diff2html": "3.4.4",
"echarts": "5.4.2",
"highlight.js": "11.4.0",
"html2canvas": "1.4.0",
"js-base64": "3.6.1",
"js-cookie": "3.0.1",
"diff": "5.1.0",
"diff2html": "3.4.45",
"echarts": "5.4.3",
"highlight.js": "11.9.0",
"html2canvas": "1.4.1",
"js-base64": "3.7.5",
"js-cookie": "3.0.5",
"lodash": "4.17.21",
"marked": "5.1.1",
"marked-gfm-heading-id": "3.0.4",
"marked-mangle": "1.1.0",
"marked-gfm-heading-id": "3.1.1",
"marked-mangle": "1.1.5",
"tippy.js": "6.3.7",
"vue": "2.7.8",
"vue-content-loader": "0.2.2",
Expand All @@ -46,74 +46,74 @@
"xss": "1.0.14"
},
"devDependencies": {
"@babel/core": "7.22.9",
"@babel/eslint-parser": "7.16.3",
"@babel/plugin-proposal-class-properties": "7.16.7",
"@babel/plugin-proposal-export-namespace-from": "7.16.7",
"@babel/core": "7.23.3",
"@babel/eslint-parser": "7.23.3",
"@babel/plugin-proposal-class-properties": "7.18.6",
"@babel/plugin-proposal-export-namespace-from": "7.18.9",
"@babel/plugin-syntax-dynamic-import": "7.8.3",
"@babel/plugin-syntax-jsx": "7.12.13",
"@babel/plugin-transform-modules-commonjs": "7.22.5",
"@babel/plugin-transform-runtime": "7.13.15",
"@babel/preset-env": "7.13.15",
"@babel/plugin-syntax-jsx": "7.23.3",
"@babel/plugin-transform-modules-commonjs": "7.23.3",
"@babel/plugin-transform-runtime": "7.23.3",
"@babel/preset-env": "7.23.3",
"@vue/babel-helper-vue-jsx-merge-props": "1.4.0",
"@vue/babel-plugin-transform-vue-jsx": "1.4.0",
"@vue/babel-sugar-inject-h": "1.4.0",
"@vue/eslint-config-standard": "8.0.1",
"ajv": "8.12.0",
"babel-loader": "9.1.3",
"babel-plugin-import-bk-magic-vue": "2.1.10",
"babel-plugin-import-bk-magic-vue": "2.1.11",
"babel-plugin-lodash": "3.3.4",
"copy-webpack-plugin": "11.0.0",
"css-loader": "6.5.1",
"css-loader": "6.8.1",
"css-minimizer-webpack-plugin": "5.0.1",
"dotenv": "16.0.0",
"eslint": "8.14.0",
"eslint-config-standard": "17.0.0",
"dotenv": "16.3.1",
"eslint": "8.53.0",
"eslint-config-standard": "17.1.0",
"eslint-config-tencent": "1.0.4",
"eslint-plugin-html": "7.1.0",
"eslint-plugin-import": "2.25.4",
"eslint-plugin-n": "16.0.1",
"eslint-plugin-import": "2.29.0",
"eslint-plugin-n": "16.3.1",
"eslint-plugin-node": "11.1.0",
"eslint-plugin-promise": "6.0.0",
"eslint-plugin-promise": "6.1.1",
"eslint-plugin-simple-import-sort": "10.0.0",
"eslint-plugin-vue": "9.15.1",
"eslint-plugin-vue": "9.18.1",
"eslint-webpack-plugin": "4.0.1",
"figlet": "1.5.0",
"html-loader": "4.1.0",
"html-webpack-plugin": "5.5.0",
"figlet": "1.7.0",
"html-loader": "4.2.0",
"html-webpack-plugin": "5.5.3",
"lodash-webpack-plugin": "0.11.6",
"markdown-loader": "8.0.0",
"mini-css-extract-plugin": "2.6.0",
"mini-css-extract-plugin": "2.7.6",
"node-xlsx": "0.23.0",
"postcss": "8.4.13",
"postcss": "8.4.31",
"postcss-advanced-variables": "~3.0.0",
"postcss-atroot": "0.2.3",
"postcss-atroot": "0.2.4",
"postcss-extend-rule": "4.0.0",
"postcss-html": "1.2.0",
"postcss-import": "15.0.0",
"postcss-html": "1.5.0",
"postcss-import": "15.1.0",
"postcss-import-webpack-resolver": "~1.0.1",
"postcss-loader": "7.0.1",
"postcss-mixins": "9.0.2",
"postcss-loader": "7.3.3",
"postcss-mixins": "9.0.4",
"postcss-nested": "6.0.1",
"postcss-preset-env": "9.0.0",
"postcss-preset-env": "9.3.0",
"postcss-property-lookup": "3.0.0",
"postcss-syntax": "0.36.2",
"postcss-url": "10.1.3",
"speed-measure-webpack-plugin": "1.5.0",
"style-loader": "3.3.1",
"stylelint": "15.10.2",
"style-loader": "3.3.3",
"stylelint": "15.11.0",
"stylelint-config-standard": "34.0.0",
"stylelint-order": "6.0.3",
"stylelint-scss": "5.0.1",
"stylelint-scss": "5.3.1",
"stylelint-webpack-plugin": "4.1.1",
"terser-webpack-plugin": "5.2.5",
"terser-webpack-plugin": "5.3.9",
"thread-loader": "4.0.2",
"vue-loader": "15.10.0",
"vue-style-loader": "4.1.3",
"webpack": "5.88.2",
"webpack": "5.89.0",
"webpack-cli": "5.1.4",
"webpack-dev-server": "4.9.0",
"webpack-merge": "5.2.0"
"webpack-dev-server": "4.15.1",
"webpack-merge": "5.10.0"
},
"engines": {
"node": ">= 16.6.0",
Expand Down
24 changes: 18 additions & 6 deletions src/frontend/src/views/executive-history/step-detail/components/ip-list/index-new.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@
import _ from 'lodash';
import {
computed,
onBeforeUnmount,
onMounted,
reactive,
ref,
Expand Down Expand Up @@ -278,14 +279,13 @@
});
const tableMaxHeight = ref(0);
const selectRowKey = ref('');
const windowInnerWidth = ref(window.innerWidth);
const positionLeftOffset = ref(0);
const styles = computed(() => {
if (!listRef.value) {
return {};
}
const { left } = listRef.value.getBoundingClientRect();
const windowInnerWidth = window.innerWidth;
const maxWidth = windowInnerWidth - left - 800 - 24;
const rightLogWidth = 800;
const paddingLeft = 24;
const maxWidth = windowInnerWidth.value - positionLeftOffset.value - rightLogWidth - paddingLeft;
const allShowColumnMap = makeMap(allShowColumn.value);
const allShowColumnWidth = columnList.value.reduce((result, item) => {
if (allShowColumnMap[item.name]) {
Expand Down Expand Up @@ -315,6 +315,9 @@
};
watch(() => props.data, () => {
if (listRef.value) {
positionLeftOffset.value = listRef.value.getBoundingClientRect().left;
}
// 切换分组时最新的分组数据一定来自API返回数据
// listLoading为false说明是本地切换不更新列表
if (!props.listLoading) {
Expand Down Expand Up @@ -435,9 +438,18 @@
emits('on-clear-search');
};
const handleWindowResize = _.throttle(() => {
windowInnerWidth.value = window.innerWidth;
}, 60);
onMounted(() => {
calcPageSize();
tableMaxHeight.value = listRef.value.getBoundingClientRect().height;
window.addEventListener('resize', handleWindowResize);
onBeforeUnmount(() => {
window.removeEventListener('resize', handleWindowResize);
});
});
</script>
<style lang='postcss'>
Expand Down

0 comments on commit db8e5af

Please sign in to comment.