quick fix

biaogebusy · Jun 24, 2024 · be8a8ac · be8a8ac
1 parent 60d8f79
commit be8a8ac
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 34 deletions.
diff --git a/src/app/core/branding/header/menu/search-box/search-box.component.ts b/src/app/core/branding/header/menu/search-box/search-box.component.ts
@@ -4,6 +4,7 @@ import {
   OnInit,
   ChangeDetectionStrategy,
   ChangeDetectorRef,
+  inject,
 } from '@angular/core';
 import { UntypedFormGroup } from '@angular/forms';
 import { NodeService } from '@core/service/node.service';
@@ -25,13 +26,10 @@ export class SearchBoxComponent extends BaseComponent implements OnInit {
 
   form: UntypedFormGroup;
   options: any[] = [];
-
-  constructor(
-    public nodeService: NodeService,
-    private router: Router,
-    private formService: FormService,
-    private cd: ChangeDetectorRef
-  ) {
+  nodeService = inject(NodeService);
+  formService = inject(FormService);
+  router = inject(Router);
+  constructor(private cd: ChangeDetectorRef) {
     super();
   }
 
@@ -54,9 +52,9 @@ export class SearchBoxComponent extends BaseComponent implements OnInit {
               page: '0',
               loading: 0,
             },
-            value
+            value,
           ),
-          isEmpty
+          isEmpty,
         );
 
         this.nodeService

diff --git a/src/app/core/branding/manage-sidebar/manage-sidebar.component.html b/src/app/core/branding/manage-sidebar/manage-sidebar.component.html
@@ -1,27 +1,20 @@
 @if (branding$ | async; as branding) {
-  <div
-    class="h-full"
-    [ngClass]="branding.header.sidebar?.classes"
-    >
+  <div class="h-full" [ngClass]="branding.header.sidebar?.classes">
     <div
       class="manage-sidebar {{ drawer.opened ? 'opened' : 'expanded' }}"
       *reqRolesIf="branding.header?.sidebar"
-      >
+    >
       @if (branding.header?.sidebar; as sidebar) {
-        <div
-          class="manage-brand p-y-sm p-x-sm"
-          >
+        <div class="manage-brand p-y-sm p-x-sm">
           @if (!sidebar?.params.showUser) {
-            <app-logo
-              [content]="sidebar.logo"
-            ></app-logo>
+            <app-logo [content]="sidebar.logo"></app-logo>
           } @else {
             <div class="profile">
               <a class="picture" [routerLink]="userService.userPage">
                 <img [src]="user.picture || coreConfig.defaultAvatar" alt="" />
               </a>
               @if (drawer.opened) {
-                <div class="name bold pt-[10px]">
+                <div class="name font-bold pt-[10px]">
                   <a class="one-line" [routerLink]="userService.userPage">{{
                     user.display_name
                   }}</a>
@@ -40,7 +33,7 @@
                 <img [src]="user.picture || coreConfig.defaultAvatar" alt="" />
               </a>
               @if (drawer.opened) {
-                <div class="name bold pt-[10px]">
+                <div class="name font-bold pt-[10px]">
                   <a class="one-line" [routerLink]="userService.userPage">{{
                     user.display_name
                   }}</a>
@@ -59,17 +52,17 @@
         <div
           class="manage-menu"
           [ngStyle]="{ overflow: drawer.opened ? 'auto' : 'visible' }"
-          >
-          <app-accordion [hidden]="!drawer.opened" [content]="menu"></app-accordion>
+        >
+          <app-accordion
+            [hidden]="!drawer.opened"
+            [content]="menu"
+          ></app-accordion>
           <div class="icon-list" [hidden]="drawer.opened">
             @for (item of menu; track item) {
               <div class="item" checkChildMenuActive>
                 <ng-container *reqRolesIf="item">
                   @if (item.icon) {
-                    <app-icon
-                      class="icon"
-                      [content]="item.icon"
-                    ></app-icon>
+                    <app-icon class="icon" [content]="item.icon"></app-icon>
                   }
                   <app-hover-menu [content]="item"></app-hover-menu>
                 </ng-container>

diff --git a/src/app/core/interface/combs/ICalendar.ts b/src/app/core/interface/combs/ICalendar.ts
@@ -1,8 +1,9 @@
 import { CalendarOptions } from '@fullcalendar/core';
 import { ICombsBase } from './ICombsBase';
+import { FormlyFieldConfig } from '@ngx-formly/core';
 
 export interface IFullCalendar extends ICombsBase {
-  sidebar: any[];
+  form: FormlyFieldConfig[];
   calendar: {
     options: CalendarOptions;
     theme: object;

diff --git a/src/assets/app/core/base.json b/src/assets/app/core/base.json
@@ -160,15 +160,15 @@
   "defaultAvatar": "/assets/images/avatar/01.jpeg",
   "defaultThumb": "/assets/images/default.png",
   "amap": {
-    "key": "xxx",
+    "key": "33877188af64f0213ff4fa259b1c14b8",
     "version": "1.4.15",
     "plugins": ["AMap.Geocoder"],
     "city": "0771",
     "zoom": 18,
     "center": [108.32067, 22.817424],
     "mapStyle": {
-      "light": "amap://styles/xxx",
-      "dark": "amap://styles/xxx"
+      "light": "amap://styles/1421728e809147de8bfac4fd1abd2fb3",
+      "dark": "amap://styles/50fcdf3719b8cd479cd3017044e49c22"
     },
     "features": ["bg", "road", "point"]
   },
@@ -689,7 +689,7 @@
           }
         },
         "type": "showcase-1v1",
-        "row": 4,
+        "row": 3,
         "elements": [
           {
             "type": "box",

diff --git a/src/assets/app/en/core/base.json b/src/assets/app/en/core/base.json
@@ -704,7 +704,7 @@
           }
         },
         "type": "showcase-1v1",
-        "row": 4,
+        "row": 3,
         "elements": [
           {
             "type": "box",