feat: 修改traceid生成规则，修改readme、图片和windows兼容

.gitignore

@@ -2,6 +2,7 @@
 node_modules
 dist
 
+package-lock.json
 
 # local env files
 .env.local

Dockerfile

@@ -1,16 +1,5 @@
 # 镜像集成
-FROM ubuntu:latest
+FROM node:16
-
-# 安装依赖
-RUN apt-get -y update
-RUN apt-get -y install wget gcc
-
-# 安装node环境
-ENV NODE_VERSION v18.17.1
-RUN mkdir -p /node/$NODE_VERSION
-RUN wget https://nodejs.org/dist/$NODE_VERSION/node-$NODE_VERSION-linux-x64.tar.gz
-RUN tar xzf node-$NODE_VERSION-linux-x64.tar.gz -C /node/
-ENV PATH  /node/node-$NODE_VERSION-linux-x64/bin:$PATH
 
 # 设置工作区间
 WORKDIR /xiaoju-survey

server/.env

@@ -1,8 +1,9 @@
 XIAOJU_SURVEY_MONGO_DB_NAME=xiaojuSurvey
 XIAOJU_SURVEY_MONGO_URL=mongodb://localhost:27017
-XIAOJU_SURVEY_RESPONSE_AES_ENCRYPT_SECRET_KEY=dataAesEncryptSecretKey
 XIAOJU_SURVEY_MONGO_AUTH_SOURCE=
 
+
+XIAOJU_SURVEY_RESPONSE_AES_ENCRYPT_SECRET_KEY=dataAesEncryptSecretKey
 XIAOJU_SURVEY_HTTP_DATA_ENCRYPT_TYPE=rsa
 
 XIAOJU_SURVEY_JWT_SECRET=xiaojuSurveyJwtSecret

server/README.md

