Merge remote-tracking branch 'origin/master'

zkqy-ui/src/views/relateTable/index.vue

@@ -303,9 +303,9 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="时间格式" prop="timeFormate">
+          <el-form-item label="时间格式" prop="timeFormat">
             <el-select
-              v-model="tableItemForm.timeFormate"
+              v-model="tableItemForm.timeFormat"
               placeholder="请选择时间格式"
               @input="iptChange()"
             >
@@ -682,7 +682,7 @@ export default {
         tableName: "",
         selectFields: "",
         isAsc: false,
-        timeFormate: "",
+        timeFormat: "",
         orderByColumn: "",
       },
       tableGroupList: [],
@@ -1066,10 +1066,11 @@ export default {
           console.log(echoData);
           let tableKey = uuidv4();
           let sqlKey = uuidv4();
-
+          console.log(this.tableItemForm);
           this.relyFileds.tableFieldList = this.tableFieldList;
           this.relyFileds.tableName = this.tableItemForm.tableName;
           // this.tableItemForm.rowId = Date.now();
+
           let newTableData = {
             //收集到的表格编辑结果
             dtName: this.tableItemForm.title,
@@ -1077,9 +1078,9 @@ export default {
             rowId: this.tableItemForm.rowId,
             selectFields: this.tableItemForm.selectFields,
             orderByColumn: this.tableItemForm.orderByColumn,
-            timeFormate: this.tableItemForm.timeFormate,
+            timeFormat: this.tableItemForm.timeFormat,
             primaryKey: this.tableItemForm.selectFields,
-            tId: this.tId,
+            tId: this.tableItemForm.tId,
             tableKey: this.tableItemForm.rowId || tableKey,
             sortOrder: this.tableItemForm.isAsc,
             sqlKey: sqlKey,
@@ -1116,7 +1117,7 @@ export default {
               sortOrder: this.tableItemForm.isAsc,
               sqlKey: sqlKey,
               dtColumnName: columns,
-              timeFormate: this.tableItemForm.timeFormate,
+              timeFormat: this.tableItemForm.timeFormat,
               searchFieldList: searchFieldList,
               conditionDefaultValueMap: this.conditionDefault,
               tableSql: this.getSQLStr(),
@@ -1168,7 +1169,7 @@ export default {
           //   dtName: this.tableItemForm.title,
           //   dtColumnName: JSON.stringify(columns),
           //   searchFieldList: searchFieldList,
-          //   timeFormate: this.tableItemForm.timeFormate,
+          //   timeFormat: this.tableItemForm.timeFormat,
           // });
           this.isShowForm = false;
           echoData = {};
@@ -1210,22 +1211,38 @@ export default {
         this.tableFieldList = echoData.tableFieldData;
         this.tableItemForm.tId = row.tId;
         this.tableItemForm.rowId = row.tableKey;
-        this.$set(this.tableItemForm, "isAsc", row.sortOrder);
+        this.$set(
+          this.tableItemForm,
+          "isAsc",
+          typeof row.sortOrder == "boolean"
+            ? row.sortOrder
+            : row.sortOrder == "true"
+            ? true
+            : false
+        );
         // this.tableItemForm.isAsc = row.sortOrder;
         this.tableItemForm.orderByColumn = row.orderByColumn;
         this.tableItemForm.title = row.dtName;
         this.tableItemForm.tableName = row.dtTableName;
         this.tableItemForm.selectFields = row.primaryKey;
-        this.tableItemForm.timeFormate = row.timeFormat;
+        this.tableItemForm.timeFormat = row.timeFormat;
       } else {
         this.tableItemForm.rowId = row.rowId; //未知字段
         this.tableItemForm.title = row.dtName;
         this.tableItemForm.selectFields = row.selectFields;
         this.tableItemForm.tableName = row.dtTableName;
         this.tableItemForm.orderByColumn = row.orderByColumn;
-        this.tableItemForm.timeFormate = row.timeFormat;
+        this.tableItemForm.timeFormat = row.timeFormat;
         // this.tableItemForm.isAsc = row.sortOrder;
-        this.$set(this.tableItemForm, "isAsc", row.sortOrder);
+        this.$set(
+          this.tableItemForm,
+          "isAsc",
+          typeof row.sortOrder == "boolean"
+            ? row.sortOrder
+            : row.sortOrder == "true"
+            ? true
+            : false
+        );
         this.tableItemForm.selectFields = row.primaryKey;
 
         this.getList();