增加表单[FormFields]拼写错误兼容

Author: cq-panda

Vol.Vue/src/components/basic/QuickSearch.vue

@@ -4,7 +4,7 @@
       clearable
       v-if="singleSearch.type=='drop'||singleSearch.type=='dropList'||
               singleSearch.type=='select'||singleSearch.type=='selectList'"
-      v-model="searchFormFileds[singleSearch.field]"
+      v-model="searchFormFields[singleSearch.field]"
       :placeholder="'请选择'+singleSearch.title"
     >
       <Option
@@ -20,13 +20,13 @@
       :type="singleSearch.type+'range'"
       :format="singleSearch.type=='date'? 'yyyy-MM-dd':'yyyy-MM-dd HH:mm:ss'"
       :placeholder="singleSearch.title"
-      v-model="searchFormFileds[singleSearch.field]"
+      v-model="searchFormFields[singleSearch.field]"
     ></DatePicker>
 
     <Input
       clearable
       v-else
-      v-model="searchFormFileds[singleSearch.field]"
+      v-model="searchFormFields[singleSearch.field]"
       :placeholder="singleSearch.title"
       @on-keypress="tiggerPress"
     />
@@ -37,16 +37,18 @@ export default {
   props: {
     singleSearch: {
       type: Object,
-      default: {}
+      default: {},
     },
-    searchFormFileds: {
+    searchFormFields: {
       type: Object,
-      default: {}
+      default: () => {
+        return {};
+      },
     },
     tiggerPress: {
       type: Function,
-      default: () => {}
-    }
-  }
+      default: () => {},
+    },
+  },
 };
 </script>

Vol.Vue/src/components/basic/ViewGrid.vue

@@ -35,11 +35,12 @@
       <!--查询条件-->
       <div class="grid-search">
         <div :class="[fiexdSearchForm?'fiexd-search-box':'search-box']" v-show="searchBoxShow">
+          <!-- 2020.09.13增加formFileds拼写错误兼容处理 -->
           <vol-form
             ref="searchForm"
             :label-width="labelWidth"
             :formRules="searchFormOptions"
-            :formFileds="searchFormFileds"
+            :formFields="_searchFormFields"
           >
             <div v-if="!fiexdSearchForm" class="form-closex" slot="footer">
               <Button size="small" type="info" ghost @click="search">
@@ -71,7 +72,7 @@
             <QuickSearch
               v-if="singleSearch"
               :singleSearch="singleSearch"
-              :searchFormFileds="searchFormFileds"
+              :searchFormFields="_searchFormFields"
               :tiggerPress="quickSearchKeyPress"
             ></QuickSearch>
           </div>
@@ -131,7 +132,7 @@
                 ref="form"
                 :label-width="boxOptions.labelWidth"
                 :formRules="editFormOptions"
-                :formFileds="editFormFileds"
+                :formFields="_editFormFields"
               ></vol-form>
             </div>
             <!--明细body自定义组件-->
