@oinone/kunlun-vue-admin-base 6.2.10 → 6.2.12

package/src/action/server-actions/ServerActionWidget.ts

@@ -1,28 +1,21 @@
 import {
-  ActiveRecords,
   Dialog,
   Drawer,
   executeViewAction,
   FunctionCache,
   FunctionService,
-  GetRequestModelFieldsOptions,
-  ModelCache,
   MultiTabsManager,
   RelationUpdateType,
   RequestModelField,
   ROOT_HANDLE,
   RuntimeContext,
-  RuntimeContextManager,
-  RuntimeFunctionDefinition,
   RuntimeServerAction,
   RuntimeViewAction,
-  StaticMetadata,
-  SubmitRelationValue,
   SubmitValue,
   translateValueByKey,
   UpdateOneWithRelationsService
 } from '@oinone/kunlun-engine';
-import { ActionContextType, ActionType, ModelFieldType, ViewType } from '@oinone/kunlun-meta';
+import { ActionType, ViewType } from '@oinone/kunlun-meta';
 import { HttpClientError, MessageHub, RequestErrorInterceptor, SystemErrorCode } from '@oinone/kunlun-request';
 import { SPI } from '@oinone/kunlun-spi';
 import { BooleanHelper, CallChaining, debugConsole, OioNotification } from '@oinone/kunlun-vue-ui-antd';
@@ -157,48 +150,6 @@ export class ServerActionWidget extends ActionWidget<RuntimeServerAction> {
     }
   }
 
