From 59799fab21b9c82c3a8f517d8e12427971074e35 Mon Sep 17 00:00:00 2001
From: chenxi-20 <76168465+chenxi-20@users.noreply.github.com>
Date: Fri, 8 Dec 2023 10:31:33 +0800
Subject: [PATCH] fix(tag): [tag] Fix the pre deletion operation function
 (#1057)

---
 .../sites/demos/pc/app/tag/before-delete.vue  | 64 -------------------
 .../pc/app/tag/closable-composition-api.vue   | 25 --------
 .../sites/demos/pc/app/tag/closable.spec.ts   | 14 ----
 ...ion-api.vue => delete-composition-api.vue} | 22 ++-----
 .../sites/demos/pc/app/tag/delete.spec.ts     | 19 ++++++
 .../pc/app/tag/{closable.vue => delete.vue}   | 27 ++++++--
 examples/sites/demos/pc/app/tag/webdoc/tag.js | 22 +++++--
 packages/vue/src/tag/src/pc.vue               |  5 +-
 8 files changed, 63 insertions(+), 135 deletions(-)
 delete mode 100644 examples/sites/demos/pc/app/tag/before-delete.vue
 delete mode 100644 examples/sites/demos/pc/app/tag/closable-composition-api.vue
 delete mode 100644 examples/sites/demos/pc/app/tag/closable.spec.ts
 rename examples/sites/demos/pc/app/tag/{before-delete-composition-api.vue => delete-composition-api.vue} (52%)
 create mode 100644 examples/sites/demos/pc/app/tag/delete.spec.ts
 rename examples/sites/demos/pc/app/tag/{closable.vue => delete.vue} (55%)

diff --git a/examples/sites/demos/pc/app/tag/before-delete.vue b/examples/sites/demos/pc/app/tag/before-delete.vue
deleted file mode 100644
index 16c890ada..000000000
--- a/examples/sites/demos/pc/app/tag/before-delete.vue
+++ /dev/null
@@ -1,64 +0,0 @@
-<template>
-  <div>
-    <p>
-      <tiny-switch v-model="beforeDeleteValue"></tiny-switch>
-      before-change 返回 {{ beforeDeleteValue }} 时 {{ beforeDeleteText }}
-      <br />
-    </p>
-    <tiny-tag
-      v-for="tag in tags"
-      :key="'tiny-tag1-' + tag.name"
-      closable
-      :type="tag.type"
-      @close="close(tag)"
-      :before-delete="beforeDelete"
-      >{{ tag.name }}</tiny-tag
-    >
-  </div>
-</template>
-
-<script>
-import { Tag, Switch } from '@opentiny/vue'
-
-export default {
-  components: {
-    TinyTag: Tag,
-    TinySwitch: Switch
-  },
-  data() {
-    return {
-      tags: [
-        { name: '标签一', type: '' },
-        { name: '标签二', type: 'success' },
-        { name: '标签三', type: 'info' },
-        { name: '标签四', type: 'warning' },
-        { name: '标签五', type: 'danger' }
-      ],
-      beforeDeleteValue: false
-    }
-  },
-  computed: {
-    beforeDeleteText() {
-      return this.beforeDeleteValue
-        ? '可执行 close 事件，点击删除图标可以删除标签'
-        : '将拦截 close 事件的执行，点击删除图标将无法删除标签'
-    }
-  },
-  methods: {
-    close(tag) {
-      this.tags.splice(this.tags.indexOf(tag), 1)
-    },
-    beforeDelete(done) {
-      setTimeout(() => {
-        this.beforeDeleteValue && done()
-      })
-    }
-  }
-}
-</script>
-
-<style scoped>
-.tiny-tag + .tiny-tag {
-  margin-left: 10px;
-}
-</style>
diff --git a/examples/sites/demos/pc/app/tag/closable-composition-api.vue b/examples/sites/demos/pc/app/tag/closable-composition-api.vue
deleted file mode 100644
index 52339e0d5..000000000
--- a/examples/sites/demos/pc/app/tag/closable-composition-api.vue
+++ /dev/null
@@ -1,25 +0,0 @@
-<template>
-  <div class="tiny-tag-demo">
-    <tiny-tag v-for="tag in tags" :key="'tiny-tag1-' + tag.name" closable :type="tag.type" @close="handleClose(tag)">{{
-      tag.name
-    }}</tiny-tag>
-  </div>
-</template>
-
-<script setup lang="jsx">
-import { ref } from 'vue'
-import { Tag as TinyTag, Modal } from '@opentiny/vue'
-
-const tags = ref([
-  { name: '标签一', type: '' },
-  { name: '标签二', type: 'success' },
-  { name: '标签三', type: 'info' },
-  { name: '标签四', type: 'warning' },
-  { name: '标签五', type: 'danger' }
-])
-
-function handleClose(tag) {
-  tags.value.splice(tags.value.indexOf(tag), 1)
-  Modal.message('close 事件')
-}
-</script>
diff --git a/examples/sites/demos/pc/app/tag/closable.spec.ts b/examples/sites/demos/pc/app/tag/closable.spec.ts
deleted file mode 100644
index b8ab96a33..000000000
--- a/examples/sites/demos/pc/app/tag/closable.spec.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { expect, test } from '@playwright/test'
-
-test('是否正常移除标签', async ({ page }) => {
-  page.on('pageerror', (exception) => expect(exception).not.toBeNull())
-  await page.goto('tag#closable')
-
-  const first = page.locator('.tiny-tag').filter({ hasText: '标签一' })
-  const close = first.locator('.tiny-tag__close')
-  const modal = page.locator('.tiny-modal__box').nth(0)
-
-  await close.click()
-  await modal.waitFor({ state: 'attached', timeout: 100 })
-  await expect(first).not.toBeVisible()
-})
diff --git a/examples/sites/demos/pc/app/tag/before-delete-composition-api.vue b/examples/sites/demos/pc/app/tag/delete-composition-api.vue
similarity index 52%
rename from examples/sites/demos/pc/app/tag/before-delete-composition-api.vue
rename to examples/sites/demos/pc/app/tag/delete-composition-api.vue
index 33e16210d..ba6f94df3 100644
--- a/examples/sites/demos/pc/app/tag/before-delete-composition-api.vue
+++ b/examples/sites/demos/pc/app/tag/delete-composition-api.vue
@@ -1,16 +1,11 @@
 <template>
   <div>
