vue2server7 1.0.1 → 2.1.0

package/frontEnd/package.json

@@ -1,43 +1,25 @@
 {
-  "name": "vue2-app",
-  "version": "0.1.0",
+  "name": "vue3-app",
+  "version": "1.0.0",
   "private": true,
   "scripts": {
-    "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build",
-    "lint": "vue-cli-service lint"
+    "dev": "vite",
+    "build": "vite build",
+    "preview": "vite preview"
   },
   "dependencies": {
+    "@element-plus/icons-vue": "^2.3.1",
     "axios": "^1.13.2",
-    "core-js": "^3.6.5",
     "echarts": "^5.5.1",
-    "element-ui": "^2.15.14",
+    "element-plus": "^2.8.4",
     "sortablejs": "^1.15.6",
-    "vue": "^2.6.11",
-    "vue-router": "^3.6.5"
+    "vue": "^3.5.13",
+    "vue-router": "^4.4.5"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "~4.5.0",
-    "@vue/cli-plugin-eslint": "~4.5.0",
-    "@vue/cli-service": "~4.5.0",
-    "babel-eslint": "^10.1.0",
-    "eslint": "^6.7.2",
-    "eslint-plugin-vue": "^6.2.2",
-    "vue-template-compiler": "^2.6.11"
-  },
-  "eslintConfig": {
-    "root": true,
-    "env": {
-      "node": true
-    },
-    "extends": [
-      "plugin:vue/essential",
-      "eslint:recommended"
-    ],
-    "parserOptions": {
-      "parser": "babel-eslint"
-    },
-    "rules": {}
+    "@vitejs/plugin-vue": "^6.0.0",
+    "vite": "^6.0.0",
+    "vite-plugin-vue-devtools": "^8.0.6"
   },
   "browserslist": [
     "> 1%",

package/frontEnd/src/App.vue

@@ -8,7 +8,10 @@
             type="text"
             @click="isMenuCollapsed = !isMenuCollapsed"
           >
-            <i :class="isMenuCollapsed ? 'el-icon-s-unfold' : 'el-icon-s-fold'"></i>
+            <el-icon>
+              <Expand v-if="isMenuCollapsed" />
+              <Fold v-else />
+            </el-icon>
           </el-button>
         </div>
         <AppMenu :collapse="isMenuCollapsed" />
@@ -22,6 +25,7 @@
 
 <script>
 import AppMenu from './components/AppMenu.vue'
+import { Expand, Fold } from '@element-plus/icons-vue'
 
 export default {
   name: 'App',
@@ -33,7 +37,9 @@ export default {
     }
   },
   components: {
-    AppMenu
+    AppMenu,
+    Expand,
+    Fold
   }
 }
 </script>

package/frontEnd/src/components/AppMenu.vue

@@ -12,8 +12,7 @@
         :key="item.path + '-submenu'"
         :index="item.path"
       >
-        <template slot="title">
-          <i :class="getIcon(item)"></i>
+        <template #title>
           <span class="menu-title-text">{{ getTitle(item) }}</span>
         </template>
         <el-menu-item
@@ -21,7 +20,6 @@
           :key="child.path"
           :index="child.path"
         >
-          <i :class="getIcon(child)"></i>
           <span class="menu-title-text">{{ getTitle(child) }}</span>
         </el-menu-item>
       </el-submenu>
@@ -31,7 +29,6 @@
         :key="item.path + '-item'"
         :index="item.path"
       >
-        <i :class="getIcon(item)"></i>
         <span class="menu-title-text">{{ getTitle(item) }}</span>
       </el-menu-item>
     </template>
@@ -61,9 +58,6 @@ export default {
     getTitle(route) {
       return (route && route.meta && route.meta.title) || route.name || route.path
     },
-    getIcon(route) {
-      return (route && route.meta && route.meta.icon) || 'el-icon-menu'
-    },
     getChildren(route) {
       if (!route || !Array.isArray(route.children)) return []
       return route.children.filter(r => this.isMenuVisible(r))

package/frontEnd/src/components/ColumnSettings.vue

@@ -0,0 +1,46 @@
+<template>
+  <div class="column-settings">
+    <el-checkbox-group v-model="selected">
+      <el-checkbox v-for="col in columns" :key="col.key" :label="col.key">
+        {{ col.label }}
+      </el-checkbox>
+    </el-checkbox-group>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ColumnSettings',
+  props: {
+    columns: {
+      type: Array,
+      default: () => []
+    },
+    modelValue: {
+      type: Array,
+      default: () => []
+    }
+  },
+  emits: ['update:modelValue'],
+  data() {
+    return {
+      selected: [...this.modelValue]
+    }
+  },
+  watch: {
+    modelValue(val) {
+      this.selected = [...val]
+    },
+    selected(val) {
+      this.$emit('update:modelValue', val)
+    }
+  }
+}
+</script>
+
+<style scoped>
+.column-settings .el-checkbox {
+  display: block;
+  margin: 6px 0;
+}
+</style>

package/frontEnd/src/components/NameScroller.vue

@@ -124,7 +124,7 @@ export default {
   mounted() {
     if (this.autoStart) this.start()
   },
-  beforeDestroy() {
+  beforeUnmount() {
     this.stopAuto()
     window.removeEventListener('resize', this.onResize)
   },

package/frontEnd/src/main.js

@@ -1,14 +1,11 @@
-import Vue from 'vue'
+import { createApp } from 'vue'
 import App from './App.vue'
-
-import ElementUI from 'element-ui'
-import 'element-ui/lib/theme-chalk/index.css'
 import router from './router'
 
-Vue.config.productionTip = false
-Vue.use(ElementUI)
+import ElementPlus from 'element-plus'
+import 'element-plus/dist/index.css'
 
-new Vue({
-  router,
-  render: h => h(App)
-}).$mount('#app')
+const app = createApp(App)
+app.use(router)
+app.use(ElementPlus)
+app.mount('#app')

package/frontEnd/src/pages/CascaderPage.vue

@@ -0,0 +1,33 @@
+<template>
+  <el-cascader
+    ref="cascader"
+    v-model="value"
+    :options="options"
+    :props="{ checkStrictly: true,emitPath: true }"
+    @change="handleChange"
+  />
+</template>
+
+<script setup>
+import { ref } from 'vue'
+
+const value = ref('')
+const cascader = ref()
+
+const options = [
+  {
+    value: 'zhejiang',
+    label: '浙江',
+    children: [
+      { value: 'hangzhou', label: '杭州' }
+    ]
+  }
+]
+
+const handleChange = () => {
+  const nodes = cascader.value?.getCheckedNodes?.() || []
+  const node = nodes[nodes.length - 1]
+  const label = node?.label ?? node?.text ?? node?.data?.label
+  console.log('label:', label)
+}
+</script>

package/frontEnd/src/pages/TablePage.vue

@@ -0,0 +1,231 @@
+<template>
+  <section class="page table-page">
+    <h1 class="title">表格页面</h1>
+    <div class="toolbar">
+      <el-input v-model="keyword" placeholder="按主题搜索" clearable style="width: 240px" />
+      <el-select v-model="type" placeholder="类型" clearable style="width: 160px; margin-left: 8px">
+        <el-option label="培训" value="TRAINING" />
+        <el-option label="晨夕会" value="MORNING" />
+      </el-select>
+      <el-button type="primary" @click="onSearch" style="margin-left: 8px">查询</el-button>
+      <el-button @click="onReset" style="margin-left: 8px">重置</el-button>
+      <el-popover placement="bottom" trigger="click" width="260">
+        <template #reference>
+          <el-button style="margin-left: 8px">列设置</el-button>
+        </template>
+        <ColumnSettings v-model="visibleKeys" :columns="columns" />
+      </el-popover>
+    </div>
+
+    <el-table
+      :key="tableKey"
+      :data="rows"
+      border
+      stripe
+      size="small"
+      style="width: 100%"
+      :default-sort="{ prop: 'createTm', order: 'descending' }"
+      @sort-change="onSortChange"
+    >
+      <el-table-column type="index" label="序号" width="60" align="center" />
+      <el-table-column
+        v-for="col in columns.filter(c => visibleKeys.includes(c.key))"
+        :key="col.key"
+        :prop="col.prop"
+        :label="col.label"
+        :width="col.width"
+        :min-width="col.minWidth"
+        :align="col.align || 'left'"
+        :header-align="col.headerAlign || col.align || 'left'"
+        :sortable="col.sortable || false"
+        :fixed="col.fixed || false"
+      >
+        <template #default="{ row }">
+          <template v-if="col.type === 'type'">
+            <el-tag :type="getTypeTag(row.meetTypeCd)" size="small">{{ formatType(row.meetTypeCd) }}</el-tag>
+          </template>
+          <template v-else-if="col.type === 'date'">
+            {{ formatDate(row[col.prop]) }}
+          </template>
+          <template v-else-if="col.type === 'datetime'">
+            {{ formatDateTime(row[col.prop]) }}
+          </template>
+          <template v-else-if="col.type === 'action'">
+            <el-button type="text" size="small" @click="onView(row)">详情</el-button>
+            <el-button type="text" size="small" @click="onDelete(row)">删除</el-button>
+          </template>
+          <template v-else>
+            {{ row[col.prop] }}
+          </template>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <div class="pagination">
+      <el-pagination layout="total, prev, pager, next" :current-page="page" :page-size="pageSize" :total="total" @current-change="onPageChange" />
+    </div>
+	  
+	  
+  </section>
+</template>
+
+<script>
+import { get } from '../utils/request'
+import ColumnSettings from '../components/ColumnSettings.vue'
+
+export default {
+  name: 'TablePage',
+  data() {
+    return {
+      columns: [
+        { key: 'organizationName', prop: 'organizationName', label: '所属机构', minWidth: 160 },
+        { key: 'meetSubj', prop: 'meetSubj', label: '会议主题', minWidth: 240 },
+        { key: 'meetNo', prop: 'meetNo', label: '会议编号', minWidth: 180 },
+        { key: 'displayName', prop: 'displayName', label: '创建人', width: 120 },
+        { key: 'meetTypeCd', prop: 'meetTypeCd', label: '类型', width: 120, align: 'center', type: 'type' },
+        { key: 'createTm', prop: 'createTm', label: '创建日期', width: 160, align: 'center', type: 'date', sortable: 'custom' },
+        { key: 'updateTm', prop: 'updateTm', label: '最近编辑时间', width: 190, align: 'center', type: 'datetime', sortable: 'custom' },
+        { key: 'action', prop: '', label: '操作', width: 140, align: 'center', fixed: 'right', type: 'action' }
+      ],
+      visibleKeys: [],
+      rows: [],
+      total: 0,
+      page: 1,
+      pageSize: 10,
+      sortField: 'createTm',
+      sortOrder: 'descending',
+      keyword: '',
+      type: '',
+      tableKey: 0
+    }
+  },
+  components: {
+    ColumnSettings
+  },
+  created() {
+    this.visibleKeys = this.columns.map(c => c.key)
+    this.fetch()
+  },
+  methods: {
+    async fetch() {
+      const params = {
+        page: this.page,
+        pageSize: this.pageSize,
+        sortField: this.sortField,
+        sortOrder: this.sortOrder
+      }
+      if (this.keyword) params.meetSubj = this.keyword
+      if (this.type) params.meetTypeCd = this.type
+      const res = await get('/meeting/list', params)
+      this.rows = Array.isArray(res.list) ? res.list : []
+      this.total = Number.isFinite(res.total) ? res.total : this.rows.length
+    },
+    onSearch() {
+      this.page = 1
+      this.fetch()
+    },
+    onReset() {
+      this.keyword = ''
+      this.type = ''
+      this.page = 1
+      this.fetch()
+    },
+    onPageChange(p) {
+      this.page = p
+      this.fetch()
+    },
+    onSortChange({ prop, order }) {
+      this.sortField = prop || ''
+      this.sortOrder = order || ''
+      this.page = 1
+      this.fetch()
+    },
+    // 通过改变 key 强制表格重渲染，确保动态列显示/隐藏立即生效
+    bumpTableKey() {
+      this.tableKey += 1
+    },
+    onView(row) {
+      const lines = [
+        `会议主题：${row.meetSubj || ''}`,
+        `内容：${row.plainContent || ''}`,
+        `所属机构：${row.organizationName || ''}`,
+        `会议类型：${this.formatType(row.meetTypeCd)}`,
+        `创建人：${row.displayName || ''}`,
+        `创建日期：${this.formatDate(row.createTm)}`,
+        `最近编辑时间：${this.formatDateTime(row.updateTm)}`
+      ]
+      this.$alert(lines.join('\n'), '会议详情', { confirmButtonText: '确定' })
+    },
+    onDelete(row) {
+      this.$confirm(`确定删除会议「${row.meetSubj || ''}」吗？`, '提示', {
+        type: 'warning',
+        confirmButtonText: '确定',
+        cancelButtonText: '取消'
+      })
+        .then(() => {
+          this.rows = this.rows.filter(item => item.id !== row.id)
+          this.$message({ type: 'success', message: '删除成功' })
+        })
+        .catch(() => {})
+    },
+    formatType(code) {
+      if (code === 'TRAINING') return '培训'
+      if (code === 'MORNING') return '晨夕会'
+      return code || ''
+    },
+    getTypeTag(code) {
+      if (code === 'TRAINING') return 'primary'
+      if (code === 'MORNING') return 'warning'
+      return 'info'
+    },
+    formatDate(value) {
+      if (!value) return ''
+      if (value.length === 10) return value
+      const d = new Date(value)
+      if (Number.isNaN(d.getTime())) return ''
+      const yyyy = d.getFullYear()
+      const mm = String(d.getMonth() + 1).padStart(2, '0')
+      const dd = String(d.getDate()).padStart(2, '0')
+      return `${yyyy}-${mm}-${dd}`
+    },
+    formatDateTime(value) {
+      if (!value) return ''
+      if (value.length >= 16 && value.includes(' ')) return value
+      const d = new Date(value)
+      if (Number.isNaN(d.getTime())) return ''
+      const yyyy = d.getFullYear()
+      const mm = String(d.getMonth() + 1).padStart(2, '0')
+      const dd = String(d.getDate()).padStart(2, '0')
+      const hh = String(d.getHours()).padStart(2, '0')
+      const mi = String(d.getMinutes()).padStart(2, '0')
+      const ss = String(d.getSeconds()).padStart(2, '0')
+      return `${yyyy}-${mm}-${dd} ${hh}:${mi}:${ss}`
+    }
+  }
+  ,
+  watch: {
+    visibleKeys() {
+      this.bumpTableKey()
+    }
+  }
+}
+</script>
+
+<style scoped>
+.page.table-page {
+  padding: 16px;
+}
+.title {
+  font-size: 18px;
+  margin-bottom: 12px;
+}
+.toolbar {
+  margin-bottom: 12px;
+  display: flex;
+  align-items: center;
+}
+.pagination {
+  margin-top: 12px;
+  text-align: right;
+}
+</style>

package/frontEnd/src/router/index.js

@@ -1,12 +1,9 @@
-import Vue from 'vue'
-import Router from 'vue-router'
-
+import { createRouter, createWebHashHistory } from 'vue-router'
 import { routes } from './routes'
 
-Vue.use(Router)
-
-export default new Router({
-  mode: 'hash',
+const router = createRouter({
+  history: createWebHashHistory(),
   routes
 })
 
+export default router

package/frontEnd/src/router/routes.js

@@ -1,63 +1,26 @@
-// 前端路由配置
-// 说明：
-// - 本文件只负责声明路由与菜单元信息，不做权限控制
-// - AppMenu 会根据 meta.showInMenu 渲染左侧菜单
-// - icon 使用 Element UI 内置图标类名
-import LineChartPage from '../pages/LineChartPage.vue'
-import MedalSetting from '../pages/MedalSetting.vue'
-import MeetingListPage from '../pages/MeetingListPage.vue'
-import NameScrollPage from '../pages/NameScrollPage.vue'
+import TablePage from '../pages/TablePage.vue'
+import CascaderPage from '../pages/CascaderPage.vue'
 
-// routes 将在 router/index 中被 VueRouter 使用
 export const routes = [
-  // 默认路由：根路径重定向到折线图页面
   {
     path: '/',
-    redirect: '/line-chart'
+    redirect: '/table'
   },
-  // 折线图页面示例
   {
-    path: '/line-chart',
-    name: 'LineChart',
-    component: LineChartPage,
+    path: '/table',
+    name: 'Table',
+    component: TablePage,
     meta: {
-      // 菜单标题
-      title: '折线图',
-      // 左侧菜单图标
-      icon: 'el-icon-data-line',
-      // 是否在菜单中展示
+      title: '表格页面',
       showInMenu: true
     }
   },
-  // 勋章设置页面
   {
-    path: '/medal-setting',
-    name: 'MedalSetting',
-    component: MedalSetting,
+    path: '/cascader',
+    name: 'Cascader',
+    component: CascaderPage,
     meta: {
-      title: '勋章设置',
-      icon: 'el-icon-medal',
-      showInMenu: true
-    }
-  },
-  // 会议列表页面
-  {
-    path: '/meeting-list',
-    name: 'MeetingList',
-    component: MeetingListPage,
-    meta: {
-      title: '会议列表',
-      icon: 'el-icon-date',
-      showInMenu: true
-    }
-  },
-  {
-    path: '/name-scroll',
-    name: 'NameScroll',
-    component: NameScrollPage,
-    meta: {
-      title: '名字滚动',
-      icon: 'el-icon-user',
+      title: '级联选择',
       showInMenu: true
     }
   }

package/frontEnd/src/utils/request.js

@@ -1,7 +1,7 @@
 import axios from 'axios'
 
 const service = axios.create({
-  baseURL: process.env.VUE_APP_API_BASE || 'http://localhost:3000/api',
+  baseURL: import.meta.env.VITE_API_BASE || '/api',
   timeout: 15000
 })
 

package/frontEnd/vite.config.js

@@ -0,0 +1,25 @@
+import { defineConfig } from 'vite'
+import vue from '@vitejs/plugin-vue'
+import vueDevTools from 'vite-plugin-vue-devtools'
+
+export default defineConfig({
+  plugins: [
+    vue(),
+    vueDevTools()
+  ],
+  server: {
+    port: 5173,
+    open: false,
+    proxy: {
+      '/api': {
+        target: 'http://localhost:3000',
+        changeOrigin: true,
+        rewrite: (path) => path.replace(/^\/api/, '/api')
+      }
+    }
+  },
+  build: {
+    outDir: 'dist',
+    sourcemap: false
+  }
+})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2server7",
-  "version": "1.0.1",
+  "version": "2.1.0",
   "description": "",
   "scripts": {
     "dev": "nodemon --watch src --ext ts --exec \"ts-node src/app.ts\"",
@@ -9,8 +9,9 @@
     "typecheck": "tsc --noEmit",
     "lint": "eslint .",
     "test": "npm run build && node --test",
-    "front-dev": "cd frontEnd && npm run serve",
+    "front-dev": "cd frontEnd && npm run dev",
     "front-build": "cd frontEnd && npm run build",
+    "front-preview": "cd frontEnd && npm run preview",
     "copy-frontend": "rm -rf dist/public && mkdir -p dist/public && cp -R frontEnd/dist/* dist/public/",
     "build:all": "npm run build && npm run front-build && npm run copy-frontend",
     "发布": "npm publish",

package/test/1.js

@@ -0,0 +1,24 @@
+const fs = require("fs");
+
+// 读取 text 文件
+const content = fs.readFileSync("input.txt", "utf8");
+
+// 正则：匹配 注解 + 字段
+const regex =
+    /@ApiModelProperty\s*\(\s*value\s*=\s*"([^"]+)"\s*\)\s*[\r\n]+\s*private\s+\w+\s+(\w+)\s*;/g;
+
+let match;
+const result = [];
+
+while ((match = regex.exec(content)) !== null) {
+    const label = match[1];  // 中文
+    const field = match[2];  // 字段名
+
+    result.push({
+        field,
+        label
+    });
+}
+
+// 输出 JSON
+console.log(JSON.stringify(result, null, 2));

package/frontEnd/public/index.html

@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html lang="">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title><%= htmlWebpackPlugin.options.title %></title>
-  </head>
-  <body>
-    <noscript>
-      <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
-    </noscript>
-    <div id="app"></div>
-    <!-- built files will be auto injected -->
-  </body>
-</html>