@oinone/kunlun-vue-admin-base 6.3.4 → 6.3.5

package/dist/types/src/service/user/UserService.d.ts

@@ -18,8 +18,8 @@ export interface UserServiceResponse {
     };
 }
 export declare class UserService {
-    static sendSmsVerificationCodeByPhone(eventType: UserBehaviorEventEnum, phone: string, picCode?: string): Promise<UserServiceResponse>;
-    static fetchVerificationCodeByForget(phone: string, picCode?: string): Promise<UserServiceResponse>;
+    static sendSmsVerificationCodeByPhone(eventType: UserBehaviorEventEnum, phone: string, picCode?: string, phoneCode?: string): Promise<UserServiceResponse>;
+    static fetchVerificationCodeByForget(phone: string, picCode?: string, phoneCode?: string): Promise<UserServiceResponse>;
     static resetPasswordByPhone(phone: string, verificationCode: any, password: string, confirmPassword: any, inviteCode: any): Promise<UserServiceResponse>;
     static resetPasswordByFirst(password: string, confirmPassword: any): Promise<UserServiceResponse>;
 }

package/dist/types/src/view/search/DefaultSearch.vue.d.ts

@@ -86,6 +86,15 @@ declare const _default: import("vue").DefineComponent<{
         type: import("vue").PropType<any[]>;
         default: () => never[];
     };
+    showTopCateAll: {
+        type: BooleanConstructor;
+    };
+    showSecondCateAll: {
+        type: BooleanConstructor;
+    };
+    topCateJustify: {
+        type: StringConstructor;
+    };
     cateFields: {
         type: import("vue").PropType<string[]>;
     };
@@ -230,6 +239,15 @@ declare const _default: import("vue").DefineComponent<{
         type: import("vue").PropType<any[]>;
         default: () => never[];
     };
+    showTopCateAll: {
+        type: BooleanConstructor;
+    };
+    showSecondCateAll: {
+        type: BooleanConstructor;
+    };
+    topCateJustify: {
+        type: StringConstructor;
+    };
     cateFields: {
         type: import("vue").PropType<string[]>;
     };
