@leevan/jtui 2.0.54-beta.6 → 2.0.54-beta.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leevan/jtui",
-  "version": "2.0.54-beta.6",
+  "version": "2.0.54-beta.7",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",

package/packages/jt-table/index.vue

@@ -77,7 +77,6 @@
       @radio-change="radioSelectChangeEvent"
       @cell-click="cellClickEvent"
       @keydown="keyEnter"
-      @edit-actived="handleEditActived"
     >
       <!-- 复选框列 -->
       <vxe-table-column
@@ -250,7 +249,6 @@
       @radio-change="radioSelectChangeEvent"
       @cell-click="cellClickEvent"
       @keydown="keyEnter"
-      @edit-actived="handleEditActived"
     >
       <!-- 复选框列 -->
       <vxe-table-column
@@ -561,7 +559,6 @@
       :loading="loading"
       @keydown="keyEnter"
       @scroll="scroll1"
-      @edit-actived="handleEditActived"
       :expand-config="{
         visibleMethod,
         loadMethod: expandConfig.loadMethod,
@@ -978,6 +975,7 @@ export default {
           setTimeout(() => {
             const temp = this.$refs[this.id].getTableData()
             if(temp.fullData.length > 0){
+              this.initRowFields(temp.fullData);
               this.isShowEmpty = false
             }else{
               if(n){
@@ -1654,12 +1652,52 @@ export default {
     syncData() {
       this.$refs[this.id].syncData();
     },
-    // 编辑激活时，确保 row 对象中有对应的字段
-    handleEditActived({ row, column }) {
-      const prop = column.property;
-      if (prop && !(prop in row)) {
-        this.$set(row, prop, '');
+    // 收集所有表头字段（包括嵌套表头）
+    getAllHeaderFields(headers) {
+      const fields = [];
+      const collect = (items) => {
+        items.forEach(item => {
+          if (item.children && item.children.length) {
+            collect(item.children);
+          } else if (item.prop) {
+            fields.push(item.prop);
+          }
+        });
+      };
+      collect(headers);
+      return fields;
+    },
+    // 初始化所有行的字段，确保每个行对象都有所有表头字段
+    initRowFields(dataArray) {
+      console.log('=== initRowFields 开始执行 ===');
+      const rows = dataArray || this.data?.DataArray;
+      console.log('传入的 dataArray:', dataArray);
+      console.log('使用的 rows:', rows);
+      if (!rows || !rows.length || !this.data?.retjson?.header) {
+        console.log('数据不完整，跳过初始化');
+        return;
       }
+      const fields = this.getAllHeaderFields(this.data.retjson.header);
+      console.log('收集到的表头字段:', fields);
+      console.log('初始化前的第一行数据:', rows[0]);
+      // 递归处理行（包括树形结构的子节点）
+      const processRow = (row, rowIndex) => {
+        console.log(`处理第 ${rowIndex} 行，处理前:`, { ...row });
+        fields.forEach(field => {
+          if (!(field in row)) {
+            console.log(`  字段 ${field} 不存在，用 $set 添加`);
+            this.$set(row, field, '');
+          }
+        });
+        console.log(`  处理后:`, { ...row });
+        // 处理子节点
+        if (row.children && row.children.length) {
+          row.children.forEach((child, idx) => processRow(child, `${rowIndex}-${idx}`));
+        }
+      };
+      rows.forEach((row, idx) => processRow(row, idx));
+      console.log('初始化后的第一行数据:', rows[0]);
+      console.log('=== initRowFields 执行完成 ===');
     },
   },
 };