Merge 67ef9dc21c into 8a0a6ea4ba

src/components/CodemirrorEditor/EditorHeader/index.vue

@@ -14,8 +14,8 @@ import {
   themeOptions,
 } from '@/config'
 import { useDisplayStore, useStore } from '@/stores'
-import { addPrefix, mergeCss, solveWeChatImage } from '@/utils'
+import { mergeCss, solveWeChatImage } from '@/utils'
-import { ChevronDownIcon, Moon, PanelLeftClose, PanelLeftOpen, Settings, Sun } from 'lucide-vue-next'
+import { Moon, PanelLeftClose, PanelLeftOpen, Settings, Sun } from 'lucide-vue-next'
 import PickColors from 'vue-pick-colors'
 
 const emit = defineEmits([`addFormat`, `formatContent`, `startCopy`, `endCopy`])
@@ -60,10 +60,6 @@ const { isDark, isCiteStatus, output, primaryColor } = storeToRefs(store)
 
 const { toggleDark, editorRefresh, citeStatusChanged } = store
 
-const copyMode = useStorage(addPrefix(`copyMode`), `txt`)
-const source = ref(``)
-const { copy: copyContent } = useClipboard({ source })
-
 // 复制到微信公众号
 function copy() {
   emit(`startCopy`)
@@ -89,7 +85,7 @@ function copy() {
       toggleDark()
     }
 
-    nextTick(async () => {
+    nextTick(() => {
       solveWeChatImage()
 
       const clipboardDiv = document.getElementById(`output`)!
@@ -132,30 +128,21 @@ function copy() {
       })
 
       window.getSelection()!.removeAllRanges()
-
-      const temp = clipboardDiv.innerHTML
-
-      if (copyMode.value === `txt`) {
       const range = document.createRange()
+
       range.setStartBefore(clipboardDiv.firstChild!)
       range.setEndAfter(clipboardDiv.lastChild!)
       window.getSelection()!.addRange(range)
       document.execCommand(`copy`)
       window.getSelection()!.removeAllRanges()
-      }
-
       clipboardDiv.innerHTML = output.value
 
       if (isBeforeDark) {
         nextTick(() => toggleDark())
       }
 
-      if (copyMode.value === `html`) {
-        await copyContent(temp)
-      }
-
       // 输出提示
-      toast.success(copyMode.value === `html` ? `已复制 HTML 源码，请进行下一步操作。` : `已复制渲染后的文章到剪贴板，可直接到公众号后台粘贴。`)
+      toast.success(`已复制渲染后的文章到剪贴板，可直接到公众号后台粘贴`)
 
       editorRefresh()
       emit(`endCopy`)
@@ -437,34 +424,9 @@ const formatOptions = ref<Format[]>([`rgb`, `hex`, `hsl`, `hsv`])
         </div>
       </PopoverContent>
     </Popover>
-
+    <Button variant="outline" class="mx-2" @click="copy">
-    <div class="space-x-1 bg-background text-background-foreground mx-2 flex items-center border rounded-md">
-      <Button variant="ghost" class="shadow-none" @click="copy">
       复制
     </Button>
-      <Separator orientation="vertical" class="h-5" />
-      <DropdownMenu v-model="copyMode">
-        <DropdownMenuTrigger as-child>
-          <Button variant="ghost" class="px-2 shadow-none">
-            <ChevronDownIcon class="text-secondary-foreground h-4 w-4" />
-          </Button>
-        </DropdownMenuTrigger>
-        <DropdownMenuContent
-          align="end"
-          :align-offset="-5"
-          class="w-[200px]"
-        >
-          <DropdownMenuRadioGroup v-model="copyMode">
-            <DropdownMenuRadioItem value="txt">
-              公众号格式
-            </DropdownMenuRadioItem>
-            <DropdownMenuRadioItem value="html">
-              HTML 格式
-            </DropdownMenuRadioItem>
-          </DropdownMenuRadioGroup>
-        </DropdownMenuContent>
-      </DropdownMenu>
-    </div>
 
     <PostInfo />
 

src/components/ui/separator/Separator.vue

@@ -1,35 +0,0 @@
-<script setup lang="ts">
-import { cn } from '@/lib/utils'
-import { Separator, type SeparatorProps } from 'radix-vue'
-import { computed, type HTMLAttributes } from 'vue'
-
-const props = defineProps<
-  SeparatorProps & { class?: HTMLAttributes[`class`], label?: string }
->()
-
-const delegatedProps = computed(() => {
-  const { class: _, ...delegated } = props
-
-  return delegated
-})
-</script>
-
-<template>
-  <Separator
-    v-bind="delegatedProps"
-    :class="
-      cn(
-        'shrink-0 bg-border relative',
-        props.orientation === 'vertical' ? 'w-px h-full' : 'h-px w-full',
-        props.class,
-      )
-    "
-  >
-    <span
-      v-if="props.label"
-      :class="cn('text-xs text-muted-foreground bg-background absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 flex justify-center items-center',
-                 props.orientation === 'vertical' ? 'w-[1px] px-1 py-2' : 'h-[1px] py-1 px-2',
-      )"
-    >{{ props.label }}</span>
-  </Separator>
-</template>

src/components/ui/separator/index.ts

@@ -1 +0,0 @@
-export { default as Separator } from './Separator.vue'