@oinone/kunlun-vue-admin-base 6.3.9 → 6.4.0

package/src/field/table/m2o/select-table/TableEditorM2OSelectTableFieldWidget.ts

@@ -0,0 +1,13 @@
+import { ModelFieldType, ViewType } from '@oinone/kunlun-meta';
+import { SPI } from '@oinone/kunlun-spi';
+import { EditorFieldWidget } from '../../../../basic';
+import { FormM2OSelectTableFieldWidget } from '../../../form';
+
+@SPI.ClassFactory(
+  EditorFieldWidget.Token({
+    viewType: ViewType.Table,
+    ttype: ModelFieldType.ManyToOne,
+    widget: 'SelectTable'
+  })
+)
+export class TableEditorM2OSelectTableFieldWidget extends FormM2OSelectTableFieldWidget {}

package/src/field/table/m2o/select-table/index.ts

@@ -0,0 +1 @@
+export * from './TableEditorM2OSelectTableFieldWidget';

package/src/field/table/m2o/upload/index.ts

@@ -0,0 +1 @@
+export * from './TableM2OUploadImgFieldWidget';

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

@@ -0,0 +1,19 @@
+import { TableKeyboardConfig } 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 { EditorFieldWidget } from '../../../basic';
+import { FormIntegerMultiFieldWidget } from '../../form';
+
+@SPI.ClassFactory(
+  EditorFieldWidget.Token({
+    viewType: ViewType.Table,
+    ttype: [ModelFieldType.Integer, ModelFieldType.Float, ModelFieldType.Currency],
+    multi: true
+  })
+)
+export class TableEditorMultiNumberFieldWidget extends FormIntegerMultiFieldWidget {
+  @Widget.Reactive()
+  @Widget.Inject('keyboardConfig')
+  protected tableKeyboardConfig: TableKeyboardConfig | undefined;
+}

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

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

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

@@ -0,0 +1,3 @@
+export * from './select';
+export * from './select-modal';
+export * from './select-table';

package/src/field/table/o2m/select/TableEditorO2MFieldWidget.ts

@@ -0,0 +1,18 @@
+import { TableKeyboardConfig } 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 { EditorFieldWidget } from '../../../../basic';
+import { FormO2MSelectFieldWidget } from '../../../form';
+
+@SPI.ClassFactory(
+  EditorFieldWidget.Token({
+    viewType: ViewType.Table,
+    ttype: ModelFieldType.OneToMany
+  })
+)
+export class TableEditorO2MFieldWidget extends FormO2MSelectFieldWidget {
+  @Widget.Reactive()
+  @Widget.Inject('keyboardConfig')
+  protected tableKeyboardConfig: TableKeyboardConfig | undefined;
+}

package/src/field/table/{relation/o2m → o2m/select}/TableO2MFieldWidget.ts

@@ -2,5 +2,10 @@ import { ModelFieldType, ViewType } from '@oinone/kunlun-meta';
 import { SPI } from '@oinone/kunlun-spi';
 import { BaseFieldWidget, TableListFieldWidget } from '../../../../basic';
 
-@SPI.ClassFactory(BaseFieldWidget.Token({ viewType: ViewType.Table, ttype: ModelFieldType.OneToMany }))
+@SPI.ClassFactory(
+  BaseFieldWidget.Token({
+    viewType: ViewType.Table,
+    ttype: ModelFieldType.OneToMany
+  })
+)
 export class TableO2MFieldWidget extends TableListFieldWidget {}

package/src/field/table/o2m/select/index.ts

@@ -0,0 +1,2 @@
+export * from './TableEditorO2MFieldWidget';
+export * from './TableO2MFieldWidget';

package/src/field/table/o2m/select-modal/TableEditorO2MSelectModalFieldWidget.ts

@@ -0,0 +1,13 @@
+import { ModelFieldType, ViewType } from '@oinone/kunlun-meta';
+import { SPI } from '@oinone/kunlun-spi';
+import { EditorFieldWidget } from '../../../../basic';
+import { FormO2MSelectModalFieldWidget } from '../../../form';
+
+@SPI.ClassFactory(
+  EditorFieldWidget.Token({
+    viewType: ViewType.Table,
+    ttype: ModelFieldType.OneToMany,
+    widget: 'SelectModal'
+  })
+)
+export class TableEditorO2MSelectModalFieldWidget extends FormO2MSelectModalFieldWidget {}

