From 4d88a33856f43064f33cc2ca22a1af9793106bc9 Mon Sep 17 00:00:00 2001
From: Realabiha <48506355+Realabiha@users.noreply.github.com>
Date: Thu, 18 Jan 2024 17:17:06 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=97=AE=E5=8D=B7=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=B1=BB=E5=9E=8B=E5=92=8C=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=20(#51)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |  7 ++
 server/package.json                           |  2 -
 server/src/apps/surveyManage/index.ts         |  2 +-
 server/src/apps/user/index.ts                 |  7 +-
 .../src/apps/user/service/captchaService.ts   |  2 -
 server/src/apps/user/utils/index.ts           |  1 -
 server/src/index.ts                           |  1 -
 .../pages/list/components/baseList.vue        | 73 ++++++++++++++++---
 .../pages/list/components/textButton.vue      | 57 +++++++++++++++
 .../pages/list/components/textSelect.vue      | 59 +++++++++++++++
 web/src/management/pages/list/config/index.js | 63 ++++++++++++++++
 11 files changed, 254 insertions(+), 20 deletions(-)
 create mode 100644 web/src/management/pages/list/components/textButton.vue
 create mode 100644 web/src/management/pages/list/components/textSelect.vue

diff --git a/README.md b/README.md
index 88e5f979..680f45e1 100644
--- a/README.md
+++ b/README.md
@@ -183,3 +183,10 @@ npm run serve
 
 ## QQ
 [<img src="https://img-hxy021.didistatic.com/static/starimg/img/iJUmLIHKV21700192846057.png"  width="300" />](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=P61UJI_q8AzizyBLGOm-bUvzNrUnSQq-&authKey=yZFtL9biGB5yiIME3%2Bi%2Bf6XMOdTNiuf0pCIaviEEAIryySNzVy6LJ4xl7uHdEcrM&noverify=0&group_code=920623419)
+
+# Feature
+[官方Feature](https://github.com/didi/xiaoju-survey/issues/45)
+
+# CHANGELOG
+[MAJOR CHANGELOG](https://github.com/didi/xiaoju-survey/issues/48)
+
diff --git a/server/package.json b/server/package.json
index 50b166ee..d0b5c031 100644
--- a/server/package.json
+++ b/server/package.json
@@ -19,7 +19,6 @@
     "@types/koa-bodyparser": "^4.3.10",
     "@types/koa-router": "^7.4.4",
     "@types/koa-static": "^4.0.4",
-    "@types/node": "^20.10.8",
     "@typescript-eslint/eslint-plugin": "^6.15.0",
     "@typescript-eslint/parser": "^6.15.0",
     "cross-env": "^7.0.3",
@@ -33,7 +32,6 @@
   "dependencies": {
     "cheerio": "^1.0.0-rc.12",
     "crypto-js": "^4.2.0",
-    "dotenv": "^16.3.1",
     "glob": "^10.3.10",
     "joi": "^17.9.2",
     "jsonwebtoken": "^9.0.1",
diff --git a/server/src/apps/surveyManage/index.ts b/server/src/apps/surveyManage/index.ts
index 4ec3a54b..8fcd5fc2 100644
--- a/server/src/apps/surveyManage/index.ts
+++ b/server/src/apps/surveyManage/index.ts
@@ -141,7 +141,7 @@ export default class SurveyManage {
   }
 
   private getFilter(filterList: Array<FilterItem>) {
-    const allowFilterField = ['title', 'remark', 'surveyType', 'curStatus.status'];
+    const allowFilterField = ['title', 'remark', 'questionType', 'curStatus.status'];
     return filterList.reduce((preItem, curItem) => {
       const condition = curItem.condition.filter(item => allowFilterField.includes(item.field)).reduce((pre, cur) => {
         switch(cur.comparator) {
diff --git a/server/src/apps/user/index.ts b/server/src/apps/user/index.ts
index 3a67e597..0c133b85 100644
--- a/server/src/apps/user/index.ts
+++ b/server/src/apps/user/index.ts
@@ -1,15 +1,16 @@
-
 import { SurveyApp, SurveyServer } from '../../decorator';
+import { Request, Response } from 'koa';
 import * as Joi from 'joi';
 import { userService } from './service/userService';
 import { captchaService } from './service/captchaService';
 import { getValidateValue } from './utils/index';
+
 import { CommonError } from '../../types/index';
 
 @SurveyApp('/api/user')
 export default class User {
   @SurveyServer({ type: 'http', method: 'post', routerName: '/register' })
-  async register({ req }) {
+  async register({ req }: { req: Request, res: Response }) {
     const userInfo = getValidateValue(Joi.object({
       username: Joi.string().required(),
       password: Joi.string().required(),
@@ -33,7 +34,7 @@ export default class User {
   }
 
   @SurveyServer({ type: 'http', method: 'post', routerName: '/login' })
-  async login({ req }) {
+  async login({ req }: { req: Request, res: Response }) {
     const userInfo = getValidateValue(Joi.object({
       username: Joi.string().required(),
       password: Joi.string().required(),
diff --git a/server/src/apps/user/service/captchaService.ts b/server/src/apps/user/service/captchaService.ts
index e7db4e96..75599fc5 100644
--- a/server/src/apps/user/service/captchaService.ts
+++ b/server/src/apps/user/service/captchaService.ts
@@ -1,6 +1,5 @@
 import { mongo } from '../db/mongo';
 import { create } from 'svg-captcha';
-
 class CaptchaService {
 
   createCaptcha() {
@@ -39,4 +38,3 @@ class CaptchaService {
 }
 
 export const captchaService = new CaptchaService();
-
diff --git a/server/src/apps/user/utils/index.ts b/server/src/apps/user/utils/index.ts
index 4cf47b97..8233dbca 100644
--- a/server/src/apps/user/utils/index.ts
+++ b/server/src/apps/user/utils/index.ts
@@ -7,7 +7,6 @@ export function getStatusObject({ status }: { status: SURVEY_STATUS }) {
     date: Date.now(),
   };
 }
-
 export function getValidateValue<T = unknown>(validationResult: Joi.ValidationResult<T>): T {
   if (validationResult.error) {
     throw new CommonError(validationResult.error.details.map(e => e.message).join());
diff --git a/server/src/index.ts b/server/src/index.ts
index a3c505ca..0331d2cc 100644
--- a/server/src/index.ts
+++ b/server/src/index.ts
@@ -1,4 +1,3 @@
-import 'dotenv/config';
 import * as os from 'os';
 import * as Koa from 'koa';
 import * as KoaBodyparser from 'koa-bodyparser';
diff --git a/web/src/management/pages/list/components/baseList.vue b/web/src/management/pages/list/components/baseList.vue
index eec22256..0786a2cf 100644
--- a/web/src/management/pages/list/components/baseList.vue
+++ b/web/src/management/pages/list/components/baseList.vue
@@ -1,11 +1,20 @@
 <template>
   <div class="tableview-root">
     <div class="filter-wrap">
+      <div class="select">
+        <text-select
+           v-for="item in Object.keys(selectOptionsDict)"
+           :effect-fun="onSelectChange"
+           :effect-key="item"
+           :options="selectOptionsDict[item]"
+        />
+      </div>
       <div class="search">
         <text-search 
           placeholder="请输入问卷标题"
           :value="searchVal" 
-          @search="onSearchText" />
+          @search="onSearchText" 
+        />
       </div>
     </div>
     <el-table
@@ -92,7 +101,8 @@ import Tag from './tag';
 import State from './state';
 import ToolBar from './toolBar';
 import TextSearch from './textSearch'
-import { fieldConfig, thead, noListDataConfig, noSearchDataConfig } from '../config';
+import TextSelect from './textSelect'
+import { fieldConfig, thead, noListDataConfig, noSearchDataConfig, selectOptionsDict } from '../config';
 import { CODE_MAP } from '@/management/api/base';
 import { QOP_MAP } from '@/management/utils/constant';
 import { getSurveyList, deleteSurvey } from '@/management/api/survey';
@@ -112,7 +122,12 @@ export default {
       total: 0,
       data: [],
       currentPage: 1,
-      searchVal: ''
+      searchVal: '',
+      selectOptionsDict,
+      selectValueMap: {
+        questionType: '',
+        'curStatus.status': ''
+      }
     };
   },
   computed: {
@@ -126,11 +141,31 @@ export default {
       return [
         {
           comparator:"",
-          condition:[{
-            "field":"title",
-            "value":this.searchVal,
-            "comparator":"$regex"
-          }]
+          condition:[
+              {
+              field: "title",
+              value: this.searchVal,
+              comparator: "$regex"
+            }
+          ]
+        },
+        { 
+        comparator: "",
+          condition: [
+            {
+              field: "curStatus.status",
+              value: this.selectValueMap["curStatus.status"]
+            }
+          ]
+        }, 
+        { 
+        comparator: "",
+          condition: [
+            {
+              field: "questionType",
+              value: this.selectValueMap.questionType
+            }
+          ]
         }
       ]
     }
@@ -142,7 +177,9 @@ export default {
     async init() {
       this.loading = true;
       try {
-        const filter = JSON.stringify(this.filter)
+        const filter = JSON.stringify(this.filter.filter(item => {
+          return item.condition[0].field === 'title' || item.condition[0].value
+        }))
         const res = await getSurveyList(this.currentPage, filter);
         this.loading = false;
         if (res.code === CODE_MAP.SUCCESS) {
@@ -247,6 +284,11 @@ export default {
       this.searchVal = e
       this.currentPage = 1
       this.init()
+    },
+    onSelectChange(selectValue, selectKey){
+      this.selectValueMap[selectKey] = selectValue
+      this.currentPage = 1
+      this.init()
     }
   },
   components: {
@@ -255,6 +297,7 @@ export default {
     Tag,
     ToolBar,
     TextSearch,
+    TextSelect,
     State,
   },
 };
@@ -264,8 +307,12 @@ export default {
 .tableview-root {
   .filter-wrap{
     display: flex;
-    justify-content: right;
+    justify-content: space-between;
+    .select{
+      display: flex;
+    }
     .search{
+      display: flex;
       padding-bottom: 20px;
     }
   }
@@ -302,4 +349,10 @@ export default {
     }
   }
 }
+.el-select-dropdown__wrap{
+        background: #eee;
+      }
+   .el-select-dropdown__item.hover{
+        background: #fff;
+      }
 </style>
diff --git a/web/src/management/pages/list/components/textButton.vue b/web/src/management/pages/list/components/textButton.vue
new file mode 100644
index 00000000..f5123dc0
--- /dev/null
+++ b/web/src/management/pages/list/components/textButton.vue
@@ -0,0 +1,57 @@
+<template>
+    <div class="text-button-root" @click="onClick">
+        <el-button type="text" :icon="currentOption.icon" size="mini">
+            <slot>{{ currentOption.label }}</slot>
+        </el-button>
+    </div>
+</template>
+<script>
+export default{
+    name: 'TextButton',
+    data(){
+        return {
+            optionIndex: 0,
+            optionValue: ''
+        }
+    },
+    props: {
+        options: {
+            type: Array,
+            required: true
+        },
+        effectFun: {
+            type: Function
+        },
+        effectKey: {
+            type: String
+        }
+    },
+    computed: {
+        optionsLength(){
+            return this.options.length
+        },
+        currentOption(){
+            return this.options[this.optionIndex % this.optionsLength]
+        }
+    },
+    watch: {
+      currentOption(newOption){
+        typeof this.effectFun === 'function' && this.effectFun(newOption, this.effectKey)
+      }  
+    },
+    methods: {
+        onClick(){
+            if(this.optionIndex > this.optionsLength){
+                this.optionIndex = 0
+                return
+            }
+            this.optionIndex++
+        }
+    },
+}
+</script>
+<style lang="scss" scoped>
+    .el-button{
+        margin-right: 20px;
+    }
+</style>
\ No newline at end of file
diff --git a/web/src/management/pages/list/components/textSelect.vue b/web/src/management/pages/list/components/textSelect.vue
new file mode 100644
index 00000000..261d13cd
--- /dev/null
+++ b/web/src/management/pages/list/components/textSelect.vue
@@ -0,0 +1,59 @@
+<template>
+    <div class="text-select-root">
+        <el-select v-model="selectValue" :placeholder="options.label">
+        <el-option
+          v-for="item in options.value"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+        </el-option>
+      </el-select>
+    </div>
+</template>
+
+<script>
+    export default {
+        name: 'TextSelect',
+        data(){
+            return {
+                selectValue: this.options.default
+            }
+        },
+        props: {
+            options: {
+                type: Object,
+                required: true
+            },
+            effectFun:{
+                type: Function
+            },
+            effectKey: {
+                type: String
+            }
+        },
+        watch: {
+            selectValue(newSelect){
+                const {effectFun} = this
+                typeof effectFun === 'function' && effectFun(newSelect, this.effectKey)
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    .el-select{
+      width: 105px;
+      line-height: 35px;
+      margin-right: 20px;
+      ::v-deep .el-input__inner{
+          border: none;
+          height: 35px;
+        //   line-height: 35px;
+        }
+        ::v-deep .el-icon-arrow-up:before{
+            position: relative;
+            top: -2px;
+        }
+   
+    }
+</style>
\ No newline at end of file
diff --git a/web/src/management/pages/list/config/index.js b/web/src/management/pages/list/config/index.js
index 3fc501ae..24811b9b 100644
--- a/web/src/management/pages/list/config/index.js
+++ b/web/src/management/pages/list/config/index.js
@@ -72,3 +72,66 @@ export const statusMaps = {
   removed: '',
   pausing: '',
 };
+
+// 问卷类型
+export const questionTypeSelect = {
+  label: '问卷类型',
+  value: [
+    {
+      value: '',
+      label: '全部类型'
+    }, 
+    {
+      value: 'normal',
+      label: '基础调查'
+    }, 
+    // {
+    //   value: 'exam',
+    //   label: '在线考试'
+    // }, 
+    // {
+    //   value: 'nps',
+    //   label: 'NPS评分'
+    // }, 
+    {
+      value: 'vote',
+      label: '投票评选'
+    },
+    {
+      value: 'register',
+      label: '在线报名'
+    },
+  ],
+  default: ''
+}
+
+// 问卷状态
+export const curStatusSelect = {
+  label: '问卷状态',
+  value: [
+    {
+      value: '',
+      label: '全部状态'
+    },
+    {
+      value: 'new',
+      label: '未发布'
+    }, 
+    {
+      value: 'published',
+      label: '已发布'
+    }, 
+    {
+      value: 'editing',
+      label: '修改中'
+    }
+  ],
+  default: ''
+}
+
+export const selectOptionsDict = Object.freeze({
+  questionType: questionTypeSelect,
+  'curStatus.status': curStatusSelect
+})
+
+