Browse Source

Merge branch 'develop' into refactor/webhooks

pull/5349/head
Wing-Kam Wong 2 years ago
parent
commit
20124c67c5
  1. 2
      packages/nc-gui/pages/[projectType]/[projectId]/index/index.vue
  2. 2
      packages/nc-gui/utils/iconUtils.ts
  3. 2
      packages/nocodb/src/lib/migrations/XcMigrationSourcev2.ts
  4. 0
      packages/nocodb/src/lib/migrations/v2/nc_028_add_enable_scanner_in_form_columns_meta_table.ts

2
packages/nc-gui/pages/[projectType]/[projectId]/index/index.vue

@ -17,7 +17,7 @@ const icon = (tab: TabItem) => {
case TabType.TABLE:
return iconMap.table
case TabType.VIEW:
return iconMap.eye
return iconMap.view
case TabType.AUTH:
return iconMap.users
}

2
packages/nc-gui/utils/iconUtils.ts

@ -298,7 +298,7 @@ export const iconMap = {
form: h('span', { class: 'material-symbols-outlined' }, 'receipt'),
map: h('span', { class: 'material-symbols-outlined' }, 'map'),
kanban: h('span', { class: 'material-symbols-outlined' }, 'view_column'),
view: h('span', { class: 'material-symbols-outlined' }, 'view_list'),
view: h('span', { class: 'material-symbols-outlined' }, 'visibility'),
// rowHeight: h('span', { class: 'material-symbols-outlined' }, 'height'),
rowHeight: h(PhSplitVerticalThin, { style: { fontSize: '14px' } }),
filter: h('span', { class: 'material-symbols-outlined' }, 'filter_list'),

2
packages/nocodb/src/lib/migrations/XcMigrationSourcev2.ts

@ -15,7 +15,7 @@ import * as nc_024_barcode_column_type from './v2/nc_024_barcode_column_type';
import * as nc_025_add_row_height from './v2/nc_025_add_row_height';
import * as nc_026_map_view from './v2/nc_026_map_view';
import * as nc_027_add_comparison_sub_op from './v2/nc_027_add_comparison_sub_op';
import * as nc_028_add_enable_scanner_in_form_columns_meta_table from './v2/nc_026_add_enable_scanner_in_form_columns_meta_table';
import * as nc_028_add_enable_scanner_in_form_columns_meta_table from './v2/nc_028_add_enable_scanner_in_form_columns_meta_table';
import * as nc_029_alter_hooklog_response_types from './v2/nc_029_alter_hooklog_response_types';
// Create a custom migration source class

0
packages/nocodb/src/lib/migrations/v2/nc_026_add_enable_scanner_in_form_columns_meta_table.ts → packages/nocodb/src/lib/migrations/v2/nc_028_add_enable_scanner_in_form_columns_meta_table.ts

Loading…
Cancel
Save