@@ -1,73 +0,0 @@
-<p align="center">
-  <a href="http://nestjs.com/" target="blank"><img src="https://nestjs.com/img/logo-small.svg" width="200" alt="Nest Logo" /></a>
-</p>
-
-[circleci-image]: https://img.shields.io/circleci/build/github/nestjs/nest/master?token=abc123def456
-[circleci-url]: https://circleci.com/gh/nestjs/nest
-
-  <p align="center">A progressive <a href="http://nodejs.org" target="_blank">Node.js</a> framework for building efficient and scalable server-side applications.</p>
-    <p align="center">
-<a href="https://www.npmjs.com/~nestjscore" target="_blank"><img src="https://img.shields.io/npm/v/@nestjs/core.svg" alt="NPM Version" /></a>
-<a href="https://www.npmjs.com/~nestjscore" target="_blank"><img src="https://img.shields.io/npm/l/@nestjs/core.svg" alt="Package License" /></a>
-<a href="https://www.npmjs.com/~nestjscore" target="_blank"><img src="https://img.shields.io/npm/dm/@nestjs/common.svg" alt="NPM Downloads" /></a>
-<a href="https://circleci.com/gh/nestjs/nest" target="_blank"><img src="https://img.shields.io/circleci/build/github/nestjs/nest/master" alt="CircleCI" /></a>
-<a href="https://coveralls.io/github/nestjs/nest?branch=master" target="_blank"><img src="https://coveralls.io/repos/github/nestjs/nest/badge.svg?branch=master#9" alt="Coverage" /></a>
-<a href="https://discord.gg/G7Qnnhy" target="_blank"><img src="https://img.shields.io/badge/discord-online-brightgreen.svg" alt="Discord"/></a>
-<a href="https://opencollective.com/nest#backer" target="_blank"><img src="https://opencollective.com/nest/backers/badge.svg" alt="Backers on Open Collective" /></a>
-<a href="https://opencollective.com/nest#sponsor" target="_blank"><img src="https://opencollective.com/nest/sponsors/badge.svg" alt="Sponsors on Open Collective" /></a>
-  <a href="https://paypal.me/kamilmysliwiec" target="_blank"><img src="https://img.shields.io/badge/Donate-PayPal-ff3f59.svg"/></a>
-    <a href="https://opencollective.com/nest#sponsor"  target="_blank"><img src="https://img.shields.io/badge/Support%20us-Open%20Collective-41B883.svg" alt="Support us"></a>
-  <a href="https://twitter.com/nestframework" target="_blank"><img src="https://img.shields.io/twitter/follow/nestframework.svg?style=social&label=Follow"></a>
-</p>
-  <!--[![Backers on Open Collective](https://opencollective.com/nest/backers/badge.svg)](https://opencollective.com/nest#backer)
-  [![Sponsors on Open Collective](https://opencollective.com/nest/sponsors/badge.svg)](https://opencollective.com/nest#sponsor)-->
-
-## Description
-
-[Nest](https://github.com/nestjs/nest) framework TypeScript starter repository.
-
-## Installation
-
-```bash
-$ npm install
-```
-
-## Running the app
-
-```bash
-# development
-$ npm run start
-
-# watch mode
-$ npm run start:dev
-
-# production mode
-$ npm run start:prod
-```
-
-## Test
-
-```bash
-# unit tests
-$ npm run test
-
-# e2e tests
-$ npm run test:e2e
-
-# test coverage
-$ npm run test:cov
-```
-
-## Support
-
-Nest is an MIT-licensed open source project. It can grow thanks to the sponsors and support by the amazing backers. If you'd like to join them, please [read more here](https://docs.nestjs.com/support).
-
-## Stay in touch
-
-- Author - [Kamil Myśliwiec](https://kamilmysliwiec.com)
-- Website - [https://nestjs.com](https://nestjs.com/)
-- Twitter - [@nestframework](https://twitter.com/nestframework)
-
-## License
-
-Nest is [MIT licensed](LICENSE).

server/package.json

@@ -1,15 +1,14 @@
 {
-  "name": "server-new",
+  "name": "server",
   "version": "0.0.1",
   "description": "",
   "author": "",
-  "private": true,
-  "license": "UNLICENSED",
   "scripts": {
     "build": "nest build",
     "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
     "local": "ts-node ./scripts/run-local.ts",
     "start": "nest start",
+    "dev": "npm run start:dev",
     "start:dev": "NODE_ENV=development nest start --watch",
     "start:debug": "NODE_ENV=development nest start --debug --watch",
     "start:prod": "NODE_ENV=production node dist/main",

server/public/commom.css

@@ -1,4 +1,4 @@
-#main{
+#main {
     width: 100wh;
     height: 100vh;
     display: flex;
@@ -6,7 +6,8 @@
     justify-content: center;
     align-items: center;
 }
-.title{
+
+.title {
     font-size: 20px;
     color: #4A4C5B;
 }

server/src/app.module.ts

@@ -2,8 +2,8 @@ import { MiddlewareConsumer, Module } from '@nestjs/common';
 
 import { AppController } from './app.controller';
 
-import { ResponseSecurityPlugin } from './plugins/responseSecurityPlugin';
+import { ResponseSecurityPlugin } from './securityPlugin/responseSecurityPlugin';
-import { SurveyUtilPlugin } from './plugins/surveyUtilPlugin';
+import { SurveyUtilPlugin } from './securityPlugin/surveyUtilPlugin';
 
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { ConfigModule, ConfigService } from '@nestjs/config';
@@ -29,9 +29,9 @@ import { ClientEncrypt } from './models/clientEncrypt.entity';
 import { Word } from './models/word.entity';
 
 import { LoggerProvider } from './logger/logger.provider';
-import { PluginManagerProvider } from './plugins/pluginManager.provider';
+import { PluginManagerProvider } from './securityPlugin/pluginManager.provider';
 import { LogRequestMiddleware } from './middlewares/logRequest.middleware';
-import { XiaojuSurveyPluginManager } from './plugins/pluginManager';
+import { XiaojuSurveyPluginManager } from './securityPlugin/pluginManager';
 import { Logger } from './logger';
 
 @Module({

server/src/guards/authtication.ts

@@ -16,7 +16,7 @@ export class Authtication implements CanActivate {
     const token = request.headers.authorization?.split(' ')[1];
 
     if (!token) {
-      throw new AuthtificationException('未登录');
+      throw new AuthtificationException('请登录');
     }
 
     let decoded;

server/src/logger/util.ts

@@ -1,15 +1,27 @@
-import { customAlphabet } from 'nanoid';
+let count = 999;
-const traceIdAlphabet = 'abcdef0123456789';
-
-let count = 0;
 
 const getCountStr = () => {
   count++;
-  return count.toString().padStart(8, '0');
+  if (count > 9000) {
+    count = 1000;
+  }
+  return count.toString();
 };
 
-const getRandom = customAlphabet(traceIdAlphabet, 10);
+export const genTraceId = ({ ip }) => {
+  // ip转16位 + 当前时间戳（毫秒级）+自增序列（1000开始自增到9000）+ 当前进程id的后5位
+  ip = ip.replace('::ffff:', '');
+  let ipArr;
+  if (ip.indexOf(':') > 0) {
+    ipArr = ip.split(':').map((segment) => {
+      // 将IPv6每个段转为16位，并补0到长度为4
+      return parseInt(segment, 16).toString(16).padStart(4, '0');
+    });
+  } else {
+    ipArr = ip
+      .split('.')
+      .map((item) => parseInt(item).toString(16).padStart(2, '0'));
+  }
 
-export const genTraceId = (): string => {
+  return `${ipArr.join('')}${Date.now().toString()}${getCountStr()}${process.pid.toString().slice(-5)}`;
-  return getRandom() + Math.round(Date.now() / 1000).toString() + getCountStr();
 };

server/src/main.ts

@@ -2,7 +2,10 @@ import { NestFactory } from '@nestjs/core';
 import { AppModule } from './app.module';
 
 async function bootstrap() {
+  const PORT = process.env.PORT || 3000;
   const app = await NestFactory.create(AppModule);
-  await app.listen(3000);
+  await app.listen(PORT);
+  console.log(`server is running at: http://127.0.0.1:${PORT}`);
 }
+
 bootstrap();

server/src/middlewares/logRequest.middleware.ts

@@ -12,7 +12,7 @@ export class LogRequestMiddleware implements NestMiddleware {
     const { method, originalUrl, ip } = req;
     const userAgent = req.get('user-agent') || '';
     const startTime = Date.now();
-    const traceId = genTraceId();
+    const traceId = genTraceId({ ip });
     this.logger.setTraceId(traceId);
     const query = JSON.stringify(req.query);
     const body = JSON.stringify(req.body);

server/src/models/surveyResponse.entity.ts

@@ -8,31 +8,13 @@ import {
 } from 'typeorm';
 import { ObjectId } from 'mongodb';
 import { RECORD_STATUS } from '../enums';
-import pluginManager from '../plugins/pluginManager';
+import pluginManager from '../securityPlugin/pluginManager';
 
 @Entity({ name: 'surveySubmit' })
 export class SurveyResponse {
   @ObjectIdColumn()
   _id: ObjectId;
 
-  @Column()
-  curStatus: {
-    status: RECORD_STATUS;
-    date: number;
-  };
-
-  @Column()
-  statusList: Array<{
-    status: RECORD_STATUS;
-    date: number;
-  }>;
-
-  @Column()
-  createDate: number;
-
-  @Column()
-  updateDate: number;
-
   @Column()
   pageId: string;
 
@@ -54,6 +36,24 @@ export class SurveyResponse {
   @Column('jsonb')
   optionTextAndId: Record<string, any>;
 
+  @Column()
+  curStatus: {
+    status: RECORD_STATUS;
+    date: number;
+  };
+
+  @Column()
+  statusList: Array<{
+    status: RECORD_STATUS;
+    date: number;
+  }>;
+
+  @Column()
+  createDate: number;
+
+  @Column()
+  updateDate: number;
+
   @BeforeInsert()
   initDefaultInfo() {
     const now = Date.now();

server/src/modules/survey/__test/survey.controller.spec.ts

@@ -61,7 +61,7 @@ describe('SurveyController', () => {
   });
 
   describe('createSurvey', () => {
-    it('should create a survey and return the survey ID', async () => {
+    it('should create a survey and return the survey id', async () => {
       const surveyInfo = {
         surveyType: 'normal',
         remark: '问卷调研',

server/src/modules/survey/controllers/dataStatistic.controller.ts

@@ -13,7 +13,7 @@ import { ResponseSchemaService } from '../../surveyResponse/services/responseSch
 
 import * as Joi from 'joi';
 import { Authtication } from 'src/guards/authtication';
-import { XiaojuSurveyPluginManager } from 'src/plugins/pluginManager';
+import { XiaojuSurveyPluginManager } from 'src/securityPlugin/pluginManager';
 
 @Controller('/api/survey/dataStatistic')
 export class DataStatisticController {

server/src/modules/survey/services/surveyMeta.service.ts

@@ -8,7 +8,7 @@ import { NoSurveyPermissionException } from 'src/exceptions/noSurveyPermissionEx
 import { HttpException } from 'src/exceptions/httpException';
 import { SurveyNotFoundException } from 'src/exceptions/surveyNotFoundException';
 import { EXCEPTION_CODE } from 'src/enums/exceptionCode';
-import { XiaojuSurveyPluginManager } from 'src/plugins/pluginManager';
+import { XiaojuSurveyPluginManager } from 'src/securityPlugin/pluginManager';
 
 @Injectable()
 export class SurveyMetaService {

server/src/modules/survey/survey.module.ts

@@ -23,7 +23,7 @@ import { SurveyHistoryService } from './services/surveyHistory.service';
 import { SurveyMetaService } from './services/surveyMeta.service';
 import { ContentSecurityService } from './services/contentSecurity.service';
 
-import { PluginManagerProvider } from 'src/plugins/pluginManager.provider';
+import { PluginManagerProvider } from 'src/securityPlugin/pluginManager.provider';
 
 @Module({
   imports: [

server/src/securityPlugin/pluginManager.ts

@@ -17,7 +17,8 @@ export class XiaojuSurveyPluginManager {
   async triggerHook(hookName: AllowHooks, data?: any) {
     for (const plugin of this.plugins) {
       if (plugin[hookName]) {
-        data = await plugin[hookName](data);
+        await plugin[hookName](data);
+        break;
       }
     }
     return data;

web/src/management/pages/edit/modules/contentModule/history.vue

@@ -26,7 +26,7 @@
 import { getSurveyHistory } from '@/management/api/survey';
 import moment from 'moment';
 // 引入中文
-import 'moment/locale/zh-cn'
+import 'moment/locale/zh-cn';
 // 设置中文
 moment.locale('zh-cn');
 

web/src/management/pages/edit/modules/generalModule/pageNav.vue

@@ -1,11 +1,21 @@
 <template>
   <div class="content">
     <template v-for="btnItem in btnList">
-      <router-link class="navbar-btn" :key="btnItem.key" :to="{ name: btnItem.router }" tag="div" replace>
+      <router-link
+        class="navbar-btn"
+        :key="btnItem.key"
+        :to="{ name: btnItem.router }"
+        tag="div"
+        replace
+      >
         <i class="iconfont" :class="[btnItem.icon]"></i>
         <span>{{ btnItem.text }}</span>
       </router-link>
-      <i v-if="btnItem.next" :key="btnItem.key + '-next'" class="iconfont icon-jiantou next"></i>
+      <i
+        v-if="btnItem.next"
+        :key="btnItem.key + '-next'"
+        class="iconfont icon-jiantou next"
+      ></i>
     </template>
   </div>
 </template>

web/src/management/utils/constant.js

@@ -2,4 +2,4 @@
 export const QOP_MAP = {
   COPY: 'copy',
   EDIT: 'edit',
-};
+};

web/src/materials/questions/common/css/choice.scss

@@ -1,15 +1,18 @@
 @import './default.scss';
+
 .isPc .choice-wrapper {
   .choice-box .choice-item {
     &:hover {
       background-color: $primary-color-light;
       transition: background-color 0.3s ease-in-out;
     }
+
     &:not(:hover) {
       background-color: transparent;
       transition: background-color 0.3s ease-in-out;
     }
   }
+
   .nest-box .choice-outer .choice-item .item-title {
     display: none !important;
   }
@@ -17,9 +20,11 @@
 
 .choice-wrapper {
   font-size: 0;
+
   .choice-box {
-    padding: 0 .2rem!important;
+    padding: 0 .2rem !important;
     box-sizing: border-box;
+
     // margin-bottom: -0.22rem;
     .choice-item {
       position: relative;
@@ -30,9 +35,10 @@
       vertical-align: top;
       // height: .88rem;
       line-height: 0.4rem;
-      padding: 0.22rem 0 0.22rem 0.05rem!important;
+      padding: 0.22rem 0 0.22rem 0.05rem !important;
       margin-bottom: 0.08rem;
       cursor: pointer;
+
       .item-input {
         position: relative;
         vertical-align: top;
@@ -43,31 +49,37 @@
         border-radius: 2px;
         background-color: #fff;
         cursor: pointer;
-        &[type='radio']{
+
+        &[type='radio'] {
           border-radius: 100%;
         }
-        &[type='radio']::before{
+
+        &[type='radio']::before {
           border-radius: 50%;
         }
-       
+
         &.print {
           border-radius: 0;
         }
+
         &.print:after {
           display: none;
         }
+
         &:disabled {
           border-color: $border-color !important;
+
           &::after {
             background: #eee;
           }
-          & + label {
+
+          &+label {
             color: #ccc !important;
           }
         }
-        
+
       }
-     
+
       .item-title {
         flex: 1;
         vertical-align: top;
@@ -76,10 +88,12 @@
         overflow: hidden;
         word-wrap: break-word;
         cursor: pointer;
+
         .label-img-wrapper {
           width: 80%;
           text-align: center;
         }
+
         .label-img {
           display: inline-block !important;
           width: 2rem;
@@ -87,6 +101,7 @@
           margin-top: 0.25rem;
         }
       }
+
       .center-text {
         span {
           display: inline-block;
@@ -94,10 +109,12 @@
           text-align: center;
         }
       }
+
       &.is-checked {
         .item-title {
           color: $primary-color;
         }
+
         .qicon.qicon-gouxuan {
           display: inline-block;
           font-size: 0.32rem;
@@ -105,16 +122,19 @@
           border-color: $primary-color;
           background-color: $primary-color;
           color: #fff;
-          border:none
+          border: none
         }
-        
+
         transition: all 0.3s ease-in-out;
       }
+
       &:not(.is-checked) {
         background-color: transparent;
+
         .item-title {
           color: $font-color;
         }
+
         transition: all 0.3s ease-in-out;
       }
 
@@ -123,6 +143,7 @@
         margin-bottom: 0;
       }
     }
+
     .option-wrapper {
       display: flex;
       // justify-content: center;
@@ -130,9 +151,11 @@
 
     .vertical {
       width: 100%;
+
       .item-title .label-img {
         width: 75%;
       }
+
       // &.choice-item.last2child {
       //     margin-bottom: .08rem;
       // }
@@ -161,97 +184,114 @@
 
 .input-wrapper {
   font-size: 0;
+
   .input-box {
-      outline: none;
+    outline: none;
-      font-size: 0.56rem;
+    font-size: 0.56rem;
-      padding: 0.4rem;
+    padding: 0.4rem;
-      border-radius: .08rem;
+    border-radius: .08rem;
-      background-color: #fff;
+    background-color: #fff;
-      vertical-align: top;
+    vertical-align: top;
 
-      border: 1px solid $border-color;
+    border: 1px solid $border-color;
-      width: 200%;
+    width: 200%;
-      height: 1.61rem;
+    height: 1.61rem;
 
-      transform: scale(0.5,0.5);
+    transform: scale(0.5, 0.5);
-      transform-origin: left top;
+    transform-origin: left top;
-      box-sizing: border-box;
+    box-sizing: border-box;
-      margin-bottom: -.81rem;
+    margin-bottom: -.81rem;
-      overflow: hidden;
+    overflow: hidden;
-      // overflow: hidden;
+    // overflow: hidden;
-      color: $font-color;
+    color: $font-color;
-      z-index: 10;
+    z-index: 10;
-      // &:focus, &.is-focused {
+
-      //     border: 1px solid $primary-color;
+    // &:focus, &.is-focused {
-      // }
+    //     border: 1px solid $primary-color;
-      &:not([readonly="readonly"]):hover{
+    // }
-        border: 1px solid $primary-color;
+    &:not([readonly="readonly"]):hover {
-      }
+      border: 1px solid $primary-color;
-      &.print {
+    }
-          border: none;
+
-          border-bottom: 1px solid $border-color;
+    &.print {
-          border-radius: 0;
+      border: none;
-      }
+      border-bottom: 1px solid $border-color;
-      &::-webkit-input-placeholder { /* WebKit browsers */
+      border-radius: 0;
-          font-size: .56rem;
+    }
-          font-weight: 300;
+
-          color: $placeholder-color;
+    &::-webkit-input-placeholder {
-      }
+      /* WebKit browsers */
-      &:-moz-placeholder { /* Mozilla Firefox 4 to 18 */
+      font-size: .56rem;
-          font-size: .56rem;
+      font-weight: 300;
-          font-weight: 300;
+      color: $placeholder-color;
-          color: $placeholder-color;
+    }
-      }
+
-      &::-moz-placeholder { /* Mozilla Firefox 19+ */
+    &:-moz-placeholder {
-          font-size: .56rem;
+      /* Mozilla Firefox 4 to 18 */
-          font-weight: 300;
+      font-size: .56rem;
-          color: $placeholder-color;
+      font-weight: 300;
-      }
+      color: $placeholder-color;
-      &:-ms-input-placeholder { /* Internet Explorer 10+ */
+    }
-          font-size: .56rem;
+
-          font-weight: 300;
+    &::-moz-placeholder {
-          color: $placeholder-color;
+      /* Mozilla Firefox 19+ */
-      }
+      font-size: .56rem;
+      font-weight: 300;
+      color: $placeholder-color;
+    }
+
+    &:-ms-input-placeholder {
+      /* Internet Explorer 10+ */
+      font-size: .56rem;
+      font-weight: 300;
+      color: $placeholder-color;
+    }
   }
+
   .text-number-tip {
-      font-size: .24rem;
+    font-size: .24rem;
-      color: $font-color;
+    color: $font-color;
-      float: right;
+    float: right;
-      margin-right: .1rem;
+    margin-right: .1rem;
-      margin-top: .1rem;
+    margin-top: .1rem;
   }
 
   input::-webkit-outer-spin-button,
   input::-webkit-inner-spin-button {
-      -webkit-appearance: none !important;
+    -webkit-appearance: none !important;
-      margin: 0;
+    margin: 0;
   }
 
   input[type="number"] {
-      -moz-appearance: textfield;
+    -moz-appearance: textfield;
   }
 }
 
 .nest-box {
   justify-content: space-around;
   padding-left: 0 !important;
+
   .choice-outer {
     display: inline-block;
     text-align: center;
+
     .choice-item {
       display: inline-block;
       width: 100%;
       margin-bottom: 0;
       padding-left: 0 !important;
+
       .item-input {
         margin-right: 0;
         border-radius: 2px;
-        &.ql-checked-input + .item-title {
+
+        &.ql-checked-input+.item-title {
           visibility: visible;
           height: auto;
           opacity: 1;
         }
       }
+
       .item-title {
         visibility: hidden;
         opacity: 0;
@@ -262,6 +302,7 @@
         width: 100%;
         color: $font-color;
         position: absolute;
+
         .item-title-text {
           text-overflow: ellipsis;
           overflow: hidden;
@@ -273,10 +314,12 @@
       }
     }
   }
+
   // &.choice-box {
   //   padding: 0;
   // }
 }
+
 // input[type="radio"]{
 //   cursor: pointer;
 //   // position: relative;

web/src/materials/questions/common/css/default.scss

@@ -21,24 +21,24 @@ $font-size: 0.28rem;
 $tip-size: 0.22rem;
 
 .el-radio__input.is-checked+.el-radio__label {
-  color: $font-color  !important;
+  color: $font-color !important;
 }
 
 .el-switch.is-checked .el-switch__core {
-  border-color: $primary-color  !important;
+  border-color: $primary-color !important;
-  background-color: $primary-color  !important;
+  background-color: $primary-color !important;
 }
 
 .el-checkbox__input.is-checked .el-checkbox__inner,
 .question-edit-wrapper .el-checkbox__input.is-indeterminate .el-checkbox__inner {
-  background-color: $primary-color  !important;
+  background-color: $primary-color !important;
-  border-color: $primary-color  !important;
+  border-color: $primary-color !important;
 }
 
 .el-checkbox__input.is-focus .el-checkbox__inner {
-  border-color: $primary-color  !important;
+  border-color: $primary-color !important;
 }
 
 .el-checkbox__input.is-checked+.el-checkbox__label {
-  color: $font-color  !important;
+  color: $font-color !important;
 }

web/src/materials/questions/common/css/formItem.scss

@@ -1,13 +1,17 @@
 @import './default.scss';
+
 .question-wrapper {
   position: relative;
-  &.gap{
+
+  &.gap {
     padding: 0.2rem 0 0.8rem;
   }
+
   .component-wrapper {
     padding: 0 0.4rem;
   }
-  .noPadding{
+
+  .noPadding {
     padding: 0;
   }
 
@@ -27,49 +31,60 @@
 
   &.question-type-section {
     padding-bottom: 0;
+
     .module-title {
       padding-bottom: 0;
     }
   }
+
   &.horizon {
     display: flex;
+
     .module-title .m-title {
       width: 1.2rem;
       margin-right: 8px;
       text-align: justify;
       position: relative;
+
       &::before {
         content: ':';
         display: block;
         position: absolute;
         right: -5px;
       }
+
       &::after {
         content: '';
         display: inline-block;
         width: 100%;
       }
     }
+
     .component-wrapper {
       flex: 1;
     }
+
     &.hasError {
       margin-bottom: 0.4rem;
     }
+
     .module-err-tip {
       position: absolute;
       padding: 0;
       margin-top: -5px;
       left: 0;
+
       .tip-text {
         padding-top: 0;
       }
     }
   }
+
   &.hasError {
     .item-border {
       border-color: $error-color;
     }
+
     /*由于错误提示可能多行，因此有错误时取消margin，让错误提示撑开边距*/
     margin-bottom: 0;
   }
@@ -77,6 +92,7 @@
   &.special .module-err-tip {
     padding: 0.12rem 0.75rem 0;
   }
+
   &.spliter {
     border-bottom: 0.12rem solid $spliter-color;
   }
@@ -84,6 +100,7 @@
   &:last-child {
     border-bottom: 0;
   }
+
   .sort-tip {
     font-size: 0.26rem;
     line-height: 0.26rem;
@@ -99,6 +116,7 @@
 
 .isPc .question-form-item {
   border-bottom: none;
+
   .sort-tip {
     padding-left: 0;
     margin-bottom: 0.24rem;

web/src/materials/questions/common/css/group.scss

@@ -1,167 +1,193 @@
 @import './default.scss';
-  .isPc .group-wrapper.group-radio .module-err-tip {
+
-    position: relative;
+.isPc .group-wrapper.group-radio .module-err-tip {
-  }
+  position: relative;
-  .isPc .group-wrapper.group-radio .question-form-item {
+}
-    margin-bottom: 0;
+
-  }
+.isPc .group-wrapper.group-radio .question-form-item {
-  
+  margin-bottom: 0;
-  .isPc .group-wrapper.group-radio {
+}
-    .matrix-select-more {
+
-      margin-left: 0;
+.isPc .group-wrapper.group-radio {
-      .module-err-tip {
-        left: 0;
-      }
-    }
-  }
-  .group-wrapper {
-    width: 100%;
-    // overflow: hidden;
-    &::-webkit-scrollbar {
-      display: block;
-      height: 10px;
-      background-color: #F2F4F7;
-    }
-    &::-webkit-scrollbar-thumb {
-      border-radius: 5px;
-       background: #E3E4E8;
-    }
-    &::-webkit-scrollbar-track {
-      height: 16px;
-       background: #F2F4F7;
-    }
-    .form-item-wrapper {
-      padding: 0 0 .2rem 0;
-      box-sizing: border-box;
-    }
-    .question-form-item {
-      padding: .16rem 0 .4rem;
-      border-bottom: none;
-  
-      .module-title {
-         padding: 0 0 .24rem 0.2rem;
-         font-size: .28rem;
-        font-weight: 400;
-      }
-      .component-wrapper {
-        padding: 0;
-        .star-wrapper {
-          padding: 0 .35rem;
-        }
-        .nps-wrapper {
-          padding: 0;
-        }
-      }
-  
-      &:last-child {
-        padding-bottom: 0;
-      }
-  
-      &.hasError .module-err-tip.show {
-        padding: 0;
-      }
-    }
-  
-    .box {
-      display: flex;
-    }
-    .group-title.main {
-      background: #F2F4F7;
-      padding: 0 ;
-      min-height: .4rem;
-              line-height: .4rem;
-      box-sizing: border-box;
-      display: flex;
-      span {
-        display: inline-block;
-        box-sizing: border-box;
-        vertical-align: top;
-        font-size: .28rem;
-        color: $title-color;
-        text-align: center;
-        line-height: 0.4rem;
-       // font-weight: 500;
-        width: 100%;
-        word-break: break-word;
-        border-left: 1px dotted rgba(200, 201, 205, 1);
-        height: auto;
-      }
-     
-      & > span:first-child {
-        border: none;
-      }
-      .group-title-text span {
-        border: none;
-      }
-       &>span{
-        padding: .2rem .1rem;
-      }
-    }
-  
-      &.group-radio {
-              .module-title {
-                  // color: $font-color;
-                  line-height: .36rem;
-              }
-              .question-form-item {
-                  padding: .4rem 0 .4rem 0;
-              }
-              .checkbox-wrapper, .radio-wrapper {
-                  .radio-box.nest-box .radio-outer .radio-item {
-                      padding: .22rem 0;
-                  }
-              }
-              .module-err-tip {
-                  margin-top: .25rem;
-              }
-          }
-  }
-  
-  .horizontal {
-    .group-title {
-      padding-left: 25%;
-    }
-    .question-form-item {
-      width: 100%;
-      font-size: 0;
-      overflow: hidden;
-      border-bottom: 1px solid #eee;
-      margin-bottom: .2rem;
-              padding-top: .2rem;
-      .module-title {
-        float: left;
-        width: 27%;
-        vertical-align: top;
-       font-size: .26rem !important;
-      }
-      .checkbox-wrapper, .radio-wrapper {
-        display: inline-block;
-        width: 70%;
-        vertical-align: top;
-        border-bottom: none;
-      }
-    }
-  }
-  
-  .select-more-label {
-    display: block;
-    margin-top: .2rem;
-    // margin-bottom: -.2rem;
-    height: .3rem;
-    line-height: .3rem;
-    width: 100%;
-    color: #666;
-    font-size: .26rem;
-  }
-  
   .matrix-select-more {
-    max-width: 10rem;
+    margin-left: 0;
-    .question-form-item {
+
-      padding-top: 0px;
+    .module-err-tip {
-      .m-select-more {
+      left: 0;
-        margin-top: .3rem;
+    }
-        margin-bottom: .5rem;
+  }
-        width: 100% !important;
+}
+
+.group-wrapper {
+  width: 100%;
+
+  // overflow: hidden;
+  &::-webkit-scrollbar {
+    display: block;
+    height: 10px;
+    background-color: #F2F4F7;
+  }
+
+  &::-webkit-scrollbar-thumb {
+    border-radius: 5px;
+    background: #E3E4E8;
+  }
+
+  &::-webkit-scrollbar-track {
+    height: 16px;
+    background: #F2F4F7;
+  }
+
+  .form-item-wrapper {
+    padding: 0 0 .2rem 0;
+    box-sizing: border-box;
+  }
+
+  .question-form-item {
+    padding: .16rem 0 .4rem;
+    border-bottom: none;
+
+    .module-title {
+      padding: 0 0 .24rem 0.2rem;
+      font-size: .28rem;
+      font-weight: 400;
+    }
+
+    .component-wrapper {
+      padding: 0;
+
+      .star-wrapper {
+        padding: 0 .35rem;
+      }
+
+      .nps-wrapper {
+        padding: 0;
       }
     }
-  }
+
+    &:last-child {
+      padding-bottom: 0;
+    }
+
+    &.hasError .module-err-tip.show {
+      padding: 0;
+    }
+  }
+
+  .box {
+    display: flex;
+  }
+
+  .group-title.main {
+    background: #F2F4F7;
+    padding: 0;
+    min-height: .4rem;
+    line-height: .4rem;
+    box-sizing: border-box;
+    display: flex;
+
+    span {
+      display: inline-block;
+      box-sizing: border-box;
+      vertical-align: top;
+      font-size: .28rem;
+      color: $title-color;
+      text-align: center;
+      line-height: 0.4rem;
+      // font-weight: 500;
+      width: 100%;
+      word-break: break-word;
+      border-left: 1px dotted rgba(200, 201, 205, 1);
+      height: auto;
+    }
+
+    &>span:first-child {
+      border: none;
+    }
+
+    .group-title-text span {
+      border: none;
+    }
+
+    &>span {
+      padding: .2rem .1rem;
+    }
+  }
+
+  &.group-radio {
+    .module-title {
+      // color: $font-color;
+      line-height: .36rem;
+    }
+
+    .question-form-item {
+      padding: .4rem 0 .4rem 0;
+    }
+
+    .checkbox-wrapper,
+    .radio-wrapper {
+      .radio-box.nest-box .radio-outer .radio-item {
+        padding: .22rem 0;
+      }
+    }
+
+    .module-err-tip {
+      margin-top: .25rem;
+    }
+  }
+}
+
+.horizontal {
+  .group-title {
+    padding-left: 25%;
+  }
+
+  .question-form-item {
+    width: 100%;
+    font-size: 0;
+    overflow: hidden;
+    border-bottom: 1px solid #eee;
+    margin-bottom: .2rem;
+    padding-top: .2rem;
+
+    .module-title {
+      float: left;
+      width: 27%;
+      vertical-align: top;
+      font-size: .26rem !important;
+    }
+
+    .checkbox-wrapper,
+    .radio-wrapper {
+      display: inline-block;
+      width: 70%;
+      vertical-align: top;
+      border-bottom: none;
+    }
+  }
+}
+
+.select-more-label {
+  display: block;
+  margin-top: .2rem;
+  // margin-bottom: -.2rem;
+  height: .3rem;
+  line-height: .3rem;
+  width: 100%;
+  color: #666;
+  font-size: .26rem;
+}
+
+.matrix-select-more {
+  max-width: 10rem;
+
+  .question-form-item {
+    padding-top: 0px;
+
+    .m-select-more {
+      margin-top: .3rem;
+      margin-bottom: .5rem;
+      width: 100% !important;
+    }
+  }
+}

web/src/materials/questions/common/css/icon.scss

@@ -1,8 +1,9 @@
 @font-face {
-  font-family: "qicon"; /* Project id 4263885 */
+  font-family: "qicon";
+  /* Project id 4263885 */
   src: url('//at.alicdn.com/t/c/font_4263885_u91txz1d68.woff2?t=1697079806138') format('woff2'),
-       url('//at.alicdn.com/t/c/font_4263885_u91txz1d68.woff?t=1697079806138') format('woff'),
+    url('//at.alicdn.com/t/c/font_4263885_u91txz1d68.woff?t=1697079806138') format('woff'),
-       url('//at.alicdn.com/t/c/font_4263885_u91txz1d68.ttf?t=1697079806138') format('truetype');
+    url('//at.alicdn.com/t/c/font_4263885_u91txz1d68.ttf?t=1697079806138') format('truetype');
 }
 
 .qicon {
@@ -35,4 +36,4 @@
 
 .qicon-xingxing:before {
   content: "\a6ca";
-}
+}

web/src/materials/questions/common/css/input.scss

@@ -1,6 +1,8 @@
 @import './default.scss';
+
 .input-wrapper {
     font-size: 0;
+
     .input-box {
         outline: none;
         font-size: 0.56rem;
@@ -13,7 +15,7 @@
         width: 200%;
         height: 1.61rem;
 
-        transform: scale(0.5,0.5);
+        transform: scale(0.5, 0.5);
         transform-origin: left top;
         box-sizing: border-box;
         margin-bottom: -.81rem;
@@ -21,41 +23,53 @@
         // overflow: hidden;
         color: $font-color;
         z-index: 10;
+
         &.is-focused:focus {
             border: 1px solid $primary-color;
             height: 3.5rem;
             margin-bottom: -1.75rem;
             overflow-y: scroll;
         }
-        &:not([readonly="readonly"]):hover{
+
+        &:not([readonly="readonly"]):hover {
             border: 1px solid $primary-color;
         }
+
         &.print {
             border: none;
             border-bottom: 1px solid $border-color;
             border-radius: 0;
         }
-        &::-webkit-input-placeholder { /* WebKit browsers */
+
+        &::-webkit-input-placeholder {
+            /* WebKit browsers */
             font-size: .56rem;
             font-weight: 300;
             color: $placeholder-color;
         }
-        &:-moz-placeholder { /* Mozilla Firefox 4 to 18 */
+
+        &:-moz-placeholder {
+            /* Mozilla Firefox 4 to 18 */
             font-size: .56rem;
             font-weight: 300;
             color: $placeholder-color;
         }
-        &::-moz-placeholder { /* Mozilla Firefox 19+ */
+
+        &::-moz-placeholder {
+            /* Mozilla Firefox 19+ */
             font-size: .56rem;
             font-weight: 300;
             color: $placeholder-color;
         }
-        &:-ms-input-placeholder { /* Internet Explorer 10+ */
+
+        &:-ms-input-placeholder {
+            /* Internet Explorer 10+ */
             font-size: .56rem;
             font-weight: 300;
             color: $placeholder-color;
         }
     }
+
     .text-number-tip {
         font-size: .24rem;
         color: $font-color;
@@ -73,7 +87,8 @@
     input[type="number"] {
         -moz-appearance: textfield;
     }
-    textarea{
+
+    textarea {
         resize: none;
     }
 }

web/src/materials/questions/common/css/question.scss

@@ -1,4 +1,5 @@
 @import './default.scss';
+
 .question {
   position: relative;
   padding: 0.2rem 0 0.3rem;
@@ -6,5 +7,4 @@
   &-block {
     padding: 0 0.4rem;
   }
-}
+}
-  

web/src/materials/questions/common/css/radioQuestion.scss

@@ -1,96 +1,110 @@
 @import './default.scss';
+
 .question-form-item {
-    position: relative;
+  position: relative;
-    padding: 0.2rem 0 0.8rem;
+  padding: 0.2rem 0 0.8rem;
-  
+
+  .component-wrapper {
+    padding: 0 0.4rem;
+  }
+
+  .noPadding {
+    padding: 0;
+  }
+
+  &.no-padding {
     .component-wrapper {
-      padding: 0 0.4rem;
-    }
-    .noPadding{
       padding: 0;
     }
-  
+  }
-    &.no-padding {
+
-      .component-wrapper {
+  &.no-out-padding {
-        padding: 0;
+    padding: 0 0 0.2rem;
-      }
+  }
-    }
+
-  
+  .clear {
-    &.no-out-padding {
+    clear: both;
-      padding: 0 0 0.2rem;
+  }
-    }
+
-  
+  &.question-type-section {
-    .clear {
+    padding-bottom: 0;
-      clear: both;
+
-    }
+    .module-title {
-  
-    &.question-type-section {
       padding-bottom: 0;
-      .module-title {
-        padding-bottom: 0;
-      }
-    }
-    &.horizon {
-      display: flex;
-      .module-title .m-title {
-        width: 1.2rem;
-        margin-right: 8px;
-        text-align: justify;
-        position: relative;
-        &::before {
-          content: ':';
-          display: block;
-          position: absolute;
-          right: -5px;
-        }
-        &::after {
-          content: '';
-          display: inline-block;
-          width: 100%;
-        }
-      }
-      .component-wrapper {
-        flex: 1;
-      }
-      &.hasError {
-        margin-bottom: 0.4rem;
-      }
-      .module-err-tip {
-        position: absolute;
-        padding: 0;
-        margin-top: -5px;
-        left: 0;
-        .tip-text {
-          padding-top: 0;
-        }
-      }
-    }
-    &.hasError {
-      .item-border {
-        border-color: $error-color;
-      }
-      /*由于错误提示可能多行，因此有错误时取消margin，让错误提示撑开边距*/
-      margin-bottom: 0;
-    }
-  
-    &.special .module-err-tip {
-      padding: 0.12rem 0.75rem 0;
-    }
-    &.spliter {
-      border-bottom: 0.12rem solid $spliter-color;
-    }
-  
-    &:last-child {
-      border-bottom: 0;
-    }
-    .sort-tip {
-      font-size: 0.26rem;
-      line-height: 0.26rem;
-      opacity: 0.5;
-      margin-top: -0.24rem;
-      margin-bottom: 0.4rem;
-      padding-left: 0.4rem;
-      color: #92949d;
     }
   }
-  
+
+  &.horizon {
+    display: flex;
+
+    .module-title .m-title {
+      width: 1.2rem;
+      margin-right: 8px;
+      text-align: justify;
+      position: relative;
+
+      &::before {
+        content: ':';
+        display: block;
+        position: absolute;
+        right: -5px;
+      }
+
+      &::after {
+        content: '';
+        display: inline-block;
+        width: 100%;
+      }
+    }
+
+    .component-wrapper {
+      flex: 1;
+    }
+
+    &.hasError {
+      margin-bottom: 0.4rem;
+    }
+
+    .module-err-tip {
+      position: absolute;
+      padding: 0;
+      margin-top: -5px;
+      left: 0;
+
+      .tip-text {
+        padding-top: 0;
+      }
+    }
+  }
+
+  &.hasError {
+    .item-border {
+      border-color: $error-color;
+    }
+
+    /*由于错误提示可能多行，因此有错误时取消margin，让错误提示撑开边距*/
+    margin-bottom: 0;
+  }
+
+  &.special .module-err-tip {
+    padding: 0.12rem 0.75rem 0;
+  }
+
+  &.spliter {
+    border-bottom: 0.12rem solid $spliter-color;
+  }
+
+  &:last-child {
+    border-bottom: 0;
+  }
+
+  .sort-tip {
+    font-size: 0.26rem;
+    line-height: 0.26rem;
+    opacity: 0.5;
+    margin-top: -0.24rem;
+    margin-bottom: 0.4rem;
+    padding-left: 0.4rem;
+    color: #92949d;
+  }
+}

web/src/materials/questions/components/AdvancedConfig/OptionConfig.vue

@@ -178,7 +178,7 @@ export default {
       for (const i in addOne) {
         if (i === 'others') {
           addOne[i] = others;
-          if(others) addOne.othersKey = `${field}_${addOne.hash}`;
+          if (others) addOne.othersKey = `${field}_${addOne.hash}`;
         } else if (i === 'mustOthers') {
           addOne[i] = false;
         } else if (i === 'text') {

web/src/materials/questions/components/Options/OptionEditBar.vue

@@ -1,8 +1,7 @@
 <script>
 import OptionConfig from '@/materials/questions/components/AdvancedConfig/OptionConfig.vue';
 import RateConfig from '../AdvancedConfig/RateConfig.vue';
-import { defineComponent, ref, inject, computed } from 'vue';
+import { defineComponent, ref, inject } from 'vue';
-import store from '@/management/store';
 import ExtraIcon from '@/materials/questions/components/ExtraIcon.vue';
 
 export default defineComponent({
@@ -11,7 +10,7 @@ export default defineComponent({
   props: {
     optionList: {
       type: Array,
-      default: [],
+      default: () => [],
     },
     showOthers: {
       type: Boolean,
@@ -29,9 +28,6 @@ export default defineComponent({
   setup(props, { emit }) {
     const moduleConfig = inject('moduleConfig');
     const optionConfigVisible = ref(false);
-    const currentEditKey = computed(() => {
-      return store.getters['edit/currentEditKey'];
-    });
 
     const addOther = () => {
       emit('addOther');
@@ -131,18 +127,21 @@ export default defineComponent({
   line-height: 24px;
   font-size: 12px;
   color: $primary-color;
+
   .add-option {
     display: inline-block;
     margin-right: 10px;
     cursor: pointer;
     font-size: 12px;
   }
+
   .option-advanced-config {
     color: #0f8a82;
     float: right;
     cursor: pointer;
     font-size: 12px;
   }
+
   .primary-color {
     color: $primary-color;
   }
@@ -155,6 +154,7 @@ export default defineComponent({
   letter-spacing: 0;
   text-align: left;
 }
+
 .pop-tip {
   font-family: PingFangSC-Regular;
   font-size: 12px;
@@ -162,6 +162,7 @@ export default defineComponent({
   letter-spacing: 0.65px;
   text-align: left;
 }
+
 .pop-input {
   margin-top: 6px;
   margin-bottom: 16px;

web/src/materials/questions/components/Options/UseOptionBase.jsx

@@ -26,13 +26,13 @@ function useOptionBase(options) {
     if (typeof text !== 'string') {
       text = '选项';
     }
-    
+
     const getHash = new GetHash();
     addOne.hash = getHash.getHash();
     for (const i in addOne) {
       if (i === 'others') {
         addOne[i] = others;
-        if(others) addOne.othersKey = `${field}_${addOne.hash}`;
+        if (others) addOne.othersKey = `${field}_${addOne.hash}`;
       } else if (i === 'mustOthers') {
         addOne[i] = false;
       } else if (i === 'text') {

web/src/materials/setters/widgets/InputNumber.vue

@@ -71,11 +71,14 @@ export default {
           return max(this.moduleConfig);
         }
         return Number(max);
-      } else if (min !== undefined && Array.isArray(this.moduleConfig?.options)) {
+      } else if (
+        min !== undefined &&
+        Array.isArray(this.moduleConfig?.options)
+      ) {
         // inputNumber 配置了最小值，没有配置最大值（checkbox, vote, matrix-checkbox, 最大选择数 ）
         return this.moduleConfig.options.length;
       } else {
-        return Infinity
+        return Infinity;
       }
     },
   },

web/src/materials/setters/widgets/QuestionTime.vue

@@ -23,7 +23,7 @@
 // 要注意，element的format和moment的format的D是不同的
 import moment from 'moment';
 // 引入中文
-import 'moment/locale/zh-cn'
+import 'moment/locale/zh-cn';
 // 设置中文
 moment.locale('zh-cn');
 import { FORM_CHANGE_EVENT_KEY } from '@/materials/setters/constant';

web/src/materials/setters/widgets/QuestionTimeHour.vue

@@ -15,7 +15,7 @@
 <script>
 import moment from 'moment';
 // 引入中文
-import 'moment/locale/zh-cn'
+import 'moment/locale/zh-cn';
 // 设置中文
 moment.locale('zh-cn');
 import { FORM_CHANGE_EVENT_KEY } from '@/materials/setters/constant';