package/src/field/table/o2m/select-modal/index.ts

@@ -0,0 +1 @@
+export * from './TableEditorO2MSelectModalFieldWidget';

package/src/field/table/o2m/select-table/TableEditorO2MSelectTableFieldWidget.ts

@@ -0,0 +1,13 @@
+import { ModelFieldType, ViewType } from '@oinone/kunlun-meta';
+import { SPI } from '@oinone/kunlun-spi';
+import { EditorFieldWidget } from '../../../../basic';
+import { FormO2MSelectTableFieldWidget } from '../../../form';
+
+@SPI.ClassFactory(
+  EditorFieldWidget.Token({
+    viewType: ViewType.Table,
+    ttype: ModelFieldType.OneToMany,
+    widget: 'SelectTable'
+  })
+)
+export class TableEditorO2MSelectTableFieldWidget extends FormO2MSelectTableFieldWidget {}

package/src/field/table/o2m/select-table/index.ts

@@ -0,0 +1 @@
+export * from './TableEditorO2MSelectTableFieldWidget';

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

@@ -0,0 +1,3 @@
+export * from './select';
+export * from './select-modal';
+export * from './select-table';

package/src/field/table/o2o/select/TableEditorO2OFieldWidget.ts

@@ -0,0 +1,18 @@
+import { TableKeyboardConfig } 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 { EditorFieldWidget } from '../../../../basic';
+import { FormO2OSelectFieldWidget } from '../../../form';
+
+@SPI.ClassFactory(
+  EditorFieldWidget.Token({
+    viewType: ViewType.Table,
+    ttype: ModelFieldType.OneToOne
+  })
+)
+export class TableEditorO2OFieldWidget extends FormO2OSelectFieldWidget {
+  @Widget.Reactive()
+  @Widget.Inject('keyboardConfig')
+  protected tableKeyboardConfig: TableKeyboardConfig | undefined;
+}

package/src/field/table/{relation/o2o → o2o/select}/TableO2OFieldWidget.ts

@@ -2,5 +2,10 @@ import { ModelFieldType, ViewType } from '@oinone/kunlun-meta';
 import { SPI } from '@oinone/kunlun-spi';
 import { BaseFieldWidget, TableObjectFieldWidget } from '../../../../basic';
 
-@SPI.ClassFactory(BaseFieldWidget.Token({ viewType: ViewType.Table, ttype: ModelFieldType.OneToOne }))
+@SPI.ClassFactory(
+  BaseFieldWidget.Token({
+    viewType: ViewType.Table,
+    ttype: ModelFieldType.OneToOne
+  })
+)
 export class TableO2OFieldWidget extends TableObjectFieldWidget {}

package/src/field/table/o2o/select/index.ts

@@ -0,0 +1,2 @@
+export * from './TableEditorO2OFieldWidget';
+export * from './TableO2OFieldWidget';

package/src/field/table/o2o/select-modal/TableEditorO2OSelectModalFieldWidget.ts

@@ -0,0 +1,13 @@
+import { ModelFieldType, ViewType } from '@oinone/kunlun-meta';
+import { SPI } from '@oinone/kunlun-spi';
+import { EditorFieldWidget } from '../../../../basic';
+import { FormO2OSelectModalFieldWidget } from '../../../form';
+
+@SPI.ClassFactory(
+  EditorFieldWidget.Token({
+    viewType: ViewType.Table,
+    ttype: ModelFieldType.OneToOne,
+    widget: 'SelectModal'
+  })
+)
+export class TableEditorO2OSelectModalFieldWidget extends FormO2OSelectModalFieldWidget {}

package/src/field/table/o2o/select-modal/index.ts

@@ -0,0 +1 @@
+export * from './TableEditorO2OSelectModalFieldWidget';

package/src/field/table/o2o/select-table/TableEditorO2OSelectTableFieldWidget.ts

