fix: SQL变量误报错 #6624

core/backend/src/main/java/io/dataease/controller/datasource/DriverMgmController.java

@@ -34,7 +34,6 @@ public class DriverMgmController {
     @ApiOperation("驱动列表")
     @PostMapping("/list")
     public List<DriverDTO> listDeDriver() throws Exception{
-        checkPermission();
         return driverService.list();
     }
 

core/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java

@@ -333,8 +333,10 @@ public class EsQueryProvider extends QueryProvider {
                 } else if (ObjectUtils.isNotEmpty(y.getExtField()) && y.getExtField() == DeTypeConstants.DE_TIME) {
                     originField = String.format(EsSqlLConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName());
                 } else {
-                    if (y.getDeType() == 2 || y.getDeType() == 3) {
+                    if (y.getDeType() == 2) {
                         originField = String.format(EsSqlLConstants.CAST, String.format(EsSqlLConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName()), "bigint");
+                    } else if (y.getDeType() == 3) {
+                        originField = String.format(EsSqlLConstants.CAST, String.format(EsSqlLConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName()), "float");
                     } else {
                         originField = String.format(EsSqlLConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName());
                     }

core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java

@@ -1118,6 +1118,7 @@ public class DataSetTableService {
     private void handleSelectItems(PlainSelect plainSelect, String dsType) throws Exception {
         List<SelectItem> selectItems = new ArrayList<>();
         for (SelectItem selectItem : plainSelect.getSelectItems()) {
+            try {
                 SelectExpressionItem selectExpressionItem = (SelectExpressionItem) selectItem;
                 if (selectExpressionItem.getExpression() instanceof SubSelect) {
                     SubSelect subSelect = (SubSelect) selectExpressionItem.getExpression();
@@ -1125,6 +1126,8 @@ public class DataSetTableService {
                     subSelect.setSelectBody(select.getSelectBody());
                     ((SelectExpressionItem) selectItem).setExpression(subSelect);
                 }
+            } catch (Exception e) {
+            }
             selectItems.add(selectItem);
         }
         plainSelect.setSelectItems(selectItems);
@@ -1150,6 +1153,7 @@ public class DataSetTableService {
             plainSelect.setFromItem(subSelect);
         }
     }
+
     private void handleJoins(PlainSelect plainSelect, String dsType) throws Exception {
         List<Join> joins = plainSelect.getJoins();
         if (joins != null) {
@@ -1177,6 +1181,7 @@ public class DataSetTableService {
             plainSelect.setJoins(joinsList);
         }
     }
+
     private String handleWhere(PlainSelect plainSelect, Select statementSelect, String dsType) throws Exception {
         Expression expr = plainSelect.getWhere();
         if (expr == null) {
@@ -1227,7 +1232,6 @@ public class DataSetTableService {
     }
 
 
-
     public Map<String, Object> getDBPreview(DataSetTableRequest dataSetTableRequest) throws Exception {
         Datasource ds = datasourceMapper.selectByPrimaryKey(dataSetTableRequest.getDataSourceId());
         if (ds == null) {

core/frontend/src/views/system/datasource/DsConfiguration.vue

@@ -1159,8 +1159,6 @@ export default {
       callback()
     },
       isNumber(rule, value, callback) {
-        console.log(value)
-        console.log(!value)
         if (!value) {
             callback(new Error(i18n.t('datasource.please_input_query_timeout')))
             return
@@ -1168,7 +1166,6 @@ export default {
         let isNumber = false
         var reg = /^\d+$/;
         isNumber =  reg.test(value);
-        console.log(!isNumber)
         if (!isNumber) {
             callback(new Error(i18n.t('datasource.please_input_query_timeout')))
             return

core/frontend/src/views/system/datasource/DsFormContent.vue

@@ -946,7 +946,7 @@ export default {
           this.tData.forEach((item) => {
             if (item.id === this.form.type) {
               item.children.forEach((child) => {
-                if (this.formType === 'modify' && child.id === this.form.id) {
+                if (child.id === this.form.id) {
                   return
                 }
                 const configuration = JSON.parse(child.configuration)