imm-element-ui 0.4.0 → 0.4.2

package/lib/grid/grid/grid.component.d.ts

@@ -244,7 +244,7 @@ export declare class GridComponent {
     searchPrm: import("@angular/core").ModelSignal<Search>;
     deleteEmit: import("@angular/core").OutputEmitterRef<number[]>;
     addEmit: import("@angular/core").OutputEmitterRef<void>;
-    addType: import("@angular/core").InputSignal<"select" | "handle" | "none" | undefined>;
+    addType: import("@angular/core").InputSignal<"select" | "none" | "handle" | undefined>;
     selectData: import("@angular/core").InputSignal<any[] | undefined>;
     showAct: import("@angular/core").InputSignal<boolean>;
     actPos: import("@angular/core").InputSignal<"top" | "bottom">;

package/lib/search/pop-panel/pop-panel.component.d.ts

@@ -1,4 +1,4 @@
-import { SearchItem } from '../search/search.component';
+import { SearchItem, SearchItemOption } from '../search/search.component';
 import { ActionService } from '../../service/action.service';
 import * as i0 from "@angular/core";
 export declare class PopPanelComponent {
@@ -6,7 +6,7 @@ export declare class PopPanelComponent {
     searchItems: import("@angular/core").InputSignal<SearchItem[] | undefined>;
     modelName: import("@angular/core").InputSignal<string | undefined>;
     otherItems: SearchItem[];
-    groupItems: SearchItem[];
+    sortOptions: SearchItemOption[];
     itemop: SearchItem;
     constructor(action: ActionService);
     static ɵfac: i0.ɵɵFactoryDeclaration<PopPanelComponent, never>;

package/lib/search/pop-sort/pop-sort.component.d.ts

@@ -1,9 +1,15 @@
-import { SearchItem } from '../search/search.component';
+import { SearchItemOption } from '../search/search.component';
+import { ActionService } from '../../service/action.service';
 import * as i0 from "@angular/core";
 export declare class PopSortComponent {
-    searchItems: import("@angular/core").InputSignal<SearchItem[] | undefined>;
+    private action;
+    sortOptions: import("@angular/core").InputSignal<SearchItemOption[] | undefined>;
+    modelName: import("@angular/core").InputSignal<string | undefined>;
     isActive: boolean;
+    fields: string[];
+    constructor(action: ActionService);
     onLabelClick(event: MouseEvent): void;
+    onSortOptionClick(item: SearchItemOption, event: MouseEvent): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<PopSortComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<PopSortComponent, "pop-sort", never, { "searchItems": { "alias": "searchItems"; "required": false; "isSignal": true; }; }, {}, never, never, true, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<PopSortComponent, "pop-sort", never, { "sortOptions": { "alias": "sortOptions"; "required": false; "isSignal": true; }; "modelName": { "alias": "modelName"; "required": false; "isSignal": true; }; }, {}, never, never, true, never>;
 }

package/lib/search/search/search.component.d.ts

@@ -1,7 +1,7 @@
 import { ElementRef } from '@angular/core';
 import { GridOptions } from '../../grid/grid/grid.component';
-import { ActionService } from '../../service/action.service';
-import { Search } from '../../am/am.component';
+import { ActionService, SortItem } from '../../service/action.service';
+import { Search, Sort } from '../../am/am.component';
 import { Popover } from 'primeng/popover';
 import { Observable } from 'rxjs';
 import { I18nService } from '../../service/i18n.service';
@@ -59,6 +59,7 @@ export declare class SearchComponent {
     onPopHide(event: any): void;
     calcMarginLeft(): void;
     getSearchItemByField(field: string): SearchItem;
+    getSortItemBySorts(sorts: Sort[]): SortItem | undefined;
     onStrItemClick(event: any): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<SearchComponent, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<SearchComponent, "custom-search", never, { "searchPrm": { "alias": "searchPrm"; "required": false; "isSignal": true; }; "gridOptions": { "alias": "gridOptions"; "required": false; "isSignal": true; }; }, {}, never, never, true, never>;

package/lib/search/search-tip/search-tip.component.d.ts

@@ -1,25 +1,28 @@
 import { SearchItem, SearchItemOption } from '../search/search.component';
-import { ColumnFilter } from '../../am/am.component';
-import { ActionService } from '../../service/action.service';
+import { ColumnFilter, Sort } from '../../am/am.component';
+import { ActionService, SortItem } from '../../service/action.service';
 import { I18nService } from '../../service/i18n.service';
 import * as i0 from "@angular/core";
 export declare class SearchTipComponent {
     private action;
     private i18n;
-    groups: import("@angular/core").InputSignal<string[] | undefined>;
     columnFilter: import("@angular/core").InputSignal<ColumnFilter | undefined>;
     searchItem: import("@angular/core").InputSignal<SearchItem | undefined>;
+    sorts: import("@angular/core").InputSignal<Sort[] | undefined>;
+    sortItem: import("@angular/core").InputSignal<SortItem | undefined>;
     flattenTreeOptions?: any[];
     operatorList: any[];
     constructor(action: ActionService, i18n: I18nService);
-    onGroupTipClose(): void;
+    onSortTipClick(): void;
+    onSortTipClose(): void;
     onSearchTipClose(): void;
     isNotFirstCheckedOption(option: SearchItemOption, item: SearchItem): boolean;
     formatSelectGroups(selects: SearchItem[]): string;
     operatorLabel(opera: string): any;
+    labelForSorts(): void;
     labelForList(): (string | undefined)[] | undefined;
     labelForSelect(): string | (string | undefined)[] | undefined;
     labelForTree(): any;
     static ɵfac: i0.ɵɵFactoryDeclaration<SearchTipComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<SearchTipComponent, "search-tip", never, { "groups": { "alias": "groups"; "required": false; "isSignal": true; }; "columnFilter": { "alias": "columnFilter"; "required": false; "isSignal": true; }; "searchItem": { "alias": "searchItem"; "required": false; "isSignal": true; }; }, {}, never, never, true, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<SearchTipComponent, "search-tip", never, { "columnFilter": { "alias": "columnFilter"; "required": false; "isSignal": true; }; "searchItem": { "alias": "searchItem"; "required": false; "isSignal": true; }; "sorts": { "alias": "sorts"; "required": false; "isSignal": true; }; "sortItem": { "alias": "sortItem"; "required": false; "isSignal": true; }; }, {}, never, never, true, never>;
 }

package/lib/search/search-utils.d.ts

@@ -5,7 +5,6 @@ export declare const searchUtils: {
     flattenTree: (nodes: any[]) => any[];
     transferFilter: (item: SearchItem) => ColumnFilter | undefined;
     concatFilter: (search: Search | undefined, filter: ColumnFilter) => Search;
-    concatGroup: (search: Search | undefined, item: SearchItem) => Search;
     extractSearchItems: (columnDefs: any, searchItems?: SearchItem[]) => SearchItem[];
     cascadeColumnFilters: (searchClear: string, columnFilters: ColumnFilter[], searchItems: SearchItem[]) => ColumnFilter[];
     translate: (operatorList: any[], i18n: I18nService) => any[];

package/lib/service/action.service.d.ts

@@ -12,6 +12,11 @@ export interface SearchRow {
     modelName?: string;
     search?: Search;
 }
+export interface SortItem {
+    isAsc?: boolean;
+    fields?: string[];
+    labels?: string[];
+}
 export interface FieldLabelAction {
     key?: string;
     type?: 'mouseenter' | 'mouseleave' | 'click' | 'dblclick';
@@ -21,9 +26,8 @@ export declare class ActionService {
     modelNameForSearch: import("@angular/core").WritableSignal<String | undefined>;
     searchList: import("@angular/core").WritableSignal<SearchRow[]>;
     searchItem: import("@angular/core").WritableSignal<SearchItem | undefined>;
-    groupItem: import("@angular/core").WritableSignal<SearchItem | undefined>;
     searchClear: import("@angular/core").WritableSignal<String | undefined>;
-    groupClear: import("@angular/core").WritableSignal<Boolean | undefined>;
+    sortItem: import("@angular/core").WritableSignal<SortItem | undefined>;
     selectedRows: import("@angular/core").WritableSignal<any[]>;
     page: import("@angular/core").WritableSignal<Page | undefined>;
     fieldLabelAction: import("@angular/core").WritableSignal<FieldLabelAction | undefined>;
@@ -37,12 +41,10 @@ export declare class ActionService {
     searchMonitor(modelName: string | undefined): boolean;
     setSearchItem(searchItem: SearchItem | undefined): void;
     getSearchItem(): SearchItem | undefined;
-    setGroupItem(groupItem: SearchItem | undefined): void;
-    getGroupItem(): SearchItem | undefined;
     setSearchClear(searchClear: String | undefined): void;
     getSearchClear(): String | undefined;
-    setGroupClear(groupClear: Boolean | undefined): void;
-    getGroupClear(): Boolean | undefined;
+    setSortItem(sortItem: SortItem | undefined): void;
+    getSortItem(): SortItem | undefined;
     setPage(page: Page): void;
     getPage(): Page | undefined;
     setFieldLabelAction(key: string, type: 'mouseenter' | 'mouseleave' | 'click' | 'dblclick'): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imm-element-ui",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "peerDependencies": {
     "@angular/common": "^18.2.0",
     "@angular/core": "^18.2.0"

package/src/lib/grid/pager/pager.component.scss

@@ -1,13 +1,3 @@
-:host ::ng-deep {
-	.ms-down .p-button {
-		border-radius: 6px 0 0 6px;
-		margin-right: 1px;
-	}
-	.ms-up .p-button {
-		border-radius: 0 6px 6px 0;
-		margin-left: 1px;
-	}
-}
 .page-container {
 	color: #334155;
 }

package/src/lib/href-btn-list/href-btn-list.component.scss

@@ -1,6 +1,15 @@
 .btn{
-  border-radius: var(--p-border-radius-md);
+  // border-radius: var(--p-border-radius-md);
   border: 1px solid rgb(216, 218, 221);
+  z-index: 0;
+  // border-left: none;
+  &:active{
+    border-color: var(--p-button-primary-active-border-color);
+    z-index: 1
+  }
+}
+.not-first{
+  margin-left: -0.8px;
 }
 .bg {
   background-color: rgb(230, 242, 243);
@@ -23,5 +32,19 @@
   color: var(--p-primary-color);
 }
 .btn:hover{
-  background-color: #e7e9ed;
+  // background-color: #e7e9ed;
+  background-color: var(--p-button-outlined-primary-hover-background);
+}
+
+.border-left {
+  border-left:1px solid rgb(216, 218, 221);
+}
+.first-btn {
+  border-radius:var(--p-border-radius-md) 0 0 var(--p-border-radius-md);
+  margin-left: 0 !important;
+
+  // border-left:1px solid rgb(216, 218, 221);
+}
+.last-btn {
+  border-radius:0 var(--p-border-radius-md) var(--p-border-radius-md) 0;
 }

package/src/lib/search/pop-date/pop-date.component.scss

@@ -1,10 +1,30 @@
 @import 'styles';
-:host ::ng-deep {
-	.p-inputtext {
-		font-size: 12px;
+::ng-deep {
+	.s-pop-date-container {
+		.p-inputtext {
+			font-size: 12px;
+		}
+		.p-select-sm .p-select-label {
+			font-size: 12px;
+		}
 	}
-	.p-select-sm .p-select-label {
-		font-size: 12px;
+	.s-pop-date-select-panel {
+		.p-select-option {
+			font-size: 12px;
+			padding: 0.25rem 0.75rem;
+		}
+	}
+	.s-pop-date-datepicker-panel {
+		.p-datepicker-calendar {
+			font-size: 12px;
+			.p-datepicker-day-view {
+				font-size: 12px;
+				.p-datepicker-day {
+					height: 1.5rem;
+					width: 1.5rem;
+				}
+			}
+		}
 	}
 }
 .s-pop-date-container {

package/src/lib/search/pop-select/pop-select.component.scss

@@ -1,3 +1,10 @@
+::ng-deep {
+	.s-pop-select-popover {
+		.p-popover-content {
+			padding: var(--p-select-list-padding);
+		}
+	}
+}
 .s-pop-select-container {
 	padding: 5px 0;
 	border-bottom: solid 1px #d6d8db;
@@ -19,15 +26,14 @@
 	cursor: pointer;
 }
 .s-pop-select-panel-item-option {
-	font-size: 14px;
-	padding: 2px 1rem;
+	font-size: 12px;
+	padding: 0.25rem 0.75rem;
 }
 .s-pop-select-panel-item-option:hover {
 	background-color: var(--p-list-option-focus-background);
-	border-radius: 6px;
 	cursor: pointer;
 }
 .s-pop-select-content {
-	max-height: 300px;
+	max-height: 250px;
 	overflow-y: scroll;
 }

package/src/lib/search/pop-self/pop-self.component.scss

@@ -1,10 +1,30 @@
 @import 'styles';
-:host ::ng-deep {
-	.p-inputtext {
-		font-size: 12px;
+::ng-deep {
+	.s-pop-self-container {
+		.p-inputtext {
+			font-size: 12px;
+		}
+		.p-select-sm .p-select-label {
+			font-size: 12px;
+		}
 	}
-	.p-select-sm .p-select-label {
-		font-size: 12px;
+	.s-pop-self-select-panel {
+		.p-select-option {
+			font-size: 12px;
+			padding: 0.25rem 0.75rem;
+		}
+	}
+	.s-pop-self-datepicker-panel {
+		.p-datepicker-calendar {
+			font-size: 12px;
+			.p-datepicker-day-view {
+				font-size: 12px;
+				.p-datepicker-day {
+					height: 1.5rem;
+					width: 1.5rem;
+				}
+			}
+		}
 	}
 }
 .s-pop-self-container {

package/src/lib/search/pop-sort/pop-sort.component.scss

@@ -1,7 +1,6 @@
 @import 'styles';
 .s-pop-sort-container {
 	padding: 5px 0;
-	border-bottom: solid 1px #d6d8db;
 }
 .s-pop-sort-label {
 	padding: 2.5px 1.6rem;
@@ -19,7 +18,9 @@
 	cursor: pointer;
 }
 .s-pop-sort-panel {
-	padding: 6px 0;
+	padding: 0 0.4rem;
+	overflow-y: scroll;
+	max-height: 200px;
 }
 .s-pop-sort-panel-show {
 	display: block;
@@ -27,3 +28,22 @@
 .s-pop-sort-panel-hide {
 	display: none;
 }
+
+.s-check {
+	padding: 0 2.5px;
+	font-size: 1rem;
+	width: 1.5rem;
+	line-height: 1;
+	display: inline-block;
+}
+.s-pop-sort-item-option {
+	font-size: 12px;
+	padding: 2px 0;
+}
+.s-pop-sort-item-option:hover {
+	background-color: var(--p-list-option-focus-background);
+	cursor: pointer;
+}
+.s-pop-sort-item-selected-option {
+	color: var(--p-form-field-focus-border-color);
+}

package/src/lib/search/pop-tree/pop-tree.component.scss

@@ -1,7 +1,10 @@
 @import 'styles';
-::ng-deep .p-popover-content .s-pop-tree-content {
-	.p-tree {
-		padding: 0;
+::ng-deep {
+	.s-pop-tree-popover .p-popover-content {
+		padding: var(--p-select-list-padding);
+		.s-pop-tree-content .p-tree {
+			padding: 0;
+		}
 	}
 }
 .s-pop-tree-container {

package/src/lib/search/search/search.component.scss

@@ -13,7 +13,7 @@
 }
 .s-container {
 	border-right-width: 0;
-	border-radius: 5px 0 0 5px;
+	border-radius: 3.5px 0 0 3.5px;
 	padding: 1.25px 0;
 	width: 100%;
 }
@@ -35,7 +35,7 @@
 }
 .s-dropdown {
 	width: 35px;
-	border-radius: 0 5px 5px 0;
+	border-radius: 0 3.5px 3.5px 0;
 	display: flex;
 	align-items: center;
 	justify-content: center;

package/src/lib/search/search-tip/search-tip.component.scss

@@ -6,20 +6,20 @@
 	margin: 1.25px;
 	display: flex;
 	flex-wrap: nowrap;
-	border-radius: 5px;
+	border-radius: 3.5px;
 }
 .s-search-tip-field {
 	padding: 2.5px 5px 1.5px 5px;
 	margin-right: 2.5px;
 	background-color: var(--p-primary-color);
-	border-radius: 5px 0 0 5px;
+	border-radius: 3.5px 0 0 3.5px;
 	color: #fff;
 }
 .s-search-tip-icon {
 	padding: 6.5px 6px 0 6px;
 	margin-right: 2.5px;
 	font-size: 11px;
-	border-radius: 5px 0 0 5px;
+	border-radius: 3.5px 0 0 3.5px;
 	color: #fff;
 }
 .s-search-tip-icon-filter {
@@ -28,6 +28,9 @@
 .s-search-tip-icon-group {
 	background-color: var(--p-primary-color);
 }
+.s-search-tip-sort:hover {
+	cursor: pointer;
+}
 .s-search-tip-title {
 	padding: 2.5px;
 	white-space: nowrap;
@@ -38,7 +41,7 @@
 }
 .s-search-tip-close {
 	padding: 6.5px 5px 0 5px;
-	border-radius: 0 5px 5px 0;
+	border-radius: 0 3.5px 3.5px 0;
 	font-size: 11px;
 }
 .s-search-tip-close:hover {