新增单独的标签，移除了以前一整个的标签。允许新增、删除标签。允许对本子进行标记（与标签关联）与取消标记。重写了标签查找。确保所有接口都带有授权码。优化了搜索任务的显示。修复刚提交下载时的任务有概率没有简单名称的bug。(同步更新)

2023-05-07 21:18:05 +08:00
parent 6644d420db
commit b27530657b
3 changed files with 423 additions and 84 deletions
@@ -10,12 +10,22 @@
          <el-option value="keyword" label="关键字"/>
          <el-option value="tag" label="标签"/>
        </el-select>
-        参数:
-        <el-input style="width: 250px;" v-model="param" class="el-input"></el-input>
+        <el-input style="width: 200px;" v-model="param"  v-if="type !== 'tag'">
+          <template #prepend>
+            参数:
+          </template>
+        </el-input>
+        <div v-if="type === 'tag'">
+          <el-tag v-for="tid in paramForTags" closable @close="removeQueryTag(tid)">
+            {{store.state.tags.get(tid).tag}}
+          </el-tag>
+          <el-autocomplete v-model="param" :fetch-suggestions="completeQueryTag"  @select="handleTagSelect" ref="tagInput" placeholder="检索标签"/>
+        </div>
      </el-col>
      <el-col>
        <el-button @click="queryRemoteTask" v-show="type === 'link'">远程查询</el-button>
        <el-button @click="queryLocalTask">当前页查询</el-button>
+        <el-button @click="removeAllQueryTag" v-show="type === 'tag'">清空查询标签</el-button>
      </el-col>
    </el-row>
    <br>
@@ -27,6 +37,7 @@
    <el-switch @click="toggleStyle" v-model="isDark">夜间模式</el-switch>
    <hr>
    <el-button @click="isQuerying = true">里站搜索</el-button>
+    <el-button @click="isViewingTag = true">查看标签</el-button>
    <div v-show="thumbnailGallery !== {}">
      <span>
        {{thumbnailGallery.shortName}}<br>
@@ -53,11 +64,14 @@
        </el-select>
      </tr>
      <tr v-if="chosenGallery.availableResolution">
-        自定义标签:<el-input v-model="tag"/>
+        标签:<el-tag v-for="tid in paramForTags" closable @close="removeQueryTag(tid)">
+          {{store.state.tags.get(tid).tag}}
+        </el-tag>
+        <el-autocomplete v-model="param" :fetch-suggestions="completeQueryTag" @select="handleTagSelect" ref="tagInputForSubmit"/>
      </tr>
-
    </table>
    <el-button @click="postTask" v-if="chosenGallery.availableResolution">下载</el-button>
+    <el-button @click="removeAllQueryTag" v-if="chosenGallery.availableResolution">清空标签</el-button>
    <tr v-if="chosenGallery.status === '下载完成'">
      <el-button @click="onlineGalleryReader(chosenGallery.gid)">在线预览</el-button>
      <el-button @click="showThumbnailGallery(chosenGallery)">查看封面图</el-button>
@@ -133,6 +147,33 @@
    </template>
  </el-dialog>

+  <el-dialog title="查看标签" v-model="isViewingTag" style="margin-top: 0; width: 550px">
+    <div style="text-align: center">
+      输入关键字:<el-input style="width: 150px" v-model="tagKeyWord"></el-input>
+      <el-button @click="tagKeyWord = ''">清空</el-button>
+      <el-button @click="pullNewTag">刷新</el-button>
+    </div>
+
+    <el-table :data="tags" height="450px" stripe>
+      <el-table-column prop="id" label="id" width="50px" sortable/>
+      <el-table-column prop="tag" label="标签" width="300px" sortable/>
+      <el-table-column prop="usage" label="用量" width="75px" sortable/>
+
+      <el-table-column width="75px">
+        <template #default="scoped">
+            <el-button v-if="scoped.row.usage === 0"  @click="deleteTag(scoped.row.id)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <span style="color: red; font: bold 15px sans-serif">
+      创建标签前先看看有没有符合的，尽量用统一一点的标签，比如已经有个图包就不要创建图集之类的了。毕竟标签多起来数据挺多的。
+    </span>
+    <template #footer>
+      输入新标签:<el-input v-model="tag"></el-input>
+      <el-button @click="postTag">创建标签</el-button>
+    </template>
+  </el-dialog>
+
  <div class="DashBoard" v-show="!loadComplete">
      <el-input v-model="AuthCode" placeholder="请输入授权码" style="padding-top: 200px"/> <br>
      <el-checkbox v-model="isRemember">是否记住授权码</el-checkbox>
@@ -145,17 +186,19 @@ import store from "../store";
 import {computed, ref, onMounted} from "vue";
 import {ElMessage} from "element-plus"
 import axios from "axios";
+import qs from "qs";

 //授权码相关
 let AuthCode = ref("")
 let isRemember = ref(false)
 let isAlterAuthCode = ref(false)
-let isConfigDarkMode = ref(false)
-let isDark = ref(false)
 let newAuthCode = ref("")
 let tempAuthCode = ref("")

 let isQuerying = ref(false)
