@oinone/kunlun-vue-admin-base 7.1.0 → 7.2.0

package/src/view/homepage-setting/field/HomepageSettingFieldWidget.ts

@@ -2,12 +2,12 @@ import { type RuntimeView, ViewCache } from '@oinone/kunlun-engine';
 import { ViewType } from '@oinone/kunlun-meta';
 import { SPI } from '@oinone/kunlun-spi';
 import { Widget } from '@oinone/kunlun-vue-widget';
-import { FormWidget } from '../../form';
 import { FormFieldWidget } from '../../../basic/field';
 import { createRuntimeContextForWidget } from '../../../tags';
-import { AbstractHomepageSettingFieldWidget } from './AbstractHomepageSettingFieldWidget';
+import { FormWidget } from '../../form';
 import { BindingTypeEnum, type HomepageConfigRule } from '../typing';
 import type { WidgetConstructor } from './AbstractHomepageSettingFieldWidget';
+import { AbstractHomepageSettingFieldWidget } from './AbstractHomepageSettingFieldWidget';
 
 const HomepageSettingField_MODEL = 'base.HomePageConfigRules';
 
@@ -15,7 +15,7 @@ const HomepageSettingField_MODEL = 'base.HomePageConfigRules';
 export class HomepageSettingFieldWidget extends AbstractHomepageSettingFieldWidget<HomepageConfigRule[]> {
   protected loadNodeWidgets() {
     this.isReady = false;
-    this.createNodeWidgets().then(() => {
+    this.createNodeWidgets().finally(() => {
       this.isReady = true;
     });
   }
@@ -39,7 +39,7 @@ export class HomepageSettingFieldWidget extends AbstractHomepageSettingFieldWidg
       console.error(`Invalid view UiDesignerTreeNodeMetadataForm`);
       return [];
     }
-    let widget: { new (): FormWidget } = FormWidget;
+    const widget: { new (): FormWidget } = FormWidget;
     const runtimeContext = createRuntimeContextForWidget(view);
     const data = this.initData(initData);
     this.useHomepageSetting.setUnCommittedRule(data);
@@ -63,7 +63,7 @@ export class HomepageSettingFieldWidget extends AbstractHomepageSettingFieldWidg
     this.activeRecords![0][this.itemName] = this.runtimeHomepageConfigRules;
     const nodes = this.runtimeHomepageConfigRules!;
     const length = nodes.length;
-    let widget: WidgetConstructor = FormWidget;
+    const widget: WidgetConstructor = FormWidget;
     for (let i = 0; i < length; i++) {
       const runtimeContext = createRuntimeContextForWidget(view);
       const data = this.initData(nodes[i]);

package/src/view/homepage-setting/hook/useHomepageSetting.ts

@@ -90,7 +90,7 @@ export function useHomepageSetting() {
           allModuleRules.push(rule);
         }
       } else {
-        console.warn('保存了不存在 module 的规则，保存失败');
+        console.warn('Failed to save the rule that does not exist in the module.');
       }
     });
     homepageSettingMap.set(ALL, allModuleRules);

package/src/view/index.ts

@@ -9,8 +9,6 @@ export * from './homepage';
 export * from './homepage-setting';
 export * from './login';
 export * from './reset-password';
-export * from './paas-manager/PaaSManager';
-export * from './paas-install';
 export * from './iframe-view';
 export * from './view';
 export * from './workbench';

package/src/view/login/BaseLoginWidget.ts

