[Core] [Dataset] Fix build data set does not carry query SQL issue (#824)

Author: qianmoQ

core/datacap-server/pom.xml

@@ -40,6 +40,12 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-log4j2</artifactId>
             <version>${springboot.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>log4j-slf4j-impl</artifactId>
+                    <groupId>org.apache.logging.log4j</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>redis.clients</groupId>

core/datacap-service/src/main/java/io/edurt/datacap/service/service/impl/DataSetServiceImpl.java

@@ -257,6 +257,7 @@ public CommonResponse<Object> adhoc(String code, Adhoc configure)
                     targetConfigure.setUsername(Optional.ofNullable(initializerConfigure.getDataSetConfigure().getUsername()));
                     targetConfigure.setPassword(Optional.ofNullable(initializerConfigure.getDataSetConfigure().getPassword()));
                     targetConfigure.setDatabase(Optional.ofNullable(database));
+                    targetConfigure.setInjector(injector);
                     plugin.connect(targetConfigure);
                     Response response = plugin.execute(sql);
                     response.setContent(sql);
@@ -337,6 +338,7 @@ private Configure getConfigure(String database)
         targetConfigure.setUsername(Optional.ofNullable(initializerConfigure.getDataSetConfigure().getUsername()));
         targetConfigure.setPassword(Optional.ofNullable(initializerConfigure.getDataSetConfigure().getPassword()));
         targetConfigure.setDatabase(Optional.ofNullable(database));
+        targetConfigure.setInjector(injector);
         return targetConfigure;
     }
 
@@ -551,7 +553,7 @@ private void syncData(DataSetEntity entity, ExecutorService service)
         try {
             SourceEntity source = entity.getSource();
             Optional<Plugin> pluginOptional = PluginUtils.getPluginByNameAndType(injector, source.getType(), source.getProtocol());
-            if (!pluginOptional.isPresent()) {
+            if (pluginOptional.isEmpty()) {
                 throw new IllegalArgumentException(String.format("Plugin [ %s ] not found", initializerConfigure.getDataSetConfigure().getType()));
             }
 
@@ -575,8 +577,10 @@ private void syncData(DataSetEntity entity, ExecutorService service)
             Properties inputProperties = ConfigureUtils.convertProperties(source, environment,
                     IConfigurePipelineType.INPUT, entity.getExecutor(), entity.getQuery(), inputFieldBody);
             Set<String> inputOptions = ConfigureUtils.convertOptions(source, environment, entity.getExecutor(), IConfigurePipelineType.INPUT);
+            Configure inputConfigure = source.toConfigure();
+            inputConfigure.setInjector(injector);
             ExecutorConfigure input = new ExecutorConfigure(source.getType(), inputProperties, inputOptions, RunProtocol.valueOf(source.getProtocol()),
-                    inputPlugin, entity.getQuery(), database, entity.getTableName(), source.toConfigure(), originColumns);
+                    inputPlugin, entity.getQuery(), database, entity.getTableName(), inputConfigure, originColumns);
 
             Plugin outputPlugin = PluginUtils.getPluginByNameAndType(injector, initializerConfigure.getDataSetConfigure().getType(), PluginType.JDBC.name()).orElseGet(null);
             SourceEntity outputSource = new SourceEntity();
@@ -776,7 +780,7 @@ private Set<CreatedModel> createdModeProcess(Set<DataSetColumnEntity> targetColu
                 Optional<DataSetColumnEntity> filterColumn = targetColumns.stream()
                         .filter(item -> item.getId().equals(sourceColumn.getId()))
                         .findFirst();
-                if (!filterColumn.isPresent()) {
+                if (filterColumn.isEmpty()) {
                     models.add(new CreatedModel(sourceColumn, CreatedMode.CREATE_COLUMN));
                 }
                 else {
@@ -816,7 +820,9 @@ private boolean checkTableExists(DataSetEntity entity)
         try {
             Plugin plugin = getOutputPlugin();
             SourceEntity source = getOutputSource();
-            plugin.connect(source.toConfigure());
+            Configure configure = source.toConfigure();
+            configure.setInjector(injector);
+            plugin.connect(configure);
             String sql = String.format("SHOW CREATE TABLE `%s`.`%s`", initializerConfigure.getDataSetConfigure().getDatabase(), entity.getTableName());
             log.info("Check table exists for dataset [ {} ] id [ {} ] sql \n {}", entity.getName(), entity.getId(), sql);
             Response response = plugin.execute(sql);

core/datacap-ui/src/views/pages/admin/dataset/DatasetInfo.vue

@@ -59,7 +59,8 @@
                       <div>{{ $t('dataset.common.columnLength') }}</div>
                       <div>{{ $t('common.action') }}</div>
                     </div>
-                    <div class="grid gap-3 md:grid-cols-2 md:gap-3 lg:grid-cols-12 h-[480px] overflow-y-auto pt-2 pb-2">
+                    <div class="grid gap-3 md:grid-cols-2 md:gap-3 lg:grid-cols-12 overflow-y-auto pt-2 pb-2"
+                         :style="{ height: 'calc(100vh - 360px)' }">
                       <template v-for="(item, index) in formState.columns" :key="index">
                         <div>
                           <Input v-model="item.name" type="text"/>
@@ -339,6 +340,7 @@ export default defineComponent({
   {
     const i18n = useI18n()
     const gridOptions = GridOptions.createDefaultOptions(i18n)
+
     return {
       i18n,
       gridOptions
@@ -394,6 +396,7 @@ export default defineComponent({
                      })
         const code = this.$route.params.code
         const sourceCode = this.$route.params.sourceCode
+
         if (code) {
           this.loading = true
           this.code = code as string
@@ -414,6 +417,7 @@ export default defineComponent({
                .finally(() => this.loading = false)
         }
         else if (sourceCode) {
+          this.value = localStorage.getItem('QueryContent') as string
           this.loading = true
           SourceService.getByCode(sourceCode as string)
                        .then(response => {

core/datacap-ui/src/views/pages/admin/dataset/DatasetRebuild.vue

@@ -8,7 +8,7 @@
           </AlertDialogTitle>
         </AlertDialogHeader>
         <Alert>
-          <AlertTitle>{{ $t('dataset.common.rebuildProgress') }}</AlertTitle>
+          <AlertTitle>{{ $t('dataset.tip.rebuildProgress') }}</AlertTitle>
         </Alert>
         <AlertDialogFooter class="-mb-4 border-t pt-2">
           <Button :disabled="loading" @click="handlerRebuild">

core/datacap-ui/src/views/pages/admin/query/QueryHome.vue

@@ -315,12 +315,7 @@ export default defineComponent({
         // The configuration editor selects content events
         editor.selection.on('changeSelection', () => {
           const selection = editor.getSelection()
-          if (selection.isEmpty()) {
-            this.selectEditor.isSelection = false
-          }
-          else {
-            this.selectEditor.isSelection = true
-          }
+          this.selectEditor.isSelection = !selection.isEmpty()
         })
 
         langTools.addCompleter({
@@ -476,6 +471,7 @@ export default defineComponent({
                           }
                           this.responseConfigure.gridConfigure = tConfigure
                           editorInstance.instance?.setValue(response.data.content)
+                          localStorage.setItem('QueryContent', content as string)
                         }
                       }
                       else {