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

Merge branch 'next' into develop

Browse Source
This commit is contained in:
katherinehhh 2024-12-02 12:51:43 +08:00
commit c7a5d90a3e
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/core/client/src/schema-component/antd/association-field/FileManager.tsx
View File

@ -22,6 +22,7 @@ import {
SchemaComponentOptions, SchemaComponentOptions,
Uploader, Uploader,
useActionContext, useActionContext,
useDesignable,
} from '../..'; } from '../..';
import { import {
TableSelectorParamsProvider, TableSelectorParamsProvider,
@ -157,6 +158,7 @@ const InternalFileManager = (props) => {
const [selectedRows, setSelectedRows] = useState([]); const [selectedRows, setSelectedRows] = useState([]);
const insertSelector = useInsertSchema('Selector'); const insertSelector = useInsertSchema('Selector');
const fieldNames = useFieldNames(props); const fieldNames = useFieldNames(props);
const { designable } = useDesignable();
const field: any = useField(); const field: any = useField();
const [options, setOptions] = useState([]); const [options, setOptions] = useState([]);
const { getField } = useCollection_deprecated(); const { getField } = useCollection_deprecated();
@ -167,7 +169,11 @@ const InternalFileManager = (props) => {
const handleSelect = (ev) => { const handleSelect = (ev) => {
ev.stopPropagation(); ev.stopPropagation();
ev.preventDefault(); ev.preventDefault();
insertSelector(schema.Selector); if (designable) {
insertSelector(schema.Selector);
} else {
fieldSchema.addProperty('selector', schema.Selector);
}
setVisibleSelector(true); setVisibleSelector(true);
setSelectedRows([]); setSelectedRows([]);
}; };

8
packages/plugins/@nocobase/plugin-public-forms/src/server/plugin.ts
View File

@ -162,11 +162,17 @@ export class PluginPublicFormsServer extends Plugin {
return next(); return next();
} }
const { resourceName, actionName } = ctx.action; const { resourceName, actionName } = ctx.action;
const collection = this.db.getCollection(resourceName);
if (actionName === 'create' && ctx.PublicForm['collectionName'] === resourceName) { if (actionName === 'create' && ctx.PublicForm['collectionName'] === resourceName) {
ctx.permission = { ctx.permission = {
skip: true, skip: true,
}; };
} else if (actionName === 'list' && ctx.PublicForm['targetCollections'].includes(resourceName)) { } else if (
(actionName === 'list' && ctx.PublicForm['targetCollections'].includes(resourceName)) ||
(collection.options.template === 'file' && actionName === 'create') ||
(resourceName === 'storages' && actionName === 'getRules') ||
(resourceName === 'map-configuration' && actionName === 'get')
) {
ctx.permission = { ctx.permission = {
skip: true, skip: true,
}; };