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

package/src/field/form/o2m/upload/FormO2MUploadDraggableFieldWidget.ts

@@ -1,7 +1,7 @@
+import { translateValueByKey } from '@oinone/kunlun-engine';
 import { ModelFieldType, ViewType } from '@oinone/kunlun-meta';
 import { SPI } from '@oinone/kunlun-spi';
 import { Widget } from '@oinone/kunlun-vue-widget';
-import { translateValueByKey } from '@oinone/kunlun-engine';
 import { FormFieldWidget } from '../../../../basic';
 import { UploadDraggable } from '../../../../components';
 import { FormO2MUploadFieldWidget } from './FormO2MUploadFieldWidget';
@@ -32,7 +32,7 @@ export class FormO2MUploadDraggableFieldWidget extends FormO2MUploadFieldWidget
     return this.getDsl().draggableTipText || '点击 或 拖拽文件到这里上传';
   }
 
-  // 是否展示支持拓展名
+  // 是否展示支持扩展名
   @Widget.Reactive()
   public get showDraggableExtendsionsText() {
     return this.getDsl().showDraggableExtendsionsText ?? true;
@@ -42,6 +42,6 @@ export class FormO2MUploadDraggableFieldWidget extends FormO2MUploadFieldWidget
   @Widget.Reactive()
   public get draggableExtendsionsText() {
     const allowdFileExtensionsString = this.limitFileExtensions || translateValueByKey('全部');
-    return translateValueByKey('支持拓展名: ') + allowdFileExtensionsString;
+    return translateValueByKey('支持扩展名: ${fileExtensions}', { fileExtensions: allowdFileExtensionsString });
   }
 }

package/src/field/form/o2o/upload/FormO2OUploadDraggableFieldWidget.ts

@@ -1,7 +1,7 @@
+import { translateValueByKey } from '@oinone/kunlun-engine';
 import { ModelFieldType, ViewType } from '@oinone/kunlun-meta';
 import { SPI } from '@oinone/kunlun-spi';
 import { Widget } from '@oinone/kunlun-vue-widget';
-import { translateValueByKey } from '@oinone/kunlun-engine';
 import { FormFieldWidget } from '../../../../basic';
 import { UploadDraggable } from '../../../../components';
 import { FormO2OUploadFieldWidget } from './FormO2OUploadFieldWidget';
@@ -32,7 +32,7 @@ export class FormO2OUploadDraggableFieldWidget extends FormO2OUploadFieldWidget
     return this.getDsl().draggableTipText || '点击 或 拖拽文件到这里上传';
   }
 
-  // 是否展示支持拓展名
+  // 是否展示支持扩展名
   @Widget.Reactive()
   public get showDraggableExtendsionsText() {
     return this.getDsl().showDraggableExtendsionsText ?? true;
@@ -42,6 +42,6 @@ export class FormO2OUploadDraggableFieldWidget extends FormO2OUploadFieldWidget
   @Widget.Reactive()
   public get draggableExtendsionsText() {
     const allowdFileExtensionsString = this.limitFileExtensions || translateValueByKey('全部');
-    return translateValueByKey('支持拓展名: ') + allowdFileExtensionsString;
+    return translateValueByKey('支持扩展名: ${fileExtensions}', { fileExtensions: allowdFileExtensionsString });
   }
 }

package/src/field/form/string/color/DefaultColorPicker.vue

@@ -4,7 +4,7 @@
     :value="realValue"
     :default-value="defaultValue"
     :has-input="hasInput"
-    :input-placeholder="placeholder"
+    :input-placeholder="$translate(placeholder)"
     :disabled="disabled"
     :readonly="readonly"
     :predefine="predefine"
@@ -16,7 +16,6 @@
 <script lang="ts">
 import { ColorFormat, ColorInputPlacement, DEFAULT_PREDEFINE } from '@oinone/kunlun-vue-ui-common';
 import { OioColorPicker } from '@oinone/kunlun-vue-ui-el';
