diff --git a/apps/web-antd/src/adapter/form.ts b/apps/web-antd/src/adapter/form.ts index 93428bac..7b43f201 100644 --- a/apps/web-antd/src/adapter/form.ts +++ b/apps/web-antd/src/adapter/form.ts @@ -8,6 +8,7 @@ import type { ComponentType } from './component'; import { setupVbenForm, useVbenForm as useForm, z } from '@vben/common-ui'; import { $t } from '@vben/locales'; +// TODO @xingyu:要不搞到全局的校验? /** 手机号正则表达式(中国) */ const MOBILE_REGEX = /(?:0|86|\+86)?1[3-9]\d{9}/; diff --git a/apps/web-antd/src/layouts/basic.vue b/apps/web-antd/src/layouts/basic.vue index cee1fd88..6795fb91 100644 --- a/apps/web-antd/src/layouts/basic.vue +++ b/apps/web-antd/src/layouts/basic.vue @@ -133,7 +133,7 @@ async function handleNotificationMakeAll() { /** 清空通知 */ async function handleNotificationClear() { - handleNotificationMakeAll(); + await handleNotificationMakeAll(); } /** 标记单个已读 */ diff --git a/apps/web-ele/src/adapter/component/index.ts b/apps/web-ele/src/adapter/component/index.ts index 7a5d9f07..af47922a 100644 --- a/apps/web-ele/src/adapter/component/index.ts +++ b/apps/web-ele/src/adapter/component/index.ts @@ -222,6 +222,7 @@ async function initComponentAdapter() { 'select', { component: ElTreeSelect, + // TODO @xingyu:这里要加 props: { label: 'label', children: 'children' }, vben 官方是有的 nodeKey: 'value', loadingSlot: 'loading', optionsPropName: 'data', @@ -250,6 +251,7 @@ async function initComponentAdapter() { }, // 自定义默认按钮 DefaultButton: (props, { attrs, slots }) => { + // TODO @xingyu:, type: 'info' 要加么?vben5 是有的; return h(ElButton, { ...props, attrs }, slots); }, // 自定义主要按钮 diff --git a/apps/web-ele/src/adapter/form.ts b/apps/web-ele/src/adapter/form.ts index e2f7e462..362ec798 100644 --- a/apps/web-ele/src/adapter/form.ts +++ b/apps/web-ele/src/adapter/form.ts @@ -8,6 +8,7 @@ import type { ComponentType } from './component'; import { setupVbenForm, useVbenForm as useForm, z } from '@vben/common-ui'; import { $t } from '@vben/locales'; +// TODO @xingyu:要不搞到全局的校验? const MOBILE_REGEX = /(?:0|86|\+86)?1[3-9]\d{9}/; async function initSetupVbenForm() { diff --git a/apps/web-ele/src/layouts/basic.vue b/apps/web-ele/src/layouts/basic.vue index 1a5c4a26..fc8cf4c6 100644 --- a/apps/web-ele/src/layouts/basic.vue +++ b/apps/web-ele/src/layouts/basic.vue @@ -133,7 +133,7 @@ async function handleNotificationMakeAll() { /** 清空通知 */ async function handleNotificationClear() { - handleNotificationMakeAll(); + await handleNotificationMakeAll(); } /** 标记单个已读 */ diff --git a/packages/effects/common-ui/src/components/json-viewer/style.scss b/packages/effects/common-ui/src/components/json-viewer/style.scss index bcc2bfdc..47acb891 100644 --- a/packages/effects/common-ui/src/components/json-viewer/style.scss +++ b/packages/effects/common-ui/src/components/json-viewer/style.scss @@ -14,8 +14,8 @@ padding: 0 4px 2px; font-size: 0.9em; line-height: 0.9; - color: hsl(var(--secondary-foreground)); vertical-align: 2px; + color: hsl(var(--secondary-foreground)); cursor: pointer; user-select: none; background-color: hsl(var(--secondary)); diff --git a/packages/effects/common-ui/src/components/resize/resize.vue b/packages/effects/common-ui/src/components/resize/resize.vue index aaf89eaf..e89ea8b8 100644 --- a/packages/effects/common-ui/src/components/resize/resize.vue +++ b/packages/effects/common-ui/src/components/resize/resize.vue @@ -1072,8 +1072,8 @@ watch( box-sizing: border-box; width: 100%; height: 100%; - content: ''; outline: 1px dashed #d6d6d6; + content: ''; } .resize-stick { diff --git a/packages/effects/layouts/src/widgets/theme-toggle/theme-button.vue b/packages/effects/layouts/src/widgets/theme-toggle/theme-button.vue index 77f330c5..9ee4bceb 100644 --- a/packages/effects/layouts/src/widgets/theme-toggle/theme-button.vue +++ b/packages/effects/layouts/src/widgets/theme-toggle/theme-button.vue @@ -132,8 +132,8 @@ function toggleTheme(event: MouseEvent) { &__sun { @apply fill-foreground/90 stroke-none; - transition: transform 1.6s cubic-bezier(0.25, 0, 0.2, 1); transform-origin: center center; + transition: transform 1.6s cubic-bezier(0.25, 0, 0.2, 1); &:hover > svg > & { @apply fill-foreground/90; @@ -143,10 +143,10 @@ function toggleTheme(event: MouseEvent) { &__sun-beams { @apply stroke-foreground/90 stroke-[2px]; + transform-origin: center center; transition: transform 1.6s cubic-bezier(0.5, 1.5, 0.75, 1.25), opacity 0.6s cubic-bezier(0.25, 0, 0.3, 1); - transform-origin: center center; &:hover > svg > & { @apply stroke-foreground; diff --git a/playground/src/locales/langs/en-US/system.json b/playground/src/locales/langs/en-US/system.json index 8c019585..003dfbbe 100644 --- a/playground/src/locales/langs/en-US/system.json +++ b/playground/src/locales/langs/en-US/system.json @@ -1,5 +1,15 @@ { "title": "System Management", + "dept": { + "name": "Department", + "title": "Department Management", + "deptName": "Department Name", + "status": "Status", + "createTime": "Create Time", + "remark": "Remark", + "operation": "Operation", + "parentDept": "Parent Department" + }, "menu": { "title": "Menu Management", "parent": "Parent Menu", diff --git a/playground/src/locales/langs/zh-CN/system.json b/playground/src/locales/langs/zh-CN/system.json index 9943bd49..b0f5e7fa 100644 --- a/playground/src/locales/langs/zh-CN/system.json +++ b/playground/src/locales/langs/zh-CN/system.json @@ -1,4 +1,15 @@ { + "dept": { + "list": "部门列表", + "createTime": "创建时间", + "deptName": "部门名称", + "name": "部门", + "operation": "操作", + "parentDept": "上级部门", + "remark": "备注", + "status": "状态", + "title": "部门管理" + }, "menu": { "list": "菜单列表", "activeIcon": "激活图标", diff --git a/playground/src/views/system/dept/data.ts b/playground/src/views/system/dept/data.ts index 8c3e557a..48773625 100644 --- a/playground/src/views/system/dept/data.ts +++ b/playground/src/views/system/dept/data.ts @@ -1,5 +1,7 @@ +import type { VxeTableGridOptions } from '@vben/plugins/vxe-table'; + import type { VbenFormSchema } from '#/adapter/form'; -import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; +import type { OnActionClickFn } from '#/adapter/vxe-table'; import type { SystemDeptApi } from '#/api/system/dept'; import { z } from '#/adapter/form';