diff --git a/.github/workflows/build-internal-image.yml b/.github/workflows/build-internal-image.yml new file mode 100644 index 0000000000..0601be438d --- /dev/null +++ b/.github/workflows/build-internal-image.yml @@ -0,0 +1,119 @@ +name: Build Image (Internal) + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +on: + workflow_dispatch: + inputs: + ref_name: + description: 'Branch or tag name to release' + +jobs: + get-plugins: + uses: nocobase/nocobase/.github/workflows/get-plugins.yml@main + secrets: inherit + push-docker: + runs-on: ubuntu-latest + needs: get-plugins + services: + verdaccio: + image: verdaccio/verdaccio:5 + ports: + - 4873:4873 + steps: + - name: Set Node.js 20 + uses: actions/setup-node@v3 + with: + node-version: 20 + - name: Get info + id: get-info + shell: bash + run: | + if [[ "${{ inputs.ref_name || github.ref_name }}" =~ "beta" ]]; then + echo "defaultTag=$(echo 'beta')" >> $GITHUB_OUTPUT + echo "proRepos=$(echo '${{ needs.get-plugins.outputs.beta-plugins }}')" >> $GITHUB_OUTPUT + elif [[ "${{ inputs.ref_name || github.ref_name }}" =~ "alpha" ]]; then + echo "defaultTag=$(echo 'alpha')" >> $GITHUB_OUTPUT + echo "proRepos=$(echo '${{ needs.get-plugins.outputs.alpha-plugins }}')" >> $GITHUB_OUTPUT + else + # rc + echo "defaultTag=$(echo 'latest')" >> $GITHUB_OUTPUT + echo "proRepos=$(echo '${{ needs.get-plugins.outputs.rc-plugins }}')" >> $GITHUB_OUTPUT + fi + - uses: actions/create-github-app-token@v1 + id: app-token + with: + app-id: ${{ vars.NOCOBASE_APP_ID }} + private-key: ${{ secrets.NOCOBASE_APP_PRIVATE_KEY }} + repositories: nocobase,pro-plugins,${{ join(fromJSON(steps.get-info.outputs.proRepos), ',') }},${{ join(fromJSON(needs.get-plugins.outputs.custom-plugins), ',') }} + skip-token-revoke: true + - name: Checkout + uses: actions/checkout@v3 + with: + ref: ${{ inputs.ref_name || github.ref_name }} + - name: yarn install + run: | + yarn install + - name: Checkout pro-plugins + uses: actions/checkout@v3 + with: + repository: nocobase/pro-plugins + path: packages/pro-plugins + ref: ${{ inputs.ref_name || github.ref_name }} + token: ${{ steps.app-token.outputs.token }} + - name: Clone pro repos + shell: bash + run: | + for repo in ${{ join(fromJSON(steps.get-info.outputs.proRepos), ' ') }} ${{ join(fromJSON(needs.get-plugins.outputs.custom-plugins), ' ') }} + do + git clone -b ${{ inputs.ref_name || github.ref_name }} https://x-access-token:${{ steps.app-token.outputs.token }}@github.com/nocobase/$repo.git packages/pro-plugins/@nocobase/$repo + done + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + with: + driver-opts: network=host + - name: Docker meta + id: meta + uses: docker/metadata-action@v4 + with: + images: | + nocobase/nocobase + tags: | + type=ref,event=branch + type=ref,event=pr + type=semver,pattern={{version}} + type=semver,pattern={{major}}.{{minor}} + - name: Login to Aliyun Container Registry + uses: docker/login-action@v2 + with: + registry: ${{ secrets.ALI_DOCKER_REGISTRY }} + username: ${{ secrets.ALI_DOCKER_USERNAME }} + password: ${{ secrets.ALI_DOCKER_PASSWORD }} + - name: Set variables + run: | + target_directory="./packages/pro-plugins/@nocobase" + subdirectories=$(find "$target_directory" -mindepth 1 -maxdepth 1 -type d -exec basename {} \; | tr '\n' ' ') + trimmed_variable=$(echo "$subdirectories" | xargs) + packageNames="@nocobase/${trimmed_variable// / @nocobase/}" + pluginNames="${trimmed_variable//plugin-/}" + BEFORE_PACK_NOCOBASE="yarn add @nocobase/plugin-notifications @nocobase/plugin-disable-pm-add $packageNames -W --production" + APPEND_PRESET_LOCAL_PLUGINS="notifications,disable-pm-add,${pluginNames// /,}" + echo "var1=$BEFORE_PACK_NOCOBASE" >> $GITHUB_OUTPUT + echo "var2=$APPEND_PRESET_LOCAL_PLUGINS" >> $GITHUB_OUTPUT + - name: Build and push + uses: docker/build-push-action@v3 + with: + context: . + file: Dockerfile + build-args: | + VERDACCIO_URL=http://localhost:4873/ + COMMIT_HASH=${GITHUB_SHA} + PLUGINS_DIRS=pro-plugins + BEFORE_PACK_NOCOBASE=${{ steps.vars.outputs.var1 }} + APPEND_PRESET_LOCAL_PLUGINS=${{ steps.vars.outputs.var2 }} + push: true + tags: ${{ secrets.ALI_DOCKER_PUBLIC_REGISTRY }}/nocobase/nocobase:${{ steps.get-info.outputs.defaultTag }},${{ secrets.ALI_DOCKER_PUBLIC_REGISTRY }}/${{ steps.meta.outputs.tags }} diff --git a/lerna.json b/lerna.json index 994c7d1426..8b921fd5ee 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.7.0-alpha.10", + "version": "1.7.0-alpha.11", "npmClient": "yarn", "useWorkspaces": true, "npmClientArgs": ["--ignore-engines"], diff --git a/packages/core/acl/package.json b/packages/core/acl/package.json index cddc749497..0702ee69e7 100644 --- a/packages/core/acl/package.json +++ b/packages/core/acl/package.json @@ -1,13 +1,13 @@ { "name": "@nocobase/acl", - "version": "1.7.0-alpha.10", + "version": "1.7.0-alpha.11", "description": "", "license": "AGPL-3.0", "main": "./lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@nocobase/resourcer": "1.7.0-alpha.10", - "@nocobase/utils": "1.7.0-alpha.10", + "@nocobase/resourcer": "1.7.0-alpha.11", + "@nocobase/utils": "1.7.0-alpha.11", "minimatch": "^5.1.1" }, "repository": { diff --git a/packages/core/actions/package.json b/packages/core/actions/package.json index 441dc3e596..95d4f210e6 100644 --- a/packages/core/actions/package.json +++ b/packages/core/actions/package.json @@ -1,14 +1,14 @@ { "name": "@nocobase/actions", - "version": "1.7.0-alpha.10", + "version": "1.7.0-alpha.11", "description": "", "license": "AGPL-3.0", "main": "./lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@nocobase/cache": "1.7.0-alpha.10", - "@nocobase/database": "1.7.0-alpha.10", - "@nocobase/resourcer": "1.7.0-alpha.10" + "@nocobase/cache": "1.7.0-alpha.11", + "@nocobase/database": "1.7.0-alpha.11", + "@nocobase/resourcer": "1.7.0-alpha.11" }, "repository": { "type": "git", diff --git a/packages/core/app/package.json b/packages/core/app/package.json index 34ab32b74f..b125d3f42b 100644 --- a/packages/core/app/package.json +++ b/packages/core/app/package.json @@ -1,17 +1,17 @@ { "name": "@nocobase/app", - "version": "1.7.0-alpha.10", + "version": "1.7.0-alpha.11", "description": "", "license": "AGPL-3.0", "main": "./lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@nocobase/database": "1.7.0-alpha.10", - "@nocobase/preset-nocobase": "1.7.0-alpha.10", - "@nocobase/server": "1.7.0-alpha.10" + "@nocobase/database": "1.7.0-alpha.11", + "@nocobase/preset-nocobase": "1.7.0-alpha.11", + "@nocobase/server": "1.7.0-alpha.11" }, "devDependencies": { - "@nocobase/client": "1.7.0-alpha.10" + "@nocobase/client": "1.7.0-alpha.11" }, "repository": { "type": "git", diff --git a/packages/core/auth/package.json b/packages/core/auth/package.json index 8730279583..70eb7e8de9 100644 --- a/packages/core/auth/package.json +++ b/packages/core/auth/package.json @@ -1,16 +1,16 @@ { "name": "@nocobase/auth", - "version": "1.7.0-alpha.10", + "version": "1.7.0-alpha.11", "description": "", "license": "AGPL-3.0", "main": "./lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@nocobase/actions": "1.7.0-alpha.10", - "@nocobase/cache": "1.7.0-alpha.10", - "@nocobase/database": "1.7.0-alpha.10", - "@nocobase/resourcer": "1.7.0-alpha.10", - "@nocobase/utils": "1.7.0-alpha.10", + "@nocobase/actions": "1.7.0-alpha.11", + "@nocobase/cache": "1.7.0-alpha.11", + "@nocobase/database": "1.7.0-alpha.11", + "@nocobase/resourcer": "1.7.0-alpha.11", + "@nocobase/utils": "1.7.0-alpha.11", "@types/jsonwebtoken": "^8.5.8", "jsonwebtoken": "^8.5.1" }, diff --git a/packages/core/build/package.json b/packages/core/build/package.json index a0b2c8d3bd..447fdf10e7 100644 --- a/packages/core/build/package.json +++ b/packages/core/build/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/build", - "version": "1.7.0-alpha.10", + "version": "1.7.0-alpha.11", "description": "Library build tool based on rollup.", "main": "lib/index.js", "types": "./lib/index.d.ts", diff --git a/packages/core/cache/package.json b/packages/core/cache/package.json index e9d9b21e92..1721f06553 100644 --- a/packages/core/cache/package.json +++ b/packages/core/cache/package.json @@ -1,12 +1,12 @@ { "name": "@nocobase/cache", - "version": "1.7.0-alpha.10", + "version": "1.7.0-alpha.11", "description": "", "license": "AGPL-3.0", "main": "./lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@nocobase/lock-manager": "1.7.0-alpha.10", + "@nocobase/lock-manager": "1.7.0-alpha.11", "bloom-filters": "^3.0.1", "cache-manager": "^5.2.4", "cache-manager-redis-yet": "^4.1.2" diff --git a/packages/core/cli/package.json b/packages/core/cli/package.json index 7ca9bb516f..1d9d20fa68 100644 --- a/packages/core/cli/package.json +++ b/packages/core/cli/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/cli", - "version": "1.7.0-alpha.10", + "version": "1.7.0-alpha.11", "description": "", "license": "AGPL-3.0", "main": "./src/index.js", @@ -8,7 +8,7 @@ "nocobase": "./bin/index.js" }, "dependencies": { - "@nocobase/app": "1.7.0-alpha.10", + "@nocobase/app": "1.7.0-alpha.11", "@types/fs-extra": "^11.0.1", "@umijs/utils": "3.5.20", "chalk": "^4.1.1", @@ -25,7 +25,7 @@ "tsx": "^4.19.0" }, "devDependencies": { - "@nocobase/devtools": "1.7.0-alpha.10" + "@nocobase/devtools": "1.7.0-alpha.11" }, "repository": { "type": "git", diff --git a/packages/core/client/package.json b/packages/core/client/package.json index 20d8a898e7..d60d648700 100644 --- a/packages/core/client/package.json +++ b/packages/core/client/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/client", - "version": "1.7.0-alpha.10", + "version": "1.7.0-alpha.11", "license": "AGPL-3.0", "main": "lib/index.js", "module": "es/index.mjs", @@ -27,9 +27,9 @@ "@formily/reactive-react": "^2.2.27", "@formily/shared": "^2.2.27", "@formily/validator": "^2.2.27", - "@nocobase/evaluators": "1.7.0-alpha.10", - "@nocobase/sdk": "1.7.0-alpha.10", - "@nocobase/utils": "1.7.0-alpha.10", + "@nocobase/evaluators": "1.7.0-alpha.11", + "@nocobase/sdk": "1.7.0-alpha.11", + "@nocobase/utils": "1.7.0-alpha.11", "ahooks": "^3.7.2", "antd": "5.24.2", "antd-style": "3.7.1", diff --git a/packages/core/client/src/acl/ACLProvider.tsx b/packages/core/client/src/acl/ACLProvider.tsx index 19d8433475..478bacb68f 100644 --- a/packages/core/client/src/acl/ACLProvider.tsx +++ b/packages/core/client/src/acl/ACLProvider.tsx @@ -314,15 +314,15 @@ export const ACLActionProvider = (props) => { const schema = useFieldSchema(); const currentUid = schema['x-uid']; let actionPath = schema['x-acl-action']; - const editablePath = ['create', 'update', 'destroy', 'importXlsx']; + // 只兼容这些数据表资源按钮 + const resourceActionPath = ['create', 'update', 'destroy', 'importXlsx', 'export']; - if (!actionPath && resource && schema['x-action'] && editablePath.includes(schema['x-action'])) { + if (!actionPath && resource && schema['x-action'] && resourceActionPath.includes(schema['x-action'])) { actionPath = `${resource}:${schema['x-action']}`; } if (actionPath && !actionPath?.includes(':')) { actionPath = `${resource}:${actionPath}`; } - const params = useMemo( () => actionPath && parseAction(actionPath, { schema, recordPkValue }), [parseAction, actionPath, schema, recordPkValue], @@ -340,7 +340,7 @@ export const ACLActionProvider = (props) => { return {props.children}; } //视图表无编辑权限时不显示 - if (editablePath.includes(actionPath) || editablePath.includes(actionPath?.split(':')[1])) { + if (resourceActionPath.includes(actionPath) || resourceActionPath.includes(actionPath?.split(':')[1])) { if ((collection && collection.template !== 'view') || collection?.writableView) { return {props.children}; } diff --git a/packages/core/client/src/modules/blocks/data-blocks/table/__e2e__/schemaInitializer.test.ts b/packages/core/client/src/modules/blocks/data-blocks/table/__e2e__/schemaInitializer.test.ts index 3c0d2ab0da..90b836587d 100644 --- a/packages/core/client/src/modules/blocks/data-blocks/table/__e2e__/schemaInitializer.test.ts +++ b/packages/core/client/src/modules/blocks/data-blocks/table/__e2e__/schemaInitializer.test.ts @@ -309,6 +309,7 @@ test.describe('configure actions column', () => { await page.getByText('Actions', { exact: true }).hover({ force: true }); await page.getByLabel('designer-schema-initializer-TableV2.Column-TableV2.ActionColumnDesigner-').hover(); await page.getByRole('menuitem', { name: 'Delete' }).click(); + await page.mouse.move(500, 0); // await page.getByText('Actions', { exact: true }).hover({ force: true }); // await page.getByLabel('designer-schema-initializer-TableV2.Column-TableV2.ActionColumnDesigner-').hover(); diff --git a/packages/core/client/src/schema-component/antd/action/hooks/useGetAfterSuccessVariablesOptions.ts b/packages/core/client/src/schema-component/antd/action/hooks/useGetAfterSuccessVariablesOptions.ts index d89abc64bb..c903752719 100644 --- a/packages/core/client/src/schema-component/antd/action/hooks/useGetAfterSuccessVariablesOptions.ts +++ b/packages/core/client/src/schema-component/antd/action/hooks/useGetAfterSuccessVariablesOptions.ts @@ -12,9 +12,9 @@ import { useCollection_deprecated, useCollectionFilterOptions } from '../../../. import { useCollectionRecordData } from '../../../../data-source'; import { useTranslation } from 'react-i18next'; import { useCompile } from '../../../'; -import { useBlockContext } from '../../../../block-provider/BlockProvider'; import { usePopupVariable } from '../../../../schema-settings/VariableInput/hooks'; import { useCurrentRoleVariable } from '../../../../schema-settings/VariableInput/hooks'; +import { useFormBlockContext } from '../../../../block-provider'; export const useAfterSuccessOptions = () => { const collection = useCollection_deprecated(); @@ -23,7 +23,7 @@ export const useAfterSuccessOptions = () => { const userFieldOptions = useCollectionFilterOptions('users', 'main'); const compile = useCompile(); const recordData = useCollectionRecordData(); - const { name: blockType } = useBlockContext() || {}; + const { form } = useFormBlockContext(); const [fields, userFields] = useMemo(() => { return [compile(fieldsOptions), compile(userFieldOptions)]; }, [fieldsOptions, userFieldOptions]); @@ -32,7 +32,7 @@ export const useAfterSuccessOptions = () => { const record = useCollectionRecordData(); return useMemo(() => { return [ - (record || blockType === 'form') && { + (record || form) && { value: '$record', label: t('Response record', { ns: 'client' }), children: [...fields], @@ -62,5 +62,5 @@ export const useAfterSuccessOptions = () => { children: null, }, ].filter(Boolean); - }, [recordData, t, fields, blockType, userFields]); + }, [recordData, t, fields, form, userFields]); }; diff --git a/packages/core/client/src/schema-component/antd/date-picker/DatePicker.tsx b/packages/core/client/src/schema-component/antd/date-picker/DatePicker.tsx index debbd13e94..4a93093675 100644 --- a/packages/core/client/src/schema-component/antd/date-picker/DatePicker.tsx +++ b/packages/core/client/src/schema-component/antd/date-picker/DatePicker.tsx @@ -252,8 +252,9 @@ DatePicker.FilterWithPicker = function FilterWithPicker(props: any) { const value = Array.isArray(props.value) ? props.value[0] : props.value; const compile = useCompile(); const fieldSchema = useFieldSchema(); - const targetPicker = value ? inferPickerType(value, picker) : picker; - const targetDateFormat = getPickerFormat(targetPicker) || format; + const initPicker = value ? inferPickerType(value, picker) : picker; + const [targetPicker, setTargetPicker] = useState(initPicker); + const targetDateFormat = getPickerFormat(initPicker) || format; const newProps = { utc, inputReadOnly: isMobileMedia, @@ -271,13 +272,6 @@ DatePicker.FilterWithPicker = function FilterWithPicker(props: any) { }; const field: any = useField(); const [stateProps, setStateProps] = useState(newProps); - useEffect(() => { - newProps.picker = targetPicker; - const dateTimeFormat = getDateTimeFormat(targetPicker, targetDateFormat, showTime, timeFormat); - newProps.format = dateTimeFormat; - setStateProps(newProps); - }, [targetPicker]); - return (