tnx-shared 5.1.211 → 5.1.215

package/bundles/tnx-shared.umd.js

@@ -6948,12 +6948,16 @@
             var url = this.serviceUri + "/" + id;
             return this.defaultGet(url);
         };
-        BaseService.prototype.getDetailWithPermission = function (id, pid) {
+        BaseService.prototype.getDetailWithPermission = function (id, pid, plusUrl) {
             if (pid === void 0) { pid = null; }
+            if (plusUrl === void 0) { plusUrl = ''; }
             if (pid == null) {
                 pid = this._commonService.guidEmpty();
             }
             var url = this.serviceUri + "/DetailWithPermission/" + id + "?pid=" + pid;
+            if (plusUrl) {
+                url = this.serviceUri + "/DetailWithPermission/" + plusUrl + "/" + id + "?pid=" + pid;
+            }
             return this.defaultGet(url);
         };
         BaseService.prototype.getDetailByPid = function (pid) {
@@ -7032,14 +7036,14 @@
         BaseService.prototype.post = function (item, plusUrl) {
             var _this = this;
             if (plusUrl === void 0) { plusUrl = ''; }
-            var uri = plusUrl ? "" + this.serviceUri + plusUrl : this.serviceUri;
+            var uri = plusUrl ? this.serviceUri + "/" + plusUrl : this.serviceUri;
             return this._http
                 .post(uri, item)
                 .pipe(operators.catchError(function (err) { return _this.handleError(err, _this._injector); })).toPromise();
         };
         BaseService.prototype.put = function (id, item, plusUrl) {
             if (plusUrl === void 0) { plusUrl = ''; }
-            var url = plusUrl ? this.serviceUri + "/" + id + plusUrl : this.serviceUri + "/" + id;
+            var url = plusUrl ? this.serviceUri + "/" + plusUrl + "/" + id : this.serviceUri + "/" + id;
             return this._http.put(url, item).toPromise();
         };
         BaseService.prototype.delete = function (id) {
@@ -17186,8 +17190,8 @@
             _this.autoGetDetail = true;
             _this.autoSave = true;
             _this.saving = false;
+            _this.getDetailPlusUrl = null;
             _this.insertPlusUrl = null;
-            _this.updatePlusUrl = null;
             _this.dynamicControl = {};
             _this.setValidateForm = true;
             _this.haveEntityMetadataAPI = true;
@@ -17218,6 +17222,9 @@
                 else {
                     this.model.formState = exports.FormState.VIEW;
                 }
+                if (this.model.data.isBuildInAll && !this._userService.isSuperUser()) {
+                    this.model.formState = exports.FormState.VIEW;
+                }
             }
             this.__isFormView = this._isFormView();
         };
@@ -17367,7 +17374,7 @@
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_a) {
                     switch (_a.label) {
-                        case 0: return [4 /*yield*/, this.setting.baseService.getDetailWithPermission(this.model.data.id, this.model.data.pid)];
+                        case 0: return [4 /*yield*/, this.setting.baseService.getDetailWithPermission(this.model.data.id, this.model.data.pid, this.getDetailPlusUrl)];
                         case 1: return [2 /*return*/, _a.sent()];
                     }
                 });
