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

package/dist/oinone-kunlun-vue-admin-base.esm.js

@@ -30520,10 +30520,11 @@ const SimpleRedirectViewActionFragment = GQL.fragment(SimpleRedirectViewActionFr
     .parameter('model', 'name', 'target', 'viewType', ['moduleDefinition', ['name']], ['resModuleDefinition', ['name']])
     .toString();
 class UserService {
-    static sendSmsVerificationCodeByPhone(eventType, phone, picCode) {
+    static sendSmsVerificationCodeByPhone(eventType, phone, picCode, phoneCode) {
         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);
         }))
@@ -30532,8 +30533,8 @@ class UserService {
         })
             .request(SYSTEM_MODULE_NAME.USER);
     }
-    static fetchVerificationCodeByForget(phone, picCode) {
-        return UserService.sendSmsVerificationCodeByPhone(UserBehaviorEventEnum.PHONE_MODIFY_PASSWORD_BY_PHONE_SEND_CODE, phone, picCode);
+    static fetchVerificationCodeByForget(phone, picCode, phoneCode) {
+        return UserService.sendSmsVerificationCodeByPhone(UserBehaviorEventEnum.PHONE_MODIFY_PASSWORD_BY_PHONE_SEND_CODE, phone, picCode, phoneCode);
     }
     static resetPasswordByPhone(phone, verificationCode, password, confirmPassword, inviteCode) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -70667,6 +70668,12 @@ const DefaultSearchProps = Object.assign(Object.assign({}, OioFormProps$1), { te
     }, secondCateFieldOptions: {
         type: Array,
         default: () => []
+    }, showTopCateAll: {
+        type: Boolean
+    }, showSecondCateAll: {
+        type: Boolean
+    }, topCateJustify: {
+        type: String
     }, cateFields: {
         type: Array
     }, onCateSearch: {
@@ -70764,6 +70771,7 @@ function createSearchBar(isExpand, options) {
             type: ButtonType.link,
             iconPlacement: IconPlacement.AFTER,
             icon: 'oinone-xiala',
+            iconColor: 'var(--oio-primary-color)',
             onClick: options.onExpand
         }, { default: () => expandText }));
     }
