Skip to content

Commit 03274d9

Browse files
wangdan-fit2cloudwangdan-fit2cloud
authored
feat: Update function setting style
1 parent 6a8d2c1 commit 03274d9

File tree

8 files changed

+123
-119
lines changed

8 files changed

+123
-119
lines changed

‎ui/src/locales/lang/zh-CN/views/function-lib.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export default {
3030
},
3131
form: {
3232
functionName: {
33-
label: '函数名称',
33+
label: '名称',
3434
placeholder: '请输入函数名称',
3535
requiredMessage: '请输入函数名称'
3636
},

‎ui/src/locales/lang/zh-Hant/views/function-lib.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export default {
3030
},
3131
form: {
3232
functionName: {
33-
label: '函數名稱',
33+
label: '名稱',
3434
placeholder: '請輸入函數名稱',
3535
requiredMessage: '請輸入函數名稱'
3636
},

‎ui/src/utils/application.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
export const defaultIcon = '/ui/favicon.ico'
22

33
// 是否显示字母 / icon
4-
export function isAppIcon(url: string | undefined) {
4+
export function isAppIcon(url: String | undefined) {
55
return url === defaultIcon ? '' : url
66
}
77

‎ui/src/views/application/component/ParamSettingDialog.vue‎

Lines changed: 23 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -131,32 +131,29 @@
131131
v-model="form.dataset_setting.no_references_setting.status"
132132
class="radio-block"
133133
>
134-
<div>
135-
<el-radio value="ai_questioning">
136-
<p>
137-
{{ $t('views.application.applicationForm.dialog.continueQuestioning') }}
138-
</p>
139-
</el-radio>
140-
</div>
141-
<div>
142-
<el-radio value="designated_answer">
143-
<p>{{ $t('views.application.applicationForm.dialog.provideAnswer') }}</p>
144-
<el-form-item
145-
v-if="
146-
form.dataset_setting.no_references_setting.status === 'designated_answer'
147-
"
148-
prop="designated_answer"
149-
>
150-
<el-input
151-
v-model="noReferencesform.designated_answer"
152-
:rows="2"
153-
type="textarea"
154-
maxlength="2048"
155-
:placeholder="defaultValue['designated_answer']"
156-
/>
157-
</el-form-item>
158-
</el-radio>
159-
</div>
134+
<el-radio value="ai_questioning">
135+
<p>
136+
{{ $t('views.application.applicationForm.dialog.continueQuestioning') }}
137+
</p>
138+
</el-radio>
139+
140+
<el-radio value="designated_answer">
141+
<p>{{ $t('views.application.applicationForm.dialog.provideAnswer') }}</p>
142+
<el-form-item
143+
v-if="
144+
form.dataset_setting.no_references_setting.status === 'designated_answer'
145+
"
146+
prop="designated_answer"
147+
>
148+
<el-input
149+
v-model="noReferencesform.designated_answer"
150+
:rows="2"
151+
type="textarea"
152+
maxlength="2048"
153+
:placeholder="defaultValue['designated_answer']"
154+
/>
155+
</el-form-item>
156+
</el-radio>
160157
</el-radio-group>
161158
</el-form>
162159
</el-form-item>

‎ui/src/views/function-lib/component/EditAvatarDialog.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<el-dialog
3-
:title="$t('views.applicationOverview.appInfo.EditAvatarDialog.title')"
3+
:title="`Logo ${$t('common.setting')}`"
44
v-model="dialogVisible"
55
:close-on-click-modal="false"
66
:close-on-press-escape="false"

‎ui/src/views/function-lib/component/FunctionFormDrawer.vue‎

Lines changed: 48 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -20,47 +20,54 @@
2020
:label="$t('views.functionLib.functionForm.form.functionName.label')"
2121
prop="name"
2222
>
23-
<div v-if="form.id"
24-
class="edit-avatar mr-12"
25-
@mouseenter="showEditIcon = true"
26-
@mouseleave="showEditIcon = false"
27-
>
28-
<AppAvatar
29-
v-if="isAppIcon(form.icon as string)"
30-
:id="form.id"
31-
shape="square"
32-
:size="32"
33-
style="background: none"
23+
<div class="flex w-full">
24+
<div
25+
v-if="form.id"
26+
class="edit-avatar mr-12"
27+
@mouseenter="showEditIcon = true"
28+
@mouseleave="showEditIcon = false"
3429
>
35-
<img :src="form.icon as string" alt="" />
30+
<AppAvatar
31+
v-if="isAppIcon(form.icon)"
32+
:id="form.id"
33+
shape="square"
34+
:size="32"
35+
style="background: none"
36+
>
37+
<img :src="String(form.icon)" alt="" />
38+
</AppAvatar>
39+
<AppAvatar
40+
v-else-if="form.name"
41+
:id="form.id"
42+
:name="form.name"
43+
pinyinColor
44+
shape="square"
45+
:size="32"
46+
/>
47+
<AppAvatar
48+
v-if="showEditIcon"
49+
:id="form.id"
50+
shape="square"
51+
class="edit-mask"
52+
:size="32"
53+
@click="openEditAvatar"
54+
>
55+
<el-icon><EditPen /></el-icon>
56+
</AppAvatar>
57+
</div>
58+
<AppAvatar shape="square" style="background: #34c724" class="mr-12" v-else>
59+
<img src="@/assets/icon_function_outlined.svg" style="width: 75%" alt="" />
3660
</AppAvatar>
37-
<AppAvatar
38-
v-else-if="form.name"
39-
:id="form.id"
40-
:name="form.name"
41-
pinyinColor
42-
shape="square"
43-
:size="32"
61+
<el-input
62+
v-model="form.name"
63+
:placeholder="$t('views.functionLib.functionForm.form.functionName.placeholder')"
64+
maxlength="64"
65+
show-word-limit
66+
@blur="form.name = form.name?.trim()"
4467
/>
45-
<AppAvatar
46-
v-if="showEditIcon"
47-
:id="form.id"
48-
shape="square"
49-
class="edit-mask"
50-
:size="32"
51-
@click="openEditAvatar"
52-
>
53-
<el-icon><EditPen /></el-icon>
54-
</AppAvatar>
5568
</div>
56-
<el-input
57-
v-model="form.name"
58-
:placeholder="$t('views.functionLib.functionForm.form.functionName.placeholder')"
59-
maxlength="64"
60-
show-word-limit
61-
@blur="form.name = form.name?.trim()"
62-
/>
6369
</el-form-item>
70+
6471
<el-form-item :label="$t('views.functionLib.functionForm.form.functionDescription.label')">
6572
<el-input
6673
v-model="form.desc"
@@ -72,7 +79,7 @@
7279
@blur="form.desc = form.desc?.trim()"
7380
/>
7481
</el-form-item>
75-
<!--
82+
<!--
7683
<el-form-item prop="permission_type">
7784
<template #label>
7885
<span>{{ $t('views.functionLib.functionForm.form.permission_type.label') }}</span>
@@ -110,7 +117,7 @@
110117
</el-button>
111118
</div>
112119
<el-table :data="form.init_field_list" class="mb-16">
113-
<el-table-column prop="field" :label="$t('dynamicsForm.paramForm.field.label')" >
120+
<el-table-column prop="field" :label="$t('dynamicsForm.paramForm.field.label')">
114121
<template #default="{ row }">
115122
<span :title="row.field" class="ellipsis-1">{{ row.field }}</span>
116123
</template>
@@ -266,7 +273,7 @@
266273

267274
<FunctionDebugDrawer ref="FunctionDebugDrawerRef" />
268275
<FieldFormDialog ref="FieldFormDialogRef" @refresh="refreshFieldList" />
269-
<UserFieldFormDialog ref="UserFieldFormDialogRef" @refresh="refreshInitFieldList"/>
276+
<UserFieldFormDialog ref="UserFieldFormDialogRef" @refresh="refreshInitFieldList" />
270277
<EditAvatarDialog ref="EditAvatarDialogRef" @refresh="refreshFunctionLib" />
271278
</el-drawer>
272279
</template>
@@ -283,8 +290,8 @@ import { cloneDeep } from 'lodash'
283290
import { PermissionType, PermissionDesc } from '@/enums/model'
284291
import { t } from '@/locales'
285292
import UserFieldFormDialog from '@/workflow/nodes/base-node/component/UserFieldFormDialog.vue'
286-
import {isAppIcon} from "@/utils/application";
287-
import EditAvatarDialog from "./EditAvatarDialog.vue";
293+
import { isAppIcon } from '@/utils/application'
294+
import EditAvatarDialog from './EditAvatarDialog.vue'
288295
289296
const props = defineProps({
290297
title: String
@@ -402,7 +409,6 @@ function refreshFieldList(data: any) {
402409
currentIndex.value = null
403410
}
404411
405-
406412
function openAddInitDialog(data?: any, index?: any) {
407413
if (typeof index !== 'undefined') {
408414
currentIndex.value = index
@@ -434,7 +440,6 @@ function openEditAvatar() {
434440
EditAvatarDialogRef.value.open(form.value)
435441
}
436442
437-
438443
const submit = async (formEl: FormInstance | undefined) => {
439444
if (!formEl) return
440445
await formEl.validate((valid: any) => {

‎ui/src/views/function-lib/component/PermissionDialog.vue‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
:close-on-press-escape="false"
77
:destroy-on-close="true"
88
append-to-body
9+
width="450"
910
>
1011
<el-form
1112
label-position="top"
@@ -14,17 +15,20 @@
1415
:model="form"
1516
require-asterisk-position="right"
1617
>
17-
<el-radio-group v-model="form.permission_type">
18-
<el-radio value="PRIVATE">
18+
<el-radio-group v-model="form.permission_type" class="radio-block">
19+
<el-radio value="PRIVATE" size="large" class="mb-16">
1920
{{ $t('common.private') }}
20-
{{ $t('views.template.templateForm.form.permissionType.privateDesc') }}
21+
<el-text type="info">{{
22+
$t('views.template.templateForm.form.permissionType.privateDesc')
23+
}}</el-text>
2124
</el-radio>
22-
<el-radio value="PUBLIC">
25+
<el-radio value="PUBLIC" size="large">
2326
{{ $t('common.public') }}
24-
{{ $t('views.template.templateForm.form.permissionType.publicDesc') }}
27+
<el-text type="info">{{
28+
$t('views.template.templateForm.form.permissionType.publicDesc')
29+
}}</el-text>
2530
</el-radio>
2631
</el-radio-group>
27-
2832
</el-form>
2933
<template #footer>
3034
<span class="dialog-footer">
@@ -44,7 +48,6 @@ import { t } from '@/locales'
4448
import functionLibApi from '@/api/function-lib'
4549
import { MsgSuccess } from '@/utils/message'
4650
47-
4851
const emit = defineEmits(['refresh'])
4952
5053
const fieldFormRef = ref()
@@ -89,12 +92,11 @@ const submit = async (formEl: FormInstance | undefined) => {
8992
if (!formEl) return
9093
await formEl.validate((valid) => {
9194
if (valid) {
92-
functionLibApi.putFunctionLib(form.value?.id as string, form.value, loading)
93-
.then((res) => {
94-
MsgSuccess(t('common.editSuccess'))
95-
emit('refresh')
96-
dialogVisible.value = false
97-
})
95+
functionLibApi.putFunctionLib(form.value?.id as string, form.value, loading).then((res) => {
96+
MsgSuccess(t('common.editSuccess'))
97+
emit('refresh')
98+
dialogVisible.value = false
99+
})
98100
}
99101
})
100102
}

0 commit comments

Comments
 (0)