Merge remote-tracking branch 'origin/master'

xiangpei

2025-03-17 2fe7eb79670f8d9a64a501596b18c4e098278c89

 src/components/VisibilityToolbar/index.vue

@@ -39,7 +39,7 @@
          </el-table-column>
          <el-table-column prop="date" label="排序">
            <template slot-scope="scope">
              <el-input-number v-model="scope.row.serialNumber" :min="0" style="width: 120px" @change="sortChange(scope.row, $event)"></el-input-number>
              <el-input-number v-model="scope.row.sort" :min="0" style="width: 120px" @change="sortChange(scope.row, $event)"></el-input-number>
            </template>
          </el-table-column>
        </el-table>
@@ -129,7 +129,6 @@
      this.table = true;
    },
    switchChange(row) {
      row.sort = row.serialNumber;
      if (row.visible === true){
        row.display = "1"
      }else {
@@ -139,17 +138,16 @@
        this.saveList.push(row)
      }else {
        let have = true;
        this.saveList.forEach((item ,index)=>{
          if (item.id === row.id){
              item[index] =item;
        let index = this.saveList.findIndex(item => item.id === row.id);
        if (index !== -1){
            this.saveList[index] = row;
            have =false;
          }
        })
        }

        if (have){
          this.saveList.push(row)
        }
      }
      console.log(this.saveList)
      this.$emit('update:columns', row);
    },
    handlePageChange(page) {
@@ -185,11 +183,12 @@
      if (this.saveList.length !== 0){
        saveHiddenList(CircularJSON.stringify(this.saveList)).then(res =>{
          this.$modal.msgSuccess("保存成功");
          //刷新页面
          this.$emit('update:resetSort');
        });
      }
    },
    sortChange(row, val) {
      row.sort = row.serialNumber;
      if (row.visible === true){
        row.display = "1"
      }else {
@@ -199,12 +198,11 @@
        this.saveList.push(row)
      }else {
        let have = true;
        this.saveList.forEach((item ,index)=>{
          if (item.id === row.id){
            item[index] =item;
            have =false;
          }
        })
        let index = this.saveList.findIndex(item => item.id === row.id);
        if (index !== -1){
          this.saveList[index] = row;
          have =false;
        }
        if (have){
          this.saveList.push(row)
        }
@@ -221,7 +219,6 @@
      //
      // // 根据serialNumber对newColumns进行排序
      // this.cpList = this.cpList.sort((a, b) => a.serialNumber - b.serialNumber);
      //
      // // 触发事件通知父组件columns已更新（如果父组件需要知道这个变化）
      // this.$emit('update:sort', this.cpList);
      this.$emit('update:sort', row);