放开500异常拦截

zkqy-ui/src/utils/request.js

@@ -95,9 +95,9 @@ service.interceptors.response.use(res => {
     return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
   } else if (code === 500) {
     console.log(msg);
-    // Message({ message: msg, type: 'error' })
-    // return Promise.reject(new Error(msg))
-    return Promise.resolve()
+    Message({ message: msg, type: 'error' })
+    return Promise.reject(new Error(msg))
+    // return Promise.resolve()
   } else if (code === 601) {
     Message({ message: msg, type: 'warning' })
     return Promise.reject('error')

zkqy-ui/src/views/login.vue

@@ -171,8 +171,10 @@ export default {
     return {
       codeUrl: "",
       loginForm: {
-        username: "admin",
-        password: "admin123",
+        username: "",
+        password: "",
+        // username: "admin",
+        // password: "admin123",
         rememberMe: false,
         code: "",
         uuid: "",

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

@@ -276,7 +276,9 @@
                 :label="item.tableComment"
                 :value="item.tableName"
               >
-                <span style="float: left">{{ item.tableComment }}</span>
+                <span class="discribe" style="float: left">{{
+                  item.tableComment
+                }}</span>
                 <span style="float: right; color: #8492a6; font-size: 13px">{{
                   item.tableName
                 }}</span>
@@ -784,6 +786,7 @@ export default {
     },
     isSearchBtn() {
       if (this.relyOption == 0) {
+        //自定义依赖值
         this.conditionDefault[this.isSearchIndex] =
           this.conditionDefaultValueMap;
       } else {
@@ -798,7 +801,7 @@ export default {
           "." +
           this.conditionDefaultValueMap;
       }
-
+      console.log(this.conditionDefault);
       this.isSearchDialog = false;
       this.conditionDefaultValueMap = "";
       this.relyFileds.tableName = "";
@@ -1124,19 +1127,44 @@ export default {
               tableFieldData: this.tableFieldList,
             };
             console.log("123456", echoData);
-            this.tableDataList.forEach((item, index) => {
-              if (item.tId == this.tableItemForm.tId) {
-                item.conditionDefaultValueMap = this.conditionDefault;
-                console.log(this.conditionDefault);
-                item.echoData = JSON.stringify(echoData);
-                item.sortOrder = this.tableItemForm.isAsc;
-                item.orderByColumn = this.tableItemForm.orderByColumn;
-                item.primaryKey = this.tableItemForm.selectFields;
-                item.dtTableName = this.tableItemForm.tableName;
-                item.dtName = this.tableItemForm.title;
-                item.dtColumnName = JSON.stringify(columns);
-                item.searchFieldList = searchFieldList;
-              }
+            // this.tableDataList.forEach((item, index) => {
+            //   console.log(item, this.tableItemForm);
+            //   if (item.tId == this.tableItemForm.tId) {
+            //     item.conditionDefaultValueMap = this.conditionDefault;
+            //     console.log(this.conditionDefault);
+            //     item.echoData = JSON.stringify(echoData);
+            //     item.sortOrder = this.tableItemForm.isAsc;
+            //     item.orderByColumn = this.tableItemForm.orderByColumn;
+            //     item.primaryKey = this.tableItemForm.selectFields;
+            //     item.dtTableName = this.tableItemForm.tableName;
+            //     item.dtName = this.tableItemForm.title;
+            //     item.dtColumnName = JSON.stringify(columns);
+            //     item.searchFieldList = searchFieldList;
+            //   }
+            // });
+            console.log(this.tableDataList, this.editIndex);
+            // this.tableDataList[this.editIndex] = {
+            //   iconditionDefaultValueMap: this.conditionDefault,
+            //   echoData: JSON.stringify(echoData),
+            //   sortOrder: this.tableItemForm.isAsc,
+            //   orderByColumn: this.tableItemForm.orderByColumn,
+            //   primaryKey: this.tableItemForm.selectFields,
+            //   dtTableName: this.tableItemForm.tableName,
+            //   dtName: this.tableItemForm.title,
+            //   dtColumnName: JSON.stringify(columns),
+            //   searchFieldList: searchFieldList,
+            // };
+            this.$set(this.tableDataList, this.editIndex, {
+              iconditionDefaultValueMap: this.conditionDefault,
+              echoData: JSON.stringify(echoData),
+              sortOrder: this.tableItemForm.isAsc,
+              orderByColumn: this.tableItemForm.orderByColumn,
+              primaryKey: this.tableItemForm.selectFields,
+              dtTableName: this.tableItemForm.tableName,
+              dtName: this.tableItemForm.title,
+              dtColumnName: JSON.stringify(columns),
+              searchFieldList: searchFieldList,
+              timeFormate: this.tableItemForm.timeFormate,
             });
           }
           this.isShowForm = false;
@@ -1186,12 +1214,14 @@ export default {
         this.tableItemForm.selectFields = row.primaryKey;
         this.tableItemForm.timeFormate = row.timeFormat;
       } else {
-        (this.tableItemForm.rowId = row.rowId),
-          (this.tableItemForm.title = row.dtName);
+        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.isAsc = row.sortOrder;
+        this.tableItemForm.selectFields = row.primaryKey;
 
         this.getList();
         this.groupList.forEach((item) => {
@@ -1626,15 +1656,16 @@ export default {
       }
       if (!this.groupTitle) {
         // console.log(this.tableDataList[this.tableDataList.length-1].dtTableName)
-
+        console.log(this.relyFileds, this.groupTitle);
         this.relyFileds.tableName =
-          this.tableDataList[this.tableDataList.length - 1].dtTableName;
-
-        let echoData = JSON.parse(
-          this.tableDataList[this.tableDataList.length - 1].echoData
-        );
-
-        this.relyFileds.tableFieldList = echoData.tableFieldData;
+          this.tableDataList[this.tableDataList.length - 1]?.dtTableName;
+        if (this.tableDataList[this.tableDataList.length - 1]?.echoData) {
+          //是否有需要回显的数据
+          let echoData = JSON.parse(
+            this.tableDataList[this.tableDataList.length - 1]?.echoData
+          );
+          this.relyFileds.tableFieldList = echoData.tableFieldData;
+        }
       }
       this.getAllTable();
       // 注意校验最后一条数据是否合法
@@ -1661,6 +1692,13 @@ export default {
 };
 </script>
 <style scoped lang="scss">
+.discribe {
+  display: block;
+  max-width: 200px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
 ::v-deep .el-dialog:not(.is-fullscreen) {
   width: 900px !important;
 }