mx-condition - optimized for best paper

src/components/MxCondition/condition-object/condition-paper-area.js

@@ -10,6 +10,7 @@ export default {
   },
   dependentKeys: ['paperType'],
   key: 'paperArea',
+  alias: 'area',
   title: '地区',
   getList: function(param,$ref) {
     return new Promise((resolve, reject) => {

src/components/MxCondition/condition-object/condition-paper-grade.js

@@ -10,6 +10,7 @@ export default {
   },
   dependentKeys: ['paperSubject'],
   key: 'paperGrade',
+  alias: 'gradeName',
   title: '年级',
   getList: function(param,$ref) {
     return new Promise((resolve, reject) => {

src/components/MxCondition/condition-object/condition-paper-subject.js

@@ -6,6 +6,7 @@ import {
 export default {
   ...conditionObjectBase,
   key: 'paperSubject',
+  alias: 'subjectName',
   title: '科目',
   getList: function(param,$ref) {
     return new Promise((resolve, reject) => {

src/components/MxCondition/condition-object/condition-paper-type.js

@@ -10,6 +10,7 @@ export default {
   },
   dependentKeys: ['paperGrade'],
   key: 'paperType',
+  alias: 'paperType',
   title: '类型',
   getList: function(param,$ref) {
     return new Promise((resolve, reject) => {

src/components/MxCondition/condition-object/condition-paper-year.js

@@ -10,6 +10,7 @@ export default {
   },
   dependentKeys: ['paperSubject'],
   key: 'paperYear',
+  alias: 'year',
   title: '年份',
   getList: function(param,$ref) {
     return new Promise((resolve, reject) => {

src/views/questioncenter/components/famous-paper.vue

@@ -2,8 +2,7 @@
   <div>
     <el-card class="mb10">
       <slot name="prefix"></slot>
-      <mx-condition ref="condition" :query-params="queryParams" :require-fields="requireFields" @query="handleQuery"
-                    @invalid="handleInvalidQuery"></mx-condition>
+      <mx-condition :query-params="queryParams" :require-fields="requireFields" use-alias-mapping @query="handleQuery" />
       <mx-search-group justify="end" placeholder="请输入内容" v-model="form.paperName" class="mt8" @search="clickSuffix">
         <el-col v-if="isFrontTeacher" :span="16" style="margin-bottom: 0"><span class="f-warning">*收藏后方可发布作业</span>
         </el-col>
@@ -76,8 +75,9 @@ export default {
         paperArea: ''
       },
       requireFields: ['paperSubject', 'paperGrade', 'paperType', 'paperArea'],
+      firedParams: null,
       form: {
-        paperName: ''
+        papername: ''
       },
       pageForm: {
         pageNum: 1,
@@ -104,12 +104,8 @@ export default {
     // 获取试卷列表
     getPaperList() {
       papersList({
-        subjectName: this.queryParams.paperSubject,
-        gradeName: this.queryParams.paperGrade,
-        paperType: this.queryParams.paperType,
-        area: this.queryParams.paperArea,
-        year: this.queryParams.paperYear,
-        papername: this.form.paperName,
+        ...this.firedParams,
+        ...this.form,
         ...this.pageForm
       }).then((res) => {
         this.total = res.total
@@ -140,7 +136,8 @@ export default {
     handleInvalidQuery() {
       // todo
     },
-    handleQuery() {
+    handleQuery(model) {
+      this.firedParams = model
       this.getPaperList()
     }
   }

src/views/questioncenter/components/history-paper.vue

@@ -2,8 +2,7 @@
   <div>
     <el-card class="mb10">
       <slot name="prefix"></slot>
-      <mx-condition ref="condition" :query-params="queryParams" :require-fields="requireFields" @query="handleQuery"
-                    @invalid="handleInvalidQuery"></mx-condition>
+      <mx-condition :query-params="queryParams" :require-fields="requireFields" use-alias-mapping @query="handleQuery" />
       <mx-search-group justify="end" placeholder="请输入内容" v-model="form.paperName" class="mt8" @search="clickSearch">
         <el-col v-if="isFrontTeacher" :span="16" style="margin-bottom: 0"><span class="f-warning">*收藏后方可发布作业</span>
         </el-col>
@@ -72,12 +71,13 @@ export default {
         paperYear: ''
       },
       requireFields: ['paperSubject', 'paperYear'],
+      firedParams: null,
       pageForm: {
         pageNum: 1,
         pageSize: 12
       },
       form: {
-        paperName: ''
+        papername: ''
       },
       total: 0, // 试卷总数
       paperYearList: []
@@ -90,7 +90,8 @@ export default {
     handleInvalidQuery() {
       // todo
     },
-    handleQuery() {
+    handleQuery(model) {
+      this.firedParams = model
       this.getPaperListByYear()
     },
     paperDownLoad(paperId) {
@@ -110,10 +111,8 @@ export default {
     getPaperListByYear() {
       this.form.paperType = '历年真题'
       papersList({
-        year: this.queryParams.paperYear,
-        papersType: this.form.paperType,
-        subjectName: this.queryParams.paperSubject,
-        papername: this.form.paperName,
+        ...this.firedParams,
+        ...this.form,
         ...this.pageForm
       }).then((res) => {
         this.total = res.total