+let isViewingTag = ref(false)
+let isConfigDarkMode = ref(false)
+let isDark = ref(false)
 let keyword = ref("")
 let galleries = ref([])
 let queryPage = ref({})
@@ -164,15 +207,19 @@ let darkConfig = ref({})
 //查询相关
 let type = ref("link")
 let param = ref("")
+let paramForTags = ref([]) //tidS

 let targetResolution = ref("")
 let tag = ref("")
+let tagKeyWord = ref("")    //查询tag的关键字

 let realAuthCode = computed(() => {
  return store.state.AuthCode
 })

 let chosenGallery = computed(() => {
+  paramForTags.value.splice(0)
+  param.value = ''
  return store.state.chosenGallery
 })

@@ -182,11 +229,40 @@ let loadComplete = computed(() => {
 let weekUsed = computed(() => {
  return store.state.weekUsed
 })
+let tags = computed(() => {
+  let tags = store.state.tags
+  let result = []
+  tags.forEach((tag) => {
+    result.push(tag)
+  })
+
+  if(isViewingTag.value) {  //正在查看标签
+    if (tagKeyWord.value.trim() === '')
+      return result
+    else
+      return result.filter((tag) => {
+        return tag.tag.includes(tagKeyWord.value)
+      })
+  }
+    return result
+})

 let thumbnailGallery = computed(() => {
  return store.state.thumbnailGallery
 })

+function pullNewTag(){
+  store.dispatch("loadTags")
+}
+
+function postTag(){
+  store.dispatch("postTag", tag.value)
+}
+
+function deleteTag(tid){
+    store.dispatch("deleteTag", tid)
+}
+
 //修改授权码
 function alterAuthCode(){
  if(newAuthCode.value.trim() === "" || tempAuthCode.value.trim() === "" || newAuthCode.value !== tempAuthCode.value)
@@ -204,7 +280,7 @@ function queryWeekUsedAmount(){
 }
 //提交任务
 function postTask(){
-  if(!validateLink(param.value)){
+  if(!validateLink(chosenGallery.value.link)){
    ElMessage("链接错误")
    return
  }
@@ -212,11 +288,11 @@ function postTask(){
    ElMessage("请选择分辨率再提交")
    return
  }
-  let tempLink = coverLink(param.value)
+  let tempLink = coverLink(chosenGallery.value.link)
  store.dispatch("postGalleryTask",
      {link: tempLink,
              targetResolution: targetResolution.value,
-              tag:tag.value})
+              tags:paramForTags.value})
  targetResolution.value = ""
 }

@@ -238,10 +314,89 @@ function queryLocalTask(){
      store.commit("_searchLocalByKeyword", param.value)
      break
    case "tag":
-      store.commit("_searchLocalByTag", param.value.includes(",") ? param.value.split(","): [param.value])
+      store.commit("_searchLocalByTag", paramForTags.value)
      break
  }
 }
+let tagInput = ref({})          //用于查询
+let tagInputForSubmit = ref({}) //用于提交
+function completeQueryTag(keyWord, cb) {
+  if(keyWord.includes(' ')) { //查询多个标签的时候
+    let temp = keyWord.split(' ')
+    keyWord = temp[temp.length - 1]
+  }else{                          //只有一个标签的时候
+    keyWord = param.value
+  }
+  let result = []
+  let skip
+  let hit = false     //用于检测是否有重复标签
+    tags.value.forEach((tag) => {
+      if(tag.tag.includes(keyWord)) {
+        skip = false
+        for (let id of paramForTags.value) {  //跳过已选中的标签
+          if(tag.id === id){
+            if(!hit && tag.tag === keyWord){       //是否命中标签
+              hit = true
+            }
+            skip = true
+            break
+          }
+        }
+        if(!skip)
+          result.push({value: tag.tag, tid: tag.id})
+      }
+    })
+  if(result.length === 0 && chosenGallery.value.gid !== undefined && !hit){   //未命中结果并且准备与下载任务一并提交
+    result.push({value: '新建 #' + keyWord + ' 标签?', tag:keyWord})
+  }
+  cb(result)
+}
+
+function removeQueryTag(tid){
+  for (let i=0; i<paramForTags.value.length; i++){
+    if(paramForTags.value[i] === tid){
+      paramForTags.value.splice(i, 1)
+      break
+    }
+  }
+  if(chosenGallery.value.gid === undefined)    //查询本地标签
+    queryLocalTask()
+}
+
+function removeAllQueryTag(){
+  paramForTags.value.splice(0)
+  if(chosenGallery.value.gid === undefined)    //查询本地标签
+    queryLocalTask()
+}
+
+function handleTagSelect(data){
+  if('tag' in data){            //需要新建,不知道怎么处理回调，直接把axios搬到vue里面
+    axios.post("http://downloader.lionwebsite.xyz/GalleryManage/tag?" + qs.stringify({
+        tag:data.tag,
+        AuthCode: store.state.AuthCode
+    })
+    ).then((res) => {
+      if (res.data.result === 'success') {
+        ElMessage('创建标签成功')
+        paramForTags.value.push(parseInt(res.data.tid))
+        tagInputForSubmit.value.blur()
+        store.dispatch("loadTags", false).then()
+      }
+      else
+        ElMessage(res.data.data)
+  })}else{
+    paramForTags.value.push(data.tid)
+    console.log(chosenGallery)
+    if(chosenGallery.value.gid === undefined){
+      queryLocalTask()
+      tagInput.value.blur()
+    }else{
+      tagInputForSubmit.value.blur()
+    }
+  }
+  param.value = ''
+}
+
 function resetLocalQuery(){
  store.commit("_searchLocalByKeyword", "")
  param.value = ""
@@ -23,7 +23,7 @@
            </span>

            <el-button @click="deleteGallery(props.row.gid)" :disabled="props.row.download === undefined">删除</el-button>
-            <el-button @click="editGalleryTag(props.row.gid, props.row.tag)">编辑标签</el-button>
+            <el-button @click="editGalleryTag(props.row)">编辑标签</el-button>
            <el-button @click="updateGallery(props.row.link)" :disabled="props.row.download === undefined">更新</el-button>
            <el-button @click="shareGallery({gid:props.row.gid, shortName:props.row.shortName + '.zip'})" v-show="isLion">分享</el-button>
          </template>
@@ -95,20 +95,20 @@
      </el-row>
    </div>

-    <el-dialog v-model="isEditingTag" title="编辑标签">
+    <el-dialog v-model="isEditingTag" title="编辑本子标签">
      <el-form>
        <el-form-item>
          <template #label>
            标签:
          </template>
          <template #default>
-            <el-input v-model="tempTag"></el-input>
+            <el-tag v-for="tid in galleryForTag.tags" closable @close="disMark(galleryForTag.gid, tid)">
+              {{tags.get(tid).tag}}
+            </el-tag>
+            <el-autocomplete v-model="newTag" :fetch-suggestions="querySimilarTag" @select="handleTagSelect" ref="tagInput"/>
          </template>
        </el-form-item>
      </el-form>
-      <el-footer>
-        <el-button @click="submitGalleryTag()">提交修改</el-button>
-      </el-footer>
    </el-dialog>

    <el-dialog v-model="isOnlineReading" title="在线预览" @close="closeOnlineReading" width="90%" style="margin-top: 0; margin-bottom: 0; padding: 0">
@@ -136,8 +136,7 @@ let isEditingPage = ref(false)
 let isEditingTag = ref(false)

 //临时变量
-let tempTag = ref("")
-let tempGid = ref("")
+let galleryForTag = ref({})

 let category = ref("myDownload")            //myDownload myCollect total
 let galleryNameType = ref("shortName")      // shortName name
@@ -192,6 +191,12 @@ let imagePadding = computed(() => {
  return store.state.imagePadding
 })

+//标签
+let tags = computed(() => {
+  return store.state.tags
+})
+let newTag = ref("")
+
 //翻页
 function next() {
  if(targetPage.value < max.value) {
@@ -243,16 +248,59 @@ function changeGalleryCollect(gid, isCollect){
  else
    store.dispatch("collectGallery", gid)
 }
-function editGalleryTag(gid, tag){
-  tempTag.value = tag
-  tempGid.value = gid
+function editGalleryTag(gallery){
+  galleryForTag.value = gallery
  isEditingTag.value = true
 }
-function submitGalleryTag(){
-  store.dispatch("updateGalleryTag", {gid:tempGid.value, tag:tempTag.value})
-  tempTag.value = ''
-  tempGid.value = ''
-  isEditingTag.value = false
+let tagInput = ref()
+
+function querySimilarTag(keyWord, cb){
+  let result = []
+  let hit = false       //用于检测是否有重复标签
+  let skip              //用于过滤已经有了的标签
+  for(const [key, tag] of store.state.tags){
+    skip = false
+    for(let id of galleryForTag.value.tags)
+      if(id === key) {
+        if(!hit && tag.tag === keyWord)       //是否命中标签
+          hit = true
+        skip = true
+        break
+      }else{
+        console.log("id:", id, key)
+      }
+    if(skip)
+      continue
+    if(tag.tag.includes(keyWord))
+      result.push({value: tag.tag, tag:tag})
+  }
+
+  if(keyWord.trim() !== '' && !hit && !keyWord.includes("?") && result.length === 0)
+    result.push({value: '新建 #' + keyWord + ' 标签?', tag:{tag:keyWord}})
+  cb(result)
+}
+
+function handleTagSelect(data){
+  if(data.value.includes('#')) {
+    if(data.tag.tag.includes("?")) {
+      ElMessage("非法字符?")
+      return
+    }
+    else
+      store.dispatch("createTagAndMark", {tag: data.tag.tag.replace('#', ''), gid: galleryForTag.value.gid})
+  }
+  else
+    store.dispatch("mark", {gid:galleryForTag.value.gid, tid:data.tag.id})
+  newTag.value = ""
+  tagInput.value.blur()
+}
+
+function mark(gid, tid){
+  store.dispatch("mark", {gid, tid})
+}
+
+function disMark(gid, tid){
+  store.dispatch("disMark", {gid, tid})
 }

 //下载，删除，在线看