@ibiz-template/vue3-components 0.7.41-alpha.151 → 0.7.41-alpha.152

package/es/control/calendar/calendar.mjs

@@ -1,4 +1,4 @@
-import { isVNode, defineComponent, createVNode, resolveComponent, withDirectives, resolveDirective, ref, computed, watch } from 'vue';
+import { isVNode, defineComponent, createVNode, resolveComponent, mergeProps, withDirectives, resolveDirective, ref, computed, watch } from 'vue';
 import { hasEmptyPanelRenderer, IBizCustomRender, useControlController, useNamespace, useUIStore, useSemanticNode } from '@ibiz-template/vue3-util';
 import { CalendarController } from '@ibiz-template/runtime';
 import dayjs from 'dayjs';
@@ -470,16 +470,19 @@ const CalendarControl = /* @__PURE__ */ defineComponent({
       let content;
       if (!htmlCode)
         content = this.showDateRange ? date && (dayjs(date).isSame(item.beginTime, "day") || dayjs(date).day() === 0 || !item.beginTime && dayjs(date).isSame(item.endTime, "day")) ? item.text : "" : item.text;
-      return createVNode("div", {
+      const vHtmlProps = htmlCode ? {
+        "v-html": htmlCode
+      } : {};
+      return createVNode("div", mergeProps({
         "class": itemClass,
         "style": style,
-        "key": item.deData.srfkey,
-        "innerHTML": htmlCode,
+        "key": item.deData.srfkey
+      }, vHtmlProps, {
         "title": showTitle(item.tips || item.text),
         "onClick": () => this.c.onRowClick(item),
         "onDblclick": () => this.c.onDbRowClick(item),
         "onContextmenu": (evt) => this.onNodeContextmenu(item, evt)
-      }, [content]);
+      }), [content]);
     };
     const renderCalendarItem = (item, date) => {
       var _a, _b, _c;

package/es/util/ai-chat-util/ai-chat-util.mjs

@@ -355,9 +355,11 @@ class AIChatUtil {
         if (extParams && Object.keys(extParams).length > 0) {
           Object.assign(questionRequestData, { srfextparams: extParams });
         }
+        aiChat.addWaitingMessage(id);
         await deService.aiChatSse(
           (msg) => {
             if (msg.actionstate === 20 && msg.actionresult) {
+              aiChat.removeWaitingMessage(id);
               if (msg.asextparam && localMsgID && updateFlag) {
                 aiChat.updateMsgRealMessageID(localMsgID, msg.asextparam);
                 updateFlag = false;
@@ -428,6 +430,7 @@ class AIChatUtil {
         }
         abortController == null ? void 0 : abortController.abort();
       } finally {
+        aiChat.removeWaitingMessage(id);
         aiChat.completeMessage(id, true);
         aiChat.setActiveAsyncacitonId("");
         return true;
@@ -487,9 +490,11 @@ class AIChatUtil {
             srfproject: other.srfproject
           });
         try {
+          aiChat.addWaitingMessage(id);
           await deService.aiResumeSse(
             (msg) => {
               if (msg.actionstate === 20 && msg.actionresult) {
+                aiChat.removeWaitingMessage(id);
                 aiChat.isLoading.value = true;
                 if (!aiChat.getActiveAsyncacitonId()) {
                   aiChat.setActiveAsyncacitonId(msg.asyncacitonid);
@@ -559,6 +564,7 @@ class AIChatUtil {
           }
           abortController == null ? void 0 : abortController.abort();
         } finally {
+          aiChat.removeWaitingMessage(id);
           aiChat.isLoading.value = false;
           aiChat.completeMessage(id, true);
           aiChat.setActiveAsyncacitonId("");
@@ -1150,9 +1156,11 @@ class AIChatUtil {
         if (extParams && Object.keys(extParams).length > 0) {
           Object.assign(questionRequestData, { srfextparams: extParams });
         }
+        aiChat.addWaitingMessage(id);
         await deService.aiChatSse(
           (msg) => {
             if (msg.actionstate === 20 && msg.actionresult) {
+              aiChat.removeWaitingMessage(id);
               if (msg.asextparam && localMsgID && updateFlag) {
                 aiChat.updateMsgRealMessageID(localMsgID, msg.asextparam);
                 updateFlag = false;
@@ -1223,6 +1231,7 @@ class AIChatUtil {
         }
         abortController == null ? void 0 : abortController.abort();
       } finally {
+        aiChat.removeWaitingMessage(id);
         aiChat.setActiveAsyncacitonId("");
         aiChat.completeMessage(id, true);
         return true;
@@ -1282,9 +1291,11 @@ class AIChatUtil {
             srfproject: other.srfproject
           });
         try {
+          aiChat.addWaitingMessage(id);
           await deService.aiResumeSse(
             (msg) => {
               if (msg.actionstate === 20 && msg.actionresult) {
+                aiChat.removeWaitingMessage(id);
                 aiChat.isLoading.value = true;
                 if (!aiChat.getActiveAsyncacitonId()) {
                   aiChat.setActiveAsyncacitonId(msg.asyncacitonid);
@@ -1354,6 +1365,7 @@ class AIChatUtil {
           }
           abortController == null ? void 0 : abortController.abort();
         } finally {
+          aiChat.removeWaitingMessage(id);
           aiChat.isLoading.value = false;
           aiChat.completeMessage(id, true);
           aiChat.setActiveAsyncacitonId("");

package/lib/control/calendar/calendar.cjs

@@ -472,16 +472,19 @@ const CalendarControl = /* @__PURE__ */ vue.defineComponent({
       let content;
       if (!htmlCode)
         content = this.showDateRange ? date && (dayjs(date).isSame(item.beginTime, "day") || dayjs(date).day() === 0 || !item.beginTime && dayjs(date).isSame(item.endTime, "day")) ? item.text : "" : item.text;
-      return vue.createVNode("div", {
+      const vHtmlProps = htmlCode ? {
+        "v-html": htmlCode
+      } : {};
+      return vue.createVNode("div", vue.mergeProps({
         "class": itemClass,
         "style": style,
-        "key": item.deData.srfkey,
-        "innerHTML": htmlCode,
+        "key": item.deData.srfkey
+      }, vHtmlProps, {
         "title": core.showTitle(item.tips || item.text),
         "onClick": () => this.c.onRowClick(item),
         "onDblclick": () => this.c.onDbRowClick(item),
         "onContextmenu": (evt) => this.onNodeContextmenu(item, evt)
-      }, [content]);
+      }), [content]);
     };
     const renderCalendarItem = (item, date) => {
       var _a, _b, _c;

package/lib/util/ai-chat-util/ai-chat-util.cjs

@@ -357,9 +357,11 @@ class AIChatUtil {
         if (extParams && Object.keys(extParams).length > 0) {
           Object.assign(questionRequestData, { srfextparams: extParams });
         }
+        aiChat.addWaitingMessage(id);
         await deService.aiChatSse(
           (msg) => {
             if (msg.actionstate === 20 && msg.actionresult) {
+              aiChat.removeWaitingMessage(id);
               if (msg.asextparam && localMsgID && updateFlag) {
                 aiChat.updateMsgRealMessageID(localMsgID, msg.asextparam);
                 updateFlag = false;
@@ -430,6 +432,7 @@ class AIChatUtil {
         }
         abortController == null ? void 0 : abortController.abort();
       } finally {
+        aiChat.removeWaitingMessage(id);
         aiChat.completeMessage(id, true);
         aiChat.setActiveAsyncacitonId("");
         return true;
@@ -489,9 +492,11 @@ class AIChatUtil {
             srfproject: other.srfproject
           });
         try {
+          aiChat.addWaitingMessage(id);
           await deService.aiResumeSse(
             (msg) => {
               if (msg.actionstate === 20 && msg.actionresult) {
+                aiChat.removeWaitingMessage(id);
                 aiChat.isLoading.value = true;
                 if (!aiChat.getActiveAsyncacitonId()) {
                   aiChat.setActiveAsyncacitonId(msg.asyncacitonid);
@@ -561,6 +566,7 @@ class AIChatUtil {
           }
           abortController == null ? void 0 : abortController.abort();
         } finally {
+          aiChat.removeWaitingMessage(id);
           aiChat.isLoading.value = false;
           aiChat.completeMessage(id, true);
           aiChat.setActiveAsyncacitonId("");
@@ -1152,9 +1158,11 @@ class AIChatUtil {
         if (extParams && Object.keys(extParams).length > 0) {
           Object.assign(questionRequestData, { srfextparams: extParams });
         }
+        aiChat.addWaitingMessage(id);
         await deService.aiChatSse(
           (msg) => {
             if (msg.actionstate === 20 && msg.actionresult) {
+              aiChat.removeWaitingMessage(id);
               if (msg.asextparam && localMsgID && updateFlag) {
                 aiChat.updateMsgRealMessageID(localMsgID, msg.asextparam);
                 updateFlag = false;
@@ -1225,6 +1233,7 @@ class AIChatUtil {
         }
         abortController == null ? void 0 : abortController.abort();
       } finally {
+        aiChat.removeWaitingMessage(id);
         aiChat.setActiveAsyncacitonId("");
         aiChat.completeMessage(id, true);
         return true;
@@ -1284,9 +1293,11 @@ class AIChatUtil {
             srfproject: other.srfproject
           });
         try {
+          aiChat.addWaitingMessage(id);
           await deService.aiResumeSse(
             (msg) => {
               if (msg.actionstate === 20 && msg.actionresult) {
+                aiChat.removeWaitingMessage(id);
                 aiChat.isLoading.value = true;
                 if (!aiChat.getActiveAsyncacitonId()) {
                   aiChat.setActiveAsyncacitonId(msg.asyncacitonid);
@@ -1356,6 +1367,7 @@ class AIChatUtil {
           }
           abortController == null ? void 0 : abortController.abort();
         } finally {
+          aiChat.removeWaitingMessage(id);
           aiChat.isLoading.value = false;
           aiChat.completeMessage(id, true);
           aiChat.setActiveAsyncacitonId("");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/vue3-components",
-  "version": "0.7.41-alpha.151",
+  "version": "0.7.41-alpha.152",
   "description": "web端组件库(vue3)",
   "main": "lib/index.cjs",
   "module": "es/index.mjs",
@@ -31,7 +31,7 @@
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
     "@floating-ui/dom": "^1.5.3",
-    "@ibiz-template-plugin/ai-chat": "^0.0.116",
+    "@ibiz-template-plugin/ai-chat": "^0.0.117",
     "@ibiz-template-plugin/gantt": "0.1.8-alpha.468",
     "@ibiz-template-plugin/bi-report": "0.0.32",
     "@ibiz-template-plugin/data-view": "0.0.8",

package/src/control/calendar/calendar.tsx

@@ -697,12 +697,14 @@ export const CalendarControl = defineComponent({
             ? item.text
             : ''
           : item.text;
+      // htmlCode 有值时才传 v-html，否则传 children
+      const vHtmlProps = htmlCode ? { 'v-html': htmlCode } : {};
       return (
         <div
           class={itemClass}
           style={style}
           key={item.deData.srfkey}
-          v-html={htmlCode}
+          {...vHtmlProps}
           title={showTitle(item.tips || item.text)}
           onClick={(): Promise<void> => this.c.onRowClick(item)}
           onDblclick={(): Promise<void> => this.c.onDbRowClick(item)}

package/src/util/ai-chat-util/ai-chat-util.ts

@@ -508,10 +508,14 @@ export class AIChatUtil implements IApiAIChatUtil {
         if (extParams && Object.keys(extParams).length > 0) {
           Object.assign(questionRequestData, { srfextparams: extParams });
         }
+        // 新增等待回复消息（AI首条内容到达前显示loading气泡）
+        aiChat.addWaitingMessage(id);
         await deService.aiChatSse(
           (msg: IPortalAsyncAction) => {
             // 20: 持续回答中，消息会持续推送。同一个消息 id 会显示在同一个框内
             if (msg.actionstate === 20 && msg.actionresult) {
+              // 移除等待回复消息
+              aiChat.removeWaitingMessage(id);
               // 更新用户消息真实id
               if (msg.asextparam && localMsgID && updateFlag) {
                 aiChat.updateMsgRealMessageID(localMsgID, msg.asextparam);
@@ -588,6 +592,8 @@ export class AIChatUtil implements IApiAIChatUtil {
         }
         abortController?.abort();
       } finally {
+        // 移除等待回复消息
+        aiChat.removeWaitingMessage(id);
         // 标记当前消息已经交互完成
         aiChat.completeMessage(id, true);
         // 清空异步消息任务
@@ -667,10 +673,14 @@ export class AIChatUtil implements IApiAIChatUtil {
             srfproject: other.srfproject,
           });
         try {
+          // 新增等待回复消息（AI首条内容到达前显示loading气泡）
+          aiChat.addWaitingMessage(id);
           await deService.aiResumeSse(
             (msg: IPortalAsyncAction) => {
               // 20: 持续回答中，消息会持续推送。同一个消息 id 会显示在同一个框内
               if (msg.actionstate === 20 && msg.actionresult) {
+                // 移除等待回复消息
+                aiChat.removeWaitingMessage(id);
                 // 设置当前聊天在加载中
                 aiChat.isLoading.value = true;
                 // 不存在才设置，存在则不设置（下方设置的时候需要去存储话题数据中）
@@ -748,6 +758,8 @@ export class AIChatUtil implements IApiAIChatUtil {
           }
           abortController?.abort();
         } finally {
+          // 移除等待回复消息
+          aiChat.removeWaitingMessage(id);
           // 设置当前聊天加载状态已完成
           aiChat.isLoading.value = false;
           // 标记当前消息已经交互完成
@@ -1500,10 +1512,14 @@ export class AIChatUtil implements IApiAIChatUtil {
         if (extParams && Object.keys(extParams).length > 0) {
           Object.assign(questionRequestData, { srfextparams: extParams });
         }
+        // 新增等待回复消息（AI首条内容到达前显示loading气泡）
+        aiChat.addWaitingMessage(id);
         await deService.aiChatSse(
           (msg: IPortalAsyncAction) => {
             // 20: 持续回答中，消息会持续推送。同一个消息 id 会显示在同一个框内
             if (msg.actionstate === 20 && msg.actionresult) {
+              // 移除等待回复消息
+              aiChat.removeWaitingMessage(id);
               // 更新用户消息真实id
               if (msg.asextparam && localMsgID && updateFlag) {
                 aiChat.updateMsgRealMessageID(localMsgID, msg.asextparam);
@@ -1580,6 +1596,8 @@ export class AIChatUtil implements IApiAIChatUtil {
         }
         abortController?.abort();
       } finally {
+        // 移除等待回复消息
+        aiChat.removeWaitingMessage(id);
         // 清空异步消息任务
         aiChat.setActiveAsyncacitonId('');
         // 标记当前消息已经交互完成
@@ -1659,10 +1677,14 @@ export class AIChatUtil implements IApiAIChatUtil {
             srfproject: other.srfproject,
           });
         try {
+          // 新增等待回复消息（AI首条内容到达前显示loading气泡）
+          aiChat.addWaitingMessage(id);
           await deService.aiResumeSse(
             (msg: IPortalAsyncAction) => {
               // 20: 持续回答中，消息会持续推送。同一个消息 id 会显示在同一个框内
               if (msg.actionstate === 20 && msg.actionresult) {
+                // 移除等待回复消息
+                aiChat.removeWaitingMessage(id);
                 // 设置当前聊天在加载中
                 aiChat.isLoading.value = true;
                 // 不存在才设置，存在则不设置（下方设置的时候需要去存储话题数据中）
@@ -1740,6 +1762,8 @@ export class AIChatUtil implements IApiAIChatUtil {
           }
           abortController?.abort();
         } finally {
+          // 移除等待回复消息
+          aiChat.removeWaitingMessage(id);
           // 设置当前聊天加载状态已完成
           aiChat.isLoading.value = false;
           // 标记当前消息已经交互完成