From 19a5074b2b3c467c7200a2e2bdf435aea03ce0f1 Mon Sep 17 00:00:00 2001 From: dl_zhoujunyang <1640485761@qq.com> Date: Wed, 10 Jul 2024 09:41:35 +0800 Subject: [PATCH 1/5] docs(FQA): update FQA page, add example screen for draggable disable --- docs/.vitepress/sidebar.ts | 10 ++- src/__docs__/faq/disable/filter.vue | 85 ++++++++++++++++++++++ src/__docs__/faq/disable/index.en-US.md | 15 ++++ src/__docs__/faq/disable/index.zh-CN.md | 15 ++++ src/__docs__/faq/{ => sort}/index.en-US.md | 4 +- src/__docs__/faq/{ => sort}/index.zh-CN.md | 4 +- 6 files changed, 127 insertions(+), 6 deletions(-) create mode 100644 src/__docs__/faq/disable/filter.vue create mode 100644 src/__docs__/faq/disable/index.en-US.md create mode 100644 src/__docs__/faq/disable/index.zh-CN.md rename src/__docs__/faq/{ => sort}/index.en-US.md (89%) rename src/__docs__/faq/{ => sort}/index.zh-CN.md (86%) diff --git a/docs/.vitepress/sidebar.ts b/docs/.vitepress/sidebar.ts index 89b4d2bb..2a02f852 100644 --- a/docs/.vitepress/sidebar.ts +++ b/docs/.vitepress/sidebar.ts @@ -26,7 +26,10 @@ export const sidebar = { }, { text: 'FAQ', - items: [{ text: 'FAQ', link: '/en/faq/' }] + items: [ + { text: 'Sort', link: '/en/faq/sort/' }, + { text: 'Drag disable', link: '/en/faq/disable/' } + ] } ], '/': [ @@ -56,7 +59,10 @@ export const sidebar = { }, { text: '常见问题', - items: [{ text: '常见问题', link: '/faq/' }] + items: [ + { text: '排序', link: '/faq/sort/' }, + { text: '拖拽禁用', link: '/faq/disable/' } + ], }, { text: '社区群', diff --git a/src/__docs__/faq/disable/filter.vue b/src/__docs__/faq/disable/filter.vue new file mode 100644 index 00000000..f393846d --- /dev/null +++ b/src/__docs__/faq/disable/filter.vue @@ -0,0 +1,85 @@ + + + diff --git a/src/__docs__/faq/disable/index.en-US.md b/src/__docs__/faq/disable/index.en-US.md new file mode 100644 index 00000000..37e0e83a --- /dev/null +++ b/src/__docs__/faq/disable/index.en-US.md @@ -0,0 +1,15 @@ +--- +map: + path: /faq/disable +--- + +# Drag disable FQA + +### How can I make some elements in a draggable container non draggable? + +Answer1: use the `filter` attribute and pass in a `class` to filter out the elements that should not be draggable. + + + \ No newline at end of file diff --git a/src/__docs__/faq/disable/index.zh-CN.md b/src/__docs__/faq/disable/index.zh-CN.md new file mode 100644 index 00000000..0fd4f9a6 --- /dev/null +++ b/src/__docs__/faq/disable/index.zh-CN.md @@ -0,0 +1,15 @@ +--- +map: + path: /faq/disable +--- + +# 拖拽禁用 + +### 如何让拖拽容器中部分元素不能进行拖拽？ + +答1：可以使用 `filter` 属性通过传入 `class` 过滤出不需要进行拖拽的元素 + + + \ No newline at end of file diff --git a/src/__docs__/faq/index.en-US.md b/src/__docs__/faq/sort/index.en-US.md similarity index 89% rename from src/__docs__/faq/index.en-US.md rename to src/__docs__/faq/sort/index.en-US.md index de8c4990..cb1a9803 100644 --- a/src/__docs__/faq/index.en-US.md +++ b/src/__docs__/faq/sort/index.en-US.md @@ -1,9 +1,9 @@ --- map: - path: /faq/ + path: /faq/sort --- -# FAQ +# Sort FAQ ### Why is the order not updating correctly when I sort? diff --git a/src/__docs__/faq/index.zh-CN.md b/src/__docs__/faq/sort/index.zh-CN.md similarity index 86% rename from src/__docs__/faq/index.zh-CN.md rename to src/__docs__/faq/sort/index.zh-CN.md index df6ec9f5..b7be6cb0 100644 --- a/src/__docs__/faq/index.zh-CN.md +++ b/src/__docs__/faq/sort/index.zh-CN.md @@ -1,9 +1,9 @@ --- map: - path: /faq/ + path: /faq/sort --- -# 常见问题 +# 排序问题 ### 为什么我在排序时，更新顺序错误？ From f387f4033a131830ec04c2cd890912e13ba8e001 Mon Sep 17 00:00:00 2001 From: dl_zhoujunyang <1640485761@qq.com> Date: Wed, 10 Jul 2024 09:45:14 +0800 Subject: [PATCH 2/5] docs(FQA): update FQA page, add example screen for draggable disable --- src/__docs__/faq/disable/index.en-US.md | 2 +- src/__docs__/faq/disable/index.zh-CN.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/__docs__/faq/disable/index.en-US.md b/src/__docs__/faq/disable/index.en-US.md index 37e0e83a..1d9e7e60 100644 --- a/src/__docs__/faq/disable/index.en-US.md +++ b/src/__docs__/faq/disable/index.en-US.md @@ -7,7 +7,7 @@ map: ### How can I make some elements in a draggable container non draggable? -Answer1: use the `filter` attribute and pass in a `class` to filter out the elements that should not be draggable. +Answer: use the `filter` attribute and pass in a `class` to filter out the elements that should not be draggable. Date: Thu, 11 Jul 2024 09:38:17 +0800 Subject: [PATCH 3/5] migrate drag disable to the demo page --- docs/.vitepress/sidebar.ts | 17 +++++++---------- .../{faq/disable => drag-disable}/filter.vue | 0 .../disable => drag-disable}/index.en-US.md | 2 +- .../disable => drag-disable}/index.zh-CN.md | 2 +- src/__docs__/faq/{sort => }/index.en-US.md | 2 +- src/__docs__/faq/{sort => }/index.zh-CN.md | 2 +- 6 files changed, 11 insertions(+), 14 deletions(-) rename src/__docs__/{faq/disable => drag-disable}/filter.vue (100%) rename src/__docs__/{faq/disable => drag-disable}/index.en-US.md (92%) rename src/__docs__/{faq/disable => drag-disable}/index.zh-CN.md (91%) rename src/__docs__/faq/{sort => }/index.en-US.md (93%) rename src/__docs__/faq/{sort => }/index.zh-CN.md (92%) diff --git a/docs/.vitepress/sidebar.ts b/docs/.vitepress/sidebar.ts index 2a02f852..76216297 100644 --- a/docs/.vitepress/sidebar.ts +++ b/docs/.vitepress/sidebar.ts @@ -17,7 +17,8 @@ export const sidebar = { { text: 'Mixin Animation', link: '/en/demo/transitions/' }, { text: 'Table Row', link: '/en/demo/table/' }, { text: 'Table Column', link: '/en/demo/table-column/' }, - { text: 'Nesting', link: '/en/demo/nested/' } + { text: 'Nesting', link: '/en/demo/nested/' }, + { text: 'Drag Disable', link: '/en/demo/drag-disable/' }, ] }, { @@ -26,10 +27,7 @@ export const sidebar = { }, { text: 'FAQ', - items: [ - { text: 'Sort', link: '/en/faq/sort/' }, - { text: 'Drag disable', link: '/en/faq/disable/' } - ] + items: [{ text: 'FAQ', link: '/en/faq/' }] } ], '/': [ @@ -50,7 +48,9 @@ export const sidebar = { { text: '内置动画合并', link: '/demo/transitions/' }, { text: '表格行拖拽', link: '/demo/table/' }, { text: '表格列拖拽', link: '/demo/table-column/' }, - { text: '嵌套', link: '/demo/nested/' } + { text: '嵌套', link: '/demo/nested/' }, + { text: '拖拽禁用', link: '/demo/drag-disable/' } + ] }, { @@ -59,10 +59,7 @@ export const sidebar = { }, { text: '常见问题', - items: [ - { text: '排序', link: '/faq/sort/' }, - { text: '拖拽禁用', link: '/faq/disable/' } - ], + items: [{ text: '常见问题', link: '/faq/' }] }, { text: '社区群', diff --git a/src/__docs__/faq/disable/filter.vue b/src/__docs__/drag-disable/filter.vue similarity index 100% rename from src/__docs__/faq/disable/filter.vue rename to src/__docs__/drag-disable/filter.vue diff --git a/src/__docs__/faq/disable/index.en-US.md b/src/__docs__/drag-disable/index.en-US.md similarity index 92% rename from src/__docs__/faq/disable/index.en-US.md rename to src/__docs__/drag-disable/index.en-US.md index 1d9e7e60..8158508e 100644 --- a/src/__docs__/faq/disable/index.en-US.md +++ b/src/__docs__/drag-disable/index.en-US.md @@ -1,6 +1,6 @@ --- map: - path: /faq/disable + path: /demo/drag-disable --- # Drag disable FQA diff --git a/src/__docs__/faq/disable/index.zh-CN.md b/src/__docs__/drag-disable/index.zh-CN.md similarity index 91% rename from src/__docs__/faq/disable/index.zh-CN.md rename to src/__docs__/drag-disable/index.zh-CN.md index 48214d94..2770b644 100644 --- a/src/__docs__/faq/disable/index.zh-CN.md +++ b/src/__docs__/drag-disable/index.zh-CN.md @@ -1,6 +1,6 @@ --- map: - path: /faq/disable + path: /demo/drag-disable --- # 拖拽禁用 diff --git a/src/__docs__/faq/sort/index.en-US.md b/src/__docs__/faq/index.en-US.md similarity index 93% rename from src/__docs__/faq/sort/index.en-US.md rename to src/__docs__/faq/index.en-US.md index cb1a9803..aa816e9a 100644 --- a/src/__docs__/faq/sort/index.en-US.md +++ b/src/__docs__/faq/index.en-US.md @@ -1,6 +1,6 @@ --- map: - path: /faq/sort + path: /faq --- # Sort FAQ diff --git a/src/__docs__/faq/sort/index.zh-CN.md b/src/__docs__/faq/index.zh-CN.md similarity index 92% rename from src/__docs__/faq/sort/index.zh-CN.md rename to src/__docs__/faq/index.zh-CN.md index b7be6cb0..eb97166d 100644 --- a/src/__docs__/faq/sort/index.zh-CN.md +++ b/src/__docs__/faq/index.zh-CN.md @@ -1,6 +1,6 @@ --- map: - path: /faq/sort + path: /faq --- # 排序问题 From 368b19298cc3fe29fa7ac8d71809f1523165b38e Mon Sep 17 00:00:00 2001 From: dl_zhoujunyang <1640485761@qq.com> Date: Thu, 11 Jul 2024 16:34:49 +0800 Subject: [PATCH 4/5] revert FQA --- src/__docs__/faq/index.en-US.md | 4 ++-- src/__docs__/faq/index.zh-CN.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/__docs__/faq/index.en-US.md b/src/__docs__/faq/index.en-US.md index aa816e9a..de8c4990 100644 --- a/src/__docs__/faq/index.en-US.md +++ b/src/__docs__/faq/index.en-US.md @@ -1,9 +1,9 @@ --- map: - path: /faq + path: /faq/ --- -# Sort FAQ +# FAQ ### Why is the order not updating correctly when I sort? diff --git a/src/__docs__/faq/index.zh-CN.md b/src/__docs__/faq/index.zh-CN.md index eb97166d..df6ec9f5 100644 --- a/src/__docs__/faq/index.zh-CN.md +++ b/src/__docs__/faq/index.zh-CN.md @@ -1,9 +1,9 @@ --- map: - path: /faq + path: /faq/ --- -# 排序问题 +# 常见问题 ### 为什么我在排序时，更新顺序错误？ From ac18f885876ce192605e6fd1272ed12b285bb24c Mon Sep 17 00:00:00 2001 From: dl_zhoujunyang <1640485761@qq.com> Date: Thu, 11 Jul 2024 16:40:59 +0800 Subject: [PATCH 5/5] modify the title name. --- docs/.vitepress/sidebar.ts | 4 ++-- src/__docs__/drag-disable/index.en-US.md | 2 +- src/__docs__/drag-disable/index.zh-CN.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/.vitepress/sidebar.ts b/docs/.vitepress/sidebar.ts index 76216297..e4cdb005 100644 --- a/docs/.vitepress/sidebar.ts +++ b/docs/.vitepress/sidebar.ts @@ -18,7 +18,7 @@ export const sidebar = { { text: 'Table Row', link: '/en/demo/table/' }, { text: 'Table Column', link: '/en/demo/table-column/' }, { text: 'Nesting', link: '/en/demo/nested/' }, - { text: 'Drag Disable', link: '/en/demo/drag-disable/' }, + { text: 'Disable Drag Items', link: '/en/demo/drag-disable/' }, ] }, { @@ -49,7 +49,7 @@ export const sidebar = { { text: '表格行拖拽', link: '/demo/table/' }, { text: '表格列拖拽', link: '/demo/table-column/' }, { text: '嵌套', link: '/demo/nested/' }, - { text: '拖拽禁用', link: '/demo/drag-disable/' } + { text: '禁用拖拽项', link: '/demo/drag-disable/' } ] }, diff --git a/src/__docs__/drag-disable/index.en-US.md b/src/__docs__/drag-disable/index.en-US.md index 8158508e..3efc6e8d 100644 --- a/src/__docs__/drag-disable/index.en-US.md +++ b/src/__docs__/drag-disable/index.en-US.md @@ -3,7 +3,7 @@ map: path: /demo/drag-disable --- -# Drag disable FQA +# Disable Drag Items ### How can I make some elements in a draggable container non draggable? diff --git a/src/__docs__/drag-disable/index.zh-CN.md b/src/__docs__/drag-disable/index.zh-CN.md index 2770b644..257e8840 100644 --- a/src/__docs__/drag-disable/index.zh-CN.md +++ b/src/__docs__/drag-disable/index.zh-CN.md @@ -3,7 +3,7 @@ map: path: /demo/drag-disable --- -# 拖拽禁用 +# 禁用拖拽项 ### 如何让拖拽容器中部分元素不能进行拖拽？