Merge branch 'dev' into songshankun/add-token

songshankun

2023-11-03 cf6a4b874aed82592eea78294715c7c688f9b248

 src/components/makepager/SearchCommonView.vue

@@ -54,7 +54,7 @@
            <template v-if="selectArr?.length > 0" slot="prepend">
              <div style="display: flex">
                <div v-for="(val, i) in selectArr" :key="i" class="pre-views">
                  <span style="margin-left: 5px">{{ val }}</span>
                  <span style="margin-left: 5px">{{ val.title }}</span>
                  <i @click="delSelectClick(val)" class="el-icon-close" style="margint: 0 5px"></i>
                </div>
              </div>
@@ -88,9 +88,9 @@
            </div>
            <el-dropdown-menu slot="dropdown">
              <el-dropdown-item
                v-for="(item, key) in taskStatusMap"
                v-for="(item, key) in screenArray"
                :key="key"
                :command="item.title"
                :command="{ command: item.title, ...item }"
                :class="{ selected: status == item.title }"
              >
                <div class="dropdown-view">
@@ -224,6 +224,14 @@
    showSreen: {
      type: Boolean,
      default: true
    },
    searchTaskMap: {
      type: Array,
      default: () => []
    },
    screenArray: {
      type: Array,
      default: () => []
    }
  },
  watch: {
@@ -243,13 +251,12 @@
      searchInput: "",
      searchSelValue: this.searchSel,
      status: "",
      taskStatusMap: [
        { value: "0", type: "default", title: "完成" },
        { value: "1", type: "default", title: "就緒" }
      ],
      selList: [],
      selectArr: []
    }
  },
  mounted() {
    this.selectArr = this.searchTaskMap
  },
  methods: {
    // 搜索
@@ -302,6 +309,7 @@
        this.selectArr.findIndex((e) => e === item),
        1
      )
      this.$emit("delSelectClick", item)
    }
  }
}
@@ -400,7 +408,7 @@
        }
      }
      .pre-views {
        border: 1px solid #ccc;
        border: 1px solid #c0c0c0;
        font-size: 12px;
        margin-right: 5px;
        border-radius: 3px;