Merge 469a229bb9 into 320fcf04bd

headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/DimValueAspect.java

@@ -102,7 +102,7 @@ public class DimValueAspect {
                 continue;
             }
             for (DimensionResp dimension : dimensions) {
-                if (!expression.getFieldName().equals(dimension.getName())
+                if (!expression.getFieldName().equals(dimension.getBizName())
                         || CollectionUtils.isEmpty(dimension.getDimValueMaps())) {
                     continue;
                 }
@@ -124,6 +124,7 @@ public class DimValueAspect {
         sql = SqlReplaceHelper.replaceValue(sql, filedNameToValueMap);
         log.debug("correctorSql after replacing:{}", sql);
         querySqlReq.setSql(sql);
+        querySqlReq.getSqlInfo().setQuerySQL(sql);
         Map<String, Map<String, String>> techNameToBizName = getTechNameToBizName(dimensions);
 
         SemanticQueryResp queryResultWithColumns = (SemanticQueryResp) joinPoint.proceed();

headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DataSetSchemaBuilder.java

@@ -19,9 +19,10 @@ public class DataSetSchemaBuilder {
     public static DataSetSchema build(DataSetSchemaResp resp) {
         DataSetSchema dataSetSchema = new DataSetSchema();
         dataSetSchema.setQueryConfig(resp.getQueryConfig());
-        SchemaElement dataSet = SchemaElement.builder().dataSetId(resp.getId())
-                .dataSetName(resp.getName()).id(resp.getId()).name(resp.getName())
-                .bizName(resp.getBizName()).type(SchemaElementType.DATASET).build();
+        SchemaElement dataSet =
+                SchemaElement.builder().dataSetId(resp.getId()).dataSetName(resp.getName())
+                        .id(resp.getId()).name(resp.getName()).description(resp.getDescription())
+                        .bizName(resp.getBizName()).type(SchemaElementType.DATASET).build();
         dataSetSchema.setDataSet(dataSet);
         dataSetSchema.setDatabaseType(resp.getDatabaseType());
         dataSetSchema.setDatabaseVersion(resp.getDatabaseVersion());

headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DictUtils.java

@@ -274,6 +274,8 @@ public class DictUtils {
     private QuerySqlReq constructQuerySqlReq(DictItemResp dictItemResp) {
 
         ModelResp model = modelService.getModel(dictItemResp.getModelId());
+        String tableStr = model.getModelDetail().getTableQuery() != null ? model.getModelDetail().getTableQuery()
+                : "(" + model.getModelDetail().getSqlQuery() + ")";
         String sqlPattern =
                 "select %s,count(1) from %s %s group by %s order by count(1) desc limit %d";
         String dimBizName = dictItemResp.getBizName();
@@ -288,7 +290,7 @@ public class DictUtils {
         }
 
         String sql =
-                String.format(sqlPattern, dimBizName, model.getBizName(), where, dimBizName, limit);
+                String.format(sqlPattern, dimBizName, tableStr, where, dimBizName, limit);
         Set<Long> modelIds = new HashSet<>();
         modelIds.add(dictItemResp.getModelId());
         QuerySqlReq querySqlReq = new QuerySqlReq();

webapp/packages/chat-sdk/src/components/ChatMsg/Table/index.tsx

@@ -24,7 +24,6 @@ const Table: React.FC<Props> = ({ data, size, loading, question, onApplyAuth })
         dataIndex: bizName,
         key: bizName,
         title: name || bizName,
-        defaultSortOrder: 'descend',
         sorter:
           showType === 'NUMBER'
             ? (a, b) => {
@@ -73,10 +72,11 @@ const Table: React.FC<Props> = ({ data, size, loading, question, onApplyAuth })
     return index % 2 !== 0 ? `${prefixCls}-even-row` : '';
   };
 
-  const dateColumn = queryColumns.find(column => column.type === 'DATE');
+  const dateColumn = queryColumns.find(column => column.type === 'DATE' || column.showType === 'DATE');
   const dataSource = dateColumn
     ? queryResults.sort((a, b) => moment(a[dateColumn.bizName]).diff(moment(b[dateColumn.bizName])))
     : queryResults;
+
   return (
     <div className={prefixCls}>
       {question && (