Skip to content

Commit f818aa8

Browse files
wangdan-fit2cloudwangdan-fit2cloud
committed
fix: 修改部分样式
1 parent 0c817a8 commit f818aa8

File tree

4 files changed

+113
-111
lines changed

4 files changed

+113
-111
lines changed

‎ui/src/components/markdown/MdEditorMagnify.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
>
1010
<template #defFooters>
1111
<el-button text type="info" @click="openDialog">
12-
<AppIcon iconName="app-magnify" style="font-size: 16px"></AppIcon>
12+
<AppIcon class="color-secondary" iconName="app-magnify" style="font-size: 16px"></AppIcon>
1313
</el-button>
1414
</template>
1515
</MdEditor>

‎ui/src/styles/md-editor.scss‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
.md-editor {
2+
font-weight: 400;
3+
}
14
.md-editor-preview {
25
padding: 0;
36
margin: 0;

‎ui/src/workflow/common/NodeContainer.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
<div @mousemove.stop @mousedown.stop @keydown.stop @click.stop>
3535
<el-button text @click="showNode = !showNode" class="mr-4">
36-
<el-icon class="arrow-icon" :class="showNode ? 'rotate-180' : ''"
36+
<el-icon class="arrow-icon color-secondary" :class="showNode ? 'rotate-180' : ''"
3737
><ArrowDownBold />
3838
</el-icon>
3939
</el-button>

‎ui/src/workflow/nodes/form-node/index.vue‎

Lines changed: 108 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -1,122 +1,121 @@
11
<template>
22
<NodeContainer :nodeModel="nodeModel">
3-
<el-form
4-
@submit.prevent
5-
:model="form_data"
6-
label-position="top"
7-
require-asterisk-position="right"
8-
label-width="auto"
9-
ref="formNodeFormRef"
10-
hide-required-asterisk
11-
>
12-
<el-form-item
13-
label="表单输出内容"
14-
prop="form_content_format"
15-
:rules="{
16-
required: true,
17-
message: '请表单输出内容',
18-
trigger: 'blur'
19-
}"
3+
<h5 class="title-decoration-1 mb-8">节点设置</h5>
4+
<el-card shadow="never" class="card-never" style="--el-card-padding: 12px">
5+
<el-form
6+
@submit.prevent
7+
:model="form_data"
8+
label-position="top"
9+
require-asterisk-position="right"
10+
label-width="auto"
11+
ref="formNodeFormRef"
12+
hide-required-asterisk
2013
>
21-
<template #label>
22-
<div class="flex align-center">
23-
<div class="mr-4">
24-
<span>表单输出内容<span class="danger">*</span></span>
25-
</div>
26-
<el-tooltip effect="dark" placement="right" popper-class="max-w-200">
27-
<template #content>
28-
设置执行该节点输出的内容，{{ '{ form }' }}为表单的占位符。
29-
</template>
30-
<AppIcon iconName="app-warning" class="app-warning-icon"></AppIcon>
31-
</el-tooltip>
32-
</div>
33-
</template>
34-
<MdEditorMagnify
35-
title="表单输出内容"
36-
v-model="form_data.form_content_format"
37-
style="height: 150px"
38-
@submitDialog="submitDialog"
39-
/>
40-
</el-form-item>
41-
<el-form-item label="表单配置" @click.prevent>
42-
<template #label>
43-
<div class="flex-between mb-16">
44-
<h5 class="lighter">{{ '表单配置' }}</h5>
45-
<el-button link type="primary" @click="openAddFormCollect()">
46-
<el-icon class="mr-4">
47-
<Plus />
48-
</el-icon>
49-
添加
50-
</el-button>
51-
</div></template
14+
<el-form-item
15+
label="表单输出内容"
16+
prop="form_content_format"
17+
:rules="{
18+
required: true,
19+
message: '请表单输出内容',
20+
trigger: 'blur'
21+
}"
5222
>
23+
<template #label>
24+
<div class="flex align-center">
25+
<div class="mr-4">
26+
<span>表单输出内容<span class="danger">*</span></span>
27+
</div>
28+
<el-tooltip effect="dark" placement="right" popper-class="max-w-200">
29+
<template #content>
30+
设置执行该节点输出的内容，{{ '{ form }' }}为表单的占位符。
31+
</template>
32+
<AppIcon iconName="app-warning" class="app-warning-icon"></AppIcon>
33+
</el-tooltip>
34+
</div>
35+
</template>
36+
<MdEditorMagnify
37+
title="表单输出内容"
38+
v-model="form_data.form_content_format"
39+
style="height: 150px"
40+
@submitDialog="submitDialog"
41+
/>
42+
</el-form-item>
43+
<el-form-item label="表单配置" @click.prevent>
44+
<template #label>
45+
<div class="flex-between">
46+
<h5 class="lighter">{{ '表单配置' }}</h5>
47+
<el-button link type="primary" @click="openAddFormCollect()">
48+
<el-icon class="mr-4">
49+
<Plus />
50+
</el-icon>
51+
添加
52+
</el-button>
53+
</div></template
54+
>
5355

