fix: 修改bug

This commit is contained in:
100011797 2023-07-07 14:04:51 +08:00
parent e103369689
commit daef6b7f1f
9 changed files with 35 additions and 22 deletions

View File

@ -1,7 +1,7 @@
<!-- 第三方账户绑定 -->
<template>
<div class='page-container'>
<div class='content'>
<div class='content-bind'>
<div class='title'>第三方账户绑定</div>
<!-- 已登录-绑定三方账号 -->
<template v-if='!!token'>
@ -323,7 +323,7 @@ onMounted(() => {
align-items: center;
justify-content: center;
.content {
.content-bind {
box-sizing: border-box;
width: 928px;
min-height: 510px;

View File

@ -41,7 +41,7 @@
:value="
form.roleList.map((item) => item.name).join(',')
"
placeholder="请输入角色"
placeholder="请选择角色"
disabled
/>
</j-form-item>
@ -52,7 +52,7 @@
:value="
form.orgList.map((item) => item.name).join(',')
"
placeholder="请输入组织"
placeholder="请选择组织"
disabled
/>
</j-form-item>

View File

@ -49,7 +49,7 @@
<j-form-item
:name="['table', index, 'value']"
:rules="{
required: true,
required: record.required,
message: '该字段为必填字段',
}"
has-feedback
@ -172,9 +172,10 @@ const newFunctions = computed(() => {
? tableItem['json']?.['properties'][0]
: undefined,
value: undefined,
required: tableItem.expands?.required
});
}
result.push({
...func,
table: array,

View File

@ -22,7 +22,7 @@
<ValueRender
type="table"
:data="_props.data"
:value="{ formatValue: record.value }"
:value="{ ...record }"
/>
</template>
<template v-else-if="column.key === 'action'">

View File

@ -95,6 +95,7 @@ const columns = [
title: '名称',
dataIndex: 'name',
key: 'name',
ellipsis: true
},
{
title: '值',

View File

@ -13,6 +13,12 @@ export const USER_CENTER_MENU_DATA = {
sortIndex: 9999,
granted: true,
owner: 'iot',
permissions: [
{
permission: 'system_config',
actions: ['query'],
},
],
buttons: [
{
id: USER_CENTER_MENU_BUTTON_CODE,

View File

@ -15,26 +15,26 @@
:rules='IdRules'
>
<template #label>
<span>
插件ID
<j-tooltip
title='若不填写系统将自动生成唯一ID'
>
<AIcon
type='QuestionCircleOutlined'
style='margin-left: 2px'
/>
</j-tooltip>
</span>
<span>
插件ID
<j-tooltip
title='若不填写系统将自动生成唯一ID'
>
<AIcon
type='QuestionCircleOutlined'
style='margin-left: 2px'
/>
</j-tooltip>
</span>
</template>
<j-input v-model:value='modelRef.id' :disabled='!!data.id' />
<j-input placeholder="请输入插件ID" v-model:value='modelRef.id' :disabled='!!data.id' />
</j-form-item>
<j-form-item
label='插件名称'
name='name'
:rules="nameRules"
>
<j-input v-model:value='modelRef.name' />
<j-input placeholder="请输入插件名称" v-model:value='modelRef.name' />
</j-form-item>
<j-form-item
label='文件'
@ -135,6 +135,7 @@ const handleSave = async () => {
const data = await formRef.value.validate()
if (data) {
loading.value = true
modelRef.id = modelRef.id ? modelRef.id : null;
const resp = props.data.id ? await update(modelRef).catch(() => { success: false }) : await add(modelRef).catch(() => { success: false })
loading.value = false
if (resp.success) {

View File

@ -353,7 +353,7 @@ const form = reactive<formType>({
title: [
{
required: true,
message: '名称必填',
message: '请输入系统名称',
},
{
max: 64,

View File

@ -94,7 +94,11 @@
</j-row>
<j-row :gutter="24" v-if="form.IsShow('add', 'edit')">
<j-col :span="12">
<j-form-item name="roleIdList" label="角色" class="flex">
<j-form-item name="roleIdList" label="角色" class="flex"
:rules="[
{ required: true, message: '请选择角色' },
]"
>
<j-select
v-model:value="form.data.roleIdList"
mode="multiple"