Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
dataease
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
zhu
dataease
Commits
594d20eb
提交
594d20eb
authored
7月 28, 2021
作者:
wangjiahao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactor:代码格式化
上级
343ea393
显示空白字符变更
内嵌
并排
正在显示
13 个修改的文件
包含
41 行增加
和
64 行删除
+41
-64
ExtPanelViewMapper.java
.../java/io/dataease/base/mapper/ext/ExtPanelViewMapper.java
+0
-1
ExtSysMsgMapper.java
...ain/java/io/dataease/base/mapper/ext/ExtSysMsgMapper.java
+0
-1
ExcelReaderUtil.java
.../main/java/io/dataease/commons/utils/ExcelReaderUtil.java
+0
-2
ExcelXlsReader.java
...c/main/java/io/dataease/commons/utils/ExcelXlsReader.java
+0
-3
ExcelXlsxReader.java
.../main/java/io/dataease/commons/utils/ExcelXlsxReader.java
+0
-4
ChartFieldCustomFilterDTO.java
...java/io/dataease/dto/chart/ChartFieldCustomFilterDTO.java
+0
-1
DataSetTaskDTO.java
...src/main/java/io/dataease/dto/dataset/DataSetTaskDTO.java
+0
-1
DataSetTableTaskService.java
.../io/dataease/service/dataset/DataSetTableTaskService.java
+0
-4
PanelViewService.java
...main/java/io/dataease/service/panel/PanelViewService.java
+0
-3
SysUserService.java
...src/main/java/io/dataease/service/sys/SysUserService.java
+0
-1
.eslintrc.js
frontend/.eslintrc.js
+1
-1
demo.css
frontend/src/components/canvas/assets/iconfont/demo.css
+22
-22
UpdateInfo.vue
frontend/src/views/dataset/data/UpdateInfo.vue
+18
-20
没有找到文件。
backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelViewMapper.java
浏览文件 @
594d20eb
package
io
.
dataease
.
base
.
mapper
.
ext
;
package
io
.
dataease
.
base
.
mapper
.
ext
;
import
io.dataease.base.domain.PanelView
;
import
io.dataease.dto.panel.PanelViewDto
;
import
io.dataease.dto.panel.PanelViewDto
;
import
io.dataease.dto.panel.po.PanelViewInsertDTO
;
import
io.dataease.dto.panel.po.PanelViewInsertDTO
;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.ibatis.annotations.Param
;
...
...
backend/src/main/java/io/dataease/base/mapper/ext/ExtSysMsgMapper.java
浏览文件 @
594d20eb
...
@@ -2,7 +2,6 @@ package io.dataease.base.mapper.ext;
...
@@ -2,7 +2,6 @@ package io.dataease.base.mapper.ext;
import
io.dataease.base.domain.SysMsgExample
;
import
io.dataease.base.domain.SysMsgExample
;
import
io.dataease.base.domain.SysMsgSetting
;
import
io.dataease.base.domain.SysMsgSetting
;
import
io.dataease.controller.message.dto.BatchSettingRequest
;
import
io.dataease.controller.message.dto.MsgGridDto
;
import
io.dataease.controller.message.dto.MsgGridDto
;
import
org.apache.ibatis.annotations.Delete
;
import
org.apache.ibatis.annotations.Delete
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Mapper
;
...
...
backend/src/main/java/io/dataease/commons/utils/ExcelReaderUtil.java
浏览文件 @
594d20eb
...
@@ -4,9 +4,7 @@ import io.dataease.datasource.dto.TableFiled;
...
@@ -4,9 +4,7 @@ import io.dataease.datasource.dto.TableFiled;
import
java.io.FileInputStream
;
import
java.io.FileInputStream
;
import
java.io.InputStream
;
import
java.io.InputStream
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
public
class
ExcelReaderUtil
{
public
class
ExcelReaderUtil
{
//excel2003扩展名
//excel2003扩展名
...
...
backend/src/main/java/io/dataease/commons/utils/ExcelXlsReader.java
浏览文件 @
594d20eb
package
io
.
dataease
.
commons
.
utils
;
package
io
.
dataease
.
commons
.
utils
;
import
com.google.gson.Gson
;
import
io.dataease.datasource.dto.TableFiled
;
import
io.dataease.datasource.dto.TableFiled
;
import
io.dataease.dto.dataset.ExcelSheetData
;
import
io.dataease.dto.dataset.ExcelSheetData
;
import
io.dataease.i18n.Translator
;
import
io.dataease.i18n.Translator
;
import
org.apache.poi.hssf.eventusermodel.*
;
import
org.apache.poi.hssf.eventusermodel.*
;
import
org.apache.poi.hssf.eventusermodel.dummyrecord.LastCellOfRowDummyRecord
;
import
org.apache.poi.hssf.eventusermodel.dummyrecord.LastCellOfRowDummyRecord
;
import
org.apache.poi.hssf.eventusermodel.dummyrecord.MissingCellDummyRecord
;
import
org.apache.poi.hssf.eventusermodel.dummyrecord.MissingCellDummyRecord
;
import
org.apache.poi.hssf.model.HSSFFormulaParser
;
import
org.apache.poi.hssf.record.*
;
import
org.apache.poi.hssf.record.*
;
import
org.apache.poi.hssf.usermodel.HSSFDataFormatter
;
import
org.apache.poi.hssf.usermodel.HSSFDataFormatter
;
import
org.apache.poi.hssf.usermodel.HSSFWorkbook
;
import
org.apache.poi.hssf.usermodel.HSSFWorkbook
;
import
org.apache.poi.poifs.filesystem.POIFSFileSystem
;
import
org.apache.poi.poifs.filesystem.POIFSFileSystem
;
import
java.io.FileInputStream
;
import
java.io.InputStream
;
import
java.io.InputStream
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
...
...
backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java
浏览文件 @
594d20eb
package
io
.
dataease
.
commons
.
utils
;
package
io
.
dataease
.
commons
.
utils
;
import
com.google.gson.Gson
;
import
io.dataease.datasource.dto.TableFiled
;
import
io.dataease.datasource.dto.TableFiled
;
import
io.dataease.dto.dataset.ExcelSheetData
;
import
io.dataease.dto.dataset.ExcelSheetData
;
import
io.dataease.i18n.Translator
;
import
io.dataease.i18n.Translator
;
import
io.dataease.service.message.MsgAop
;
import
org.apache.commons.collections4.CollectionUtils
;
import
org.apache.commons.collections4.CollectionUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.poi.openxml4j.opc.OPCPackage
;
import
org.apache.poi.openxml4j.opc.OPCPackage
;
import
org.apache.poi.ss.usermodel.BuiltinFormats
;
import
org.apache.poi.ss.usermodel.DataFormatter
;
import
org.apache.poi.ss.usermodel.DataFormatter
;
import
org.apache.poi.xssf.eventusermodel.XSSFReader
;
import
org.apache.poi.xssf.eventusermodel.XSSFReader
;
import
org.apache.poi.xssf.model.SharedStringsTable
;
import
org.apache.poi.xssf.model.SharedStringsTable
;
...
...
backend/src/main/java/io/dataease/dto/chart/ChartFieldCustomFilterDTO.java
浏览文件 @
594d20eb
package
io
.
dataease
.
dto
.
chart
;
package
io
.
dataease
.
dto
.
chart
;
import
io.dataease.base.domain.DatasetTableField
;
import
lombok.Getter
;
import
lombok.Getter
;
import
lombok.Setter
;
import
lombok.Setter
;
...
...
backend/src/main/java/io/dataease/dto/dataset/DataSetTaskDTO.java
浏览文件 @
594d20eb
package
io
.
dataease
.
dto
.
dataset
;
package
io
.
dataease
.
dto
.
dataset
;
import
io.dataease.base.domain.DatasetTableTask
;
import
io.dataease.base.domain.DatasetTableTask
;
import
io.dataease.base.domain.DatasetTableTaskLog
;
import
lombok.Getter
;
import
lombok.Getter
;
import
lombok.Setter
;
import
lombok.Setter
;
...
...
backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java
浏览文件 @
594d20eb
package
io
.
dataease
.
service
.
dataset
;
package
io
.
dataease
.
service
.
dataset
;
import
com.google.gson.Gson
;
import
io.dataease.base.domain.*
;
import
io.dataease.base.domain.*
;
import
io.dataease.base.mapper.DatasetTableMapper
;
import
io.dataease.base.mapper.DatasetTableMapper
;
import
io.dataease.base.mapper.DatasetTableTaskMapper
;
import
io.dataease.base.mapper.DatasetTableTaskMapper
;
...
@@ -14,8 +13,6 @@ import io.dataease.commons.constants.TriggerType;
...
@@ -14,8 +13,6 @@ import io.dataease.commons.constants.TriggerType;
import
io.dataease.controller.request.dataset.DataSetTaskRequest
;
import
io.dataease.controller.request.dataset.DataSetTaskRequest
;
import
io.dataease.controller.sys.base.BaseGridRequest
;
import
io.dataease.controller.sys.base.BaseGridRequest
;
import
io.dataease.controller.sys.base.ConditionEntity
;
import
io.dataease.controller.sys.base.ConditionEntity
;
import
io.dataease.controller.sys.response.SysUserGridResponse
;
import
io.dataease.controller.sys.response.SysUserRole
;
import
io.dataease.dto.dataset.DataSetTaskDTO
;
import
io.dataease.dto.dataset.DataSetTaskDTO
;
import
io.dataease.exception.DataEaseException
;
import
io.dataease.exception.DataEaseException
;
import
io.dataease.i18n.Translator
;
import
io.dataease.i18n.Translator
;
...
@@ -32,7 +29,6 @@ import javax.annotation.Resource;
...
@@ -32,7 +29,6 @@ import javax.annotation.Resource;
import
java.util.Arrays
;
import
java.util.Arrays
;
import
java.util.List
;
import
java.util.List
;
import
java.util.UUID
;
import
java.util.UUID
;
import
java.util.stream.Collectors
;
/**
/**
* @Author gin
* @Author gin
...
...
backend/src/main/java/io/dataease/service/panel/PanelViewService.java
浏览文件 @
594d20eb
...
@@ -3,9 +3,7 @@ package io.dataease.service.panel;
...
@@ -3,9 +3,7 @@ package io.dataease.service.panel;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSONArray
;
import
com.alibaba.fastjson.JSONArray
;
import
com.alibaba.fastjson.JSONObject
;
import
com.alibaba.fastjson.JSONObject
;
import
io.dataease.base.domain.PanelGroup
;
import
io.dataease.base.domain.PanelGroupWithBLOBs
;
import
io.dataease.base.domain.PanelGroupWithBLOBs
;
import
io.dataease.base.mapper.PanelViewMapper
;
import
io.dataease.base.mapper.ext.ExtPanelViewMapper
;
import
io.dataease.base.mapper.ext.ExtPanelViewMapper
;
import
io.dataease.commons.utils.AuthUtils
;
import
io.dataease.commons.utils.AuthUtils
;
import
io.dataease.commons.utils.BeanUtils
;
import
io.dataease.commons.utils.BeanUtils
;
...
@@ -21,7 +19,6 @@ import org.springframework.transaction.annotation.Propagation;
...
@@ -21,7 +19,6 @@ import org.springframework.transaction.annotation.Propagation;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.util.Assert
;
import
org.springframework.util.Assert
;
import
javax.annotation.Resource
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
...
backend/src/main/java/io/dataease/service/sys/SysUserService.java
浏览文件 @
594d20eb
...
@@ -30,7 +30,6 @@ import org.springframework.transaction.annotation.Transactional;
...
@@ -30,7 +30,6 @@ import org.springframework.transaction.annotation.Transactional;
import
javax.annotation.Resource
;
import
javax.annotation.Resource
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Optional
;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
@Service
@Service
...
...
frontend/.eslintrc.js
浏览文件 @
594d20eb
...
@@ -22,7 +22,7 @@ module.exports = {
...
@@ -22,7 +22,7 @@ module.exports = {
}
}
}],
}],
"vue/singleline-html-element-content-newline"
:
"off"
,
"vue/singleline-html-element-content-newline"
:
"off"
,
"vue/multiline-html-element-content-newline"
:
"off"
,
"vue/multiline-html-element-content-newline"
:
"off"
,
"vue/name-property-casing"
:
[
"error"
,
"PascalCase"
],
"vue/name-property-casing"
:
[
"error"
,
"PascalCase"
],
"vue/no-v-html"
:
"off"
,
"vue/no-v-html"
:
"off"
,
'accessor-pairs'
:
2
,
'accessor-pairs'
:
2
,
...
...
frontend/src/components/canvas/assets/iconfont/demo.css
浏览文件 @
594d20eb
...
@@ -215,35 +215,35 @@
...
@@ -215,35 +215,35 @@
margin
:
1em
0
;
margin
:
1em
0
;
}
}
.markdown
>
p
,
.markdown
>
p
,
.markdown
>
blockquote
,
.markdown
>
blockquote
,
.markdown
>
.highlight
,
.markdown
>
.highlight
,
.markdown
>
ol
,
.markdown
>
ol
,
.markdown
>
ul
{
.markdown
>
ul
{
width
:
80%
;
width
:
80%
;
}
}
.markdown
ul
>
li
{
.markdown
ul
>
li
{
list-style
:
circle
;
list-style
:
circle
;
}
}
.markdown
>
ul
li
,
.markdown
>
ul
li
,
.markdown
blockquote
ul
>
li
{
.markdown
blockquote
ul
>
li
{
margin-left
:
20px
;
margin-left
:
20px
;
padding-left
:
4px
;
padding-left
:
4px
;
}
}
.markdown
>
ul
li
p
,
.markdown
>
ul
li
p
,
.markdown
>
ol
li
p
{
.markdown
>
ol
li
p
{
margin
:
0.6em
0
;
margin
:
0.6em
0
;
}
}
.markdown
ol
>
li
{
.markdown
ol
>
li
{
list-style
:
decimal
;
list-style
:
decimal
;
}
}
.markdown
>
ol
li
,
.markdown
>
ol
li
,
.markdown
blockquote
ol
>
li
{
.markdown
blockquote
ol
>
li
{
margin-left
:
20px
;
margin-left
:
20px
;
padding-left
:
4px
;
padding-left
:
4px
;
}
}
...
@@ -260,7 +260,7 @@
...
@@ -260,7 +260,7 @@
font-weight
:
600
;
font-weight
:
600
;
}
}
.markdown
>
table
{
.markdown
>
table
{
border-collapse
:
collapse
;
border-collapse
:
collapse
;
border-spacing
:
0px
;
border-spacing
:
0px
;
empty-cells
:
show
;
empty-cells
:
show
;
...
@@ -269,20 +269,20 @@
...
@@ -269,20 +269,20 @@
margin-bottom
:
24px
;
margin-bottom
:
24px
;
}
}
.markdown
>
table
th
{
.markdown
>
table
th
{
white-space
:
nowrap
;
white-space
:
nowrap
;
color
:
#333
;
color
:
#333
;
font-weight
:
600
;
font-weight
:
600
;
}
}
.markdown
>
table
th
,
.markdown
>
table
th
,
.markdown
>
table
td
{
.markdown
>
table
td
{
border
:
1px
solid
#e9e9e9
;
border
:
1px
solid
#e9e9e9
;
padding
:
8px
16px
;
padding
:
8px
16px
;
text-align
:
left
;
text-align
:
left
;
}
}
.markdown
>
table
th
{
.markdown
>
table
th
{
background
:
#F7F7F7
;
background
:
#F7F7F7
;
}
}
...
@@ -318,8 +318,8 @@
...
@@ -318,8 +318,8 @@
display
:
inline-block
;
display
:
inline-block
;
}
}
.markdown
>
br
,
.markdown
>
br
,
.markdown
>
p
>
br
{
.markdown
>
p
>
br
{
clear
:
both
;
clear
:
both
;
}
}
...
@@ -453,13 +453,13 @@ pre[class*="language-"] {
...
@@ -453,13 +453,13 @@ pre[class*="language-"] {
overflow
:
auto
;
overflow
:
auto
;
}
}
:not
(
pre
)
>
code
[
class
*=
"language-"
],
:not
(
pre
)
>
code
[
class
*=
"language-"
],
pre
[
class
*=
"language-"
]
{
pre
[
class
*=
"language-"
]
{
background
:
#f5f2f0
;
background
:
#f5f2f0
;
}
}
/* Inline code */
/* Inline code */
:not
(
pre
)
>
code
[
class
*=
"language-"
]
{
:not
(
pre
)
>
code
[
class
*=
"language-"
]
{
padding
:
.1em
;
padding
:
.1em
;
border-radius
:
.3em
;
border-radius
:
.3em
;
white-space
:
normal
;
white-space
:
normal
;
...
...
frontend/src/views/dataset/data/UpdateInfo.vue
浏览文件 @
594d20eb
...
@@ -96,7 +96,7 @@
...
@@ -96,7 +96,7 @@
append-to-body
append-to-body
>
>
<el-col>
<el-col>
<el-form
:form=
"taskForm"
:model=
"taskForm"
label-width=
"100px"
size=
"mini"
ref=
"taskForm
"
:rules=
"taskFormRules"
>
<el-form
ref=
"taskForm"
:form=
"taskForm"
:model=
"taskForm"
label-width=
"100px"
size=
"mini
"
:rules=
"taskFormRules"
>
<el-form-item
:label=
"$t('dataset.task_name')"
prop=
"name"
>
<el-form-item
:label=
"$t('dataset.task_name')"
prop=
"name"
>
<el-input
<el-input
v-model=
"taskForm.name"
v-model=
"taskForm.name"
...
@@ -143,19 +143,18 @@
...
@@ -143,19 +143,18 @@
<el-form-item
v-if=
"taskForm.rate === 'SIMPLE_CRON'"
label=
""
>
<el-form-item
v-if=
"taskForm.rate === 'SIMPLE_CRON'"
label=
""
>
<el-form
:inline=
"true"
>
<el-form
:inline=
"true"
>
<el-form-item
:label=
"$t('cron.every')"
>
<el-form-item
:label=
"$t('cron.every')"
>
<el-input
v-model=
"taskForm.extraData.simple_cron_value"
size=
"mini"
type=
"number"
min=
"1"
@
change=
"onSimpleCronChange()"
/>
<el-input
v-model=
"taskForm.extraData.simple_cron_value"
size=
"mini"
type=
"number"
min=
"1"
@
change=
"onSimpleCronChange()"
/>
</el-form-item>
</el-form-item>
<el-form-item
class=
"form-item"
>
<el-form-item
class=
"form-item"
>
<el-select
v-model=
"taskForm.extraData.simple_cron_type"
filterable
size=
"mini"
@
change=
"onSimpleCronChange()"
>
<el-select
v-model=
"taskForm.extraData.simple_cron_type"
filterable
size=
"mini"
@
change=
"onSimpleCronChange()"
>
<el-option
:label=
"$t('cron.minute')"
value=
"minute"
/>
<el-option
:label=
"$t('cron.minute')"
value=
"minute"
/>
<el-option
:label=
"$t('cron.hour')"
value=
"hour"
/>
<el-option
:label=
"$t('cron.hour')"
value=
"hour"
/>
<el-option
:label=
"$t('cron.day')"
value=
"day"
/>
<el-option
:label=
"$t('cron.day')"
value=
"day"
/>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
class=
"form-item"
:label=
"$t('cron.every_exec')"
>
<el-form-item
class=
"form-item"
:label=
"$t('cron.every_exec')"
/>
</el-form-item>
</el-form>
</el-form>
</el-form-item>
</el-form-item>
...
@@ -535,7 +534,7 @@ export default {
...
@@ -535,7 +534,7 @@ export default {
}
}
this
.
incrementalConfig
.
tableId
=
this
.
table
.
id
this
.
incrementalConfig
.
tableId
=
this
.
table
.
id
let
startTime
=
new
Date
(
task
.
startTime
).
getTime
()
let
startTime
=
new
Date
(
task
.
startTime
).
getTime
()
if
(
startTime
<
new
Date
().
getTime
())
{
if
(
startTime
<
new
Date
().
getTime
())
{
startTime
=
new
Date
().
getTime
()
startTime
=
new
Date
().
getTime
()
}
}
task
.
startTime
=
startTime
task
.
startTime
=
startTime
...
@@ -559,10 +558,9 @@ export default {
...
@@ -559,10 +558,9 @@ export default {
this
.
listTask
()
this
.
listTask
()
this
.
listTaskLog
()
this
.
listTaskLog
()
})
})
}
else
{
}
else
{
return
false
return
false
}
}
})
})
},
},
deleteTask
(
task
)
{
deleteTask
(
task
)
{
...
@@ -590,27 +588,27 @@ export default {
...
@@ -590,27 +588,27 @@ export default {
},
},
onSimpleCronChange
()
{
onSimpleCronChange
()
{
if
(
this
.
taskForm
.
extraData
.
simple_cron_type
===
'minute'
)
{
if
(
this
.
taskForm
.
extraData
.
simple_cron_type
===
'minute'
)
{
if
(
this
.
taskForm
.
extraData
.
simple_cron_value
<
1
||
this
.
taskForm
.
extraData
.
simple_cron_value
>
59
)
{
if
(
this
.
taskForm
.
extraData
.
simple_cron_value
<
1
||
this
.
taskForm
.
extraData
.
simple_cron_value
>
59
)
{
this
.
$message
({
message
:
this
.
$t
(
'cron.minute_limit'
),
type
:
'warning'
,
showClose
:
true
})
this
.
$message
({
message
:
this
.
$t
(
'cron.minute_limit'
),
type
:
'warning'
,
showClose
:
true
})
this
.
taskForm
.
extraData
.
simple_cron_value
=
59
this
.
taskForm
.
extraData
.
simple_cron_value
=
59
}
}
this
.
taskForm
.
cron
=
'0 0/'
+
this
.
taskForm
.
extraData
.
simple_cron_value
+
' * * * ? *'
this
.
taskForm
.
cron
=
'0 0/'
+
this
.
taskForm
.
extraData
.
simple_cron_value
+
' * * * ? *'
return
return
}
}
if
(
this
.
taskForm
.
extraData
.
simple_cron_type
===
'hour'
)
{
if
(
this
.
taskForm
.
extraData
.
simple_cron_type
===
'hour'
)
{
if
(
this
.
taskForm
.
extraData
.
simple_cron_value
<
1
||
this
.
taskForm
.
extraData
.
simple_cron_value
>
23
)
{
if
(
this
.
taskForm
.
extraData
.
simple_cron_value
<
1
||
this
.
taskForm
.
extraData
.
simple_cron_value
>
23
)
{
this
.
$message
({
message
:
this
.
$t
(
'cron.hour_limit'
),
type
:
'warning'
,
showClose
:
true
})
this
.
$message
({
message
:
this
.
$t
(
'cron.hour_limit'
),
type
:
'warning'
,
showClose
:
true
})
this
.
taskForm
.
extraData
.
simple_cron_value
=
23
this
.
taskForm
.
extraData
.
simple_cron_value
=
23
}
}
this
.
taskForm
.
cron
=
'0 0 0/'
+
this
.
taskForm
.
extraData
.
simple_cron_value
+
' * * ? *'
this
.
taskForm
.
cron
=
'0 0 0/'
+
this
.
taskForm
.
extraData
.
simple_cron_value
+
' * * ? *'
return
return
}
}
if
(
this
.
taskForm
.
extraData
.
simple_cron_type
===
'day'
)
{
if
(
this
.
taskForm
.
extraData
.
simple_cron_type
===
'day'
)
{
if
(
this
.
taskForm
.
extraData
.
simple_cron_value
<
1
||
this
.
taskForm
.
extraData
.
simple_cron_value
>
31
)
{
if
(
this
.
taskForm
.
extraData
.
simple_cron_value
<
1
||
this
.
taskForm
.
extraData
.
simple_cron_value
>
31
)
{
this
.
$message
({
message
:
this
.
$t
(
'cron.day_limit'
),
type
:
'warning'
,
showClose
:
true
})
this
.
$message
({
message
:
this
.
$t
(
'cron.day_limit'
),
type
:
'warning'
,
showClose
:
true
})
this
.
taskForm
.
extraData
.
simple_cron_value
=
31
this
.
taskForm
.
extraData
.
simple_cron_value
=
31
}
}
this
.
taskForm
.
cron
=
'0 0 0 1/'
+
this
.
taskForm
.
extraData
.
simple_cron_value
+
' * ? *'
this
.
taskForm
.
cron
=
'0 0 0 1/'
+
this
.
taskForm
.
extraData
.
simple_cron_value
+
' * ? *'
return
return
}
}
},
},
...
@@ -620,15 +618,15 @@ export default {
...
@@ -620,15 +618,15 @@ export default {
this
.
taskForm
.
endTime
=
''
this
.
taskForm
.
endTime
=
''
this
.
taskForm
.
cron
=
''
this
.
taskForm
.
cron
=
''
}
}
if
(
this
.
taskForm
.
rate
===
'SIMPLE_CRON'
){
if
(
this
.
taskForm
.
rate
===
'SIMPLE_CRON'
)
{
this
.
taskForm
.
cron
=
'0 0 0/1 * * ? *'
this
.
taskForm
.
cron
=
'0 0 0/1 * * ? *'
}
}
if
(
this
.
taskForm
.
rate
===
'CRON'
){
if
(
this
.
taskForm
.
rate
===
'CRON'
)
{
this
.
taskForm
.
cron
=
'00 00 * ? * * *'
this
.
taskForm
.
cron
=
'00 00 * ? * * *'
}
}
},
},
listTaskLog
(
loading
=
true
)
{
listTaskLog
(
loading
=
true
)
{
const
params
=
{
"conditions"
:[{
"field"
:
"dataset_table_task_log.table_id"
,
"operator"
:
"eq"
,
"value"
:
this
.
table
.
id
}],
"orders"
:[]
}
const
params
=
{
'conditions'
:
[{
'field'
:
'dataset_table_task_log.table_id'
,
'operator'
:
'eq'
,
'value'
:
this
.
table
.
id
}],
'orders'
:
[]
}
post
(
'/dataset/taskLog/list/'
+
this
.
table
.
type
+
'/'
+
this
.
page
.
currentPage
+
'/'
+
this
.
page
.
pageSize
,
params
,
loading
).
then
(
response
=>
{
post
(
'/dataset/taskLog/list/'
+
this
.
table
.
type
+
'/'
+
this
.
page
.
currentPage
+
'/'
+
this
.
page
.
pageSize
,
params
,
loading
).
then
(
response
=>
{
this
.
taskLogData
=
response
.
data
.
listObject
this
.
taskLogData
=
response
.
data
.
listObject
this
.
page
.
total
=
response
.
data
.
itemCount
this
.
page
.
total
=
response
.
data
.
itemCount
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论