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

package/src/control/calendar/calendar.tsx

@@ -662,6 +662,7 @@ export const CalendarControl = defineComponent({
       const findIndex = this.c.state.selectedData.findIndex((data: IData) => {
         return data.deData.srfkey === item.deData.srfkey;
       });
+      const htmlCode = this.c.getCustomHtml(item);
       const itemClass = [
         this.ns.b('item'),
         this.semanticClass('item', { item }),
@@ -671,6 +672,7 @@ export const CalendarControl = defineComponent({
           'begin-time',
           date && dayjs(date).isSame(item.beginTime, 'day'),
         ),
+        this.ns.is('script', !!htmlCode),
         this.ns.is(
           'hidden',
           this.showDateRange &&
@@ -685,24 +687,28 @@ export const CalendarControl = defineComponent({
         this.ns.is('end-time', date && dayjs(date).isSame(item.endTime, 'day')),
       ];
       const style = this.calcItemStyle(item);
+      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 (
         <div
           class={itemClass}
-          key={item.deData.srfkey}
           style={style}
+          key={item.deData.srfkey}
+          v-html={htmlCode}
           title={showTitle(item.tips || item.text)}
           onClick={(): Promise<void> => this.c.onRowClick(item)}
           onDblclick={(): Promise<void> => this.c.onDbRowClick(item)}
           onContextmenu={evt => this.onNodeContextmenu(item, evt)}
         >
-          {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}
+          {content}
         </div>
       );
     };
@@ -711,16 +717,20 @@ export const CalendarControl = defineComponent({
      * 绘制日历项
      *
      * @param {ICalendarItemData} item
-     * @param {Date} date
+     * @param {[Date]} date
      * @return {*}
      */
-    const renderCalendarItem = (item: ICalendarItemData, date: Date) => {
+    const renderCalendarItem = (item: ICalendarItemData, date?: Date) => {
       const model = this.c.model.sysCalendarItems?.find(
         (calendarItems: IData) => {
           return item.itemType === calendarItems.itemType;
         },
       );
-      const panel = model!.layoutPanel;
+      const panel =
+        model!.layoutPanel ||
+        model!.controlRenders?.find(
+          render => render.renderType === 'LAYOUTPANEL',
+        )?.layoutPanel;
       return panel
         ? renderPanelItem(item, panel, date)
         : renderDefaultItem(item, date);
@@ -1010,15 +1020,9 @@ export const CalendarControl = defineComponent({
      * @returns {*}
      */
     const renderSlots = () => {
-      const { sysCalendarItems = [] } = this.c.model;
       return {
         event: ({ data }: { data: ICalendarItemData }) => {
-          const model = sysCalendarItems.find(
-            item => data.itemType === item.itemType,
-          );
-          if (model?.layoutPanel)
-            return renderPanelItem(data, model.layoutPanel);
-          return renderDefaultItem(data);
+          return renderCalendarItem(data);
         },
       };
     };
@@ -1085,11 +1089,6 @@ export const CalendarControl = defineComponent({
           <el-timeline class={this.ns.e('timeline')}>
             {this.c.state.items.length > 0
               ? this.c.state.items.map((item: ICalendarItemData) => {
-                  const model = this.c.model.sysCalendarItems?.find(
-                    (calendarItems: IData) => {
-                      return item.itemType === calendarItems.itemType;
-                    },
-                  );
                   const time = item[this.c.groupTimeField];
                   const temptime = time
                     ? dayjs(time).format(this.c.timelineCaptionFormat)
@@ -1101,9 +1100,7 @@ export const CalendarControl = defineComponent({
                       color={item.bkColor}
                       timestamp={temptime}
                     >
-                      {model?.layoutPanel
-                        ? renderPanelItem(item, model.layoutPanel)
-                        : renderDefaultItem(item)}
+                      {renderCalendarItem(item)}
                     </el-timeline-item>
                   );
                 })

package/src/control/drbar/drbar.controller.ts

@@ -122,6 +122,17 @@ export class DRBarController
     return this.view.modal.routeDepth;
   }
 
+  /**
+   * @description 缓存项集合
+   * @readonly
+   * @type {string[]}
+   * @memberof DRBarController
+   */
+  get cacheItems(): string[] {
+    const { cacheitems = '' } = this.controlParams;
+    return cacheitems.split(',');
+  }
+
   /**
    * 初始化state的属性
    *
@@ -550,6 +561,7 @@ export class DRBarController
       params,
       viewId: drBarItem.appViewId,
       isRoutePushed,
+      isCache: this.cacheItems.includes(drBarItem.id!),
     });
   }
 

package/src/control/drtab/drtab.controller.ts

@@ -163,6 +163,17 @@ export class DRTabController
     return this.controlParams.navbarwidth || ibiz.config.drtab.navbarWidth;
   }
 
+  /**
+   * @description 缓存项集合
+   * @readonly
+   * @type {string[]}
+   * @memberof DRBarController
+   */
+  get cacheItems(): string[] {
+    const { cacheitems = '' } = this.controlParams;
+    return cacheitems.split(',');
+  }
+
   /**
    * Router 对象
    *
@@ -605,6 +616,7 @@ export class DRTabController
       params,
       viewId: drTabPage.appViewId,
       isRoutePushed,
+      isCache: this.cacheItems.includes(drTabPage.id!),
     });
   }
 

package/src/control/grid/grid-column/grid-field-column/grid-field-column.tsx

@@ -1,5 +1,5 @@
-import { ILayoutPanel, IPanel, IUIActionGroupDetail } from '@ibiz/model-core';
-import { computed, defineComponent, ref, VNode } from 'vue';
+import { IPanel, IUIActionGroupDetail } from '@ibiz/model-core';
+import { computed, defineComponent, ref } from 'vue';
 import {
   useNamespace,
   computedAsync,
@@ -171,22 +171,6 @@ export const GridFieldColumn = defineComponent({
       )?.layoutPanel;
     };
 
-    // 绘制项布局面板
-    const renderPanelItemLayout = (
-      item: IData,
-      modelData: ILayoutPanel,
-    ): VNode => {
-      const { context, params } = props.controller;
-      return (
-        <iBizControlShell
-          data={item}
-          modelData={modelData}
-          context={context}
-          params={params}
-        ></iBizControlShell>
-      );
-    };
-
     return {
       ns,
       zIndex,
@@ -204,7 +188,6 @@ export const GridFieldColumn = defineComponent({
       onActionClick,
       findLayoutPanel,
       onInfoTextChange,
-      renderPanelItemLayout,
     };
   },
   render() {

package/src/control/grid/grid-column/grid-field-edit-column/grid-field-edit-column.tsx

@@ -12,9 +12,11 @@ import {
 import {
   useNamespace,
   renderTooltip,
+  computedAsync,
   useSemanticNode,
 } from '@ibiz-template/vue3-util';
 import { RuntimeError } from '@ibiz-template/core';
+import { IPanel } from '@ibiz/model-core';
 import {
   GridRowState,
   GridFieldEditColumnController,
@@ -123,16 +125,36 @@ export const GridFieldEditColumn = defineComponent({
         : `${id?.toLowerCase()}_tooltip`;
     });
 
+    const CustomHtml = computedAsync(async () => {
+      const html = await props.controller.getCustomHtml(props.row);
+      return html;
+    });
+
+    const findLayoutPanel = (): IPanel | undefined => {
+      const { controlRenders = [], id } = props.controller.model;
+      return controlRenders.find(
+        renderItem =>
+          renderItem.renderType === 'LAYOUTPANEL' &&
+          ![
+            `${id?.toLowerCase()}_tooltip`,
+            `${id?.toLowerCase()}_edit_tooltip`,
+          ].includes(renderItem.id!),
+      )?.layoutPanel;
+    };
+
     return {
       c,
       ns,
       tooltip,
+      editable,
       tooltipId,
       showTitle,
+      CustomHtml,
       editorProps,
       componentRef,
       gridEditItemProps,
       rowDataChange,
+      findLayoutPanel,
       onInfoTextChange,
       semanticClass,
       semanticStyle,
@@ -142,6 +164,25 @@ export const GridFieldEditColumn = defineComponent({
     const val = this.row.data[this.c.fieldName];
     let content = null;
     const editorSlot = `${this.controller.model.codeName}_editor`;
+
+    const renderEditor = () => {
+      return this.c.editorProvider
+        ? h(resolveComponent(this.c.editorProvider.gridEditor), {
+            class: this.ns.e('editor'),
+            value: val,
+            data: this.row.data,
+            controller: this.c.editor,
+            showTitle: this.showTitle,
+            overflowMode: this.c.grid.overflowMode,
+            onChange: this.rowDataChange,
+            onInfoTextChange: this.onInfoTextChange,
+            title: this.tooltip,
+            ...this.editorProps,
+            ...this.attrs,
+          })
+        : undefined;
+    };
+
     if (this.$slots[editorSlot]) {
       content = renderSlot(this.$slots, editorSlot!, {
         class: this.ns.e('editor'),
@@ -157,19 +198,25 @@ export const GridFieldEditColumn = defineComponent({
         ...this.attrs,
       });
     } else if (this.c.editorProvider) {
-      content = h(resolveComponent(this.c.editorProvider.gridEditor), {
-        class: this.ns.e('editor'),
-        value: val,
-        data: this.row.data,
-        controller: this.c.editor,
-        showTitle: this.showTitle,
-        overflowMode: this.c.grid.overflowMode,
-        onChange: this.rowDataChange,
-        onInfoTextChange: this.onInfoTextChange,
-        title: this.tooltip,
-        ...this.editorProps,
-        ...this.attrs,
-      });
+      const panel = this.findLayoutPanel();
+      if (this.editable) {
+        content = renderEditor();
+      } else if (this.c.isCustomCode) {
+        content = (
+          <span class={this.ns.e('script')} v-html={this.CustomHtml}></span>
+        );
+      } else if (panel) {
+        content = (
+          <iBizControlShell
+            data={this.row.data}
+            modelData={panel}
+            context={this.c.context}
+            params={this.c.params}
+          />
+        );
+      } else {
+        content = renderEditor();
+      }
     }
 
     return (

package/src/control/tree/tree.tsx

@@ -1139,7 +1139,14 @@ export const TreeControl = defineComponent({
                 const layoutPanel = getNodeControlPanel(nodeModel);
 
                 let content;
-                if (layoutPanel) {
+
+                const htmlCode = this.c.getCustomHtml(nodeModel, nodeData);
+
+                if (htmlCode) {
+                  content = (
+                    <div class={this.ns.e('script')} v-html={htmlCode}></div>
+                  );
+                } else if (layoutPanel) {
                   content = (
                     <iBizControlShell
                       data={nodeData}

package/src/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-edit-column/all-edit.ts

@@ -62,5 +62,6 @@ export function useAllEdit(
   return {
     gridEditItemProps,
     editorProps,
+    editable,
   };
 }

package/src/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-edit-column/cell-edit.ts

@@ -115,5 +115,6 @@ export function useCellEdit(
   return {
     gridEditItemProps,
     editorProps,
+    editable,
   };
 }

package/src/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-edit-column/row-edit.ts

@@ -54,5 +54,6 @@ export function useRowEdit(
   return {
     gridEditItemProps,
     editorProps,
+    editable,
   };
 }

package/src/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-edit-column/tree-grid-ex-edit-column.tsx

@@ -1,6 +1,15 @@
-import { h, defineComponent, resolveComponent, ref, computed } from 'vue';
+import {
+  h,
+  ref,
+  computed,
+  PropType,
+  ComputedRef,
+  defineComponent,
+  resolveComponent,
+} from 'vue';
 import { useNamespace, useSemanticNode } from '@ibiz-template/vue3-util';
 import { RuntimeError } from '@ibiz-template/core';
+import { IPanel } from '@ibiz/model-core';
 import {
   TreeGridExNodeColumnController,
   TreeGridExRowState,
@@ -22,6 +31,16 @@ export const TreeGridExEditColumn = defineComponent({
       type: TreeGridExRowState,
       required: true,
     },
+    isCustomCode: {
+      type: Boolean,
+      default: false,
+    },
+    panelModel: {
+      type: Object as PropType<IPanel>,
+    },
+    customHtml: {
+      type: String,
+    },
   },
   setup(props) {
     /** 行数据对应属性列的值 */
@@ -52,6 +71,7 @@ export const TreeGridExEditColumn = defineComponent({
     const useByShowMode = (): {
       gridEditItemProps: IData;
       editorProps: IData;
+      editable: ComputedRef<boolean>;
     } => {
       switch (c.treeGrid.editShowMode) {
         case 'cell':
@@ -68,7 +88,7 @@ export const TreeGridExEditColumn = defineComponent({
           );
       }
     };
-    const { gridEditItemProps, editorProps } = useByShowMode();
+    const { gridEditItemProps, editorProps, editable } = useByShowMode();
 
     const infoText = ref<string | undefined>(undefined);
     const onInfoTextChange = (text: string) => {
@@ -90,6 +110,7 @@ export const TreeGridExEditColumn = defineComponent({
       fieldValue,
       componentRef,
       tooltip,
+      editable,
       rowDataChange,
       onInfoTextChange,
       gridEditItemProps,
@@ -99,6 +120,42 @@ export const TreeGridExEditColumn = defineComponent({
     };
   },
   render() {
+    const renderEditor = () => {
+      return this.controller.editorProvider
+        ? h(resolveComponent(this.controller.editorProvider.gridEditor), {
+            class: this.ns.e('editor'),
+            value: this.fieldValue,
+            data: this.row.data,
+            controller: this.controller.editor,
+            overflowMode: this.controller.treeGrid.overflowMode,
+            onChange: this.rowDataChange,
+            onInfoTextChange: this.onInfoTextChange,
+            title: this.tooltip,
+            ...this.editorProps,
+          })
+        : undefined;
+    };
+
+    let content = null;
+    if (this.editable) {
+      content = renderEditor();
+    } else if (this.isCustomCode) {
+      content = (
+        <span class={this.ns.e('script')} v-html={this.customHtml}></span>
+      );
+    } else if (this.panelModel) {
+      content = (
+        <iBizControlShell
+          data={this.row.data}
+          modelData={this.panelModel}
+          context={this.controller.context}
+          params={this.controller.params}
+        />
+      );
+    } else {
+      content = renderEditor();
+    }
+
     return (
       <iBizGridEditItem
         {...{
@@ -114,18 +171,7 @@ export const TreeGridExEditColumn = defineComponent({
           ...this.gridEditItemProps,
         }}
       >
-        {this.controller.editorProvider &&
-          h(resolveComponent(this.controller.editorProvider.gridEditor), {
-            class: this.ns.e('editor'),
-            value: this.fieldValue,
-            data: this.row.data,
-            controller: this.controller.editor,
-            overflowMode: this.controller.treeGrid.overflowMode,
-            onChange: this.rowDataChange,
-            onInfoTextChange: this.onInfoTextChange,
-            title: this.tooltip,
-            ...this.editorProps,
-          })}
+        {content}
       </iBizGridEditItem>
     );
   },

package/src/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-field-column/tree-grid-ex-field-column.tsx

@@ -1,13 +1,13 @@
 import { computed, defineComponent, ref } from 'vue';
-import { IUIActionGroupDetail } from '@ibiz/model-core';
-import { useNamespace } from '@ibiz-template/vue3-util';
+import { IPanel, IUIActionGroupDetail } from '@ibiz/model-core';
+import { computedAsync, useNamespace } from '@ibiz-template/vue3-util';
 import {
   TreeGridExFieldColumnController,
   TreeGridExRowState,
 } from '@ibiz-template/runtime';
 import { isNotNil } from 'ramda';
-import './tree-grid-ex-field-column.scss';
 import { showTitle } from '@ibiz-template/core';
+import './tree-grid-ex-field-column.scss';
 
 export const TreeGridExFieldColumn = defineComponent({
   name: 'IBizTreeGridExFieldColumn',
@@ -53,6 +53,11 @@ export const TreeGridExFieldColumn = defineComponent({
       codeListText.value = text;
     };
 
+    const CustomHtml = computedAsync(async () => {
+      const html = await nodeColumn.value?.getCustomHtml(props.row);
+      return html;
+    });
+
     const showText = computed(() => {
       const nodeColumnC = nodeColumn.value;
       if (nodeColumnC) {
@@ -129,6 +134,22 @@ export const TreeGridExFieldColumn = defineComponent({
       await nodeColumn.value?.onActionClick(detail, props.row, event);
     };
 
+    /**
+     * @description 查找视图布局面板
+     * @returns {*}  {(IPanel | undefined)}
+     */
+    const findLayoutPanel = (): IPanel | undefined => {
+      const { controlRenders = [], id } = nodeColumn.value?.nodeColumn || {};
+      return controlRenders.find(
+        renderItem =>
+          renderItem.renderType === 'LAYOUTPANEL' &&
+          ![
+            `${id?.toLowerCase()}_tooltip`,
+            `${id?.toLowerCase()}_edit_tooltip`,
+          ].includes(renderItem.id!),
+      )?.layoutPanel;
+    };
+
     return {
       ns,
       zIndex,
@@ -137,21 +158,40 @@ export const TreeGridExFieldColumn = defineComponent({
       clickable,
       nodeColumn,
       fieldValue,
+      CustomHtml,
       onTextClick,
       onActionClick,
       onInfoTextChange,
+      findLayoutPanel,
     };
   },
   render() {
     let content = null;
-
+    const panel = this.findLayoutPanel();
     if (this.nodeColumn?.nodeEditItem) {
       content = (
         <iBizTreeGridExEditColumn
           controller={this.nodeColumn}
           row={this.row}
+          panelModel={panel}
+          customHtml={this.CustomHtml}
+          isCustomCode={this.nodeColumn.isCustomCode}
         ></iBizTreeGridExEditColumn>
       );
+    } else if (this.nodeColumn?.isCustomCode) {
+      content = (
+        <span class={this.ns.e('script')} v-html={this.CustomHtml}></span>
+      );
+    } else if (panel) {
+      content = (
+        <iBizControlShell
+          data={this.row.data}
+          modelData={panel}
+          class={this.ns.e('panel')}
+          context={this.controller.context}
+          params={this.controller.params}
+        ></iBizControlShell>
+      );
     } else if (this.nodeColumn?.codeList) {
       content = (
         <iBizCodeList

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

@@ -1,6 +1,15 @@
 /* eslint-disable no-nested-ternary */
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { defineComponent, onMounted, onUnmounted, Ref, ref, watch } from 'vue';
+import {
+  defineComponent,
+  onActivated,
+  onDeactivated,
+  onMounted,
+  onUnmounted,
+  Ref,
+  ref,
+  watch,
+} from 'vue';
 import { createUUID } from 'qx-util';
 import { ITextArea } from '@ibiz/model-core';
 import {
@@ -27,7 +36,7 @@ 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;
@@ -164,6 +173,18 @@ 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', {
@@ -221,6 +242,20 @@ export const IBizEmbedAIChat = defineComponent({
       mountedFlag = false;
     });
 
+    onDeactivated(() => {
+      const chatInstance = c.chatInstance;
+      if (chatInstance) {
+        chatInstance.onDeactivated();
+      }
+    });
+
+    onActivated(() => {
+      const chatInstance = c.chatInstance;
+      if (chatInstance) {
+        chatInstance.onActivated();
+      }
+    });
+
     return {
       c,
       ns,

package/src/editor/markdown/ibiz-markdown-editor/ibiz-markdown-editor.scss

@@ -189,7 +189,8 @@ $markdown-footer-button: (
         border-top: 1px solid getCssVar(markdown, border-color);
       }
 
-      .cherry-previewer{
+      .cherry-previewer {
+        min-height: 58px;
         border-top: 1px solid getCssVar(markdown, border-color);
         
         // 调整预览区图片鼠标移入样式

package/src/editor/text-box/input/input.tsx

@@ -52,6 +52,7 @@ import './input.scss';
  * @editorparams {"name":"srfaichunkview","parameterType":"string", "description":"知识切片视图，用于定义AI交谈打开目标知识切片视图"}
  * @editorparams {"name":"srfaichunkentity","parameterType":"string", "description":"知识切片实体，用于定义AI交谈打开知识切片视图数据主键key"}
  * @editorparams {"name":"srfaichatcaption","parameterType":"string", "description":"自定义AI交谈框标题"}
+ * @editorparams {"name":"showpassword","parameterType":"boolean", "description":"密码框是否显示切换密码图标"}
  * @ignoreprops overflowMode
  * @ignoreemits infoTextChange
  */
@@ -164,6 +165,13 @@ export const IBizInput = defineComponent({
       }
     });
 
+    const showPassword = computed(() => {
+      if (c.editorParams.showpassword) {
+        return c.toBoolean(c.editorParams.showpassword);
+      }
+      return type.value === 'password';
+    });
+
     // 是否显示表单默认内容
     const showFormDefaultContent = computed(() => {
       if (
@@ -436,6 +444,7 @@ export const IBizInput = defineComponent({
       isAuto,
       editorRef,
       showLimit,
+      showPassword,
       childClass,
       childStyle,
       isEditable,
@@ -520,7 +529,7 @@ export const IBizInput = defineComponent({
           class={[this.ns.b('input'), this.semanticClass('editor.content')]}
           disabled={this.disabled}
           style={this.semanticStyle('editor.content')}
-          show-password={this.type === 'password'}
+          show-password={this.showPassword}
           autocomplete={this.shouldAutoComplete}
           v-child-class={this.childClass}
           v-child-style={this.childStyle}