Merge Develop

apps/cloud/vite.config.ts

@@ -126,7 +126,7 @@ export default defineConfig(({ mode }) => {
             {
               name: 'removeAttributesBySelector',
               params: {
-                selector: ":not(path[fill='none'])",
+                selector: ":not(path[fill='none'],rect[fill='none'])",
                 attributes: ['fill'],
               },
             },

apps/daas/src/auto-imports.d.ts

@@ -5,18 +5,10 @@
 // Generated by unplugin-auto-import
 export {}
 declare global {
-  const ElButton: typeof import('element-plus/es')['ElButton']
-  const ElDrawer: typeof import('element-plus/es')['ElDrawer']
-  const ElIconArrowRight: typeof import('@element-plus/icons-vue')['ArrowRight']
   const ElIconCopyDocument: typeof import('@element-plus/icons-vue')['CopyDocument']
   const ElIconRefresh: typeof import('@element-plus/icons-vue')['Refresh']
   const ElIconSearch: typeof import('@element-plus/icons-vue')['Search']
   const ElInput: typeof import('element-plus/es')['ElInput']
-  const ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
   const ElMessage: typeof import('element-plus/es')['ElMessage']
   const ElMessageBox: typeof import('element-plus/es')['ElMessageBox']
-  const ElOption: typeof import('element-plus/es')['ElOption']
-  const ElSelect: typeof import('element-plus/es')['ElSelect']
-  const ElTabs: typeof import('element-plus/es')['ElTabs']
-  const ElTag: typeof import('element-plus/es')['ElTag']
 }

apps/daas/src/components.d.ts

@@ -76,6 +76,7 @@ declare module 'vue' {
     ElTabPane: typeof import('element-plus/es')['ElTabPane']
     ElTabs: typeof import('element-plus/es')['ElTabs']
     ElTag: typeof import('element-plus/es')['ElTag']
+    ElText: typeof import('element-plus/es')['ElText']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
     ElTree: typeof import('element-plus/es')['ElTree']
     ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']

apps/daas/src/layouts/Header.vue

@@ -227,7 +227,8 @@ onMounted(() => {
 
   if (
     import.meta.env.VUE_APP_MODE !== 'community' &&
-    window.getSettingByKey?.('SHOW_LICENSE')
+    window.getSettingByKey?.('SHOW_LICENSE') &&
+    window.getSettingByKey('checkLicense') !== 'false'
   ) {
     getLicense()
   }

apps/daas/vite.config.ts

@@ -77,7 +77,7 @@ export default defineConfig(({ mode }) => {
             {
               name: 'removeAttributesBySelector',
               params: {
-                selector: ":not(path[fill='none'])",
+                selector: ":not(path[fill='none'],rect[fill='none'])",
                 attributes: ['fill'],
               },
             },

package.json

@@ -24,7 +24,7 @@
     "nb": "node scripts/worktree-checkout.js"
   },
   "dependencies": {
-    "element-plus": "^2.9.8",
+    "element-plus": "^2.9.10",
     "lodash-es": "^4.17.21",
     "vue-router": "^4.0.8"
   },
@@ -61,7 +61,7 @@
       "@formily/reactive-vue": "^2.3.0",
       "@formily/shared": "^2.3.0",
       "@formily/vue": "^2.3.0",
-      "element-plus": "^2.9.8",
+      "element-plus": "^2.9.10",
       "vue": "^3.4.29",
       "vue-virtual-scroller": "2.0.0-beta.8"
     },

packages/assets/styles/element.scss

@@ -155,6 +155,13 @@
 }
 
 // Radio
+.el-radio-group.has-space {
+  gap: 1rem;
+  .el-radio-button__inner {
+    border-left: var(--el-border);
+    border-radius: var(--el-border-radius-base);
+  }
+}
 .el-radio-group.button-style-outline {
   .el-radio-button {
     --el-radio-button-checked-bg-color: #fff;
@@ -454,6 +461,12 @@
 
 // Alert
 .el-alert {
+  &.fit-content {
+    .el-alert__content {
+      flex: 1;
+      min-width: 0;
+    }
+  }
   &--info.is-light {
     --el-alert-bg-color: var(--info-fill);
     --el-color-info: var(--el-text-color-title);

packages/assets/styles/utilities.scss

@@ -12557,4 +12557,18 @@
 
 .-z-10 {
   z-index: -10;
-}
+}
+
+.bg-gray-50 {
+  background-color: rgb(249 250 251);
+}
+
+.bg-gray-100 {
+  background-color: rgb(243 244 246);
+}
+
+.bg-gray-200 {
+  background-color: rgb(229 231 235);
+}
+
+

packages/business/package.json

@@ -21,6 +21,7 @@
     "lodash": "^4.17.15",
     "qs": "^6.11.0",
     "tiny-emitter": "^2.1.0",
+    "vue": "^3.0.0",
     "vue-json-viewer": "^2.2.15",
     "vue-virtual-scroller": "2.0.0-beta.8",
     "vuex": "^4.0.2"

packages/business/src/components/create-connection/SceneDialog.vue

@@ -80,7 +80,7 @@ export default {
             'Clickhouse',
             'Elasticsearch',
             'Dummy',
-            'Kafka',
+            'Kafka-Enhanced',
             'Doris',
             'BigQuery',
           ],
@@ -178,7 +178,9 @@ export default {
           'packages_business_create_connection_elasticsearch_desc',
         ),
         Dummy: i18n.t('packages_business_create_connection_dummy_desc'),
-        Kafka: i18n.t('packages_business_create_connection_kafka_desc'),
+        'Kafka-Enhanced': i18n.t(
+          'packages_business_create_connection_kafka_desc',
+        ),
         Doris: i18n.t('packages_business_create_connection_doris_desc'),
         'MongoDB Atlas': i18n.t(
           'packages_business_create_connection_mongodbatlas_desc',

packages/business/src/components/logs/NodeLog.vue

@@ -1049,8 +1049,10 @@ Stack Trace: ${this.codeDialog.data.errorStack ? `\n${this.codeDialog.data.error
           }}</ElCheckbox
         >
 
-        <span
-          class="color-primary cursor-pointer ml-auto"
+        <el-button
+          text
+          type="primary"
+          class="ml-auto"
           @click="handleFullScreen"
         >
           <VIcon class="mr-1">{{ fullscreen ? 'suoxiao' : 'fangda' }}</VIcon>
@@ -1059,7 +1061,7 @@ Stack Trace: ${this.codeDialog.data.errorStack ? `\n${this.codeDialog.data.error
               ? $t('packages_form_js_editor_exit_fullscreen')
               : $t('packages_form_js_editor_fullscreen')
           }}</span>
-        </span>
+        </el-button>
       </div>
       <div
         v-loading="loading"

packages/business/src/locale/lang/en.js

@@ -1592,4 +1592,10 @@ export default {
   packages_business_checkTableThreadNum: 'Thread Validation',
   packages_business_checkTableThreadNum_tip:
     'Number of threads to use. Default is 10. Can be increased if system resources permit.',
+  packages_business_verification_empty_add_table:
+    'No validation table configuration, please add tables',
+  packages_business_verification_empty_auto_add_table:
+    'No validation table configuration, please automatically add tables',
+  packages_business_verification_empty_chooseJob:
+    'No validation table configuration, please select a task',
 }

packages/business/src/locale/lang/zh-CN.js

@@ -1418,4 +1418,8 @@ export default {
   packages_business_checkTableThreadNum: '校验线程数量',
   packages_business_checkTableThreadNum_tip:
     '校验线程数量，在资源充足的情况下可进行调整，默认线程数为 10',
+  packages_business_verification_empty_chooseJob: '暂无校验表配置，请选择任务',
+  packages_business_verification_empty_add_table: '暂无校验表配置，请添加表',
+  packages_business_verification_empty_auto_add_table:
+    '暂无校验表配置，请自动添加表',
 }

packages/business/src/locale/lang/zh-TW.js

@@ -1405,4 +1405,8 @@ export default {
   packages_business_checkTableThreadNum: '校驗線程數量',
   packages_business_checkTableThreadNum_tip:
     '校驗線程數量，在資源充足的情況下可進行調整，默認線程數為 10',
+  packages_business_verification_empty_add_table: '暫無校驗表配置，請添加表',
+  packages_business_verification_empty_auto_add_table:
+    '暫無校驗表配置，請自動添加表',
+  packages_business_verification_empty_chooseJob: '暫無校驗表配置，請選擇任務',
 }