@ibiz-template/vue3-components 0.7.41-alpha.113 → 0.7.41-alpha.114

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

@@ -19,7 +19,11 @@ import {
   calcItemVisible,
 } from '@ibiz-template/runtime';
 import { getNestedRoutePath } from '@ibiz-template/vue3-util';
-import { IDEDRCtrlItem, IDEDRTab } from '@ibiz/model-core';
+import {
+  IAppDETabExplorerView,
+  IDEDRCtrlItem,
+  IDEDRTab,
+} from '@ibiz/model-core';
 import { Router } from 'vue-router';
 import { isNil } from 'ramda';
 
@@ -57,6 +61,13 @@ export class DRTabController
    */
   srfCacheKeyTempl: string = '';
 
+  /**
+   * @description 显示位置
+   * @type {(string | undefined)}
+   * @memberof DRTabController
+   */
+  tabPosition: string | undefined;
+
   /**
    * 导航占位控制器
    *
@@ -182,6 +193,7 @@ export class DRTabController
     super.initState();
     this.state.drTabPages = [];
     this.state.showMore = false;
+    this.state.expViewParams = {};
     // 未配置时默认隐藏编辑项
     this.state.hideEditItem = !!this.model.hideEditItem;
   }
@@ -193,6 +205,9 @@ export class DRTabController
    * @memberof DRTabController
    */
   async onCreated(): Promise<void> {
+    this.tabPosition = (
+      this.view.model as IAppDETabExplorerView
+    ).tabLayout?.toLowerCase();
     await super.onCreated();
     await this.initCounter();
     this.srfCacheKeyTempl = this.controlParams.srfcachekeytempl || '';
@@ -425,7 +440,7 @@ export class DRTabController
         testScriptCode,
         counterMode,
       } = item;
-      drTabPages.push({
+      const drTabPage: IDRTabPagesState = {
         tag: item.id!,
         caption: item.caption,
         sysImage: item.sysImage,
@@ -437,7 +452,15 @@ export class DRTabController
         testAppDELogicId,
         testScriptCode,
         counterMode,
-      });
+      };
+      if (this.tabPosition === 'flow_noheader' || this.tabPosition === 'flow') {
+        const { context, params } = this.prepareParams(item);
+        Object.assign(drTabPage, {
+          context,
+          params,
+        });
+      }
+      drTabPages.push(drTabPage);
     });
     this.state.drTabPages = drTabPages;
     this.state.defaultName = drTabPages[0].tag;
@@ -518,15 +541,15 @@ export class DRTabController
   /**
    * 准备参数
    *
-   * @param {IDEDRCtrlItem} drTabPages 关系分页
+   * @param {IDEDRCtrlItem} drTabPage 关系分页
    * @return {*}
    * @memberof DRTabController
    */