-  protected async submit(action: RuntimeServerAction): Promise<SubmitValue> {
-    let records: ActiveRecords | undefined;
-    let relationRecords: SubmitRelationValue[] | undefined;
-    if (!this.inline && this.submitCallChaining) {
-      debugConsole.run(() => {
-        if ([ViewType.Detail, ViewType.Form].includes(this.viewType!)) {
-          debugConsole.log('formData in view:', this.activeRecords?.[0]);
-        }
-      });
-      const callResult = await this.submitCallChaining?.syncCall();
-      if (callResult != null) {
-        records = callResult.records;
-        relationRecords = callResult.relationRecords;
-      }
-    }
-    if (records == null) {
-      records = this.activeRecords || [];
-    }
-    if (action.contextType === ActionContextType.Batch || action.contextType === ActionContextType.SingleAndBatch) {
-      // do nothing.
-    } else if (action.contextType === ActionContextType.Single) {
-      if (Array.isArray(records)) {
-        [records] = records;
-      }
-    } else {
-      const ttype = action.functionDefinition?.argumentList?.[0]?.ttype;
-      if (ttype && [ModelFieldType.ManyToOne, ModelFieldType.OneToOne].includes(ttype as ModelFieldType)) {
-        if (Array.isArray(records)) {
-          [records] = records;
-        }
-      }
-    }
-    if (!records) {
-      if (action.contextType !== ActionContextType.ContextFree) {
-        const name = this.action?.displayName || this.action?.label;
-        throw new Error(`${name} action not params`);
-      }
-      records = {};
-    }
-    return new SubmitValue(records, relationRecords);
-  }
-
   protected async clickActionAfter(result: ClickResult): Promise<ClickResult> {
     let refreshParent = false;
     if (this.isDialog) {
@@ -207,8 +158,8 @@ export class ServerActionWidget extends ActionWidget<RuntimeServerAction> {
         await this.clickActionAfterRefreshData(result, refreshParent);
         this.closeAllDialog ? Dialog.disposeAll() : Dialog.dispose(this.action);
         return result;
-      } else if (this.goBack) {
-        // eslint-disable-next-line no-restricted-globals
+      }
+      if (this.goBack) {
         this.historyBack();
         return result;
       }
@@ -218,13 +169,12 @@ export class ServerActionWidget extends ActionWidget<RuntimeServerAction> {
         await this.clickActionAfterRefreshData(result, refreshParent);
         this.closeAllDrawer ? Drawer.disposeAll() : Drawer.dispose(this.action);
         return result;
-      } else if (this.goBack) {
-        // eslint-disable-next-line no-restricted-globals
+      }
+      if (this.goBack) {
         this.historyBack();
         return result;
       }
     } else if (this.goBack) {
-      // eslint-disable-next-line no-restricted-globals
       this.historyBack();
       return result;
     }
@@ -355,36 +305,6 @@ export class ServerActionWidget extends ActionWidget<RuntimeServerAction> {
     return !!parameters.relationRecords.length;
   }
 
-  protected seekPopupMainRuntimeContext(): RuntimeContext {
-    if (this.metadataHandle === this.rootHandle) {
-      const modelModel = this.model.model;
-      if (modelModel) {
-        const popupMainRuntimeContext = RuntimeContextManager.getOthers(this.rootHandle)?.find(
-          (v) => v.model.model === modelModel
-        );
-        if (popupMainRuntimeContext) {
-          return popupMainRuntimeContext;
-        }
-      }
-    }
-    return this.rootRuntimeContext;
-  }
-
-  protected async getRequestModelFields(options?: GetRequestModelFieldsOptions): Promise<RequestModelField[]> {
-    const { viewType } = this;
-    if (viewType === ViewType.Tree) {
-      const runtimeModel = await ModelCache.get(this.model.model);
-      if (runtimeModel) {
-        return runtimeModel.modelFields.map((field) => ({ field }));
-      }
-      return [];
-    }
-    if (this.popupScene) {
-      return this.seekPopupMainRuntimeContext().getRequestModelFields(options);
-    }
-    return this.rootRuntimeContext.getRequestModelFields(options);
-  }
-
   protected async executeAction(action: RuntimeServerAction, submitValue: SubmitValue): Promise<ClickResult> {
     if (
       (this.updateOneWithRelationName === action.fun || this.updateActionName === action.name) &&
@@ -407,27 +327,9 @@ export class ServerActionWidget extends ActionWidget<RuntimeServerAction> {
     return this.executeFunction(functionDefinition, requestFields, submitValue.records);
   }
 
-  protected executeFunction<T>(
-    functionDefinition: RuntimeFunctionDefinition,
-    requestFields: RequestModelField[],
-    activeRecords: ActiveRecords | undefined
-  ): Promise<T> {
-    activeRecords = this.mergeContext(activeRecords);
-    return FunctionService.INSTANCE.simpleExecute(
-      this.model,
-      functionDefinition,
-      {
-        requestModels: [StaticMetadata.ResourceAddress],
-        requestFields,
-        variables: this.rootRuntimeContext.generatorVariables({ path: this.action.sessionPath })
-      },
-      activeRecords
-    );
-  }
-
   protected executeRelationUpdate<T>(requestFields: RequestModelField[], submitValue: SubmitValue): Promise<T> {
     return UpdateOneWithRelationsService.execute(this.model, submitValue, {
-      requestModels: [StaticMetadata.ResourceAddress],
+      requestModels: FunctionService.usingStaticModels(),
       requestFields,
       variables: this.rootRuntimeContext.generatorVariables({ path: this.action.sessionPath })
     });

package/src/action/url-actions/UrlActionWidget.ts

@@ -2,19 +2,14 @@ import {
   ActiveRecord,
   FunctionCache,
   FunctionService,
-  GetRequestModelFieldsOptions,
-  ModelCache,
   RedirectTargetEnum,
   RequestModelField,
-  RuntimeContext,
-  RuntimeContextManager,
   RuntimeFunctionDefinition,
   RuntimeUrlAction,
-  StaticMetadata,
   translateValueByKey
 } from '@oinone/kunlun-engine';
 import { Expression } from '@oinone/kunlun-expression';
-import { ActionType, ViewActionTarget, ViewType } from '@oinone/kunlun-meta';
+import { ActionType, ViewActionTarget } from '@oinone/kunlun-meta';
 import { ReturnPromise } from '@oinone/kunlun-shared';
 import { SPI } from '@oinone/kunlun-spi';
 import { OioMessage, OioNotification } from '@oinone/kunlun-vue-ui-antd';
@@ -67,36 +62,6 @@ export class UrlActionWidget extends ActionWidget<RuntimeUrlAction> {
     return res;
   }
 
-  protected seekPopupMainRuntimeContext(): RuntimeContext {
-    if (this.metadataHandle === this.rootHandle) {
-      const modelModel = this.model.model;
-      if (modelModel) {
-        const popupMainRuntimeContext = RuntimeContextManager.getOthers(this.rootHandle)?.find(
-          (v) => v.model.model === modelModel
-        );
-        if (popupMainRuntimeContext) {
-          return popupMainRuntimeContext;
-        }
-      }
-    }
-    return this.rootRuntimeContext;
-  }
-
-  protected async getRequestModelFields(options?: GetRequestModelFieldsOptions): Promise<RequestModelField[]> {
-    const { viewType } = this;
-    if (viewType === ViewType.Tree) {
-      const runtimeModel = await ModelCache.get(this.model.model);
-      if (runtimeModel) {
-        return runtimeModel.modelFields.map((field) => ({ field }));
-      }
-      return [];
-    }
-    if (this.popupScene) {
-      return this.seekPopupMainRuntimeContext().getRequestModelFields(options);
-    }
-    return this.rootRuntimeContext.getRequestModelFields(options);
-  }
-
   protected executeFunction<T>(
     functionDefinition: RuntimeFunctionDefinition,
     requestFields: RequestModelField[],
@@ -109,7 +74,7 @@ export class UrlActionWidget extends ActionWidget<RuntimeUrlAction> {
       this.model,
       functionDefinition,
       {
-        requestModels: [StaticMetadata.ResourceAddress],
+        requestModels: FunctionService.usingStaticModels(),
         requestFields,
         variables: { path: this.action.sessionPath }
       },

package/src/basic/element/BaseElementViewWidget.ts

@@ -1,4 +1,11 @@
-import { parseConfigs, RelationUpdateType, ROOT_HANDLE, SubmitType, SubmitValue } from '@oinone/kunlun-engine';
+import {
+  ExperimentalConfigManager,
+  parseConfigs,
+  RelationUpdateType,
+  ROOT_HANDLE,
+  SubmitType,
+  SubmitValue
+} from '@oinone/kunlun-engine';
 import { LifeCycleHeart, LifeCycleTypes } from '@oinone/kunlun-event';
 import { ViewMode } from '@oinone/kunlun-meta';
 import { Router } from '@oinone/kunlun-router';
@@ -228,7 +235,9 @@ export abstract class BaseElementViewWidget<
       mainViewFilter
     );
     this.setViewFilter?.(internalFilter);
-    this.internalDomain = RSQLHelper.concatByAnd(this.viewAction?.domain, this.getDsl().domain as string | undefined);
+    if (!ExperimentalConfigManager.baseElementViewWidgetNext()) {
+      this.internalDomain = RSQLHelper.concatByAnd(this.viewAction?.domain, this.getDsl().domain as string | undefined);
+    }
   }
 
   protected refreshConditionContext(): Record<string, unknown> | undefined {

package/src/basic/field/complex/select/FormSelectComplexFieldWidget.ts

@@ -214,38 +214,6 @@ export abstract class FormSelectComplexFieldWidget<
     }
     this.dataList = dataList;
     this.options = this.handleSelectOption(this.dataList, this.referencesModel);
-
-    // if (!insetDefaultValue && !isEmptyValue(this.value)) {
-    //   this.selectedOption = {
-    //     value: this.value?.[this.relationFieldKey]
-    //   };
-    // }
-
-    // let existInOptions = false;
-    // if (this.selectedOption && this.selectedOption.value) {
-    //   existInOptions = !!this.options.find((option) => option.value === this.selectedOption.value);
-    //   if (!existInOptions && !isEmpty(this.options) && !this.clearBackFillSelected) {
-    //     this.options.unshift(this.selectedOption);
-    //   }
-    // }
-  }
-
-  @Widget.Reactive()
-  protected get renderOnParent() {
-    const _renderOnParent = this.getDsl().renderOnParent;
-    if (isNil(_renderOnParent)) {
-      return false;
-    }
-    return _renderOnParent;
-  }
-
-  @Widget.Reactive()
-  protected get clearBackFillSelected() {
-    const _clearBackFillSelected = this.getDsl().clearBackFillSelected;
-    if (isNil(_clearBackFillSelected)) {
-      return false;
-    }
-    return _clearBackFillSelected;
   }
 
   @Widget.Reactive()
@@ -692,4 +660,28 @@ export abstract class FormSelectComplexFieldWidget<
       context
     }) as unknown as IQueryPageResult<T>;
   }
