Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
S
saas-dml
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
EzijingWeb
saas-dml
Commits
58a1d243
提交
58a1d243
authored
2月 15, 2023
作者:
王鹏飞
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: eslint warning
上级
21cb2626
隐藏空白字符变更
内嵌
并排
正在显示
8 个修改的文件
包含
38 行增加
和
14 行删除
+38
-14
.eslintrc.cjs
.eslintrc.cjs
+6
-1
EventRule.vue
src/components/rule/EventRule.vue
+9
-3
LabelRule.vue
src/components/rule/LabelRule.vue
+1
-1
UserRule.vue
src/components/rule/UserRule.vue
+2
-1
useAllData.ts
src/composables/useAllData.ts
+1
-1
FormDialog.vue
src/modules/group/components/FormDialog.vue
+11
-3
ViewDialog.vue
src/modules/group/components/ViewDialog.vue
+1
-1
LabelFormDialog.vue
src/modules/label/components/LabelFormDialog.vue
+7
-3
没有找到文件。
.eslintrc.cjs
浏览文件 @
58a1d243
...
@@ -3,7 +3,12 @@ require('@rushstack/eslint-patch/modern-module-resolution')
...
@@ -3,7 +3,12 @@ require('@rushstack/eslint-patch/modern-module-resolution')
module.exports = {
module.exports = {
root: true,
root: true,
extends: ['plugin:vue/vue3-essential', 'eslint:recommended', '@vue/eslint-config-typescript'],
extends: [
'plugin:vue/vue3-essential',
'eslint:recommended',
'@vue/eslint-config-typescript',
'./.eslintrc-auto-import.json'
],
parserOptions: {
parserOptions: {
ecmaVersion: 'latest'
ecmaVersion: 'latest'
},
},
...
...
src/components/rule/EventRule.vue
浏览文件 @
58a1d243
...
@@ -118,7 +118,7 @@ function handleTriggerOperateChange(value: string, item: EventRuleItem) {
...
@@ -118,7 +118,7 @@ function handleTriggerOperateChange(value: string, item: EventRuleItem) {
<el-select
<el-select
v-model=
"rule.happen_info.is_happened"
v-model=
"rule.happen_info.is_happened"
@
change=
"value => handleHappenOperateChange(value, rule)"
>
@
change=
"value => handleHappenOperateChange(value, rule)"
>
<el-option
v-for=
"option in happenInfoList"
v-bind=
"option"
></el-option>
<el-option
v-for=
"option in happenInfoList"
:key=
"option.label"
v-bind=
"option"
></el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
v-if=
"rule.happen_info.is_happened"
>
<el-form-item
v-if=
"rule.happen_info.is_happened"
>
...
@@ -141,7 +141,11 @@ function handleTriggerOperateChange(value: string, item: EventRuleItem) {
...
@@ -141,7 +141,11 @@ function handleTriggerOperateChange(value: string, item: EventRuleItem) {
</el-row>
</el-row>
<
template
v-if=
"rule.happen_info.is_happened"
>
<
template
v-if=
"rule.happen_info.is_happened"
>
<!-- 属性条件 -->
<!-- 属性条件 -->
<el-row
class=
"rule-item"
justify=
"space-between"
v-for=
"(attr, index) in rule.happen_info.attr_list"
>
<el-row
justify=
"space-between"
class=
"rule-item"
v-for=
"(attr, index) in rule.happen_info.attr_list"
:key=
"index"
>
<div>
<div>
<el-form-item>
<el-form-item>
<el-select
v-model=
"attr.attr_id"
@
change=
"value => handleAttrChange(value, attr, rule)"
>
<el-select
v-model=
"attr.attr_id"
@
change=
"value => handleAttrChange(value, attr, rule)"
>
...
@@ -156,6 +160,7 @@ function handleTriggerOperateChange(value: string, item: EventRuleItem) {
...
@@ -156,6 +160,7 @@ function handleTriggerOperateChange(value: string, item: EventRuleItem) {
<el-select
v-model=
"attr.operate"
@
change=
"value => handleOperateChange(value, attr)"
>
<el-select
v-model=
"attr.operate"
@
change=
"value => handleOperateChange(value, attr)"
>
<el-option
<el-option
v-for=
"option in getOperatorList(attr.attr_type)"
v-for=
"option in getOperatorList(attr.attr_type)"
:key=
"option.value"
:label=
"option.alias || option.label"
:label=
"option.alias || option.label"
:value=
"option.value"
></el-option>
:value=
"option.value"
></el-option>
</el-select>
</el-select>
...
@@ -173,7 +178,7 @@ function handleTriggerOperateChange(value: string, item: EventRuleItem) {
...
@@ -173,7 +178,7 @@ function handleTriggerOperateChange(value: string, item: EventRuleItem) {
<el-row
style=
"margin-top: 10px"
>
<el-row
style=
"margin-top: 10px"
>
<el-form-item>
<el-form-item>
<el-select
model-value=
"触发次数"
>
<el-select
model-value=
"触发次数"
>
<el-option
v-for=
"option in triggerInfoList"
v-bind=
"option"
></el-option>
<el-option
v-for=
"option in triggerInfoList"
:key=
"option.value"
v-bind=
"option"
></el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item>
<el-form-item>
...
@@ -182,6 +187,7 @@ function handleTriggerOperateChange(value: string, item: EventRuleItem) {
...
@@ -182,6 +187,7 @@ function handleTriggerOperateChange(value: string, item: EventRuleItem) {
@
change=
"value => handleTriggerOperateChange(value, rule)"
>
@
change=
"value => handleTriggerOperateChange(value, rule)"
>
<el-option
<el-option
v-for=
"option in numberOperatorList"
v-for=
"option in numberOperatorList"
:key=
"option.value"
:label=
"option.alias || option.label"
:label=
"option.alias || option.label"
:value=
"option.value"
/>
:value=
"option.value"
/>
</el-select>
</el-select>
...
...
src/components/rule/LabelRule.vue
浏览文件 @
58a1d243
...
@@ -39,7 +39,7 @@ function handleRemove(items: string[], index: number) {
...
@@ -39,7 +39,7 @@ function handleRemove(items: string[], index: number) {
<span
@
click=
"toggleOperate(tagRule)"
>
{{ getLogicalName(tagRule.current_logic_operate) }}
</span>
<span
@
click=
"toggleOperate(tagRule)"
>
{{ getLogicalName(tagRule.current_logic_operate) }}
</span>
</div>
</div>
<div
class=
"rule-list"
>
<div
class=
"rule-list"
>
<el-row
class=
"rule-item"
v-for=
"(item, index) in tagRule.items"
justify=
"space-between
"
>
<el-row
justify=
"space-between"
class=
"rule-item"
v-for=
"(item, index) in tagRule.items"
:key=
"index
"
>
<div>
<div>
标签 等于
标签 等于
<el-form-item>
<el-form-item>
...
...
src/components/rule/UserRule.vue
浏览文件 @
58a1d243
...
@@ -67,7 +67,7 @@ function handleOperateChange(value: string, item: RuleAttr) {
...
@@ -67,7 +67,7 @@ function handleOperateChange(value: string, item: RuleAttr) {
<span
@
click=
"toggleOperate(userAttrRule)"
>
{{ getLogicalName(userAttrRule.current_logic_operate) }}
</span>
<span
@
click=
"toggleOperate(userAttrRule)"
>
{{ getLogicalName(userAttrRule.current_logic_operate) }}
</span>
</div>
</div>
<div
class=
"rule-list"
>
<div
class=
"rule-list"
>
<el-row
class=
"rule-item"
v-for=
"(item, index) in userAttrRule.items"
justify=
"space-between
"
>
<el-row
justify=
"space-between"
class=
"rule-item"
v-for=
"(item, index) in userAttrRule.items"
:key=
"index
"
>
<div>
<div>
<el-form-item>
<el-form-item>
<el-select
v-model=
"item.attr_id"
@
change=
"value => handleAttrChange(value, item)"
>
<el-select
v-model=
"item.attr_id"
@
change=
"value => handleAttrChange(value, item)"
>
...
@@ -82,6 +82,7 @@ function handleOperateChange(value: string, item: RuleAttr) {
...
@@ -82,6 +82,7 @@ function handleOperateChange(value: string, item: RuleAttr) {
<el-select
v-model=
"item.operate"
@
change=
"value => handleOperateChange(value, item)"
>
<el-select
v-model=
"item.operate"
@
change=
"value => handleOperateChange(value, item)"
>
<el-option
<el-option
v-for=
"option in getOperatorList(item.attr_type)"
v-for=
"option in getOperatorList(item.attr_type)"
:key=
"option.value"
:label=
"option.alias || option.label"
:label=
"option.alias || option.label"
:value=
"option.value"
></el-option>
:value=
"option.value"
></el-option>
</el-select>
</el-select>
...
...
src/composables/useAllData.ts
浏览文件 @
58a1d243
...
@@ -82,7 +82,7 @@ export function useConnection() {
...
@@ -82,7 +82,7 @@ export function useConnection() {
getConnectionList
().
then
((
res
:
any
)
=>
{
getConnectionList
().
then
((
res
:
any
)
=>
{
connectionList
.
value
=
res
.
data
.
items
.
map
((
item
:
any
)
=>
{
connectionList
.
value
=
res
.
data
.
items
.
map
((
item
:
any
)
=>
{
const
attrs
=
JSON
.
parse
(
item
.
config_attributes
)
const
attrs
=
JSON
.
parse
(
item
.
config_attributes
)
le
t
name
=
Array
.
isArray
(
attrs
)
?
attrs
.
find
((
item
:
any
)
=>
item
.
prop
===
'name'
)?.
value
:
attrs
.
name
cons
t
name
=
Array
.
isArray
(
attrs
)
?
attrs
.
find
((
item
:
any
)
=>
item
.
prop
===
'name'
)?.
value
:
attrs
.
name
return
{
...
item
,
config_attributes
:
attrs
,
name
}
return
{
...
item
,
config_attributes
:
attrs
,
name
}
})
})
})
})
...
...
src/modules/group/components/FormDialog.vue
浏览文件 @
58a1d243
...
@@ -149,7 +149,11 @@ async function handleUpdate() {
...
@@ -149,7 +149,11 @@ async function handleUpdate() {
<div
class=
"update-rule-wrap"
v-if=
"form.update_status === '1'"
>
<div
class=
"update-rule-wrap"
v-if=
"form.update_status === '1'"
>
<span>
每
</span>
<span>
每
</span>
<el-select
v-model=
"form.update_rule.type"
placeholder=
" "
style=
"width: 60px"
>
<el-select
v-model=
"form.update_rule.type"
placeholder=
" "
style=
"width: 60px"
>
<el-option
v-for=
"item in dateUnitList"
:label=
"item.label"
:value=
"item.value"
></el-option>
<el-option
v-for=
"item in dateUnitList"
:key=
"item.value"
:label=
"item.label"
:value=
"item.value"
></el-option>
</el-select>
</el-select>
<template
v-if=
"form.update_rule.type === 1"
>
<template
v-if=
"form.update_rule.type === 1"
>
<span>
的凌晨更新
</span>
<span>
的凌晨更新
</span>
...
@@ -157,14 +161,18 @@ async function handleUpdate() {
...
@@ -157,14 +161,18 @@ async function handleUpdate() {
<
template
v-if=
"form.update_rule.type === 2"
>
<
template
v-if=
"form.update_rule.type === 2"
>
<span>
的
</span>
<span>
的
</span>
<el-select
v-model=
"form.update_rule.info"
placeholder=
" "
style=
"width: 80px"
>
<el-select
v-model=
"form.update_rule.info"
placeholder=
" "
style=
"width: 80px"
>
<el-option
v-for=
"item in weekList"
:label=
"item.label"
:value=
"item.value"
></el-option>
<el-option
v-for=
"item in weekList"
:key=
"item.value"
:label=
"item.label"
:value=
"item.value"
></el-option>
</el-select>
</el-select>
<span>
的凌晨更新
</span>
<span>
的凌晨更新
</span>
</
template
>
</
template
>
<
template
v-if=
"form.update_rule.type === 3"
>
<
template
v-if=
"form.update_rule.type === 3"
>
<span>
第
</span>
<span>
第
</span>
<el-select
v-model=
"form.update_rule.info"
placeholder=
" "
style=
"width: 60px"
>
<el-select
v-model=
"form.update_rule.info"
placeholder=
" "
style=
"width: 60px"
>
<el-option
v-for=
"item in 6"
:label=
"item"
:value=
"item"
></el-option>
<el-option
v-for=
"item in 6"
:
key=
"item"
:
label=
"item"
:value=
"item"
></el-option>
</el-select>
</el-select>
<span>
天的凌晨更新
</span>
<span>
天的凌晨更新
</span>
</
template
>
</
template
>
...
...
src/modules/group/components/ViewDialog.vue
浏览文件 @
58a1d243
...
@@ -12,7 +12,7 @@ const props = defineProps<{
...
@@ -12,7 +12,7 @@ const props = defineProps<{
data
:
Group
data
:
Group
}
>
()
}
>
()
const
emit
=
defineEmits
<
{
defineEmits
<
{
(
e
:
'update'
):
void
(
e
:
'update'
):
void
(
e
:
'update:modelValue'
,
visible
:
boolean
):
void
(
e
:
'update:modelValue'
,
visible
:
boolean
):
void
}
>
()
}
>
()
...
...
src/modules/label/components/LabelFormDialog.vue
浏览文件 @
58a1d243
...
@@ -109,7 +109,11 @@ function handleUpdate() {
...
@@ -109,7 +109,11 @@ function handleUpdate() {
<div
class=
"update-rule-wrap"
v-if=
"form.update_status === '1'"
>
<div
class=
"update-rule-wrap"
v-if=
"form.update_status === '1'"
>
<span>
每
</span>
<span>
每
</span>
<el-select
v-model=
"form.update_rule.type"
placeholder=
" "
style=
"width: 60px"
>
<el-select
v-model=
"form.update_rule.type"
placeholder=
" "
style=
"width: 60px"
>
<el-option
v-for=
"item in dateUnitList"
:label=
"item.label"
:value=
"item.value"
></el-option>
<el-option
v-for=
"item in dateUnitList"
:key=
"item.value"
:label=
"item.label"
:value=
"item.value"
></el-option>
</el-select>
</el-select>
<template
v-if=
"form.update_rule.type === 1"
>
<template
v-if=
"form.update_rule.type === 1"
>
<span>
的凌晨更新
</span>
<span>
的凌晨更新
</span>
...
@@ -117,14 +121,14 @@ function handleUpdate() {
...
@@ -117,14 +121,14 @@ function handleUpdate() {
<
template
v-if=
"form.update_rule.type === 2"
>
<
template
v-if=
"form.update_rule.type === 2"
>
<span>
的
</span>
<span>
的
</span>
<el-select
v-model=
"form.update_rule.info"
placeholder=
" "
style=
"width: 80px"
>
<el-select
v-model=
"form.update_rule.info"
placeholder=
" "
style=
"width: 80px"
>
<el-option
v-for=
"item in weekList"
:label=
"item.label"
:value=
"item.value"
></el-option>
<el-option
v-for=
"item in weekList"
:
key=
"item.value"
:
label=
"item.label"
:value=
"item.value"
></el-option>
</el-select>
</el-select>
<span>
的凌晨更新
</span>
<span>
的凌晨更新
</span>
</
template
>
</
template
>
<
template
v-if=
"form.update_rule.type === 3"
>
<
template
v-if=
"form.update_rule.type === 3"
>
<span>
第
</span>
<span>
第
</span>
<el-select
v-model=
"form.update_rule.info"
placeholder=
" "
style=
"width: 60px"
>
<el-select
v-model=
"form.update_rule.info"
placeholder=
" "
style=
"width: 60px"
>
<el-option
v-for=
"item in 6"
:label=
"item"
:value=
"item"
></el-option>
<el-option
v-for=
"item in 6"
:
key=
"item"
:
label=
"item"
:value=
"item"
></el-option>
</el-select>
</el-select>
<span>
天的凌晨更新
</span>
<span>
天的凌晨更新
</span>
</
template
>
</
template
>
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论