fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-05-09 23:49:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/next' into develop

Browse Source
This commit is contained in:
xilesun 2024-11-15 17:46:28 +08:00
commit efbc0c6a1d
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.github/workflows/manual-build-pro-image.yml vendored
View File

@ -25,19 +25,21 @@ jobs:
- 4873:4873 - 4873:4873
steps: steps:
- name: Get pro plugins - name: Get pro plugins
id: get-pro-plugins id: get-info
run: | run: |
if [[ "${{ github.head_ref || github.ref_name }}" == "main" ]]; then if [[ "${{ github.head_ref || github.ref_name }}" == "main" ]]; then
echo "proRepos=$(echo '${{ vars.PRO_PLUGIN_REPOS }}')" >> $GITHUB_OUTPUT echo "proRepos=$(echo '${{ vars.PRO_PLUGIN_REPOS }}')" >> $GITHUB_OUTPUT
echo "branch=$(echo 'main')" >> $GITHUB_OUTPUT
else else
echo "proRepos=$(echo '${{ vars.NEXT_PRO_PLUGIN_REPOS }}')" >> $GITHUB_OUTPUT echo "proRepos=$(echo '${{ vars.NEXT_PRO_PLUGIN_REPOS }}')" >> $GITHUB_OUTPUT
echo "branch=$(echo 'next')" >> $GITHUB_OUTPUT
fi fi
- uses: actions/create-github-app-token@v1 - uses: actions/create-github-app-token@v1
id: app-token id: app-token
with: with:
app-id: ${{ vars.NOCOBASE_APP_ID }} app-id: ${{ vars.NOCOBASE_APP_ID }}
private-key: ${{ secrets.NOCOBASE_APP_PRIVATE_KEY }} private-key: ${{ secrets.NOCOBASE_APP_PRIVATE_KEY }}
repositories: nocobase,pro-plugins,${{ join(fromJSON(steps.get-pro-plugins.outputs.proRepos), ',') }} repositories: nocobase,pro-plugins,${{ join(fromJSON(steps.get-info.outputs.proRepos), ',') }}
skip-token-revoke: true skip-token-revoke: true
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v4
@ -71,14 +73,14 @@ jobs:
- name: Clone pro repos - name: Clone pro repos
shell: bash shell: bash
run: | run: |
for repo in ${{ join(fromJSON(steps.get-pro-plugins.outputs.proRepos), ' ') }} for repo in ${{ join(fromJSON(steps.get-info.outputs.proRepos), ' ') }}
do do
git clone -b ${{ github.head_ref || github.ref_name }} https://x-access-token:${{ steps.app-token.outputs.token }}@github.com/nocobase/$repo.git packages/pro-plugins/@nocobase/$repo git clone -b ${{ steps.get-info.outputs.branch }} https://x-access-token:${{ steps.app-token.outputs.token }}@github.com/nocobase/$repo.git packages/pro-plugins/@nocobase/$repo
done done
- name: rm .git - name: rm .git
run: | run: |
rm -rf packages/pro-plugins/.git rm -rf packages/pro-plugins/.git
for repo in ${{ join(fromJSON(steps.get-pro-plugins.outputs.proRepos), ' ') }} for repo in ${{ join(fromJSON(steps.get-info.outputs.proRepos), ' ') }}
do do
rm -rf packages/pro-plugins/@nocobase/$repo/.git rm -rf packages/pro-plugins/@nocobase/$repo/.git
done done

2
packages/core/client/src/schema-component/antd/association-field/SubTable.tsx
View File

@ -181,7 +181,7 @@ export const SubTable: any = observer(
return { return {
current: currentPage > page ? page : currentPage, current: currentPage > page ? page : currentPage,
pageSize: pageSize || 10, pageSize: pageSize || 10,
total: field?.value?.length, total: field?.value,
onChange: (page, pageSize) => { onChange: (page, pageSize) => {
setCurrentPage(page); setCurrentPage(page);
setPageSize(pageSize); setPageSize(pageSize);

16
packages/core/client/src/schema-component/antd/table-v2/Table.tsx
View File

@ -200,23 +200,23 @@ const useTableColumns = (props: { showDel?: any; isSubTable?: boolean }, paginat
render: (v, record, index) => { render: (v, record, index) => {
if (props.showDel(record)) { if (props.showDel(record)) {
return ( return (
<CloseOutlined <div
style={{ cursor: 'pointer', color: 'gray' }}
onClick={() => { onClick={() => {
return action(() => { return action(() => {
const fieldIndex = (current - 1) * pageSize + index; const fieldIndex = (current - 1) * pageSize + index;
const deleteCount = field.value[fieldIndex] ? 1 : 2;
spliceArrayState(field, { spliceArrayState(field, {
startIndex: fieldIndex, startIndex: fieldIndex,
deleteCount: 1, deleteCount: deleteCount,
});
field.value.splice(fieldIndex, 1);
setTimeout(() => {
field.value[field.value.length] = null;
}); });
field.value.splice(fieldIndex, deleteCount);
field.setInitialValue(field.value);
return field.onInput(field.value); return field.onInput(field.value);
}); });
}} }}
/> >
<CloseOutlined style={{ cursor: 'pointer', color: 'gray' }} />
</div>
); );
} }
return; return;