+
+  /**
+   * @deprecated invalid prop
+   */
+  @Widget.Reactive()
+  protected get renderOnParent() {
+    const _renderOnParent = this.getDsl().renderOnParent;
+    if (isNil(_renderOnParent)) {
+      return false;
+    }
+    return _renderOnParent;
+  }
+
+  /**
+   * @deprecated invalid prop
+   */
+  @Widget.Reactive()
+  protected get clearBackFillSelected() {
+    const _clearBackFillSelected = this.getDsl().clearBackFillSelected;
+    if (isNil(_clearBackFillSelected)) {
+      return false;
+    }
+    return _clearBackFillSelected;
+  }
 }

package/src/basic/form-item/BaseFormItemWidget.ts

@@ -505,6 +505,10 @@ export class BaseFormItemWidget<
   protected formValidateCallChaining: CallChaining<FormValidateResult[] | undefined> | undefined;
 
   protected get isSkipValidator(): boolean {
+    const isSkipValidator = BooleanHelper.toBoolean(this.getDsl().isSkipValidator);
+    if (isSkipValidator != null) {
+      return isSkipValidator;
+    }
     return this.invisible || this.parentInvisible || false;
   }
 

package/src/basic/gallery-item/DefaultGalleryItem.vue

@@ -18,7 +18,12 @@ export default defineComponent({
     ...BaseGalleryItemProps
   },
   setup(props) {
-    const showLabel = computed(() => !!props.label);
+    const showLabel = computed(() => {
+      if (props.labelInvisible) {
+        return false;
+      }
+      return !!props.label;
+    });
 
     return {
       showLabel

package/src/basic/table-column/BaseTableColumnWidget.ts

@@ -12,12 +12,12 @@ import {
 import { ConfirmType, PopconfirmPlacement } from '@oinone/kunlun-vue-ui-antd';
 import { ActiveRecordsWidgetProps, Widget } from '@oinone/kunlun-vue-widget';
 import { isNil, isString, toString } from 'lodash-es';
-import { VNode, toRaw } from 'vue';
+import { toRaw, VNode } from 'vue';
 import { fetchPopconfirmPlacement } from '../../typing';
 import { executeConfirm } from '../../util';
 import { BaseDataWidget } from '../common';
-import DefaultTableColumn from './DefaultTableColumn.vue';
 import { FieldWidgetComponentFunction } from '../types';
+import DefaultTableColumn from './DefaultTableColumn.vue';
 
 export abstract class BaseTableColumnWidget<
   Value = unknown,
@@ -156,6 +156,9 @@ export abstract class BaseTableColumnWidget<
     return this.clientInvisible || BooleanHelper.toBoolean(this.getDsl().invisible) || false;
   }
 
+  /**
+   * @deprecated invalid prop in the table column
+   */
   @Widget.Reactive()
   public get readonly() {
     return BooleanHelper.toBoolean(this.getDsl().readonly) || false;

package/src/components/upload/File.vue

@@ -41,11 +41,6 @@ export default defineComponent({
     value: {
       type: Object
     },
-    // 上传总文件大小限制
-    allLimitSize: {
-      type: String,
-      default: '' // 1B、1KB、1MB、1GB、1TG
-    },
     cdnKey: {
       type: String
     },
@@ -110,46 +105,6 @@ export default defineComponent({
       context.emit('change', fileList.value);
     };
 
-    function pow1024(number: number) {
-      return Math.pow(1024, number);
-    }
-
-    function toUpCase(str: string) {
-      return str.toLocaleUpperCase();
-    }
-
-    const sizeUnit = {
-      // kb -> b
-      KB(size: number) {
-        const [s] = toUpCase(props.allLimitSize).split('KB');
-        return Number(s) * pow1024(1) > size;
-      },
-
-      // MB -> b
-      MB(size: number) {
-        const [s] = toUpCase(props.allLimitSize).split('MB');
-
-        return Number(s) * pow1024(2) > size;
-      },
-
-      // GB -> b
-      GB(size: number) {
-        const [s] = toUpCase(props.allLimitSize).split('GB');
-        return Number(s) * pow1024(3) > size;
-      },
-
-      // TB -> b
-      TG(size: number) {
-        const [s] = toUpCase(props.allLimitSize).split('TB');
-        return Number(s) * pow1024(4) > size;
-      },
-
-      B(size: number) {
-        const [s] = toUpCase(props.allLimitSize).split('B');
-        return Number(s) > size;
-      }
-    };
-
     /**
      * 上传之前现判断 当前文件大小 + 原先上线的文件大小 是否 大于 限制的大小
      */

package/src/field/detail/boolean/Boolean.vue

@@ -2,10 +2,9 @@
   <detail-common-field :value="realLabel" />
 </template>
 <script lang="ts">
-import { translateValueByKey } from '@oinone/kunlun-engine';
-import { computed, defineComponent } from 'vue';
-import DetailCommonField from '../common/DetailCommonField.vue';
+import { defineComponent } from 'vue';
 import { useBoolean } from '../../../basic/field/boolean';
+import DetailCommonField from '../common/DetailCommonField.vue';
 
 export default defineComponent({
   components: { DetailCommonField },

package/src/field/detail/boolean/DetailBooleanFieldWidget.ts

@@ -5,7 +5,7 @@ import Boolean from './Boolean.vue';
 
 @SPI.ClassFactory(
   FormFieldWidget.Token({
-    viewType: [ViewType.Detail],
+    viewType: ViewType.Detail,
     ttype: ModelFieldType.Boolean
   })
 )

package/src/field/detail/boolean/DetailBooleanSelectFieldWidget.ts

@@ -10,7 +10,7 @@ import Enum from '../enum/Enum.vue';
 
 @SPI.ClassFactory(
   FormFieldWidget.Token({
-    viewType: [ViewType.Detail],
+    viewType: ViewType.Detail,
     ttype: [ModelFieldType.Boolean],
     widget: ['Select', 'Radio']
   })

package/src/field/detail/enum/multi/DetailEnumMultiFieldWidget.ts

@@ -1,15 +1,19 @@
 import { ModelFieldType, ViewType } from '@oinone/kunlun-meta';
+import { EnumerationValue } from '@oinone/kunlun-shared';
 import { SPI } from '@oinone/kunlun-spi';
-
 import { Widget } from '@oinone/kunlun-vue-widget';
-
 import { FormFieldWidget } from '../../../../basic';
-import { EnumerationValue, FormEnumFieldAbstractWidget } from '../../../form/enum/FormEnumFieldAbstractWidget';
+import { FormEnumFieldAbstractWidget } from '../../../form';
 import { multiEnumFetchOptionByValue } from '../../../util';
-
 import Enum from '../Enum.vue';
 
-@SPI.ClassFactory(FormFieldWidget.Token({ viewType: [ViewType.Detail], ttype: ModelFieldType.Enum, multi: true }))
+@SPI.ClassFactory(
+  FormFieldWidget.Token({
+    viewType: ViewType.Detail,
+    ttype: ModelFieldType.Enum,
+    multi: true
+  })
+)
 export class DetailEnumMultiFieldWidget extends FormEnumFieldAbstractWidget<EnumerationValue[]> {
   public initialize(props) {
     super.initialize(props);

package/src/field/detail/enum/single/DetailEnumFieldWidget.ts

@@ -1,12 +1,18 @@
 import { ModelFieldType, ViewType } from '@oinone/kunlun-meta';
+import { EnumerationValue } from '@oinone/kunlun-shared';
 import { SPI } from '@oinone/kunlun-spi';
 import { Widget } from '@oinone/kunlun-vue-widget';
 import { FormFieldWidget } from '../../../../basic';
-import { EnumerationValue, FormEnumFieldAbstractWidget } from '../../../form/enum/FormEnumFieldAbstractWidget';
+import { FormEnumFieldAbstractWidget } from '../../../form';
 import { enumFetchOptionByValue } from '../../../util';
 import Enum from '../Enum.vue';
 
-@SPI.ClassFactory(FormFieldWidget.Token({ viewType: [ViewType.Detail], ttype: ModelFieldType.Enum }))
+@SPI.ClassFactory(
+  FormFieldWidget.Token({
+    viewType: ViewType.Detail,
+    ttype: ModelFieldType.Enum
+  })
+)
 export class DetailEnumFieldWidget extends FormEnumFieldAbstractWidget<EnumerationValue> {
   public initialize(props) {
     super.initialize(props);

package/src/field/detail/html/DetailHtmlFieldWidget.ts

@@ -7,7 +7,7 @@ import Html from './Html.vue';
 
 @SPI.ClassFactory(
   FormFieldWidget.Token({
-    viewType: [ViewType.Detail],
+    viewType: ViewType.Detail,
     ttype: ModelFieldType.HTML
   })
 )

package/src/field/detail/index.ts

@@ -11,7 +11,6 @@ export * from './enum/multi/DetailEnumMultiFieldWidget';
 export * from './boolean/DetailBooleanFieldWidget';
 export * from './boolean/DetailBooleanSelectFieldWidget';
 export * from './html/DetailHtmlFieldWidget';
-export * from './o2m/DetailO2MSelectFieldWidget';
 export * from './m2o/DetailM2OSelectFieldWidget';
 export * from './m2o/upload/DetailM2OUploadWidget';
 export * from './o2o/DetailO2OSelectFieldWidget';

package/src/field/detail/m2m/select/DetailM2MSelectFieldWidget.ts

@@ -1,14 +1,12 @@
 import { ModelFieldType, ViewType } from '@oinone/kunlun-meta';
 import { SPI } from '@oinone/kunlun-spi';
-
 import { FormFieldWidget } from '../../../../basic';
-import { DetailO2MSelectFieldWidget } from '../../o2m/DetailO2MSelectFieldWidget';
+import { DetailO2MSelectFieldWidget } from '../../o2m';
 
 @SPI.ClassFactory(
   FormFieldWidget.Token({
-    viewType: [ViewType.Detail],
-    ttype: ModelFieldType.ManyToMany,
-    widget: 'Select'
+    viewType: ViewType.Detail,
+    ttype: ModelFieldType.ManyToMany
   })
 )
 export class DetailM2MSelectFieldWidget extends DetailO2MSelectFieldWidget {}

package/src/field/detail/m2m/table/DetailM2MTableFieldWidget.ts

@@ -3,11 +3,13 @@ import { ModelFieldType, ViewMode, ViewType } from '@oinone/kunlun-meta';
 import { ReturnPromise } from '@oinone/kunlun-shared';
 import { SPI } from '@oinone/kunlun-spi';
 import { BaseFieldWidget, FormSubviewListFieldWidget, RelationQueryHelper } from '../../../../basic';
+import { TABLE_WIDGET } from '../../../../typing';
 
 @SPI.ClassFactory(
   BaseFieldWidget.Token({
     viewType: ViewType.Detail,
-    ttype: ModelFieldType.ManyToMany
+    ttype: ModelFieldType.ManyToMany,
+    widget: ['table', TABLE_WIDGET]
   })
 )
 export class DetailM2MTableFieldWidget extends FormSubviewListFieldWidget<RuntimeM2MField> {

package/src/field/detail/m2o/DetailM2OSelectFieldWidget.ts

@@ -6,7 +6,7 @@ import Select from './Select.vue';
 
 @SPI.ClassFactory(
   FormFieldWidget.Token({
-    viewType: [ViewType.Detail],
+    viewType: ViewType.Detail,
     ttype: ModelFieldType.ManyToOne
   })
 )

package/src/field/detail/m2o/upload/DetailM2OUploadWidget.ts

@@ -1,15 +1,14 @@
 import { ModelFieldType, ViewType } from '@oinone/kunlun-meta';
+import { BooleanHelper } from '@oinone/kunlun-shared';
 import { SPI } from '@oinone/kunlun-spi';
 import { Widget } from '@oinone/kunlun-vue-widget';
-import { BooleanHelper } from '@oinone/kunlun-shared';
-
 import { FormFieldWidget } from '../../../../basic/field';
 import { DetailRelationSelectFieldWidget } from '../../abstract/DetailRelationSelectFieldWidget';
 import DetailUpload from './DetailUpload.vue';
 
 @SPI.ClassFactory(
   FormFieldWidget.Token({
-    viewType: [ViewType.Detail],
+    viewType: ViewType.Detail,
     ttype: ModelFieldType.ManyToOne,
     widget: 'Upload'
   })

package/src/field/detail/number/DetailNumberWidget.ts

@@ -9,7 +9,7 @@ import DetailString from '../string/default/DetailString.vue';
 
 @SPI.ClassFactory(
   FormFieldWidget.Token({
-    viewType: [ViewType.Detail],
+    viewType: ViewType.Detail,
     ttype: [ModelFieldType.Integer, ModelFieldType.Long, ModelFieldType.Float, ModelFieldType.Currency]
   })
 )

package/src/field/detail/o2m/index.ts

@@ -1 +1,2 @@
+export * from './select/DetailO2MSelectFieldWidget';
 export * from './table/DetailO2MTableFieldWidget';

package/src/field/detail/o2m/{DetailO2MSelectFieldWidget.ts → select/DetailO2MSelectFieldWidget.ts}

@@ -2,15 +2,14 @@ import { ActiveRecord, getLabelFieldList4query, RuntimeO2MField } from '@oinone/
 import { ModelFieldType, ViewType } from '@oinone/kunlun-meta';
 import { SPI } from '@oinone/kunlun-spi';
 import { Widget } from '@oinone/kunlun-vue-widget';
-import { FormFieldWidget } from '../../../basic/field';
-import { DetailRelationSelectFieldWidget } from '../abstract/DetailRelationSelectFieldWidget';
+import { FormFieldWidget } from '../../../../basic/field';
+import { DetailRelationSelectFieldWidget } from '../../abstract/DetailRelationSelectFieldWidget';
 import Select from './Select.vue';
 
 @SPI.ClassFactory(
   FormFieldWidget.Token({
-    viewType: [ViewType.Detail],
-    ttype: ModelFieldType.OneToMany,
-    widget: 'Select'
+    viewType: ViewType.Detail,
+    ttype: ModelFieldType.OneToMany
   })
 )
 export class DetailO2MSelectFieldWidget extends DetailRelationSelectFieldWidget<ActiveRecord[], RuntimeO2MField> {

package/src/field/detail/o2m/{Select.vue → select/Select.vue}

@@ -12,7 +12,7 @@
 </template>
 <script lang="ts">
 import { defineComponent, PropType } from 'vue';
-import DetailCommonField from '../common/DetailCommonField.vue';
+import DetailCommonField from '../../common/DetailCommonField.vue';
 
 export default defineComponent({
   props: {

package/src/field/detail/o2m/table/DetailO2MTableFieldWidget.ts

@@ -4,11 +4,13 @@ import { Condition } from '@oinone/kunlun-request';
 import { ReturnPromise } from '@oinone/kunlun-shared';
 import { SPI } from '@oinone/kunlun-spi';
 import { BaseFieldWidget, FormSubviewListFieldWidget, RelationQueryHelper } from '../../../../basic';
+import { TABLE_WIDGET } from '../../../../typing';
 
 @SPI.ClassFactory(
   BaseFieldWidget.Token({
     viewType: ViewType.Detail,
-    ttype: ModelFieldType.OneToMany
+    ttype: ModelFieldType.OneToMany,
+    widget: ['table', TABLE_WIDGET]
   })
 )
 export class DetailO2MTableFieldWidget extends FormSubviewListFieldWidget<RuntimeO2MField> {