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

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/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: '准备画布中...',

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

@@ -345,6 +345,14 @@ export class AIChatUtil implements IApiAIChatUtil {
         ibiz.config.common.aiChatMessagePageSize;
     }
 
+    // AI会话是否启用工作空间文件系统相关操作
+    if (editorParams.srfaienableworkspace) {
+      chatOptions.enableWorkSpace =
+        editorParams.srfaienableworkspace === 'true';
+    } else {
+      chatOptions.enableWorkSpace = ibiz.config.common.aiEnableWorkSpace;
+    }
+
     // 智能体选项(由内部获取，优化打开速度)
     chatOptions.fetchAgentList = (args: IParams = {}) => {
       const { query, agentid } = args;
@@ -378,9 +386,17 @@ export class AIChatUtil implements IApiAIChatUtil {
     let id: string = '';
     let abortController: AbortController;
     const { chatInstance, view, ctrl } = args;
+
     // 文件系统操作参数
-    const fileSystemOptions = await this.getAIFileSystemOptions();
+    // AI聊天框文件预览模式
+    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: IContext,
@@ -1354,6 +1370,14 @@ export class AIChatUtil implements IApiAIChatUtil {
         ibiz.config.common.aiChatMessagePageSize;
     }
 
+    // AI会话是否启用工作空间文件系统相关操作
+    if (params.hasOwnProperty('srfaienableworkspace')) {
+      chatOptions.enableWorkSpace = params.srfaienableworkspace === 'true';
+      delete params.srfaienableworkspace;
+    } else {
+      chatOptions.enableWorkSpace = ibiz.config.common.aiEnableWorkSpace;
+    }
+
     // 智能体选项(由内部获取，优化打开速度)
     chatOptions.fetchAgentList = (args: IParams = {}) => {
       const { query, agentid } = args;
@@ -1385,8 +1409,17 @@ export class AIChatUtil implements IApiAIChatUtil {
     let abortController: AbortController;
     const { chatInstance, view, ctrl } = args;
     // 文件系统操作参数
-    const fileSystemOptions = await this.getAIFileSystemOptions();
+
+    // AI聊天框文件预览模式
+    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: IContext,
@@ -2423,8 +2456,42 @@ export class AIChatUtil implements IApiAIChatUtil {
    * @returns {*}  {Promise<IData>}
    * @memberof AIChatUtil
    */
-  async getAIFileSystemOptions(): Promise<IData> {
+  async getAIFileSystemOptions(
+    filePreviewMode: 'DEFAULT' | 'CUSTOM',
+  ): Promise<IData> {
     const fileSystemOptions: IData = {};
+    // 文件预览模式
+    fileSystemOptions.filePreviewMode = filePreviewMode;
+    // 获取自定义文件预览路径
+    fileSystemOptions.getCustomFilePreviewUrl = async (
+      ctx: IContext,
+      param: IParams,
+      other: IParams,
+    ): Promise<string> => {
+      const filePreviewAddress = ibiz.env.customParams?.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 = `${protocol}//${hostname}:${actualPort}`;
+      const filedownloadurl = `${windowInfo}${downloadUrl}?fullfilename=${name}`;
+      const b64Encoded = ibiz.util.base64.encode(filedownloadurl);
+      const previewUrl = `${filePreviewAddress}/onlinePreview?url=${encodeURIComponent(b64Encoded)}`;
+      return previewUrl;
+    };
     // 查询文件列表
     fileSystemOptions.getFileList = async (
       ctx: IContext,
@@ -2454,11 +2521,91 @@ export class AIChatUtil implements IApiAIChatUtil {
       const response = await deService.aiChatProject(
         ctx,
         { srfactag: param.srfactag },
-        { ...other, action: 'UPLOAD' },
+        { action: 'UPLOAD', ...other },
       );
       if (response.ok) return response.data;
       return undefined;
     };
+    // 新建目录
+    fileSystemOptions.createFolder = async (
+      ctx: IContext,
+      param: IParams,
+      other: IParams,
+    ): Promise<IData> => {
+      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: IContext,
+      param: IParams,
+      other: IParams,
+    ): Promise<IData> => {
+      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: IContext,
+      param: IParams,
+      other: IParams,
+    ): Promise<IData> => {
+      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: IContext,
+      param: IParams,
+      other: IParams,
+    ): Promise<IData> => {
+      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: IContext,
+      param: IParams,
+      other: IParams,
+    ): Promise<IData> => {
+      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: IContext,