@oinone/kunlun-vue-admin-base 6.2.3 → 6.2.4

package/dist/types/src/field/form/m2o/address/FormM2OAddressFieldWidget.d.ts

@@ -1,14 +1,24 @@
 import { ActiveRecord, SubmitValue } from '@oinone/kunlun-engine';
+import { StandardString } from '@oinone/kunlun-shared';
 import { OioTreeNode } from '@oinone/kunlun-vue-ui-common';
 import { TreeNodeResponseBody } from '../../../../service';
-import { TreeData, TreeNodeMetadata } from '../../../../typing';
+import { AddressTypeEnum, ResourceAddress, TreeData, TreeNodeMetadata } from '../../../../typing';
 import { FormM2OCascaderFieldWidget } from '../cascader/FormM2OCascaderFieldWidget';
 export declare class FormM2OAddressFieldWidget extends FormM2OCascaderFieldWidget {
+    static readonly AddressTypes: AddressTypeEnum[];
     protected get changeOnSelect(): boolean;
     protected generatorDefaultTreeDefinition(props: any): TreeNodeMetadata | undefined;
     protected getSubmitField(metadata: TreeNodeMetadata): Record<string, string> | undefined;
     protected $onSelectedChange(selectedNodes: OioTreeNode<TreeData>[] | null | undefined): void;
+    protected $onSelectedChangeNext(currentValue: ResourceAddress, selectedNode: OioTreeNode<TreeData> | undefined): void;
+    protected getResourceAddressValue(currentValue: ResourceAddress, type: AddressTypeEnum): {
+        code: StandardString;
+        name: StandardString;
+    } | undefined;
+    protected setResourceAddressValue(currentValue: ResourceAddress, type: AddressTypeEnum, code: StandardString, name: StandardString): AddressTypeEnum | null | undefined;
     protected fetchBackfillData(currentValues: ActiveRecord[], metadataList: TreeNodeMetadata[]): Promise<TreeNodeResponseBody[] | undefined>;
+    protected fetchBackfillDataNext(currentValues: ActiveRecord[], metadataList: TreeNodeMetadata[]): Promise<TreeNodeResponseBody[] | undefined>;
     protected generatorCompareRecords(currentValues: ActiveRecord[], metadataList: TreeNodeMetadata[]): ActiveRecord[] | undefined;
+    protected generatorCompareRecordsNext(currentValues: ActiveRecord[], metadataList: TreeNodeMetadata[]): ActiveRecord[] | undefined;
     submit(submitValue: SubmitValue): Promise<Record<string, unknown> | undefined>;
 }

package/dist/types/src/typing/model.d.ts

