Merge pull request #11326 from lockiechen/vol_fix

feat: 漏洞处理 #11251
TencentBlueKing · Dec 18, 2024 · 798d794 · 798d794
2 parents ce4ae7c + 81162d1
commit 798d794
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/src/frontend/devops-pipeline/src/components/AtomPropertyPanel/AtomContent.vue b/src/frontend/devops-pipeline/src/components/AtomPropertyPanel/AtomContent.vue
@@ -185,6 +185,7 @@
                         :atom-props-model="atom.atomModal.props"
                         :set-parent-validate="setAtomValidate"
                         :disabled="!editable"
+                        :is-instance-template="isInstanceTemplate"
                         class="atom-content"
                     >
                     </div>
@@ -253,6 +254,7 @@
     import CodePullGitX from './CodePullGitX'
     import CodePullSvn from './CodePullSvn'
     import CodeSvnWebHookTrigger from './CodeSvnWebHookTrigger'
+    import CodeWebHookTrigger from './CodeWebHookTrigger'
     import CrossDistribute from './CrossDistribute'
     import FormField from './FormField'
     import IosCertInstall from './IosCertInstall'
@@ -268,7 +270,6 @@
     import SubPipelineCall from './SubPipelineCall'
     import TimerTrigger from './TimerTrigger'
     import Unity3dBuild from './Unity3dBuild'
-    import CodeWebHookTrigger from './CodeWebHookTrigger'
 
     export default {
         name: 'atom-content',

diff --git a/src/frontend/devops-pipeline/src/components/AtomPropertyPanel/RemoteAtom.vue b/src/frontend/devops-pipeline/src/components/AtomPropertyPanel/RemoteAtom.vue
@@ -21,8 +21,8 @@
 
 <script>
     import { mapActions } from 'vuex'
-    import atomMixin from './atomMixin'
     import validMixins from '../validMixins'
+    import atomMixin from './atomMixin'
     import AtomOutput from './AtomOutput'
     export default {
         name: 'remote-atom',
@@ -31,7 +31,8 @@
         },
         mixins: [atomMixin, validMixins],
         props: {
-            atom: Object
+            atom: Object,
+            isInstanceTemplate: Boolean
         },
         data () {
             return {
@@ -83,6 +84,7 @@
                     currentUserInfo,
                     envConf,
                     atomDisabled,
+                    isInstanceTemplate: this.isInstanceTemplate,
                     hostInfo: {
                         ...this.$route.params
                     },

diff --git a/src/frontend/webpack.base.js b/src/frontend/webpack.base.js
@@ -122,10 +122,13 @@ module.exports = ({ entry, publicPath, dist, port = 8080, argv, env }) => {
             minimize: !isDev,
             splitChunks: {
                 cacheGroups: {
-                    vendor: {
-                        test: /[\\/]node_modules[\\/]/, // 指定要单独打包的依赖
-                        name: 'vendors', // chunk 的名字
-                        chunks: 'all' // 可能的值 'async', 'initial', 'all'
+                    bkMagicVue: {
+                        test: module => {
+                            return /bk-magic-vue/.test(module.context)
+                        },
+                        name: 'bk-magic-vue-chunk', // chunk 的名字
+                        chunks: 'all', // 可能的值 'async', 'initial', 'all',
+                        reuseExistingChunk: true
                     },
                     default: {
                         minChunks: 2,