Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: api插件体验问题修复 #85 #91

Merged
merged 2 commits into from
Mar 4, 2025
Merged

fix: api插件体验问题修复 #85 #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
602d4e0
fix: api插件变量引用时标题描述隐藏问题修复 #85
ywywZhou Jan 8, 2025
fadc9c2
fix: api插件配置项映射组件错误问题修复 #86
ywywZhou Jan 10, 2025
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
277 changes: 152 additions & 125 deletions frontend/src/utils/jsonFormSchema.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,140 +1,167 @@
import tools from './tools';

function getProperties(data = [], config = {}) {
return data.reduce((acc, cur) => {
const { key, name, desc, type, required, form_type: formType, options, meta_desc: metaDesc, multiple } = cur;
function getDataType(type) {
if (type === 'bool') return 'boolean';
if (type === 'int') return 'number';
if (type === 'list') return 'array';
return 'string';
}

let dataType = type === 'bool' ? 'boolean' : 'string';
dataType = type === 'int' ? 'number' : dataType;
acc[key] = {
title: name,
type: dataType,
sourceType: type,
formType,
description: desc || '',
extend: {
can_hook: 'can_hook' in config ? config.can_hook : true,
hook: false,
},
};
function createBaseProperty(cur, type, formType, config) {
const { name, desc, options } = cur;

if (metaDesc) {
acc[key].metaDesc = metaDesc;
}
const dataType = getDataType(type);
const compType = getCompType(type, formType, options);

if (required) {
let validRules = type === 'bool' ? '{{ typeof $self.value === "boolean" }}' : '{{ $self.value?.length > 0 }}';
validRules = type === 'int' ? '{{ $self.value >= 0 }}' : validRules;
acc[key]['ui:rules'] = [{
validator: validRules,
message: '值不能为空',
}];
}
return {
title: name,
type: dataType,
sourceType: type,
formType,
description: desc || '',
extend: {
can_hook: 'can_hook' in config ? config.can_hook : true,
hook: false,
},
'ui:component': {
name: compType,
props: {},
},
};
}

if (cur.default) {
let defaultVal = cur.default;
if (type === 'json' && !tools.checkIsJSON(defaultVal)) {
defaultVal = JSON.stringify(cur.default, null, 4);
}
acc[key].default = defaultVal;
}
function createValidationRules(type) {
let validRules = type === 'bool' ? '{{ typeof $self.value === "boolean" }}' : '{{ $self.value?.length > 0 }}';
validRules = type === 'int' ? '{{ $self.value >= 0 }}' : validRules;
return [{
validator: validRules,
message: '值不能为空',
}];
}

if (type === 'list') {
acc[key].type = 'array';
if (formType === 'table') {
const properties = getProperties(cur.table.fields, {
...cur.table.meta,
...config,
});
const tableColumnProps = { showOverflowTooltip: { interactive: true } };
Object.values(properties).forEach((item) => {
if (item['ui:props']) {
item['ui:props'].tableColumnProps = tableColumnProps;
} else {
item['ui:props'] = { tableColumnProps };
}
/* 特殊处理！！！
* 表格下单元格如果为下拉框，则popover宽度默认为auto
* 设置为字符串类型宽度是为了避免select组件使用默认宽度
*/
if (item['ui:component'].name === 'select') {
item['ui:component'].props['popover-width'] = 'max-content';
}
});
acc[key].items = {
type: 'object',
properties,
};
acc[key]['ui:props'] = {
...config,
};
} else if (formType !== 'time_range') {
// checkbox为数组类型
acc[key]['ui:props'] = {
...config,
};
const dataSource = options.map(item => ({
label: item.text || item,
value: item.value || item,
})) || [];
acc[key]['ui:component'] = {
name: 'checkbox',
props: { datasource: dataSource },
};
return acc;
}
}
function getDefaultVal(defaultVal, type) {
if (type === 'json' && !tools.checkIsJSON(defaultVal)) {
return JSON.stringify(defaultVal, null, 4);
}
return defaultVal;
}

function getCompType(type, formType, options) {
let compType = 'bfInput';
// 支持表单类型
if (formType) {
compType = ['input', 'textarea'].includes(formType) ? compType : formType;
} else if (type === 'list') {
compType = formType === 'time_range' ? 'datetimerange' : 'checkbox';
compType = formType === 'table' ? 'table' : compType;
} else {
compType = ['int', 'string'].includes(type) && options?.length ? 'select' : compType;
compType = type === 'bool' ? 'switcher' : compType;
}
return compType;
}

let compType = 'bfInput';
// 支持表单类型
if (formType) {
if (!['input', 'textarea'].includes(formType)) {
compType = formType;
}
function setComponentProps(acc, cur, key, config) {
const { multiple, hint, allow_create: allowCreate, options, type, form_type: formType } = cur;
const { name: compType } = acc[key]['ui:component'];

if (compType === 'select') {
const dataSource = options.map((item) => {
const result = {
label: item.text || item,
value: item.value || item,
};
return result;
}) || [];
acc[key].type = multiple ? 'array' : acc[key].type;
acc[key]['ui:component'].props = {
...config,
datasource: dataSource,
multiple,
allowCreate,
searchable: true,
};
} else if (compType === 'checkbox') {
acc[key]['ui:props'] = {
...config,
};
const dataSource = options.map(item => ({
label: item.text || item,
value: item.value || item,
})) || [];
acc[key]['ui:component'].props = { datasource: dataSource };
} else if (['int', 'string', 'textarea'].includes(type)) {
// 区分文本框和数字框
let inputType = type === 'int' ? 'number' : 'text';
inputType = formType === 'textarea' ? 'textarea' : inputType;
acc[key]['ui:component'].props = {
...config,
placeholder: hint,
type: inputType,
};
} else if (type === 'json') {
acc[key]['ui:component'].props = {
...config,
placeholder: hint || '请输入JSON格式数据{ "xxx": "xxx" }',
type: 'textarea',
extCls: 'json-textarea',
};
} else if (formType === 'time_range') {
acc[key]['ui:component'].name = 'bk-date-picker';
acc[key]['ui:component'].props = {
...config,
type: 'datetimerange',
placeholder: hint || '请选择时间范围',
transfer: true,
multiple: false,
};
}
}

function setTableProps(acc, cur, key, config) {
const properties = getProperties(cur.table.fields, {
...cur.table.meta,
...config,
});
const tableColumnProps = { showOverflowTooltip: { interactive: true } };
Object.values(properties).forEach((item) => {
if (item['ui:props']) {
item['ui:props'].tableColumnProps = tableColumnProps;
} else {
compType = ['int', 'string'].includes(type) && options?.length ? 'select' : compType;
compType = type === 'bool' ? 'switcher' : compType;
item['ui:props'] = { tableColumnProps };
}
acc[key]['ui:component'] = {
name: compType,
props: {
...config,
},
};
if (options && options.length) {
const dataSource = options.map((item) => {
const result = {
label: item.text || item,
value: item.value || item,
};
return result;
}) || [];
acc[key]['ui:component'].props.datasource = dataSource;
acc[key].type = multiple ? 'array' : acc[key].type;
acc[key]['ui:component'].props.multiple = multiple;
} else if (['int', 'string', 'textarea'].includes(type)) {
// 区分文本框和数字框
let inputType = type === 'int' ? 'number' : 'text';
inputType = formType === 'textarea' ? 'textarea' : inputType;
acc[key]['ui:component'].props.type = inputType;
} else if (type === 'json') {
acc[key]['ui:component'].props = {
...config,
placeholder: '请输入JSON格式数据{ "xxx": "xxx" }',
type: 'textarea',
extCls: 'json-textarea',
};
} else if (formType && formType === 'time_range') {
acc[key]['ui:component'].name = 'bk-date-picker';
acc[key]['ui:component'].props = {
...config,
type: 'datetimerange',
placeholder: '请选择时间范围',
transfer: true,
multiple: false,
};
/* 特殊处理！！！
* 表格下单元格如果为下拉框，则popover宽度默认为auto
* 设置为字符串类型宽度是为了避免select组件使用默认宽度
*/
if (item['ui:component'].name === 'select') {
item['ui:component'].props['popover-width'] = 'max-content';
}
});
acc[key].items = {
type: 'object',
properties,
};
acc[key]['ui:props'] = {
...config,
};
}

function getProperties(data = [], config = {}) {
return data.reduce((acc, cur) => {
const { key, type, required, form_type: formType, meta_desc: metaDesc } = cur;

acc[key] = createBaseProperty(cur, type, formType, config);

if (metaDesc) acc[key].metaDesc = metaDesc;
if (required) acc[key]['ui:rules'] = createValidationRules(type);
if (cur.default) acc[key].default = getDefaultVal(cur.default, type);

if (formType === 'table') {
setTableProps(acc, cur, key, config);
} else {
setComponentProps(acc, cur, key, config);
}
return acc;
}, {});
}
Expand Down
11 changes: 6 additions & 5 deletions frontend/src/views/template/TemplateEdit/NodeConfig/InputParams.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@
this.hookFormData[form] = varItem.value;
this.hookFormSchema[form] = { ...schema };
this.formData[form] = `\${${form}}`;
this.setHookFormItem(formSchema, { form, title: schema.title });
this.setHookFormItem(formSchema, { form, schema });
result = true;
}
}
Expand All @@ -261,18 +261,19 @@
const result = await this.hookForm(path);
if (!result) return;
this.formData[path] = `\${${path}}`;
this.setHookFormItem(this.formsScheme, { form: path, title: schema.title });
this.setHookFormItem(this.formsScheme, { form: path, schema });
this.$emit('update', tools.deepClone(this.formData));
}
this.randomKey = new Date().getTime();
},
setHookFormItem(formSchema, { form, title }) {
setHookFormItem(formSchema, { form, schema }) {
formSchema.properties[form] = {
extend: {
can_hook: true,
hook: true,
},
title,
title: schema.title,
description: schema.description,
type: 'string',
'ui:component': {
name: 'bfInput',
Expand Down Expand Up @@ -535,7 +536,7 @@
// jsonSchema表单重置hook态
if (this.isJsonSchema) {
const schema = this.hookFormSchema[form];
this.setHookFormItem(this.formsScheme, { form, title: schema.title });
this.setHookFormItem(this.formsScheme, { form, schema });
this.randomKey = new Date().getTime();
}
},
Expand Down
Loading