Merge branch 'dev' into pr@dev@fixextratdata

backend/src/main/resources/db/migration/V54__1.18.7.sql

@@ -0,0 +1,4 @@
+UPDATE `my_plugin`
+SET `version` = '1.18.7'
+where `plugin_id` > 0
+  and `version` = '1.18.6';

frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dataease",
-  "version": "1.18.6",
+  "version": "1.18.7",
   "description": "dataease front",
   "private": true,
   "scripts": {

frontend/src/api/panel/enshrine.js

@@ -29,6 +29,6 @@ export function starStatus(panelId) {
   return request({
     url: '/api/store/status/' + panelId,
     method: 'post',
-    loading: true
+    loading: false
   })
 }

frontend/src/api/panel/linkJump.js

@@ -33,6 +33,7 @@ export function queryTargetPanelJumpInfo(requestInfo) {
 export function queryPanelJumpInfo(panelId) {
   return request({
     url: '/linkJump/queryPanelJumpInfo/' + panelId,
-    method: 'get'
+    method: 'get',
+    loading: false
   })
 }

frontend/src/api/panel/linkage.js

@@ -21,6 +21,7 @@ export function saveLinkage(requestInfo) {
 export function getPanelAllLinkageInfo(panelId) {
   return request({
     url: '/linkage/getPanelAllLinkageInfo/' + panelId,
-    method: 'get'
+    method: 'get',
+    loading: false
   })
 }

frontend/src/api/panel/panel.js

@@ -97,7 +97,7 @@ export function viewPanelLog(data) {
   return request({
     url: 'panel/group/viewLog',
     method: 'post',
-    loading: true,
+    loading: false,
     data
   })
 }

frontend/src/api/panel/pdfTemplate.js

@@ -4,6 +4,6 @@ export function queryAll() {
   return request({
     url: '/pdf-template/queryAll',
     method: 'get',
-    loading: true
+    loading: false
   })
 }

mobile/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dataease-mobile",
-  "version": "1.18.6",
+  "version": "1.18.7",
   "private": true,
   "scripts": {
     "serve": "npm run dev:h5",

pom.xml

@@ -16,7 +16,7 @@
     </parent>
 
     <properties>
-        <dataease.version>1.18.6</dataease.version>
+        <dataease.version>1.18.7</dataease.version>
     </properties>
 
     <name>dataease</name>