@@ -0,0 +1,13 @@
+import { ModelFieldType, ViewType } from '@oinone/kunlun-meta';
+import { SPI } from '@oinone/kunlun-spi';
+import { EditorFieldWidget } from '../../../../basic';
+import { FormO2OSelectTableFieldWidget } from '../../../form';
+
+@SPI.ClassFactory(
+  EditorFieldWidget.Token({
+    viewType: ViewType.Table,
+    ttype: ModelFieldType.OneToOne,
+    widget: 'SelectTable'
+  })
+)
+export class TableEditorO2OSelectTableFieldWidget extends FormO2OSelectTableFieldWidget {}

package/src/field/table/o2o/select-table/index.ts

@@ -0,0 +1 @@
+export * from './TableEditorO2OSelectTableFieldWidget';

package/src/field/table/string/tag/TableEditorStringTagFieldWidget.ts

@@ -0,0 +1,19 @@
+import { TableKeyboardConfig } 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 { EditorFieldWidget } from '../../../../basic';
+import { FormStringMultiTagFieldWidget } from '../../../form';
+
+@SPI.ClassFactory(
+  EditorFieldWidget.Token({
+    viewType: ViewType.Table,
+    ttype: ModelFieldType.String,
+    multi: true
+  })
+)
+export class TableEditorStringTagFieldWidget extends FormStringMultiTagFieldWidget {
+  @Widget.Reactive()
+  @Widget.Inject('keyboardConfig')
+  protected tableKeyboardConfig: TableKeyboardConfig | undefined;
+}

package/src/field/table/string/tag/index.ts

@@ -1 +1,2 @@
+export * from './TableEditorStringTagFieldWidget';
 export * from './TableStringTagFieldWidget';

package/src/field/table/text/TableTextFieldWidget.ts