@@ -291,6 +309,8 @@ declare const _default: import("vue").DefineComponent<{
     showSearchPrefer: boolean;
     topCateFieldOptions: any[];
     secondCateFieldOptions: any[];
+    showTopCateAll: boolean;
+    showSecondCateAll: boolean;
     loading: boolean;
     colon: boolean;
     validateOnRuleChange: boolean;

package/dist/types/src/view/search/DefaultSearchTab.vue.d.ts

@@ -19,6 +19,9 @@ declare const _default: import("vue").DefineComponent<{
         type: PropType<any[]>;
         default: () => never[];
     };
+    topCateJustify: {
+        type: StringConstructor;
+    };
     cateFields: {
         type: PropType<string[]>;
     };
@@ -50,6 +53,9 @@ declare const _default: import("vue").DefineComponent<{
         type: PropType<any[]>;
         default: () => never[];
     };
+    topCateJustify: {
+        type: StringConstructor;
+    };
     cateFields: {
         type: PropType<string[]>;
     };

package/dist/types/src/view/search/SearchTabWidget.d.ts

@@ -10,6 +10,7 @@ export declare class SearchTabWidget extends BaseElementWidget {
     protected get showTopCateAll(): boolean;
     protected get topCateFieldOptions(): IModelFieldOption[];
     protected get secondCateModelField(): RuntimeModelField | undefined;
+    protected get topCateJustify(): string | undefined;
     protected get showSecondCateAll(): boolean;
     protected get secondCateFieldOptions(): IModelFieldOption[];
     onCateSearch: any;

package/dist/types/src/view/search/SearchWidget.d.ts

@@ -8,6 +8,9 @@ export declare class SearchWidget extends BaseSearchWidget {
     protected get disabledExpand(): boolean;
     protected get foldSize(): number;
     protected get cateFields(): string[];
+    protected get topCateJustify(): string | undefined;
+    protected get showTopCateAll(): boolean;
+    protected get showSecondCateAll(): boolean;
     initialize(props: any): this;
     onExpand(expand: boolean): void;
     onSearch(): void;

package/dist/types/src/view/search/types.d.ts

@@ -89,6 +89,15 @@ export declare const DefaultSearchProps: {
         type: PropType<any[]>;
         default: () => never[];
     };
+    showTopCateAll: {
+        type: BooleanConstructor;
+    };
+    showSecondCateAll: {
+        type: BooleanConstructor;
+    };
+    topCateJustify: {
+        type: StringConstructor;
+    };
     cateFields: {
         type: PropType<string[]>;
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oinone/kunlun-vue-admin-base",
-  "version": "6.3.4",
+  "version": "6.3.5",
   "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.3.4",
-    "@oinone/kunlun-vue-router": "6.3.4",
-    "@oinone/kunlun-vue-ui": "6.3.4",
-    "@oinone/kunlun-vue-ui-antd": "6.3.4",
-    "@oinone/kunlun-vue-ui-common": "6.3.4",
-    "@oinone/kunlun-vue-ui-el": "6.3.4",
-    "@oinone/kunlun-vue-widget": "6.3.4",
+    "@oinone/kunlun-vue-admin-layout": "6.3.5",
+    "@oinone/kunlun-vue-router": "6.3.5",
+    "@oinone/kunlun-vue-ui": "6.3.5",
+    "@oinone/kunlun-vue-ui-antd": "6.3.5",
+    "@oinone/kunlun-vue-ui-common": "6.3.5",
+    "@oinone/kunlun-vue-ui-el": "6.3.5",
+    "@oinone/kunlun-vue-widget": "6.3.5",
     "@wangeditor/editor": "5.1.23",
     "@wangeditor/editor-for-vue": "5.1.11",
     "@wangeditor/plugin-upload-attachment": "1.1.0",

package/src/service/user/UserService.ts

@@ -1,5 +1,5 @@
-import { GQL } from '@oinone/kunlun-request';
 import { SYSTEM_MODULE_NAME, UserBehaviorEventEnum, ViewActionTarget } from '@oinone/kunlun-meta';
+import { GQL } from '@oinone/kunlun-request';
 import { encrypt } from '../../util';
 
 export interface UserServiceResponse {
@@ -32,12 +32,14 @@ export class UserService {
   public static sendSmsVerificationCodeByPhone(
     eventType: UserBehaviorEventEnum,
     phone: string,
-    picCode?: string
+    picCode?: string,
+    phoneCode?: string
   ): Promise<UserServiceResponse> {
     return GQL.mutation('pamirsUserTransient', 'sendSmsVerificationCode')
       .buildRequest((builder) =>
         builder.buildObjectParameter('user', (dataBuilder) => {
           dataBuilder.stringParameter('phone', phone);
+          dataBuilder.stringParameter('inviteCode', phoneCode);
           dataBuilder.stringParameter('picCode', picCode);
           dataBuilder.enumerationParameter('userBehaviorEvent', eventType);
         })
@@ -48,11 +50,16 @@ export class UserService {
       .request(SYSTEM_MODULE_NAME.USER);
   }
 
-  public static fetchVerificationCodeByForget(phone: string, picCode?: string): Promise<UserServiceResponse> {
+  public static fetchVerificationCodeByForget(
+    phone: string,
+    picCode?: string,
+    phoneCode?: string
+  ): Promise<UserServiceResponse> {
     return UserService.sendSmsVerificationCodeByPhone(
       UserBehaviorEventEnum.PHONE_MODIFY_PASSWORD_BY_PHONE_SEND_CODE,
       phone,
-      picCode
+      picCode,
+      phoneCode
     );
   }
 

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

@@ -101,7 +101,11 @@ export class ForgetPasswordWidget extends BaseI18nRouterWidget {
     if (!phone) {
       return false;
     }
-    const { broken, errorMsg } = await UserService.fetchVerificationCodeByForget(phone);
+    const { broken, errorMsg } = await UserService.fetchVerificationCodeByForget(
+      phone,
+      undefined,
+      this.selectedCountry?.data?.phoneCode
+    );
     if (broken) {
       if (errorMsg) {
         OioMessage.error(errorMsg);

package/src/view/reset-password/style/index.scss

@@ -66,7 +66,7 @@
     background: #fafafc;
   }
 
-  .ant-input-affix-wrapper {
+  .oio-input.ant-input-affix-wrapper {
     background-color: #fafafc;
     border-radius: 4px;
     border: solid 1px #e6e6e6;
@@ -86,7 +86,7 @@
     }
   }
 
-  .ant-input-affix-wrapper > input.ant-input {
+  .oio-input.ant-input-affix-wrapper > input.ant-input {
     height: 46px !important;
     box-shadow: 0 0 0 1000px #fafafc inset;
     background-color: #fafafc;

package/src/view/search/DefaultSearch.vue

@@ -165,6 +165,7 @@ function createSearchBar(
           type: ButtonType.link,
           iconPlacement: IconPlacement.AFTER,
           icon: 'oinone-xiala',
+          iconColor: 'var(--oio-primary-color)',
           onClick: options.onExpand
         },
         { default: () => expandText }
@@ -241,7 +242,7 @@ export default defineComponent({
       let invisible = false;
       let hasExpandButton = false;
 
-      if (props.template && !props.disabledExpand) {
+      if (props.template) {
         const { widgets } = props.template;
         if (widgets && widgets.length) {
           let fields: DslDefinition[] = [];
@@ -253,18 +254,22 @@ export default defineComponent({
                 cateFields: props.cateFields,
                 dslNodeType: DslDefinitionType.ELEMENT,
                 widget: 'SearchTab',
-                widgets: cateWidgets
+                widgets: cateWidgets,
+                showTopCateAll: props.showTopCateAll,
+                showSecondCateAll: props.showSecondCateAll,
+                topCateJustify: props.topCateJustify
               })!
             );
           }
 
-          const finalExpandSize = props.invisibleSearch ? props.foldSize + 1 : props.foldSize;
-          appendFieldDslDefinition(fields, widgets, finalExpandSize, props.foldSize, props.cateFields);
-          if (fields.length) {
+          if (!props.disabledExpand) {
+            const finalExpandSize = props.invisibleSearch ? props.foldSize + 1 : props.foldSize;
+            appendFieldDslDefinition(fields, widgets, finalExpandSize, props.foldSize, props.cateFields);
             hasExpandButton = fields.length > finalExpandSize;
             if (hasExpandButton) {
               fields = fields.slice(0, finalExpandSize);
             }
+
             if (!props.invisibleSearch) {
               const searchActionBar: VNode[] = createSearchBar(false, {
                 hasExpandButton,
@@ -294,25 +299,22 @@ export default defineComponent({
               );
               fields.push(searchBarCol);
             }
-          } else {
-            hasExpandButton = false;
-            fields = widgets;
+            defaultChildren.push(
+              withDirectives(
+                DslRender.render({
+                  internal: true,
+                  dslNodeType: DslDefinitionType.PACK,
+                  widgets: fields,
+                  widget: InternalWidget.Row,
+                  cols: DEFAULT_COLS,
+                  resolveOptions: {
+                    mode: ResolveMode.NORMAL
+                  }
+                })!,
+                [[vShow, !props.isExpand]]
+              )
+            );
           }
-          defaultChildren.push(
-            withDirectives(
-              DslRender.render({
-                internal: true,
-                dslNodeType: DslDefinitionType.PACK,
-                widgets: fields,
-                widget: InternalWidget.Row,
-                cols: DEFAULT_COLS,
-                resolveOptions: {
-                  mode: ResolveMode.NORMAL
-                }
-              })!,
-              [[vShow, !props.isExpand]]
-            )
-          );
         }
       }
 

package/src/view/search/DefaultSearchTab.vue

@@ -27,6 +27,9 @@ export default defineComponent({
       type: Array as PropType<any[]>,
       default: () => []
     },
+    topCateJustify: {
+      type: String
+    },
     cateFields: {
       type: Array as PropType<string[]>
     },
@@ -104,11 +107,16 @@ export default defineComponent({
   render() {
     const cateSearchNodes = [] as VNode[];
     if (this.topCateFieldOptions?.length) {
+      const className = ['oio-cate-search'];
+      if (this.topCateJustify) {
+        className.push(`oio-cate-search-${this.topCateJustify.toLocaleLowerCase()}`);
+      }
+
       cateSearchNodes.push(
         createVNode(
           OioTabs,
           {
-            class: 'oio-cate-search',
+            class: className,
             activeKey: this.topCateActive,
             'onUpdate:activeKey': (val) => (this.topCateActive = val),
             onChange: this.onChangeTopCate

package/src/view/search/SearchTabWidget.ts

@@ -2,7 +2,7 @@ import { SPI } from '@oinone/kunlun-spi';
 import { IModelField, IModelFieldOption, ModelFieldType, ViewType } from '@oinone/kunlun-meta';
 import { Widget } from '@oinone/kunlun-vue-widget';
 import { ActiveRecord, RuntimeModelField } from '@oinone/kunlun-engine';
-import { BooleanHelper, CallChaining } from '@oinone/kunlun-shared';
+import { BooleanHelper, CallChaining, Optional } from '@oinone/kunlun-shared';
 import DefaultSearchTab from './DefaultSearchTab.vue';
 import { BaseElementWidget } from '../../basic';
 import { CATE_ALL_OPTION } from './types';
@@ -43,7 +43,7 @@ export class SearchTabWidget extends BaseElementWidget {
 
   @Widget.Reactive()
   protected get showTopCateAll(): boolean {
-    return BooleanHelper.toBoolean(this.getDsl().showTopCateAll) || true;
+    return Optional.ofNullable(BooleanHelper.toBoolean(this.getDsl().showTopCateAll)).orElse(true);
   }
 
   @Widget.Reactive()
@@ -64,9 +64,14 @@ export class SearchTabWidget extends BaseElementWidget {
     );
   }
 
+  @Widget.Reactive()
+  protected get topCateJustify(): string | undefined {
+    return this.getDsl().topCateJustify;
+  }
+
   @Widget.Reactive()
   protected get showSecondCateAll(): boolean {
-    return BooleanHelper.toBoolean(this.getDsl().showSecondCateAll) || true;
+    return Optional.ofNullable(BooleanHelper.toBoolean(this.getDsl().showSecondCateAll)).orElse(true);
   }
 
   @Widget.Reactive()

package/src/view/search/SearchWidget.ts

@@ -6,7 +6,7 @@ import {
 } from '@oinone/kunlun-engine';
 import { Entity, ViewType } from '@oinone/kunlun-meta';
 import { getRouterInstance } from '@oinone/kunlun-router';
-import { BooleanHelper, NumberHelper } from '@oinone/kunlun-shared';
+import { BooleanHelper, NumberHelper, Optional } from '@oinone/kunlun-shared';
 import { SPI } from '@oinone/kunlun-spi';
 import { OioMessage } from '@oinone/kunlun-vue-ui-antd';
 import { isAllInvisible, Widget } from '@oinone/kunlun-vue-widget';
@@ -57,6 +57,21 @@ export class SearchWidget extends BaseSearchWidget {
     return [topCateField, secondCateField];
   }
 
+  @Widget.Reactive()
+  protected get topCateJustify(): string | undefined {
+    return this.getDsl().topCateJustify;
+  }
+
+  @Widget.Reactive()
+  protected get showTopCateAll(): boolean {
+    return Optional.ofNullable(BooleanHelper.toBoolean(this.getDsl().showTopCateAll)).orElse(true);
+  }
+
+  @Widget.Reactive()
+  protected get showSecondCateAll(): boolean {
+    return Optional.ofNullable(BooleanHelper.toBoolean(this.getDsl().showSecondCateAll)).orElse(true);
+  }
+
   public initialize(props) {
     super.initialize(props);
     this.setComponent(DefaultSearch);

package/src/view/search/style/index.scss

@@ -10,10 +10,29 @@ $labelMarginRight: 16px;
     box-shadow: none;
     margin-bottom: var(--oio-margin-md);
     height: auto;
-    &.oio-tabs.ant-tabs-top .ant-tabs-nav .ant-tabs-tab {
-      padding: var(--oio-padding-md) 0;
-      font-size: var(--oio-font-size-lg);
-      font-weight: bold;
+
+    &.oio-cate-search-center {
+      .ant-tabs-nav-wrap {
+        justify-content: center;
+      }
+    }
+
+    &.oio-cate-search-end {
+      .ant-tabs-nav-wrap {
+        justify-content: end;
+      }
+    }
+    &.oio-tabs.ant-tabs-top {
+      .ant-tabs-tab + .ant-tabs-tab {
+        margin-left: 40px;
+      }
+
+      .ant-tabs-nav {
+        .ant-tabs-tab {
+          padding: var(--oio-padding-md) 0;
+          font-size: var(--oio-font-size-lg);
+        }
+      }
     }
     .ant-tabs-content-holder {
       display: none;
@@ -28,9 +47,8 @@ $labelMarginRight: 16px;
         padding: 0 var(--oio-padding-md);
         margin-right: var(--oio-margin-md);
         border-radius: var(--oio-border-radius);
-        background: var(--oio-tag-select-background);
         font-size: var(--oio-font-size);
-        color: var(--oio-text-color);
+        color: var(--oio-text-color-secondary);
         height: var(--oio-height);
         line-height: var(--oio-height);
         font-weight: 400;
@@ -39,10 +57,14 @@ $labelMarginRight: 16px;
           margin-right: 0;
         }
 
-        &:hover,
+        &:hover {
+          background: var(--oio-hover-background-color);
+          color: var(--oio-hover-text-color);
+        }
+
         &.active {
-          color: #fff;
-          background: var(--oio-primary-color);
+          color: var(--oio-selected-text-color);
+          background: var(--oio-selected-background-color);
         }
       }
     }

package/src/view/search/types.ts

@@ -93,6 +93,15 @@ export const DefaultSearchProps = {
     type: Array as PropType<any[]>,
     default: () => []
   },
+  showTopCateAll: {
+    type: Boolean
+  },
+  showSecondCateAll: {
+    type: Boolean
+  },
+  topCateJustify: {
+    type: String
+  },
   cateFields: {
     type: Array as PropType<string[]>
   },