@alauda-fe/dynamic-plugin-shared 0.0.3-alpha.0 → 0.0.3-alpha.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alauda-fe/dynamic-plugin-shared",
-  "version": "0.0.3-alpha.0",
+  "version": "0.0.3-alpha.1",
   "peerDependencies": {
     "@alauda-fe/i18n": "1.0.4",
     "@alauda/chart": "^0.1.11",

package/styles/mixins.scss

@@ -1,9 +1,9 @@
 // stylelint-disable no-descending-specificity
-@import 'node_modules/@alauda/ui/theme/var';
-@import 'node_modules/@alauda/ui/theme/mixin';
-@import 'node_modules/@alauda/ui/theme/pattern';
-@import 'libs/dynamic-plugin-sdk/styles/mixins';
-@import './var';
+@use 'node_modules/@alauda/ui/theme/var' as *;
+@use 'node_modules/@alauda/ui/theme/mixin' as *;
+@use 'node_modules/@alauda/ui/theme/pattern' as *;
+@use 'libs/dynamic-plugin-sdk/styles/mixins' as *;
+@use './var' as shared-var;
 
 @mixin array-form-table {
   .acl-array-form-table {
@@ -250,7 +250,9 @@
 
 @mixin detail-page-fullheight($gap: 0) {
   display: block;
-  height: calc(100vh - (#{$page-top}) - #{111px + 16px + 20px + $gap});
+  height: calc(
+    100vh - (#{shared-var.$page-top}) - #{111px + 16px + 20px + $gap}
+  );
 
   > .aui-card {
     height: 100%;
@@ -267,13 +269,13 @@
 // 通用创建/更新页，撑屏内容高度
 @mixin create-page-fullheight__card($hasSample: false) {
   $height: calc(
-    100vh - (#{$page-top}) - #{20px + 32px + 16px + 1px + 16px + 20px + 20px +
-      $fixed-form-footer-height}
+    100vh - (#{shared-var.$page-top}) - #{20px + 32px + 16px + 1px + 16px + 20px +
+      20px + shared-var.$fixed-form-footer-height}
   );
   @if $hasSample == true {
     $height: calc(
       100vh -
-        (#{$page-top}) -
+        (#{shared-var.$page-top}) -
         #{20px +
         32px +
         16px +
@@ -282,7 +284,7 @@
         20px +
         20px +
         15px +
-        $fixed-form-footer-height}
+        shared-var.$fixed-form-footer-height}
     );
   }
 
@@ -300,7 +302,8 @@
 // 创建页，无card-header时撑屏内容高度
 @mixin create-page-fullheight__content {
   height: calc(
-    100vh - (#{$page-top}) - #{20px + 20px + 20px + $fixed-form-footer-height}
+    100vh - (#{shared-var.$page-top}) - #{20px + 20px + 20px +
+      shared-var.$fixed-form-footer-height}
   );
 }
 

package/types/alauda-fe-dynamic-plugin-shared.d.ts

@@ -2420,7 +2420,7 @@ declare const compareVersion: {
     gte: (v1: string, v2: string) => boolean;
     cmp: (v1: string, v2: string, operator: CompareOperator) => boolean;
 };
-declare const compareMinorVersion: (v1: string, v2: string) => 0 | 1 | -1;
+declare const compareMinorVersion: (v1: string, v2: string) => 1 | 0 | -1;
 
 type AvailableResourceType = (typeof RESOURCE_MAC_TYPES)[number];
 interface ResourceControl {
@@ -2858,7 +2858,7 @@ declare class ScrollToFirstInvalidDirective {
     readonly cdkScrollable: CdkScrollable;
     labelOffset: number;
     aclScrollToFirstInvalid: boolean | '';
-    get containerEl(): (Window & typeof globalThis) | HTMLElement;
+    get containerEl(): HTMLElement | (Window & typeof globalThis);
     onSubmit(): void;
     scrollToFirstInvalid(): void;
     getFirstInvalidInput(): HTMLElement;
@@ -3850,7 +3850,7 @@ declare class BaseNestedFormControl<V, M = V> implements AfterViewInit, OnDestro
     protected asyncValidator: boolean;
     protected cdr: ChangeDetectorRef;
     protected destroy$$: Subject<void>;
-    protected hostForm: FormGroupDirective | NgForm;
+    protected hostForm: NgForm | FormGroupDirective;
     constructor();
     ngAfterViewInit(): void;
     ngOnDestroy(): void;
@@ -4936,11 +4936,11 @@ declare class K8SResourcePagedList<R extends KubernetesResource = KubernetesReso
     loading$: Observable<boolean>;
     items$: Observable<R[]>;
     totalItems$: Observable<number>;
-    loadError$: Observable<HttpErrorResponse | Status>;
+    loadError$: Observable<Status | HttpErrorResponse>;
     $loading: Signal<boolean>;
     $items: Signal<R[]>;
     $totalItems: Signal<number>;
-    $loadError: Signal<HttpErrorResponse | Status>;
+    $loadError: Signal<Status | HttpErrorResponse>;
     constructor(config: PagedListConfig<R, P>);
     reload(): void;
     private sourceLoadState;
@@ -5168,7 +5168,7 @@ declare class TableComponent<Item extends object, Context = TableUtilService<Ite
 }
 
 declare function defaultFilter<T extends string | number>(value: T, filterValue: T, _item: unknown, name: string): boolean;
-declare function defaultSorter<T>(a: T, b: T): 0 | 1 | -1;
+declare function defaultSorter<T>(a: T, b: T): 1 | 0 | -1;
 
 declare class NamespaceBadgeComponent {
     name: string;
@@ -5457,7 +5457,7 @@ declare class ArrayFormTableComponent implements OnDestroy {
     addDisabled: boolean | '';
     actionColumnDivider: boolean | '';
     showZeroState: boolean;
-    get formDirective(): FormGroupDirective | NgForm;
+    get formDirective(): NgForm | FormGroupDirective;
     /**
      * 自定义是否展示错误内容
      * 例如 control 是 FormGroup，只有在内部子 control 错误时才需要展示错误内容