@@ -26,6 +26,8 @@ import { Widget } from '@oinone/kunlun-vue-widget';
 import { BaseI18nRouterWidget } from '../../basic';
 
 export class BaseLoginWidget extends BaseI18nRouterWidget {
+  protected moduleName = SYSTEM_MODULE_NAME.USER;
+
   protected matched: Matched | undefined;
 
   protected router!: Router;
@@ -161,8 +163,8 @@ export class BaseLoginWidget extends BaseI18nRouterWidget {
   @Widget.Reactive()
   protected currentLanguage: RuntimeLanguage = {} as RuntimeLanguage;
 
-  protected async getCurrentLanguage() {
-    return localStorage.getItem(LOGIN_LANGUAGE_STORAGE_KEY) ?? CurrentLanguage.DEFAULT_LANGUAGE;
+  protected async getCurrentLanguage(): Promise<string | null> {
+    return localStorage.getItem(LOGIN_LANGUAGE_STORAGE_KEY);
   }
 
   protected async getCurrentLanguageIsoCode() {
@@ -184,7 +186,7 @@ export class BaseLoginWidget extends BaseI18nRouterWidget {
     }
   }
 
-  protected async queryLanguageSetting(langCode) {
+  protected async queryLanguageSetting(langCode: string | null): Promise<MajorConfig> {
     const mutation = `
       {
         appConfigQuery {
@@ -198,7 +200,7 @@ export class BaseLoginWidget extends BaseI18nRouterWidget {
       lang: langCode,
       translationOnlyGlobal: true
     });
-    return result.data.appConfigQuery.queryListByWrapper;
+    return result.data.appConfigQuery.queryListByWrapper?.[0] as MajorConfig;
   }
 
   protected async initLanguages(): Promise<void> {
@@ -270,8 +272,12 @@ export class BaseLoginWidget extends BaseI18nRouterWidget {
     this.isoStorageKey = LOGIN_LANGUAGE_ISO_STORAGE_KEY;
     this.initLanguages().then(async () => {
       const language = await this.getCurrentLanguage();
-      await this.queryLanguageSetting(language);
-      this.initCurrentLanguage(language);
+      const currentLanguage = (await this.queryLanguageSetting(language))?.extend?.currentLanguage as string;
+      if (currentLanguage) {
+        this.initCurrentLanguage(currentLanguage);
+      } else {
+        this.initCurrentLanguage(CurrentLanguage.DEFAULT_LANGUAGE);
+      }
       super.beforeMount();
     });
   }

package/src/view/login/LoginWidget.ts

@@ -24,8 +24,6 @@ import LoginComponent from './Login.vue';
   })
 )
 export class LoginWidget extends BaseLoginWidget {
-  protected moduleName = SYSTEM_MODULE_NAME.USER;
-
   @Widget.Method()
   protected handleRegister() {
     console.error('you should to overwrite function `handleRegister` in LoginPageWidget if you want register working');

package/src/view/login/SSOLoginWidget.ts

@@ -20,9 +20,7 @@ export class SSOLoginWidget extends BaseLoginWidget {
 
   protected get keyMapping(): Record<string, string> {
     return {
-      login: 'username',
-      client_id: 'clientId',
-      redirect_uri: 'redirectUri'
+      login: 'username'
     };
   }
 

package/src/view/login-page-setting/LoginPageSetting.vue

@@ -182,43 +182,42 @@ const { isFullScreen, trigger } = useFullscreen(loginPageRef);
 
 const layoutConfigs = [
   {
-    url: genStaticPath('右侧登录@2x.png?x-oss-process=image/resize,m_lfit,h_800'),
+    url: genStaticPath('right-login.png'),
     name: OioLoginThemeName.STAND_RIGHT,
     tips: translateValueByKey(
       '请上传jpg、png格式的图片或mp4、mov、avi格式视频。尺寸建议为1200*1080px，文件大小不超过50MB'
     )
   },
   {
-    url: genStaticPath('左侧登录@2x.png?x-,oss-process=image/resize,m_lfit,h_800'),
+    url: genStaticPath('left-login.png'),
     name: OioLoginThemeName.STAND_LEFT,
     tips: translateValueByKey(
       '请上传jpg、png格式的图片或mp4、mov、avi格式视频。尺寸建议为1200*1080px，文件大小不超过50MB'
     )
   },
   {
-    url: genStaticPath('大背景左侧登录@2x.png?x-oss-process=image/resize,m_lfit,h_800'),
+    url: genStaticPath('bg-left-login.png'),
     name: OioLoginThemeName.LEFT_STICK,
     tips: translateValueByKey(
       '请上传jpg、png格式的图片或mp4、mov、avi格式视频。尺寸建议为1200*1080px，文件大小不超过50MB'
     )
   },
   {
-    url: genStaticPath('大背景居中登录@2x.png?x-oss-process=image/resize,m_lfit,h_800'),
+    url: genStaticPath('bg-center-login.png'),
     name: OioLoginThemeName.CENTER_STICK,
     tips: translateValueByKey(
       '请上传jpg、png格式的图片或mp4、mov、avi格式视频。尺寸建议为1920*1080px，文件大小不超过50MB'
     )
   },
   {
-    url: genStaticPath('大背景右侧登录@2x.png?x-oss-process=image/resize,m_lfit,h_800'),
+    url: genStaticPath('bg-right-login.png'),
     name: OioLoginThemeName.RIGHT_STICK,
     tips: translateValueByKey(
       '请上传jpg、png格式的图片或mp4、mov、avi格式视频。尺寸建议为1920*1080px，文件大小不超过50MB'
     )
   },
-
   {
-    url: genStaticPath('logo在输入框上方@2x.png?x-oss-process=image/resize,m_lfit,h_800'),
+    url: genStaticPath('logo-top.png'),
     name: OioLoginThemeName.CENTER_STICK_LOGO,
     tips: translateValueByKey(
       '请上传jpg、png格式的图片或mp4、mov、avi格式视频。尺寸建议为1920*1080px，文件大小不超过50MB'

package/src/view/paas-install/PaaSInstall.vue

@@ -113,7 +113,7 @@ export default defineComponent({
       const action = getActionByModel(model, actionName);
 
       if (!action) {
-        console.error('action匹配异常');
+        console.error('action match exception');
         return;
       }
 
@@ -135,7 +135,7 @@ export default defineComponent({
         await executeServerAction(action, item);
         loadData();
       } else {
-        console.error('跳转异常');
+        console.error('Jump Exception');
       }
     };
 

package/src/view/paas-manager/PaaSManager.vue

@@ -127,7 +127,7 @@ export default defineComponent({
       const action = getActionByModel(model, actionName);
 
       if (!action) {
-        console.error('action匹配异常');
+        console.error('action match exception');
         return;
       }
 
@@ -148,7 +148,7 @@ export default defineComponent({
         await executeServerAction(action, item);
         loadData();
       } else {
-        console.error('跳转异常');
+        console.error('Jump Exception');
       }
     };
 

package/src/view/popup/PopupWidget.ts

@@ -286,7 +286,7 @@ export abstract class PopupWidget<Props extends PopupWidgetProps = PopupWidgetPr
             if (this.submitCallChaining) {
               result = (await this.submitCallChaining.syncCall())?.records || [];
             }
-            let finalShowRecords: ActiveRecord[] = this.activeRecords || [];
+            let finalShowRecords: ActiveRecord[] = deepClone(this.activeRecords) || [];
             const viewAction = this.action;
             if (viewAction) {
               const { model, resModel } = viewAction;
@@ -301,7 +301,7 @@ export abstract class PopupWidget<Props extends PopupWidgetProps = PopupWidgetPr
             break;
           }
           case PopupSubmitType.all: {
-            const result: ActiveRecord[] = this.dataSource || [];
+            const result: ActiveRecord[] = deepClone(this.dataSource) || [];
             finalParameters = {
               showRecords: result,
               submitRecords: result

package/src/view/quick-fill/Excel.vue

@@ -86,6 +86,7 @@
 </template>
 
 <script setup lang="ts">
+import { translateValueByKey } from '@oinone/kunlun-engine';
 import { OioSpin } from '@oinone/kunlun-vue-ui-antd';
 import { Select as ASelect } from 'ant-design-vue';
 import { computed, defineExpose, defineProps, nextTick, onMounted, onUnmounted, ref, watch } from 'vue';
@@ -151,7 +152,7 @@ const tableHeaderValues = ref<TableFieldOption[]>([]);
 const selectOptions = computed(() => {
   return [
     {
-      label: '不粘贴',
+      label: translateValueByKey('不粘贴'),
       key: NON_CUT,
       value: NON_CUT,
       readonly: true,

package/src/view/quick-fill/QuickFill.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="default-table-footer-operator-quick-fill" @click="onToggleModal(true)">
     <oio-icon size="14" icon="oinone-file-text-outlined" color="var(--oio-primary-color)"></oio-icon>
-    {{ $translate('快速填报 ') }}
+    {{ $translate('快速填报') }}
   </div>
 
   <oio-modal
@@ -21,7 +21,7 @@
       <div class="quick-fill-modal-content-desc" v-if="step === 0">
         <template v-if="type === 'create'">
           <div class="quick-fill-modal-content-desc-item">
-            {{ $translate('支持将Excel内容粘贴至本表格，粘贴后内容将自动追加至表格末尾') }}
+            {{ $translate('支持将 Excel 内容粘贴至本表格，粘贴后内容将自动追加至表格末尾') }}
           </div>
           <div class="quick-fill-modal-content-desc-item">{{ $translate('系统已自动隐藏不支持粘贴的字段列') }}</div>
           <div class="quick-fill-modal-content-desc-item">
@@ -54,12 +54,12 @@
 
     <template #footer>
       <div v-if="step === 0">
-        <oio-button @click="onToggleModal(false)">取消</oio-button>
-        <oio-button type="primary" @click="onHandlerSure">确定</oio-button>
+        <oio-button @click="onToggleModal(false)">{{ $translate('取消') }}</oio-button>
+        <oio-button type="primary" @click="onHandlerSure">{{ $translate('确定') }}</oio-button>
       </div>
       <div v-else>
-        <oio-button @click="onStepChange(0)">上一步</oio-button>
-        <oio-button type="primary" @click="onSubmit">继续填报</oio-button>
+        <oio-button @click="onStepChange(0)">{{ $translate('上一步') }}</oio-button>
+        <oio-button type="primary" @click="onSubmit">{{ $translate('继续填报') }}</oio-button>
       </div>
     </template>
   </oio-modal>
@@ -69,7 +69,7 @@
 import { type ActiveRecord, type RuntimeModelField, translateValueByKey } from '@oinone/kunlun-engine';
 import { OioButton, OioIcon, OioModal } from '@oinone/kunlun-vue-ui-antd';
 import { ModalWidth, OioCloseIcon } from '@oinone/kunlun-vue-ui-common';
-import { Modal, Radio as ARadio, RadioGroup as ARadioGroup } from 'ant-design-vue';
+import { Radio as ARadio, RadioGroup as ARadioGroup, Modal } from 'ant-design-vue';
 import { computed, createVNode, defineComponent, type PropType, ref, watch } from 'vue';
 import Excel from './Excel.vue';
 import { QuickFillType, type TableFieldOption } from './type';
@@ -171,7 +171,7 @@ export default defineComponent({
         class: 'oio-modal oio-quick-fill-witch-mode-modal',
         icon: createVNode(OioIcon, { icon: 'oinone-tixing1', size: '18' }),
         closeIcon: createVNode(OioCloseIcon),
-        title: translateValueByKey(`确认关闭?`),
+        title: translateValueByKey('确认关闭?'),
         closable: true,
         content: translateValueByKey('本页数据将丢失，请确认后再继续'),
         okText: translateValueByKey('确定'),
@@ -192,7 +192,7 @@ export default defineComponent({
 
     const onChangeRadio = (val) => {
       const nextType = val.target.value;
-      const str = `确认要切换为${nextType === QuickFillType.update ? '编辑已有' : '新增'}数据吗？`;
+      const str = `确认要切换为${nextType === QuickFillType.update ? '编辑已有' : '新增'}数据吗?`;
       if (excelRef.value.getCellStatus()) {
         const _modal = Modal.confirm({
           class: 'oio-modal oio-quick-fill-witch-mode-modal',
@@ -202,7 +202,6 @@ export default defineComponent({
           closable: true,
           content: translateValueByKey('切换后，本页数据将丢失，请确认后再继续'),
           okText: translateValueByKey('确定'),
-
           cancelText: translateValueByKey('取消'),
           onOk: () => {
             type.value = nextType;

package/src/view/system-style/localData.ts

@@ -15,8 +15,8 @@ enum ThemeType {
 }
 
 export const hostImage = () => genStaticPath('computer-samples.png?x-oss-process=image/resize,m_lfit,h_800');
-export const lightMode = () => genStaticPath('light-mode@2x.png?x-oss-process=image/resize,m_lfit,h_800');
-export const darkMode = () => genStaticPath('dark-mode@2x.png?x-oss-process=image/resize,m_lfit,h_800');
+export const lightMode = () => genStaticPath('light-mode.png?x-oss-process=image/resize,m_lfit,h_800');
+export const darkMode = () => genStaticPath('dark-mode.png?x-oss-process=image/resize,m_lfit,h_800');
 
 interface ReturnValue<T> {
   style: T;
@@ -93,20 +93,20 @@ class SystemThemeConfig {
   public get previewImages() {
     return {
       // 深色 - 大
-      [DefaultThemeName.DARK_LARGE]: genStaticPath('表格页large-black.png?x-oss-process=image/resize,m_lfit,h_800'),
+      [DefaultThemeName.DARK_LARGE]: genStaticPath('table-pagelarge-black.png'),
       // 深色 - 中
-      [DefaultThemeName.DARK_MEDIUM]: genStaticPath('表格页middle-black.png?x-oss-process=image/resize,m_lfit,h_800'),
+      [DefaultThemeName.DARK_MEDIUM]: genStaticPath('table-pagemiddle-black.png'),
       // 深色 - 小
-      [DefaultThemeName.DARK_SMALL]: genStaticPath('表格页small-black.png?x-oss-process=image/resize,m_lfit,h_800'),
+      [DefaultThemeName.DARK_SMALL]: genStaticPath('table-pagesmall-black.png'),
 
       // 浅色 - 大
-      [DefaultThemeName.DEFAULT_LARGE]: genStaticPath('表格页large.png?x-oss-process=image/resize,m_lfit,h_800'),
+      [DefaultThemeName.DEFAULT_LARGE]: genStaticPath('table-pagelarge.png'),
 
       // 浅色 - 中
-      [DefaultThemeName.DEFAULT_MEDIUM]: genStaticPath('表格页middle.png?x-oss-process=image/resize,m_lfit,h_800'),
+      [DefaultThemeName.DEFAULT_MEDIUM]: genStaticPath('table-pagemiddle.png'),
 
       // 浅色 - 小
-      [DefaultThemeName.DEFAULT_SMALL]: genStaticPath('表格页small.png?x-oss-process=image/resize,m_lfit,h_800')
+      [DefaultThemeName.DEFAULT_SMALL]: genStaticPath('table-pagesmall.png')
     };
   }
 

package/src/view/table/DefaultTable.vue

@@ -7,6 +7,7 @@ import { DEFAULT_PREFIX } from '@oinone/kunlun-theme';
 import {
   type ActiveEditorContext,
   type CheckedChangeEvent,
+  GROUP_TREE_KEY,
   OioColumn,
   OioTable,
   type OioTableInstance,
@@ -33,9 +34,7 @@ import {
   OioSpin,
   OioTooltip,
   PropRecordHelper,
-  StyleHelper,
-  useInjectOioDefaultFormContext,
-  useProviderOioDefaultFormContext
+  StyleHelper
 } from '@oinone/kunlun-vue-ui-antd';
 import { DslRender } from '@oinone/kunlun-vue-widget';
 import { debounce } from 'lodash-es';
@@ -354,6 +353,9 @@ export default defineComponent({
     treeConfig: {
       type: Object as PropType<VxeTablePropTypes.TreeConfig>
     },
+    onToggleTreeExpand: {
+      type: Function
+    },
     autoLineHeight: {
       type: Boolean,
       default: false
@@ -402,6 +404,10 @@ export default defineComponent({
       type: Function,
       required: true
     },
+    enableGrouping: {
+      type: Boolean,
+      default: false
+    },
     enabledGroupView: {
       type: Boolean,
       default: false
@@ -427,14 +433,18 @@ export default defineComponent({
     },
     onKeydown: {
       type: Function
+    },
+    currentLineHeight: {
+      type: Number
+    },
+    onLineHeightChange: {
+      type: Function
     }
   },
   setup(props) {
     const defaultTableRef = ref<HTMLElement>(null as any);
     const table = ref<OioTableInstance | undefined>();
 
-    const formContext = useInjectOioDefaultFormContext();
-
     const tableContentElement = computed(
       () => defaultTableRef.value && defaultTableRef.value.querySelector('.oio-table-content-wrapper')!
     );
@@ -536,7 +546,19 @@ export default defineComponent({
       return StyleHelper.parse(props.template?.style);
     });
 
-    const calcHeight = ref('');
+    const $$calcHeight = ref('');
+    const calcHeight = computed<string, number>({
+      get() {
+        if (props.currentLineHeight === undefined) {
+          return $$calcHeight.value;
+        }
+        return `${props.currentLineHeight}px`;
+      },
+      set(val) {
+        $$calcHeight.value = `${val}px`;
+        props.onLineHeightChange?.(val);
+      }
+    });
 
     const tableLineHeight = computed(() => {
       if (typeof props.lineHeight === 'number') {
@@ -554,14 +576,30 @@ export default defineComponent({
       return 'var(--oio-table-thead-height)';
     });
 
-    const calcHeaderHeight = ref('');
-    const tableHeaderHeight = computed(() => {
-      if (calcHeaderHeight.value) {
-        return calcHeaderHeight.value;
+    // const calcHeaderHeight = ref('');
+    // const tableHeaderHeight = computed(() => {
+    //   if (calcHeaderHeight.value) {
+    //     return calcHeaderHeight.value;
+    //   }
+    //
+    //   return 'var(--oio-table-thead-height)';
+    // });
+
+    const onToggleTreeExpand = (...args) => {
+      if (props.onToggleTreeExpand) {
+        const res = props.onToggleTreeExpand(...args);
+        if (res) {
+          nextTick(() => {
+            calcTableColumnHeight();
+          });
+        }
+        return res;
       }
-
-      return 'var(--oio-table-thead-height)';
-    });
+      nextTick(() => {
+        calcTableColumnHeight();
+      });
+      return true;
+    };
 
     const onToggleRowExpand = (...args) => {
       props.onToggleRowExpand?.(...args);
@@ -586,28 +624,29 @@ export default defineComponent({
 
         if (defaultHeight > 0 && operationHeight > 0) {
           if (operationHeight >= defaultHeight) {
-            calcHeight.value = `${operationHeight}px`;
+            calcHeight.value = operationHeight;
           } else if (defaultHeight) {
-            calcHeight.value = `${defaultHeight}px`;
+            calcHeight.value = defaultHeight;
           }
         }
       }
 
-      const headerTable = tableEle.querySelector('.vxe-table--main-wrapper > .vxe-table--header-wrapper');
-      const fixedRightColumn = tableEle.querySelector(
-        '.vxe-table--fixed-wrapper > .vxe-table--fixed-right-wrapper .vxe-header--column'
-      );
-      if (headerTable && fixedRightColumn) {
-        const headerTableHeight = headerTable?.getBoundingClientRect().height;
-        const fixedRightColumnHeight = fixedRightColumn?.getBoundingClientRect().height;
-        if (headerTableHeight > 0 && fixedRightColumnHeight > 0) {
-          if (headerTableHeight >= fixedRightColumnHeight) {
-            calcHeaderHeight.value = `${headerTableHeight}px`;
-          } else if (fixedRightColumnHeight) {
-            calcHeaderHeight.value = `${fixedRightColumnHeight}px`;
-          }
-        }
-      }
+      // fixme @zbh 20260228 此处在处理多级表头高度时，无法判断单行高度和整体高度，暂时移除
+      // const headerTable = tableEle.querySelector('.vxe-table--main-wrapper > .vxe-table--header-wrapper');
+      // const fixedRightColumn = tableEle.querySelector(
+      //   '.vxe-table--fixed-wrapper > .vxe-table--fixed-right-wrapper .vxe-header--column'
+      // );
+      // if (headerTable && fixedRightColumn) {
+      //   const headerTableHeight = headerTable?.getBoundingClientRect().height;
+      //   const fixedRightColumnHeight = fixedRightColumn?.getBoundingClientRect().height;
+      //   if (headerTableHeight > 0 && fixedRightColumnHeight > 0) {
+      //     if (headerTableHeight >= fixedRightColumnHeight) {
+      //       calcHeaderHeight.value = `${headerTableHeight}px`;
+      //     } else if (fixedRightColumnHeight) {
+      //       calcHeaderHeight.value = `${fixedRightColumnHeight}px`;
+      //     }
+      //   }
+      // }
 
       if (!props.autoLineHeight) {
         return;
@@ -760,19 +799,12 @@ export default defineComponent({
       { immediate: true }
     );
 
-    useProviderOioDefaultFormContext({
-      ...formContext,
-      getTriggerContainer: (triggerNode) => {
-        return document.body;
-      }
-    });
-
     return {
       defaultTableRef,
       table,
       style,
       tableLineHeight,
-      tableHeaderHeight,
+      // tableHeaderHeight,
 
       pagination,
       editorMode,
@@ -787,6 +819,7 @@ export default defineComponent({
       onCheckedChange,
       onCheckedAllChange,
       onRadioChange,
+      onToggleTreeExpand,
       onToggleRowExpand
     };
   },
@@ -859,6 +892,7 @@ export default defineComponent({
       groupViewFooterFoldControl,
 
       treeConfig,
+      onToggleTreeExpand,
       scrollX,
       scrollY,
 
@@ -1078,7 +1112,6 @@ export default defineComponent({
         beforeEditMethod: activeEditorBefore,
         showIcon: editorShowIcon
       },
-      treeConfig,
       emptyText,
       emptyImage,
       showFooter,
@@ -1093,6 +1126,12 @@ export default defineComponent({
       onResizableChange,
       customConfig: { usingSimpleUserPrefer }
     };
+    if (treeConfig) {
+      tableProps.treeConfig = {
+        ...treeConfig,
+        toggleMethod: onToggleTreeExpand
+      };
+    }
     if (selectMode) {
       const selectTrigger = allowRowClick ? TableSelectTrigger.cell : TableSelectTrigger.row;
       switch (selectMode) {
@@ -1146,6 +1185,9 @@ export default defineComponent({
     if (!this.inline) {
       classs.push('default-main-table');
     }
+    if (this.treeConfig?.children === GROUP_TREE_KEY.CHILDREN_KEY && !this.enabledGroupView) {
+      classs.push('default-table-group-hidden-expand');
+    }
 
     return createVNode(
       createVNode(
@@ -1171,10 +1213,6 @@ export default defineComponent({
     .vxe-table--render-default.vxe-editable.size--mini .vxe-body--column {
       height: v-bind(tableLineHeight);
     }
-
-    > .vxe-table--render-default.size--mini .vxe-header--column.col--ellipsis {
-      height: v-bind(tableHeaderHeight);
-    }
   }
 
   &.default-table-line-height-auto {

package/src/view/table/DefaultTableFooterOperator.vue

@@ -2,7 +2,7 @@
   <div class="default-table-footer-operator">
     <div class="default-table-footer-operator-add-one" v-if="showAddBtn" @click.stop="onAddRow">
       <oio-icon size="14" icon="oinone-plus-outlined" color="var(--oio-primary-color)"></oio-icon>
-      {{ $translate('添加一行 ') }}
+      {{ $translate('添加一行') }}
     </div>
 
     <!-- 快速填报 -->
@@ -11,8 +11,8 @@
 </template>
 
 <script lang="ts">
-import { defineComponent } from 'vue';
 import { OioIcon } from '@oinone/kunlun-vue-ui-antd';
+import { defineComponent } from 'vue';
 import Element from '../../tags/Element.vue';
 
 export default defineComponent({

package/src/view/table/TableUserPrefer.vue

@@ -3,7 +3,7 @@
     <default-user-prefer
       :simple="simple"
       :fields="fields"
-      :title="modalTitle"
+      :title="$translate(modalTitle)"
       :enter-callback="enterCallback"
       :reset-callback="resetCallback"
     />