@@ -17602,10 +17609,7 @@
         };
         DataFormBase.prototype.disableBuildInField = function () {
             if (!this._isFormAddNew()) {
-                if (this.model.data.isBuildIn && this.setting.schema['code']) {
-                    this.setting.schema['code'].disabled = true;
-                }
-                if (this.model.data.isBuildInAll) {
+                if (this.model.data.isBuildInAll && !this._userService.isSuperUser()) {
                     this.setting.schema.forEach(function (item) {
                         item.disabled = true;
                     });
@@ -17909,7 +17913,7 @@
         DataFormBase.prototype.handleUpdateError = function () {
         };
         DataFormBase.prototype.getPromiseActionUpdate = function () {
-            return this.setting.baseService.put(this.model.data.id.toString(), this.model.data, this.updatePlusUrl);
+            return this.setting.baseService.put(this.model.data.id.toString(), this.model.data);
         };
         DataFormBase.prototype.setDefaultValue = function (model) {
             if (model.isBuildIn === null || model.isBuildIn === undefined) {
@@ -22278,9 +22282,10 @@
 
     var TreeTableComponent = /** @class */ (function (_super) {
         __extends(TreeTableComponent, _super);
-        function TreeTableComponent(injector, _crudService, _notifierService) {
+        function TreeTableComponent(injector, _crudService, _translateService, _notifierService) {
             var _this = _super.call(this, injector) || this;
             _this._crudService = _crudService;
+            _this._translateService = _translateService;
             _this._notifierService = _notifierService;
             _this.model = new CrudListData();
             _this.setting = new CrudListSetting();
@@ -22364,15 +22369,177 @@
                 // this.getColorSetting();
                 // this.getColumnSetting(colGroup);
                 // this.getPageSetting();
-                // this.extendColumns(this.setting.cols);
+                this.extendColumns(this.setting.cols);
                 // this.formatColumns(this.setting.cols);
                 // this.applyColumnSetting();
                 this.buildFilterColumn(this.setting.cols);
             }
         };
+        TreeTableComponent.prototype.extendColumns = function (cols, appendCol) {
+            var _this = this;
+            if (appendCol === void 0) { appendCol = true; }
+            if (!cols) {
+                return;
+            }
+            this.setting.advanceData.fieldNeedGetRef = [];
+            var temp = [];
+            var tmpCols = __spread(cols);
+            if (this.setting.columnSetting.details) {
+                this.setting.columnSetting.details.forEach(function (colReorder) {
+                    for (var i = 0; i < cols.length; i++) {
+                        if (cols[i].field == colReorder.columnCode) {
+                            temp.push(cols[i]);
+                            cols.splice(i, 1);
+                        }
+                    }
+                });
+                // Còn lại những code mà không được cấu hình thì ghép lại theo index được khai báo
+                var tempCols_1 = [];
+                cols.forEach(function (col) {
+                    var indexColOld = tmpCols.findIndex(function (p) { return p.field == col.field; });
+                    if (indexColOld == 0) {
+                        temp.splice(0, 0, col);
+                    }
+                    else {
+                        // Tìm vị trí của cột phía trước trong list reorder mới
+                        var indexColBeforeNew = temp.findIndex(function (p) { return p.field == tmpCols[indexColOld - 1].field; });
+                        while (indexColBeforeNew == -1) {
+                            tempCols_1.splice(0, 0, col);
+                            // Tìm vị trí của cột trước cột đang kiểm tra trong list cột gốc
+                            indexColOld = tmpCols.findIndex(function (p) { return p.field == tmpCols[indexColOld - 1].field; });
+                            indexColBeforeNew = temp.findIndex(function (p) { return p.field == tmpCols[indexColOld - 1].field; });
+                        }
+                        // => Đến khi thấy thì add cột hiện tại và list tạm vào vị trí chèn
+                        if (indexColBeforeNew == temp.length - 1) {
+                            temp.push.apply(temp, __spread([col], tempCols_1));
+                        }
+                        else {
+                            temp.splice.apply(temp, __spread([indexColBeforeNew + 1, 0, col], tempCols_1));
+                        }
+                        tempCols_1 = [];
+                    }
+                });
+            }
+            else {
+            }
+            cols.splice(0, cols.length);
+            cols.splice.apply(cols, __spread([0, 0], temp));
+            var firstColVisible = null;
+            var foundItemShowEditLink = false;
+            temp.splice(0, temp.length);
+            var tmpCol = null;
+            var _loop_1 = function (ind) {
+                var element = cols[ind];
+                if (element.rawColumn) {
+                    return "continue";
+                }
+                temp.push(element);
+                var config = this_1.setting.columnSetting.details.find(function (p) { return p.columnCode == element.field; });
+                if (config && config.visible !== undefined && config.visible !== null) {
+                    element.visible = config.visible;
+                }
+                if (element.label) {
+                    element.label = this_1._translateService.instant(element.label);
+                }
+                if (config && config.textAlign !== undefined && config.textAlign !== null) {
+                    element.textAlign = config.textAlign;
+                }
+                if (config && config.width !== undefined && config.width !== null) {
+                    element.width = config.width;
+                }
+                if (element.dataType == null || element.dataType == undefined || element.dataType == '') {
+                    element.dataType = exports.DataType.string;
+                }
+                if (element.visible
+                    || (this_1.setting.groupColumn
+                        && element.field == this_1.setting.groupColumn.field)) {
+                    if (element.baseService != null) {
+                        element.controlType = exports.ControlType.dropdown;
+                        if (!element.rawColumn) {
+                            this_1.setting.advanceData.fieldNeedGetRef.push(element);
+                            element[KeyFieldGetRefType] = exports.EnumGetRefType.SERVER;
+                            if (element.valueField == null) {
+                                element.valueField = 'id';
+                            }
+                            if (element.displayField == null) {
+                                element.displayField = 'ten';
+                            }
+                            tmpCol = new ColumnSchemaBase(Object.assign(Object.assign({}, element), { rawColumn: element, controlType: exports.ControlType.dropdown, dataType: element.dataTypeRefField, field: 'str' + element.field, allowFilter: element.allowFilter, sort: false, visible: true }));
+                            var configRefField = this_1.setting.columnSetting.details.find(function (p) { return p.columnCode == tmpCol.field; });
+                            if (configRefField && configRefField.visible != null) {
+                                tmpCol.visible = configRefField.visible;
+                            }
+                            temp.push(tmpCol);
+                            element.visible = false;
+                            if (!firstColVisible) {
+                                firstColVisible = tmpCol;
+                            }
+                        }
+                    }
+                    else if (element.dataSource && element.dataSource.length > 0) {
+                        element.controlType = exports.ControlType.dropdown;
+                        if (!element.rawColumn) {
+                            this_1.setting.advanceData.fieldNeedGetRef.push(element);
+                            element[KeyFieldGetRefType] = exports.EnumGetRefType.LOCAL;
+                            tmpCol = new ColumnSchemaBase(Object.assign(Object.assign({}, element), { rawColumn: element, controlType: exports.ControlType.dropdown, dataType: element.dataTypeRefField, baseService: null, field: 'str' + element.field, allowFilter: element.allowFilter, sort: false, visible: true, generatedRefColumn: true }));
+                            var configRefField = this_1.setting.columnSetting.details.find(function (p) { return p.columnCode == tmpCol.field; });
+                            if (configRefField && configRefField.visible != null) {
+                                tmpCol.visible = configRefField.visible;
+                            }
+                            temp.push(tmpCol);
+                            element.visible = false;
+                            if (!firstColVisible) {
+                                firstColVisible = tmpCol;
+                            }
+                        }
+                    }
+                    else if (!firstColVisible) {
+                        firstColVisible = element;
+                    }
+                }
+                else if (element.forceGetData) {
+                    if (element.baseService != null) {
+                        this_1.setting.advanceData.fieldNeedGetRef.push(element);
+                        element[KeyFieldGetRefType] = exports.EnumGetRefType.SERVER;
+                        if (element.valueField == null) {
+                            element.valueField = 'id';
+                        }
+                        if (element.displayField == null) {
+                            element.displayField = 'ten';
+                        }
+                        element.visible = false;
+                    }
+                }
+                if (element.showEditLink) {
+                    foundItemShowEditLink = true;
+                }
+            };
+            var this_1 = this;
+            for (var ind in cols) {
+                _loop_1(ind);
+            }
+            if (!foundItemShowEditLink && firstColVisible) {
+                firstColVisible.showEditLink = true;
+            }
+            cols.length = 0;
+            cols.push.apply(cols, __spread(temp));
+            this.setting.advanceData.fieldNeedGetRef.sort(multipleSort({ name: 'sort', primer: function (a) { return a == null; } }, 'order'));
+            this.setting.advanceData.fieldHasMaximumLength = [];
+            this.setting.advanceData.fieldHasMaximumWord = [];
+            cols.forEach(function (col) {
+                if (!col.visible)
+                    return;
+                if (col.maxWordDisplay) {
+                    _this.setting.advanceData.fieldHasMaximumWord.push(col);
+                }
+                else if (col.maxLengthDisplay) {
+                    _this.setting.advanceData.fieldHasMaximumLength.push(col);
+                }
+            });
+        };
         TreeTableComponent.prototype.createSearchSchema = function () {
             return __awaiter(this, void 0, void 0, function () {
-                var searchInfo, _a, _b, col, control, e_1_1, _loop_1, this_1, _c, _d, field;
+                var searchInfo, _a, _b, col, control, e_1_1, _loop_2, this_2, _c, _d, field;
                 var e_1, _e, _f, e_2, _g;
                 return __generator(this, function (_h) {
                     switch (_h.label) {
@@ -22477,23 +22644,23 @@
                             return [7 /*endfinally*/];
                         case 8:
                             if (searchInfo.fieldSearchText) {
-                                _loop_1 = function (field) {
+                                _loop_2 = function (field) {
                                     if (searchInfo.fieldSearchText.indexOf(field) == -1) {
                                         searchInfo.fieldSearchText.push(field);
                                         if (!searchInfo.tooltipSearchText) {
                                             searchInfo.tooltipSearchText = 'Tìm kiếm theo các trường:';
                                         }
-                                        var col = this_1.setting.modelSchemas.find(function (p) { return p.field == field; });
+                                        var col = this_2.setting.modelSchemas.find(function (p) { return p.field == field; });
                                         if (col != null) {
                                             searchInfo.tooltipSearchText += " \"" + col.name + "\",";
                                         }
                                     }
                                 };
-                                this_1 = this;
+                                this_2 = this;
                                 try {
                                     for (_c = __values(searchInfo.fieldSearchText), _d = _c.next(); !_d.done; _d = _c.next()) {
                                         field = _d.value;
-                                        _loop_1(field);
+                                        _loop_2(field);
                                     }
                                 }
                                 catch (e_2_1) { e_2 = { error: e_2_1 }; }
@@ -22950,21 +23117,21 @@
         };
         TreeTableComponent.prototype.preProcessData = function (dataSource) {
             return __awaiter(this, void 0, void 0, function () {
-                var colHasPipe, _loop_2, this_2, colHasPipe_1, colHasPipe_1_1, col;
+                var colHasPipe, _loop_3, this_3, colHasPipe_1, colHasPipe_1_1, col;
                 var e_5, _a;
                 return __generator(this, function (_b) {
                     colHasPipe = this.setting.cols.filter(function (x) { return x.pipe; });
-                    _loop_2 = function (col) {
+                    _loop_3 = function (col) {
                         var e_6, _a;
-                        var _loop_3 = function (item) {
-                            this_2.transform(col.pipe, col.asyncPipe, item[col.field]).then(function (rs) {
+                        var _loop_4 = function (item) {
+                            this_3.transform(col.pipe, col.asyncPipe, item[col.field]).then(function (rs) {
                                 item["pipe__" + col.field + " "] = rs;
                             });
                         };
                         try {
                             for (var dataSource_1 = (e_6 = void 0, __values(dataSource)), dataSource_1_1 = dataSource_1.next(); !dataSource_1_1.done; dataSource_1_1 = dataSource_1.next()) {
                                 var item = dataSource_1_1.value;
-                                _loop_3(item);
+                                _loop_4(item);
                             }
                         }
                         catch (e_6_1) { e_6 = { error: e_6_1 }; }
@@ -22975,11 +23142,11 @@
                             finally { if (e_6) throw e_6.error; }
                         }
                     };
-                    this_2 = this;
+                    this_3 = this;
                     try {
                         for (colHasPipe_1 = __values(colHasPipe), colHasPipe_1_1 = colHasPipe_1.next(); !colHasPipe_1_1.done; colHasPipe_1_1 = colHasPipe_1.next()) {
                             col = colHasPipe_1_1.value;
-                            _loop_2(col);
+                            _loop_3(col);
                         }
                     }
                     catch (e_5_1) { e_5 = { error: e_5_1 }; }
@@ -23180,6 +23347,7 @@
     TreeTableComponent.ctorParameters = function () { return [
         { type: i0.Injector },
         { type: CrudService },
+        { type: i2.TranslateService },
         { type: NotifierService }
     ]; };
     TreeTableComponent.propDecorators = {
@@ -24540,7 +24708,7 @@
         };
         DataListBase.prototype._getDataSource = function (response) {
             return __awaiter(this, void 0, void 0, function () {
-                var dataSource, lstItemId, statusNotAllowEdits_1, userIdCurrent, fieldKey_1, callBackWhenNotHaveStatus, _baseService, dataTask_1, result;
+                var dataSource, lstItemId, funcModifyItem, statusNotAllowEdits_1, userIdCurrent, fieldKey_1, callBackWhenNotHaveStatus, _baseService, dataTask_1, result;
                 var _this = this;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
@@ -24554,20 +24722,25 @@
                             });
                             dataSource = response.data;
                             lstItemId = [];
+                            funcModifyItem = function (item, index) {
+                                item._index = (_this.setting.pageSetting.page - 1) * _this.setting.pageSetting.pageSize + 1 + index;
+                                lstItemId.push(item.id);
+                                if ((item.isBuildInAll || item.isBuildIn)
+                                    && !_this._userService.isSuperUser()) {
+                                    item.__disableEdit = true;
+                                    item.__disableDelete = true;
+                                }
+                            };
                             if (this.setting.workflowSetting) {
                                 statusNotAllowEdits_1 = this.setting.workflowSetting.statuses.filter(function (p) { return !p.options.choPhepSua; }).map(function (item) { return item.trangThaiContainer.ma; });
                                 dataSource.forEach(function (item, index) {
-                                    item._index = (_this.setting.pageSetting.page - 1) * _this.setting.pageSetting.pageSize + 1 + index;
-                                    // item.currentStateCode = item.currentStateCode;
                                     item.__disableEdit = statusNotAllowEdits_1.indexOf(item.currentStateCode) > -1;
-                                    lstItemId.push(item.id);
+                                    funcModifyItem(item, index);
                                 });
                             }
                             else {
                                 dataSource.forEach(function (item, index) {
-                                    item._index = (_this.setting.pageSetting.page - 1) * _this.setting.pageSetting.pageSize + 1 + index;
-                                    // item.currentStateCode = item.currentStateCode;
-                                    lstItemId.push(item.id);
+                                    funcModifyItem(item, index);
                                 });
                             }
                             if (!(this.setting.workflowSettingNew
@@ -44868,6 +45041,10 @@
             try {
                 for (var _f = __values(data.connections), _g = _f.next(); !_g.done; _g = _f.next()) {
                     var conn = _g.value;
+                    // fix openPopup của một số workflow cũ chưa có trường này
+                    if (conn.openPopup === null || conn.openPopup === undefined) {
+                        conn.openPopup = true;
+                    }
                     var newObj = JSON.parse(JSON.stringify(conn));
                     newObj.source = mapping[conn.source];
                     newObj.target = mapping[conn.target];
@@ -55548,6 +55725,13 @@
             _this.fieldParent = 'idParent';
             _this.valueParentRoot = null;
             _this.levelOpen = 1;
+            _this.funcModifyItem = function (item) {
+                if ((item.isBuildInAll || item.isBuildIn)
+                    && !_this._userService.isSuperUser()) {
+                    item.__disableEdit = true;
+                    item.__disableDelete = true;
+                }
+            };
             return _this;
         }
         TreeListBase.prototype.ngOnInit = function () {
@@ -55588,6 +55772,7 @@
                     level: level,
                     children: []
                 };
+                _this.funcModifyItem(item);
                 result.push(node);
                 _this.createTreeData(dataSource, node.children, node.data.id, level + 1, __spread(lstIdParent, [item.id]));
             });