Merge branch 'main' into next

.env.example

@@ -31,17 +31,20 @@ LOGGER_FORMAT=
 
 ################# DATABASE #################
 
-DB_DIALECT=sqlite
+# postgres | msysql | mariadb | sqlite
-DB_STORAGE=storage/db/nocobase.sqlite
+DB_DIALECT=postgres
 DB_TABLE_PREFIX=
-# DB_HOST=localhost
+DB_HOST=localhost
-# DB_PORT=5432
+DB_PORT=5432
-# DB_DATABASE=postgres
+DB_DATABASE=nocobase
-# DB_USER=nocobase
+DB_USER=nocobase
-# DB_PASSWORD=nocobase
+DB_PASSWORD=nocobase
 # DB_LOGGING=on
 # DB_UNDERSCORED=false
 
+# sqlite only
+# DB_STORAGE=storage/db/nocobase.sqlite
+
 #== SSL CONFIG ==#
 # DB_DIALECT_OPTIONS_SSL_CA=
 # DB_DIALECT_OPTIONS_SSL_KEY=

CHANGELOG.md

@@ -7,6 +7,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+## [v1.2.15-alpha](https://github.com/nocobase/nocobase/compare/v1.2.14-alpha...v1.2.15-alpha) - 2024-07-11
+
+### Merged
+
+- fix: initializer select close [`#4865`](https://github.com/nocobase/nocobase/pull/4865)
+- fix(data-vi): fix the permission issue when using external data sources in data-vi plugin [`#4864`](https://github.com/nocobase/nocobase/pull/4864)
+
+### Commits
+
+- Revert "fix: skip mysql server" [`30cdd25`](https://github.com/nocobase/nocobase/commit/30cdd25b0cea7fa37b15df2b34ff9d3aa98db406)
+- fix: skip mysql server [`f6bc113`](https://github.com/nocobase/nocobase/commit/f6bc113ba78122ce7da3c36d63e8b1c87ecd3f51)
+- chore(versions): 😊 publish v1.2.15-alpha [`11fdb51`](https://github.com/nocobase/nocobase/commit/11fdb5131c32b19825c0bb6a661ae89b357f4524)
+
 ## [v1.2.14-alpha](https://github.com/nocobase/nocobase/compare/v1.2.13-alpha...v1.2.14-alpha) - 2024-07-11
 
 ### Merged

packages/core/client/src/application/schema-initializer/components/SchemaInitializerSelect.tsx

@@ -45,7 +45,7 @@ export const SchemaInitializerSelect: FC<SchemaInitializerSelectItemProps> = (pr
   );
 
   return (
-    <SchemaInitializerItem {...others}>
+    <SchemaInitializerItem closeInitializerMenuWhenClick={false} {...others}>
       <div style={{ alignItems: 'center', display: 'flex', justifyContent: 'space-between' }}>
         {title}
         <Select

packages/core/client/src/schema-items/OpenModeSchemaItems.tsx

@@ -48,6 +48,7 @@ export const SchemaInitializerOpenModeSchemaItems: React.FC<Options> = (options)
     <>
       {openMode ? (
         <SchemaInitializerSelect
+          closeInitializerMenuWhenClick={false}
           title={t('Open mode')}
           options={modeOptions}
           value={openModeValue}
@@ -69,7 +70,7 @@ export const SchemaInitializerOpenModeSchemaItems: React.FC<Options> = (options)
         />
       ) : null}
       {openSize && ['modal', 'drawer'].includes(openModeValue) ? (
-        <SchemaInitializerItem>
+        <SchemaInitializerItem closeInitializerMenuWhenClick={false}>
           <div style={{ alignItems: 'center', display: 'flex', justifyContent: 'space-between' }}>
             {t('Popup size')}
             <Select

packages/plugins/@nocobase/plugin-data-visualization/package.json

@@ -28,11 +28,11 @@
     "@nocobase/actions": "1.x",
     "@nocobase/cache": "1.x",
     "@nocobase/client": "1.x",
+    "@nocobase/data-source-main": "1.x",
     "@nocobase/database": "1.x",
     "@nocobase/server": "1.x",
     "@nocobase/test": "1.x",
-    "@nocobase/utils": "1.x",
+    "@nocobase/utils": "1.x"
-    "@nocobase/data-source-main": "1.x"
   },
   "gitHead": "d0b4efe4be55f8c79a98a331d99d9f8cf99021a1",
   "keywords": [