Merge pull request #1024 from TencentBlueKing/develop

v1.1.0 merge develop to master
TencentBlueKing · Jul 4, 2023 · 38ca704 · 38ca704
2 parents 37b7587 + 14deaa1
commit 38ca704
Show file tree

Hide file tree

Showing 1,142 changed files with 51,285 additions and 11,992 deletions.
diff --git a/.bk.env b/.bk.env
@@ -6,3 +6,5 @@ BK_APP_PORT = 5000
 // 接口路径地址
 BK_AJAX_URL_PREFIX = '/api'
 
+// default为社区版， ieod为内部版
+BK_ENGINE_REGION = default
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -42,6 +42,7 @@ module.exports = {
     },
     // add your custom rules hered
     rules: {
+        'standard/no-callback-literal': 0,
         '@typescript-eslint/adjacent-overload-signatures': 'error',
         /**
          * 类的只读属性若是一个字面量，则必须使用只读属性而不是 getter

diff --git a/bk.config.js b/bk.config.js
@@ -11,6 +11,7 @@ module.exports = {
     publicPath: process.env.BK_STATIC_URL,
     typescript: true,
     bundleAnalysis: false,
+    parseNodeModules: false,
     replaceStatic: true,
     parallel: 8,
     copy: {
@@ -40,7 +41,8 @@ module.exports = {
             resolve: {
                 alias: {
                     '@': path.resolve(__dirname, './lib/client/src'),
-                    'shared': path.resolve(__dirname, './lib/shared')
+                    'shared': path.resolve(__dirname, './lib/shared'),
+                    VueI18n: path.resolve(__dirname, './node_modules/vue-i18n')
                 },
                 fallback: {
                     buffer: require.resolve('buffer')
@@ -73,21 +75,49 @@ module.exports = {
                         toast: {
                             name: 'toast-ui',
                             test: /toast-ui/,
-                            priority: 20,
+                            priority: 1,
                             chunks: 'all',
                             reuseExistingChunk: true
                         },
                         element: {
                             name: 'element-ui',
                             test: /element-ui/,
-                            priority: 30,
+                            priority: 1,
                             chunks: 'all',
                             reuseExistingChunk: true
                         },
-                        third: {
+                        echartsMavonVant: {
                             name: 'echarts-mavon-vant',
                             test: /(echarts)|(mavon-editor)|(vant)/,
-                            priority: 40,
+                            priority: 1,
+                            chunks: 'all',
+                            reuseExistingChunk: true
+                        },
+                        render: {
+                            name: 'bk-lesscode-render',
+                            test: /bk-lesscode-render/,
+                            priority: 1,
+                            chunks: 'all',
+                            reuseExistingChunk: true
+                        },
+                        sqlParser: {
+                            name: 'node-sql-parser',
+                            test: /node-sql-parser/,
+                            priority: 1,
+                            chunks: 'all',
+                            reuseExistingChunk: true
+                        },
+                        blueking: {
+                            name: 'blueking',
+                            test: /@blueking/,
+                            priority: 1,
+                            chunks: 'all',
+                            reuseExistingChunk: true
+                        },
+                        xlsxTypeormMoment: {
+                            name: 'xlsx-typeorm-moment',
+                            test: /(xlsx)|(typeorm)|(moment)/,
+                            priority: 1,
                             chunks: 'all',
                             reuseExistingChunk: true
                         }

diff --git a/lib/client/preview.html b/lib/client/preview.html
@@ -12,8 +12,8 @@
 <!DOCTYPE html>
 <html>
     <head>
-        <link rel="icon" href="<%= process.env.BK_STATIC_URL %>/images/logo.png" type="image/x-icon" />
-        <link rel="shortcut icon" href="<%= process.env.BK_STATIC_URL %>/images/logo.png" type="image/x-icon" />
+        <link rel="icon" href="<%= process.env.BK_STATIC_URL %>/static/images/logo.png" type="image/x-icon" />
+        <link rel="shortcut icon" href="<%= process.env.BK_STATIC_URL %>/static/images/logo.png" type="image/x-icon" />
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <title>可视化开发平台 | 腾讯蓝鲸智云</title>
@@ -96,14 +96,15 @@
                 }
             }
             .preview-tip {
+                display: none;
                 position: fixed;
-                top: 7px;
+                top: 11px;
                 right: -29px;
                 transform: rotate(45deg);
                 font-size: 12px;
                 line-height: 13px;
                 padding: 6px 0;
-                width: 110px;
+                width: 120px;
                 text-align: center;
                 background: rgba(239, 184, 61, 0.8);
                 color: #000000;
@@ -115,7 +116,7 @@
     <body>
         <div id="preview-app">
             <div class="bk-loading">
-                <div class="bk-loading-wrapper">
+                <div class="bk-loading-wrapper">  
                     <div class="bk-loading1 bk-colorful bk-size-large">
                         <div class="point point1"></div>
                         <div class="point point2"></div>
@@ -125,7 +126,7 @@
                 </div>
             </div>
         </div>
-        <div class="preview-tip">未发布<br>请勿分享</div>
+        <div id="preview-tip" class="preview-tip"></div>
         <script>
             var BK_STATIC_URL = '<%= process.env.BK_STATIC_URL %>'
             var BKPAAS_ENVIRONMENT = '<%= process.env.BK_PAAS_ENVIRONMENT %>'

diff --git a/lib/client/src/App.vue b/lib/client/src/App.vue
@@ -162,6 +162,11 @@
         font-family: -apple-system, BlinkMacSystemFont, PingFang SC, Microsoft YaHei, Helvetica Neue, Arial;
     }
 
+    input::-webkit-input-placeholder {
+        /* placeholder字体大小 */
+        font-size: 12px;
+    }
+
     .dialog-footer {
         button + button {
             margin-left: 6px;
@@ -233,4 +238,10 @@
         width:6px;
         height:6px;
     }
+
+    .header-small-padding-dialog {
+        .bk-dialog-header {
+            padding-bottom: 6px;
+        }
+    }
 </style>
diff --git a/lib/client/src/bk-icon/fonts/iconcool.eot b/lib/client/src/bk-icon/fonts/iconcool.eot