Skip to content

Commit

Permalink
feature: Agent 导入表头支持云区域搜索 (closed TencentBlueKing#913)
Browse files Browse the repository at this point in the history
  • Loading branch information
GONGONGONG committed Jul 11, 2022
1 parent 9baf3cc commit 2b75340
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 0 deletions.
3 changes: 3 additions & 0 deletions dev_log/2.2.19/daoqgong202207111755.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
feature:
- "Agent 导入表头支持云区域搜索 (closed #913)"
2 changes: 2 additions & 0 deletions frontend/src/components/setup-table/input-type.vue
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
:permission="permission"
:ref="type"
:clearable="false"
:searchable="searchable"
:value="inputValue"
:popover-options="{ 'boundary': 'window' }"
:placeholder="placeholder"
Expand Down Expand Up @@ -184,6 +185,7 @@ export default class InputType extends Mixins(emitter) {
@Prop({ type: Boolean, default: false }) private readonly disabled!: boolean;
@Prop({ type: String, default: window.i18n.t('请输入') }) private placeholder!: string;
@Prop({ type: Boolean, default: true }) private readonly multiple!: boolean; // biz select 框是否支持多选
@Prop({ type: Boolean, default: false }) private readonly searchable!: boolean;
@Prop({ type: Array, default: () => ([]) }) private options!: Dictionary[]; // 下拉框数据源
@Prop({ type: Number, default: 0 }) private popoverMinWidth!: number;
@Prop({ type: Boolean, default: true }) private readonly autoRequest!: boolean;
Expand Down
1 change: 1 addition & 0 deletions frontend/src/components/setup-table/install-table.vue
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
subTitle: config.subTitle,
options: getCellInputOptions({}, config),
multiple: !!config.multiple,
searchable: !!config.searchable,
placeholder: config.placeholder,
appendSlot: config.appendSlot
}"
Expand Down
2 changes: 2 additions & 0 deletions frontend/src/components/setup-table/table-header.vue
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
options: options,
multiple: multiple,
appendSlot: appendSlot,
searchable: searchable,
placeholder
}"
v-model="value"
Expand Down Expand Up @@ -106,6 +107,7 @@ export default class TableHeader extends Vue {
@Prop({ type: String, default: '' }) private readonly subTitle!: string; // 批量编辑提示信息
@Prop({ type: Array, default: () => ([]) }) private options!: Dictionary[]; // 下拉框数据源
@Prop({ type: Boolean, default: false }) private readonly multiple!: boolean; // 是否支持多选
@Prop({ type: Boolean, default: false }) private readonly searchable!: boolean;
@Prop({ type: String, default: '' }) private readonly placeholder!: string;
@Prop({ type: String, default: '' }) private readonly appendSlot!: string;
Expand Down
2 changes: 2 additions & 0 deletions frontend/src/views/agent/config/importTableConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ export const tableConfig = [
prop: 'bk_cloud_id',
type: 'select',
batch: true,
searchable: true,
required: true,
noRequiredMark: false,
popoverMinWidth: 160,
Expand Down Expand Up @@ -273,6 +274,7 @@ export const tableManualConfig = [
prop: 'bk_cloud_id',
type: 'select',
batch: true,
searchable: true,
required: true,
noRequiredMark: false,
popoverMinWidth: 160,
Expand Down

0 comments on commit 2b75340

Please sign in to comment.