-    <p>
-      <tiny-switch v-model="beforeDeleteValue"></tiny-switch>
-      before-change 返回 {{ beforeDeleteValue }} 时 {{ beforeDeleteText }}
-      <br />
-    </p>
     <tiny-tag
       v-for="tag in tags"
       :key="'tiny-tag1-' + tag.name"
       closable
       :type="tag.type"
-      @close="close(tag)"
+      @close="handleClose(tag)"
       :before-delete="beforeDelete"
       >{{ tag.name }}</tiny-tag
     >
@@ -19,7 +14,7 @@
 
 <script setup>
 import { ref, computed } from 'vue'
-import { Tag as TinyTag, Switch as TinySwitch } from '@opentiny/vue'
+import { Tag as TinyTag, Modal } from '@opentiny/vue'
 
 const tags = ref([
   { name: '标签一', type: '' },
@@ -28,20 +23,15 @@ const tags = ref([
   { name: '标签四', type: 'warning' },
   { name: '标签五', type: 'danger' }
 ])
-const beforeDeleteValue = ref(false)
-const beforeDeleteText = computed(() => {
-  return beforeDeleteValue.value
-    ? '可执行 close 事件，点击删除图标可以删除标签'
-    : '将拦截 close 事件的执行，点击删除图标将无法删除标签'
-})
 
-function close(tag) {
+function handleClose(tag) {
   tags.value.splice(tags.value.indexOf(tag), 1)
+  Modal.message('close 事件')
 }
 
 function beforeDelete(done) {
-  setTimeout(() => {
-    beforeDeleteValue.value && done()
+  Modal.confirm('确认删除？').then((res) => {
+    res === 'confirm' && done()
   })
 }
 </script>
diff --git a/examples/sites/demos/pc/app/tag/delete.spec.ts b/examples/sites/demos/pc/app/tag/delete.spec.ts
new file mode 100644
index 000000000..10e39c058
--- /dev/null
+++ b/examples/sites/demos/pc/app/tag/delete.spec.ts
@@ -0,0 +1,19 @@
+import { expect, test } from '@playwright/test'
+
+test('是否能阻止删除或正常删除标签', async ({ page }) => {
+  page.on('pageerror', (exception) => expect(exception).not.toBeNull())
+  await page.goto('tag#delete')
+
+  const first = page.locator('.tiny-tag').filter({ hasText: '标签一' })
+  const close = first.locator('.tiny-tag__close')
+  const modal = page.locator('.tiny-modal__box').getByText('消息提示确认删除？确认取消')
+
+  await close.click()
+  await modal.waitFor({ state: 'attached', timeout: 100 })
+  await page.getByRole('button', { name: '取消' }).click()
+  await first.isVisible()
+  await close.click()
+  await modal.waitFor({ state: 'attached', timeout: 100 })
+  await page.getByRole('button', { name: '确认' }).click()
+  await expect(first).not.toBeVisible()
+})
diff --git a/examples/sites/demos/pc/app/tag/closable.vue b/examples/sites/demos/pc/app/tag/delete.vue
similarity index 55%
rename from examples/sites/demos/pc/app/tag/closable.vue
rename to examples/sites/demos/pc/app/tag/delete.vue
index 2ccc643f2..323428c3d 100644
--- a/examples/sites/demos/pc/app/tag/closable.vue
+++ b/examples/sites/demos/pc/app/tag/delete.vue
@@ -1,12 +1,18 @@
 <template>
-  <div class="tiny-tag-demo">
-    <tiny-tag v-for="tag in tags" :key="'tiny-tag1-' + tag.name" closable :type="tag.type" @close="handleClose(tag)">{{
-      tag.name
-    }}</tiny-tag>
+  <div>
+    <tiny-tag
+      v-for="tag in tags"
+      :key="'tiny-tag1-' + tag.name"
+      closable
+      :type="tag.type"
+      @close="handleClose(tag)"
+      :before-delete="beforeDelete"
+      >{{ tag.name }}</tiny-tag
+    >
   </div>
 </template>
 
-<script lang="jsx">
+<script>
 import { Tag, Modal } from '@opentiny/vue'
 
 export default {
@@ -28,7 +34,18 @@ export default {
     handleClose(tag) {
       this.tags.splice(this.tags.indexOf(tag), 1)
       Modal.message('close 事件')
+    },
+    beforeDelete(done) {
+      Modal.confirm('确认删除？').then((res) => {
+        res === 'confirm' && done()
+      })
     }
   }
 }
 </script>
+
+<style scoped>
+.tiny-tag + .tiny-tag {
+  margin-left: 10px;
+}
+</style>
diff --git a/examples/sites/demos/pc/app/tag/webdoc/tag.js b/examples/sites/demos/pc/app/tag/webdoc/tag.js
index 2ddb9fd05..5ac2631e8 100644
--- a/examples/sites/demos/pc/app/tag/webdoc/tag.js
+++ b/examples/sites/demos/pc/app/tag/webdoc/tag.js
@@ -50,14 +50,15 @@ export default {
       'codeFiles': ['disabled.vue']
     },
     {
-      'demoId': 'closable',
-      'name': { 'zh-CN': '移除', 'en-US': 'Remove' },
+      'demoId': 'delete',
+      'name': { 'zh-CN': '删除操作', 'en-US': 'Delete' },
       'desc': {
-        'zh-CN': '通过 <code>closable</code> 设置展示关闭按钮， <code>close</code> 监听关闭按钮点击事件，做删除操作。',
+        'zh-CN':
+          '通过 <code>closable</code> 设置展示关闭按钮， <code>before-delete</code> 设置删除前的操作，可以在此钩子中做提示或确认；<code>close</code> 监听关闭按钮点击事件，做删除操作。',
         'en-US':
-          'Set the display close button through <code>close</code> , listen to the close button click event, and perform the deletion operation.'
+          'Set the display close button through<code>close</code>, and<code>before-delete</code>to set the operation before deletion, which can be prompted or confirmed in this hook< Code>close</code>Listen to the close button click event and perform the deletion operation.'
       },
-      'codeFiles': ['closable.vue']
+      'codeFiles': ['delete.vue']
     },
     {
       'demoId': 'create',
@@ -95,12 +96,19 @@ export default {
       'name': 'tag',
       'type': 'component',
       'props': [
+        {
+          'name': 'before-delete',
+          'type': '(close: () => void) => void',
+          'defaultValue': '',
+          'desc': { 'zh-CN': '删除前回调函数', 'en-US': 'Delete callback function before deletion' },
+          'demoId': 'delete'
+        },
         {
           'name': 'closable',
           'type': 'boolean',
           'defaultValue': 'false',
           'desc': { 'zh-CN': '是否可关闭', 'en-US': 'Can be disabled' },
-          'demoId': 'closable'
+          'demoId': 'delete'
         },
         {
           'name': 'color',
@@ -189,7 +197,7 @@ export default {
             'zh-CN': '点击关闭按钮时触发的事件',
             'en-US': 'Event triggered when the close button is clicked'
           },
-          'demoId': 'closable'
+          'demoId': 'delete'
         }
       ],
       'slots': [
diff --git a/packages/vue/src/tag/src/pc.vue b/packages/vue/src/tag/src/pc.vue
index 286bfc131..501894544 100644
--- a/packages/vue/src/tag/src/pc.vue
+++ b/packages/vue/src/tag/src/pc.vue
@@ -37,10 +37,7 @@ export default defineComponent({
     ]
 
     const tagElement = (
-      <span
-        class={classes}
-        style={{ backgroundColor: color, display: state.show ? null : 'none' }}
-        onClick={handleClick}>
+      <span class={classes} style={{ backgroundColor: color }} onClick={handleClick}>
         {value ? <span>{value}</span> : slots.default && slots.default()}
         {closable && <icon-close class="tiny-svg-size tiny-tag__close " onClick={handleClose}></icon-close>}
       </span>