st-comp 0.0.234 → 0.0.236

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "st-comp",
   "public": true,
-  "version": "0.0.234",
+  "version": "0.0.236",
   "type": "module",
   "scripts": {
     "dev": "vite",

package/packages/KlineBasic/components/Tips/index.vue

@@ -33,7 +33,7 @@
           } else if(props.data?.[index]?.label === '额') {
             widthList.value[index] = '85px'
           } else if(['开', '高', '低', '收'].includes(props.data?.[index]?.label)) {
-            widthList.value[index] = `${item.offsetWidth + 22}px`
+            widthList.value[index] = `${item.offsetWidth + 24}px`
           } else {
             widthList.value[index] = `${item.offsetWidth + 36}px`
           }

package/packages/VarietySearch/components/AddTag/index.vue

@@ -23,13 +23,12 @@
   <!-- 添加标签弹窗 -->
   <el-dialog
     v-model="visible"
-    title="Tips"
     width="1000"
   >
     <template #header>
       <div>
         添加标签
-        <el-radio-group v-model="tagType" size="small" style="margin-left: 8px; vertical-align: 5px;" v-if="0">
+        <el-radio-group v-model="tagType" size="small" style="margin-left: 8px; vertical-align: 5px;">
           <el-radio-button label="个人" value="person" />
           <el-radio-button label="系统" value="system" />
         </el-radio-group>
@@ -41,8 +40,8 @@
         <el-checkbox :checked="isCheck(item)" @change="changeCheckBox(item)">
           <div style="display: flex; width: 280px;">
             <div style="flex: 1;line-height: 24px;">{{ item.name }}</div>
-            <el-button size="small" :icon="Edit" v-if="0"></el-button>
-            <el-button size="small" :icon="Delete" @click="deleteTag(item)"></el-button>
+            <el-button size="small" :icon="Edit" @click="editTag(item)" v-if="tagType === 'person'"></el-button>
+            <el-button size="small" :icon="Delete" @click="deleteTag(item)" v-if="tagType === 'person'"></el-button>
           </div>
         </el-checkbox>
       </div>
@@ -55,6 +54,21 @@
     </template>
   </el-dialog>
   <!-- 编辑标签弹窗 -->
+   <el-dialog
+    v-model="editVisible"
+    title="编辑标签"
+    top="20vh"
+    width="600"
+  >
+    <div style="margin-bottom: 12px;">原名称：{{ editItem?.name }}</div>
+    <el-input v-model="editValue" />
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="editVisible = false">取消</el-button>
+        <el-button type="primary" @click="changeTag()">确定</el-button>
+      </div>
+    </template>
+  </el-dialog>
 </template>
 
 <script setup>
@@ -69,14 +83,17 @@ const data = defineModel("data", { default: [] });
 const visible = ref(false);
 const tagType = ref('person'); // 标签类型
 const searchValue = ref(''); // 搜索值
-const totalTagList = ref([]); // 全部标签列表
+const tagMap = ref({}); // 全部标签映射
 const tagList = ref([]); // 标签列表
 const checkList = ref([]); // 勾选列表
+const editVisible = ref(false); // 编辑标签弹窗
+const editItem = ref(null); // 编辑标签对象
+const editValue = ref(''); // 编辑标签值
 
 const showCheckTagList = computed(() => {
   return data.value.map(id => {
     return {
-      name: totalTagList.value?.find(i => i.id === id)?.tagName,
+      name: tagMap.value[id],
       id,
     }
   })
@@ -84,6 +101,7 @@ const showCheckTagList = computed(() => {
 
 watch(() => tagType.value, () => {
   searchValue.value = ''
+  getTagList()
 })
 
 watch(() => searchValue.value, () => {
@@ -106,6 +124,7 @@ const changeCheckBox = (item) => {
   }
 }
 
+// 标签相关操作
 const handleAction = (action, index) => {
   switch (action) {
     // 新增
@@ -117,13 +136,6 @@ const handleAction = (action, index) => {
       getTagList()
       break;
     }
-    // 编辑
-    case "edit": {
-      const item = data.value[index];
-      compositeOrderForm.value = { ...item };
-      visible.value = true;
-      break;
-    }
     // 窗口确认
     case "submit": {
       visible.value = false;
@@ -138,6 +150,7 @@ const handleAction = (action, index) => {
   }
 };
 
+// 删除个人标签
 const deleteTag = (item) => {
   ElMessageBox.alert(`确认删除标签“${item.name}”吗？`, '删除标签', {
     confirmButtonText: 'OK',
@@ -145,13 +158,41 @@ const deleteTag = (item) => {
       if (action === 'confirm') {
         await request.post('/alarm/deliversign/deleteTag', { tagId: item.id })
         getTagList()
-        Elmessage.success('删除成功!')
+        ElMessage.success('删除成功!')
       }
     },
   })
 }
 
-const getTagList = async (isTotal = false) => {
+// 打开编辑标签弹窗
+const editTag = (item) => { 
+  editItem.value = item
+  editValue.value = item.name
+  editVisible.value = true
+}
+
+// 修改标签
+const changeTag = async () => {
+  await request.post('/alarm/deliversign/addOrUpdateFeatureTag', { tagName: editValue.value, tagId: editItem.value.id })
+  tagMap.value = {
+    ...tagMap.value,
+    [editItem.value.id]: editValue.value
+  }
+  tagList.value = tagList.value.map(item => {
+    if (item.id === editItem.value.id) {
+      return {
+        ...item,
+        name: editValue.value
+      }
+    }
+    return item
+  })
+  editVisible.value = false
+  ElMessage.success('修改成功!')
+}
+
+// 获取标签列表
+const getTagList = async () => {
   if (tagType.value === 'person') {
     // 个人标签
     const res = await request.post('/alarm/deliversign/findTagsByUserId', { tagName: searchValue.value })
@@ -162,19 +203,44 @@ const getTagList = async (isTotal = false) => {
         id: item.id
       }))
     })
-    if (isTotal) {
-      totalTagList.value = res.body
-    }
   } else {
     // 系统标签
+    const res = await request.post('/alarm/deliversign/findSystemTagsByTagName', { tagName: searchValue.value })
+    tagList.value = []
+    nextTick(() => {
+      tagList.value = res.body?.map(item => ({
+        name: item.tagName,
+        id: item.id
+      }))
+    })
   }
 }
 
-getTagList(true)
+// 获取全部标签
+const getTotalTagMap = async () => {
+  const res = await Promise.all([
+    request.post('/alarm/deliversign/findTagsByUserId'),
+    request.post('/alarm/deliversign/findSystemTagsByTagName')
+  ])
+  tagMap.value = res.reduce((r, i) => {
+    return {
+      ...r,
+      ...i.body?.reduce((bodyR, bodyI) => {
+        return {
+          ...bodyR,
+          [bodyI.id]: bodyI.tagName
+        }
+      }, {})
+    }
+  }, {})
+  Elmessage.success('删除成功!')
+}
+
+getTotalTagMap()
 
 defineExpose({
   updateTag: () => {
-    getTagList(true)
+    getTotalTagMap()
   }
 })
 </script>