Merge branch 'dev' into pr@dev@fix_oidc_exit_error

frontend/src/api/appTemplateMarket/log.js

@@ -11,7 +11,7 @@ export function logGrid(page, size, data) {
 
 export function opTypes() {
   return request({
-    url: '/api/log/opTypes',
+    url: '/app/log/opTypes',
     method: 'post',
     loading: true
   })
@@ -19,10 +19,19 @@ export function opTypes() {
 
 export function exportExcel(data) {
   return request({
-    url: '/api/log/export',
+    url: '/app/log/export',
     method: 'post',
     loading: true,
     responseType: 'blob',
     data
   })
 }
+
+export function deleteLogAndResource(data) {
+  return request({
+    url: '/app/log/deleteLog',
+    method: 'post',
+    data,
+    loading: true
+  })
+}

frontend/src/api/panel/panel.js

@@ -313,7 +313,33 @@ export function appApply(data) {
   return request({
     url: 'panel/group/appApply',
     method: 'post',
-    loading: true,
+    loading: false,
     data
   })
 }
+
+export function appEdit(data) {
+  return request({
+    url: 'panel/group/appEdit',
+    method: 'post',
+    loading: false,
+    data
+  })
+}
+
+export function editApply(data) {
+  return request({
+    url: 'panel/group/appApply',
+    method: 'post',
+    loading: false,
+    data
+  })
+}
+
+export function findOneWithParent(panelId) {
+  return request({
+    url: 'panel/group/findOneWithParent/' + panelId,
+    method: 'get',
+    loading: false
+  })
+}