-  prepareParams(drTabPages: IDEDRCtrlItem): {
+  prepareParams(drTabPage: IDEDRCtrlItem): {
     context: IContext;
     params: IParams;
   } {
-    const { navigateContexts, navigateParams } = drTabPages;
+    const { navigateContexts, navigateParams } = drTabPage;
     const model = {
       navContexts: navigateContexts,
       navParams: navigateParams,
@@ -538,9 +561,13 @@ export class DRTabController
     };
     const { resultContext, resultParams } = calcNavParams(model, originParams);
     const context = Object.assign(this.context.clone(), resultContext, {
-      currentSrfNav: drTabPages.id,
+      currentSrfNav: drTabPage.id,
     });
-    const params = { ...this.params, ...resultParams };
+    const params = {
+      ...this.params,
+      ...resultParams,
+      ...this.state.expViewParams,
+    };
     return { context, params };
   }
 
@@ -549,22 +576,22 @@ export class DRTabController
    *
    * @author lxm
    * @date 2023-12-21 05:40:07
-   * @param {IDEDRCtrlItem} drTabPages
+   * @param {IDEDRCtrlItem} drTabPage
    * @param {boolean} [isRoutePushed=false]
    * @return {*}  {Promise<void>}
    */
   async openNavPosView(
-    drTabPages: IDEDRCtrlItem,
+    drTabPage: IDEDRCtrlItem,
     isRoutePushed = false,
     navViewKey?: string,
   ): Promise<void> {
-    const { context, params } = this.prepareParams(drTabPages);
-    if (!drTabPages.appViewId) return;
+    const { context, params } = this.prepareParams(drTabPage);
+    if (!drTabPage.appViewId) return;
     this.navPos?.openView({
-      key: navViewKey || drTabPages.id!,
+      key: navViewKey || drTabPage.id!,
       context,
       params,
-      viewId: drTabPages.appViewId,
+      viewId: drTabPage.appViewId,
       isRoutePushed,
     });
   }
@@ -600,6 +627,19 @@ export class DRTabController
    * @return {*}  {Promise<void>}
    */
   async refresh(): Promise<void> {
+    if (this.tabPosition === 'flow_noheader' || this.tabPosition === 'flow') {
+      this.state.drTabPages.forEach((tabPageState: IDRTabPagesState) => {
+        const dedrtabPage = this.model.dedrtabPages?.find(
+          item => item.id === tabPageState.tag,
+        );
+        if (dedrtabPage) {
+          const { context, params } = this.prepareParams(dedrtabPage);
+          tabPageState.context = context;
+          tabPageState.params = params;
+        }
+      });
+      return;
+    }
     const { activeName } = this.state;
     const drBarItem = this.model.dedrtabPages?.find(
       item => item.id === activeName,

package/src/control/drtab/drtab.tsx

@@ -319,7 +319,7 @@ export const DRTabControl = defineComponent({
           style={this.semanticStyle('root')}
           semanticClass={this.semanticClass}
           semanticStyle={this.semanticStyle}
-          pagesstate={this.visibleItems as IData[]}
+          pagesState={this.visibleItems as IData[]}
           drtabpages={this.modelData.dedrtabPages}
           context={this.c.context}
           params={this.c.params}

package/src/control/drtab/flow-drtab.tsx

@@ -23,7 +23,7 @@ import './flow-drtab.scss';
 export const FlowDrtab = defineComponent({
   name: 'FlowDrtab',
   props: {
-    pagesstate: {
+    pagesState: {
       type: Array as PropType<IData[]>,
       default: () => [],
     },
@@ -93,7 +93,7 @@ export const FlowDrtab = defineComponent({
 
     // 所有可视视图
     const allVisibleViews = computed(() => {
-      return props.pagesstate.filter(item => {
+      return props.pagesState.filter(item => {
         const target = props.drtabpages.find(page => {
           return page.id === item.tag;
         });
@@ -103,8 +103,8 @@ export const FlowDrtab = defineComponent({
 
     // 所有导航项元素id
     const allNavTags = computed(() => {
-      if (props.pagesstate) {
-        return props.pagesstate.map(item => {
+      if (props.pagesState) {
+        return props.pagesState.map(item => {
           const target = props.drtabpages.find(page => {
             return page.id === item.tag;
           });
@@ -222,7 +222,7 @@ export const FlowDrtab = defineComponent({
       });
       completedViews.value += 1;
       if (completedViews.value === allVisibleViews.value && !navtag.value) {
-        navtag.value = `${target?.appViewId}_${props.pagesstate[0].tag}`;
+        navtag.value = `${target?.appViewId}_${props.pagesState[0].tag}`;
       }
       const el = document.getElementById(`${target?.appViewId}_${item.tag}`);
       if (el) {
@@ -339,7 +339,7 @@ export const FlowDrtab = defineComponent({
                 navbarRef.value = el;
               }}
             >
-              {props.pagesstate.map(item => {
+              {props.pagesState.map(item => {
                 const target = props.drtabpages.find(page => {
                   return page.id === item.tag;
                 });
@@ -391,7 +391,7 @@ export const FlowDrtab = defineComponent({
     };
   },
   render() {
-    const tabs = this.pagesstate.map((item: IData) => {
+    const tabs = this.pagesState.map((item: IData) => {
       const counterNum = item.counterId
         ? this.counterData[item.counterId]
         : undefined;
@@ -467,8 +467,8 @@ export const FlowDrtab = defineComponent({
             }}
           >
             {h(viewShell, {
-              context: this.context,
-              params: this.params,
+              context: item.context || this.context,
+              params: item.params || this.params,
               viewId: target.appViewId,
               onMounted: () => this.onViewMounted(item),
             })}

package/src/control/exp-bar/render-util.tsx

@@ -61,11 +61,11 @@ export function useExpBarRender(
       >
         {model.sysImage && (
           <iBizIcon
-            style={semanticStyle('title.icon')}
             class={[
               expBarNs.be('caption', 'icon'),
-              semanticStyle('title.icon'),
+              semanticClass('title.icon'),
             ]}
+            style={semanticStyle('title.icon')}
             icon={model.sysImage}
           ></iBizIcon>
         )}
@@ -74,7 +74,7 @@ export function useExpBarRender(
             class={[
               ns.be('caption', 'text'),
               expBarNs.be('caption', 'text'),
-              semanticStyle('title.text'),
+              semanticClass('title.text'),
             ]}
             style={semanticStyle('title.text')}
           >

package/src/control/medit-view-panel/medit-view-panel.tsx

@@ -178,7 +178,7 @@ export const MEditViewPanelControl = defineComponent({
                                 this.ns.be('tab-label', 'remove'),
                                 this.semanticClass('tab.remove', { item }),
                               ]}
-                              style={this.semanticClass('tab.remove', { item })}
+                              style={this.semanticStyle('tab.remove', { item })}
                               name='close-outline'
                               onClick={(event: MouseEvent) =>
                                 this.handleTabDelete(item, event)

package/src/control/toolbar/toolbar.tsx

@@ -380,6 +380,7 @@ export const ToolbarControl = defineComponent({
                 ns2.bm('dropdown-popper', calcCssName(item)),
                 semanticClass('popup', { item }),
               ]}
+              popper-style={semanticStyle('popup', { item })}
               placement='right-start'
               teleported={false}
               popper-options={{

package/src/control/tree/tree.tsx

@@ -1230,7 +1230,7 @@ export const TreeControl = defineComponent({
           ref={'treeviewRef'}
           controller={this.c}
           class={this.semanticClass('root')}
-          style={this.semanticClass('root')}
+          style={this.semanticStyle('root')}
           v-loading={this.c.state.isLoading}
           element-loading-text={this.c.state.loadingText}
         >

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

@@ -377,6 +377,7 @@ export const TreeGridExControl = defineComponent({
               ref={'tableRef'}
               key={this.tableRefreshKey}
               class={[this.ns.e('table'), this.semanticClass('content')]}
+              style={this.semanticStyle('content')}
               border
               row-key='id'
               data={this.elTableData}

package/src/editor/date-picker/ibiz-date-picker/ibiz-date-picker.tsx

@@ -267,6 +267,7 @@ export const IBizDatePicker = defineComponent({
           this.ns.b('form-default-content'),
           this.semanticClass('editor.content'),
         ]}
+        style={this.semanticStyle('editor.content')}
       >
         {this.formatValue ? (
           this.formatValue

package/src/locale/en/index.ts

@@ -587,6 +587,7 @@ export default {
       importResults: 'Import Results',
       downloadTemplate: 'Download the import template and fill in as required:',
       templateFile: 'Data import template file',
+      template: 'Template',
       continue: 'Continue importing',
     },
     dataImport2: {

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

@@ -543,6 +543,7 @@ export default {
       importResults: '导入结果',
       downloadTemplate: '下载导入模版，并按要求填写：',
       templateFile: '数据导入模板文件',
+      template: '模板',
       continue: '继续导入',
     },
     dataImport2: {

package/src/panel-component/global-search/global-search.tsx

@@ -352,6 +352,7 @@ export const GlobalSearch = defineComponent({
           visible={this.visible}
           placement='bottom-start'
           popper-class={[this.ns.e('popper'), this.semanticClass('popup')]}
+          popper-style={this.semanticStyle('popup')}
         >
           {{
             reference: () => {

package/src/panel-component/nav-tabs/nav-tabs.tsx

@@ -321,6 +321,9 @@ export const NavTabs = defineComponent({
                                 item: msg,
                               }),
                             ]}
+                            style={this.semanticStyle('item.captioninfo', {
+                              item: msg,
+                            })}
                           >
                             {msg.caption}
                           </span>
@@ -332,6 +335,9 @@ export const NavTabs = defineComponent({
                                   item: msg,
                                 }),
                               ]}
+                              style={this.semanticStyle('item.captiondivider', {
+                                item: msg,
+                              })}
                             >
                               &nbsp;-&nbsp;
                             </span>
@@ -344,6 +350,9 @@ export const NavTabs = defineComponent({
                                   item: msg,
                                 }),
                               ]}
+                              style={this.semanticStyle('item.datainfo', {
+                                item: msg,
+                              })}
                             >
                               {msg.dataInfo}
                             </span>

package/src/panel-component/short-cut/short-cut.tsx

@@ -364,6 +364,7 @@ export const ShortCut = defineComponent({
           trigger='click'
           width='auto'
           popper-class={[ns.e('popover'), semanticClass('popup')]}
+          popper-style={semanticStyle('popup')}
         >
           {{
             reference: () => {

package/src/panel-component/user-message/user-message.tsx

@@ -133,6 +133,7 @@ export const UserMessage = defineComponent({
         <el-popover
           ref='popoverRef'
           popper-class={[this.ns.b('popover'), this.semanticClass('popup')]}
+          popper-style={this.semanticStyle('popup')}
           placement='bottom'
           trigger='click'
           v-model:visible={this.showPopover}

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

@@ -678,6 +678,12 @@ export class AIChatUtil implements IApiAIChatUtil {
         );
       },
     };
+    // 文件最大上传大小限制
+    let uploadMaxSize = ibiz.config.common.aiUploadMaxSize;
+    if (editorParams.srfuploadmaxsize) {
+      uploadMaxSize = Number(editorParams.srfuploadmaxsize);
+    }
+    chatOptions.uploader.maxSize = uploadMaxSize;
     // 扩展工具栏点击
     chatOptions.extendToolbarClick = async (
       event: MouseEvent,
@@ -1401,6 +1407,13 @@ export class AIChatUtil implements IApiAIChatUtil {
         );
       },
     };
+    // 文件最大上传大小限制
+    let uploadMaxSize = ibiz.config.common.aiUploadMaxSize;
+    if (params.hasOwnProperty('srfuploadmaxsize')) {
+      uploadMaxSize = Number(params.srfuploadmaxsize);
+      delete params.srfuploadmaxsize;
+    }
+    chatOptions.uploader.maxSize = uploadMaxSize;
     // 扩展工具栏点击
     chatOptions.extendToolbarClick = async (
       event: MouseEvent,