@sd-angular/core 0.0.987 → 0.0.991

package/fesm2015/sd-angular-core-grid-material.js

@@ -6,11 +6,10 @@ import { trigger, state, style, transition, animate } from '@angular/animations'
 import * as uuid from 'uuid';
 import { v4 } from 'uuid';
 import { Subject, Subscription, isObservable } from 'rxjs';
-import * as hash from 'object-hash';
-import hash__default from 'object-hash';
 import { SdNotifyService } from '@sd-angular/core/notify';
 import { moveItemInArray, DragDropModule } from '@angular/cdk/drag-drop';
 import { startWith, debounceTime, map, switchMap } from 'rxjs/operators';
+import hash from 'object-hash';
 import { SdSettingService } from '@sd-angular/core/setting';
 import { DeviceDetectorService } from 'ngx-device-detector';
 import { SdLoadingService } from '@sd-angular/core/loading';
@@ -237,7 +236,7 @@ class SdGridFilterService {
                 prefix: __classPrivateFieldGet(this, _prefix),
                 key
             });
-            key = hash__default({
+            key = hash({
                 prefix: __classPrivateFieldGet(this, _prefix),
                 key
             });
@@ -693,7 +692,7 @@ class SdPopupExport {
         if (!((_b = (_a = this.gridOption) === null || _a === void 0 ? void 0 : _a.export) === null || _b === void 0 ? void 0 : _b.key)) {
             return null;
         }
-        return hash__default({
+        return hash({
             prefix,
             key: (_d = (_c = this.gridOption) === null || _c === void 0 ? void 0 : _c.export) === null || _d === void 0 ? void 0 : _d.key
         });
@@ -764,7 +763,7 @@ class SdGridConfigurationService {
             if (!((_a = gridOption === null || gridOption === void 0 ? void 0 : gridOption.config) === null || _a === void 0 ? void 0 : _a.key) && !(gridOption === null || gridOption === void 0 ? void 0 : gridOption.key)) {
                 return null;
             }
-            return hash__default({
+            return hash({
                 prefix,
                 key: ((_b = gridOption === null || gridOption === void 0 ? void 0 : gridOption.config) === null || _b === void 0 ? void 0 : _b.key) || !(gridOption === null || gridOption === void 0 ? void 0 : gridOption.key)
             });
@@ -1086,7 +1085,7 @@ class SdGridService {
                     obj: {}
                 };
             }
-            const hashKey = hash__default({
+            const hashKey = hash({
                 prefix: __classPrivateFieldGet(this, _prefix$1),
                 field: column.field,
                 key,
@@ -1107,7 +1106,7 @@ class SdGridService {
             return __classPrivateFieldGet(this, _cache$1)[hashKey];
         });
         this.getValues = (column, key) => {
-            const hashKey = hash__default({
+            const hashKey = hash({
                 prefix: __classPrivateFieldGet(this, _prefix$1),
                 field: column.field,
                 key,
@@ -1369,8 +1368,6 @@ class SdGridMaterial {
             // this.isHiddenPaginator = this.filterInfo.pageNumber === 0 && this.total <= this.filterInfo.pageSize;
             this.items.forEach((item) => {
                 item.originItem = Object.assign({}, item);
-                const { sdId } = item, remain = __rest(item, ["sdId"]);
-                item.sdId = hash(remain);
             });
             yield ((_c = (_b = (_a = this.gridOption) === null || _a === void 0 ? void 0 : _a.reload) === null || _b === void 0 ? void 0 : _b.onReload) === null || _c === void 0 ? void 0 : _c.call(_b, this.items));
             this.isSelectAll = this.items.every(e => e.isSelected);
@@ -1833,10 +1830,6 @@ class SdGridMaterial {
                 return;
             }
         };
-        this.reloadItem = (item) => {
-            const { sdId } = item, remain = __rest(item, ["sdId"]);
-            item.sdId = hash(remain);
-        };
         this.detectChanges = () => this.ref.detectChanges();
     }
     set _gridFilter(gridFilter) {
@@ -2522,7 +2515,7 @@ class SdSelectionActionFilterPipe {
                 if ('children' in action) {
                     const children = [];
                     for (const childAction of action.children) {
-                        const key = hash__default(childAction);
+                        const key = hash(childAction);
                         if (selectedItems.every(e => e.actions.includes(key))) {
                             children.push(childAction);
                         }
@@ -2532,7 +2525,7 @@ class SdSelectionActionFilterPipe {
                     }
                 }
                 else {
-                    const key = hash__default(action);
+                    const key = hash(action);
                     if (selectedItems.every(e => e.actions.includes(key))) {
                         results.push(action);
                     }
@@ -2563,7 +2556,7 @@ class SdSelectionDisablePipe {
             const availableActions = actions.filter(action => {
                 if ('children' in action) {
                     for (const childAction of action.children) {
-                        const key = hash__default(childAction);
+                        const key = hash(childAction);
                         if (selectedItems.every(e => e.actions.includes(key))) {
                             return true;
                         }
@@ -2571,7 +2564,7 @@ class SdSelectionDisablePipe {
                     return false;
                 }
                 else {
-                    const key = hash__default(action);
+                    const key = hash(action);
                     return selectedItems.every(e => e.actions.includes(key));
                 }
             });
@@ -2579,13 +2572,13 @@ class SdSelectionDisablePipe {
             for (const action of availableActions) {
                 if ('children' in action) {
                     for (const childAction of action.children) {
-                        if (rowData.actions.includes(hash__default(childAction))) {
+                        if (rowData.actions.includes(hash(childAction))) {
                             return false;
                         }
                     }
                 }
                 else {
-                    if (rowData.actions.includes(hash__default(action))) {
+                    if (rowData.actions.includes(hash(action))) {
                         return false;
                     }
                 }
@@ -2608,7 +2601,7 @@ class SdSelectionVisibleSelectAllPipe {
                 return true;
             }
             if (!items.length) {
-                return true;
+                return false;
             }
             yield new Promise(resolve => setTimeout(resolve, 500));
             const first = items[0];
@@ -2636,7 +2629,7 @@ class SdGeneratedColumnService {
             if (!(configuration === null || configuration === void 0 ? void 0 : configuration.key)) {
                 return null;
             }
-            const key = hash__default({
+            const key = hash({
                 prefix: '260f5e94-5865-4425-8ced-b9c083c390dd',
                 key: configuration.key
             });
@@ -2657,7 +2650,7 @@ class SdGeneratedColumnService {
             if (!(configuration === null || configuration === void 0 ? void 0 : configuration.systemColumn)) {
                 return null;
             }
-            const key = hash__default({
+            const key = hash({
                 prefix: '8b8050ca-1f44-4860-bad3-20e646c0d68f',
                 key: configuration.key
             });
@@ -2776,7 +2769,7 @@ class SdDesktopCell {
 SdDesktopCell.decorators = [
     { type: Component, args: [{
                 selector: 'sd-desktop-cell',
-                template: "<ng-container *ngIf=\"column && item\">\r\n  <ng-container *ngIf=\"item.editorHandlerRow?.visible;else useView\">\r\n    <ng-container *sdLet=\"item[column.field] | sdId:item\">\r\n      <ng-container *sdLet=\"item.sdId | sdEditorHandlerColumn:item:column\">\r\n        <ng-container *ngIf=\"item.editorHandlerColumn[column.field]?.visible;else useView\">\r\n          <ng-container *ngIf=\"cellDef[column.field]\">\r\n            <ng-container *ngTemplateOutlet=\"\r\n              cellDef[column.field].templateRef;\r\n              context: { item: item, column: column, idx: idx, isEdited: true }\r\n            \">\r\n            </ng-container>\r\n          </ng-container>\r\n          <sd-desktop-cell-editor *ngIf=\"!cellDef[column.field]\" [sdId]=\"item.sdId\" [column]=\"column\" [item]=\"item\">\r\n          </sd-desktop-cell-editor>\r\n        </ng-container>\r\n      </ng-container>\r\n    </ng-container>\r\n  </ng-container>\r\n  <ng-template #useView>\r\n    <ng-container *ngIf=\"cellDef[column.field]\">\r\n      <ng-container *ngTemplateOutlet=\"\r\n          cellDef[column.field].templateRef;\r\n          context: { item: item, column: column, idx: idx }\r\n        \">\r\n      </ng-container>\r\n    </ng-container>\r\n    <sd-desktop-cell-view *ngIf=\"!cellDef[column.field]\" [sdId]=\"item.sdId\" [key]=\"key\" [column]=\"column\" [item]=\"item\">\r\n    </sd-desktop-cell-view>\r\n  </ng-template>\r\n</ng-container>",
+                template: "<ng-container *ngIf=\"column && item\">\r\n  <ng-container *ngIf=\"item.editorHandlerRow?.visible;else useView\">\r\n    <!-- <ng-container *sdLet=\"item[column.field] | sdId:item:column\"> -->\r\n    <ng-container *sdLet=\"item[column.field] | sdEditorHandlerColumn:item:column:gridOption\">\r\n      <ng-container *ngIf=\"item.editorHandlerColumn[column.field]?.visible;else useView\">\r\n        <ng-container *ngIf=\"cellDef[column.field]\">\r\n          <ng-container *ngTemplateOutlet=\"\r\n              cellDef[column.field].templateRef;\r\n              context: { item: item, column: column, idx: idx, isEdited: true }\r\n            \">\r\n          </ng-container>\r\n        </ng-container>\r\n        <sd-desktop-cell-editor *ngIf=\"!cellDef[column.field]\" [sdId]=\"item.sdId\" [column]=\"column\" [item]=\"item\">\r\n        </sd-desktop-cell-editor>\r\n      </ng-container>\r\n    </ng-container>\r\n    <!-- </ng-container> -->\r\n  </ng-container>\r\n  <ng-template #useView>\r\n    <ng-container *ngIf=\"cellDef[column.field]\">\r\n      <ng-container *ngTemplateOutlet=\"\r\n          cellDef[column.field].templateRef;\r\n          context: { item: item, column: column, idx: idx }\r\n        \">\r\n      </ng-container>\r\n    </ng-container>\r\n    <sd-desktop-cell-view *ngIf=\"!cellDef[column.field]\" [sdId]=\"item.sdId\" [key]=\"key\" [column]=\"column\" [item]=\"item\">\r\n    </sd-desktop-cell-view>\r\n  </ng-template>\r\n</ng-container>",
                 changeDetection: ChangeDetectionStrategy.OnPush
             },] }
 ];
@@ -2847,8 +2840,8 @@ class SdEditorHandlerRowPipe {
             }
             item.editorHandlerRow = Object.assign(Object.assign({}, item.editorHandlerRow), { visible: false, editable: !status, removable: false, savable: false, cancelable: false });
         }
-        const { sdId } = item, remain = __rest(item, ["sdId"]);
-        item.sdId = hash__default(remain);
+        const { sdId, editorHandlerColumn } = item, remain = __rest(item, ["sdId", "editorHandlerColumn"]);
+        item.sdId = hash(remain);
         return item.editorHandlerRow;
     }
 }
@@ -2875,14 +2868,15 @@ class SdEditorHandlerColumnPipe {
             return true;
         });
     }
-    transform(id, item, column) {
+    transform(value, item, column, gridOption) {
         if (column.type === 'children' || column.type === 'children-col') {
             return;
         }
-        item.editorHandlerColumn = item.editorHandlerColumn || {};
         item.editorHandlerColumn[column.field] = Object.assign(Object.assign({}, item.editorHandlerColumn[column.field]), { visible: __classPrivateFieldGet(this, _visible).call(this, column, item) });
-        const { sdId } = item, remain = __rest(item, ["sdId"]);
-        item.sdId = hash(remain);
+        const { columns } = gridOption;
+        for (const col of columns) {
+            item.editorHandlerColumn[col.field] = Object.assign(Object.assign({}, item.editorHandlerColumn[col.field]), { visible: __classPrivateFieldGet(this, _visible).call(this, col, item) });
+        }
         return true;
     }
 }
@@ -3016,7 +3010,7 @@ class SdSelectionVisiblePipe {
                     let flag = false;
                     for (const childAction of action.children) {
                         const { hidden } = childAction;
-                        const key = hash__default(childAction);
+                        const key = hash(childAction);
                         if (typeof (hidden) === 'function') {
                             if (!hidden(rowData)) {
                                 rowData.actions.push(key);
@@ -3029,12 +3023,12 @@ class SdSelectionVisiblePipe {
                         }
                     }
                     if (flag) {
-                        rowData.actions.push(hash__default(action));
+                        rowData.actions.push(hash(action));
                     }
                 }
                 else {
                     const { hidden } = action;
-                    const key = hash__default(action);
+                    const key = hash(action);
                     if (typeof (hidden) === 'function') {
                         if (!hidden(rowData)) {
                             rowData.actions.push(key);
@@ -3056,9 +3050,11 @@ SdSelectionVisiblePipe.decorators = [
 ];
 
 class SdIdPipe {
-    transform(value, item) {
-        const { sdId } = item, remain = __rest(item, ["sdId"]);
+    transform(value, item, column) {
+        const { sdId, editorHandlerColumn } = item, remain = __rest(item, ["sdId", "editorHandlerColumn"]);
+        item.editorHandlerColumn = item.editorHandlerColumn || {};
         item.sdId = hash(remain);
+        item.editorHandlerColumn[column.field] = Object.assign(Object.assign({}, item.editorHandlerColumn[column.field]), { sdId: item.sdId });
         return item.sdId;
     }
 }
@@ -3176,6 +3172,7 @@ SdGridMaterialModule.decorators = [
                 providers: [
                     DatePipe,
                     DecimalPipe,
+                    SdIdPipe,
                     CdkColumnDef,
                     SdGridService,
                     SdGridFilterService,