Skip to content

Commit dee53ad

Browse files
committed
fix(frontend): 单据前端交互问题 #8656
1 parent 109e77c commit dee53ad

File tree

43 files changed

+258
-5710
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+258
-5710
lines changed

dbm-ui/frontend/src/components/db-table/OriginalTable.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,13 @@
4040
(e: 'clearSearch'): void;
4141
}
4242
interface Props {
43-
columns: InstanceType<typeof Table>['$props']['columns'];
43+
columns?: InstanceType<typeof Table>['$props']['columns'];
4444
isAnomalies?: boolean;
4545
isSearching?: boolean;
4646
}
4747
4848
const props = withDefaults(defineProps<Props>(), {
49+
columns: undefined,
4950
isAnomalies: false,
5051
isSearching: false,
5152
});

dbm-ui/frontend/src/router/index.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,6 @@ import getTicketRoutes from '@views/ticket-center/routes';
3636
import getTicketCooperationSettingRoutes from '@views/ticket-cooperation-setting/routes';
3737
import getTicketFlowSettingBizRoutes from '@views/ticket-flow-setting-biz/routes';
3838
import getTicketFlowSettingGlobalRoutes from '@views/ticket-flow-setting-global/routes';
39-
// import getTicketManageRoutes from '@views/ticket-manage/routes';
40-
// import getTicketSelfApplyRoutes from '@views/ticket-self-apply/routes';
41-
// import getTicketSelfManageRoutes from '@views/ticket-self-manage/routes';
42-
// import getTicketSelfTodoRoutes from '@views/ticket-self-todo/routes';
4339
import getVersionFilesRoutes from '@views/version-files/routes';
4440
import getWhitelistRoutes from '@views/whitelist/routes';
4541

dbm-ui/frontend/src/services/source/package.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,13 @@ export function updatePackage(params: {
7575
id: number;
7676
priority?: number;
7777
enable?: boolean;
78-
name: string;
79-
version: string;
80-
pkg_type: string;
81-
db_type: string;
82-
path: string;
83-
size: number;
84-
md5: string;
78+
name?: string;
79+
version?: string;
80+
pkg_type?: string;
81+
db_type?: string;
82+
path?: string;
83+
size?: number;
84+
md5?: string;
8585
allow_biz_ids?: number[];
8686
mode?: string;
8787
}) {

dbm-ui/frontend/src/views/db-configure/components/ParameterTable.vue

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828
</DbForm>
2929
</template>
3030
<script lang="tsx">
31-
import type { Column } from 'bkui-vue/lib/table/props';
32-
// import _ from 'lodash';
3331
import { useI18n } from 'vue-i18n';
3432
3533
import { getLevelConfig } from '@services/source/configs';
@@ -46,9 +44,9 @@
4644
index: number;
4745
};
4846
49-
export default {
47+
defineOptions({
5048
name: 'ParameterTable',
51-
};
49+
});
5250
</script>
5351

5452
<script setup lang="tsx">
@@ -101,10 +99,10 @@
10199
// 配合 controlShow 控制当前行显示隐藏
102100
const lockTipsList = computed(() => Array.from({ length: props.data.length }, () => false));
103101
104-
const columns: Column[] = [{
102+
const columns = [{
105103
label: t('参数项'),
106104
field: 'conf_name',
107-
showOverflowTooltip: false,
105+
minWidth: 300,
108106
render: ({ cell, data, index }: TableColumn) => {
109107
if (data.op_type === 'add') {
110108
return (

dbm-ui/frontend/src/views/db-configure/components/ReadonlyTable.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@
8484
{
8585
label: t('参数项'),
8686
field: 'conf_name',
87+
minWidth: 300,
8788
render: ({ data }: {data: ParameterConfigItem}) => (
8889
<>
8990
<div

dbm-ui/frontend/src/views/db-manage/common/sql-execute/cluster-ids/Index.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@
9191
{
9292
label: t('集群'),
9393
field: 'master_domain',
94+
minWidth: 250,
9495
},
9596
{
9697
label: t('类型'),

dbm-ui/frontend/src/views/db-manage/mysql/partition-manage/Index.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,6 @@
222222
},
223223
{
224224
label: t('操作'),
225-
field: 'action',
226225
width: 220,
227226
fixed: 'right',
228227
render: ({ data }: { data: PartitionModel }) => {

dbm-ui/frontend/src/views/db-manage/tendb-cluster/partition-manage/Index.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,6 @@
230230
},
231231
{
232232
label: t('操作'),
233-
field: 'action',
234233
width: 220,
235234
fixed: 'right',
236235
render: ({ data }: { data: PartitionModel }) => {

dbm-ui/frontend/src/views/ticket-center/common/hooks/use-search-select.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const create = (options = {} as { exclude: string[] }) => {
2424
const serachList = [
2525
{
2626
name: t('单号'),
27-
id: 'id',
27+
id: 'ids',
2828
},
2929
{
3030
name: t('单据类型'),

dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/com-factory/components/DemandInfo.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@
107107
}
108108
109109
.demand-info-item-value {
110-
display: ruby;
111110
overflow: hidden;
112111
color: @title-color;
113112
text-overflow: ellipsis;

0 commit comments

Comments
 (0)