Browse Source

Merge branch 'develop' of github.com:nocodb/nocodb into develop

pull/3572/head
braks 2 years ago
parent
commit
559fc80031
  1. 3
      packages/nc-gui/components/general/ShareBaseButton.vue
  2. 1
      packages/nc-gui/components/smartsheet-column/RollupOptions.vue
  3. 6
      packages/nc-gui/components/smartsheet-toolbar/LockType.vue
  4. 13
      scripts/sdk/swagger.json

3
packages/nc-gui/components/general/ShareBaseButton.vue

@ -9,7 +9,7 @@ const { isUIAllowed } = useUIPermission()
</script> </script>
<template> <template>
<div class="flex items-center w-full pl-3 hover:(text-primary bg-primary bg-opacity-5)"> <div class="flex items-center w-full pl-3 hover:(text-primary bg-primary bg-opacity-5)" @click="showUserModal = true">
<div <div
v-if=" v-if="
isUIAllowed('newUser') && isUIAllowed('newUser') &&
@ -18,7 +18,6 @@ const { isUIAllowed } = useUIPermission()
route.name !== 'index-index-create-external' && route.name !== 'index-index-create-external' &&
route.name !== 'index-user-index' route.name !== 'index-user-index'
" "
@click="showUserModal = true"
> >
<div class="flex items-center space-x-1"> <div class="flex items-center space-x-1">
<MdiAccountPlusOutline class="mr-1 nc-share-base" /> <MdiAccountPlusOutline class="mr-1 nc-share-base" />

1
packages/nc-gui/components/smartsheet-column/RollupOptions.vue

@ -35,7 +35,6 @@ const aggrFunctionsList = [
{ text: 'min', value: 'min' }, { text: 'min', value: 'min' },
{ text: 'max', value: 'max' }, { text: 'max', value: 'max' },
{ text: 'avg', value: 'avg' }, { text: 'avg', value: 'avg' },
{ text: 'min', value: 'min' },
{ text: 'sum', value: 'sum' }, { text: 'sum', value: 'sum' },
{ text: 'countDistinct', value: 'countDistinct' }, { text: 'countDistinct', value: 'countDistinct' },
{ text: 'sumDistinct', value: 'sumDistinct' }, { text: 'sumDistinct', value: 'sumDistinct' },

6
packages/nc-gui/components/smartsheet-toolbar/LockType.vue

@ -13,17 +13,17 @@ const types = {
[LockType.Personal]: { [LockType.Personal]: {
title: 'title.personalView', title: 'title.personalView',
icon: MdiAccountIcon, icon: MdiAccountIcon,
subtitle: 'msg.info.collabView', subtitle: 'msg.info.personalView',
}, },
[LockType.Collaborative]: { [LockType.Collaborative]: {
title: 'title.collabView', title: 'title.collabView',
icon: MdiAccountGroupIcon, icon: MdiAccountGroupIcon,
subtitle: 'msg.info.lockedView', subtitle: 'msg.info.collabView',
}, },
[LockType.Locked]: { [LockType.Locked]: {
title: 'title.lockedView', title: 'title.lockedView',
icon: MdiLockOutlineIcon, icon: MdiLockOutlineIcon,
subtitle: 'msg.info.personalView', subtitle: 'msg.info.lockedView',
}, },
} }

13
scripts/sdk/swagger.json

@ -5821,9 +5821,6 @@
"pageInfo": { "pageInfo": {
"$ref": "#/components/schemas/Paginated" "$ref": "#/components/schemas/Paginated"
} }
},
"": {
"type": "string"
} }
}, },
"Base": { "Base": {
@ -6148,8 +6145,7 @@
"type": "string" "type": "string"
}, },
"title": { "title": {
"type": "string", "type": "string"
"required": true
}, },
"deleted": { "deleted": {
"type": "boolean" "type": "boolean"
@ -6193,7 +6189,8 @@
} }
] ]
} }
} },
"required": ["title"]
}, },
"TableInfo": { "TableInfo": {
"title": "Table", "title": "Table",
@ -6981,10 +6978,12 @@
"properties": { "properties": {
"options": { "options": {
"type": "array", "type": "array",
"required": true,
"$ref": "#/components/schemas/SelectOption" "$ref": "#/components/schemas/SelectOption"
} }
}, },
"required": [
"options"
],
"examples": [ "examples": [
{ {
"options": [ "options": [

Loading…
Cancel
Save