diff --git a/CHANGELOG.md b/CHANGELOG.md index 15d923631d..917f81ef1a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,29 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [v1.4.24](https://github.com/nocobase/nocobase/compare/v1.4.23...v1.4.24) - 2025-01-14 + +### 🚀 Improvements + +- **[client]** datePicker component input read only ([#6061](https://github.com/nocobase/nocobase/pull/6061)) by @Cyx649312038 + +### 🐛 Bug Fixes + +- **[client]** + - Fix incorrect loading of modal association fields in table block ([#6060](https://github.com/nocobase/nocobase/pull/6060)) by @katherinehhh + + - Fix style issue in sub-table in detail block ([#6049](https://github.com/nocobase/nocobase/pull/6049)) by @katherinehhh + + - Fix number field format in readPretty mode affecting edit mode ([#6050](https://github.com/nocobase/nocobase/pull/6050)) by @katherinehhh + + - Fix table header cell style issue in ant-table ([#6052](https://github.com/nocobase/nocobase/pull/6052)) by @katherinehhh + +- **[database]** fix an issue when init sort field with primary key ([#6059](https://github.com/nocobase/nocobase/pull/6059)) by @chareice + +- **[Data visualization]** Remove the `LIMIT` clause when using aggregate functions without setting dimensions in chart queries ([#6062](https://github.com/nocobase/nocobase/pull/6062)) by @2013xile + +- **[Backup manager]** Fixed backup download error for users only logged into sub-app by @gchust + ## [v1.4.23](https://github.com/nocobase/nocobase/compare/v1.4.22...v1.4.23) - 2025-01-13 ### 🐛 Bug Fixes diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md index ccbd921da3..97ba5da330 100644 --- a/CHANGELOG.zh-CN.md +++ b/CHANGELOG.zh-CN.md @@ -5,6 +5,29 @@ 格式基于 [Keep a Changelog](https://keepachangelog.com/zh-CN/1.0.0/), 并且本项目遵循 [语义化版本](https://semver.org/spec/v2.0.0.html)。 +## [v1.4.24](https://github.com/nocobase/nocobase/compare/v1.4.23...v1.4.24) - 2025-01-14 + +### 🚀 优化 + +- **[client]** 日期选择器组件输入框只读 ([#6061](https://github.com/nocobase/nocobase/pull/6061)) by @Cyx649312038 + +### 🐛 修复 + +- **[client]** + - 修复表格区块加载时误加载弹窗区块中的关系字段 ([#6060](https://github.com/nocobase/nocobase/pull/6060)) by @katherinehhh + + - 去掉详情区块中子表格右侧空隙 ([#6049](https://github.com/nocobase/nocobase/pull/6049)) by @katherinehhh + + - 整数字段在阅读模式下设置的格式也会影响编辑模式 ([#6050](https://github.com/nocobase/nocobase/pull/6050)) by @katherinehhh + + - 修复 表格样式问题，调整表头单元格样式 ([#6052](https://github.com/nocobase/nocobase/pull/6052)) by @katherinehhh + +- **[database]** 修复排序字段从主键初始化问题 ([#6059](https://github.com/nocobase/nocobase/pull/6059)) by @chareice + +- **[数据可视化]** 在图表查询中使用聚合函数且没有设置维度的时候去除 `LIMIT` 语句 ([#6062](https://github.com/nocobase/nocobase/pull/6062)) by @2013xile + +- **[备份管理器]** 修复用户仅登录子应用后无法下载备份文件的问题 by @gchust + ## [v1.4.23](https://github.com/nocobase/nocobase/compare/v1.4.22...v1.4.23) - 2025-01-13 ### 🐛 修复 diff --git a/README.ja-JP.md b/README.ja-JP.md index 342099a7a3..eadb8ea33e 100644 --- a/README.ja-JP.md +++ b/README.ja-JP.md @@ -1,6 +1,6 @@ [English](./README.md) | [简体中文](./README.zh-CN.md) | 日本語 -https://github.com/user-attachments/assets/b11cbb68-76bc-4e8b-a2aa-2a1feed0ab77 +https://github.com/user-attachments/assets/cf08bfe5-e6e6-453c-8b96-350a6a8bed17 ## ご協力ありがとうございます！ nocobase%2Fnocobase | Trendshift diff --git a/lerna.json b/lerna.json index 3e07cefe0b..2da755853e 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.6.0-alpha.12", + "version": "1.6.0-alpha.14", "npmClient": "yarn", "useWorkspaces": true, "npmClientArgs": ["--ignore-engines"], diff --git a/packages/core/acl/package.json b/packages/core/acl/package.json index bc26b0b5af..873a67f6dd 100644 --- a/packages/core/acl/package.json +++ b/packages/core/acl/package.json @@ -1,13 +1,13 @@ { "name": "@nocobase/acl", - "version": "1.6.0-alpha.12", + "version": "1.6.0-alpha.14", "description": "", "license": "AGPL-3.0", "main": "./lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@nocobase/resourcer": "1.6.0-alpha.12", - "@nocobase/utils": "1.6.0-alpha.12", + "@nocobase/resourcer": "1.6.0-alpha.14", + "@nocobase/utils": "1.6.0-alpha.14", "minimatch": "^5.1.1" }, "repository": { diff --git a/packages/core/actions/package.json b/packages/core/actions/package.json index 2cc07d9127..35e11ec963 100644 --- a/packages/core/actions/package.json +++ b/packages/core/actions/package.json @@ -1,14 +1,14 @@ { "name": "@nocobase/actions", - "version": "1.6.0-alpha.12", + "version": "1.6.0-alpha.14", "description": "", "license": "AGPL-3.0", "main": "./lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@nocobase/cache": "1.6.0-alpha.12", - "@nocobase/database": "1.6.0-alpha.12", - "@nocobase/resourcer": "1.6.0-alpha.12" + "@nocobase/cache": "1.6.0-alpha.14", + "@nocobase/database": "1.6.0-alpha.14", + "@nocobase/resourcer": "1.6.0-alpha.14" }, "repository": { "type": "git", diff --git a/packages/core/app/package.json b/packages/core/app/package.json index c70baee181..76cd7adbd2 100644 --- a/packages/core/app/package.json +++ b/packages/core/app/package.json @@ -1,17 +1,17 @@ { "name": "@nocobase/app", - "version": "1.6.0-alpha.12", + "version": "1.6.0-alpha.14", "description": "", "license": "AGPL-3.0", "main": "./lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@nocobase/database": "1.6.0-alpha.12", - "@nocobase/preset-nocobase": "1.6.0-alpha.12", - "@nocobase/server": "1.6.0-alpha.12" + "@nocobase/database": "1.6.0-alpha.14", + "@nocobase/preset-nocobase": "1.6.0-alpha.14", + "@nocobase/server": "1.6.0-alpha.14" }, "devDependencies": { - "@nocobase/client": "1.6.0-alpha.12" + "@nocobase/client": "1.6.0-alpha.14" }, "repository": { "type": "git", diff --git a/packages/core/auth/package.json b/packages/core/auth/package.json index 1e04bf0509..75a778a290 100644 --- a/packages/core/auth/package.json +++ b/packages/core/auth/package.json @@ -1,16 +1,16 @@ { "name": "@nocobase/auth", - "version": "1.6.0-alpha.12", + "version": "1.6.0-alpha.14", "description": "", "license": "AGPL-3.0", "main": "./lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@nocobase/actions": "1.6.0-alpha.12", - "@nocobase/cache": "1.6.0-alpha.12", - "@nocobase/database": "1.6.0-alpha.12", - "@nocobase/resourcer": "1.6.0-alpha.12", - "@nocobase/utils": "1.6.0-alpha.12", + "@nocobase/actions": "1.6.0-alpha.14", + "@nocobase/cache": "1.6.0-alpha.14", + "@nocobase/database": "1.6.0-alpha.14", + "@nocobase/resourcer": "1.6.0-alpha.14", + "@nocobase/utils": "1.6.0-alpha.14", "@types/jsonwebtoken": "^8.5.8", "jsonwebtoken": "^8.5.1" }, diff --git a/packages/core/build/package.json b/packages/core/build/package.json index ad977a04ae..ba45288906 100644 --- a/packages/core/build/package.json +++ b/packages/core/build/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/build", - "version": "1.6.0-alpha.12", + "version": "1.6.0-alpha.14", "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 f370b94253..685b23c83e 100644 --- a/packages/core/cache/package.json +++ b/packages/core/cache/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/cache", - "version": "1.6.0-alpha.12", + "version": "1.6.0-alpha.14", "description": "", "license": "AGPL-3.0", "main": "./lib/index.js", diff --git a/packages/core/cli/package.json b/packages/core/cli/package.json index 86c873c7d6..eb759ce9c0 100644 --- a/packages/core/cli/package.json +++ b/packages/core/cli/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/cli", - "version": "1.6.0-alpha.12", + "version": "1.6.0-alpha.14", "description": "", "license": "AGPL-3.0", "main": "./src/index.js", @@ -8,7 +8,7 @@ "nocobase": "./bin/index.js" }, "dependencies": { - "@nocobase/app": "1.6.0-alpha.12", + "@nocobase/app": "1.6.0-alpha.14", "@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.6.0-alpha.12" + "@nocobase/devtools": "1.6.0-alpha.14" }, "repository": { "type": "git", diff --git a/packages/core/client/package.json b/packages/core/client/package.json index b5b72461a0..aecef73494 100644 --- a/packages/core/client/package.json +++ b/packages/core/client/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/client", - "version": "1.6.0-alpha.12", + "version": "1.6.0-alpha.14", "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.6.0-alpha.12", - "@nocobase/sdk": "1.6.0-alpha.12", - "@nocobase/utils": "1.6.0-alpha.12", + "@nocobase/evaluators": "1.6.0-alpha.14", + "@nocobase/sdk": "1.6.0-alpha.14", + "@nocobase/utils": "1.6.0-alpha.14", "ahooks": "^3.7.2", "antd": "5.12.8", "antd-style": "3.7.1", diff --git a/packages/core/client/src/block-provider/hooks/index.ts b/packages/core/client/src/block-provider/hooks/index.ts index 717bf512e2..e757256e24 100644 --- a/packages/core/client/src/block-provider/hooks/index.ts +++ b/packages/core/client/src/block-provider/hooks/index.ts @@ -1571,6 +1571,7 @@ export const getAppends = ({ 'AssociationField.AddNewer', 'TableField', 'Kanban.CardViewer', + 'Action.Container', ].includes(s['x-component']) ) { getAppends({ 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 876366dd75..9305cae995 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 @@ -15,7 +15,7 @@ import React, { useState, useEffect, useRef } from 'react'; import { getPickerFormat, getDateTimeFormat } from '@nocobase/utils/client'; import { useTranslation } from 'react-i18next'; import { ReadPretty, ReadPrettyComposed } from './ReadPretty'; -import { getDateRanges, mapDatePicker, mapRangePicker, inferPickerType } from './util'; +import { getDateRanges, mapDatePicker, mapRangePicker, inferPickerType, isMobile } from './util'; import { useCompile } from '../../'; import { useVariables, useLocalVariables, isVariable } from '../../../variables'; import { autorun } from '@formily/reactive'; @@ -264,6 +264,7 @@ DatePicker.RangePicker = function RangePicker(props: any) { DatePicker.FilterWithPicker = function FilterWithPicker(props: any) { const { picker = 'date', format, showTime, timeFormat } = props; + const isMobileMedia = isMobile(); const { utc = true } = useDatePickerContext(); const value = Array.isArray(props.value) ? props.value[0] : props.value; const compile = useCompile(); @@ -272,6 +273,7 @@ DatePicker.FilterWithPicker = function FilterWithPicker(props: any) { const targetDateFormat = getPickerFormat(targetPicker) || format; const newProps = { utc, + inputReadOnly: isMobileMedia, ...props, underFilter: true, showTime: showTime ? { defaultValue: dayjs('00:00:00', 'HH:mm:ss') } : false, diff --git a/packages/core/client/src/schema-component/antd/date-picker/demos/demo1.tsx b/packages/core/client/src/schema-component/antd/date-picker/demos/demo1.tsx index db937d7c6e..0e58433fe0 100644 --- a/packages/core/client/src/schema-component/antd/date-picker/demos/demo1.tsx +++ b/packages/core/client/src/schema-component/antd/date-picker/demos/demo1.tsx @@ -1,5 +1,3 @@ - - /** * title: DatePicker */ diff --git a/packages/core/client/src/schema-component/antd/date-picker/demos/demo2.tsx b/packages/core/client/src/schema-component/antd/date-picker/demos/demo2.tsx index 2a3d446cde..a32adcd207 100644 --- a/packages/core/client/src/schema-component/antd/date-picker/demos/demo2.tsx +++ b/packages/core/client/src/schema-component/antd/date-picker/demos/demo2.tsx @@ -1,5 +1,3 @@ - - /** * title: DatePicker (GMT) */ diff --git a/packages/core/client/src/schema-component/antd/date-picker/demos/demo3.tsx b/packages/core/client/src/schema-component/antd/date-picker/demos/demo3.tsx index 63597b8c4a..82f0a13022 100644 --- a/packages/core/client/src/schema-component/antd/date-picker/demos/demo3.tsx +++ b/packages/core/client/src/schema-component/antd/date-picker/demos/demo3.tsx @@ -1,5 +1,3 @@ - - /** * title: DatePicker */ diff --git a/packages/core/client/src/schema-component/antd/date-picker/demos/demo7.tsx b/packages/core/client/src/schema-component/antd/date-picker/demos/demo7.tsx index e3de179d0b..56eaec1826 100644 --- a/packages/core/client/src/schema-component/antd/date-picker/demos/demo7.tsx +++ b/packages/core/client/src/schema-component/antd/date-picker/demos/demo7.tsx @@ -1,5 +1,3 @@ - - /** * title: DatePicker */ diff --git a/packages/core/client/src/schema-component/antd/date-picker/demos/demo8.tsx b/packages/core/client/src/schema-component/antd/date-picker/demos/demo8.tsx index 81309fc9d7..aad364a19d 100644 --- a/packages/core/client/src/schema-component/antd/date-picker/demos/demo8.tsx +++ b/packages/core/client/src/schema-component/antd/date-picker/demos/demo8.tsx @@ -1,5 +1,3 @@ - - /** * title: DatePicker */ diff --git a/packages/core/client/src/schema-component/antd/date-picker/util.ts b/packages/core/client/src/schema-component/antd/date-picker/util.ts index f86e3bdf93..d13189fe4e 100644 --- a/packages/core/client/src/schema-component/antd/date-picker/util.ts +++ b/packages/core/client/src/schema-component/antd/date-picker/util.ts @@ -106,12 +106,14 @@ export const handleDateChangeOnForm = (value, dateOnly, utc, picker, showTime, g }; export const mapDatePicker = function () { + const isMobileMedia = isMobile(); return (props: any) => { const { dateOnly, showTime, picker = 'date', utc, gmt, underFilter } = props; const format = getDefaultFormat(props); const onChange = props.onChange; return { ...props, + inputReadOnly: isMobileMedia, format: format, value: str2moment(props.value, props), onChange: (value: Dayjs | null, dateString) => { @@ -126,8 +128,12 @@ export const mapDatePicker = function () { }; }; }; +export function isMobile() { + return window.matchMedia('(max-width: 768px)').matches; +} export const mapRangePicker = function () { + const isMobileMedia = isMobile(); return (props: any) => { const format = getDefaultFormat(props) as any; const onChange = props.onChange; @@ -136,6 +142,7 @@ export const mapRangePicker = function () { ...props, format: format, value: str2moment(props.value, props), + inputReadOnly: isMobileMedia, onChange: (value: Dayjs[]) => { if (onChange) { if (underFilter) { diff --git a/packages/core/client/src/schema-component/antd/table-v2/Table.Column.Decorator.tsx b/packages/core/client/src/schema-component/antd/table-v2/Table.Column.Decorator.tsx index f681f08d38..fea29701cd 100644 --- a/packages/core/client/src/schema-component/antd/table-v2/Table.Column.Decorator.tsx +++ b/packages/core/client/src/schema-component/antd/table-v2/Table.Column.Decorator.tsx @@ -88,7 +88,15 @@ export const TableColumnDecorator = (props) => { }, [uiSchema?.title]); if (!designable || Designer.isNullComponent) { - return props.children; + return ( + + + + {fieldSchema?.required && *} + {field?.title || compile(uiSchema?.title)} + + + ); } return ( { const { transaction } = options; - const orderField = (() => { - const model = this.collection.model; - - if (model.primaryKeyAttribute) { - return model.primaryKeyAttribute; - } - - if (model.rawAttributes['createdAt']) { - return model.rawAttributes['createdAt'].field; - } - - throw new Error(`can not find order key for collection ${this.collection.name}`); - })(); const needInit = async (scopeKey = null, scopeValue = null) => { const filter = {}; @@ -93,6 +80,23 @@ export class SortField extends Field { }; const doInit = async (scopeKey = null, scopeValue = null) => { + const orderField = (() => { + const model = this.collection.model; + + if (model.primaryKeyAttribute) { + const primaryKeyAttribute = model.rawAttributes[model.primaryKeyAttribute]; + if (primaryKeyAttribute.autoIncrement) { + return primaryKeyAttribute.field; + } + } + + if (model.rawAttributes['createdAt']) { + return model.rawAttributes['createdAt'].field; + } + + throw new Error(`can not find order key for collection ${this.collection.name}`); + })(); + const queryInterface = this.collection.db.sequelize.getQueryInterface(); if (scopeKey) { diff --git a/packages/plugins/@nocobase/plugin-file-manager/package.json b/packages/plugins/@nocobase/plugin-file-manager/package.json index ba76fb412d..8b97fdc7c5 100644 --- a/packages/plugins/@nocobase/plugin-file-manager/package.json +++ b/packages/plugins/@nocobase/plugin-file-manager/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-file-manager", - "version": "1.6.0-alpha.12", + "version": "1.6.0-alpha.14", "displayName": "File manager", "displayName.zh-CN": "文件管理器", "description": "Provides files storage services with files collection template and attachment field.", diff --git a/packages/plugins/@nocobase/plugin-gantt/package.json b/packages/plugins/@nocobase/plugin-gantt/package.json index ac32d5a958..969600ba8e 100644 --- a/packages/plugins/@nocobase/plugin-gantt/package.json +++ b/packages/plugins/@nocobase/plugin-gantt/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-gantt", - "version": "1.6.0-alpha.12", + "version": "1.6.0-alpha.14", "displayName": "Block: Gantt", "displayName.zh-CN": "区块：甘特图", "description": "Provides Gantt block.", diff --git a/packages/plugins/@nocobase/plugin-graph-collection-manager/package.json b/packages/plugins/@nocobase/plugin-graph-collection-manager/package.json index f9aceec2c1..4dab728e28 100644 --- a/packages/plugins/@nocobase/plugin-graph-collection-manager/package.json +++ b/packages/plugins/@nocobase/plugin-graph-collection-manager/package.json @@ -4,7 +4,7 @@ "displayName.zh-CN": "可视化数据表管理", "description": "An ER diagram-like tool. Currently only the Master database is supported.", "description.zh-CN": "类似 ER 图的工具，目前只支持主数据库。", - "version": "1.6.0-alpha.12", + "version": "1.6.0-alpha.14", "license": "AGPL-3.0", "main": "./dist/server/index.js", "homepage": "https://docs.nocobase.com/handbook/graph-collection-manager", diff --git a/packages/plugins/@nocobase/plugin-kanban/package.json b/packages/plugins/@nocobase/plugin-kanban/package.json index 8210a6d849..3ef9cefad7 100644 --- a/packages/plugins/@nocobase/plugin-kanban/package.json +++ b/packages/plugins/@nocobase/plugin-kanban/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-kanban", - "version": "1.6.0-alpha.12", + "version": "1.6.0-alpha.14", "main": "dist/server/index.js", "homepage": "https://docs.nocobase.com/handbook/block-kanban", "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/block-kanban", diff --git a/packages/plugins/@nocobase/plugin-localization/package.json b/packages/plugins/@nocobase/plugin-localization/package.json index 149a0b0977..30f47303b9 100644 --- a/packages/plugins/@nocobase/plugin-localization/package.json +++ b/packages/plugins/@nocobase/plugin-localization/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-localization", - "version": "1.6.0-alpha.12", + "version": "1.6.0-alpha.14", "main": "dist/server/index.js", "homepage": "https://docs.nocobase.com/handbook/localization-management", "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/localization-management", diff --git a/packages/plugins/@nocobase/plugin-logger/package.json b/packages/plugins/@nocobase/plugin-logger/package.json index 0fc05948cb..fa95dcdd36 100644 --- a/packages/plugins/@nocobase/plugin-logger/package.json +++ b/packages/plugins/@nocobase/plugin-logger/package.json @@ -4,7 +4,7 @@ "displayName.zh-CN": "日志", "description": "Server-side logs, mainly including API request logs and system runtime logs, and allows to package and download log files.", "description.zh-CN": "服务端日志，主要包括接口请求日志和系统运行日志，并支持打包和下载日志文件。", - "version": "1.6.0-alpha.12", + "version": "1.6.0-alpha.14", "license": "AGPL-3.0", "main": "dist/server/index.js", "homepage": "https://docs.nocobase.com/handbook/logger", diff --git a/packages/plugins/@nocobase/plugin-map/package.json b/packages/plugins/@nocobase/plugin-map/package.json index ea3d52830c..8b882a533d 100644 --- a/packages/plugins/@nocobase/plugin-map/package.json +++ b/packages/plugins/@nocobase/plugin-map/package.json @@ -2,7 +2,7 @@ "name": "@nocobase/plugin-map", "displayName": "Block: Map", "displayName.zh-CN": "区块：地图", - "version": "1.6.0-alpha.12", + "version": "1.6.0-alpha.14", "description": "Map block, support Gaode map and Google map, you can also extend more map types.", "description.zh-CN": "地图区块，支持高德地图和 Google 地图，你也可以扩展更多地图类型。", "license": "AGPL-3.0", diff --git a/packages/plugins/@nocobase/plugin-mobile-client/package.json b/packages/plugins/@nocobase/plugin-mobile-client/package.json index 43d8bcbc7b..d8b86adf3c 100644 --- a/packages/plugins/@nocobase/plugin-mobile-client/package.json +++ b/packages/plugins/@nocobase/plugin-mobile-client/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-mobile-client", - "version": "1.6.0-alpha.12", + "version": "1.6.0-alpha.14", "main": "./dist/server/index.js", "homepage": "https://docs.nocobase.com/handbook/mobile-client", "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/mobile-client", diff --git a/packages/plugins/@nocobase/plugin-mobile/package.json b/packages/plugins/@nocobase/plugin-mobile/package.json index 2f3fe6f67f..f316be7a1c 100644 --- a/packages/plugins/@nocobase/plugin-mobile/package.json +++ b/packages/plugins/@nocobase/plugin-mobile/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-mobile", - "version": "1.6.0-alpha.12", + "version": "1.6.0-alpha.14", "main": "dist/server/index.js", "homepage": "https://docs.nocobase.com/handbook/mobile", "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/mobile", diff --git a/packages/plugins/@nocobase/plugin-mock-collections/package.json b/packages/plugins/@nocobase/plugin-mock-collections/package.json index 4e64a8c3f7..443dcba28e 100644 --- a/packages/plugins/@nocobase/plugin-mock-collections/package.json +++ b/packages/plugins/@nocobase/plugin-mock-collections/package.json @@ -2,7 +2,7 @@ "name": "@nocobase/plugin-mock-collections", "displayName": "mock-collections", "description": "mock-collections", - "version": "1.6.0-alpha.12", + "version": "1.6.0-alpha.14", "main": "./dist/server/index.js", "license": "AGPL-3.0", "peerDependencies": { diff --git a/packages/plugins/@nocobase/plugin-multi-app-manager/package.json b/packages/plugins/@nocobase/plugin-multi-app-manager/package.json index 89cfa3ad18..5cd13fa5dc 100644 --- a/packages/plugins/@nocobase/plugin-multi-app-manager/package.json +++ b/packages/plugins/@nocobase/plugin-multi-app-manager/package.json @@ -4,7 +4,7 @@ "displayName.zh-CN": "多应用管理器", "description": "Dynamically create multiple apps without separate deployments.", "description.zh-CN": "无需单独部署即可动态创建多个应用。", - "version": "1.6.0-alpha.12", + "version": "1.6.0-alpha.14", "license": "AGPL-3.0", "main": "./dist/server/index.js", "homepage": "https://docs.nocobase.com/handbook/multi-app-manager", diff --git a/packages/plugins/@nocobase/plugin-multi-app-share-collection/package.json b/packages/plugins/@nocobase/plugin-multi-app-share-collection/package.json index c511c8f393..6f322288e5 100644 --- a/packages/plugins/@nocobase/plugin-multi-app-share-collection/package.json +++ b/packages/plugins/@nocobase/plugin-multi-app-share-collection/package.json @@ -4,7 +4,7 @@ "displayName.zh-CN": "多应用数据表共享", "description": "", "description.zh-CN": "", - "version": "1.6.0-alpha.12", + "version": "1.6.0-alpha.14", "main": "./dist/server/index.js", "devDependencies": { "@formily/react": "2.x", diff --git a/packages/plugins/@nocobase/plugin-notification-email/package.json b/packages/plugins/@nocobase/plugin-notification-email/package.json index 8833e6257d..4114309dc1 100644 --- a/packages/plugins/@nocobase/plugin-notification-email/package.json +++ b/packages/plugins/@nocobase/plugin-notification-email/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-notification-email", - "version": "1.6.0-alpha.12", + "version": "1.6.0-alpha.14", "displayName": "Notification: Email", "displayName.zh-CN": "通知：电子邮件", "description": "Used for sending email notifications with built-in SMTP transport.", diff --git a/packages/plugins/@nocobase/plugin-notification-in-app-message/package.json b/packages/plugins/@nocobase/plugin-notification-in-app-message/package.json index 8fd3cbb109..903d0982e9 100644 --- a/packages/plugins/@nocobase/plugin-notification-in-app-message/package.json +++ b/packages/plugins/@nocobase/plugin-notification-in-app-message/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-notification-in-app-message", - "version": "1.6.0-alpha.12", + "version": "1.6.0-alpha.14", "displayName": "Notification: In-app message", "displayName.zh-CN": "通知：站内信", "description": "It supports users in receiving real-time message notifications within the NocoBase application.", diff --git a/packages/plugins/@nocobase/plugin-notification-manager/package.json b/packages/plugins/@nocobase/plugin-notification-manager/package.json index f34387d205..b1d36bc4ed 100644 --- a/packages/plugins/@nocobase/plugin-notification-manager/package.json +++ b/packages/plugins/@nocobase/plugin-notification-manager/package.json @@ -4,7 +4,7 @@ "description": "Provides a unified management service that includes channel configuration, logging, and other features, supporting the configuration of various notification channels, including in-app message and email.", "displayName.zh-CN": "通知管理", "description.zh-CN": "提供统一的管理服务，涵盖渠道配置、日志记录等功能，支持多种通知渠道的配置，包括站内信和电子邮件等。", - "version": "1.6.0-alpha.12", + "version": "1.6.0-alpha.14", "main": "dist/server/index.js", "devDependencies": { "@ant-design/icons": "5.x", diff --git a/packages/plugins/@nocobase/plugin-notifications/package.json b/packages/plugins/@nocobase/plugin-notifications/package.json index 93bc78c7a2..ded2d238e1 100644 --- a/packages/plugins/@nocobase/plugin-notifications/package.json +++ b/packages/plugins/@nocobase/plugin-notifications/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-notifications", - "version": "1.6.0-alpha.12", + "version": "1.6.0-alpha.14", "description": "", "license": "AGPL-3.0", "main": "./dist/server/index.js", diff --git a/packages/plugins/@nocobase/plugin-public-forms/package.json b/packages/plugins/@nocobase/plugin-public-forms/package.json index 1f9b7f7a71..91fb07010d 100644 --- a/packages/plugins/@nocobase/plugin-public-forms/package.json +++ b/packages/plugins/@nocobase/plugin-public-forms/package.json @@ -1,6 +1,6 @@ { "name": "@nocobase/plugin-public-forms", - "version": "1.6.0-alpha.12", + "version": "1.6.0-alpha.14", "main": "dist/server/index.js", "displayName": "Public forms", "displayName.zh-CN": "公开表单", diff --git a/packages/plugins/@nocobase/plugin-public-forms/src/client/components/AdminPublicFormPage.tsx b/packages/plugins/@nocobase/plugin-public-forms/src/client/components/AdminPublicFormPage.tsx index b24c453ca6..62813125af 100644 --- a/packages/plugins/@nocobase/plugin-public-forms/src/client/components/AdminPublicFormPage.tsx +++ b/packages/plugins/@nocobase/plugin-public-forms/src/client/components/AdminPublicFormPage.tsx @@ -25,7 +25,19 @@ import { ApplicationContext, useGlobalVariable, } from '@nocobase/client'; -import { Breadcrumb, Button, Dropdown, Space, Spin, Switch, message, Popover, QRCode } from 'antd'; +import { + Breadcrumb, + Button, + Dropdown, + Space, + Spin, + Switch, + Input, + message, + Popover, + QRCode, + theme as AntdTheme, +} from 'antd'; import React, { useState } from 'react'; import { useParams } from 'react-router'; import { Link } from 'react-router-dom'; @@ -59,6 +71,7 @@ export function AdminPublicFormPage() { const { t } = usePublicFormTranslation(); const { theme } = useGlobalTheme(); const apiClient = useAPIClient(); + const { token } = AntdTheme.useToken(); const app = useApp(); const environmentCtx = useGlobalVariable('$env'); const { data, loading, refresh } = useRequest({ @@ -127,6 +140,8 @@ export function AdminPublicFormPage() { display: 'flex', alignItems: 'center', justifyContent: 'space-between', + background: `${token.colorBgContainer}`, + borderBottom: `1px solid ${token.colorBorderSecondary}`, }} >