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

package/src/locale/en/index.ts

@@ -937,14 +937,6 @@ export default {
       failed: 'File upload failure',
       title: 'Process manager',
     },
-    appUtil: {
-      aiTitle: 'delete conversation',
-      aiDesc:
-        'After deletion, the conversation will not be recoverable. Are you sure to delete?',
-      clearTopic: 'Clear conversation',
-      clearTopicDesc:
-        'Are you sure to clear all conversation data except for the current activation item?',
-    },
     appModal: {
       prev: 'Previous record',
       next: 'Next record',

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

@@ -880,12 +880,6 @@ export default {
       failed: '文件上传失败',
       title: '进程管理器',
     },
-    appUtil: {
-      aiTitle: '删除对话',
-      aiDesc: '删除后，该对话将不可恢复。确认删除吗？',
-      clearTopic: '清空会话',
-      clearTopicDesc: '确认清空除当前激活项外的所有会话数据？',
-    },
     appModal: {
       prev: '上一个记录',
       next: '下一个记录',

package/src/panel-component/app-extend-menu/bottom-side-menu/bottom-side-menu.tsx

@@ -50,6 +50,7 @@ export const BottomSideMenu = defineComponent({
         <iBizCommonExtendMenu
           renderMode={this.controller.rawItemParams.rendermode}
           items={this.state.items}
+          controller={this.controller}
           menuItemsState={this.state.menuItemsState}
           providers={this.controller.itemProviders}
           position={'BOTTOM'}

package/src/panel-component/app-extend-menu/extend-menu-base/common-extend-menu/common-extend-menu.tsx

@@ -7,6 +7,7 @@ import { useNamespace } from '@ibiz-template/vue3-util';
 import './common-extend-menu.scss';
 import { ExtendButtonMenu } from '../extend-button-menu/extend-button-menu';
 import { ExtendStandardMenu } from '../extend-standard-menu/extend-standard-menu';
+import { ExtendMenuBaseController } from '../extend-menu-base.controller';
 
 /**
  * 扩展基础菜单
@@ -73,6 +74,10 @@ export const CommonExtendMenu = defineComponent({
     layout: {
       type: Object as PropType<ILayout>,
     },
+    controller: {
+      type: Object as PropType<ExtendMenuBaseController>,
+      required: true,
+    },
   },
   emits: {
     /**
@@ -99,6 +104,7 @@ export const CommonExtendMenu = defineComponent({
     let content = (
       <ExtendButtonMenu
         items={this.items}
+        controller={this.controller}
         menuItemsState={this.menuItemsState}
         providers={this.providers}
         position={this.position}
@@ -112,6 +118,7 @@ export const CommonExtendMenu = defineComponent({
       content = (
         <ExtendStandardMenu
           items={this.items}
+          controller={this.controller}
           menuItemsState={this.menuItemsState}
           providers={this.providers}
           position={this.position}

package/src/panel-component/app-extend-menu/extend-menu-base/extend-button-menu/extend-button-menu.scss

@@ -74,6 +74,10 @@ $extend-menu-button-rawitem: (
     height: 100%;
     padding: getCssVar('extend-menu-button', 'padding');
 
+    @include e('panel') {
+        line-height: normal;
+    }
+      
     @include e('menuitem') {
         width: 100%;
         height: 100%;

package/src/panel-component/app-extend-menu/extend-menu-base/extend-button-menu/extend-button-menu.tsx

@@ -18,6 +18,7 @@ import {
   useCascaderPopover,
   IMenuSemantic,
 } from '../extend-menu-base.util';
+import { ExtendMenuBaseController } from '../extend-menu-base.controller';
 import './extend-button-menu.scss';
 
 const rightArrow = () => (
@@ -35,11 +36,30 @@ const rightArrow = () => (
   </svg>
 );
 
+function renderItemRender(params: IMenuItemParams) {
+  const { ns, menu, controller } = params;
+  const panel = menu.controlRenders?.find(
+    render => render.renderType === 'LAYOUTPANEL',
+  )?.layoutPanel;
+  if (panel)
+    return (
+      <iBizControlShell
+        class={ns.e('panel')}
+        modelData={panel}
+        context={controller.context}
+        params={controller.params}
+      />
+    );
+  const htmlCode = controller.getCustomHtml(menu);
+  if (htmlCode) return <div class={ns.e('script')} v-html={htmlCode}></div>;
+}
+
 function renderMenuItem(params: IMenuItemParams): VNode | undefined {
   const { ns, menu, menuAlign, menuItemsState, semantic } = params;
 
   if (!menu.id || !menuItemsState[menu.id]?.visible) return;
-
+  const render = renderItemRender(params);
+  if (render) return render;
   if (menu.itemType === 'MENUITEM') {
     return (
       <el-button
@@ -122,6 +142,7 @@ function renderMenuContent(_params: IMenuContentParams) {
     menuItemsState,
     showCascaderArrow,
     semantic,
+    controller,
     handleMenuItemClick,
     handleMenuItemMouseEnter,
     handleMenuItemMouseLeave,
@@ -146,6 +167,7 @@ function renderMenuContent(_params: IMenuContentParams) {
               menuAlign,
               menuItemsState,
               semantic,
+              controller,
             });
             if (!menuItem) return;
 
@@ -226,6 +248,10 @@ export const ExtendButtonMenu = defineComponent({
         semanticStyle: () => '',
       }),
     },
+    controller: {
+      type: Object as PropType<ExtendMenuBaseController>,
+      required: true,
+    },
   },
   emits: {
     menuItemClick: (item: IAppMenuItem, event: MouseEvent) => true,
@@ -252,6 +278,7 @@ export const ExtendButtonMenu = defineComponent({
         showCascaderArrow: true,
         isLayout: false,
         semantic: props.semantic,
+        controller: props.controller,
       });
     };
     const renderBorderContent = () => {
@@ -267,6 +294,7 @@ export const ExtendButtonMenu = defineComponent({
         showCascaderArrow: true,
         isLayout: false,
         semantic: props.semantic,
+        controller: props.controller,
       });
     };
 
@@ -347,6 +375,7 @@ export const ExtendButtonMenu = defineComponent({
             handleMenuItemMouseEnter: this.handleMenuItemMouseEnter,
             handleMenuItemMouseLeave: this.handleMenuItemMouseLeave,
             semantic: this.semantic,
+            controller: this.controller,
           })}
       </div>
     );

package/src/panel-component/app-extend-menu/extend-menu-base/extend-menu-base.controller.ts

@@ -11,6 +11,7 @@ import {
   PanelItemController,
   IAppMenuItemProvider,
   getAppMenuItemProvider,
+  ScriptFactory,
 } from '@ibiz-template/runtime';
 import { IAppMenu, IAppMenuItem, IPanelRawItem } from '@ibiz/model-core';
 import { recursiveIterate, RuntimeModelError } from '@ibiz-template/core';
@@ -327,4 +328,32 @@ export class ExtendMenuBaseController extends PanelItemController<IPanelRawItem>
       },
     );
   }
+
+  /**
+   * @description 解析获取脚本代码html
+   * @param {IAppMenuItem} menuItem
+   * @returns {*}  {(string | undefined)}
+   * @memberof ExtendMenuBaseController
+   */
+  getCustomHtml(menuItem: IAppMenuItem): string | undefined {
+    const { controlRenders = [] } = menuItem;
+    let scriptCode = controlRenders.find(
+      render => render.renderType === 'LAYOUTPANEL_MODEL',
+    )?.layoutPanelModel;
+    if (scriptCode) {
+      // 兼容单行模式
+      if (!scriptCode.includes('return')) scriptCode = `return (${scriptCode})`;
+      return ScriptFactory.execScriptFn(
+        {
+          context: this.context,
+          params: this.params,
+          ctrl: this,
+          view: this.view,
+          metadata: { model: menuItem },
+        },
+        scriptCode,
+        { isAsync: false },
+      ) as string;
+    }
+  }
 }

package/src/panel-component/app-extend-menu/extend-menu-base/extend-menu-base.util.ts

@@ -8,6 +8,7 @@ import { h, ref, Ref, VNode, onMounted, onUnmounted } from 'vue';
 import { IAppMenuItem, IFlexLayout, ILayout } from '@ibiz/model-core';
 import { IAppMenuItemProvider } from '@ibiz-template/runtime';
 import { Namespace } from '@ibiz-template/core';
+import { ExtendMenuBaseController } from './extend-menu-base.controller';
 
 /**
  * @description 组件传参类型定义
@@ -86,6 +87,8 @@ export interface IMenuRenderParams {
   menuItemsState: { [p: string]: { visible: boolean; permitted: boolean } };
   // 语义化节点数据
   semantic: IMenuSemantic;
+  /** 控制器 */
+  controller: ExtendMenuBaseController;
 }
 
 /**

package/src/panel-component/app-extend-menu/extend-menu-base/extend-standard-menu/extend-standard-menu.scss

@@ -183,6 +183,10 @@ $extend-standard-menu-divider: (
   width: 100%;
   height: 100%;
 
+  @include e('panel') {
+    line-height: normal;
+  }
+
   @include e('content') {
     position: relative;
     width: 100%;

package/src/panel-component/app-extend-menu/extend-menu-base/extend-standard-menu/extend-standard-menu.tsx

@@ -12,12 +12,31 @@ import {
   IMenuBaseItem,
   IMenuSemantic,
 } from '../extend-menu-base.util';
+import { ExtendMenuBaseController } from '../extend-menu-base.controller';
 import './extend-standard-menu.scss';
 
 const ellipsisSvg = (): VNode => {
   return <ion-icon name='ellipsis-horizontal'></ion-icon>;
 };
 
+function renderItemRender(params: IStandardMenuItemParams) {
+  const { ns, menu, controller } = params;
+  const panel = menu.controlRenders?.find(
+    render => render.renderType === 'LAYOUTPANEL',
+  )?.layoutPanel;
+  if (panel)
+    return (
+      <iBizControlShell
+        class={ns.e('panel')}
+        modelData={panel}
+        context={controller.context}
+        params={controller.params}
+      />
+    );
+  const htmlCode = controller.getCustomHtml(menu);
+  if (htmlCode) return <div class={ns.e('script')} v-html={htmlCode}></div>;
+}
+
 /**
  * 绘制菜单项
  * @param {IStandardMenuItemParams} _params
@@ -30,7 +49,7 @@ function renderMenuItem(_params: IStandardMenuItemParams): VNode | undefined {
   if (!menu.id || (menuItemsState && !menuItemsState[menu.id]?.visible)) {
     return;
   }
-
+  const render = renderItemRender(_params);
   if (menu.itemType === 'MENUITEM') {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     let content: any;
@@ -80,7 +99,7 @@ function renderMenuItem(_params: IStandardMenuItemParams): VNode | undefined {
         ),
       ];
     }
-
+    if (render) content = render;
     return !(isFirst && collapse) ? (
       <el-menu-item
         class={[
@@ -118,6 +137,7 @@ function renderMenuItem(_params: IStandardMenuItemParams): VNode | undefined {
   if (menu.itemType === 'SEPERATOR') {
     const direction =
       menuAlign === 'horizontal' && isFirst ? 'vertical' : 'horizontal';
+    if (render) return render;
     return (
       <el-divider
         direction={direction}
@@ -142,7 +162,7 @@ function renderMenuItem(_params: IStandardMenuItemParams): VNode | undefined {
         ]}
         style={semantic.semanticStyle('rawitem', { item: menu })}
       >
-        <iBizRawItem rawItem={menu}></iBizRawItem>
+        {render || <iBizRawItem rawItem={menu}></iBizRawItem>}
       </el-menu-item>
     );
   }
@@ -154,8 +174,16 @@ function renderMenuItem(_params: IStandardMenuItemParams): VNode | undefined {
  * @returns {*}
  */
 function renderSubmenu(_params: IStandardMenuItemParams): VNode | undefined {
-  const { isFirst, menu, collapse, ns, menuAlign, menuItemsState, semantic } =
-    _params;
+  const {
+    isFirst,
+    menu,
+    collapse,
+    ns,
+    menuAlign,
+    menuItemsState,
+    semantic,
+    controller,
+  } = _params;
   if (!menu.id || (menuItemsState && !menuItemsState[menu.id]?.visible)) {
     return;
   }
@@ -187,6 +215,7 @@ function renderSubmenu(_params: IStandardMenuItemParams): VNode | undefined {
                 menuAlign,
                 menuItemsState,
                 semantic,
+                controller,
               });
             }
             return renderMenuItem({
@@ -197,6 +226,7 @@ function renderSubmenu(_params: IStandardMenuItemParams): VNode | undefined {
               menuAlign,
               menuItemsState,
               semantic,
+              controller,
             });
           }),
         title: () => {
@@ -259,6 +289,7 @@ function renderMenuContent(_params: IStandardMenuContentParams): VNode {
     menus,
     menuItemsState,
     semantic,
+    controller,
     handleMenuSelect,
   } = _params;
 
@@ -296,6 +327,7 @@ function renderMenuContent(_params: IStandardMenuContentParams): VNode {
                   menuAlign,
                   menuItemsState,
                   semantic,
+                  controller,
                 });
               }
               return renderMenuItem({
@@ -306,6 +338,7 @@ function renderMenuContent(_params: IStandardMenuContentParams): VNode {
                 menuAlign,
                 menuItemsState,
                 semantic,
+                controller,
               });
             });
           },
