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

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;