From 0095e3b7e056339af69644ae2d932d9a290e7a46 Mon Sep 17 00:00:00 2001
From: alwayrun <minge23@live.cn>
Date: Fri, 24 May 2024 20:28:01 +0800
Subject: [PATCH 1/6] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E9=A2=98=E5=9E=8B=E9=80=9A=E7=94=A8=E7=BB=84=E4=BB=B6=20BaseCh?=
 =?UTF-8?q?oice=20=E5=8D=95=E9=80=89=E7=B1=BB=E5=9E=8B=E9=A2=98=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E8=A7=A6=E5=8F=91=20change=20=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20(#164)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/materials/questions/widgets/BaseChoice/index.jsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/web/src/materials/questions/widgets/BaseChoice/index.jsx b/web/src/materials/questions/widgets/BaseChoice/index.jsx
index efc6d270..3aba05c8 100644
--- a/web/src/materials/questions/widgets/BaseChoice/index.jsx
+++ b/web/src/materials/questions/widgets/BaseChoice/index.jsx
@@ -64,7 +64,10 @@ export default defineComponent({
     const onRadioClick = (item, $event) => {
       $event && $event.stopPropagation()
       $event && $event.preventDefault()
-      emit('change', item.hash)
+
+      if (!isChecked(item)) {
+        emit('change', item.hash)
+      }
     }
     const onCheckboxClick = (item, $event) => {
       $event && $event.stopPropagation()

From 2b683b0923fc0498c5946476c0997d1e2fc9a073 Mon Sep 17 00:00:00 2001
From: hiStephen <30630927+1004801012@users.noreply.github.com>
Date: Fri, 24 May 2024 20:28:43 +0800
Subject: [PATCH 2/6] =?UTF-8?q?refactor:=20Vue3=20=E7=BB=84=E5=90=88?=
 =?UTF-8?q?=E5=BC=8F=20API=20=E5=86=99=E6=B3=95=E9=87=8D=E6=9E=84=20(#165)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../management/pages/create/CreatePage.vue    |  23 +---
 .../pages/create/components/CreateForm.vue    | 119 +++++++++---------
 .../pages/create/components/NavHeader.vue     |  49 ++++----
 .../pages/create/components/TypeList.vue      |  41 +++---
 4 files changed, 106 insertions(+), 126 deletions(-)

diff --git a/web/src/management/pages/create/CreatePage.vue b/web/src/management/pages/create/CreatePage.vue
index 0b9461df..efed176d 100644
--- a/web/src/management/pages/create/CreatePage.vue
+++ b/web/src/management/pages/create/CreatePage.vue
@@ -5,26 +5,15 @@
   </div>
 </template>
 
-<script>
+<script setup lang="ts">
+import { ref } from 'vue'
 import TypeList from './components/TypeList.vue'
 import CreateForm from './components/CreateForm.vue'
 
-export default {
-  name: 'CreatePage',
-  components: {
-    TypeList,
-    CreateForm
-  },
-  data() {
-    return {
-      selectType: 'normal'
-    }
-  },
-  methods: {
-    onSelectTypeChange(selectType) {
-      this.selectType = selectType
-    }
-  }
+const selectType = ref<string>('normal')
+
+const onSelectTypeChange = (type: string) => {
+  selectType.value = type
 }
 </script>
 
diff --git a/web/src/management/pages/create/components/CreateForm.vue b/web/src/management/pages/create/components/CreateForm.vue
index ea174ab2..3b32f2dd 100644
--- a/web/src/management/pages/create/components/CreateForm.vue
+++ b/web/src/management/pages/create/components/CreateForm.vue
@@ -35,7 +35,9 @@
   </div>
 </template>
 
-<script>
+<script setup lang="ts">
+import { ref, reactive, computed, toRefs } from 'vue'
+import { useRouter } from 'vue-router'
 import { ElMessage } from 'element-plus'
 import 'element-plus/theme-chalk/src/message.scss'
 
@@ -43,70 +45,67 @@ import { createSurvey } from '@/management/api/survey'
 
 import { SURVEY_TYPE_LIST } from '../types'
 
-export default {
-  name: 'CreateForm',
-  props: {
-    selectType: {
-      type: String,
-      default: 'normal'
-    }
-  },
-  data() {
-    return {
-      rules: {
-        title: [{ required: true, message: '请输入问卷标题', trigger: 'blur' }]
-      },
-      canSubmit: true,
-      form: {
-        title: '问卷调研',
-        remark: '问卷调研'
-      }
-    }
+interface Props {
+  selectType?: string
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  selectType: 'normal'
+})
+
+const ruleForm = ref<any>(null)
+
+const state = reactive({
+  rules: {
+    title: [{ required: true, message: '请输入问卷标题', trigger: 'blur' }]
   },
-  computed: {
-    SURVEY_TYPE_LIST() {
-      return SURVEY_TYPE_LIST
-    },
-    title() {
-      return this.SURVEY_TYPE_LIST.find((item) => item.type === this.selectType)?.title
+  canSubmit: true,
+  form: {
+    title: '问卷调研',
+    remark: '问卷调研'
+  }
+})
+const { rules, canSubmit, form } = toRefs(state)
+
+const title = computed(() => {
+  return SURVEY_TYPE_LIST.find((item) => item.type === props.selectType)?.title
+})
+
+const checkForm = (fn: Function) => {
+  ruleForm.value?.validate?.((valid: boolean) => {
+    valid && typeof fn === 'function' && fn()
+  })
+}
+
+const router = useRouter()
+
+const submit = () => {
+  if (!state.canSubmit) {
+    return
+  }
+  checkForm(async () => {
+    const { selectType } = props
+    if (!state.canSubmit) {
+      return
     }
-  },
-  methods: {
-    checkForm(fn) {
-      this.$refs.ruleForm.validate((valid) => {
-        valid && typeof fn === 'function' && fn()
-      })
-    },
-    submit() {
-      if (!this.canSubmit) {
-        return
-      }
-      this.checkForm(async () => {
-        const { selectType } = this
-        if (!this.canSubmit) {
-          return
-        }
-        this.canSubmit = false
-        const res = await createSurvey({
-          surveyType: selectType,
-          ...this.form
-        })
-        if (res.code === 200 && res?.data?.id) {
-          const id = res.data.id
-          this.$router.push({
-            name: 'QuestionEditIndex',
-            params: {
-              id
-            }
-          })
-        } else {
-          ElMessage.error(res.errmsg || '创建失败')
+    state.canSubmit = false
+    const res:any = await createSurvey({
+      surveyType: selectType,
+      ...state.form
+    })
+    if (res?.code === 200 && res?.data?.id) {
+      const id = res.data.id
+      router.push({
+        name: 'QuestionEditIndex',
+        params: {
+          id
         }
-
-        this.canSubmit = true
       })
+    } else {
+      ElMessage.error(res?.errmsg || '创建失败')
     }
-  }
+    state.canSubmit = true
+  })
 }
 </script>
 
diff --git a/web/src/management/pages/create/components/NavHeader.vue b/web/src/management/pages/create/components/NavHeader.vue
index fc58183d..7e3ae6a8 100644
--- a/web/src/management/pages/create/components/NavHeader.vue
+++ b/web/src/management/pages/create/components/NavHeader.vue
@@ -2,37 +2,36 @@
   <div :class="['nav-header', `${boxShadow ? 'box-shadow' : null}`]">
     <div class="left">
       <div class="logo">
-        <img class="logoImg" :src="img" alt @click="toHomePage" />
+        <img class="logoImg" :src="img" @click="toHomePage" />
       </div>
       <div class="return no-logo-return icon-fanhui" @click="onBack">返回</div>
     </div>
   </div>
 </template>
 
-<script>
-export default {
-  props: {
-    boxShadow: {
-      type: Boolean,
-      default: true
-    }
-  },
-  name: 'NavHeader',
-  data() {
-    return {
-      img: '/imgs/s-logo.webp'
-    }
-  },
-  methods: {
-    toHomePage() {
-      this.$router.replace({
-        name: 'survey'
-      })
-    },
-    onBack() {
-      this.$router.go(-1)
-    }
-  }
+<script setup lang="ts">
+import { useRouter } from 'vue-router'
+
+interface Props {
+  boxShadow?: boolean
+}
+
+withDefaults(defineProps<Props>(), {
+  boxShadow: true
+})
+
+const img = '/imgs/s-logo.webp'
+
+const router = useRouter()
+
+const onBack = () => {
+  router.go(-1)
+}
+
+const toHomePage = () => {
+  router.push({
+    name: 'Home'
+  })
 }
 </script>
 
diff --git a/web/src/management/pages/create/components/TypeList.vue b/web/src/management/pages/create/components/TypeList.vue
index 541c5be5..2e59c43f 100644
--- a/web/src/management/pages/create/components/TypeList.vue
+++ b/web/src/management/pages/create/components/TypeList.vue
@@ -8,7 +8,7 @@
           v-for="item in renderData"
           class="list-item"
           :key="item.type"
-          @click="handleSelectType('selectType', item)"
+          @click="handleSelectType(item.type)"
         >
           <div class="selected-border" v-if="selectType === item.type" />
           <img class="img" :src="item.img" alt="类别图片" />
@@ -24,34 +24,27 @@
   </div>
 </template>
 
-<script>
+<script setup lang="ts">
 import NavHeader from './NavHeader.vue'
 
 import { SURVEY_TYPE_LIST } from '../types'
+import { computed } from 'vue'
 
-export default {
-  name: 'LeftSide',
-  components: {
-    NavHeader
-  },
-  props: {
-    selectType: {
-      type: String,
-      default: ''
-    }
-  },
-  computed: {
-    renderData() {
-      return SURVEY_TYPE_LIST
-    }
-  },
-  methods: {
-    handleSelectType(key, value) {
-      const { type } = value
-      this.$emit('selectTypeChange', type)
-    }
-  }
+interface Props {
+  selectType?: string
 }
+
+withDefaults(defineProps<Props>(), {
+  selectType: ''
+})
+
+const emit = defineEmits(['selectTypeChange'])
+
+const handleSelectType = (selectType: string) => {
+  emit('selectTypeChange', selectType)
+}
+
+const renderData = computed(() => SURVEY_TYPE_LIST)
 </script>
 
 <style lang="scss" scoped>

From 994a2004154e956481a65cecae1eb7c857c8ae95 Mon Sep 17 00:00:00 2001
From: alwayrun <minge23@live.cn>
Date: Mon, 27 May 2024 16:10:42 +0800
Subject: [PATCH 3/6] =?UTF-8?q?feat:=20=E9=A2=98=E5=9E=8B=E5=A4=84?=
 =?UTF-8?q?=E4=BA=8E=E6=B4=BB=E5=8A=A8=E7=8A=B6=E6=80=81=E6=97=B6=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E4=BE=A7=E8=BE=B9=E6=A0=8F=E9=BB=98=E8=AE=A4=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=20(#157)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/management/pages/edit/components/QuestionWrapper.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/management/pages/edit/components/QuestionWrapper.vue b/web/src/management/pages/edit/components/QuestionWrapper.vue
index 0ab1355d..f0b7daa7 100644
--- a/web/src/management/pages/edit/components/QuestionWrapper.vue
+++ b/web/src/management/pages/edit/components/QuestionWrapper.vue
@@ -72,7 +72,7 @@ const itemClass = computed(() => {
   }
 })
 const showHover = computed(() => {
-  return isHover.value
+  return isHover.value || props.isSelected
 })
 const showUp = computed(() => {
   return props.qIndex !== 0

From 9526faeec146b6ad993659a96d753b28f2c87155 Mon Sep 17 00:00:00 2001
From: alwayrun <minge23@live.cn>
Date: Mon, 27 May 2024 16:18:08 +0800
Subject: [PATCH 4/6] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84=20management?=
 =?UTF-8?q?/pages/publishResult=20=E7=9B=AE=E5=BD=95=E4=B8=8B=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6,=20=E4=BD=BF=E7=94=A8=20Vue3=20=E7=BB=84=E5=90=88?=
 =?UTF-8?q?=E5=BC=8F=20API=20=E5=86=99=E6=B3=95=20(#167)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/package.json                              |  1 +
 web/src/management/components/LeftMenu.vue    |  2 +-
 .../modules/contentModule/PublishPanel.vue    |  4 +-
 .../pages/list/components/ToolBar.vue         |  2 +-
 .../PublishPage.vue}                          | 95 ++++++++-----------
 .../components/ChannelRow.vue                 | 67 ++++++-------
 .../components/QRCode.vue                     | 64 ++++++-------
 web/src/management/router/index.ts            |  6 +-
 8 files changed, 113 insertions(+), 128 deletions(-)
 rename web/src/management/pages/{publishResult/PublishResultPage.vue => publish/PublishPage.vue} (64%)
 rename web/src/management/pages/{publishResult => publish}/components/ChannelRow.vue (67%)
 rename web/src/management/pages/{publishResult => publish}/components/QRCode.vue (63%)

diff --git a/web/package.json b/web/package.json
index 1b879af2..c2a6226b 100644
--- a/web/package.json
+++ b/web/package.json
@@ -38,6 +38,7 @@
     "@rushstack/eslint-patch": "^1.10.2",
     "@tsconfig/node20": "^20.1.2",
     "@types/node": "^20.11.19",
+    "@types/qrcode": "^1.5.5",
     "@vitejs/plugin-vue": "^5.0.3",
     "@vitejs/plugin-vue-jsx": "^3.1.0",
     "@vue/eslint-config-prettier": "^8.0.0",
diff --git a/web/src/management/components/LeftMenu.vue b/web/src/management/components/LeftMenu.vue
index 4c861ef0..12bb3b52 100644
--- a/web/src/management/components/LeftMenu.vue
+++ b/web/src/management/components/LeftMenu.vue
@@ -25,7 +25,7 @@ const tabs = [
     text: '投放问卷',
     icon: 'icon-toufang',
     to: {
-      name: 'publishResultPage'
+      name: 'publish'
     }
   },
   {
diff --git a/web/src/management/pages/edit/modules/contentModule/PublishPanel.vue b/web/src/management/pages/edit/modules/contentModule/PublishPanel.vue
index 2560b018..b78638c5 100644
--- a/web/src/management/pages/edit/modules/contentModule/PublishPanel.vue
+++ b/web/src/management/pages/edit/modules/contentModule/PublishPanel.vue
@@ -53,9 +53,7 @@ export default {
         if (publishRes.code === 200) {
           ElMessage.success('发布成功')
           this.$store.dispatch('edit/getSchemaFromRemote')
-          this.$router.push({
-            name: 'publishResultPage'
-          })
+          this.$router.push({ name: 'publish' })
         } else {
           ElMessage.error(`发布失败 ${publishRes.errmsg}`)
         }
diff --git a/web/src/management/pages/list/components/ToolBar.vue b/web/src/management/pages/list/components/ToolBar.vue
index 95f4f336..0247c38e 100644
--- a/web/src/management/pages/list/components/ToolBar.vue
+++ b/web/src/management/pages/list/components/ToolBar.vue
@@ -48,7 +48,7 @@ export default {
           return
         case 'release':
           this.$router.push({
-            name: 'publishResultPage',
+            name: 'publish',
             params: {
               id: this.data._id
             }
diff --git a/web/src/management/pages/publishResult/PublishResultPage.vue b/web/src/management/pages/publish/PublishPage.vue
similarity index 64%
rename from web/src/management/pages/publishResult/PublishResultPage.vue
rename to web/src/management/pages/publish/PublishPage.vue
index c7e48f5e..4cd31798 100644
--- a/web/src/management/pages/publishResult/PublishResultPage.vue
+++ b/web/src/management/pages/publish/PublishPage.vue
@@ -3,7 +3,7 @@
     <LeftMenu class="left" />
     <div class="right">
       <template v-if="curStatus !== 'new'">
-        <div class="preview-container" :style="{ backgroundImage: `url('${this.phoneBg}')` }">
+        <div class="preview-container" :style="{ backgroundImage: `url('${backgroundImage}')` }">
           <iframe :src="mainChannel.fullUrl"></iframe>
         </div>
         <div class="container-content">
@@ -20,13 +20,14 @@
           </div>
         </div>
       </template>
-      <EmptyIndex v-else :data="noDataConfig" />
+      <EmptyIndex v-else :data="defaultConfig" />
     </div>
   </div>
 </template>
-
-<script>
-import { mapState } from 'vuex'
+<script setup lang="ts">
+import { computed, onMounted } from 'vue'
+import { useStore } from 'vuex'
+import { useRoute, useRouter } from 'vue-router'
 import { get as _get } from 'lodash-es'
 
 import { ElMessage } from 'element-plus'
@@ -34,61 +35,43 @@ import 'element-plus/theme-chalk/src/message.scss'
 
 import EmptyIndex from '@/management/components/EmptyIndex.vue'
 import LeftMenu from '@/management/components/LeftMenu.vue'
-
 import ChannelRow from './components/ChannelRow.vue'
 
-export default {
-  name: 'PublishResultPage',
-  data() {
-    return {
-      noDataConfig: {
-        title: '问卷未发布',
-        desc: '点击发布后，问卷就可以对外投放了哦！',
-        img: '/imgs/icons/unpublished.webp'
-      },
-      phoneBg: '/imgs/phone-bg.webp'
-    }
-  },
-  async created() {
-    this.$store.commit('edit/setSurveyId', this.$route.params.id)
-    try {
-      await this.$store.dispatch('edit/init')
-    } catch (error) {
-      ElMessage.error(error.message)
-      // 自动跳转回列表页
-      setTimeout(() => {
-        this.$router.replace({
-          name: 'survey'
-        })
-      }, 1000)
-    }
-  },
-  computed: {
-    ...mapState({
-      metaData: (state) => _get(state, 'edit.schema.metaData')
-    }),
-    curStatus() {
-      return _get(this.metaData, 'curStatus.status', 'new')
-    },
-    mainChannel() {
-      if (!this.metaData) {
-        return {
-          fullUrl: ''
-        }
-      }
-      return {
-        fullUrl: `${location.origin}/render/${this.metaData.surveyPath}`
-      }
-    }
-  },
-  components: {
-    ChannelRow,
-    EmptyIndex,
-    LeftMenu
-  }
+const backgroundImage = '/imgs/phone-bg.webp'
+const defaultConfig = {
+  title: '问卷未发布',
+  desc: '点击发布后，问卷就可以对外投放了哦！',
+  img: '/imgs/icons/unpublished.webp'
 }
-</script>
 
+const store = useStore()
+const metaData = computed(() => _get(store.state, 'edit.schema.metaData'))
+const curStatus = computed(() => _get(metaData.value, 'curStatus.status', 'new'))
+const mainChannel = computed(() => {
+  let fullUrl = ''
+
+  if (metaData.value) {
+    fullUrl = `${location.origin}/render/${metaData.value.surveyPath}`
+  }
+
+  return { fullUrl }
+})
+
+const route = useRoute()
+const router = useRouter()
+onMounted(async () => {
+  store.commit('edit/setSurveyId', route.params.id)
+
+  try {
+    await store.dispatch('edit/init')
+  } catch (err: any) {
+    ElMessage.error(err.message)
+    setTimeout(() => {
+      router.replace({ name: 'survey' })
+    }, 1000)
+  }
+})
+</script>
 <style lang="scss" scoped>
 .publish-result-page {
   width: 100%;
diff --git a/web/src/management/pages/publishResult/components/ChannelRow.vue b/web/src/management/pages/publish/components/ChannelRow.vue
similarity index 67%
rename from web/src/management/pages/publishResult/components/ChannelRow.vue
rename to web/src/management/pages/publish/components/ChannelRow.vue
index 632e805a..1f500893 100644
--- a/web/src/management/pages/publishResult/components/ChannelRow.vue
+++ b/web/src/management/pages/publish/components/ChannelRow.vue
@@ -4,63 +4,66 @@
       <div class="left">
         <div class="crc-url-wrap" :class="{ 'no-name': !data.name }">
           <div style="margin-bottom: 16px">
-            <el-input class="cru-content" :model-value="getFullUrl(data)" :readonly="true" />
+            <el-input class="cru-content" :model-value="normalizationURL(data)" :readonly="true" />
           </div>
         </div>
       </div>
       <div class="operate-btn-group">
         <el-tooltip class="item" effect="dark" content="在新页面打开" placement="top">
-          <a class="cru-suffix j-open" @click="openPage(getFullUrl(data))">
+          <a class="cru-suffix j-open" @click="handleOpenPage(normalizationURL(data))">
             <i class="font23 iconfont icon-jinru"></i>
           </a>
         </el-tooltip>
         <el-tooltip class="item" effect="dark" content="复制链接" placement="top">
-          <a class="cru-suffix j-copy" :data-clipboard-text="getFullUrl(data)" @click="handleCopy">
+          <a
+            class="cru-suffix j-copy"
+            :data-clipboard-text="normalizationURL(data)"
+            @click="handleCopy"
+          >
             <i class="font23 iconfont icon-fuzhi"></i>
           </a>
         </el-tooltip>
-        <QRCode class="cru-suffix" :url="getFullUrl(data)" />
+        <QRCode class="cru-suffix" :url="normalizationURL(data)" />
       </div>
     </div>
   </div>
 </template>
 
-<script>
+<script setup lang="ts">
 import Clipboard from 'clipboard'
-
 import { ElMessage } from 'element-plus'
 import 'element-plus/theme-chalk/src/message.scss'
 
 import QRCode from './QRCode.vue'
 
-export default {
-  name: 'ChannelRow',
-  components: {
-    QRCode
-  },
-  props: ['data', 'styleWrap'],
-  methods: {
-    handleCopy() {
-      const clipboard = new Clipboard('.j-copy')
-      clipboard.on('success', (e) => {
-        ElMessage({
-          type: 'success',
-          message: `已复制渠道链接：${e.text}`
-        })
-      })
-    },
-    openPage(url) {
-      window.open(url)
-    },
-    getFullUrl(v) {
-      const url = v.fullUrl
-      const protocol = window.location.protocol
-      return `${protocol}//${url.split('//')[1]}`
-    }
-  }
+interface Props {
+  data: any
+  styleWrap: any
 }
-</script>
 
+defineProps<Props>()
+
+const handleCopy = () => {
+  const clipboard = new Clipboard('.j-copy')
+  clipboard.on('success', (e) => {
+    ElMessage({
+      type: 'success',
+      message: `已复制渠道链接：${e.text}`
+    })
+
+    clipboard.destroy()
+  })
+}
+
+const handleOpenPage = (url: string) => window.open(url)
+
+const normalizationURL = (value: any) => {
+  const url = value.fullUrl
+  const protocol = window.location.protocol
+
+  return `${protocol}//${url.split('//')[1]}`
+}
+</script>
 <style lang="scss" scoped>
 .channel-list-wrap div.normal-row-wrap {
   position: relative;
diff --git a/web/src/management/pages/publishResult/components/QRCode.vue b/web/src/management/pages/publish/components/QRCode.vue
similarity index 63%
rename from web/src/management/pages/publishResult/components/QRCode.vue
rename to web/src/management/pages/publish/components/QRCode.vue
index 849ccf5c..95ef2c4f 100644
--- a/web/src/management/pages/publishResult/components/QRCode.vue
+++ b/web/src/management/pages/publish/components/QRCode.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="qrcode" @mouseover="inQcode = true" @mouseout="inQcode = false">
+  <div class="qrcode">
     <div class="qcode-mask">
       <el-popover
         ref="popover"
@@ -18,42 +18,42 @@
   </div>
 </template>
 
-<script>
+<script setup lang="ts">
+import { ref, watch, computed, nextTick } from 'vue'
+
 import QRCode from 'qrcode'
 
-export default {
-  name: 'QRCode',
-  props: ['url'],
-  data() {
-    return {
-      inQcode: false,
-      qRCodeImg: ''
-    }
-  },
-  methods: {
-    initQRCodeImg() {
-      QRCode.toDataURL(this.url)
-        .then((url) => {
-          this.qRCodeImg = url
-        })
-        .catch((err) => {
-          console.error(err)
-        })
+interface Props {
+  url: string
+}
+
+const props = defineProps<Props>()
+
+const qRCodeImg = ref<string>('')
+const watchURL = computed<string>(() => props.url)
+
+const convertUrlToQRCode = async (url: string) => {
+  try {
+    const res = await QRCode.toDataURL(url)
+    qRCodeImg.value = res
+  } catch (err) {
+    console.log(err)
+  }
+}
+
+watch(
+  watchURL,
+  (value) => {
+    if ((!qRCodeImg.value && value) || watchURL.value !== value) {
+      nextTick(() => {
+        convertUrlToQRCode(value)
+      })
     }
   },
-  watch: {
-    url: {
-      immediate: true,
-      handler(newVal) {
-        if (newVal) {
-          this.$nextTick(() => {
-            this.initQRCodeImg()
-          })
-        }
-      }
-    }
+  {
+    immediate: true
   }
-}
+)
 </script>
 
 <style lang="scss" scoped>
diff --git a/web/src/management/router/index.ts b/web/src/management/router/index.ts
index 126b4aa7..919cb688 100644
--- a/web/src/management/router/index.ts
+++ b/web/src/management/router/index.ts
@@ -94,12 +94,12 @@ const routes: RouteRecordRaw[] = [
     component: () => import('../pages/analysis/AnalysisPage.vue')
   },
   {
-    path: '/survey/:id/publishResult',
-    name: 'publishResultPage',
+    path: '/survey/:id/publish',
+    name: 'publish',
     meta: {
       needLogin: true
     },
-    component: () => import('../pages/publishResult/PublishResultPage.vue')
+    component: () => import('../pages/publish/PublishPage.vue')
   },
   {
     path: '/create',

From 29011194c7307cf201085cc103ef5ffa317b70f3 Mon Sep 17 00:00:00 2001
From: codeniu <jingxiangniu@gmail.com>
Date: Mon, 27 May 2024 16:54:32 +0800
Subject: [PATCH 5/6] =?UTF-8?q?refactor:=20=E4=BD=BF=E7=94=A8vue3=E7=BB=84?=
 =?UTF-8?q?=E5=90=88=E5=BC=8FAPI=E9=87=8D=E6=9E=84=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E9=A1=B5=E4=BB=A3=E7=A0=81=20(#172)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/management/pages/login/LoginPage.vue | 221 ++++++++++---------
 1 file changed, 121 insertions(+), 100 deletions(-)

diff --git a/web/src/management/pages/login/LoginPage.vue b/web/src/management/pages/login/LoginPage.vue
index 377eca25..d502cf84 100644
--- a/web/src/management/pages/login/LoginPage.vue
+++ b/web/src/management/pages/login/LoginPage.vue
@@ -14,7 +14,7 @@
       <el-form
         :model="formData"
         :rules="rules"
-        ref="formData"
+        ref="formDataRef"
         label-width="100px"
         class="login-form"
         @submit.prevent
@@ -36,17 +36,17 @@
 
         <el-form-item class="button-group">
           <el-button
-            :loading="loginPending"
+            :loading="pending.login"
             size="small"
             type="primary"
             class="button"
-            @click="submitForm('formData', 'login')"
+            @click="submitForm('login')"
             >登录</el-button
           >
           <el-button
-            :loading="registerPending"
+            :loading="pending.register"
             class="button register-button"
-            @click="submitForm('formData', 'register')"
+            @click="submitForm('register')"
             >注册</el-button
           >
         </el-form-item>
@@ -55,113 +55,134 @@
   </div>
 </template>
 
-<script>
+<script setup lang="ts">
+import { onMounted, ref, reactive } from 'vue'
+import { useStore } from 'vuex'
+import { useRoute, useRouter } from 'vue-router'
+
 import { ElMessage } from 'element-plus'
 import 'element-plus/theme-chalk/src/message.scss'
 
 import { login, register } from '@/management/api/auth'
-import { refreshCaptcha } from '@/management/api/captcha'
+import { refreshCaptcha as refreshCaptchaApi } from '@/management/api/captcha'
 import { CODE_MAP } from '@/management/api/base'
-export default {
-  name: 'LoginPage',
-  data() {
-    return {
-      formData: {
-        name: '',
-        password: '',
-        captcha: '',
-        captchaId: ''
-      },
-      rules: {
-        name: [
-          { required: true, message: '请输入账号', trigger: 'blur' },
-          {
-            min: 3,
-            max: 10,
-            message: '长度在 3 到 10 个字符',
-            trigger: 'blur'
-          }
-        ],
-        password: [
-          { required: true, message: '请输入密码', trigger: 'blur' },
-          {
-            min: 8,
-            max: 16,
-            message: '长度在 8 到 16 个字符',
-            trigger: 'blur'
-          }
-        ],
-        captcha: [
-          {
-            required: true,
-            message: '请输入验证码',
-            trigger: 'blur'
-          }
-        ]
-      },
-      loginPending: false,
-      registerPending: false,
-      captchaImgData: ''
+
+const store = useStore()
+const route = useRoute()
+const router = useRouter()
+
+interface FormData {
+  name: string
+  password: string
+  captcha: string
+  captchaId: string
+}
+
+interface Pending {
+  login: boolean
+  register: boolean
+}
+
+const formData = reactive<FormData>({
+  name: '',
+  password: '',
+  captcha: '',
+  captchaId: ''
+})
+
+const rules = {
+  name: [
+    { required: true, message: '请输入账号', trigger: 'blur' },
+    {
+      min: 3,
+      max: 10,
+      message: '长度在 3 到 10 个字符',
+      trigger: 'blur'
     }
-  },
-  created() {
-    this.refreshCaptcha()
-  },
-  methods: {
-    submitForm(formName, type) {
-      this.$refs[formName].validate(async (valid) => {
-        if (valid) {
-          try {
-            const submitTypes = {
-              login,
-              register
-            }
-            this[`${type}Pending`] = true
-            const res = await submitTypes[type]({
-              username: this.formData.name,
-              password: this.formData.password,
-              captcha: this.formData.captcha,
-              captchaId: this.formData.captchaId
-            })
-            this[`${type}Pending`] = false
-            if (res.code !== CODE_MAP.SUCCESS) {
-              ElMessage.error(res.errmsg)
-              throw new Error('登录/注册失败' + res.errmsg)
-            }
-            this.$store.dispatch('user/login', {
-              username: res.data.username,
-              token: res.data.token
-            })
-            let redirect = {
-              name: 'survey'
-            }
-            if (this.$route.query.redirect) {
-              redirect = decodeURIComponent(this.$route.query.redirect)
-            }
-            this.$router.replace(redirect)
-          } catch (error) {
-            this[`${type}Pending`] = false
-          }
-          return true
-        } else {
-          return false
-        }
-      })
-    },
-    async refreshCaptcha() {
+  ],
+  password: [
+    { required: true, message: '请输入密码', trigger: 'blur' },
+    {
+      min: 8,
+      max: 16,
+      message: '长度在 8 到 16 个字符',
+      trigger: 'blur'
+    }
+  ],
+  captcha: [
+    {
+      required: true,
+      message: '请输入验证码',
+      trigger: 'blur'
+    }
+  ]
+}
+
+onMounted(() => {
+  refreshCaptcha()
+})
+
+const pending = reactive<Pending>({
+  login: false,
+  register: false
+})
+
+const captchaImgData = ref<string>('')
+const formDataRef = ref<any>(null)
+
+const submitForm = (type: 'login' | 'register') => {
+  formDataRef.value.validate(async (valid: boolean) => {
+    if (valid) {
       try {
-        const res = await refreshCaptcha({
-          captchaId: this.formData.captchaId
+        const submitTypes = {
+          login,
+          register
+        }
+        pending[type] = true
+        const res: any = await submitTypes[type]({
+          username: formData.name,
+          password: formData.password,
+          captcha: formData.captcha,
+          captchaId: formData.captchaId
         })
-        if (res.code === 200) {
-          const { id, img } = res.data
-          this.formData.captchaId = id
-          this.captchaImgData = img
+        pending[type] = false
+        if (res.code !== CODE_MAP.SUCCESS) {
+          ElMessage.error(res.errmsg)
+          throw new Error('登录/注册失败' + res.errmsg)
         }
+        store.dispatch('user/login', {
+          username: res.data.username,
+          token: res.data.token
+        })
+        let redirect: any = {
+          name: 'survey'
+        }
+        if (route.query.redirect) {
+          redirect = decodeURIComponent(route.query.redirect as string)
+        }
+        router.replace(redirect)
       } catch (error) {
-        ElMessage.error('获取验证码失败')
+        pending[type] = false
       }
+      return true
+    } else {
+      return false
+    }
+  })
+}
+
+const refreshCaptcha = async () => {
+  try {
+    const res: any = await refreshCaptchaApi({
+      captchaId: formData.captchaId
+    })
+    if (res.code === 200) {
+      const { id, img } = res.data
+      formData.captchaId = id
+      captchaImgData.value = img
     }
+  } catch (error) {
+    ElMessage.error('获取验证码失败')
   }
 }
 </script>

From 8c0563ca830e3f808794acda8ae1d8f532dae69c Mon Sep 17 00:00:00 2001
From: sudoooooo <zjbbabybaby@gmail.com>
Date: Mon, 27 May 2024 21:35:07 +0800
Subject: [PATCH 6/6] =?UTF-8?q?fix:=20C=E7=AB=AF=E8=83=8C=E6=99=AF?=
 =?UTF-8?q?=E5=92=8C=E9=A2=98=E5=9E=8B=E5=88=86=E5=89=B2=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/materials/questions/QuestionRuleContainer/style.scss | 4 ----
 web/src/render/App.vue                                       | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/web/src/materials/questions/QuestionRuleContainer/style.scss b/web/src/materials/questions/QuestionRuleContainer/style.scss
index e4b9ae84..fc676f84 100644
--- a/web/src/materials/questions/QuestionRuleContainer/style.scss
+++ b/web/src/materials/questions/QuestionRuleContainer/style.scss
@@ -97,10 +97,6 @@
     border-bottom: 0.12rem solid $spliter-color;
   }
 
-  &:last-child {
-    border-bottom: 0;
-  }
-
   .sort-tip {
     font-size: 0.26rem;
     line-height: 0.26rem;
diff --git a/web/src/render/App.vue b/web/src/render/App.vue
index fd39f51d..94ac846f 100644
--- a/web/src/render/App.vue
+++ b/web/src/render/App.vue
@@ -111,7 +111,7 @@ onMounted(async () => {
 @import url('./styles/reset.scss');
 
 html {
-  background: rgb(238, 238, 238);
+  background: #f7f7f7;
 }
 
 #app {