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

package/lib/panel-component/nav-tabs/nav-tabs.cjs

@@ -227,15 +227,24 @@ const NavTabs = /* @__PURE__ */ vue.defineComponent({
           }, [vue.createVNode("span", {
             "class": [this.ns.em("item", "captioninfo"), this.semanticClass("item.captioninfo", {
               item: msg
-            })]
+            })],
+            "style": this.semanticStyle("item.captioninfo", {
+              item: msg
+            })
           }, [msg.caption]), msg.dataInfo && vue.createVNode("span", {
             "class": [this.ns.em("item", "captiondivider"), this.semanticClass("item.captiondivider", {
               item: msg
-            })]
+            })],
+            "style": this.semanticStyle("item.captiondivider", {
+              item: msg
+            })
           }, [vue.createTextVNode("\xA0-\xA0")]), msg.dataInfo && vue.createVNode("span", {
             "class": [this.ns.em("item", "datainfo"), this.semanticClass("item.datainfo", {
               item: msg
-            })]
+            })],
+            "style": this.semanticStyle("item.datainfo", {
+              item: msg
+            })
           }, [msg.dataInfo])])]);
         }
       });

package/lib/panel-component/short-cut/short-cut.cjs

@@ -219,7 +219,8 @@ const ShortCut = /* @__PURE__ */ vue.defineComponent({
         "placement": "top-start",
         "trigger": "click",
         "width": "auto",
-        "popper-class": [ns.e("popover"), semanticClass("popup")]
+        "popper-class": [ns.e("popover"), semanticClass("popup")],
+        "popper-style": semanticStyle("popup")
       }, {
         reference: () => {
           return vue.createVNode("div", {

package/lib/panel-component/user-message/user-message.cjs

@@ -106,6 +106,7 @@ const UserMessage = /* @__PURE__ */ vue.defineComponent({
     }, [vue.createVNode(vue.resolveComponent("el-popover"), {
       "ref": "popoverRef",
       "popper-class": [this.ns.b("popover"), this.semanticClass("popup")],
+      "popper-style": this.semanticStyle("popup"),
       "placement": "bottom",
       "trigger": "click",
       "visible": this.showPopover,

package/lib/util/ai-chat-util/ai-chat-util.cjs

@@ -105,7 +105,10 @@ class AIChatUtil {
       params,
       data
     ) : void 0;
-    chatOptions.autoQuestion = editorParams.autoquestion !== "false";
+    chatOptions.autoQuestion = ibiz.config.common.aiAutoQuestion;
+    if (editorParams.autoquestion) {
+      chatOptions.autoQuestion = editorParams.autoquestion !== "false";
+    }
     chatOptions.autoFill = editorParams.autofill === "true";
     chatOptions.appendCurResource = editorParams.srfaiappendresource ? core.StringUtil.fill(editorParams.srfaiappendresource, context, params, data) : void 0;
     if (editorParams.srfmode) {
@@ -509,6 +512,11 @@ class AIChatUtil {
         );
       }
     };
+    let uploadMaxSize = ibiz.config.common.aiUploadMaxSize;
+    if (editorParams.srfuploadmaxsize) {
+      uploadMaxSize = Number(editorParams.srfuploadmaxsize);
+    }
+    chatOptions.uploader.maxSize = uploadMaxSize;
     chatOptions.extendToolbarClick = async (event, source, context2, params2, data2) => {
       var _a2, _b, _c;
       const { id: id2, isPluginApp } = source;
@@ -664,10 +672,12 @@ class AIChatUtil {
       );
       delete params.srfaiappendcurcontent;
     }
+    let autoQuestion = ibiz.config.common.aiAutoQuestion;
     if (params.hasOwnProperty("autoquestion")) {
-      chatOptions.autoQuestion = params.autoquestion !== "false";
+      autoQuestion = params.autoquestion !== "false";
       delete params.autoquestion;
     }
+    chatOptions.autoQuestion = autoQuestion;
     if (params.hasOwnProperty("srfaiappendresource")) {
       chatOptions.appendCurResource = core.StringUtil.fill(
         params.srfaiappendresource,
@@ -1086,6 +1096,12 @@ class AIChatUtil {
         );
       }
     };
+    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, source, context2, params2, data2) => {
       var _a2, _b, _c;
       const { id: id2, isPluginApp } = source;

package/lib/util/fullscreen/fullscreen-util.cjs

@@ -2,7 +2,7 @@
 
 var vue = require('vue');
 var ElementPlus = require('element-plus');
-var namespace = require('../../node_modules/.pnpm/@ibiz-template_core@0.7.41-alpha.117_axios@1.12.2_lodash-es@4.17.21_qs@6.14.0_qx-util@0.4.8_ramda@0.29.1/node_modules/@ibiz-template/core/out/utils/namespace/namespace.cjs');
+var namespace = require('../../node_modules/.pnpm/@ibiz-template_core@0.7.41-alpha.119_axios@1.12.2_lodash-es@4.17.21_qs@6.14.0_qx-util@0.4.8_ramda@0.29.1/node_modules/@ibiz-template/core/out/utils/namespace/namespace.cjs');
 var fullscreenToolbar = require('../../common/fullscreen-toolbar/fullscreen-toolbar.cjs');
 
 "use strict";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/vue3-components",
-  "version": "0.7.41-alpha.113",
+  "version": "0.7.41-alpha.115",
   "description": "web端组件库(vue3)",
   "main": "lib/index.cjs",
   "module": "es/index.mjs",
@@ -31,16 +31,16 @@
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
     "@floating-ui/dom": "^1.5.3",
-    "@ibiz-template-plugin/ai-chat": "^0.0.87",
+    "@ibiz-template-plugin/ai-chat": "^0.0.89",
     "@ibiz-template-plugin/gantt": "0.1.8-alpha.468",
     "@ibiz-template-plugin/bi-report": "0.0.32",
     "@ibiz-template-plugin/data-view": "0.0.7",
-    "@ibiz-template/core": "0.7.41-alpha.117",
+    "@ibiz-template/core": "0.7.41-alpha.119",
     "@ibiz-template/devtool": "0.0.16",
-    "@ibiz-template/model-helper": "0.7.41-alpha.118",
-    "@ibiz-template/runtime": "0.7.41-alpha.118",
+    "@ibiz-template/model-helper": "0.7.41-alpha.121",
+    "@ibiz-template/runtime": "0.7.41-alpha.121",
     "@ibiz-template/theme": "0.7.39",
-    "@ibiz-template/vue3-util": "0.7.41-alpha.118",
+    "@ibiz-template/vue3-util": "0.7.41-alpha.121",
     "@ibiz-template/web-theme": "3.16.0",
     "@ibiz/model-core": "^0.1.89",
     "@imengyu/vue3-context-menu": "^1.3.5",

package/src/common/button-list/button-list.tsx

@@ -253,7 +253,10 @@ export const IBizButtonList = defineComponent({
               },
             ],
           }}
-          popper-style={`z-index: ${zIndex.zIndex}`}
+          popper-style={{
+            zIndex: zIndex.zIndex,
+            ...props.semantic.semanticStyle('popup', { model: detail }),
+          }}
         >
           {{
             reference: () => {

package/src/common/data-import/data-import.tsx

@@ -1,12 +1,11 @@
 import { IAppDataEntity, IAppDEDataImport } from '@ibiz/model-core';
 import { useNamespace } from '@ibiz-template/vue3-util';
 import { defineComponent, ref, PropType } from 'vue';
-
-import './data-import.scss';
 import {
-  downloadImportTemplate,
   selectAndImport,
+  downloadImportTemplate,
 } from '@ibiz-template/runtime';
+import './data-import.scss';
 
 export const DataImport = defineComponent({
   name: 'DataImport',
@@ -46,6 +45,11 @@ export const DataImport = defineComponent({
 
     const isLoading = ref(false);
 
+    const importTemplName =
+      ibiz.config.common.importTemplNameMode === 'custom'
+        ? `${props.dataImport?.name}${ibiz.i18n.t('component.dataImport.template')}`
+        : `${props.appDataEntity.logicName}${ibiz.i18n.t('component.dataImport.templateFile')}`;
+
     const onCancelButtonClick = () => {
       props.dismiss();
     };
@@ -57,11 +61,18 @@ export const DataImport = defineComponent({
         props.dataImport,
         props.context,
         props.params,
+        ibiz.config.common.importTemplNameMode === 'custom'
+          ? importTemplName
+          : undefined,
       );
     };
 
     const selectFile = async () => {
       isLoading.value = true;
+      // 重置提示信息
+      errorMessage.value = '';
+      message.value.message = '';
+      message.value.state = 'ready';
       const result = await selectAndImport({
         appDataEntity: props.appDataEntity,
         dataImport: props.dataImport,
@@ -101,12 +112,13 @@ export const DataImport = defineComponent({
 
     return {
       ns,
-      onLinkClick,
-      selectFile,
-      onCancelButtonClick,
-      isLoading,
       message,
+      isLoading,
       errorMessage,
+      importTemplName,
+      selectFile,
+      onLinkClick,
+      onCancelButtonClick,
     };
   },
   render() {
@@ -149,8 +161,7 @@ export const DataImport = defineComponent({
           </div>
           <div class={this.ns.e('template-link')} onClick={this.onLinkClick}>
             <ion-icon class={this.ns.e('link-icon')} name='link' />
-            {this.appDataEntity.logicName}
-            {ibiz.i18n.t('component.dataImport.templateFile')}
+            {this.importTemplName}
           </div>
         </div>
         <div class={this.ns.e('button-bar')}>

package/src/control/calendar/components/calendar-user2/calendar-user2.tsx

@@ -157,7 +157,7 @@ export const CalendarUser2 = defineComponent({
             class={[
               this.ns.e('legend'),
               this.ns.em('header', 'legend'),
-              this.semanticStyle('legend'),
+              this.semanticClass('legend'),
             ]}
             style={this.semanticStyle('legend')}
           >
@@ -168,7 +168,7 @@ export const CalendarUser2 = defineComponent({
                     class={[
                       this.ns.e('legend-item'),
                       this.ns.em('legend', 'item'),
-                      this.semanticStyle('legend.item'),
+                      this.semanticClass('legend.item'),
                     ]}
                     style={this.semanticStyle('legend.item')}
                     onClick={() => this.$emit('legendClick', legend)}

package/src/control/calendar/components/custom-calendar/custom-calendar.tsx

@@ -171,7 +171,7 @@ export const CustomCalendar = defineComponent({
      */
     const renderDay = () => {
       return (
-        <div class={ns.e('calendar-day')} style={props.semanticStyle('day')}>
+        <div class={ns.e('calendar-day')}>
           {slots?.header ? (
             <div
               class={[

package/src/control/dashboard/portlet/menu-portlet/app-menu-portlet/app-menu-portlet.tsx

@@ -170,6 +170,7 @@ export const AppMenuPortletControl = defineComponent({
       content = (
         <el-collapse
           class={[this.ns.e('content'), this.semanticClass('content')]}
+          style={this.semanticStyle('content')}
           v-model={this.defaultOpens}
         >
           {model.appMenuItems.map(item => {
@@ -185,6 +186,7 @@ export const AppMenuPortletControl = defineComponent({
     return (
       <iBizControlBase
         class={[this.ns.b(), this.semanticClass('root')]}
+        style={this.semanticStyle('root')}
         controller={this.c}
       >
         {content}

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;
+
   /**
    * 导航占位控制器
    *
@@ -103,6 +114,16 @@ export class DRTabController
     return `${userId}_${this.view.model.codeName}_${this.model.codeName}`;
   }
 
+  /**
+   * @description 是否启用折叠
+   * @readonly
+   * @type {boolean}
+   * @memberof DRTabController
+   */
+  get enableCollapse(): boolean {
+    return this.controlParams.enablecollapse === 'true';
+  }
+
   /**
    * 是否启用锚点栏
    *
@@ -114,7 +135,7 @@ export class DRTabController
     if (this.controlParams.enablenavbar) {
       return this.controlParams.enablenavbar === 'true';
     }
-    return (ibiz.config as IData).drtab.enableNavbar;
+    return ibiz.config.drtab.enableNavbar;
   }
 
   /**
@@ -126,8 +147,8 @@ export class DRTabController
    */
   get navbarpos(): string {
     return (
-      (this.controlParams.navbarpos as string)?.toLowerCase() ||
-      ((ibiz.config as IData).drtab.navbarPos as string).toLowerCase()
+      this.controlParams.navbarpos?.toLowerCase() ||
+      ibiz.config.drtab.navbarPos.toLowerCase()
     );
   }
 
@@ -139,9 +160,7 @@ export class DRTabController
    * @memberof DRTabController
    */
   get navbarwidth(): string | number {
-    return (
-      this.controlParams.navbarwidth || (ibiz.config as IData).drtab.navbarWidth
-    );
+    return this.controlParams.navbarwidth || ibiz.config.drtab.navbarWidth;
   }
 
   /**
@@ -182,6 +201,8 @@ export class DRTabController
     super.initState();
     this.state.drTabPages = [];
     this.state.showMore = false;
+    this.state.expandedKeys = [];
+    this.state.expViewParams = {};
     // 未配置时默认隐藏编辑项
     this.state.hideEditItem = !!this.model.hideEditItem;
   }
@@ -193,6 +214,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 +449,7 @@ export class DRTabController
         testScriptCode,
         counterMode,
       } = item;
-      drTabPages.push({
+      const drTabPage: IDRTabPagesState = {
         tag: item.id!,
         caption: item.caption,
         sysImage: item.sysImage,
@@ -437,7 +461,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;
@@ -450,6 +482,9 @@ export class DRTabController
         this.state.activeName = activeName;
       }
     }
+    // 折叠模式下默认展开所有项
+    if (this.enableCollapse)
+      this.state.expandedKeys = this.state.drTabPages.map(tab => tab.tag);
     // 路由模式下，且有子路由的时候不需要navpos跳转路由，只要做呈现
     const isRoutePushed = !!this.routeDepth && hasSubRoute(this.routeDepth);
     this.handleTabChange(isRoutePushed);
@@ -518,15 +553,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 +573,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 +588,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 +639,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,
@@ -660,4 +712,18 @@ export class DRTabController
         page.caption = ibiz.i18n.t(page.capLanguageRes.lanResTag, page.caption);
     });
   }
+
+  /**
+   * @description 折叠改变
+   * @param {string} id
+   * @memberof DRTabController
+   */
+  onCollapseChange(id: string): void {
+    const index = this.state.expandedKeys.findIndex(key => key === id);
+    if (index > -1) {
+      this.state.expandedKeys.splice(index, 1);
+    } else {
+      this.state.expandedKeys.push(id);
+    }
+  }
 }

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.scss

@@ -46,6 +46,12 @@ $control-drtab-flow-item-counter: (
   overflow: hidden;
   background-color: getCssVar('control-drtab-flow', 'bg-color');
 
+  @include e('icon') {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+
   @include e('container') {
     height: 100%;
     overflow: auto;
@@ -55,6 +61,21 @@ $control-drtab-flow-item-counter: (
     background-color: getCssVar('control-drtab-flow-item', 'bg-color');
     border-radius: getCssVar('control-drtab-flow-item', 'border-radius');
 
+    @include when('enable-collapse') {
+      .#{bem('flow-drtab', 'tab-item', 'label')} {
+        cursor: pointer;
+      }
+    }
+
+    @include when('collapse') {
+      .#{bem('flow-drtab', 'icon', 'collapse')} {
+        transform: rotate(-90deg);
+      }
+      .#{bem('flow-drtab', 'tab-item', 'tab-view')} {
+        display: none;
+      }
+    }
+
     @include m('label') {
       display: flex;
       gap: getCssVar('control-drtab-flow-item', 'gap');