tnx-shared 5.3.334 → 5.3.335

package/bundles/tnx-shared.umd.js

@@ -22127,6 +22127,14 @@
                         case 0:
                             if (callBackWhenNotHaveStatus == null) {
                                 callBackWhenNotHaveStatus = function (itemStatus, rowItem) {
+                                    if (rowItem[fieldKey]
+                                        && rowItem.workflowCode
+                                        && rowItem.currentStateCode) {
+                                        itemStatus.textTrangThai = 'Đã bắt đầu quy trình';
+                                        itemStatus.trangThai = rowItem.currentStateCode;
+                                        itemStatus.workflowCode = rowItem.workflowCode;
+                                        itemStatus.permission = exports.PermissionBase.READ;
+                                    }
                                 };
                             }
                             itemId = data[fieldKey];
@@ -22141,7 +22149,7 @@
                             else {
                                 sorts.push(new Sort({ field: 'permission', dir: -1 }), new Sort({ field: 'inComing', dir: -1 }));
                             }
-                            return [4 /*yield*/, this.getAll(filters, 'itemId,userId,trangThai,textTrangThai,workflowCode,permission', sorts)];
+                            return [4 /*yield*/, this.getAll(filters, 'itemId,userId,trangThai,textTrangThai,workflowCode,permission', sorts, 'ForCrudList')];
                         case 1:
                             dataStatus = (_a.sent()).data;
                             if (dataStatus == null) {
@@ -22160,10 +22168,11 @@
                 textTrangThai: 'Chưa chạy quy trình'
             };
             if (itemId) {
-                var lstItemStatus = dataStatus.filter(function (q) { return q.itemId == itemId && q.userId == userIdCurrent; });
-                if (ignoreWorkflow === true && lstItemStatus.length === 0) {
-                    lstItemStatus.push.apply(lstItemStatus, __spreadArray([], __read(dataStatus.filter(function (q) { return q.itemId === itemId; }))));
-                }
+                // const lstItemStatus = dataStatus.filter(q => q.itemId == itemId && q.userId == userIdCurrent);
+                // if (ignoreWorkflow === true && lstItemStatus.length === 0) {
+                //     lstItemStatus.push(...dataStatus.filter(q => q.itemId === itemId));
+                // }
+                var lstItemStatus = dataStatus.filter(function (q) { return q.itemId === itemId; });
                 // let itemStatus = null;
                 if (lstItemStatus.length) {
                     itemStatus = lstItemStatus.find(function (q) { return (q.permission & exports.PermissionBase.EDIT) == exports.PermissionBase.EDIT; });
@@ -22216,6 +22225,14 @@
                         case 0:
                             if (callBackWhenNotHaveStatus == null) {
                                 callBackWhenNotHaveStatus = function (itemStatus, rowItem) {
+                                    if (rowItem[fieldKey]
+                                        && rowItem.workflowCode
+                                        && rowItem.currentStateCode) {
+                                        itemStatus.textTrangThai = 'Đã bắt đầu quy trình';
+                                        itemStatus.trangThai = rowItem.currentStateCode;
+                                        itemStatus.workflowCode = rowItem.workflowCode;
+                                        itemStatus.permission = exports.PermissionBase.READ;
+                                    }
                                 };
                             }
                             lstItemId = data.filter(function (q) { return q[fieldKey]; }).map(function (q) { return q[fieldKey]; });
@@ -22227,13 +22244,11 @@
                                 filters.push(this.newFilter('tableName', exports.Operator.equal, this.tableName));
                             }
                             sorts = [];
-                            if (!ignoreWorkflow) {
-                                filters.push(this.newFilter('userId', exports.Operator.equal, userIdCurrent));
-                            }
-                            else {
-                                sorts.push(new Sort({ field: 'permission', dir: -1 }), new Sort({ field: 'inComing', dir: -1 }));
-                            }
-                            return [4 /*yield*/, this.getAll(filters, 'itemId,userId,trangThai,textTrangThai,workflowCode,permission', sorts)];
+                            // if (!ignoreWorkflow) {
+                            //     filters.push(this.newFilter('userId', Operator.equal, userIdCurrent));
+                            // }
+                            sorts.push(new Sort({ field: 'permission', dir: -1 }), new Sort({ field: 'inComing', dir: -1 }));
+                            return [4 /*yield*/, this.getAll(filters, 'itemId,userId,trangThai,textTrangThai,workflowCode,permission', sorts, 'ForCrudList')];
                         case 1:
                             dataStatus = (_a.sent()).data;
                             if (dataStatus == null) {