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

Merge branch 'main' into next

Browse Source 
# Conflicts:
#	packages/core/client/src/schema-component/antd/collection-select/__tests__/collection-select.test.tsx
This commit is contained in:
chenos 2025-04-14 14:03:33 +08:00
commit 9ce7674d5b
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/cli/src/util.js
View File

@ -461,7 +461,7 @@ exports.initEnv = function initEnv() {
fs.mkdirpSync(dirname(process.env.SOCKET_PATH), { force: true, recursive: true }); fs.mkdirpSync(dirname(process.env.SOCKET_PATH), { force: true, recursive: true });
fs.mkdirpSync(process.env.PM2_HOME, { force: true, recursive: true }); fs.mkdirpSync(process.env.PM2_HOME, { force: true, recursive: true });
const pkgDir = resolve(process.cwd(), 'storage/plugins', '@nocobase/plugin-multi-app-manager'); const pkgDir = resolve(process.cwd(), 'storage/plugins', '@nocobase/plugin-multi-app-manager');
fs.existsSync(pkgDir) && fs.rmdirSync(pkgDir, { force: true }); fs.existsSync(pkgDir) && fs.rmdirSync(pkgDir, { recursive: true, force: true });
}; };
exports.generatePlugins = function () { exports.generatePlugins = function () {

10
packages/core/client/src/schema-component/antd/form-item/FormItem.tsx
View File

@ -39,15 +39,17 @@ const formItemWrapCss = css`
.ant-description-textarea img { .ant-description-textarea img {
max-width: 100%; max-width: 100%;
} }
&.ant-formily-item-layout-vertical .ant-formily-item-label { &.ant-formily-item-layout-horizontal.ant-formily-item-label-wrap {
.ant-formily-item-label {
display: inline; display: inline;
.ant-formily-item-label-tooltip-icon { padding-right: 5px;
display: inline;
} .ant-formily-item-label-tooltip-icon,
.ant-formily-item-label-content { .ant-formily-item-label-content {
display: inline; display: inline;
} }
} }
}
`; `;
const formItemLabelCss = css` const formItemLabelCss = css`