Merge 0d8ee40d6e into 8eeed87bac

chat/server/src/main/java/com/tencent/supersonic/chat/server/processor/execute/DataInterpretProcessor.java

@@ -46,8 +46,7 @@ public class DataInterpretProcessor implements ExecuteResultProcessor {
     public boolean accept(ExecuteContext executeContext) {
         Agent agent = executeContext.getAgent();
         ChatApp chatApp = agent.getChatAppConfig().get(APP_KEY);
-        return Objects.nonNull(chatApp) && chatApp.isEnable()&&
-                StringUtils.isNotBlank(executeContext.getResponse().getTextResult()); //  如果都没结果，则无法处理，直接跳过
+        return Objects.nonNull(chatApp) && chatApp.isEnable();
     }
 
     @Override

headless/chat/src/main/java/com/tencent/supersonic/headless/chat/knowledge/helper/NatureHelper.java

@@ -179,15 +179,13 @@ public class NatureHelper {
     }
 
     public static Long parseIdFromNature(String nature, int index) {
-        if(nature.startsWith("_")){ // 框架的字典都是以_开头的
-            try {
-                String[] split = nature.split(DictWordType.NATURE_SPILT);
-                if (split.length > index) {
-                    return Long.valueOf(split[index]);
-                }
-            } catch (NumberFormatException e) {
-                log.error("Error parsing long from nature: {}", nature, e);
+        try {
+            String[] split = nature.split(DictWordType.NATURE_SPILT);
+            if (split.length > index) {
+                return Long.valueOf(split[index]);
             }
+        } catch (NumberFormatException e) {
+            log.error("Error parsing long from nature: {}", nature, e);
         }
         return null;
     }

webapp/packages/chat-sdk/src/components/ChatItem/index.tsx

@@ -102,6 +102,7 @@ const ChatItem: React.FC<Props> = ({
     {}
   );
   const [isParserError, setIsParseError] = useState<boolean>(false);
+
   const resetState = () => {
     setParseLoading(false);
     setParseTimeCost(undefined);
@@ -440,8 +441,6 @@ const ChatItem: React.FC<Props> = ({
 
   const { register, call } = useMethodRegister(() => message.error('该条消息暂不支持该操作'));
 
-  let actualQueryText=parseInfo?.properties.CONTEXT.queryText // lance修改 结果显示多轮对话转义的内容
-  actualQueryText=actualQueryText==null?msg:actualQueryText
   return (
     <ChartItemContext.Provider value={{ register, call }}>
       <div className={prefixCls}>
@@ -510,7 +509,7 @@ const ChatItem: React.FC<Props> = ({
                       <SqlItem
                         agentId={agentId}
                         queryId={parseInfo.queryId}
-                        question={actualQueryText}
+                        question={msg}
                         llmReq={llmReq}
                         llmResp={llmResp}
                         integrateSystem={integrateSystem}
@@ -523,7 +522,7 @@ const ChatItem: React.FC<Props> = ({
                   <ExecuteItem
                     isSimpleMode={isSimpleMode}
                     queryId={parseInfo?.queryId}
-                    question={actualQueryText}
+                    question={msg}
                     queryMode={parseInfo?.queryMode}
                     executeLoading={executeLoading}
                     executeTip={executeTip}

webapp/packages/chat-sdk/src/components/ChatMsg/Table/style.less

@@ -82,11 +82,7 @@
     background-color: #fafafa !important;
   }
 
-  .ant-table-cell { // 更新修改，解决表格内容太长导致显示的问题
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    max-width: 250px;
+  .ant-table-cell {
     text-align: center !important;
   }
 

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

@@ -293,7 +293,7 @@ const ChatMsg: React.FC<Props> = ({
       dateInfo: {
         ...chatContext.dateInfo,
         dateMode: dateModeValue,
-        unit: currentDateOption || chatContext.dateInfo?.unit,
+        unit: currentDateOption || chatContext.dateInfo.unit,
       },
       dimensions: [
         ...(chatContext.dimensions || []),
@@ -310,7 +310,7 @@ const ChatMsg: React.FC<Props> = ({
       dateInfo: {
         ...chatContext.dateInfo,
         dateMode: dateModeValue,
-        unit: currentDateOption || chatContext.dateInfo?.unit,
+        unit: currentDateOption || chatContext.dateInfo.unit,
       },
       dimensions: drillDownDimension
         ? [...(chatContext.dimensions || []), drillDownDimension]