-import { translateValueByKey } from '@oinone/kunlun-engine';
 import { defineComponent, type PropType } from 'vue';
 import { OioCommonProps, OioMetadataProps, useMetadataProps } from '../../../../basic';
 
@@ -45,7 +44,7 @@ export default defineComponent({
     },
     placeholder: {
       type: String,
-      default: translateValueByKey('请选择颜色')
+      default: '请选择颜色'
     },
     inputPlacement: {
       type: [String, Object] as PropType<ColorInputPlacement>,

package/src/field/form/string/download/FormStringDownloadFieldWidget.ts

@@ -50,7 +50,7 @@ export class FormStringDownloadFieldWidget extends FormStringFieldWidget {
       // 发起请求获取文件数据
       const response = await fetch(this.value, { mode: 'cors' });
       if (!response.ok) {
-        throw new Error('网络响应错误');
+        throw new Error('Network response error');
       }
       // 将响应转为 Blob 对象
       const blob = await response.blob();
@@ -71,7 +71,7 @@ export class FormStringDownloadFieldWidget extends FormStringFieldWidget {
       // 释放Blob URL资源
       URL.revokeObjectURL(url);
     } catch (error) {
-      console.error('下载文件失败：', error);
+      console.error('Download file failed:', error);
     }
   }
 }

package/src/field/form/string/expression/model-field-select/modelFieldSelectControlWidget.ts

@@ -8,6 +8,7 @@ import {
   type IVariableItem,
   ModelFieldSelectControl
 } from '@oinone/kunlun-vue-expression';
+import { ValidateTrigger } from '@oinone/kunlun-vue-ui-common';
 import { Widget } from '@oinone/kunlun-vue-widget';
 import { isBoolean, isNil, isString } from 'lodash-es';
 import { FormFieldWidget } from '../../../../../basic';
@@ -23,6 +24,8 @@ import { FormFieldWidget } from '../../../../../basic';
   })
 )
 export class ModelFieldSelectControlWidget extends FormFieldWidget {
+  public defaultValidateTrigger: ValidateTrigger[] = [ValidateTrigger.change];
+
   public initialize(props) {
     super.initialize(props);
     this.setComponent(ModelFieldSelectControl);

package/src/field/form/string/upload/FormStringUploadDraggableFieldWidget.ts

@@ -32,7 +32,7 @@ export class FormStringUploadDraggableFieldWidget extends FormStringUploadFieldW
     return this.getDsl().draggableTipText || '点击 或 拖拽文件到这里上传';
   }
 
-  // 是否展示支持拓展名
+  // 是否展示支持扩展名
   @Widget.Reactive()
   public get showDraggableExtendsionsText() {
     return this.getDsl().showDraggableExtendsionsText ?? true;
@@ -42,6 +42,6 @@ export class FormStringUploadDraggableFieldWidget extends FormStringUploadFieldW
   @Widget.Reactive()
   public get draggableExtendsionsText() {
     const allowdFileExtensionsString = this.limitFileExtensions || translateValueByKey('全部');
-    return translateValueByKey('支持拓展名: ') + allowdFileExtensionsString;
+    return translateValueByKey('支持扩展名: ') + allowdFileExtensionsString;
   }
 }

package/src/field/form/text/DomainExpGenerator/ExpRight.vue

@@ -147,9 +147,9 @@ export default defineComponent({
     const contextItemOptions = [
       {
         key: 'currentUser',
-        name: '当前登录用户id',
+        name: translateValueByKey('当前登录用户id'),
         val: '${currentUser}',
-        label: '当前登录用户id'
+        label: translateValueByKey('当前登录用户id')
       }
     ];
     const showContextItem = ref(false);

package/src/field/gallery/number/GalleryFloatFieldWidget.ts

@@ -0,0 +1,12 @@
+import { ModelFieldType, ViewType } from '@oinone/kunlun-meta';
+import { SPI } from '@oinone/kunlun-spi';
+import { BaseFieldWidget } from '../../../basic';
+import { GalleryNumberWidget } from './GalleryNumberWidget';
+
+@SPI.ClassFactory(
+  BaseFieldWidget.Token({
+    viewType: ViewType.Gallery,
+    ttype: ModelFieldType.Float
+  })
+)
+export class GalleryFloatFieldWidget extends GalleryNumberWidget {}

package/src/field/gallery/number/GalleryIntegerFieldWidget.ts

@@ -0,0 +1,12 @@
+import { ModelFieldType, ViewType } from '@oinone/kunlun-meta';
+import { SPI } from '@oinone/kunlun-spi';
+import { BaseFieldWidget } from '../../../basic';
+import { GalleryNumberWidget } from './GalleryNumberWidget';
+
+@SPI.ClassFactory(
+  BaseFieldWidget.Token({
+    viewType: ViewType.Gallery,
+    ttype: ModelFieldType.Integer
+  })
+)
+export class GalleryIntegerFieldWidget extends GalleryNumberWidget {}

package/src/field/gallery/number/GalleryMoneyFieldWidget.ts

@@ -0,0 +1,12 @@
+import { ModelFieldType, ViewType } from '@oinone/kunlun-meta';
+import { SPI } from '@oinone/kunlun-spi';
+import { BaseFieldWidget } from '../../../basic';
+import { GalleryNumberWidget } from './GalleryNumberWidget';
+
+@SPI.ClassFactory(
+  BaseFieldWidget.Token({
+    viewType: ViewType.Gallery,
+    ttype: ModelFieldType.Currency
+  })
+)
+export class GalleryMoneyFieldWidget extends GalleryNumberWidget {}

package/src/field/gallery/number/GalleryNumberWidget.ts

@@ -1,15 +1,6 @@
-import { ModelFieldType, ViewType } from '@oinone/kunlun-meta';
-import { SPI } from '@oinone/kunlun-spi';
-import { FormFieldWidget } from '../../../basic';
 import { DetailNumberWidget } from '../../detail';
 import GalleryString from '../string/default/GalleryString.vue';
 
-@SPI.ClassFactory(
-  FormFieldWidget.Token({
-    viewType: ViewType.Gallery,
-    ttype: [ModelFieldType.Integer, ModelFieldType.Long, ModelFieldType.Float, ModelFieldType.Currency]
-  })
-)
 export class GalleryNumberWidget extends DetailNumberWidget {
   public initialize(props) {
     super.initialize(props);

package/src/field/gallery/number/index.ts

@@ -1 +1,4 @@
+export * from './GalleryFloatFieldWidget';
+export * from './GalleryIntegerFieldWidget';
+export * from './GalleryMoneyFieldWidget';
 export * from './GalleryNumberWidget';

package/src/field/prop/RelationSelectProps.ts

@@ -3,6 +3,7 @@ import { BooleanHelper } from '@oinone/kunlun-shared';
 import { debounce, delay } from 'lodash-es';
 import { computed, nextTick, onBeforeUnmount, onMounted, type PropType, ref } from 'vue';
 import { usePlaceholderProps } from '../../basic';
+import { useSelectId } from '../../components';
 
 export const RelationSelectProps = {
   dropdownClassName: {
@@ -99,6 +100,8 @@ export const RelationSelectProps = {
 };
 
 export function relationSelectSetup(props, multi?: boolean) {
+  const id = useSelectId();
+
   const selectRef = ref();
   const dropdownInputRef = ref();
   const dropdownOpen = ref(false);
@@ -256,7 +259,37 @@ export function relationSelectSetup(props, multi?: boolean) {
     }
   };
 
+  const $$onClear = () => {
+    props.change?.(null);
+    props.search?.('');
+  };
+
   const onGlobalMouseDown = (e: MouseEvent) => {
+    let antSelectClearDom: HTMLElement | undefined;
+    let target = e.target as HTMLElement | null | undefined;
+    if (target) {
+      for (let i = 0; i < 5; i++) {
+        if (target.nodeType && target.classList.contains('ant-select-clear')) {
+          antSelectClearDom = target;
+          break;
+        }
+        target = target.parentElement;
+        if (!target) {
+          break;
+        }
+      }
+    }
+    if (
+      antSelectClearDom &&
+      document
+        .querySelector(`#${id}`)
+        ?.parentElement?.parentElement?.parentElement?.getElementsByClassName('ant-select-clear')
+        .item(0) === antSelectClearDom
+    ) {
+      e.preventDefault();
+      e.stopPropagation();
+      $$onClear();
+    }
     focusSearchInput = e.target === dropdownInputRef.value?.originInput?.input;
   };
 
@@ -269,6 +302,7 @@ export function relationSelectSetup(props, multi?: boolean) {
   });
 
   return {
+    id,
     placeholder,
     innerReadonly,
     innerDisabled,

package/src/field/resource/resource-date-time-format/constant.ts

@@ -91,14 +91,14 @@ export const getResourceTimeFormatOptions = (): ResourceDateTimeOption[] => {
     },
     {
       displayName: translateValueByKey('毫秒'),
-      code: 'MS',
-      id: 'Ms',
+      code: 'SSS',
+      id: 'Sss',
       concat: '',
       options: [
         {
           displayName: '001',
-          code: 'ms',
-          id: 'CMs'
+          code: 'SSS',
+          id: 'Sss'
         }
       ]
     }

package/src/field/resource/resource-date-time-format/resource-date-format/FormResourceDateFormat.vue

@@ -16,7 +16,7 @@
               <control-tag class="variable-item variable-tag" :closable="!readonly" @close="onRemoveOption(index)">
                 <a-select
                   class="oio-select"
-                  popup-class-name="form-resource-date-format-child-select"
+                  popup-class-name="oio-select-dropdown form-resource-date-format-child-select"
                   :disabled="readonly"
                   :style="{
                     width: opt.width
@@ -122,6 +122,7 @@ export default defineComponent({
     padding: 0 var(--oio-padding);
     line-height: var(--oio-height);
     cursor: pointer;
+
     &:hover {
       background: rgba(var(--oio-primary-color-rgb), 0.1);
       color: var(--oio-primary-color);
@@ -134,8 +135,62 @@ export default defineComponent({
 }
 
 .form-resource-date-format {
+  font-feature-settings: 'tnum';
+  border-collapse: separate;
+  border-spacing: 0;
+  box-sizing: border-box;
+  color: rgba(0, 0, 0, 0.85);
+  display: table;
+  font-size: 14px;
+  font-variant: tabular-nums;
+  line-height: 1.5715;
+  list-style: none;
+  margin: 0;
+  padding: 0;
+  position: relative;
+  width: 100%;
+
+  .ant-input-affix-wrapper {
+    background-color: #fff;
+    background-image: none;
+    border: 1px solid #d9d9d9;
+    border-radius: 2px;
+    color: rgba(0, 0, 0, 0.85);
+    display: inline-flex;
+    font-size: 14px;
+    line-height: 1.5715;
+    min-width: 0;
+    padding: 4px 11px;
+    position: relative;
+    transition: all 0.3s;
+    width: 100%;
+    border-bottom-right-radius: 0;
+    border-top-right-radius: 0;
+  }
+
+  .ant-input-group-addon {
+    display: table-cell;
+    vertical-align: middle;
+    white-space: nowrap;
+    width: 1px;
+    background-color: #fafafa;
+    border: 1px solid #d9d9d9;
+    border-radius: 2px;
+    color: rgba(0, 0, 0, 0.85);
+    font-size: 14px;
+    font-weight: 400;
+    padding: 0 11px;
+    position: relative;
+    text-align: center;
+    transition: all 0.3s;
+    border-left: 0;
+    border-bottom-left-radius: 0;
+    border-top-left-radius: 0;
+  }
+
   &.form-resource-date-format-readonly {
     position: relative;
+
     &::after {
       content: '';
       position: absolute;
@@ -145,6 +200,7 @@ export default defineComponent({
       left: 0;
       z-index: 1;
     }
+
     &.ant-input-wrapper .ant-input-affix-wrapper {
       border: none;
       padding: 0;
@@ -154,19 +210,23 @@ export default defineComponent({
       }
     }
   }
+
   .oio-select.ant-select {
     width: 50px;
   }
+
   .oio-select.ant-select .ant-select-selector:hover,
   .oio-select.ant-select:not(.ant-select-customize-input) .ant-select-selector:hover {
     background-color: transparent;
     border: none;
   }
+
   .control-tag-inner {
     height: calc(var(--oio-height) * 0.8);
     line-height: calc(var(--oio-height) * 0.8);
     border-radius: 4px;
   }
+
   .oio-select.ant-select .ant-select-selector,
   .oio-select.ant-select:not(.ant-select-customize-input) .ant-select-selector {
     border: none;

package/src/field/table/date/TableWeekPickerFieldWidget.ts

@@ -0,0 +1,13 @@
+import { ModelFieldType, ViewType } from '@oinone/kunlun-meta';
+import { SPI } from '@oinone/kunlun-spi';
+import { BaseFieldWidget } from '../../../basic';
+import { TableDateFieldWidget } from './TableDateFieldWidget';
+
+@SPI.ClassFactory(
+  BaseFieldWidget.Token({
+    viewType: ViewType.Table,
+    ttype: ModelFieldType.Date,
+    widget: 'WeekPicker'
+  })
+)
+export class TableWeekPickerFieldWidget extends TableDateFieldWidget {}

package/src/field/table/date/TableYearFieldWidget.ts

@@ -9,7 +9,7 @@ import { TableDateTimeFieldWidget } from './TableDateTimeFieldWidget';
 @SPI.ClassFactory(
   BaseFieldWidget.Token({
     viewType: ViewType.Table,
-    ttype: [ModelFieldType.Year]
+    ttype: ModelFieldType.Year
   })
 )
 export class TableYearFieldWidget extends TableDateTimeFieldWidget {

package/src/field/table/date/index.ts

@@ -3,3 +3,4 @@ export * from './TableDateTimeFieldWidget';
 export * from './TableDateFieldWidget';
 export * from './TableTimeFieldWidget';
 export * from './TableYearFieldWidget';
+export * from './TableWeekPickerFieldWidget';

package/src/field/table/date/range/TableDateTimeRangeFieldWidget.ts

@@ -129,7 +129,7 @@ export class TableDateTimeRangeFieldWidget extends BaseTableQuickOperationColumn
       dateValue = value;
     } else if (value) {
       if (isDev()) {
-        console.warn('无法识别的日期值, 显示的值可能出现异常. value: ', value);
+        console.warn('Unrecognized date value, the displayed value may have an exception. value:', value);
       }
       return toString(value);
     } else {

package/src/field/table/enum/TableEnum.vue

@@ -1,12 +1,12 @@
 <template>
   <div v-if="realOptions.length > 0 && optionColor" class="table-multi-select oio-scrollbar detail-multi-select">
     <div class="detail-multi-select-item" v-for="item in realOptions" :key="item.key" :style="computeStyle(item)">
-      <div class="detail-multi-select-item-font" :title="item.label">
-        {{ item.label }}
+      <div class="detail-multi-select-item-font" :title="$translate(item.label)">
+        {{ $translate(item.label) }}
       </div>
     </div>
   </div>
-  <span v-else>{{ currentValue }}</span>
+  <span v-else>{{ $translate(currentValue) }}</span>
 </template>
 <script lang="ts">
 import type { RuntimeEnumerationOption } from '@oinone/kunlun-engine';

package/src/field/table/number/TableFloatFieldWidget.ts

@@ -0,0 +1,12 @@
+import { ModelFieldType, ViewType } from '@oinone/kunlun-meta';
+import { SPI } from '@oinone/kunlun-spi';
+import { BaseFieldWidget } from '../../../basic';
+import { TableNumberWidget } from './TableNumberWidget';
+
+@SPI.ClassFactory(
+  BaseFieldWidget.Token({
+    viewType: ViewType.Table,
+    ttype: ModelFieldType.Float
+  })
+)
+export class TableFloatFieldWidget extends TableNumberWidget {}

package/src/field/table/number/TableIntegerFieldWidget.ts

@@ -0,0 +1,12 @@
+import { ModelFieldType, ViewType } from '@oinone/kunlun-meta';
+import { SPI } from '@oinone/kunlun-spi';
+import { BaseFieldWidget } from '../../../basic';
+import { TableNumberWidget } from './TableNumberWidget';
+
+@SPI.ClassFactory(
+  BaseFieldWidget.Token({
+    viewType: ViewType.Table,
+    ttype: ModelFieldType.Integer
+  })
+)
+export class TableIntegerFieldWidget extends TableNumberWidget {}

package/src/field/table/number/TableNumberWidget.ts

@@ -1,20 +1,12 @@
 import type { RuntimeNumberField } from '@oinone/kunlun-engine';
-import { ModelFieldType, ViewType } from '@oinone/kunlun-meta';
 import { BooleanHelper, NumberHelper, Optional } from '@oinone/kunlun-shared';
-import { SPI } from '@oinone/kunlun-spi';
 import type { RowContext } from '@oinone/kunlun-vue-ui';
 import { Widget } from '@oinone/kunlun-vue-widget';
 import { isNil, toString } from 'lodash-es';
 import type { VNode } from 'vue';
-import { BaseFieldWidget, BaseTableFieldWidget } from '../../../basic';
+import { BaseTableFieldWidget } from '../../../basic';
 import { numberAddThousandth, numberZeroFill } from '../../util';
 
-@SPI.ClassFactory(
-  BaseFieldWidget.Token({
-    viewType: [ViewType.Table],
-    ttype: [ModelFieldType.Integer, ModelFieldType.Long, ModelFieldType.Float]
-  })
-)
 export class TableNumberWidget extends BaseTableFieldWidget<string | number, RuntimeNumberField> {
   protected getShowThousandth(context: RowContext) {
     return Optional.ofNullable(this.getDsl().showThousandth)

package/src/field/table/number/index.ts

@@ -1,3 +1,5 @@
 export * from './TableEditorMultiNumberFieldWidget';
+export * from './TableFloatFieldWidget';
+export * from './TableIntegerFieldWidget';
 export * from './TableMultiNumberWidget';
 export * from './TableNumberWidget';

package/src/field/table-layout-column/TableLayoutColumnWidget.ts

@@ -1,9 +1,9 @@
 import { DslDefinition, DslDefinitionHelper, DslSlotUtils, ViewDslDefinition } from '@oinone/kunlun-dsl';
-import { ActiveRecords, createDefaultLayout } from '@oinone/kunlun-engine';
+import { ActiveRecords, createDefaultLayout, resolveTemplate } from '@oinone/kunlun-engine';
 import { ViewMode, ViewType } from '@oinone/kunlun-meta';
-import { StringHelper } from '@oinone/kunlun-shared';
+import { Optional, StringHelper } from '@oinone/kunlun-shared';
 import { SPI } from '@oinone/kunlun-spi';
-import type { RenderCellContext, RowContext } from '@oinone/kunlun-vue-ui';
+import { GROUP_TREE_KEY, RenderCellContext, RowContext } from '@oinone/kunlun-vue-ui';
 import { DslRender, Widget } from '@oinone/kunlun-vue-widget';
 import { cloneDeep } from 'lodash-es';
 import { VNode } from 'vue';
@@ -20,6 +20,11 @@ export interface LayoutColumnLoadedData {
   })
 )
 export class TableLayoutColumnWidget extends BaseTableColumnWidget {
+  @Widget.Reactive()
+  public get minWidth() {
+    return Optional.ofNullable(this.getDsl().minWidth).orElseGet(() => this.computeDefaultMinWidth());
+  }
+
   @Widget.Method()
   public className(context: RenderCellContext): string[] {
     return StringHelper.append(['table-column-layout'], super.className(context));
@@ -30,27 +35,43 @@ export class TableLayoutColumnWidget extends BaseTableColumnWidget {
     return StringHelper.append(['table-header-column-layout'], super.headerClassName(context));
   }
 
+  @Widget.Reactive()
+  public get sortable(): boolean {
+    return false;
+  }
+
+  @Widget.Reactive()
+  public get enableGrouping(): boolean {
+    return false;
+  }
+
+  @Widget.Reactive()
+  public get editable(): boolean {
+    return false;
+  }
+
   public initialize(props) {
     super.initialize(props);
     const viewDslNode = this.template?.widgets?.find((v) => DslDefinitionHelper.isView(v)) as ViewDslDefinition;
     if (viewDslNode) {
-      this.generatorViewDslDefinition(viewDslNode);
+      this.currentViewDsl = this.generatorViewDslDefinition(viewDslNode);
+      resolveTemplate(this.rootRuntimeContext, this.currentViewDsl);
     }
     return this;
   }
 
   @Widget.Reactive()
-  private viewDslDefinition: DslDefinition | undefined;
+  protected currentViewDsl: DslDefinition | undefined;
 
-  public getViewDslDefinition(context?: RowContext): DslDefinition | undefined {
-    return this.viewDslDefinition;
-  }
-
-  public setViewDslDefinition(viewDslDefinition: DslDefinition | undefined) {
-    this.viewDslDefinition = viewDslDefinition;
+  public getViewDsl(context?: RowContext): DslDefinition | undefined {
+    const isGroupRow = !!context?.data?.[GROUP_TREE_KEY.CHILDREN_KEY];
+    if (isGroupRow) {
+      return undefined;
+    }
+    return this.currentViewDsl;
   }
 
-  protected generatorViewDslDefinition(viewDslNode: ViewDslDefinition) {
+  protected generatorViewDslDefinition(viewDslNode: ViewDslDefinition): DslDefinition {
     let { type: viewType } = viewDslNode;
     if (!viewType) {
       viewType = ViewType.Detail;
@@ -61,14 +82,13 @@ export class TableLayoutColumnWidget extends BaseTableColumnWidget {
     }
     const layout = this.generatorLayout(viewType);
     if (layout) {
-      this.setViewDslDefinition(DslSlotUtils.mergeTemplateToLayout(layout, viewDslNode));
-    } else {
-      this.setViewDslDefinition(viewDslNode);
+      return DslSlotUtils.mergeTemplateToLayout(layout, viewDslNode);
     }
+    return viewDslNode;
   }
 
   protected generatorLayout(viewType: ViewType): DslDefinition | undefined {
-    return createDefaultLayout(viewType, false);
+    return createDefaultLayout(viewType, true);
   }
 
   protected loadData(context: RowContext): LayoutColumnLoadedData {
@@ -85,7 +105,7 @@ export class TableLayoutColumnWidget extends BaseTableColumnWidget {
 
   @Widget.Method()
   public renderDefaultSlot(context: RowContext): VNode[] | string {
-    const dslDefinition = this.getViewDslDefinition(context);
+    const dslDefinition = this.getViewDsl(context);
     if (this.invisible || !dslDefinition) {
       return [];
     }

package/src/file/excel/service/ExcelExportService.ts

@@ -78,7 +78,7 @@ export class ExcelExportService {
       data
     );
     if (!result) {
-      throw new Error('创建导出任务失败');
+      throw new Error('Failed to create export task');
     }
     return result;
     // fixme @zbh 20240805 5.1 using static metadata

package/src/file/print/service/PrintService.ts

@@ -42,7 +42,7 @@ export class PrintService {
       data
     );
     if (!result) {
-      throw new Error('创建打印任务失败');
+      throw new Error('Failed to create print job');
     }
     return result;
     // fixme @zbh 20240805 5.1 using static metadata