@ibiz-template/vue3-components 0.7.41-alpha.147 → 0.7.41-alpha.149

package/src/control/dashboard/portlet/portlet-layout/portlet-layout.tsx

@@ -70,24 +70,33 @@ export const PortletLayout = defineComponent({
     // 部件绘制器
     const controlRenders = c.dashboard.model.controlRenders;
 
+    // 有dashboard_前缀的为实体数据看板门户部件，没有前缀的为应用数据看板门户部件
     // 头部绘制器
     const header = controlRenders?.find(
-      item => `dashboard_${item.id}` === `${c.model.name}_header`,
+      item =>
+        `dashboard_${item.id}` === `${c.model.name}_header` ||
+        `${item.id}` === `${c.model.name}_header`,
     );
 
     // 头部标题绘制器
     const headerCaption = controlRenders?.find(
-      item => `dashboard_${item.id}` === `${c.model.name}_header_caption`,
+      item =>
+        `dashboard_${item.id}` === `${c.model.name}_header_caption` ||
+        `${item.id}` === `${c.model.name}_header_caption`,
     );
 
     // 头部背景绘制器
     const headerBg = controlRenders?.find(
-      item => `dashboard_${item.id}` === `${c.model.name}_header_bg`,
+      item =>
+        `dashboard_${item.id}` === `${c.model.name}_header_bg` ||
+        `${item.id}` === `${c.model.name}_header_bg`,
     );
 
     // 头部行为组绘制器
     const headerAction = controlRenders?.find(
-      item => `dashboard_${item.id}` === `${c.model.name}_header_action`,
+      item =>
+        `dashboard_${item.id}` === `${c.model.name}_header_action` ||
+        `${item.id}` === `${c.model.name}_header_action`,
     );
 
     // 渲染绘制器内容
@@ -97,6 +106,9 @@ export const PortletLayout = defineComponent({
           {
             params: c.params,
             context: c.context,
+            controller: props.controller,
+            ctrl: props.controller.dashboard,
+            view: props.controller.dashboard.view,
           },
           model.layoutPanelModel,
           { isAsync: false },

package/src/control/data-view/data-view.tsx

@@ -1087,14 +1087,14 @@ export const DataViewControl = defineComponent({
           controller={this.c}
         >
           {this.renderLayoutByStyle()}
-          {this.c.state.isLoaded && this.c.showScrollTo !== 'none' && (
-            <iBizBackTop
-              target={this.infiniteScroll}
-              mode={this.c.showScrollTo}
-              {...this.renderAttrs()}
-            />
-          )}
         </iBizControlBase>
+        {this.c.state.isLoaded && this.c.showScrollTo !== 'none' && (
+          <iBizBackTop
+            target={this.infiniteScroll}
+            mode={this.c.showScrollTo}
+            {...this.renderAttrs()}
+          />
+        )}
       </iBizControlNavigation>
     );
   },

package/src/control/exp-bar/index.ts

@@ -4,3 +4,4 @@ export * from './grid-exp-bar';
 export * from './data-view-exp-bar';
 export * from './calendar-exp-bar';
 export * from './chart-exp-bar';
+export * from './render-util';

package/src/control/tree/el-tree-util.ts

@@ -4,7 +4,6 @@ import {
   IControlProvider,
   ITreeController,
   ITreeNodeData,
-  ScriptFactory,
   TreeController,
 } from '@ibiz-template/runtime';
 import { IControlRender, IDETree, IPanel } from '@ibiz/model-core';
@@ -266,6 +265,7 @@ export function findChildItems(
  * @return {*}  {(IPanel | undefined)}
  */
 export function getNodeControlPanel(control: {
+  appId: string;
   controlRenders?: IControlRender[];
 }): IPanel | undefined {
   if (control.controlRenders) {
@@ -273,7 +273,7 @@ export function getNodeControlPanel(control: {
     const controlRenders = control.controlRenders.filter(
       item => (item.id || '').split('_')[0] !== 'newnoderender',
     );
-    return getControlPanel({ controlRenders });
+    return getControlPanel({ controlRenders, appId: control.appId });
   }
 }
 
@@ -289,30 +289,13 @@ export function getNewNodeControlPanel(control: {
   controlRenders?: IControlRender[];
 }): IPanel | undefined {
   if (control.controlRenders) {
-    // 排除新建节点内容绘制器
+    // 查找新建节点内容绘制器
     const controlRender = control.controlRenders.find(
-      item => (item.id || '').split('_')[0] === 'newnoderender',
+      item =>
+        (item.id || '').split('_')[0] === 'newnoderender' &&
+        item.renderType === 'LAYOUTPANEL',
     );
-    if (!controlRender) return;
-
-    if (
-      controlRender.renderType === 'LAYOUTPANEL_MODEL' &&
-      controlRender.layoutPanelModel
-    ) {
-      const layoutPanelModel = ScriptFactory.execScriptFn(
-        {},
-        controlRender.layoutPanelModel,
-        { isAsync: false },
-      ) as IPanel;
-      return layoutPanelModel;
-    }
-
-    if (
-      controlRender.renderType === 'LAYOUTPANEL' &&
-      controlRender.layoutPanel
-    ) {
-      return controlRender.layoutPanel;
-    }
+    return controlRender?.layoutPanel;
   }
 }
 

package/src/editor/ai-chat/embed-ai-chat/embed-ai-chat.tsx

@@ -36,7 +36,6 @@ export const IBizEmbedAIChat = defineComponent({
     const ctrl = c.ctrl as EditFormController;
     const agentMap: Map<string | undefined, IData[]> = new Map();
     const knowledgeMap: Map<string | undefined, IData[]> = new Map();
-    const projectMap: Map<string | undefined, IData[]> = new Map();
     // AI聊天框挂载元素
     const aiChatElementRef: Ref<HTMLElement | null> = ref(null);
     let mountedFlag: boolean = false;
@@ -173,18 +172,6 @@ export const IBizEmbedAIChat = defineComponent({
             if (knowledge) knowledgeMap.set(key, knowledge);
             return knowledge;
           },
-          fetchProject: async (
-            ctx: IContext,
-            param: IParams,
-            other: IParams,
-          ) => {
-            const key = JSON.stringify(other);
-            let projects = projectMap.get(key);
-            if (projects?.length) return projects;
-            projects = await chatOptions.fetchProject(ctx, param, other);
-            if (projects) projectMap.set(key, projects);
-            return projects;
-          },
           action: (action: string, message: IData) => {
             if (action === 'send')
               ctrl.evt.emit('onFormDetailEvent', {

package/src/panel-component/panel-app-title/panel-app-title.controller.ts

@@ -107,6 +107,7 @@ export class PanelAppTitleController extends PanelItemController<IPanelRawItem>
     if (defaultApp.model.appId === indexViewModel.appId) {
       // 环境变量中的系统标题权重最大
       if (ibiz.env.AppTitle) this.state.caption = ibiz.env.AppTitle;
+      if (ibiz.env.AppSubTitle) this.state.subCaption = ibiz.env.AppSubTitle;
     }
   }
 

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

@@ -125,6 +125,12 @@ export class AIChatUtil implements IApiAIChatUtil {
     if (editorParams.srfworkmode) {
       topicOptions.workMode = editorParams.srfworkmode;
     }
+    // 编辑器参数srfdisableselectscope，禁用会话域选择，仅适用于工作模式为'WORKSPACE'
+    topicOptions.disableSelectScope = ibiz.config.common.aiDisableSelectScope;
+    if (editorParams.srfdisableselectscope) {
+      topicOptions.disableSelectScope =
+        editorParams.srfdisableselectscope === 'true';
+    }
     // 编辑器参数srfscopecodelistid，用于修正会话域源数据（代码表标识）
     let scopeCodeListId = editorParams.srfscopecodelistid;
     if (!scopeCodeListId) {
@@ -760,6 +766,10 @@ export class AIChatUtil implements IApiAIChatUtil {
             ...headers,
             'Content-Type': 'multipart/form-data',
           },
+          params: {
+            // 时间戳加随机数，防止请求合并
+            timestamp: `${Date.now()}-${Math.floor(Math.random() * 10000)}`,
+          },
           data: formData,
           onUploadProgress: (progressEvent: AxiosProgressEvent) => {
             const percent = (progressEvent.loaded / progressEvent.total!) * 100;
@@ -964,6 +974,12 @@ export class AIChatUtil implements IApiAIChatUtil {
       topicOptions.workMode = params.srfworkmode;
       delete params.srfworkmode;
     }
+    // 视图参数srfdisableselectscope，禁用会话域选择，仅适用于工作模式为'WORKSPACE'
+    topicOptions.disableSelectScope = ibiz.config.common.aiDisableSelectScope;
+    if (params.srfdisableselectscope) {
+      topicOptions.disableSelectScope = params.srfdisableselectscope === 'true';
+      delete params.srfdisableselectscope;
+    }
     // 视图参数srfscopecodelistid，用于修正会话域源数据（代码表标识）
     let scopeCodeListId = params.srfscopecodelistid;
     if (!scopeCodeListId) {
@@ -1628,6 +1644,10 @@ export class AIChatUtil implements IApiAIChatUtil {
             ...headers,
             'Content-Type': 'multipart/form-data',
           },
+          params: {
+            // 时间戳加随机数，防止请求合并
+            timestamp: `${Date.now()}-${Math.floor(Math.random() * 10000)}`,
+          },
           data: formData,
           onUploadProgress: (progressEvent: AxiosProgressEvent) => {
             const percent = (progressEvent.loaded / progressEvent.total!) * 100;