@ai-table/state 0.1.43 → 0.1.45

package/fesm2022/ai-table-state.mjs

@@ -733,7 +733,6 @@ class GroupCalculator {
         const linearRows = [];
         let lastGroupDepth = -1;
         let currentGroupRecords = [];
-        let currentGroupIds = [];
         let currentGroupRecordIndices = []; // 记录当前分组中每个记录的原始索引
         // 开始添加一个空白行
         linearRows.push({
@@ -747,11 +746,10 @@ class GroupCalculator {
             if (groupTabRows.length > 0) {
                 // 如果有新的分组标签，先处理上一个分组的结束
                 if (currentGroupRecords.length > 0) {
-                    this.handleGroupEnd(currentGroupRecords, linearRows, currentGroupIds, currentGroupRecordIndices);
+                    this.handleGroupEnd(currentGroupRecords, linearRows, currentGroupRecordIndices);
                     currentGroupRecords = [];
                     currentGroupRecordIndices = [];
                 }
-                currentGroupIds = groupTabRows.map((row) => row.groupId);
                 const depths = groupTabRows.filter((d) => d.depth !== undefined).map((d) => d.depth);
                 const minDepth = depths.length > 0 ? Math.min(...depths) : 0;
                 // 如果当前分组的最小深度小于等于上一个分组的深度，说明是同级或上级分组，需添加空白行
@@ -762,9 +760,7 @@ class GroupCalculator {
                         depth: minDepth
                     });
                 }
-                // 只添加未被父级折叠的分组
-                const visibleGroupTabRows = this.filterVisibleGroupTabs(groupTabRows);
-                linearRows.push(...visibleGroupTabRows);
+                linearRows.push(...groupTabRows);
                 lastGroupDepth = depths.length > 0 ? Math.max(...depths) : 0;
             }
             // 将记录添加到当前分组
@@ -773,7 +769,7 @@ class GroupCalculator {
         });
         // 处理最后一个分组
         if (currentGroupRecords.length > 0) {
-            this.handleGroupEnd(currentGroupRecords, linearRows, currentGroupIds, currentGroupRecordIndices);
+            this.handleGroupEnd(currentGroupRecords, linearRows, currentGroupRecordIndices);
         }
         // 添加分组结束的空白行
         if (lastGroupDepth >= 0) {
@@ -785,12 +781,11 @@ class GroupCalculator {
         }
         return linearRows;
     }
-    handleGroupEnd(currentGroupRecords, linearRows, currentGroupIds, currentGroupRecordIndices) {
-        // 分组结束时添加该分组的记录和add行
+    handleGroupEnd(currentGroupRecords, linearRows, currentGroupRecordIndices) {
         let groupDisplayRowIndex = 0;
+        const lastLinearRow = linearRows[linearRows.length - 1];
         currentGroupRecords.forEach((record, i) => {
-            const recordIndex = currentGroupRecordIndices?.[i] ?? 0;
-            if (this.shouldShowRecord(recordIndex)) {
+            if (lastLinearRow?.type === AITableRowType.group && !lastLinearRow.isCollapsed) {
                 groupDisplayRowIndex++;
                 linearRows.push({
                     type: AITableRowType.record,
@@ -801,7 +796,7 @@ class GroupCalculator {
             }
         });
         // 分组未折叠，为每个分组添加add新增行
-        if (currentGroupRecords.length > 0 && this.shouldShowAddRow(currentGroupIds)) {
+        if (currentGroupRecords.length > 0 && lastLinearRow?.type === AITableRowType.group && !lastLinearRow.isCollapsed) {
             let startRecordIndex = 0;
             let endRecordIndex = 0;
             if (currentGroupRecordIndices) {
@@ -826,20 +821,23 @@ class GroupCalculator {
                 const field = this.fieldsMap[groupField.field_id];
                 if (!field)
                     return;
-                const groupValue = AITableQueries.getFieldValue(this.aiTable, [record._id, field._id]);
                 const breakpointIndex = breakpoints.indexOf(recordIndex);
                 const groupId = this.generateGroupId(groupField.field_id, depth, breakpointIndex);
-                const recordRange = this.calculateGroupRecordRange(groupField.field_id, breakpointIndex, totalRecords);
-                groupTabRows.push({
-                    type: AITableRowType.group,
-                    _id: nanoid(),
-                    depth,
-                    fieldId: groupField.field_id,
-                    groupValue,
-                    isCollapsed: this.groupCollapseState.has(groupId),
-                    range: recordRange,
-                    groupId
-                });
+                const isParentCollapsed = this.isParentGroupCollapsed(depth, recordIndex);
+                if (!isParentCollapsed) {
+                    const groupValue = AITableQueries.getFieldValue(this.aiTable, [record._id, field._id]);
+                    const recordRange = this.calculateGroupRecordRange(groupField.field_id, breakpointIndex, totalRecords);
+                    groupTabRows.push({
+                        type: AITableRowType.group,
+                        _id: nanoid(),
+                        depth,
+                        fieldId: groupField.field_id,
+                        groupValue,
+                        isCollapsed: this.groupCollapseState.has(groupId),
+                        range: recordRange,
+                        groupId
+                    });
+                }
             }
         });
         return groupTabRows;
@@ -863,61 +861,27 @@ class GroupCalculator {
         // 通过字段ID、深度和断点索引确保唯一
         return `${fieldId}_${depth}_${breakpointIndex}`;
     }
-    shouldShowRecord(recordIndex) {
-        for (let depth = 0; depth < this.groups.length; depth++) {
-            const groupField = this.groups[depth];
-            const breakpoints = this.groupBreakpoints.get(groupField.field_id) || [];
-            // 找到当前记录所属的分组断点
-            let belongsToBreakpointIndex = -1;
-            for (let i = breakpoints.length - 1; i >= 0; i--) {
-                if (breakpoints[i] <= recordIndex) {
-                    belongsToBreakpointIndex = i;
+    // 检查所有父级分组是否被折叠
+    isParentGroupCollapsed(currentDepth, recordIndex) {
+        for (let parentDepth = 0; parentDepth < currentDepth; parentDepth++) {
+            const parentGroupField = this.groups[parentDepth];
+            const parentBreakpoints = this.groupBreakpoints.get(parentGroupField.field_id) || [];
+            let parentBreakpointIndex = -1;
+            for (let i = parentBreakpoints.length - 1; i >= 0; i--) {
+                if (parentBreakpoints[i] <= recordIndex) {
+                    parentBreakpointIndex = i;
                     break;
                 }
             }
-            if (belongsToBreakpointIndex >= 0) {
-                const groupId = this.generateGroupId(groupField.field_id, depth, belongsToBreakpointIndex);
-                if (this.groupCollapseState.has(groupId)) {
-                    return false; // 父级分组被折叠，不显示记录
-                }
-            }
-        }
-        return true;
-    }
-    // 检查当前分组是否应该显示添加行
-    shouldShowAddRow(currentGroupIds) {
-        if (!currentGroupIds || currentGroupIds.length === 0) {
-            return true; // 默认显示
-        }
-        // 检查当前组的所有分组层级是否都展开
-        for (const groupId of currentGroupIds) {
-            if (this.groupCollapseState.has(groupId)) {
-                return false; // 有层级被折叠，不显示添加行
-            }
-        }
-        return true;
-    }
-    // 过滤可见的分组标签
-    filterVisibleGroupTabs(groupTabRows) {
-        const visibleRows = [];
-        for (let i = 0; i < groupTabRows.length; i++) {
-            const currentRow = groupTabRows[i];
-            let show = true;
-            // 检查当前分组标签的所有父级是否都展开
-            const currentDepth = currentRow.depth ?? 0;
-            for (let parentDepth = 0; parentDepth < currentDepth; parentDepth++) {
-                // 找到同一记录索引下的父级分组ID
-                const parentRow = groupTabRows.find((row) => row.depth === parentDepth);
-                if (parentRow && this.groupCollapseState.has(parentRow.groupId)) {
-                    show = false;
-                    break;
+            if (parentBreakpointIndex > -1) {
+                const parentGroupId = this.generateGroupId(parentGroupField.field_id, parentDepth, parentBreakpointIndex);
+                const isParentCollapsed = this.groupCollapseState.has(parentGroupId);
+                if (isParentCollapsed) {
+                    return true;
                 }
             }
-            if (show) {
-                visibleRows.push(currentRow);
-            }
         }
-        return visibleRows;
+        return false;
     }
 }
 
@@ -1447,7 +1411,7 @@ function createMultiplePositions(views, activeId, data, targetIndex = data.lengt
     return positions;
 }
 function getPositions(activeId, data, targetIndex = data.length - 1, count = 1, isInsertBefore = false) {
-    let startPosition = data.length - 1;
+    let startPosition = data[data.length - 1].positions[activeId];
     let endPosition = startPosition + count + 1;
     if (data[targetIndex]) {
         if (isInsertBefore) {
@@ -1551,7 +1515,7 @@ const apply = (aiTable, records, fields, views, action) => {
         case ActionName.UpdateFieldValue: {
             const [recordId, fieldId] = action.path;
             if (recordId && fieldId) {
-                const recordIndex = aiTable.records().findIndex((item) => item._id === recordId);
+                const recordIndex = records.findIndex((item) => item._id === recordId);
                 records[recordIndex].values[fieldId] = action.newFieldValue;
             }
             break;
@@ -1559,7 +1523,7 @@ const apply = (aiTable, records, fields, views, action) => {
         case ActionName.UpdateSystemFieldValue: {
             const [recordId] = action.path;
             if (recordId && action.updatedInfo) {
-                const recordIndex = aiTable.records().findIndex((item) => item._id === recordId);
+                const recordIndex = records.findIndex((item) => item._id === recordId);
                 if (action.updatedInfo.updated_at) {
                     records[recordIndex].updated_at = action.updatedInfo.updated_at;
                 }
@@ -1584,7 +1548,7 @@ const apply = (aiTable, records, fields, views, action) => {
         }
         case ActionName.RemoveField: {
             const [fieldId] = action.path;
-            const fieldIndex = aiTable.fields().findIndex((item) => item._id === fieldId);
+            const fieldIndex = fields.findIndex((item) => item._id === fieldId);
             if (fieldIndex > -1) {
                 fields.splice(fieldIndex, 1);
                 records.forEach((item) => {
@@ -1595,7 +1559,7 @@ const apply = (aiTable, records, fields, views, action) => {
         }
         case ActionName.RemoveRecord: {
             const [recordId] = action.path;
-            const recordIndex = aiTable.records().findIndex((item) => item._id === recordId);
+            const recordIndex = records.findIndex((item) => item._id === recordId);
             if (recordIndex > -1) {
                 records.splice(recordIndex, 1);
             }
@@ -2020,6 +1984,24 @@ function getParentGroupValuesByGroupId(aiTable, groupId) {
         return pre;
     }, {});
 }
+function getPrevRecordIdByAddGroupId(aiTable, groupId) {
+    const activeViewId = aiTable.activeViewId();
+    const activeView = aiTable.viewsMap()[activeViewId];
+    if (!activeView.settings?.groups?.length)
+        return null;
+    const visibleRowsIndexMap = aiTable.context.visibleRowsIndexMap();
+    const rowIndex = visibleRowsIndexMap.get(groupId) ?? -1;
+    if (rowIndex > -1) {
+        const linearRows = aiTable.context.linearRows();
+        const current = linearRows[rowIndex];
+        const prev = linearRows[rowIndex - 1];
+        if (current.type === AITableRowType.add && prev.type === AITableRowType.record) {
+            return prev._id;
+        }
+        return null;
+    }
+    return null;
+}
 
 function moveRecords(aiTable, options, updatedInfo) {
     const activeViewId = aiTable.activeViewId();
@@ -2085,7 +2067,7 @@ function addFields(aiTable, options) {
         };
     }
     else {
-        newField.positions = createPositions(aiTable.views(), aiTable.activeViewId(), aiTable.gridData().fields, fields.length);
+        newField.positions = createPositions(aiTable.views(), aiTable.activeViewId(), aiTable.gridData().fields);
     }
     Actions.addField(aiTable, newField, originId, isDuplicate);
 }
@@ -2120,18 +2102,20 @@ function addRecords(aiTable, trackableEntity, options) {
     const hiddenRecordIds = [];
     let needCopyGroupValuesMap = null;
     if (groups?.length && options.forGroupId) {
+        if (!options.afterRecordId && !options.beforeRecordId) {
+            const prevRecordId = getPrevRecordIdByAddGroupId(aiTable, options.forGroupId);
+            if (prevRecordId) {
+                options.afterRecordId = prevRecordId;
+            }
+        }
         needCopyGroupValuesMap = getParentGroupValuesByGroupId(aiTable, options.forGroupId);
     }
-    const records = aiTable.gridData().records;
     newRecordIds.forEach((id, index) => {
         const record = {
             _id: id,
             short_id: newRecordShortIds[index],
             values: newRecordValues,
-            ...trackableEntity,
-            positions: {
-                [activeViewId]: getMaxPosition(records, activeViewId) + 1
-            }
+            ...trackableEntity
         };
         if (needCopyGroupValuesMap) {
             groups?.forEach((group) => {
@@ -2459,5 +2443,5 @@ const VIEW_ACTIONS = [ActionName.SetView, ActionName.AddView, ActionName.RemoveV
  * Generated bundle index. Do not edit.
  */
 
-export { AITableStateI18nKey, AITableStateI18nText, Actions, CopyCellsItem, CopyFieldPropertyItem, DividerMenuItem, EditFieldPropertyItem, FLUSHING, GroupCalculator, InsertDownwardRecords, InsertUpwardRecords, PasteCellsItem, RemoveRecordsItem, UndoManagerService, VIEW_ACTIONS, YjsAITable, actionMappers, addFields, addRecords, addView, applyActionOps, applyActions, applyEvents, applyYjsEvents, buildFieldsByView, buildGroupLinearRows, buildRecordsByView, buildRemoveFieldItem, buildSetFieldAction, buildSetRecordPositionsActon, calculateAdaptiveFrozenColumnCount, checkConditions, createMultiplePositions, createPositions, createSharedType, doFilter, findNextRecordForTargetInOriginalRecords, findPrevRecordForTargetInOriginalRecords, freezeToThisColumn, generateCopyName, getDataBySharedType, getDefaultI18nTextByKey, getDefaultRecordDataByFilter, getDefaultRecordValues, getFieldPositionInView, getFieldsSizeMap, getFilteredRecords, getFrozenFieldId, getMaxPosition, getNewRecordsPosition, getParentGroupValuesByGroupId, getParentLinearRowGroups, getPosition, getPositionByAfterOrBeforeRecordId, getPositions, getRecordsBySharedJson, getSharedTypeByData, getSortFields, getSortRecords, getStateI18nTextByKey, isPathEqual, moveFields, moveRecords, removeView, restoreDefaultFrozenColumn, sortRecordsBySortInfo, sortViews, toSharedType, translateYjsEvent, updateFieldAndValues, updateFieldValues, withState };
+export { AITableStateI18nKey, AITableStateI18nText, Actions, CopyCellsItem, CopyFieldPropertyItem, DividerMenuItem, EditFieldPropertyItem, FLUSHING, GroupCalculator, InsertDownwardRecords, InsertUpwardRecords, PasteCellsItem, RemoveRecordsItem, UndoManagerService, VIEW_ACTIONS, YjsAITable, actionMappers, addFields, addRecords, addView, applyActionOps, applyActions, applyEvents, applyYjsEvents, buildFieldsByView, buildGroupLinearRows, buildRecordsByView, buildRemoveFieldItem, buildSetFieldAction, buildSetRecordPositionsActon, calculateAdaptiveFrozenColumnCount, checkConditions, createMultiplePositions, createPositions, createSharedType, doFilter, findNextRecordForTargetInOriginalRecords, findPrevRecordForTargetInOriginalRecords, freezeToThisColumn, generateCopyName, getDataBySharedType, getDefaultI18nTextByKey, getDefaultRecordDataByFilter, getDefaultRecordValues, getFieldPositionInView, getFieldsSizeMap, getFilteredRecords, getFrozenFieldId, getMaxPosition, getNewRecordsPosition, getParentGroupValuesByGroupId, getParentLinearRowGroups, getPosition, getPositionByAfterOrBeforeRecordId, getPositions, getPrevRecordIdByAddGroupId, getRecordsBySharedJson, getSharedTypeByData, getSortFields, getSortRecords, getStateI18nTextByKey, isPathEqual, moveFields, moveRecords, removeView, restoreDefaultFrozenColumn, sortRecordsBySortInfo, sortViews, toSharedType, translateYjsEvent, updateFieldAndValues, updateFieldValues, withState };
 //# sourceMappingURL=ai-table-state.mjs.map