Merge branch 'dev' of github.com:dataease/dataease into dev

frontend/src/api/authModel/authModel.js

 import request from '@/utils/request'
 
-export function queryAuthModel(data, loading = true, timeout = 30000) {
+export function queryAuthModel(data, loading = true, timeout = 60000) {
   return request({
     url: 'authModel/queryAuthModel',
     method: 'post',
     loading: loading,
-    timeout: timeout,
     data
   })
 }

frontend/src/api/chart/chart.js

@@ -15,7 +15,6 @@ export function ajaxGetData(id, data) {
     method: 'post',
     loading: true,
     hideMsg: true,
-    timeout: 30000,
     data
   })
 }
@@ -67,7 +66,6 @@ export function ajaxGetDataOnly(id, data) {
     method: 'post',
     loading: true,
     hideMsg: true,
-    timeout: 30000,
     data
   })
 }

frontend/src/api/dataset/dataset.js

@@ -120,12 +120,11 @@ export function batchEdit(data) {
   })
 }
 
-export function post(url, data, showLoading = true, timeout = 20000) {
+export function post(url, data, showLoading = true, timeout = 60000) {
   return request({
     url: url,
     method: 'post',
     loading: showLoading,
-    timeout: timeout,
     data
   })
 }

frontend/src/api/link/index.js

@@ -68,7 +68,6 @@ export function viewInfo(id, data) {
   return request({
     url: 'api/link/viewDetail/' + id,
     method: 'post',
-    timeout: 30000,
     hideMsg: true,
     data
   })

frontend/src/api/panel/panel.js

@@ -22,7 +22,6 @@ export function querySubject(data) {
     url: '/panel/subject/query',
     method: 'post',
     loading: true,
-    timeout: 30000,
     data
   })
 }
@@ -31,27 +30,24 @@ export function querySubjectWithGroup(data) {
   return request({
     url: '/panel/subject/querySubjectWithGroup',
     method: 'post',
-    timeout: 30000,
     data
   })
 }
 