@@ -13,6 +13,18 @@ import { TableStringFieldWidget } from '../string';
   })
 )
 export class TableTextFieldWidget extends TableStringFieldWidget {
+  @Widget.Method()
+  public onAutofocus(params: { cell: HTMLElement }) {
+    const { cell } = params;
+    if (!cell) {
+      return;
+    }
+    const input = cell.querySelector('textarea') as HTMLElement;
+    if (input) {
+      input.focus();
+    }
+  }
+
   @Widget.Method()
   public renderDefaultSlot(context: RowContext): VNode[] | string {
     const value = this.compute(context);

package/src/field/table-operation-column/TableOperationColumn.vue

@@ -1,6 +1,6 @@
 <script lang="ts">
 import { translate, translateValueByKey } from '@oinone/kunlun-engine';
-import { RenderRowContext, useInjectOioTableInstance } from '@oinone/kunlun-vue-ui';
+import { GROUP_TREE_KEY, RenderRowContext, useInjectOioTableInstance } from '@oinone/kunlun-vue-ui';
 import { StableSlotProp, StyleHelper } from '@oinone/kunlun-vue-ui-common';
 import { debounce, isBoolean } from 'lodash-es';
 import { computed, createVNode, defineComponent, PropType } from 'vue';
@@ -49,6 +49,10 @@ export default defineComponent({
     },
     headerClassName: {
       type: Function
+    },
+    enabledGroupView: {
+      type: Boolean,
+      default: false
     }
   },
   setup(props) {
@@ -93,7 +97,8 @@ export default defineComponent({
       invisible,
       currentHandle,
       table,
-      isLastColumn
+      isLastColumn,
+      enabledGroupView
     } = this;
     const userPreferNodes = isLastColumn
       ? [
@@ -119,6 +124,11 @@ export default defineComponent({
       },
       {
         default: (context: RenderRowContext) => {
+          // 如果当前表格开启了分组，并且当前行是展开行，则不渲染
+          if (enabledGroupView && context.row[GROUP_TREE_KEY.CHILDREN_KEY]) {
+            return;
+          }
+
           return createVNode(
             ActionBar,
             {

package/src/field/transfer/FormTransferFieldWidget.ts

@@ -20,7 +20,7 @@ import { Widget } from '@oinone/kunlun-vue-widget';
 import { isNil } from 'lodash-es';
 import { FormFieldWidget } from '../../basic';
 import { isValidatorSuccess, ValidatorInfo } from '../../typing';
-import { FormM2MFieldSelectWidget } from '../form';
+import { FormM2MSelectFieldWidget } from '../form';
 import DefaultTransfer from './DefaultTransfer.vue';
 
 @SPI.ClassFactory(
@@ -30,7 +30,7 @@ import DefaultTransfer from './DefaultTransfer.vue';
     widget: 'Transfer'
   })
 )
-export class FormTransferFieldWidget extends FormM2MFieldSelectWidget {
+export class FormTransferFieldWidget extends FormM2MSelectFieldWidget {
   @Widget.Reactive()
   protected get selectMode(): SelectMode {
     return SelectMode.multiple;

package/src/field/tree/FormTreeFieldWidget.ts

@@ -5,8 +5,8 @@ import {
   RuntimeRelationField,
   UnsupportedOperationException
 } from '@oinone/kunlun-engine';
-import { BooleanHelper, CastHelper } from '@oinone/kunlun-shared';
-import { OioTreeNode, SelectMode } from '@oinone/kunlun-vue-ui-common';
+import { BooleanHelper, CastHelper, OioTreeNode } from '@oinone/kunlun-shared';
+import { SelectMode } from '@oinone/kunlun-vue-ui-common';
 import { Widget } from '@oinone/kunlun-vue-widget';
 import { FormComplexFieldProps } from '../../basic';
 import { TreeNodeResponseBody, TreeService } from '../../service';

package/src/field/tree-select/AbstractTreeFieldWidget.ts

@@ -13,6 +13,7 @@ import {
   CastHelper,
   NumberHelper,
   ObjectUtils,
+  OioTreeNode,
   Optional,
   ReturnPromise,
   TreeHelper,
@@ -20,7 +21,7 @@ import {
   uniqueKeyGenerator
 } from '@oinone/kunlun-shared';
 import { EmptyStyle, SelectMode, WidgetTrigger } from '@oinone/kunlun-vue-ui-antd';
-import { defaultTreeSelectProperties, OioTreeNode, TreeSelectProperties } from '@oinone/kunlun-vue-ui-common';
+import { defaultTreeSelectProperties, TreeSelectProperties } from '@oinone/kunlun-vue-ui-common';
 import { Widget } from '@oinone/kunlun-vue-widget';
 import { debounce, DebouncedFunc, isNil, toInteger } from 'lodash-es';
 import { BaseFieldProps, FormFieldWidget } from '../../basic';

package/src/field/tree-select/DefaultTreeSelect.vue

@@ -2,17 +2,17 @@
 import {
   BooleanHelper,
   ButtonType,
-  defaultTreeSelectProperties,
   OioButton,
   OioTreeNode,
   OioTreeSelect,
   SimpleTreeSelected,
   TreeSelectNode,
   TreeSelectNodeChangeEvent,
-  TreeSelectProperties
+  TreeSelectProperties,
+  useInjectOioDefaultFormContext
 } from '@oinone/kunlun-vue-ui-antd';
 import { computed, createVNode, defineComponent, PropType, VNode, withModifiers } from 'vue';
-import { OioCommonProps, OioMetadataProps, useInjectOioDefaultFormContext } from '../../basic';
+import { OioCommonProps, OioMetadataProps } from '../../basic';
 import { TreeData } from '../../typing';
 import { TreeUtils } from '../../util';
 

package/src/field/tree-select/FormTreeSelectFieldWidget.ts

@@ -1,12 +1,6 @@
 import { ActiveRecord, ActiveRecords, RuntimeRelationField } from '@oinone/kunlun-engine';
-import { BooleanHelper } from '@oinone/kunlun-shared';
-import {
-  EmptyStyle,
-  OioTreeNode,
-  SelectMode,
-  SimpleTreeSelected,
-  TreeSelectNodeChangeEvent
-} from '@oinone/kunlun-vue-ui-common';
+import { BooleanHelper, OioTreeNode } from '@oinone/kunlun-shared';
+import { EmptyStyle, SelectMode, SimpleTreeSelected, TreeSelectNodeChangeEvent } from '@oinone/kunlun-vue-ui-common';
 import { Widget } from '@oinone/kunlun-vue-widget';
 import { isBoolean, remove } from 'lodash-es';
 import { FormComplexFieldProps } from '../../basic';

package/src/field/util.ts

@@ -243,7 +243,7 @@ export function optionsConvertSelectItem(
       return {
         key: v.name,
         value: v.name,
-        label: v.label || v.displayName || v.name,
+        label: v.label ?? v.displayName ?? v.name,
         data: v,
         state: v.state,
         disabled: !!v.disabled || v.state === EnumOptionState.INACTIVE

package/src/file/excel/action/ExportWorkbookActionWidget.ts

@@ -1,10 +1,4 @@
-import {
-  ModelCache,
-  RuntimeContext,
-  RuntimeRelationField,
-  RuntimeServerAction,
-  SubmitValue
-} from '@oinone/kunlun-engine';
+import { RuntimeContext, RuntimeServerAction, SubmitValue } from '@oinone/kunlun-engine';
 import { ModelDefaultActionName } from '@oinone/kunlun-meta';
 import { Condition, getSessionPath, GQL } from '@oinone/kunlun-request';
 import { DEFAULT_TRUE_CONDITION } from '@oinone/kunlun-service';
@@ -49,11 +43,6 @@ export class ExportWorkbookActionWidget extends AbstractTaskAction<ExcelExportTa
       : undefined;
 
     const modelName = this.model.name || 'excelExportTask';
-    const excelExportTaskModel = await ModelCache.get('file.ExcelExportTask');
-    const selectedFieldsField = excelExportTaskModel?.modelFields.find(
-      (v) => v.data === 'selectedFields'
-    ) as RuntimeRelationField;
-    const hasOptionLabel = selectedFieldsField.references === 'file.ExcelModelField';
     return GQL.mutation(`${modelName}Mutation`, 'createExportTask')
       .buildRequest((builder) => {
         builder.buildObjectParameter('data', (builder) => {
@@ -78,9 +67,7 @@ export class ExportWorkbookActionWidget extends AbstractTaskAction<ExcelExportTa
             builder.buildArrayParameter('selectedFields', selectedFields, (builder, value) => {
               builder.stringParameter('field', value.data);
               builder.stringParameter('displayName', value.displayName);
-              if (hasOptionLabel) {
-                builder.stringParameter('optionLabel', value.optionLabel);
-              }
+              builder.stringParameter('optionLabel', value.optionLabel);
             });
           }
         });

package/src/icon-manage/view/search/IconSearch.vue

@@ -1,9 +1,13 @@
 <script lang="ts">
 import { translateValueByKey } from '@oinone/kunlun-engine';
 import { ModelFieldType } from '@oinone/kunlun-meta';
-import { OioSpin, PropRecordHelper } from '@oinone/kunlun-vue-ui-antd';
+import {
+  OioSpin,
+  PropRecordHelper,
+  useInjectOioDefaultFormContext,
+  useProviderOioDefaultFormContext
+} from '@oinone/kunlun-vue-ui-antd';
 import { computed, createVNode, defineComponent, PropType, ref, VNode, vShow, withDirectives } from 'vue';
-import { useInjectOioDefaultFormContext, useProviderOioDefaultFormContext } from '../../../basic';
 import { GroupListItem, OioManageGroup, OioManageGroupProps } from '../../../components';
 import { DefaultSearchProps, useProviderSearchPreferContext } from '../../../view';
 import { GroupAll } from '../../typing';

package/src/index.ts

@@ -15,6 +15,7 @@ export {
   Action,
   Element,
   Pack,
+  PackCombination,
   Custom,
   ActionBar,
   ActionColumn,

package/src/main-view/DefaultMainView.vue

@@ -1,10 +1,9 @@
 <script lang="ts">
 import { OioSpin } from '@oinone/kunlun-vue-ui-antd';
 import { OioSpinProps, PropRecordHelper } from '@oinone/kunlun-vue-ui-common';
-import { DslRender } from '@oinone/kunlun-vue-widget';
+import { DslRender, useInjectMetaContext, useProviderMetaContext } from '@oinone/kunlun-vue-widget';
 import { computed, createVNode, defineComponent, VNode } from 'vue';
 import { MetadataViewProps } from '../basic';
-import { useInjectMetaContext, useProviderMetaContext } from '../tags';
 
 export default defineComponent({
   name: 'DefaultMainView',

package/src/main-view/DefaultMainViewWidget.ts

@@ -1,18 +1,16 @@
 import {
   getReloadMainViewParameters,
-  MultiTabsRuntimeManifestMergedConfigManager,
   MultiTabsManager,
-  RuntimeContextManager,
-  systemMajorConfig
+  MultiTabsRuntimeManifestMergedConfigManager,
+  RuntimeContextManager
 } from '@oinone/kunlun-engine';
 import { useMatched } from '@oinone/kunlun-router';
 import { CallChaining } from '@oinone/kunlun-shared';
 import { SPI } from '@oinone/kunlun-spi';
 import { MaskWidget } from '@oinone/kunlun-vue-admin-layout';
-import { VueWidget, Widget } from '@oinone/kunlun-vue-widget';
+import { useInjectMetaContext, VueWidget, Widget } from '@oinone/kunlun-vue-widget';
 import { MetadataViewWidget, UrlQueryParameters } from '../basic';
 import { TeleportWidget } from '../components/teleport';
-import { useInjectMetaContext } from '../tags';
 import DefaultMainView from './DefaultMainView.vue';
 import { MultiTabsContainerWidget } from './multi-tabs';
 import { MULTI_TABS_TELEPORT_HANDLE } from './multi-tabs/named';

package/src/main-view/DefaultMetadataMainView.vue

@@ -3,10 +3,9 @@ import { DslDefinition } from '@oinone/kunlun-dsl';
 import { useProviderMaskContext } from '@oinone/kunlun-vue-admin-layout';
 import { OioSpin, OioSpinProps } from '@oinone/kunlun-vue-ui-antd';
 import { PropRecordHelper } from '@oinone/kunlun-vue-ui-common';
-import { DslRender } from '@oinone/kunlun-vue-widget';
+import { DslRender, useProviderMetaContext } from '@oinone/kunlun-vue-widget';
 import { computed, createVNode, defineComponent, PropType, VNode } from 'vue';
 import { MetadataViewProps } from '../basic';
-import { useProviderMetaContext } from '../tags';
 
 export default defineComponent({
   name: 'DefaultMetadataMainView',

package/src/main-view/shared/SharedMainView.vue

@@ -2,8 +2,8 @@
 import { useProviderMaskContext } from '@oinone/kunlun-vue-admin-layout';
 import { OioSpin, PropRecordHelper } from '@oinone/kunlun-vue-ui-antd';
 import { OioSpinProps } from '@oinone/kunlun-vue-ui-common';
+import { useProviderMetaContext } from '@oinone/kunlun-vue-widget';
 import { computed, createVNode, defineComponent } from 'vue';
-import { useProviderMetaContext } from '../../tags';
 
 export default defineComponent({
   name: 'SharedMainView',

package/src/permission/permission/field/ActionPermissionWidget.ts

@@ -1,7 +1,7 @@
 import { RuntimeO2MField } from '@oinone/kunlun-engine';
 import { ModelType, ViewType } from '@oinone/kunlun-meta';
 import { getModel, http } from '@oinone/kunlun-service';
-import { CallChaining } from '@oinone/kunlun-shared';
+import { CallChaining, StringHelper } from '@oinone/kunlun-shared';
 import { SPI } from '@oinone/kunlun-spi';
 import { Widget } from '@oinone/kunlun-vue-widget';
 import { Tree as ATree } from 'ant-design-vue';
@@ -58,7 +58,7 @@ let counter = 0;
 export class ActionPermissionWidget extends FormFieldWidget<unknown, RuntimeO2MField> {
   @Widget.Reactive()
   public get class() {
-    return 'oio-tree';
+    return StringHelper.append(['oio-tree'], super.class);
   }
 
   public initialize(props) {

package/src/permission/role-permission/resource-permission/FormManagementPermissionFieldWidget.ts

@@ -1,7 +1,7 @@
 import { SubmitHandler, SubmitValue } from '@oinone/kunlun-engine';
 import { ModelFieldType, ViewType } from '@oinone/kunlun-meta';
+import { OioTreeNode } from '@oinone/kunlun-shared';
 import { SPI } from '@oinone/kunlun-spi';
-import { OioTreeNode } from '@oinone/kunlun-vue-ui-common';
 import { FormFieldWidget } from '../../../basic';
 import { TreeData } from '../../../typing';
 import {

package/src/permission/role-permission/resource-permission/FormResourcePermissionFieldWidget.ts

@@ -1,8 +1,7 @@
 import { ActiveRecord, MemoryListSearchCache, SubmitHandler, SubmitValue } from '@oinone/kunlun-engine';
 import { ModelFieldType, ViewType } from '@oinone/kunlun-meta';
-import { TreeNode, uniqueKeyGenerator } from '@oinone/kunlun-shared';
+import { OioTreeNode, TreeNode, uniqueKeyGenerator } from '@oinone/kunlun-shared';
 import { SPI } from '@oinone/kunlun-spi';
-import { OioTreeNode } from '@oinone/kunlun-vue-ui-common';
 import { Widget } from '@oinone/kunlun-vue-widget';
 import { FormFieldWidget } from '../../../basic';
 import { FormM2MTreeFieldWidget } from '../../../field';
@@ -313,9 +312,10 @@ export class FormResourcePermissionFieldWidget extends FormM2MTreeFieldWidget {
   }
 
   protected generatorResourcePermissionItem(node: PermissionNode): AuthResourcePermissionItem {
-    const { path, nodeType, resourceId, canAccess, canManagement, canDesign } = node;
+    const { path, nodeType, resourceId, resourceCode, canAccess, canManagement, canDesign } = node;
     return {
       resourceId,
+      resourceCode,
       subtype: nodeType,
       path,
       canAccess,

package/src/permission/system-permission/components/data-permission/data-permission-table.vue

@@ -194,7 +194,6 @@ const onAdd = () => {
       const dialogWidget = instance.widget as DialogWidget;
       const newPerm = dialogWidget?.rootData?.[0] as unknown as IPermission;
       if (newPerm) {
-        console.log('newPerm', newPerm);
         dataSource.value.push({ ...newPerm, domainExpJson: '' });
         reloadTableData();
       }

package/src/permission/types.ts

@@ -32,6 +32,7 @@ export interface PermissionNode {
   canDesign: boolean;
   nodeType: ResourcePermissionSubtypeEnum;
   resourceId: string;
+  resourceCode: string;
   path: string;
   displayValue: string;
   nodes?: AnyPermissionNode[];
@@ -106,6 +107,7 @@ export interface AuthResourcePermission {
 
 export interface AuthResourcePermissionItem extends AuthResourcePermission {
   resourceId?: string;
+  resourceCode?: string;
   canAccess?: boolean;
   canManagement?: boolean;
   canDesign?: boolean;

package/src/service/tree/tree-service.ts

@@ -3,8 +3,14 @@ import { ExpressionRunParam } from '@oinone/kunlun-expression';
 import { SYSTEM_MODULE_NAME } from '@oinone/kunlun-meta';
 import { GQL } from '@oinone/kunlun-request';
 import { http, IQueryPageResult } from '@oinone/kunlun-service';
-import { CastHelper, GraphqlHelper, TreeHelper, TreeNode, uniqueKeyGenerator } from '@oinone/kunlun-shared';
-import { OioTreeNode } from '@oinone/kunlun-vue-ui-common';
+import {
+  CastHelper,
+  GraphqlHelper,
+  OioTreeNode,
+  TreeHelper,
+  TreeNode,
+  uniqueKeyGenerator
+} from '@oinone/kunlun-shared';
 import { cloneDeep } from 'lodash-es';
 import { CardCascaderItemData, TreeData, TreeNodeMetadata } from '../../typing';