@@ -1,29 +1,29 @@
 import { ActiveRecord } from '@oinone/kunlun-engine';
 export interface ResourceAddress extends ActiveRecord {
     id?: string;
-    countryCode?: string;
-    countryName?: string;
+    countryCode?: string | null;
+    countryName?: string | null;
     originCountry?: ResourceCountry;
-    provinceCode?: string;
-    provinceName?: string;
+    provinceCode?: string | null;
+    provinceName?: string | null;
     originProvince?: ResourceProvince;
-    cityCode?: string;
-    cityName?: string;
+    cityCode?: string | null;
+    cityName?: string | null;
     originCity?: ResourceCity;
-    districtCode?: string;
-    districtName?: string;
+    districtCode?: string | null;
+    districtName?: string | null;
     originDistrict?: ResourceDistrict;
-    streetCode?: string;
-    streetName?: string;
+    streetCode?: string | null;
+    streetName?: string | null;
     originStreet?: ResourceStreet;
     /**
      * 详细地址
      */
-    street2?: string;
+    street2?: string | null;
     /**
      * 完整地址
      */
-    fullAddress?: string;
+    fullAddress?: string | null;
 }
 export interface ResourceCountry extends ActiveRecord {
     id?: string;
@@ -51,3 +51,18 @@ export interface ResourceStreet extends ActiveRecord {
     code?: string;
     name?: string;
 }
+export interface ResourceRegion extends ActiveRecord {
+    id?: string;
+    type?: AddressTypeEnum;
+    code?: string | null;
+    name?: string | null;
+    pCode?: string;
+    parent?: ResourceRegion;
+}
+export declare enum AddressTypeEnum {
+    Country = "Country",
+    Province = "Province",
+    City = "City",
+    District = "District",
+    Street = "Street"
+}

package/dist/types/src/view/login/LoginWidget.d.ts

@@ -2,7 +2,7 @@ import { MajorConfig } from '@oinone/kunlun-engine';
 import { Router } from '@oinone/kunlun-router';
 import { LoginConfig, LoginData, LoginMode, RuntimeLanguage } from '@oinone/kunlun-vue-ui-common';
 import { BaseI18nRouterWidget } from '../../basic/BaseI18nRouterWidget';
-export declare class LoginPageWidget extends BaseI18nRouterWidget {
+export declare class LoginWidget extends BaseI18nRouterWidget {
     protected moduleName: string;
     errorMessages: Record<string, string>;
     /**
@@ -106,3 +106,7 @@ export declare class LoginPageWidget extends BaseI18nRouterWidget {
     protected queryLanguageSetting(langCode: any): Promise<Record<string, unknown>>;
     protected beforeMount(): Promise<void>;
 }
+/**
+ * @deprecated please using LoginWidget
+ */
+export declare const LoginPageWidget: typeof LoginWidget;

package/dist/types/src/view/reset-password/ForgetPasswordWidget.d.ts

@@ -2,9 +2,9 @@ import { MajorConfig } from '@oinone/kunlun-engine';
 import { Router } from '@oinone/kunlun-router';
 import { FormItemRule, OioFormInstance } from '@oinone/kunlun-vue-ui-antd';
 import { SelectItem } from '@oinone/kunlun-vue-ui-common';
+import { BaseI18nRouterWidget } from '../../basic';
 import { ResourceCountry } from '../../typing';
 import { ResetPasswordData } from './typing';
-import { BaseI18nRouterWidget } from '../../basic/BaseI18nRouterWidget';
 export declare class ForgetPasswordWidget extends BaseI18nRouterWidget {
     protected moduleName: string;
     protected router: Router;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oinone/kunlun-vue-admin-base",
-  "version": "6.2.3",
+  "version": "6.2.4",
   "main": "index.ts",
   "scripts": {
     "prebuild": "rimraf dist",
@@ -14,13 +14,13 @@
     "doc": "typedoc --out docs src/index.ts"
   },
   "dependencies": {
-    "@oinone/kunlun-vue-admin-layout": "6.2.3",
-    "@oinone/kunlun-vue-router": "6.2.3",
-    "@oinone/kunlun-vue-ui": "6.2.3",
-    "@oinone/kunlun-vue-ui-antd": "6.2.3",
-    "@oinone/kunlun-vue-ui-common": "6.2.3",
-    "@oinone/kunlun-vue-ui-el": "6.2.3",
-    "@oinone/kunlun-vue-widget": "6.2.3",
+    "@oinone/kunlun-vue-admin-layout": "6.2.4",
+    "@oinone/kunlun-vue-router": "6.2.4",
+    "@oinone/kunlun-vue-ui": "6.2.4",
+    "@oinone/kunlun-vue-ui-antd": "6.2.4",
+    "@oinone/kunlun-vue-ui-common": "6.2.4",
+    "@oinone/kunlun-vue-ui-el": "6.2.4",
+    "@oinone/kunlun-vue-widget": "6.2.4",
     "@wangeditor/editor": "5.1.23",
     "@wangeditor/editor-for-vue": "5.1.11",
     "@wangeditor/plugin-upload-attachment": "1.1.0",

package/src/basic/BaseI18nRouterWidget.ts

@@ -1,6 +1,6 @@
-import { RouterWidget } from '@oinone/kunlun-vue-router';
 import { getDefaultBrowser, initI18n, OioProvider, translateValueByKey } from '@oinone/kunlun-engine';
 import { SYSTEM_MODULE_NAME } from '@oinone/kunlun-meta';
+import { RouterWidget } from '@oinone/kunlun-vue-router';
 
 /**
  * 无模块需要国际化的路由页面

package/src/field/form/m2o/address/FormM2OAddressFieldWidget.ts

@@ -1,12 +1,26 @@
-import { ActiveRecord, ActiveRecordExtendKeys, parseConfigs, SubmitHandler, SubmitValue } from '@oinone/kunlun-engine';
+import {
+  ActiveRecord,
+  ActiveRecordExtendKeys,
+  ExperimentalConfigManager,
+  parseConfigs,
+  SubmitHandler,
+  SubmitValue
+} from '@oinone/kunlun-engine';
 import { ModelFieldType, ViewType } from '@oinone/kunlun-meta';
-import { BooleanHelper, CastHelper, ObjectUtils, Optional, uniqueKeyGenerator } from '@oinone/kunlun-shared';
+import {
+  BooleanHelper,
+  CastHelper,
+  ObjectUtils,
+  Optional,
+  StandardString,
+  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 { TreeNodeResponseBody, TreeService } from '../../../../service';
-import { TreeData, TreeNodeMetadata } from '../../../../typing';
+import { AddressTypeEnum, ResourceAddress, ResourceRegion, TreeData, TreeNodeMetadata } from '../../../../typing';
 import { FetchUtil } from '../../../../util';
 import { generatorDefaultAddressTreeDefinition } from '../../../../util/default-tree-definition';
 import { FormM2OCascaderFieldWidget } from '../cascader/FormM2OCascaderFieldWidget';
@@ -19,6 +33,14 @@ import { FormM2OCascaderFieldWidget } from '../cascader/FormM2OCascaderFieldWidg
   })
 )
 export class FormM2OAddressFieldWidget extends FormM2OCascaderFieldWidget {
+  public static readonly AddressTypes = [
+    AddressTypeEnum.Street,
+    AddressTypeEnum.District,
+    AddressTypeEnum.City,
+    AddressTypeEnum.Province,
+    AddressTypeEnum.Country
+  ];
+
   @Widget.Reactive()
   protected get changeOnSelect(): boolean {
     return Optional.ofNullable(this.getDsl().changeOnSelect).map(BooleanHelper.toBoolean).orElse(true)!;
@@ -63,7 +85,7 @@ export class FormM2OAddressFieldWidget extends FormM2OCascaderFieldWidget {
       return;
     }
     const { value } = this;
-    let currentValue: ActiveRecord | undefined;
+    let currentValue: ResourceAddress | undefined;
     if (value) {
       currentValue = FetchUtil.generatorPksObjectByPks(['id'], value);
       if (currentValue) {
@@ -77,25 +99,130 @@ export class FormM2OAddressFieldWidget extends FormM2OCascaderFieldWidget {
         __draftId: uniqueKeyGenerator()
       };
     }
+    if (ExperimentalConfigManager.addressWidgetNext()) {
+      this.$onSelectedChangeNext(currentValue, selectedNode);
+    } else {
+      while (selectedNode) {
+        const targetValue = selectedNode.value.data;
+        if (targetValue) {
+          const submitFields = this.getSubmitField(selectedNode.value.metadata);
+          if (submitFields) {
+            Object.entries(submitFields).forEach(([relationField, referenceField]) => {
+              currentValue![relationField] = targetValue[referenceField as string];
+            });
+          }
+        }
+        selectedNode = selectedNode.parent;
+      }
+    }
+    this.change(currentValue);
+  }
+
+  protected $onSelectedChangeNext(currentValue: ResourceAddress, selectedNode: OioTreeNode<TreeData> | undefined) {
+    let nextAddressType: AddressTypeEnum | null | undefined;
     while (selectedNode) {
-      const targetValue = selectedNode.value.data;
-      if (targetValue) {
-        const submitFields = this.getSubmitField(selectedNode.value.metadata);
-        if (submitFields) {
-          Object.entries(submitFields).forEach(([relationField, referenceField]) => {
-            currentValue![relationField] = targetValue[referenceField as string];
-          });
+      const targetValue = selectedNode.value.data as ResourceRegion | undefined;
+      if (!targetValue) {
+        selectedNode = selectedNode.parent;
+        continue;
+      }
+      const { type, code, name } = targetValue;
+      if (!type) {
+        console.error('Invalid region type.', selectedNode);
+        this.change(null);
+        return;
+      }
+      if (nextAddressType) {
+        while (type !== nextAddressType) {
+          nextAddressType = this.setResourceAddressValue(currentValue, nextAddressType, null, null);
+          if (nextAddressType === null) {
+            break;
+          }
+          if (!nextAddressType) {
+            return;
+          }
         }
+      } else {
+        nextAddressType = type;
+      }
+      nextAddressType = this.setResourceAddressValue(currentValue, type, code, name);
+      if (nextAddressType === null) {
+        break;
+      }
+      if (!nextAddressType) {
+        return;
       }
       selectedNode = selectedNode.parent;
     }
-    this.change(currentValue);
+  }
+
+  protected getResourceAddressValue(
+    currentValue: ResourceAddress,
+    type: AddressTypeEnum
+  ):
+    | {
+        code: StandardString;
+        name: StandardString;
+      }
+    | undefined {
+    switch (type) {
+      case AddressTypeEnum.Country:
+        return { code: currentValue.countryCode, name: currentValue.countryName };
+      case AddressTypeEnum.Province:
+        return { code: currentValue.provinceCode, name: currentValue.provinceName };
+      case AddressTypeEnum.City:
+        return { code: currentValue.cityCode, name: currentValue.cityName };
+      case AddressTypeEnum.District:
+        return { code: currentValue.districtCode, name: currentValue.districtName };
+      case AddressTypeEnum.Street:
+        return { code: currentValue.streetCode, name: currentValue.streetName };
+      default:
+        console.error('Invalid region type.', type);
+        return undefined;
+    }
+  }
+
+  protected setResourceAddressValue(
+    currentValue: ResourceAddress,
+    type: AddressTypeEnum,
+    code: StandardString,
+    name: StandardString
+  ): AddressTypeEnum | null | undefined {
+    switch (type) {
+      case AddressTypeEnum.Country:
+        currentValue.countryCode = code;
+        currentValue.countryName = name;
+        return null;
+      case AddressTypeEnum.Province:
+        currentValue.provinceCode = code;
+        currentValue.provinceName = name;
+        return AddressTypeEnum.Country;
+      case AddressTypeEnum.City:
+        currentValue.cityCode = code;
+        currentValue.cityName = name;
+        return AddressTypeEnum.Province;
+      case AddressTypeEnum.District:
+        currentValue.districtCode = code;
+        currentValue.districtName = name;
+        return AddressTypeEnum.City;
+      case AddressTypeEnum.Street:
+        currentValue.streetCode = code;
+        currentValue.streetName = name;
+        return AddressTypeEnum.District;
+      default:
+        console.error('Invalid region type.', type);
+        this.change(null);
+        return undefined;
+    }
   }
 
   protected async fetchBackfillData(
     currentValues: ActiveRecord[],
     metadataList: TreeNodeMetadata[]
   ): Promise<TreeNodeResponseBody[] | undefined> {
+    if (ExperimentalConfigManager.addressWidgetNext()) {
+      return this.fetchBackfillDataNext(currentValues, metadataList);
+    }
     const finalValues: ActiveRecord[] = [];
     let finalMetadataList: TreeNodeMetadata[] | undefined;
     for (const currentValue of currentValues) {
@@ -130,10 +257,37 @@ export class FormM2OAddressFieldWidget extends FormM2OCascaderFieldWidget {
     return undefined;
   }
 
+  protected async fetchBackfillDataNext(
+    currentValues: ActiveRecord[],
+    metadataList: TreeNodeMetadata[]
+  ): Promise<TreeNodeResponseBody[] | undefined> {
+    const currentValue = currentValues[0] as ResourceAddress | undefined;
+    if (!currentValue) {
+      return undefined;
+    }
+    let lastRegion: ResourceRegion | undefined;
+    for (const type of FormM2OAddressFieldWidget.AddressTypes) {
+      lastRegion = this.getResourceAddressValue(currentValue, type);
+      if (lastRegion) {
+        break;
+      }
+    }
+    if (lastRegion) {
+      return TreeService.reverselyQueryWithSize([lastRegion], metadataList, {
+        expressionParameters: this.generatorExpressionParameters(),
+        disabledIsLeaf: true
+      });
+    }
+    return undefined;
+  }
+
   protected generatorCompareRecords(
     currentValues: ActiveRecord[],
     metadataList: TreeNodeMetadata[]
   ): ActiveRecord[] | undefined {
+    if (ExperimentalConfigManager.addressWidgetNext()) {
+      return this.generatorCompareRecordsNext(currentValues, metadataList);
+    }
     const compareRecords: ActiveRecord[] = [];
     for (const currentValue of currentValues) {
       for (const metadata of metadataList) {
@@ -161,6 +315,27 @@ export class FormM2OAddressFieldWidget extends FormM2OCascaderFieldWidget {
     return [compareRecords[compareRecords.length - 1]];
   }
 
+  protected generatorCompareRecordsNext(
+    currentValues: ActiveRecord[],
+    metadataList: TreeNodeMetadata[]
+  ): ActiveRecord[] | undefined {
+    const currentValue = currentValues[0] as ResourceAddress | undefined;
+    if (!currentValue) {
+      return undefined;
+    }
+    let lastRegion: ResourceRegion | undefined;
+    for (const type of FormM2OAddressFieldWidget.AddressTypes) {
+      lastRegion = this.getResourceAddressValue(currentValue, type);
+      if (lastRegion) {
+        break;
+      }
+    }
+    if (lastRegion) {
+      return [lastRegion];
+    }
+    return undefined;
+  }
+
   public async submit(submitValue: SubmitValue) {
     return SubmitHandler.DEFAULT(this.field, this.itemName, submitValue, this.value);
   }

package/src/main-view/shared/SharedMainViewWidget.ts

@@ -23,7 +23,11 @@ import { clearSharedSession, getSharedSession, setSharedSession } from './sessio
 import SharedMainView from './SharedMainView.vue';
 import { SharedViewUtils } from './utils';
 
-@SPI.ClassFactory(RouterWidget.Token({ widget: SHARED_VIEW_WIDGET }))
+@SPI.ClassFactory(
+  RouterWidget.Token({
+    widget: SHARED_VIEW_WIDGET
+  })
+)
 export class SharedMainViewWidget extends RouterWidget {
   protected metadataViewWidget: MetadataViewWidget | undefined;
 

package/src/typing/model.ts

@@ -3,35 +3,35 @@ import { ActiveRecord } from '@oinone/kunlun-engine';
 export interface ResourceAddress extends ActiveRecord {
   id?: string;
 
-  countryCode?: string;
-  countryName?: string;
+  countryCode?: string | null;
+  countryName?: string | null;
   originCountry?: ResourceCountry;
 
-  provinceCode?: string;
-  provinceName?: string;
+  provinceCode?: string | null;
+  provinceName?: string | null;
   originProvince?: ResourceProvince;
 
-  cityCode?: string;
-  cityName?: string;
+  cityCode?: string | null;
+  cityName?: string | null;
   originCity?: ResourceCity;
 
-  districtCode?: string;
-  districtName?: string;
+  districtCode?: string | null;
+  districtName?: string | null;
   originDistrict?: ResourceDistrict;
 
-  streetCode?: string;
-  streetName?: string;
+  streetCode?: string | null;
+  streetName?: string | null;
   originStreet?: ResourceStreet;
 
   /**
    * 详细地址
    */
-  street2?: string;
+  street2?: string | null;
 
   /**
    * 完整地址
    */
-  fullAddress?: string;
+  fullAddress?: string | null;
 }
 
 export interface ResourceCountry extends ActiveRecord {
@@ -65,3 +65,20 @@ export interface ResourceStreet extends ActiveRecord {
   code?: string;
   name?: string;
 }
+
+export interface ResourceRegion extends ActiveRecord {
+  id?: string;
+  type?: AddressTypeEnum;
+  code?: string | null;
+  name?: string | null;
+  pCode?: string;
+  parent?: ResourceRegion;
+}
+
+export enum AddressTypeEnum {
+  Country = 'Country',
+  Province = 'Province',
+  City = 'City',
+  District = 'District',
+  Street = 'Street'
+}

package/src/util/default-tree-definition.ts

@@ -1,4 +1,5 @@
 import { XMLParse } from '@oinone/kunlun-dsl';
+import { ExperimentalConfigManager } from '@oinone/kunlun-engine';
 import { TreeNodeMetadata } from '../typing';
 import { TreeUtils } from './tree-utils';
 
@@ -13,7 +14,17 @@ const defaultAddressTemplate = XMLParse.INSTANCE.parse(`<template>
 </template>
 `);
 
+const defaultAddressTemplateNext = XMLParse.INSTANCE.parse(`<template>
+  <nodes>
+    <node model="resource.ResourceRegion" label="activeRecord.name" labelFields="name" selfReferences="parent" />
+  </nodes>
+</template>
+`);
+
 export function generatorDefaultAddressTreeDefinition(): TreeNodeMetadata | undefined {
+  if (ExperimentalConfigManager.addressWidgetNext()) {
+    return TreeUtils.convert(defaultAddressTemplateNext);
+  }
   return TreeUtils.convert(defaultAddressTemplate);
 }
 

package/src/view/login/LoginWidget.ts

@@ -10,7 +10,14 @@ import {
   translateValueByKey
 } from '@oinone/kunlun-engine';
 import { RuntimeConfig, SYSTEM_MODULE_NAME } from '@oinone/kunlun-meta';
-import { gql, HttpClientError, ILevel, useMessageHub } from '@oinone/kunlun-request';
+import {
+  gql,
+  HttpClientError,
+  ILevel,
+  isFirstResetPasswordError,
+  isPicCodeError,
+  useMessageHub
+} from '@oinone/kunlun-request';
 import { Router } from '@oinone/kunlun-router';
 import { http } from '@oinone/kunlun-service';
 import { SPI } from '@oinone/kunlun-spi';
@@ -28,15 +35,17 @@ import {
   LoginMode,
   RuntimeLanguage
 } from '@oinone/kunlun-vue-ui-common';
-import { VueWidget, Widget } from '@oinone/kunlun-vue-widget';
-import { toString } from 'lodash-es';
+import { Widget } from '@oinone/kunlun-vue-widget';
 import { BaseI18nRouterWidget } from '../../basic/BaseI18nRouterWidget';
-
 import { encrypt, homepageMaybeRuntimeContext } from '../../util';
 import LoginComponent from './Login.vue';
 
-@SPI.ClassFactory(RouterWidget.Token({ widget: 'Login' }))
-export class LoginPageWidget extends BaseI18nRouterWidget {
+@SPI.ClassFactory(
+  RouterWidget.Token({
+    widget: 'Login'
+  })
+)
+export class LoginWidget extends BaseI18nRouterWidget {
   protected moduleName = SYSTEM_MODULE_NAME.USER;
 
   public errorMessages = defaultLoginErrorMessages;
@@ -601,7 +610,7 @@ export class LoginPageWidget extends BaseI18nRouterWidget {
         return;
       }
 
-      if (['20200008', '20060008'].includes(toString(errorCode))) {
+      if (isFirstResetPasswordError(errorCode)) {
         // 首次登录需修改密码
         this.router.push({ segments: [{ path: 'first' }] });
         return;
@@ -635,7 +644,7 @@ export class LoginPageWidget extends BaseI18nRouterWidget {
     const hub = useMessageHub(loginMessageHubName);
     hub.subscribe((error) => {
       const { errorCode } = error;
-      if (errorCode === '20060080') {
+      if (isPicCodeError(errorCode)) {
         this.getPicCode();
       }
       hub.unsubscribe();
@@ -689,3 +698,8 @@ export class LoginPageWidget extends BaseI18nRouterWidget {
     });
   }
 }
+
+/**
+ * @deprecated please using LoginWidget
+ */
+export const LoginPageWidget = LoginWidget;

package/src/view/reset-password/FirstResetPasswordWidget.ts

@@ -9,7 +9,11 @@ import { UserService } from '../../service';
 import FirstResetPassword from './FirstResetPassword.vue';
 import { ForgetPasswordWidget } from './ForgetPasswordWidget';
 
-@SPI.ClassFactory(RouterWidget.Token({ widget: 'FirstResetPassword' }))
+@SPI.ClassFactory(
+  RouterWidget.Token({
+    widget: 'FirstResetPassword'
+  })
+)
 export class FirstResetPasswordWidget extends ForgetPasswordWidget {
   public initialize(config) {
     super.initialize(config);

package/src/view/reset-password/ForgetPasswordWidget.ts

@@ -1,4 +1,5 @@
 import { getMajorConfig, MajorConfig, translateValueByKey } from '@oinone/kunlun-engine';
+import { SYSTEM_MODULE_NAME } from '@oinone/kunlun-meta';
 import { Router } from '@oinone/kunlun-router';
 import { http } from '@oinone/kunlun-service';
 import { SPI } from '@oinone/kunlun-spi';
@@ -6,14 +7,17 @@ import { RouterWidget, useRouter } from '@oinone/kunlun-vue-router';
 import { FormItemRule, OioFormInstance, OioMessage } from '@oinone/kunlun-vue-ui-antd';
 import { SelectItem } from '@oinone/kunlun-vue-ui-common';
 import { Widget } from '@oinone/kunlun-vue-widget';
+import { BaseI18nRouterWidget } from '../../basic';
 import { PhoneCodeQueryService, UserService } from '../../service';
 import { ResourceCountry } from '../../typing';
 import ForgetPassword from './ForgetPassword.vue';
 import { ResetPasswordData } from './typing';
-import { BaseI18nRouterWidget } from '../../basic/BaseI18nRouterWidget';
-import { SYSTEM_MODULE_NAME } from '@oinone/kunlun-meta';
 
-@SPI.ClassFactory(RouterWidget.Token({ widget: 'ForgetPassword' }))
+@SPI.ClassFactory(
+  RouterWidget.Token({
+    widget: 'ForgetPassword'
+  })
+)
 export class ForgetPasswordWidget extends BaseI18nRouterWidget {
   protected moduleName = SYSTEM_MODULE_NAME.USER;