diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 00498b7928..38c2ed6b3b 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -20,7 +20,7 @@ jobs: strategy: matrix: - node-version: [18.x] + node-version: 18.19.0 # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ steps: diff --git a/docker-compose/traefik/docker-compose.yml b/docker-compose/traefik/docker-compose.yml index b02b03bad7..5d4115d615 100644 --- a/docker-compose/traefik/docker-compose.yml +++ b/docker-compose/traefik/docker-compose.yml @@ -34,7 +34,7 @@ services: retries: 10 test: "pg_isready -U ${DATABASE_USER} -d ${DATABASE_NAME}" timeout: 2s - image: "postgres:12.1-alpine" + image: "postgres:12.17-alpine" networks: - traefik_proxy restart: always @@ -71,7 +71,7 @@ services: - "-c" - "http://localhost:8081/ping" timeout: 3s - image: "traefik:v2.2" + image: "traefik:v2.11" networks: - default - traefik_proxy diff --git a/packages/nc-gui/assets/nc-icons/cell-attachment.svg b/packages/nc-gui/assets/nc-icons/cell-attachment.svg new file mode 100644 index 0000000000..0d14c80304 --- /dev/null +++ b/packages/nc-gui/assets/nc-icons/cell-attachment.svg @@ -0,0 +1,3 @@ + diff --git a/packages/nc-gui/assets/nc-icons/cell-barcode.svg b/packages/nc-gui/assets/nc-icons/cell-barcode.svg new file mode 100644 index 0000000000..e1736db956 --- /dev/null +++ b/packages/nc-gui/assets/nc-icons/cell-barcode.svg @@ -0,0 +1,3 @@ + diff --git a/packages/nc-gui/assets/nc-icons/cell-checkbox.svg b/packages/nc-gui/assets/nc-icons/cell-checkbox.svg new file mode 100644 index 0000000000..c7dfdfb14f --- /dev/null +++ b/packages/nc-gui/assets/nc-icons/cell-checkbox.svg @@ -0,0 +1,4 @@ + diff --git a/packages/nc-gui/assets/nc-icons/cell-currency.svg b/packages/nc-gui/assets/nc-icons/cell-currency.svg new file mode 100644 index 0000000000..f4886aee03 --- /dev/null +++ b/packages/nc-gui/assets/nc-icons/cell-currency.svg @@ -0,0 +1,4 @@ + diff --git a/packages/nc-gui/assets/nc-icons/cell-date.svg b/packages/nc-gui/assets/nc-icons/cell-date.svg new file mode 100644 index 0000000000..c5df544962 --- /dev/null +++ b/packages/nc-gui/assets/nc-icons/cell-date.svg @@ -0,0 +1,6 @@ + diff --git a/packages/nc-gui/assets/nc-icons/cell-datetime.svg b/packages/nc-gui/assets/nc-icons/cell-datetime.svg new file mode 100644 index 0000000000..859720d9e8 --- /dev/null +++ b/packages/nc-gui/assets/nc-icons/cell-datetime.svg @@ -0,0 +1,8 @@ + diff --git a/packages/nc-gui/assets/nc-icons/cell-db.svg b/packages/nc-gui/assets/nc-icons/cell-db.svg new file mode 100644 index 0000000000..53d8ccc922 --- /dev/null +++ b/packages/nc-gui/assets/nc-icons/cell-db.svg @@ -0,0 +1,5 @@ + diff --git a/packages/nc-gui/assets/nc-icons/cell-decimal.svg b/packages/nc-gui/assets/nc-icons/cell-decimal.svg new file mode 100644 index 0000000000..4d5db110a1 --- /dev/null +++ b/packages/nc-gui/assets/nc-icons/cell-decimal.svg @@ -0,0 +1,7 @@ + diff --git a/packages/nc-gui/assets/nc-icons/cell-duration.svg b/packages/nc-gui/assets/nc-icons/cell-duration.svg new file mode 100644 index 0000000000..d8e5fe8372 --- /dev/null +++ b/packages/nc-gui/assets/nc-icons/cell-duration.svg @@ -0,0 +1,7 @@ + diff --git a/packages/nc-gui/assets/nc-icons/cell-email.svg b/packages/nc-gui/assets/nc-icons/cell-email.svg new file mode 100644 index 0000000000..1bf0267b34 --- /dev/null +++ b/packages/nc-gui/assets/nc-icons/cell-email.svg @@ -0,0 +1,4 @@ + diff --git a/packages/nc-gui/assets/nc-icons/cell-formula.svg b/packages/nc-gui/assets/nc-icons/cell-formula.svg new file mode 100644 index 0000000000..169d829606 --- /dev/null +++ b/packages/nc-gui/assets/nc-icons/cell-formula.svg @@ -0,0 +1,8 @@ + diff --git a/packages/nc-gui/assets/nc-icons/cell-geometry.svg b/packages/nc-gui/assets/nc-icons/cell-geometry.svg new file mode 100644 index 0000000000..4126148ebf --- /dev/null +++ b/packages/nc-gui/assets/nc-icons/cell-geometry.svg @@ -0,0 +1,7 @@ + diff --git a/packages/nc-gui/assets/nc-icons/cell-json.svg b/packages/nc-gui/assets/nc-icons/cell-json.svg new file mode 100644 index 0000000000..c613327dfc --- /dev/null +++ b/packages/nc-gui/assets/nc-icons/cell-json.svg @@ -0,0 +1,8 @@ + diff --git a/packages/nc-gui/assets/nc-icons/cell-link.svg b/packages/nc-gui/assets/nc-icons/cell-link.svg new file mode 100644 index 0000000000..c2427ff00e --- /dev/null +++ b/packages/nc-gui/assets/nc-icons/cell-link.svg @@ -0,0 +1,7 @@ + diff --git a/packages/nc-gui/assets/nc-icons/cell-longtext.svg b/packages/nc-gui/assets/nc-icons/cell-longtext.svg new file mode 100644 index 0000000000..bfdb92ae92 --- /dev/null +++ b/packages/nc-gui/assets/nc-icons/cell-longtext.svg @@ -0,0 +1,8 @@ + diff --git a/packages/nc-gui/assets/nc-icons/cell-lookup.svg b/packages/nc-gui/assets/nc-icons/cell-lookup.svg new file mode 100644 index 0000000000..d77c7e1a69 --- /dev/null +++ b/packages/nc-gui/assets/nc-icons/cell-lookup.svg @@ -0,0 +1,9 @@ + diff --git a/packages/nc-gui/assets/nc-icons/cell-multiselect.svg b/packages/nc-gui/assets/nc-icons/cell-multiselect.svg new file mode 100644 index 0000000000..c1eaf56f58 --- /dev/null +++ b/packages/nc-gui/assets/nc-icons/cell-multiselect.svg @@ -0,0 +1,8 @@ + diff --git a/packages/nc-gui/assets/nc-icons/cell-number.svg b/packages/nc-gui/assets/nc-icons/cell-number.svg new file mode 100644 index 0000000000..04a8149bbd --- /dev/null +++ b/packages/nc-gui/assets/nc-icons/cell-number.svg @@ -0,0 +1,6 @@ + diff --git a/packages/nc-gui/assets/nc-icons/cell-percentage.svg b/packages/nc-gui/assets/nc-icons/cell-percentage.svg new file mode 100644 index 0000000000..bd53dc96c5 --- /dev/null +++ b/packages/nc-gui/assets/nc-icons/cell-percentage.svg @@ -0,0 +1,5 @@ + diff --git a/packages/nc-gui/assets/nc-icons/cell-phone.svg b/packages/nc-gui/assets/nc-icons/cell-phone.svg new file mode 100644 index 0000000000..cebfd82713 --- /dev/null +++ b/packages/nc-gui/assets/nc-icons/cell-phone.svg @@ -0,0 +1,3 @@ + diff --git a/packages/nc-gui/assets/nc-icons/cell-qrcode.svg b/packages/nc-gui/assets/nc-icons/cell-qrcode.svg new file mode 100644 index 0000000000..4e10fc7aac --- /dev/null +++ b/packages/nc-gui/assets/nc-icons/cell-qrcode.svg @@ -0,0 +1,10 @@ + diff --git a/packages/nc-gui/assets/nc-icons/cell-rating.svg b/packages/nc-gui/assets/nc-icons/cell-rating.svg new file mode 100644 index 0000000000..e52116a748 --- /dev/null +++ b/packages/nc-gui/assets/nc-icons/cell-rating.svg @@ -0,0 +1,3 @@ + diff --git a/packages/nc-gui/assets/nc-icons/cell-rollup.svg b/packages/nc-gui/assets/nc-icons/cell-rollup.svg new file mode 100644 index 0000000000..6730c17e5d --- /dev/null +++ b/packages/nc-gui/assets/nc-icons/cell-rollup.svg @@ -0,0 +1,3 @@ + diff --git a/packages/nc-gui/assets/nc-icons/cell-select.svg b/packages/nc-gui/assets/nc-icons/cell-select.svg new file mode 100644 index 0000000000..a19b1801e6 --- /dev/null +++ b/packages/nc-gui/assets/nc-icons/cell-select.svg @@ -0,0 +1,4 @@ + diff --git a/packages/nc-gui/assets/nc-icons/cell-text.svg b/packages/nc-gui/assets/nc-icons/cell-text.svg new file mode 100644 index 0000000000..9af97b17a4 --- /dev/null +++ b/packages/nc-gui/assets/nc-icons/cell-text.svg @@ -0,0 +1,5 @@ + diff --git a/packages/nc-gui/assets/nc-icons/cell-time.svg b/packages/nc-gui/assets/nc-icons/cell-time.svg new file mode 100644 index 0000000000..8df7a2cda8 --- /dev/null +++ b/packages/nc-gui/assets/nc-icons/cell-time.svg @@ -0,0 +1,4 @@ + diff --git a/packages/nc-gui/assets/nc-icons/cell-url.svg b/packages/nc-gui/assets/nc-icons/cell-url.svg new file mode 100644 index 0000000000..781af1c05c --- /dev/null +++ b/packages/nc-gui/assets/nc-icons/cell-url.svg @@ -0,0 +1,4 @@ + diff --git a/packages/nc-gui/assets/nc-icons/cell-user.svg b/packages/nc-gui/assets/nc-icons/cell-user.svg new file mode 100644 index 0000000000..60f73b5442 --- /dev/null +++ b/packages/nc-gui/assets/nc-icons/cell-user.svg @@ -0,0 +1,4 @@ + diff --git a/packages/nc-gui/assets/nc-icons/system-date.svg b/packages/nc-gui/assets/nc-icons/system-date.svg new file mode 100644 index 0000000000..c9e3333ff8 --- /dev/null +++ b/packages/nc-gui/assets/nc-icons/system-date.svg @@ -0,0 +1,7 @@ + diff --git a/packages/nc-gui/assets/nc-icons/system-key.svg b/packages/nc-gui/assets/nc-icons/system-key.svg new file mode 100644 index 0000000000..f2c3ed467b --- /dev/null +++ b/packages/nc-gui/assets/nc-icons/system-key.svg @@ -0,0 +1,4 @@ + diff --git a/packages/nc-gui/assets/nc-icons/system-text.svg b/packages/nc-gui/assets/nc-icons/system-text.svg new file mode 100644 index 0000000000..23616c84eb --- /dev/null +++ b/packages/nc-gui/assets/nc-icons/system-text.svg @@ -0,0 +1,6 @@ + diff --git a/packages/nc-gui/assets/nc-icons/system-user.svg b/packages/nc-gui/assets/nc-icons/system-user.svg new file mode 100644 index 0000000000..a4316e1f09 --- /dev/null +++ b/packages/nc-gui/assets/nc-icons/system-user.svg @@ -0,0 +1,5 @@ + diff --git a/packages/nc-gui/assets/style.scss b/packages/nc-gui/assets/style.scss index 8ea1d047ca..4b195ee081 100644 --- a/packages/nc-gui/assets/style.scss +++ b/packages/nc-gui/assets/style.scss @@ -784,4 +784,5 @@ svg.nc-cell-icon, svg.nc-virtual-cell-icon { @apply !flex !pl-4 max-w-[calc(100%_-_16px)]; } } -} \ No newline at end of file +} + diff --git a/packages/nc-gui/components/cell/Json.vue b/packages/nc-gui/components/cell/Json.vue index e39ff2e06c..7b2270d6b5 100644 --- a/packages/nc-gui/components/cell/Json.vue +++ b/packages/nc-gui/components/cell/Json.vue @@ -184,6 +184,7 @@ watch(isExpanded, () => { :class="{ 'expanded-editor': isExpanded, 'editor': !isExpanded }" :hide-minimap="true" :disable-deep-compare="true" + :auto-focus="!isForm" @update:model-value="localValue = $event" @keydown.enter.stop /> diff --git a/packages/nc-gui/components/cell/MultiSelect.vue b/packages/nc-gui/components/cell/MultiSelect.vue index 5c5a205f2a..333a35c01f 100644 --- a/packages/nc-gui/components/cell/MultiSelect.vue +++ b/packages/nc-gui/components/cell/MultiSelect.vue @@ -394,7 +394,7 @@ const onFocus = () => { @click="toggleMenu" >