@@ -289,6 +290,8 @@ var vueParam = {
   props: {},
   data() {
     return {
+      _searchFormFields: {}, //2020.09.13增加formFileds拼写错误兼容处理
+      _editFormFields: {}, //2020.09.13增加formFileds拼写错误兼容处理
       fiexdSearchForm: false, //2020.09.011是否固定查询表单，true查询表单将固定显示在表单的最上面
       _inited: false,
       single: false, //表是否单选
@@ -421,6 +424,14 @@ var vueParam = {
     // this.$refs.searchForm.forEach()
   },
   created: function () {
+    //2020.09.13增加formFileds拼写错误兼容处理
+    this._searchFormFields = Object.keys(this.searchFormFields).length
+      ? this.searchFormFields
+      : this.searchFormFileds;
+    //2020.09.13增加formFileds拼写错误兼容处理
+    this._editFormFields = Object.keys(this.editFormFields).length
+      ? this.editFormFields
+      : this.editFormFileds;
     //在其他方法中如果拿不到this，请使用$viewGridVue或$this
     $viewGridVue = this;
     $this = this;

Vol.Vue/src/components/basic/ViewGridConfig/methods.js

@@ -19,7 +19,7 @@ let methods = {
   quickSearchKeyPress($event) {
     //查询字段为input时，按回车查询
     if ($event.keyCode == 13) {
-      if (this.searchFormFileds[this.singleSearch.field] != "") {
+      if (this._searchFormFields[this.singleSearch.field] != "") {
         this.search();
       }
     }
@@ -232,8 +232,8 @@ let methods = {
     }
 
     let query = { wheres: [] };
-    for (const key in this.searchFormFileds) {
-      let value = this.searchFormFileds[key];
+    for (const key in this._searchFormFields) {
+      let value = this._searchFormFields[key];
       if (this.emptyValue(value)) continue;
       if (typeof value == "number") {
         value = value + "";
@@ -326,7 +326,7 @@ let methods = {
     let objKey = {};
     //编辑状态下,不需要重置主键,创建时间创建人
     if (isEdit) {
-      objKey[this.table.key] = this.editFormFileds[this.table.key];
+      objKey[this.table.key] = this._editFormFields[this.table.key];
     }
     this.resetEditForm(objKey);
     //重置之后
@@ -389,10 +389,10 @@ let methods = {
     if (!sourceObj) return;
     let form, keyLeft;
     if (formName == "searchForm") {
-      form = this.searchFormFileds;
+      form = this._searchFormFields;
       keyLeft = "s" + "_b_";
     } else {
-      form = this.editFormFileds;
+      form = this._editFormFields;
       keyLeft = "e" + "_b_";
     }
     //获取数据源的data类型，否则如果数据源data的key是数字，重置的值是字符串就无法绑定值
@@ -464,36 +464,36 @@ let methods = {
     });
   },
   saveExecute() {
-    let editFormFileds = {};
+    let _editFormFields = {};
     //上传文件以逗号隔开
-    for (const key in this.editFormFileds) {
+    for (const key in this._editFormFields) {
       if (
         this.uploadfiled &&
         this.uploadfiled.length > 0 &&
         this.uploadfiled.indexOf(key) != -1 &&
-        this.editFormFileds[key] instanceof Array
+        this._editFormFields[key] instanceof Array
       ) {
-        let allPath = this.editFormFileds[key].map(x => {
+        let allPath = this._editFormFields[key].map(x => {
           return x.path;
         });
-        editFormFileds[key] = allPath.join(",");
+        _editFormFields[key] = allPath.join(",");
       } else {
-        editFormFileds[key] = this.editFormFileds[key];
+        _editFormFields[key] = this._editFormFields[key];
       }
     }
 
     // else {
-    //     editFormFileds = this.editFormFileds;
+    //     _editFormFields = this._editFormFields;
     // }
     //将数组转换成string
-    for (const key in editFormFileds) {
-      if (editFormFileds[key] instanceof Array) {
-        editFormFileds[key] = editFormFileds[key].join(",");
+    for (const key in _editFormFields) {
+      if (_editFormFields[key] instanceof Array) {
+        _editFormFields[key] = _editFormFields[key].join(",");
       }
     }
 
     let formData = {
-      mainData: editFormFileds,
+      mainData: _editFormFields,
       detailData: null,
       delKeys: null
     };
@@ -536,7 +536,7 @@ let methods = {
 
       if (this.currentAction == this.const.ADD) {
         //  this.currentRow=x.data;
-        this.editFormFileds[this.table.key] = "";
+        this._editFormFields[this.table.key] = "";
         this.currentAction = this.const.EDIT;
         this.currentRow = resultRow.data;
       }
@@ -606,9 +606,9 @@ let methods = {
         });
       });
     });
-    this.editFormFileds;
+    this._editFormFields;
     //重置编辑表单数据
-    this.editFormFileds[this.table.key] = row[this.table.key];
+    this._editFormFields[this.table.key] = row[this.table.key];
 
     this.resetEditForm(row);
     this.currentAction = this.const.EDIT;
@@ -989,12 +989,12 @@ let methods = {
     let keys = [];
     this.dicKeys.splice(0);
     //初始化编辑数据源,默认为一个空数组，如果要求必填设置type=number/decimal的最小值
-    this.initFormOptions(this.editFormOptions, keys, this.editFormFileds, true);
+    this.initFormOptions(this.editFormOptions, keys, this._editFormFields, true);
     //初始化查询数据源,默认为一个空数组
     this.initFormOptions(
       this.searchFormOptions,
       keys,
-      this.searchFormFileds,
+      this._searchFormFields,
       false
     );
     //查询日期设置为可选开始与结果日期

Vol.Vue/src/components/basic/ViewGridConfig/props.js

@@ -20,6 +20,13 @@ let props = {
       return {};
     }
   },
+  //2020.09.13增加formFileds拼写错误兼容处理
+  editFormFields: {//新建、编辑字段(key/value)
+    type: Object,
+    default: () => {
+      return {};
+    }
+  },
   editFormOptions: {//新建、编辑配置信息
     type: Array,
     default: () => {
@@ -31,6 +38,13 @@ let props = {
     default: () => {
       return {};
     }
+  },
+    //2020.09.13增加formFileds拼写错误兼容处理
+  searchFormFields: {//查询字段(key/value)
+    type: Object,
+    default: () => {
+      return {};
+    }
   },
   searchFormOptions: {//查询配置信息(key/value)
     type: Array,