Browse Source

Merge branch 'develop' into feat/import-optimization

pull/3811/head
Wing-Kam Wong 2 years ago
parent
commit
a53248c3c1
  1. 1
      .github/workflows/release-docker.yml
  2. 1
      .github/workflows/release-npm.yml
  3. 4
      packages/nc-gui/components/smartsheet/column/SelectOptions.vue
  4. 2
      scripts/pkg-executable/package.json

1
.github/workflows/release-docker.yml

@ -79,6 +79,7 @@ jobs:
- name: upgrade packages for nightly build or pr build - name: upgrade packages for nightly build or pr build
if: ${{ github.event.inputs.targetEnv == 'DEV' || inputs.targetEnv == 'DEV' }} if: ${{ github.event.inputs.targetEnv == 'DEV' || inputs.targetEnv == 'DEV' }}
run: | run: |
export NODE_OPTIONS="--max_old_space_size=16384"
targetEnv=${{ github.event.inputs.targetEnv || inputs.targetEnv }} targetVersion=${{ github.event.inputs.tag || inputs.tag }} node scripts/bumpNocodbSdkVersion.js targetEnv=${{ github.event.inputs.targetEnv || inputs.targetEnv }} targetVersion=${{ github.event.inputs.tag || inputs.tag }} node scripts/bumpNocodbSdkVersion.js
cd packages/nocodb-sdk cd packages/nocodb-sdk
npm install && npm run build npm install && npm run build

1
.github/workflows/release-npm.yml

@ -49,6 +49,7 @@ jobs:
node-version: 16.15.0 node-version: 16.15.0
registry-url: 'https://registry.npmjs.org' registry-url: 'https://registry.npmjs.org'
- run: | - run: |
export NODE_OPTIONS="--max_old_space_size=16384"
targetEnv=${{ github.event.inputs.targetEnv || inputs.targetEnv }} targetVersion=${{ github.event.inputs.tag || inputs.tag }} node scripts/bumpNocodbSdkVersion.js && targetEnv=${{ github.event.inputs.targetEnv || inputs.targetEnv }} targetVersion=${{ github.event.inputs.tag || inputs.tag }} node scripts/bumpNocodbSdkVersion.js &&
cd packages/nocodb-sdk && cd packages/nocodb-sdk &&
npm ci && npm run build && npm publish && npm ci && npm run build && npm publish &&

4
packages/nc-gui/components/smartsheet/column/SelectOptions.vue

@ -79,13 +79,13 @@ onMounted(() => {
}) })
const optionChanged = (changedId: string) => { const optionChanged = (changedId: string) => {
if (changedId === defaultOption.value?.id) { if (changedId && changedId === defaultOption.value?.id) {
vModel.value.cdf = defaultOption.value.title vModel.value.cdf = defaultOption.value.title
} }
} }
const optionDropped = (changedId: string) => { const optionDropped = (changedId: string) => {
if (changedId === defaultOption.value?.id) { if (changedId && changedId === defaultOption.value?.id) {
vModel.value.cdf = null vModel.value.cdf = null
defaultOption.value = null defaultOption.value = null
} }

2
scripts/pkg-executable/package.json

@ -28,6 +28,6 @@
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"express": "^4.17.1", "express": "^4.17.1",
"nocodb": "0.91.10" "nocodb": "0.97.0"
} }
} }

Loading…
Cancel
Save