-export function defaultTree(data, loading = true, timeout = 30000) {
+export function defaultTree(data, loading = true, timeout = 60000) {
   return request({
     url: '/panel/group/defaultTree',
     method: 'post',
     loading: loading,
-    timeout: timeout,
     data
   })
 }
 
-export function groupTree(data, loading = true, timeout = 30000) {
+export function groupTree(data, loading = true, timeout = 60000) {
   return request({
     url: '/panel/group/tree',
     method: 'post',
     loading: loading,
-    timeout: timeout,
     data
   })
 }
@@ -60,7 +56,6 @@ export function viewData(id, data) {
   return request({
     url: '/chart/view/getData/' + id,
     method: 'post',
-    timeout: 30000,
     hideMsg: true,
     data
   })
@@ -69,7 +64,6 @@ export function panelSave(data) {
   return request({
     url: 'panel/group/save',
     method: 'post',
-    timeout: 30000,
     loading: true,
     data
   })
@@ -78,8 +72,7 @@ export function findOne(id) {
   return request({
     url: 'panel/group/findOne/' + id,
     method: 'get',
-    loading: true,
-    timeout: 30000
+    loading: true
   })
 }
 
@@ -94,7 +87,6 @@ export function getPreviewData(data) {
   return request({
     url: '/panel/table/getPreviewData',
     method: 'post',
-    timeout: 30000,
     data
   })
 }
@@ -133,7 +125,6 @@ export function get(url) {
 export function delGroup(groupId) {
   return request({
     url: '/panel/group/deleteCircle/' + groupId,
-    method: 'post',
-    timeout: 30000
+    method: 'post'
   })
 }

frontend/src/api/panel/pdfTemplate.js

 import request from '@/utils/request'
 
-
 export function queryAll() {
   return request({
     url: '/pdf-template/queryAll',
     method: 'get',
-    loading: true,
-    timeout: 30000
+    loading: true
   })
 }

frontend/src/api/panel/view.js

@@ -4,7 +4,6 @@ export function tree(data) {
   return request({
     url: '/api/panelView/tree',
     method: 'post',
-    timeout: 30000,
     data
   })
 }
@@ -13,7 +12,6 @@ export function viewsWithIds(data) {
   return request({
     url: '/api/panelView/viewsWithIds',
     method: 'post',
-    timeout: 30000,
     loading: true,
     data
   })
@@ -23,7 +21,6 @@ export function findOne(id) {
   return request({
     url: '/api/panelView/findOne/' + id,
     method: 'get',
-    timeout: 30000,
     loading: true
   })
 }

frontend/src/api/system/email.js

@@ -4,7 +4,6 @@ export function validate(data) {
   return request({
     url: '/system/testConnection',
     method: 'post',
-    timeout: 30000,
     loading: true,
     data
 

frontend/src/api/system/template.js

@@ -4,14 +4,12 @@ export function save(data) {
   return request({
     url: '/template/save',
     data: data,
-    timeout: 60000,
     method: 'post'
   })
 }
 export function templateDelete(id) {
   return request({
     url: '/template/delete/' + id,
-    timeout: 60000,
     method: 'delete'
   })
 }
@@ -19,7 +17,6 @@ export function templateDelete(id) {
 export function showTemplateList(data) {
   return request({
     url: '/template/templateList',
-    timeout: 60000,
     data: data,
     method: 'post'
   })
@@ -28,7 +25,6 @@ export function showTemplateList(data) {
 export function findOne(id) {
   return request({
     url: '/template/findOne/' + id,
-    timeout: 60000,
     method: 'get'
   })
 }
@@ -36,7 +32,6 @@ export function findOne(id) {
 export function find(data) {
   return request({
     url: '/template/find',
-    timeout: 60000,
     data: data,
     method: 'post'
   })

frontend/src/views/panel/edit/index.vue

@@ -313,7 +313,8 @@ export default {
         'de-show-date',
         'de-video'
       ],
-      enableSureButton: false
+      enableSureButton: false,
+      filterFromDrag: false
     }
   },
 
@@ -628,7 +629,7 @@ export default {
 
         if (this.currentWidget.filterDialog) {
           this.show = false
-          this.openFilterDialog()
+          this.openFilterDialog(true)
           return
         }
         component = deepCopy(this.currentFilterCom)
@@ -676,7 +677,8 @@ export default {
         this.$store.commit('hideContextMenu')
       }
     },
-    openFilterDialog() {
+    openFilterDialog(fromDrag = false) {
+      this.filterFromDrag = fromDrag
       this.filterVisible = true
     },
     closeFilter() {
@@ -686,7 +688,9 @@ export default {
     },
     cancelFilter() {
       this.closeFilter()
-      bus.$emit('onRemoveLastItem')
+      if(this.filterFromDrag){
+        bus.$emit('onRemoveLastItem')
+      }
     },
     sureFilter() {
       this.currentFilterCom = this.$refs['filter-setting-' + this.currentFilterCom.id].getElementInfo()

frontend/src/views/panel/filter/defaultValue/DeDateRangeDefault.vue

@@ -37,7 +37,7 @@
             v-model="element.options.attrs.default.sDynamicPrefix"
             type="number"
             size="mini"
-            :min="1"
+            :min="0"
             :max="10"
             @input="sDynamicPrefixChange"
           />
@@ -90,7 +90,7 @@
             v-model="element.options.attrs.default.eDynamicPrefix"
             type="number"
             size="mini"
-            :min="1"
+            :min="0"
             :max="10"
             @input="eDynamicPrefixChange"
           />
@@ -189,16 +189,16 @@ export default {
     },
 
     sDynamicPrefixChange(value) {
-      if (value < 1) {
-        value = 1
-        this.element.options.attrs.default.sDynamicPrefix = 1
+      if (value < 0) {
+        value = 0
+        this.element.options.attrs.default.sDynamicPrefix = 0
       }
       this.setDval()
     },
     eDynamicPrefixChange(value) {
-      if (value < 1) {
-        value = 1
-        this.element.options.attrs.default.eDynamicPrefix = 1
+      if (value < 0) {
+        value = 0
+        this.element.options.attrs.default.eDynamicPrefix = 0
       }
       this.setDval()
     },