Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ function handleClosed() {
</el-button>
</MkTooltip>
<MkDrawer v-model="visible" title="编辑 API Key" @closed="handleClosed">
<el-form ref="formRef" :model="form" :rules="rules" :inert="saving" label-position="top" require-asterisk-position="right" @submit.prevent>
<el-form ref="formRef" :model="form" :rules="rules" label-position="top" require-asterisk-position="right" @submit.prevent>
<el-form-item label="API KEY">
<el-input :model-value="form.secret_key" disabled>
<template #suffix>
Expand Down
11 changes: 2 additions & 9 deletions ui/src/components/mk-dynamics-form/Demo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ const validateForm = async () => {
</div>
</template>
<el-table :data="formFieldList" row-key="field" v-if="formFieldList.length > 0">
<el-table-column prop="field" label="参数" width="120" show-overflow-tooltip> </el-table-column>
<el-table-column prop="field" label="参数" width="120" show-overflow-tooltip></el-table-column>
<el-table-column prop="label" label="显示名称" show-overflow-tooltip>
<template #default="{ row }">
<span>{{ getFieldLabel(row) }}</span>
Expand Down Expand Up @@ -159,14 +159,7 @@ const validateForm = async () => {
<el-button type="primary" @click="validateForm">校验</el-button>
</div>
</template>
<MkDynamicsForm
v-if="formFieldList.length > 0"
ref="dynamicsFormRef"
v-model="formData"
:render-data="formFieldList"
label-position="top"
require-asterisk-position="right"
/>
<MkDynamicsForm v-if="formFieldList.length > 0" ref="dynamicsFormRef" v-model="formData" :render-data="formFieldList" />
<el-empty v-else description="请先添加表单字段" />
</el-card>
</el-col>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,8 @@ defineExpose({ validate, field: props.field })
:render-data="getChildFields()"
v-bind="attr"
:parent-field="formField.field + '.' + index"
label-position="top"
require-asterisk-position="right"
></DynamicsForm>
<MkTooltip effect="dark" content="删除" placement="top">
<MkTooltip content="删除" placement="top">
<el-button text @click.stop="deleteKnowledge(item)" class="delete-button">
<MkIcon name="icon_delete-trash_outlined"></MkIcon>
</el-button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,6 @@ defineExpose({ validate })
:render-data="formField.children ? formField.children : []"
v-bind="$attrs"
:parent-field="formField.field"
label-position="top"
require-asterisk-position="right"
></DynamicsForm>
</el-card>
</template>
2 changes: 0 additions & 2 deletions ui/src/components/mk-dynamics-form/items/complex/TabCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,6 @@ defineExpose({ validate, field: props.field })
:render-data="getChildFields()"
v-bind="attr"
:parent-field="formField.field + '.' + index"
label-position="top"
require-asterisk-position="right"
></DynamicsForm>
</el-card>
</template>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ defineExpose({ open })
:rules="applicationFormRules"
label-position="top"
require-asterisk-position="right"
@submit.prevent="submit"
@submit.prevent
>
<el-form-item label="名称" prop="name">
<el-input
Expand Down
10 changes: 9 additions & 1 deletion ui/src/views/knowledge-detail/setting/scheduled-sync/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,15 @@ watch(
<el-tab-pane label="同步日志" name="logs" />
</el-tabs>
<div v-show="activeTab === 'settings'" v-loading="loading || saving" class="min-h-40">
<el-form ref="formRef" :model="syncSetting" :rules="rules" class="max-w-200 pb-6" label-position="top" @submit.prevent>
<el-form
ref="formRef"
:model="syncSetting"
:rules="rules"
class="max-w-200 pb-6"
label-position="top"
require-asterisk-position="right"
@submit.prevent
>
<el-form-item>
<template #label>
<span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ defineExpose({ open })

<template>
<MkDrawer v-model="visible" :title="`${LOGIN_METHOD_LABELS[form.key]}设置`" @closed="resetData">
<el-form ref="formRef" v-loading="loading" :model="form" :rules="rules" label-position="top" require-asterisk-position="right">
<el-form ref="formRef" v-loading="loading" :model="form" :rules="rules" label-position="top" require-asterisk-position="right" @submit.prevent>
<el-form-item v-for="key in configKeys" :key="key" :label="SCAN_FIELD_LABELS[key] ?? key" :prop="`config.${key}`">
<el-input
v-model="form.config[key]"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,25 @@ onMounted(() => loadSetting)
</script>

<template>
<el-form ref="authFormRef" v-loading="loading" class="max-w-200" :model="form" :rules="rules" label-position="top">
<el-form
ref="authFormRef"
v-loading="loading"
class="max-w-200"
:model="form"
:rules="rules"
label-position="top"
require-asterisk-position="right"
@submit.prevent
>
<el-form-item label="ldpUri" prop="config.ldpUri"><el-input v-model="form.config.ldpUri" placeholder="请输入 ldpUri" /></el-form-item>
<el-form-item label="验证地址" prop="config.validateUrl"
><el-input v-model="form.config.validateUrl" placeholder="请输入验证地址"
/></el-form-item>
<el-form-item label="回调地址" prop="config.redirectUrl"
><el-input v-model="form.config.redirectUrl" placeholder="请输入回调地址"
/></el-form-item>
<el-form-item
><div class="flex-column">
<el-form-item label="验证地址" prop="config.validateUrl">
<el-input v-model="form.config.validateUrl" placeholder="请输入验证地址" />
</el-form-item>
<el-form-item label="回调地址" prop="config.redirectUrl">
<el-input v-model="form.config.redirectUrl" placeholder="请输入回调地址" />
</el-form-item>
<el-form-item>
<div class="flex-column">
<span>启用 CAS 认证</span>
<el-switch v-model="form.is_active" class="self-start" />
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,23 +51,32 @@ onMounted(() => loadSetting())
</script>

<template>
<el-form ref="authFormRef" v-loading="loading" class="max-w-200" :model="form" :rules="rules" label-position="top">
<el-form-item label="LDAP 地址" prop="config.ldap_server"
><el-input v-model="form.config.ldap_server" placeholder="请输入LDAP 地址"
/></el-form-item>
<el-form
ref="authFormRef"
v-loading="loading"
class="max-w-200"
:model="form"
:rules="rules"
label-position="top"
require-asterisk-position="right"
@submit.prevent
>
<el-form-item label="LDAP 地址" prop="config.ldap_server">
<el-input v-model="form.config.ldap_server" placeholder="请输入LDAP 地址" />
</el-form-item>
<el-form-item label="绑定 DN" prop="config.base_dn"><el-input v-model="form.config.base_dn" placeholder="请输入绑定 DN" /></el-form-item>
<el-form-item label="密码" prop="config.password">
<el-input v-model="form.config.password" type="password" autocomplete="new-password" show-password placeholder="请输入密码" />
</el-form-item>
<el-form-item label="用户 OU" prop="config.ou">
<el-input v-model="form.config.ou" placeholder="请输入用户 OU" />
</el-form-item>
<el-form-item label="用户过滤器" prop="config.ldap_filter"
><el-input v-model="form.config.ldap_filter" placeholder="请输入用户过滤器"
/></el-form-item>
<el-form-item label="LDAP 属性映射" prop="config.ldap_mapping"
><el-input v-model="form.config.ldap_mapping" type="textarea" :rows="4" placeholder="请输入 LDAP 属性映射"
/></el-form-item>
<el-form-item label="用户过滤器" prop="config.ldap_filter">
<el-input v-model="form.config.ldap_filter" placeholder="请输入用户过滤器" />
</el-form-item>
<el-form-item label="LDAP 属性映射" prop="config.ldap_mapping">
<el-input v-model="form.config.ldap_mapping" type="textarea" :rows="4" placeholder="请输入 LDAP 属性映射" />
</el-form-item>
<el-form-item>
<div class="flex-column">
<span>启用 LDAP 认证</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,30 +53,42 @@ onMounted(() => loadSetting())
</script>

<template>
<el-form ref="authFormRef" v-loading="loading" class="max-w-200" :model="form" :rules="rules" label-position="top">
<el-form-item label="授权端地址" prop="config.authEndpoint"
><el-input v-model="form.config.authEndpoint" placeholder="请输入授权端地址"
/></el-form-item>
<el-form-item label="Token 端地址" prop="config.tokenEndpoint"
><el-input v-model="form.config.tokenEndpoint" placeholder="请输入 Token 端地址"
/></el-form-item>
<el-form-item label="用户信息端地址" prop="config.userInfoEndpoint"
><el-input v-model="form.config.userInfoEndpoint" placeholder="请输入用户信息端地址"
/></el-form-item>
<el-form
ref="authFormRef"
v-loading="loading"
class="max-w-200"
:model="form"
:rules="rules"
label-position="top"
require-asterisk-position="right"
@submit.prevent
>
<el-form-item label="授权端地址" prop="config.authEndpoint">
<el-input v-model="form.config.authEndpoint" placeholder="请输入授权端地址" />
</el-form-item>
<el-form-item label="Token 端地址" prop="config.tokenEndpoint">
<el-input v-model="form.config.tokenEndpoint" placeholder="请输入 Token 端地址" />
</el-form-item>
<el-form-item label="用户信息端地址" prop="config.userInfoEndpoint">
<el-input v-model="form.config.userInfoEndpoint" placeholder="请输入用户信息端地址" />
</el-form-item>
<el-form-item label="连接范围" prop="config.scope"><el-input v-model="form.config.scope" placeholder="请输入连接范围" /></el-form-item>
<el-form-item label="客户端 ID" prop="config.clientId"><el-input v-model="form.config.clientId" placeholder="请输入客户端 ID" /></el-form-item>
<el-form-item label="客户端密钥" prop="config.clientSecret"
><el-input v-model="form.config.clientSecret" type="password" autocomplete="new-password" show-password placeholder="请输入客户端密钥"
/></el-form-item>
<el-form-item label="字段映射" prop="config.fieldMapping"
><el-input v-model="form.config.fieldMapping" placeholder="请输入字段映射"
/></el-form-item>
<el-form-item label="回调地址" prop="config.redirectUrl"
><el-input v-model="form.config.redirectUrl" placeholder="请输入回调地址"
/></el-form-item>
<el-form-item
><div class="flex-column"><span>启用 OAuth2 认证</span><el-switch v-model="form.is_active" class="self-start" /></div
></el-form-item>
<el-form-item label="客户端密钥" prop="config.clientSecret">
<el-input v-model="form.config.clientSecret" type="password" autocomplete="new-password" show-password placeholder="请输入客户端密钥" />
</el-form-item>
<el-form-item label="字段映射" prop="config.fieldMapping">
<el-input v-model="form.config.fieldMapping" placeholder="请输入字段映射" />
</el-form-item>
<el-form-item label="回调地址" prop="config.redirectUrl">
<el-input v-model="form.config.redirectUrl" placeholder="请输入回调地址" />
</el-form-item>
<el-form-item>
<div class="flex-column">
<span>启用 OAuth2 认证</span>
<el-switch v-model="form.is_active" class="self-start" />
</div>
</el-form-item>
<!-- 保存 -->
<el-button v-if="perm.system.chatAuth.edit()" type="primary" @click="submit">保存</el-button>
</el-form>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,31 +71,43 @@ onMounted(() => loadSetting())
</script>

<template>
<el-form ref="authFormRef" v-loading="loading" class="max-w-200" :model="form" :rules="rules" label-position="top">
<el-form-item label="授权端地址" prop="config.authEndpoint"
><el-input v-model="form.config.authEndpoint" placeholder="请输入授权端地址"
/></el-form-item>
<el-form-item label="Token 端地址" prop="config.tokenEndpoint"
><el-input v-model="form.config.tokenEndpoint" placeholder="请输入 Token 端地址"
/></el-form-item>
<el-form-item label="用户信息端地址" prop="config.userInfoEndpoint"
><el-input v-model="form.config.userInfoEndpoint" placeholder="请输入用户信息端地址"
/></el-form-item>
<el-form
ref="authFormRef"
v-loading="loading"
class="max-w-200"
:model="form"
:rules="rules"
label-position="top"
require-asterisk-position="right"
@submit.prevent
>
<el-form-item label="授权端地址" prop="config.authEndpoint">
<el-input v-model="form.config.authEndpoint" placeholder="请输入授权端地址" />
</el-form-item>
<el-form-item label="Token 端地址" prop="config.tokenEndpoint">
<el-input v-model="form.config.tokenEndpoint" placeholder="请输入 Token 端地址" />
</el-form-item>
<el-form-item label="用户信息端地址" prop="config.userInfoEndpoint">
<el-input v-model="form.config.userInfoEndpoint" placeholder="请输入用户信息端地址" />
</el-form-item>
<el-form-item label="Scope" prop="config.scope"><el-input v-model="form.config.scope" placeholder="openid+profile+email" /></el-form-item>
<el-form-item label="State"><el-input v-model="form.config.state" placeholder="请输入" /></el-form-item>
<el-form-item label="客户端 ID" prop="config.clientId"><el-input v-model="form.config.clientId" placeholder="请输入客户端 ID" /></el-form-item>
<el-form-item label="客户端密钥" prop="config.clientSecret"
><el-input v-model="form.config.clientSecret" type="password" autocomplete="new-password" show-password placeholder="请输入客户端密钥"
/></el-form-item>
<el-form-item label="字段映射" prop="config.fieldMapping"
><el-input v-model="form.config.fieldMapping" placeholder="请输入字段映射"
/></el-form-item>
<el-form-item label="回调地址" prop="config.redirectUrl"
><el-input v-model="form.config.redirectUrl" placeholder="请输入回调地址"
/></el-form-item>
<el-form-item
><div class="flex-column"><span>启用 OIDC 认证</span><el-switch v-model="form.is_active" class="self-start" /></div
></el-form-item>
<el-form-item label="客户端密钥" prop="config.clientSecret">
<el-input v-model="form.config.clientSecret" type="password" autocomplete="new-password" show-password placeholder="请输入客户端密钥" />
</el-form-item>
<el-form-item label="字段映射" prop="config.fieldMapping">
<el-input v-model="form.config.fieldMapping" placeholder="请输入字段映射" />
</el-form-item>
<el-form-item label="回调地址" prop="config.redirectUrl">
<el-input v-model="form.config.redirectUrl" placeholder="请输入回调地址" />
</el-form-item>
<el-form-item>
<div class="flex-column">
<span>启用 OIDC 认证</span>
<el-switch v-model="form.is_active" class="self-start" />
</div>
</el-form-item>
<!-- 保存 -->
<el-button v-if="perm.system.chatAuth.edit()" type="primary" @click="submit">保存</el-button>
</el-form>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ defineExpose({ open })

<template>
<MkDialog v-model="visible" title="添加成员" @closed="resetData">
<el-form ref="formRef" :model="memberForm" :rules="formRules" label-position="top">
<el-form ref="formRef" :model="memberForm" :rules="formRules" label-position="top" require-asterisk-position="right" @submit.prevent>
<el-form-item label="对话用户" prop="userIds">
<el-select v-model="memberForm.userIds" class="w-full" filterable multiple :loading="optionsLoading" placeholder="请选择用户名或姓名">
<el-option v-for="user in userOptions" :key="user.id" :label="user.nick_name" :value="user.id" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ defineExpose({ open })

<template>
<MkDialog v-model="visible" :title="groupForm.id ? '重命名用户组' : '创建用户组'" @closed="resetData">
<el-form ref="formRef" :model="groupForm" :rules="formRules" label-position="top">
<el-form ref="formRef" :model="groupForm" :rules="formRules" label-position="top" @submit.prevent>
<el-form-item label="用户组名称" prop="name">
<el-input v-model="groupForm.name" maxlength="128" placeholder="请输入用户组名称" show-word-limit @keyup.enter="submit" />
</el-form-item>
Expand Down
9 changes: 1 addition & 8 deletions ui/src/views/system/chat-management/users/UserFromDrawer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -137,14 +137,7 @@ defineExpose({ open })

<template>
<MkDrawer v-model="drawerVisible" :title="drawerTitle" @closed="resetData">
<el-form
ref="userFormRef"
:model="userForm"
:rules="userFormRules"
label-position="top"
require-asterisk-position="right"
@submit.prevent="submitUser"
>
<el-form ref="userFormRef" :model="userForm" :rules="userFormRules" label-position="top" require-asterisk-position="right" @submit.prevent>
<section>
<h4 class="mk-title-decoration mb-4">基本信息</h4>
<el-form-item label="用户名" prop="username">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ defineExpose({ open })
:rules="batchGroupFormRules"
label-position="top"
require-asterisk-position="right"
@submit.prevent="submitBatchSetUserGroups"
@submit.prevent
>
<el-form-item label="设置方式">
<el-radio-group v-model="batchGroupForm.is_append">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ defineExpose({ open })
:rules="importUsersFormRules"
label-position="top"
require-asterisk-position="right"
@submit.prevent="submitImportUsers"
@submit.prevent
>
<el-form-item label="用户来源" prop="syncType">
<el-select v-model="importUsersForm.syncType" class="w-full" :loading="syncTypesLoading" placeholder="请选择用户来源">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ defineExpose({ open })
label-position="top"
require-asterisk-position="right"
v-loading="loading"
@submit.prevent="submitQuotaSettings"
@submit.prevent
>
<el-form-item label="设置方式">
<el-radio-group v-model="quotaSettingsForm.quotaType">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ defineExpose({ open })

<template>
<MkDialog v-model="visible" title="添加成员" @closed="resetData">
<el-form ref="formRef" :model="memberForm" :rules="formRules" label-position="top">
<el-form ref="formRef" :model="memberForm" :rules="formRules" label-position="top" require-asterisk-position="right" @submit.prevent>
<el-form-item label="用户名/姓名" prop="userIds">
<el-select
v-model="memberForm.userIds"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ defineExpose({ open })

<template>
<MkDialog v-model="visible" :title="groupForm.id ? '重命名用户组' : '创建用户组'" @closed="resetData">
<el-form ref="formRef" :model="groupForm" :rules="formRules" label-position="top">
<el-form ref="formRef" :model="groupForm" :rules="formRules" label-position="top" require-asterisk-position="right" @submit.prevent>
<el-form-item label="用户组名称" prop="name">
<el-input v-model="groupForm.name" maxlength="128" placeholder="请输入用户组名称" show-word-limit @keyup.enter="submit" />
</el-form-item>
Expand Down
2 changes: 1 addition & 1 deletion ui/src/views/system/identity/roles/AddMemberDrawer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ defineExpose({ open })

<template>
<MkDrawer v-model="visible" title="添加成员" @closed="resetData">
<el-form ref="formRef" :model="memberForm" label-position="top">
<el-form ref="formRef" :model="memberForm" label-position="top" require-asterisk-position="right" @submit.prevent>
<MkFormList v-model="memberForm.members" add-text="添加成员" :default-item="{ user_ids: [], workspace_ids: [] }">
<template #default="{ index, item: memberSetting }">
<el-form-item
Expand Down
Loading
Loading