diff --git a/template/admin/src/pages/setting/systemOutInterface/index.vue b/template/admin/src/pages/setting/systemOutInterface/index.vue
index 0af83f869..72b4e9335 100644
--- a/template/admin/src/pages/setting/systemOutInterface/index.vue
+++ b/template/admin/src/pages/setting/systemOutInterface/index.vue
@@ -90,7 +90,7 @@
{{ formValidate.name }}
-
+
diff --git a/template/admin/src/pages/system/backendRouting/debugging.vue b/template/admin/src/pages/system/backendRouting/debugging.vue
index 456b97a81..c7509116c 100644
--- a/template/admin/src/pages/system/backendRouting/debugging.vue
+++ b/template/admin/src/pages/system/backendRouting/debugging.vue
@@ -42,7 +42,15 @@
-
+ {
+ handleChange(val, row, 'xTable');
+ }
+ "
+ >
- 插入
删除
@@ -98,7 +110,15 @@
-
+ {
+ handleChange(val, row, 'yTable');
+ }
+ "
+ >
- 插入
删除
@@ -154,7 +178,15 @@
-
+ {
+ handleChange(val, row, 'zTable');
+ }
+ "
+ >
- 插入
删除
@@ -267,6 +303,21 @@ export default {
},
mounted() {},
methods: {
+ async handleChange(e, row, type) {
+ console.log(type, row);
+ if (e.value !== 'array' && e.value !== 'object') {
+ if (row.children.length) {
+ let arr = this.$refs[type].getTableData().tableData;
+ let id = row.children[0].parentId;
+ const $table = this.$refs[type];
+ for (let i = 0; i < arr.length; i++) {
+ if (arr[i].parentId == id) {
+ await $table.remove(arr[i]);
+ }
+ }
+ }
+ }
+ },
insertCopy() {
this.$copyText(this.codes)
.then((message) => {
@@ -277,8 +328,6 @@ export default {
});
},
async requestData() {
- console.log(this.$refs.xTable.getTableData().tableData);
- console.log(this.filtersData((await this.$refs.xTable.getTableData().tableData) || []));
let url, method, params, body, headers;
url = this.interfaceData.app_name + '/' + this.interfaceData.path;
method = this.interfaceData.method;
@@ -286,7 +335,6 @@ export default {
body = this.filtersData((await this.$refs.yTable.getTableData().tableData) || []);
let h = this.filtersData((await this.$refs.zTable.getTableData().tableData) || []);
let h1 = this.filtersData((await this.$refs.zaTable.getTableData().tableData) || []);
- console.log(this.interfaceData, h, h1);
headers = {
...h,
...h1,
@@ -308,8 +356,16 @@ export default {
if (!e.parentId) {
for (let i in e) {
if (i == 'attribute') {
- console.log(e);
- if (e.type !== 'array') {
+ console.log(e.type);
+ if (e.type === 'object') {
+ let obj = {};
+
+ e.children.map((item, index) => {
+ obj = this.filtersObj(item, 1);
+ });
+ console.log(obj, 'objobjobj');
+ x[e[i]] = obj;
+ } else if (e.type !== 'array') {
x[e[i]] = e.value || '';
} else {
let arr = [];
@@ -327,12 +383,25 @@ export default {
console.log(error);
}
},
- filtersObj(obj) {
+ // type 1 为obj属性
+ filtersObj(obj, type) {
let x = {};
for (let i in obj) {
if (i == 'attribute') {
- if (obj.type !== 'array') {
- x[obj[i]] = obj.value || '';
+ console.log(obj, 'obj111');
+ if (obj.type === 'object') {
+ let oj = {};
+ obj.children.map((item, index) => {
+ oj[obj.attribute] = this.filtersObj(item);
+ });
+ console.log(oj, 'oj');
+ x = oj;
+ } else if (obj.type !== 'array') {
+ if (type) {
+ x[obj.attribute] = obj.value || '';
+ } else {
+ x[obj[i]] = obj.value || '';
+ }
} else {
let arr = [];
obj.children.map((item, index) => {
@@ -346,8 +415,7 @@ export default {
},
changeTab(name) {
if (name === 'Header') {
- console.log(this.interfaceData.headerData);
- if (!this.interfaceData.headerData) {
+ if (!this.$refs.zTable.getTableData().tableData.length) {
this.insertEvent('zTable', {
attribute: 'Content-Type',
value: 'application/x-www-form-urlencoded',
diff --git a/template/admin/src/pages/system/backendRouting/index.vue b/template/admin/src/pages/system/backendRouting/index.vue
index 35e6651d1..a60d43237 100644
--- a/template/admin/src/pages/system/backendRouting/index.vue
+++ b/template/admin/src/pages/system/backendRouting/index.vue
@@ -470,6 +470,10 @@ export default {
value: 'array',
label: 'Array',
},
+ {
+ value: 'object',
+ label: 'Object',
+ },
{
value: 'number',
label: 'Number',
@@ -530,7 +534,7 @@ export default {
this.methodColor = '#49cc90';
} else if (method == 'PUT') {
this.methodColor = '#fca130';
- } else if (method == 'DELETE') {
+ } else if (method == 'DEL' || method == 'DELETE') {
this.methodColor = '#f93e3e';
}
},
@@ -567,7 +571,7 @@ export default {
return '#49cc90';
} else if (method == 'PUT') {
return '#fca130';
- } else if (method == 'DELETE') {
+ } else if (method == 'DEL' || method == 'DELETE') {
return '#f93e3e';
}
},
@@ -1070,6 +1074,7 @@ export default {
.text-area {
white-space: pre-wrap;
+ word-break: break-word;
}
}
diff --git a/template/admin/src/pages/system/backendRouting/request.js b/template/admin/src/pages/system/backendRouting/request.js
index 9b64e1c18..1baa77b15 100644
--- a/template/admin/src/pages/system/backendRouting/request.js
+++ b/template/admin/src/pages/system/backendRouting/request.js
@@ -66,7 +66,7 @@ service.interceptors.response.use(
}
},
(error) => {
- return Promise.reject(error);
+ // return Promise.reject(error);
},
);
export default service;
diff --git a/template/admin/src/pages/system/codeGeneration/index.vue b/template/admin/src/pages/system/codeGeneration/index.vue
index 649581603..c67a53451 100644
--- a/template/admin/src/pages/system/codeGeneration/index.vue
+++ b/template/admin/src/pages/system/codeGeneration/index.vue
@@ -1,5 +1,5 @@
-