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

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

@@ -225,6 +225,11 @@ class AIChatUtil {
     } else {
       chatOptions.chatMessagePageSize = ibiz.config.common.aiChatMessagePageSize;
     }
+    if (editorParams.srfaienableworkspace) {
+      chatOptions.enableWorkSpace = editorParams.srfaienableworkspace === "true";
+    } else {
+      chatOptions.enableWorkSpace = ibiz.config.common.aiEnableWorkSpace;
+    }
     chatOptions.fetchAgentList = (args2 = {}) => {
       const { query, agentid } = args2;
       return this.getAIAgentList(
@@ -253,7 +258,11 @@ class AIChatUtil {
     let id = "";
     let abortController;
     const { chatInstance, view, ctrl } = args;
-    const fileSystemOptions = await this.getAIFileSystemOptions();
+    let filePreviewMode = ibiz.config.common.aiFilePreviewMode;
+    if (editorParams.srfaifilepreviewmode) {
+      filePreviewMode = editorParams.srfaifilepreviewmode;
+    }
+    const fileSystemOptions = await this.getAIFileSystemOptions(filePreviewMode);
     chatOptions.fileSystemOptions = fileSystemOptions;
     chatOptions.history = async (ctx, param, other) => {
       const deService = await ibiz.hub.getApp(ctx.srfappid).deService.getService(ctx, other.appDataEntityId);
@@ -357,9 +366,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 +441,7 @@ class AIChatUtil {
         }
         abortController == null ? void 0 : abortController.abort();
       } finally {
+        aiChat.removeWaitingMessage(id);
         aiChat.completeMessage(id, true);
         aiChat.setActiveAsyncacitonId("");
         return true;
@@ -489,9 +501,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 +575,7 @@ class AIChatUtil {
           }
           abortController == null ? void 0 : abortController.abort();
         } finally {
+          aiChat.removeWaitingMessage(id);
           aiChat.isLoading.value = false;
           aiChat.completeMessage(id, true);
           aiChat.setActiveAsyncacitonId("");
@@ -1024,6 +1039,12 @@ class AIChatUtil {
     } else {
       chatOptions.chatMessagePageSize = ibiz.config.common.aiChatMessagePageSize;
     }
+    if (params.hasOwnProperty("srfaienableworkspace")) {
+      chatOptions.enableWorkSpace = params.srfaienableworkspace === "true";
+      delete params.srfaienableworkspace;
+    } else {
+      chatOptions.enableWorkSpace = ibiz.config.common.aiEnableWorkSpace;
+    }
     chatOptions.fetchAgentList = (args2 = {}) => {
       const { query, agentid } = args2;
       return this.getAIAgentList(context, {
@@ -1050,7 +1071,12 @@ class AIChatUtil {
     let id = "";
     let abortController;
     const { chatInstance, view, ctrl } = args;
-    const fileSystemOptions = await this.getAIFileSystemOptions();
+    let filePreviewMode = ibiz.config.common.aiFilePreviewMode;
+    if (params.hasOwnProperty("srfaifilepreviewmode")) {
+      filePreviewMode = params.srfaifilepreviewmode;
+      delete params.srfaifilepreviewmode;
+    }
+    const fileSystemOptions = await this.getAIFileSystemOptions(filePreviewMode);
     chatOptions.fileSystemOptions = fileSystemOptions;
     chatOptions.history = async (ctx, param, other) => {
       const deService = await ibiz.hub.getApp(ctx.srfappid).deService.getService(ctx, other.appDataEntityId);
@@ -1152,9 +1178,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 +1253,7 @@ class AIChatUtil {
         }
         abortController == null ? void 0 : abortController.abort();
       } finally {
+        aiChat.removeWaitingMessage(id);
         aiChat.setActiveAsyncacitonId("");
         aiChat.completeMessage(id, true);
         return true;
@@ -1284,9 +1313,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 +1387,7 @@ class AIChatUtil {
           }
           abortController == null ? void 0 : abortController.abort();
         } finally {
+          aiChat.removeWaitingMessage(id);
           aiChat.isLoading.value = false;
           aiChat.completeMessage(id, true);
           aiChat.setActiveAsyncacitonId("");
@@ -1881,8 +1913,34 @@ class AIChatUtil {
    * @returns {*}  {Promise<IData>}
    * @memberof AIChatUtil
    */
-  async getAIFileSystemOptions() {
+  async getAIFileSystemOptions(filePreviewMode) {
     const fileSystemOptions = {};
+    fileSystemOptions.filePreviewMode = filePreviewMode;
+    fileSystemOptions.getCustomFilePreviewUrl = async (ctx, param, other) => {
+      var _a;
+      const filePreviewAddress = (_a = ibiz.env.customParams) == null ? void 0 : _a.file_preview_address;
+      if (!filePreviewAddress) {
+        ibiz.message.error(
+          ibiz.i18n.t("util.aiChartUtil.noFilePreviewAddress")
+        );
+        return "";
+      }
+      const { id, name, folder } = other;
+      let { downloadUrl } = ibiz.util.file.calcFileUpDownUrl(
+        ctx,
+        param,
+        {},
+        { osscat: folder }
+      );
+      downloadUrl = downloadUrl.replace("%fileId%", id);
+      const { protocol, hostname, port } = window.location;
+      const actualPort = port || (protocol === "https:" ? "443" : "80");
+      const windowInfo = "".concat(protocol, "//").concat(hostname, ":").concat(actualPort);
+      const filedownloadurl = "".concat(windowInfo).concat(downloadUrl, "?fullfilename=").concat(name);
+      const b64Encoded = ibiz.util.base64.encode(filedownloadurl);
+      const previewUrl = "".concat(filePreviewAddress, "/onlinePreview?url=").concat(encodeURIComponent(b64Encoded));
+      return previewUrl;
+    };
     fileSystemOptions.getFileList = async (ctx, param, other) => {
       const deService = await ibiz.hub.getApp(ctx.srfappid).deService.getService(ctx, param.appDataEntityId);
       const response = await deService.aiChatProject(
@@ -1899,12 +1957,57 @@ class AIChatUtil {
       const response = await deService.aiChatProject(
         ctx,
         { srfactag: param.srfactag },
-        { ...other, action: "UPLOAD" }
+        { action: "UPLOAD", ...other }
       );
       if (response.ok)
         return response.data;
       return void 0;
     };
+    fileSystemOptions.createFolder = async (ctx, param, other) => {
+      const deService = await ibiz.hub.getApp(ctx.srfappid).deService.getService(ctx, param.appDataEntityId);
+      const response = await deService.aiChatProject(
+        ctx,
+        { srfactag: param.srfactag },
+        { action: "MKDIR", ...other }
+      );
+      return response.data;
+    };
+    fileSystemOptions.createFile = async (ctx, param, other) => {
+      const deService = await ibiz.hub.getApp(ctx.srfappid).deService.getService(ctx, param.appDataEntityId);
+      const response = await deService.aiChatProject(
+        ctx,
+        { srfactag: param.srfactag },
+        { action: "WRITE", ...other }
+      );
+      return response.data;
+    };
+    fileSystemOptions.move = async (ctx, param, other) => {
+      const deService = await ibiz.hub.getApp(ctx.srfappid).deService.getService(ctx, param.appDataEntityId);
+      const response = await deService.aiChatProject(
+        ctx,
+        { srfactag: param.srfactag },
+        { action: "MOVE", ...other }
+      );
+      return response.data;
+    };
+    fileSystemOptions.delete = async (ctx, param, other) => {
+      const deService = await ibiz.hub.getApp(ctx.srfappid).deService.getService(ctx, param.appDataEntityId);
+      const response = await deService.aiChatProject(
+        ctx,
+        { srfactag: param.srfactag },
+        { recursive: true, action: "DELETE", ...other }
+      );
+      return response.data;
+    };
+    fileSystemOptions.readFile = async (ctx, param, other) => {
+      const deService = await ibiz.hub.getApp(ctx.srfappid).deService.getService(ctx, param.appDataEntityId);
+      const response = await deService.aiChatProject(
+        ctx,
+        { srfactag: param.srfactag },
+        { action: "READ", ...other }
+      );
+      return response.data;
+    };
     fileSystemOptions.getContent = async (ctx, param, id, type, cat) => {
       const app = await ibiz.hub.getAppAsync(ctx.appId);
       const requestUrl = "/ibizutil/downloadtxt/".concat(cat ? "".concat(cat, "/") : "").concat(id, "?type=").concat(type);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/vue3-components",
-  "version": "0.7.41-alpha.151",
+  "version": "0.7.41-alpha.153",
   "description": "web端组件库(vue3)",
   "main": "lib/index.cjs",
   "module": "es/index.mjs",
@@ -31,16 +31,16 @@
   "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.118",
     "@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",
     "@ibiz-template/core": "0.7.41-alpha.152",
     "@ibiz-template/devtool": "0.0.17",
-    "@ibiz-template/model-helper": "0.7.41-alpha.152",
-    "@ibiz-template/runtime": "0.7.41-alpha.152",
+    "@ibiz-template/model-helper": "0.7.41-alpha.153",
+    "@ibiz-template/runtime": "0.7.41-alpha.153",
     "@ibiz-template/theme": "0.7.39",
-    "@ibiz-template/vue3-util": "0.7.41-alpha.152",
+    "@ibiz-template/vue3-util": "0.7.41-alpha.153",
     "@ibiz-template/web-theme": "3.16.0",
     "@ibiz/model-core": "^0.1.89",
     "@imengyu/vue3-context-menu": "^1.3.5",

package/src/common/rawitem/rawitem.tsx

@@ -10,6 +10,7 @@ import {
   IRawItemContainer,
 } from '@ibiz/model-core';
 import { isBase64, isBase64Image, isSvg } from '@ibiz-template/core';
+import { isObject } from 'lodash-es';
 import { IControlController, IViewController } from '@ibiz-template/runtime';
 import { parseHtml } from '../../util';
 import './rawitem.scss';
@@ -119,8 +120,9 @@ export const IBizRawItem = defineComponent({
       }
     } else if (['INFO', 'WARNING', 'ERROR'].includes(contentType!)) {
       rawItemContent.value = (rawItem as IUnkownItem).rawContent!;
-    } else if (['VIDEO', 'DIVIDER'].includes(contentType!)) {
-      // 暂不处理
+      // 分割线内容解析，视频模型缺少，暂不处理(有rawItemParams则为面板直接内容)
+    } else if (contentType === 'DIVIDER' && !rawItem!.rawItemParams) {
+      rawItemContent.value = (rawItem as IUnkownItem).rawContent!;
     } else if (contentType === 'IMAGE' && sysImage) {
       rawItemContent.value = sysImage;
     }
@@ -179,6 +181,21 @@ export const IBizRawItem = defineComponent({
     // 文本类型显示值
     const rawItemText: Ref<string | number | IData> = ref('');
 
+    // 获取面板项直接内容项参数
+    const getRawItemParams = () => {
+      const tempParams: IData = {};
+      if (
+        rawItem &&
+        rawItem.rawItemParams &&
+        rawItem.rawItemParams.length > 0
+      ) {
+        rawItem.rawItemParams.forEach((item: IData) => {
+          tempParams[item.key] = item.value;
+        });
+      }
+      return tempParams;
+    };
+
     // 转换各类值操作
     const convertValue = () => {
       // 图片类型
@@ -243,25 +260,43 @@ export const IBizRawItem = defineComponent({
         )
       ) {
         if (rawItemContent.value) {
-          let rawConfig = {};
+          let rawConfig: IData | string = {};
           try {
+            // 兼容json字符串格式与字符串文本模式
             if (typeof rawItemContent.value === 'string') {
-              // eslint-disable-next-line no-new-func
-              const func = new Function(`return (${rawItemContent.value});`);
-              rawConfig = func();
+              // 以 { 或 [ 开头的使用脚本解析,不是则做为文本字符串
+              if (/^[[{]/.test(rawItemContent.value)) {
+                // eslint-disable-next-line no-new-func
+                const func = new Function(`return (${rawItemContent.value});`);
+                rawConfig = func();
+              } else {
+                rawConfig = rawItemContent.value;
+              }
               switch (rawItemType.value) {
                 case 'VIDEO':
-                  Object.assign(playerParams.value, rawConfig);
+                  if (isObject(rawConfig)) {
+                    Object.assign(playerParams.value, rawConfig);
+                  } else {
+                    playerParams.value.path = rawConfig;
+                  }
                   break;
                 case 'DIVIDER':
-                  Object.assign(dividerParams.value, rawConfig);
+                  if (isObject(rawConfig)) {
+                    Object.assign(dividerParams.value, rawConfig);
+                  } else {
+                    dividerParams.value.html = rawConfig;
+                  }
                   break;
                 case 'INFO':
                 case 'WARNING':
                 case 'ERROR':
                   alertParams.value.type =
                     rawItemType.value.toLocaleLowerCase();
-                  Object.assign(alertParams.value, rawConfig);
+                  if (isObject(rawConfig)) {
+                    Object.assign(alertParams.value, rawConfig);
+                  } else {
+                    alertParams.value.title = rawConfig;
+                  }
                   break;
                 default:
                   break;
@@ -274,17 +309,13 @@ export const IBizRawItem = defineComponent({
               }),
             );
           }
-        } else if (rawItemType.value === 'VIDEO') {
-          if (
-            rawItem &&
-            rawItem.rawItemParams &&
-            rawItem.rawItemParams.length > 0
-          ) {
-            const tempParams: IData = {};
-            rawItem.rawItemParams.forEach((item: IData) => {
-              tempParams[item.key] = item.value;
-            });
+          // 面板中分割线、视频支持直接内容项参数
+        } else if (['DIVIDER', 'VIDEO'].includes(rawItemType.value)) {
+          const tempParams = getRawItemParams();
+          if (rawItemType.value === 'VIDEO') {
             Object.assign(playerParams.value, tempParams);
+          } else {
+            Object.assign(dividerParams.value, tempParams);
           }
         }
       }

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/editor/ai-chat/embed-ai-chat/embed-ai-chat.tsx

@@ -130,6 +130,9 @@ export const IBizEmbedAIChat = defineComponent({
           container: aiChatElementRef.value,
           compWrapperId: editorParams.compwrapperid || 'DEFAULT',
           enableBackFill: false,
+          isEmbedAiHeaderHidden: editorParams.isembedaiheaderhidden
+            ? editorParams.isembedaiheaderhidden === 'true'
+            : ibiz.config.common.isEmbedAiHeaderHidden,
         },
         topicOptions: {
           appid: ibiz.env.appId,

package/src/locale/en/index.ts

@@ -979,6 +979,8 @@ export default {
       violationPrivacy: 'Violation of Privacy',
       contentInfringement: 'Content infringement',
       placeholder: 'Please enter',
+      noFilePreviewAddress:
+        'No attachment preview service. Please contact the administrator to add it!',
     },
     screenShotUtil: {
       prepareCanvas: 'Prepare the canvas...',

package/src/locale/zh-CN/index.ts

@@ -922,6 +922,7 @@ export default {
       violationPrivacy: '侵犯隐私',
       contentInfringement: '内容侵权',
       placeholder: '请输入',
+      noFilePreviewAddress: '无附件预览服务，请联系管理员添加!',
     },
     screenShotUtil: {
       prepareCanvas: '准备画布中...',