feat:conflict

src/views/components/PenDatas.vue

@@ -152,10 +152,10 @@
         <div class="t-space-item" v-if="props.pen.name==='tablePlus'">
           <div v-if="cell.row!==undefined" class="flex between form-item  py-12">
               <div  v-if="cell.col!==undefined"  style="line-height: 30px">
-                {{$t( '当前选中单元格' )}}  ({{$t( '第' )}}{{ cell.row }}{{$t( '行' )}}，{{$t( '第' )}}{{ cell.col}}{{$t( '列' )}})
+                {{$t( '当前选中单元格' )}}  ({{$t( '第' )}}{{ props.pen.colHeaders? cell.row:cell.row+1 }}{{$t( '行' )}}，{{$t( '第' )}}{{ cell.col}}{{$t( '列' )}})
               </div>
               <div v-else style="line-height: 30px">
-                {{$t( '当前选中行' )}}  ({{$t( '第' )}}{{ cell.row }}{{$t( '行' )}})
+                {{$t( '当前选中行' )}}  ({{$t( '第' )}}{{ props.pen.colHeaders? cell.row:cell.row+1 }}{{$t( '行' )}})
               </div>
               <div>
                 <t-tooltip placement="top" :content="$t('快捷绑定')">
@@ -1877,14 +1877,18 @@ const onQuickBind = ()=>{
     if(!props.pen.realTimes){
       props.pen.realTimes = [];
     }
+    let row = cell.value.row;
+    if(props.pen.colHeaders){
+      row-=1;
+    }
     if(cell.value.col !== undefined){
       let found = props.pen.realTimes.findIndex((item:any)=>{
         return item.key === `data.${cell.value.row}.${cell.value.col}`;
       });
       if(found === -1){
         props.pen.realTimes.push({
-          label: `第${cell.value.row}行，第${cell.value.col}列`,
-          key: `data.${cell.value.row-1}.${cell.value.col}`,
+          label: `第${row+1}行，第${cell.value.col}列`,
+          key: `data.${row}.${cell.value.col}`,
           type: 'float',
         });
         onBind(props.pen.realTimes[props.pen.realTimes.length-1]);
@@ -1897,8 +1901,8 @@ const onQuickBind = ()=>{
       });
       if(found === -1){
         props.pen.realTimes.push({
-          label: `第${cell.value.row-1}行`,
-          key: `data.${cell.value.row}`,
+          label: `第${row+1}行`,
+          key: `data.${row}`,
           type: 'array',
         });
         onBind(props.pen.realTimes[props.pen.realTimes.length-1]);