54-
<el-table
55-
v-if="form_data.form_field_list.length > 0"
56-
:data="form_data.form_field_list"
57-
class="mb-16"
58-
>
59-
<el-table-column prop="field" label="参数">
60-
<template #default="{ row }">
61-
<span :title="row.field" class="ellipsis-1">{{ row.field }}</span>
62-
</template>
63-
</el-table-column>
64-
<el-table-column prop="label" label="显示名称">
65-
<template #default="{ row }">
66-
<span v-if="row.label && row.label.input_type === 'TooltipLabel'">
67-
<span :title="row.label.label" class="ellipsis-1">
68-
{{ row.label.label }}
56+
<el-table class="border" v-if="form_data.form_field_list.length > 0" :data="form_data.form_field_list">
57+
<el-table-column prop="field" label="参数">
58+
<template #default="{ row }">
59+
<span :title="row.field" class="ellipsis-1">{{ row.field }}</span>
60+
</template>
61+
</el-table-column>
62+
<el-table-column prop="label" label="显示名称">
63+
<template #default="{ row }">
64+
<span v-if="row.label && row.label.input_type === 'TooltipLabel'">
65+
<span :title="row.label.label" class="ellipsis-1">
66+
{{ row.label.label }}
67+
</span>
6968
</span>
70-
</span>
71-
<span v-else>
72-
<span :title="row.label" class="ellipsis-1">
73-
{{ row.label }}
74-
</span></span
75-
>
76-
</template>
77-
</el-table-column>
69+
<span v-else>
70+
<span :title="row.label" class="ellipsis-1">
71+
{{ row.label }}
72+
</span></span
73+
>
74+
</template>
75+
</el-table-column>
7876

79-
<el-table-column label="组件类型" width="110px">
80-
<template #default="{ row }">
81-
<el-tag type="info" class="info-tag">{{
82-
input_type_list.find((item) => item.value === row.input_type)?.label
83-
}}</el-tag>
84-
</template>
85-
</el-table-column>
77+
<el-table-column label="组件类型" width="110px">
78+
<template #default="{ row }">
79+
<el-tag type="info" class="info-tag">{{
80+
input_type_list.find((item) => item.value === row.input_type)?.label
81+
}}</el-tag>
82+
</template>
83+
</el-table-column>
8684

87-
<el-table-column prop="default_value" label="默认值">
88-
<template #default="{ row }">
89-
<span :title="row.default_value" class="ellipsis-1">{{ row.default_value }}</span>
90-
</template>
91-
</el-table-column>
92-
<el-table-column label="必填">
93-
<template #default="{ row }">
94-
<div @click.stop>
95-
<el-switch disabled size="small" v-model="row.required" />
96-
</div>
97-
</template>
98-
</el-table-column>
99-
<el-table-column label="操作" align="left" width="80">
100-
<template #default="{ row, $index }">
101-
<span class="mr-4">
102-
<el-tooltip effect="dark" content="修改" placement="top">
103-
<el-button type="primary" text @click.stop="openEditFormCollect(row, $index)">
104-
<el-icon><EditPen /></el-icon>
85+
<el-table-column prop="default_value" label="默认值">
86+
<template #default="{ row }">
87+
<span :title="row.default_value" class="ellipsis-1">{{ row.default_value }}</span>
88+
</template>
89+
</el-table-column>
90+
<el-table-column label="必填">
91+
<template #default="{ row }">
92+
<div @click.stop>
93+
<el-switch disabled size="small" v-model="row.required" />
94+
</div>
95+
</template>
96+
</el-table-column>
97+
<el-table-column label="操作" align="left" width="80">
98+
<template #default="{ row, $index }">
99+
<span class="mr-4">
100+
<el-tooltip effect="dark" content="修改" placement="top">
101+
<el-button type="primary" text @click.stop="openEditFormCollect(row, $index)">
102+
<el-icon><EditPen /></el-icon>
103+
</el-button>
104+
</el-tooltip>
105+
</span>
106+
<el-tooltip effect="dark" content="删除" placement="top">
107+
<el-button type="primary" text @click="deleteField(row)">
108+
<el-icon>
109+
<Delete />
110+
</el-icon>
105111
</el-button>
106112
</el-tooltip>
107-
</span>
108-
<el-tooltip effect="dark" content="删除" placement="top">
109-
<el-button type="primary" text @click="deleteField(row)">
110-
<el-icon>
111-
<Delete />
112-
</el-icon>
113-
</el-button>
114-
</el-tooltip>
115-
</template>
116-
</el-table-column>
117-
</el-table>
118-
</el-form-item>
119-
</el-form>
113+
</template>
114+
</el-table-column>
115+
</el-table>
116+
</el-form-item>
117+
</el-form>
118+
</el-card>
120119
<AddFormCollect ref="addFormCollectRef" :addFormField="addFormField"></AddFormCollect>
121120
<EditFormCollect ref="editFormCollectRef" :editFormField="editFormField"></EditFormCollect>
122121
</NodeContainer>

0 commit comments

Comments
 (0)