@@ -70826,7 +70834,7 @@ var script$1h = defineComponent({
             const defaultChildren = [];
             let invisible = false;
             let hasExpandButton = false;
-            if (props.template && !props.disabledExpand) {
+            if (props.template) {
                 const { widgets } = props.template;
                 if (widgets && widgets.length) {
                     let fields = [];
@@ -70837,12 +70845,15 @@ var script$1h = 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);
@@ -70870,21 +70881,17 @@ var script$1h = defineComponent({
                             const searchBarCol = createSearchBarCol(searchActionBar, (props.foldSize - fields.length) * (DEFAULT_COLS$1 / (props.foldSize + 1)), invisible, props.foldSize);
                             fields.push(searchBarCol);
                         }
+                        defaultChildren.push(withDirectives(DslRender.render({
+                            internal: true,
+                            dslNodeType: DslDefinitionType.PACK,
+                            widgets: fields,
+                            widget: InternalWidget.Row,
+                            cols: DEFAULT_COLS$1,
+                            resolveOptions: {
+                                mode: ResolveMode.NORMAL
+                            }
+                        }), [[vShow, !props.isExpand]]));
                     }
-                    else {
-                        hasExpandButton = false;
-                        fields = widgets;
-                    }
-                    defaultChildren.push(withDirectives(DslRender.render({
-                        internal: true,
-                        dslNodeType: DslDefinitionType.PACK,
-                        widgets: fields,
-                        widget: InternalWidget.Row,
-                        cols: DEFAULT_COLS$1,
-                        resolveOptions: {
-                            mode: ResolveMode.NORMAL
-                        }
-                    }), [[vShow, !props.isExpand]]));
                 }
             }
             if (hasExpandButton || props.disabledExpand) {
@@ -70992,6 +70999,15 @@ let SearchWidget = class SearchWidget extends BaseSearchWidget {
         }
         return [topCateField, secondCateField];
     }
+    get topCateJustify() {
+        return this.getDsl().topCateJustify;
+    }
+    get showTopCateAll() {
+        return Optional.ofNullable(BooleanHelper.toBoolean(this.getDsl().showTopCateAll)).orElse(true);
+    }
+    get showSecondCateAll() {
+        return Optional.ofNullable(BooleanHelper.toBoolean(this.getDsl().showSecondCateAll)).orElse(true);
+    }
     initialize(props) {
         super.initialize(props);
         this.setComponent(script$1h);
@@ -71188,6 +71204,21 @@ __decorate([
     __metadata("design:type", Array),
     __metadata("design:paramtypes", [])
 ], SearchWidget.prototype, "cateFields", null);
+__decorate([
+    Widget.Reactive(),
+    __metadata("design:type", Object),
+    __metadata("design:paramtypes", [])
+], SearchWidget.prototype, "topCateJustify", null);
+__decorate([
+    Widget.Reactive(),
+    __metadata("design:type", Boolean),
+    __metadata("design:paramtypes", [])
+], SearchWidget.prototype, "showTopCateAll", null);
+__decorate([
+    Widget.Reactive(),
+    __metadata("design:type", Boolean),
+    __metadata("design:paramtypes", [])
+], SearchWidget.prototype, "showSecondCateAll", null);
 __decorate([
     Widget.Method(),
     __metadata("design:type", Function),
@@ -71293,6 +71324,9 @@ var script$1g = defineComponent({
             type: Array,
             default: () => []
         },
+        topCateJustify: {
+            type: String
+        },
         cateFields: {
             type: Array
         },
@@ -71366,8 +71400,12 @@ var script$1g = defineComponent({
         var _a, _b;
         const cateSearchNodes = [];
         if ((_a = this.topCateFieldOptions) === null || _a === void 0 ? void 0 : _a.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
@@ -71408,7 +71446,7 @@ let SearchTabWidget = class SearchTabWidget extends BaseElementWidget {
         return (_c = (_b = this.rootRuntimeContext) === null || _b === void 0 ? void 0 : _b.model.modelFields) === null || _c === void 0 ? void 0 : _c.find((a) => a && a.ttype === ModelFieldType.Enum && a.name === cateField);
     }
     get showTopCateAll() {
-        return BooleanHelper.toBoolean(this.getDsl().showTopCateAll) || true;
+        return Optional.ofNullable(BooleanHelper.toBoolean(this.getDsl().showTopCateAll)).orElse(true);
     }
     get topCateFieldOptions() {
         const topCateModelField = this.topCateModelField;
@@ -71423,8 +71461,11 @@ let SearchTabWidget = class SearchTabWidget extends BaseElementWidget {
         }
         return (_b = (_a = this.rootRuntimeContext) === null || _a === void 0 ? void 0 : _a.model.modelFields) === null || _b === void 0 ? void 0 : _b.find((a) => a && a.ttype === ModelFieldType.Enum && a.name === secondCateField);
     }
+    get topCateJustify() {
+        return this.getDsl().topCateJustify;
+    }
     get showSecondCateAll() {
-        return BooleanHelper.toBoolean(this.getDsl().showSecondCateAll) || true;
+        return Optional.ofNullable(BooleanHelper.toBoolean(this.getDsl().showSecondCateAll)).orElse(true);
     }
     get secondCateFieldOptions() {
         const secondCateModelField = this.secondCateModelField;
@@ -71495,6 +71536,11 @@ __decorate([
     __metadata("design:type", Object),
     __metadata("design:paramtypes", [])
 ], SearchTabWidget.prototype, "secondCateModelField", null);
+__decorate([
+    Widget.Reactive(),
+    __metadata("design:type", Object),
+    __metadata("design:paramtypes", [])
+], SearchTabWidget.prototype, "topCateJustify", null);
 __decorate([
     Widget.Reactive(),
     __metadata("design:type", Boolean),
@@ -76085,12 +76131,13 @@ let ForgetPasswordWidget = class ForgetPasswordWidget extends BaseI18nRouterWidg
         this.router.push({ segments: [{ path: 'login' }] });
     }
     fetchVerificationCode() {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             const { phone } = this.formData;
             if (!phone) {
                 return false;
             }
-            const { broken, errorMsg } = yield UserService.fetchVerificationCodeByForget(phone);
+            const { broken, errorMsg } = yield UserService.fetchVerificationCodeByForget(phone, undefined, (_b = (_a = this.selectedCountry) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.phoneCode);
             if (broken) {
                 if (errorMsg) {
                     OioMessage.error(errorMsg);