提交 df3a88a0 authored 作者: taojinlong's avatar taojinlong

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

import request from '@/utils/request' import request from '@/utils/request'
export function queryAuthModel(data, loading = true, timeout = 30000) { export function queryAuthModel(data, loading = true, timeout = 60000) {
return request({ return request({
url: 'authModel/queryAuthModel', url: 'authModel/queryAuthModel',
method: 'post', method: 'post',
loading: loading, loading: loading,
timeout: timeout,
data data
}) })
} }
...@@ -15,7 +15,6 @@ export function ajaxGetData(id, data) { ...@@ -15,7 +15,6 @@ export function ajaxGetData(id, data) {
method: 'post', method: 'post',
loading: true, loading: true,
hideMsg: true, hideMsg: true,
timeout: 30000,
data data
}) })
} }
...@@ -67,7 +66,6 @@ export function ajaxGetDataOnly(id, data) { ...@@ -67,7 +66,6 @@ export function ajaxGetDataOnly(id, data) {
method: 'post', method: 'post',
loading: true, loading: true,
hideMsg: true, hideMsg: true,
timeout: 30000,
data data
}) })
} }
...@@ -120,12 +120,11 @@ export function batchEdit(data) { ...@@ -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({ return request({
url: url, url: url,
method: 'post', method: 'post',
loading: showLoading, loading: showLoading,
timeout: timeout,
data data
}) })
} }
......
...@@ -68,7 +68,6 @@ export function viewInfo(id, data) { ...@@ -68,7 +68,6 @@ export function viewInfo(id, data) {
return request({ return request({
url: 'api/link/viewDetail/' + id, url: 'api/link/viewDetail/' + id,
method: 'post', method: 'post',
timeout: 30000,
hideMsg: true, hideMsg: true,
data data
}) })
......
...@@ -22,7 +22,6 @@ export function querySubject(data) { ...@@ -22,7 +22,6 @@ export function querySubject(data) {
url: '/panel/subject/query', url: '/panel/subject/query',
method: 'post', method: 'post',
loading: true, loading: true,
timeout: 30000,
data data
}) })
} }
...@@ -31,27 +30,24 @@ export function querySubjectWithGroup(data) { ...@@ -31,27 +30,24 @@ export function querySubjectWithGroup(data) {
return request({ return request({
url: '/panel/subject/querySubjectWithGroup', url: '/panel/subject/querySubjectWithGroup',
method: 'post', method: 'post',
timeout: 30000,
data data
}) })
} }
export function defaultTree(data, loading = true, timeout = 30000) { export function defaultTree(data, loading = true, timeout = 60000) {
return request({ return request({
url: '/panel/group/defaultTree', url: '/panel/group/defaultTree',
method: 'post', method: 'post',
loading: loading, loading: loading,
timeout: timeout,
data data
}) })
} }
export function groupTree(data, loading = true, timeout = 30000) { export function groupTree(data, loading = true, timeout = 60000) {
return request({ return request({
url: '/panel/group/tree', url: '/panel/group/tree',
method: 'post', method: 'post',
loading: loading, loading: loading,
timeout: timeout,
data data
}) })
} }
...@@ -60,7 +56,6 @@ export function viewData(id, data) { ...@@ -60,7 +56,6 @@ export function viewData(id, data) {
return request({ return request({
url: '/chart/view/getData/' + id, url: '/chart/view/getData/' + id,
method: 'post', method: 'post',
timeout: 30000,
hideMsg: true, hideMsg: true,
data data
}) })
...@@ -69,7 +64,6 @@ export function panelSave(data) { ...@@ -69,7 +64,6 @@ export function panelSave(data) {
return request({ return request({
url: 'panel/group/save', url: 'panel/group/save',
method: 'post', method: 'post',
timeout: 30000,
loading: true, loading: true,
data data
}) })
...@@ -78,8 +72,7 @@ export function findOne(id) { ...@@ -78,8 +72,7 @@ export function findOne(id) {
return request({ return request({
url: 'panel/group/findOne/' + id, url: 'panel/group/findOne/' + id,
method: 'get', method: 'get',
loading: true, loading: true
timeout: 30000
}) })
} }
...@@ -94,7 +87,6 @@ export function getPreviewData(data) { ...@@ -94,7 +87,6 @@ export function getPreviewData(data) {
return request({ return request({
url: '/panel/table/getPreviewData', url: '/panel/table/getPreviewData',
method: 'post', method: 'post',
timeout: 30000,
data data
}) })
} }
...@@ -133,7 +125,6 @@ export function get(url) { ...@@ -133,7 +125,6 @@ export function get(url) {
export function delGroup(groupId) { export function delGroup(groupId) {
return request({ return request({
url: '/panel/group/deleteCircle/' + groupId, url: '/panel/group/deleteCircle/' + groupId,
method: 'post', method: 'post'
timeout: 30000
}) })
} }
import request from '@/utils/request' import request from '@/utils/request'
export function queryAll() { export function queryAll() {
return request({ return request({
url: '/pdf-template/queryAll', url: '/pdf-template/queryAll',
method: 'get', method: 'get',
loading: true, loading: true
timeout: 30000
}) })
} }
...@@ -4,7 +4,6 @@ export function tree(data) { ...@@ -4,7 +4,6 @@ export function tree(data) {
return request({ return request({
url: '/api/panelView/tree', url: '/api/panelView/tree',
method: 'post', method: 'post',
timeout: 30000,
data data
}) })
} }
...@@ -13,7 +12,6 @@ export function viewsWithIds(data) { ...@@ -13,7 +12,6 @@ export function viewsWithIds(data) {
return request({ return request({
url: '/api/panelView/viewsWithIds', url: '/api/panelView/viewsWithIds',
method: 'post', method: 'post',
timeout: 30000,
loading: true, loading: true,
data data
}) })
...@@ -23,7 +21,6 @@ export function findOne(id) { ...@@ -23,7 +21,6 @@ export function findOne(id) {
return request({ return request({
url: '/api/panelView/findOne/' + id, url: '/api/panelView/findOne/' + id,
method: 'get', method: 'get',
timeout: 30000,
loading: true loading: true
}) })
} }
......
...@@ -4,7 +4,6 @@ export function validate(data) { ...@@ -4,7 +4,6 @@ export function validate(data) {
return request({ return request({
url: '/system/testConnection', url: '/system/testConnection',
method: 'post', method: 'post',
timeout: 30000,
loading: true, loading: true,
data data
......
...@@ -4,14 +4,12 @@ export function save(data) { ...@@ -4,14 +4,12 @@ export function save(data) {
return request({ return request({
url: '/template/save', url: '/template/save',
data: data, data: data,
timeout: 60000,
method: 'post' method: 'post'
}) })
} }
export function templateDelete(id) { export function templateDelete(id) {
return request({ return request({
url: '/template/delete/' + id, url: '/template/delete/' + id,
timeout: 60000,
method: 'delete' method: 'delete'
}) })
} }
...@@ -19,7 +17,6 @@ export function templateDelete(id) { ...@@ -19,7 +17,6 @@ export function templateDelete(id) {
export function showTemplateList(data) { export function showTemplateList(data) {
return request({ return request({
url: '/template/templateList', url: '/template/templateList',
timeout: 60000,
data: data, data: data,
method: 'post' method: 'post'
}) })
...@@ -28,7 +25,6 @@ export function showTemplateList(data) { ...@@ -28,7 +25,6 @@ export function showTemplateList(data) {
export function findOne(id) { export function findOne(id) {
return request({ return request({
url: '/template/findOne/' + id, url: '/template/findOne/' + id,
timeout: 60000,
method: 'get' method: 'get'
}) })
} }
...@@ -36,7 +32,6 @@ export function findOne(id) { ...@@ -36,7 +32,6 @@ export function findOne(id) {
export function find(data) { export function find(data) {
return request({ return request({
url: '/template/find', url: '/template/find',
timeout: 60000,
data: data, data: data,
method: 'post' method: 'post'
}) })
......
...@@ -313,7 +313,8 @@ export default { ...@@ -313,7 +313,8 @@ export default {
'de-show-date', 'de-show-date',
'de-video' 'de-video'
], ],
enableSureButton: false enableSureButton: false,
filterFromDrag: false
} }
}, },
...@@ -628,7 +629,7 @@ export default { ...@@ -628,7 +629,7 @@ export default {
if (this.currentWidget.filterDialog) { if (this.currentWidget.filterDialog) {
this.show = false this.show = false
this.openFilterDialog() this.openFilterDialog(true)
return return
} }
component = deepCopy(this.currentFilterCom) component = deepCopy(this.currentFilterCom)
...@@ -676,7 +677,8 @@ export default { ...@@ -676,7 +677,8 @@ export default {
this.$store.commit('hideContextMenu') this.$store.commit('hideContextMenu')
} }
}, },
openFilterDialog() { openFilterDialog(fromDrag = false) {
this.filterFromDrag = fromDrag
this.filterVisible = true this.filterVisible = true
}, },
closeFilter() { closeFilter() {
...@@ -686,7 +688,9 @@ export default { ...@@ -686,7 +688,9 @@ export default {
}, },
cancelFilter() { cancelFilter() {
this.closeFilter() this.closeFilter()
bus.$emit('onRemoveLastItem') if(this.filterFromDrag){
bus.$emit('onRemoveLastItem')
}
}, },
sureFilter() { sureFilter() {
this.currentFilterCom = this.$refs['filter-setting-' + this.currentFilterCom.id].getElementInfo() this.currentFilterCom = this.$refs['filter-setting-' + this.currentFilterCom.id].getElementInfo()
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
v-model="element.options.attrs.default.sDynamicPrefix" v-model="element.options.attrs.default.sDynamicPrefix"
type="number" type="number"
size="mini" size="mini"
:min="1" :min="0"
:max="10" :max="10"
@input="sDynamicPrefixChange" @input="sDynamicPrefixChange"
/> />
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
v-model="element.options.attrs.default.eDynamicPrefix" v-model="element.options.attrs.default.eDynamicPrefix"
type="number" type="number"
size="mini" size="mini"
:min="1" :min="0"
:max="10" :max="10"
@input="eDynamicPrefixChange" @input="eDynamicPrefixChange"
/> />
...@@ -189,16 +189,16 @@ export default { ...@@ -189,16 +189,16 @@ export default {
}, },
sDynamicPrefixChange(value) { sDynamicPrefixChange(value) {
if (value < 1) { if (value < 0) {
value = 1 value = 0
this.element.options.attrs.default.sDynamicPrefix = 1 this.element.options.attrs.default.sDynamicPrefix = 0
} }
this.setDval() this.setDval()
}, },
eDynamicPrefixChange(value) { eDynamicPrefixChange(value) {
if (value < 1) { if (value < 0) {
value = 1 value = 0
this.element.options.attrs.default.eDynamicPrefix = 1 this.element.options.attrs.default.eDynamicPrefix = 0
} }
this.setDval() this.setDval()
}, },
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论