win_text_editor/lib/modules/code_creater/services/code_create_service.dart

@@ -65,6 +65,7 @@ class CodeCreateService {
         if (action!.startsWith("遍历") && action.endsWith("结束")) {
           //将当前遍历块内变量清除
           final memberName = iterateStack.removeLast();
+          debugPrint('删除遍历块:$memberName');
           iterateOutputFields.remove(memberName);
           iteratePartnerMap.remove(memberName);
 
@@ -228,47 +229,35 @@ class CodeCreateService {
               iteratePartnerMap.values.expand((partners) => partners).toList(),
             );
 
-            List<String> fieldNames = component.fields.map((col) => col.name).toList();
-
             switch (action) {
+              case "获取组件":
               case "遍历组件":
-                iterateStack.add(component.name); //入栈
-
-                iterateOutputFields.putIfAbsent(iterateStack.last, () => []).addAll(fieldNames);
-                iterateOutputFields[iterateStack.last]!.add(component.name);
-                iteratePartnerMap
-                    .putIfAbsent(member.name, () => [])
-                    .add(CodePartner(name: member.name, fields: fieldNames));
-
-                break;
+                List<String> fieldNames = component.fields.map((col) => col.name).toList();
 
-              case "插入组件":
-              case "修改组件":
-                for (var field in component.fields) {
-                  if (!outputFields.contains(field.name) &&
-                      !inputFields.contains(field.name) &&
-                      !iterateOutputFields.values.expand((list) => list).contains(field.name)) {
-                    inputFields.add(field.name);
-                  }
-                }
-                continue case_get;
-              case_get:
-              case "获取组件":
                 //将出参加入作用域出参列表中
                 if (iterateStack.isNotEmpty) {
                   //仍在遍历块内，加入最近遍历块中
                   iterateOutputFields.putIfAbsent(iterateStack.last, () => []).addAll(fieldNames);
-                  iterateOutputFields[iterateStack.last]!.add(component.name);
                   iteratePartnerMap
                       .putIfAbsent(member.name, () => [])
                       .add(CodePartner(name: member.name, fields: fieldNames));
                 } else {
                   //加入全局出参中
                   outputFields.addAll(fieldNames);
-                  outputFields.add(component.name);
                   beforePartner.add(CodePartner(name: member.name, fields: fieldNames));
                 }
 
+                iterateStack.add(component.name); //入栈
+                break;
+
+              default:
+                for (var field in component.fields) {
+                  if (!outputFields.contains(field.name) &&
+                      !inputFields.contains(field.name) &&
+                      !iterateOutputFields.values.expand((list) => list).contains(field.name)) {
+                    inputFields.add(field.name);
+                  }
+                }
                 break;
             }
 

win_text_editor/lib/modules/code_creater/widgets/code_creater_view.dart

@@ -71,7 +71,6 @@ class _CodeCreaterViewState extends State<CodeCreaterView> {
               members: _controller.members,
               onMoveMember: _moveMember,
               onDeleteMember: _deleteMember,
-              onDeleteAll: _deleteAll,
               onMoveToTop: _moveToTop,
               onMoveToBottom: _moveToBottom,
               onActionTypeChanged:
@@ -145,13 +144,6 @@ class _CodeCreaterViewState extends State<CodeCreaterView> {
     });
   }
 
-  void _deleteAll() {
-    setState(() {
-      _controller.members.clear();
-      _updateDisplay();
-    });
-  }
-
   void _selectOperation(String? operation) {
     if (operation == null || operation.isEmpty) {
       return;

win_text_editor/lib/modules/code_creater/widgets/node_table.dart

@@ -13,7 +13,6 @@ class NodeTable extends StatefulWidget {
   final List<OutlineNode> members;
   final Function(int, int) onMoveMember;
   final Function(int) onDeleteMember;
-  final Function() onDeleteAll;
   final Function(int) onMoveToTop;
   final Function(int) onMoveToBottom;
   final Function(int, String)? onActionTypeChanged; // 新增回调函数
@@ -23,7 +22,6 @@ class NodeTable extends StatefulWidget {
     required this.members,
     required this.onMoveMember,
     required this.onDeleteMember,
-    required this.onDeleteAll,
     required this.onMoveToTop,
     required this.onMoveToBottom,
     this.onActionTypeChanged, // 新增参数
@@ -110,7 +108,6 @@ class NodeTableState extends State<NodeTable> {
     final canMoveUp = _selectedRowIndex != null && _selectedRowIndex! > 0;
     final canMoveDown = _selectedRowIndex != null && _selectedRowIndex! < widget.members.length - 1;
     final canDelete = _selectedRowIndex != null;
-    final canDeleteAll = widget.members.isNotEmpty;
 
     return Padding(
       padding: const EdgeInsets.all(2.0),
@@ -161,15 +158,6 @@ class NodeTableState extends State<NodeTable> {
                 onPressed: canDelete ? () => widget.onDeleteMember(_selectedRowIndex!) : null,
                 tooltip: '删除行',
               ),
-              IconButton(
-                icon: Icon(
-                  Icons.delete_forever,
-                  size: 14,
-                  color: canDeleteAll ? Colors.red : Colors.grey,
-                ),
-                onPressed: canDeleteAll ? _showDeleteAllConfirmation : null,
-                tooltip: '全部删除',
-              ),
             ],
           ),
         ],
@@ -177,36 +165,6 @@ class NodeTableState extends State<NodeTable> {
     );
   }
 
-  void _showDeleteAllConfirmation() {
-    showDialog(
-      context: context,
-      builder: (BuildContext context) {
-        return AlertDialog(
-          title: const Text('确认删除'),
-          content: const Text('确定要删除所有节点吗？此操作不可撤销。'),
-          actions: [
-            TextButton(onPressed: () => Navigator.of(context).pop(false), child: const Text('取消')),
-            TextButton(
-              onPressed: () {
-                Navigator.of(context).pop(true);
-                _deleteAllMembers();
-              },
-              child: const Text('删除', style: TextStyle(color: Colors.red)),
-            ),
-          ],
-        );
-      },
-    );
-  }
-
-  // 添加删除所有成员的方法
-  void _deleteAllMembers() {
-    setState(() {
-      _selectedRowIndex = null;
-    });
-    widget.onDeleteAll();
-  }
-
   void _handleRowSelection() {
     if (_stateManager?.currentRow == null) return;
     setState(() {

win_text_editor/lib/modules/data_format/widgets/grid_view.dart

@@ -54,11 +54,8 @@ class _DataGridViewState extends State<DataGridView> {
         ),
         // 数据表格区域
         Expanded(
-          child: Row(
-            children: [
+          child:
               _csvData.isEmpty ? const Center(child: Text('请选择CSV文件')) : _buildScrollableDataGrid(),
-            ],
-          ),
         ),
       ],
     );
@@ -173,9 +170,9 @@ class _DataGridViewState extends State<DataGridView> {
       columns: columns,
       gridLinesVisibility: GridLinesVisibility.both,
       headerGridLinesVisibility: GridLinesVisibility.both,
-      columnWidthMode: ColumnWidthMode.fill,
       allowColumnsResizing: true,
       columnResizeMode: ColumnResizeMode.onResizeEnd,
+      columnWidthMode: ColumnWidthMode.none,
     );
   }
 }

win_text_editor/lib/modules/template_parser/widgets/grid_view.dart

@@ -135,7 +135,6 @@ class TemplateGridView extends StatelessWidget {
       columns: columns,
       gridLinesVisibility: GridLinesVisibility.both,
       headerGridLinesVisibility: GridLinesVisibility.both,
-      columnWidthMode: ColumnWidthMode.fill,
       allowColumnsResizing: true,
       allowEditing: true, // 启用编辑
       editingGestureType: EditingGestureType.tap, // 点击编辑

win_text_editor/lib/modules/uft_component/services/uft_component_service.dart

@@ -68,6 +68,10 @@ class UftComponentService {
         final name = node.getAttribute('name') ?? '';
         final chineseName = node.getAttribute('chineseName') ?? '';
 
+        if (filterName != null && filterName.isNotEmpty && filterName != name) {
+          continue; // 如果有过滤条件且不匹配，则跳过
+        }
+
         final fields = <Field>[];
         List<Index>? indexes = [];
         int index = 1;
@@ -126,9 +130,6 @@ class UftComponentService {
         );
       }
 
-      if (filterName != null && filterName.isNotEmpty) {
-        return _components.where((com) => com.name == filterName).toList();
-      }
       return _components;
     } on xml.XmlParserException catch (e) {
       _logger.error("XML解析错误: ${e.message}");

win_text_editor/lib/shared/base/my_sf_data_grid.dart

@@ -61,7 +61,6 @@ class MySfDataGrid<T extends SelectableItem> extends StatelessWidget {
                     gridLinesVisibility: GridLinesVisibility.both,
                     headerGridLinesVisibility: GridLinesVisibility.both,
                     allowColumnsResizing: true, // 启用列宽调整
-                    columnWidthMode: ColumnWidthMode.fill,
                     columnResizeMode: ColumnResizeMode.onResizeEnd, // 推荐模式
                     controller: controller,
                     columns: [