@@ -347,6 +380,10 @@ export const ExtendStandardMenu = defineComponent({
         semanticStyle: () => '',
       }),
     },
+    controller: {
+      type: Object as PropType<ExtendMenuBaseController>,
+      required: true,
+    },
   },
   emits: {
     /**
@@ -411,6 +448,7 @@ export const ExtendStandardMenu = defineComponent({
           menuItemsState: this.menuItemsState,
           handleMenuSelect: this.handleMenuSelect,
           semantic: this.semantic,
+          controller: this.controller,
         })}
       </div>
     );

package/src/panel-component/app-extend-menu/left-side-menu/left-side-menu.tsx

@@ -48,6 +48,7 @@ export const LeftSideMenu = defineComponent({
         style={this.semanticStyle('root')}
       >
         <iBizCommonExtendMenu
+          controller={this.controller}
           renderMode={this.controller.rawItemParams.rendermode}
           items={this.state.items}
           menuItemsState={this.state.menuItemsState}

package/src/panel-component/app-extend-menu/right-side-menu/right-side-menu.tsx

@@ -50,6 +50,7 @@ export const RightSideMenu = defineComponent({
         <iBizCommonExtendMenu
           renderMode={this.controller.rawItemParams.rendermode}
           items={this.state.items}
+          controller={this.controller}
           menuItemsState={this.state.menuItemsState}
           providers={this.controller.itemProviders}
           position={'RIGHT'}

package/src/panel-component/app-extend-menu/top-side-menu/top-side-menu.tsx

@@ -50,6 +50,7 @@ export const TopSideMenu = defineComponent({
         <iBizCommonExtendMenu
           renderMode={this.controller.rawItemParams.rendermode}
           items={this.state.items}
+          controller={this.controller}
           menuItemsState={this.state.menuItemsState}
           providers={this.controller.itemProviders}
           position={'TOP'}