diff --git a/apps/web-antd/src/api/bpm/form/index.ts b/apps/web-antd/src/api/bpm/form/index.ts new file mode 100644 index 00000000..27191230 --- /dev/null +++ b/apps/web-antd/src/api/bpm/form/index.ts @@ -0,0 +1,48 @@ +import type { PageParam, PageResult } from '@vben/request'; + +import { requestClient } from '#/api/request'; + +export namespace BpmFormApi { + export interface FormVO { + id?: number | undefined; + name: string; + conf: string; + fields: string[]; + status: number; + remark: string; + createTime: string; + + } +} + +/** 获取表单分页列表 */ +export async function getFormPage(params: PageParam) { + return requestClient.get>('/bpm/form/page', { + params, + }); +} + +/** 获取表单详情 */ +export async function getFormDetail(id: number) { + return requestClient.get(`/bpm/form/get?id=${id}`); +} + +/** 创建表单 */ +export async function createForm(data: BpmFormApi.FormVO) { + return requestClient.post('/bpm/form/create', data); +} + +/** 更新表单 */ +export async function updateForm(data: BpmFormApi.FormVO) { + return requestClient.put('/bpm/form/update', data); +} + +/** 删除表单 */ +export async function deleteForm(id: number) { + return requestClient.delete(`/bpm/form/delete?id=${id}`); +} + +/** 获取表单简单列表 */ +export async function getFormSimpleList() { + return requestClient.get('/bpm/form/simple-list'); +} diff --git a/apps/web-antd/src/components/user-select-modal/user-select-modal.vue b/apps/web-antd/src/components/user-select-modal/user-select-modal.vue index 6b03d308..105267b7 100644 --- a/apps/web-antd/src/components/user-select-modal/user-select-modal.vue +++ b/apps/web-antd/src/components/user-select-modal/user-select-modal.vue @@ -1,4 +1,5 @@ + + + + diff --git a/apps/web-antd/src/views/bpm/form/index.vue b/apps/web-antd/src/views/bpm/form/index.vue index e4b8d579..433f0a54 100644 --- a/apps/web-antd/src/views/bpm/form/index.vue +++ b/apps/web-antd/src/views/bpm/form/index.vue @@ -1,34 +1,215 @@ diff --git a/apps/web-antd/src/views/bpm/form/modules/form.vue b/apps/web-antd/src/views/bpm/form/modules/form.vue new file mode 100644 index 00000000..4a395ec2 --- /dev/null +++ b/apps/web-antd/src/views/bpm/form/modules/form.vue @@ -0,0 +1,107 @@ + + + diff --git a/apps/web-antd/src/views/bpm/group/index.vue b/apps/web-antd/src/views/bpm/group/index.vue index 7f5406ca..ad68c318 100644 --- a/apps/web-antd/src/views/bpm/group/index.vue +++ b/apps/web-antd/src/views/bpm/group/index.vue @@ -42,6 +42,21 @@ const [Grid, gridApi] = useVbenVxeGrid({ ...formValues, }); }, + querySuccess: (params) => { + const { list } = params.response; + const userMap = new Map( + userList.value.map((user) => [user.id, user.nickname]), + ); + + list.forEach( + (item: BpmUserGroupApi.UserGroupVO & { nicknames?: string }) => { + item.nicknames = item.userIds + .map((userId) => userMap.get(userId)) + .filter(Boolean) + .join('、'); + }, + ); + }, }, }, rowConfig: { @@ -126,16 +141,8 @@ onMounted(async () => { - diff --git a/apps/web-antd/src/views/bpm/processInstance/create/index.vue b/apps/web-antd/src/views/bpm/processInstance/create/index.vue index 34bc7d04..a8ceeb35 100644 --- a/apps/web-antd/src/views/bpm/processInstance/create/index.vue +++ b/apps/web-antd/src/views/bpm/processInstance/create/index.vue @@ -265,18 +265,18 @@ onMounted(() => { width: '100%', }" > -
流程图标 +
- {{ definition.name }} + {{ definition.name?.slice(0, 2) }}
@@ -325,19 +325,26 @@ onMounted(() => { ");const o=j(e),a=K(e),c=e.getBody().dir,u=c?' dir="'+n(c)+'"':"";return""+r+'"+e.getContent()+(()=>{const e=F().os.isMacOS()||F().os.isiOS();return` diff --git a/apps/web-ele/src/components/tinymce/editor.vue b/apps/web-ele/src/components/tinymce/editor.vue new file mode 100644 index 00000000..cb874f6c --- /dev/null +++ b/apps/web-ele/src/components/tinymce/editor.vue @@ -0,0 +1,357 @@ + + + + + + diff --git a/apps/web-ele/src/components/tinymce/helper.ts b/apps/web-ele/src/components/tinymce/helper.ts new file mode 100644 index 00000000..1f98dda4 --- /dev/null +++ b/apps/web-ele/src/components/tinymce/helper.ts @@ -0,0 +1,85 @@ +const validEvents = new Set([ + 'onActivate', + 'onAddUndo', + 'onBeforeAddUndo', + 'onBeforeExecCommand', + 'onBeforeGetContent', + 'onBeforePaste', + 'onBeforeRenderUI', + 'onBeforeSetContent', + 'onBlur', + 'onChange', + 'onClearUndos', + 'onClick', + 'onContextMenu', + 'onCopy', + 'onCut', + 'onDblclick', + 'onDeactivate', + 'onDirty', + 'onDrag', + 'onDragDrop', + 'onDragEnd', + 'onDragGesture', + 'onDragOver', + 'onDrop', + 'onExecCommand', + 'onFocus', + 'onFocusIn', + 'onFocusOut', + 'onGetContent', + 'onHide', + 'onInit', + 'onKeyDown', + 'onKeyPress', + 'onKeyUp', + 'onLoadContent', + 'onMouseDown', + 'onMouseEnter', + 'onMouseLeave', + 'onMouseMove', + 'onMouseOut', + 'onMouseOver', + 'onMouseUp', + 'onNodeChange', + 'onObjectResized', + 'onObjectResizeStart', + 'onObjectSelected', + 'onPaste', + 'onPostProcess', + 'onPostRender', + 'onPreProcess', + 'onProgressState', + 'onRedo', + 'onRemove', + 'onReset', + 'onSaveContent', + 'onSelectionChange', + 'onSetAttrib', + 'onSetContent', + 'onShow', + 'onSubmit', + 'onUndo', + 'onVisualAid', +]); + +const isValidKey = (key: string) => validEvents.has(key); + +export const bindHandlers = ( + initEvent: Event, + listeners: any, + editor: any, +): void => { + Object.keys(listeners) + .filter((element) => isValidKey(element)) + .forEach((key: string) => { + const handler = listeners[key]; + if (typeof handler === 'function') { + if (key === 'onInit') { + handler(initEvent, editor); + } else { + editor.on(key.slice(2), (e: any) => handler(e, editor)); + } + } + }); +}; diff --git a/apps/web-ele/src/components/tinymce/img-upload.vue b/apps/web-ele/src/components/tinymce/img-upload.vue new file mode 100644 index 00000000..8aefc08a --- /dev/null +++ b/apps/web-ele/src/components/tinymce/img-upload.vue @@ -0,0 +1,89 @@ + + + + diff --git a/apps/web-ele/src/components/tinymce/index.ts b/apps/web-ele/src/components/tinymce/index.ts new file mode 100644 index 00000000..c277d781 --- /dev/null +++ b/apps/web-ele/src/components/tinymce/index.ts @@ -0,0 +1 @@ +export { default as Tinymce } from './editor.vue'; diff --git a/apps/web-ele/src/components/tinymce/tinymce.ts b/apps/web-ele/src/components/tinymce/tinymce.ts new file mode 100644 index 00000000..45a867b6 --- /dev/null +++ b/apps/web-ele/src/components/tinymce/tinymce.ts @@ -0,0 +1,17 @@ +// Any plugins you want to setting has to be imported +// Detail plugins list see https://www.tiny.cloud/docs/plugins/ +// Custom builds see https://www.tiny.cloud/download/custom-builds/ +// colorpicker/contextmenu/textcolor plugin is now built in to the core editor, please remove it from your editor configuration + +export const plugins = + 'preview importcss searchreplace autolink autosave save directionality code visualblocks visualchars fullscreen image link media codesample table charmap pagebreak nonbreaking anchor insertdatetime advlist lists wordcount help emoticons accordion'; + +// 和 vben2.0 不同,从 https://www.tiny.cloud/ 拷贝 Vue 部分,然后去掉 importword exportword exportpdf | math 部分,并额外增加最后一行(来自 vben2.0 差异的部分) +export const toolbar = + 'undo redo | accordion accordionremove | \\\n' + + ' blocks fontfamily fontsize | bold italic underline strikethrough | \\\n' + + ' align numlist bullist | link image | table media | \\\n' + + ' lineheight outdent indent | forecolor backcolor removeformat | \\\n' + + ' charmap emoticons | code fullscreen preview | save print | \\\n' + + ' pagebreak anchor codesample | ltr rtl | \\\n' + + ' hr searchreplace alignleft aligncenter alignright blockquote subscript superscript'; diff --git a/apps/web-ele/src/store/dict.ts b/apps/web-ele/src/store/dict.ts index 37f636d2..d2c6c73c 100644 --- a/apps/web-ele/src/store/dict.ts +++ b/apps/web-ele/src/store/dict.ts @@ -13,7 +13,7 @@ interface DictState { dictCache: Dict; } -// TODO @芋艿:可以共享么? +// TODO @xingyu:@芋艿:可以共享么? export const useDictStore = defineStore('dict', { actions: { getDictData(dictType: string, value: any) { diff --git a/apps/web-ele/src/utils/rangePickerProps.ts b/apps/web-ele/src/utils/rangePickerProps.ts index 245e3d81..84c03356 100644 --- a/apps/web-ele/src/utils/rangePickerProps.ts +++ b/apps/web-ele/src/utils/rangePickerProps.ts @@ -1,59 +1,77 @@ -import type { Dayjs } from 'dayjs'; - import dayjs from 'dayjs'; import { $t } from '#/locales'; -/** 时间段选择器拓展 */ +/** 时间段选择器拓展 */ export function getRangePickerDefaultProps() { return { - format: 'YYYY-MM-DD HH:mm:ss', - placeholder: [ - $t('utils.rangePicker.beginTime'), - $t('utils.rangePicker.endTime'), + startPlaceholder: $t('utils.rangePicker.beginTime'), + endPlaceholder: $t('utils.rangePicker.endTime'), + shortcuts: [ + { + text: $t('utils.rangePicker.today'), + value: () => { + return [dayjs().startOf('day'), dayjs().endOf('day')]; + }, + }, + { + text: $t('utils.rangePicker.yesterday'), + value: () => { + return [ + dayjs().subtract(1, 'day').startOf('day'), + dayjs().subtract(1, 'day').endOf('day'), + ]; + }, + }, + { + text: $t('utils.rangePicker.last7Days'), + value: () => { + return [ + dayjs().subtract(7, 'day').startOf('day'), + dayjs().endOf('day'), + ]; + }, + }, + { + text: $t('utils.rangePicker.last30Days'), + value: () => { + return [ + dayjs().subtract(30, 'day').startOf('day'), + dayjs().endOf('day'), + ]; + }, + }, + { + text: $t('utils.rangePicker.thisWeek'), + value: () => { + return [dayjs().startOf('week'), dayjs().endOf('day')]; + }, + }, + { + text: $t('utils.rangePicker.lastWeek'), + value: () => { + return [ + dayjs().subtract(1, 'week').startOf('day'), + dayjs().endOf('day'), + ]; + }, + }, + { + text: $t('utils.rangePicker.thisMonth'), + value: () => { + return [dayjs().startOf('month'), dayjs().endOf('day')]; + }, + }, ], - ranges: { - [$t('utils.rangePicker.today')]: () => - [dayjs().startOf('day'), dayjs().endOf('day')] as [Dayjs, Dayjs], - [$t('utils.rangePicker.last7Days')]: () => - [dayjs().subtract(7, 'day').startOf('day'), dayjs().endOf('day')] as [ - Dayjs, - Dayjs, - ], - [$t('utils.rangePicker.last30Days')]: () => - [dayjs().subtract(30, 'day').startOf('day'), dayjs().endOf('day')] as [ - Dayjs, - Dayjs, - ], - [$t('utils.rangePicker.yesterday')]: () => - [ - dayjs().subtract(1, 'day').startOf('day'), - dayjs().subtract(1, 'day').endOf('day'), - ] as [Dayjs, Dayjs], - [$t('utils.rangePicker.thisWeek')]: () => - [dayjs().startOf('week'), dayjs().endOf('day')] as [Dayjs, Dayjs], - [$t('utils.rangePicker.thisMonth')]: () => - [dayjs().startOf('month'), dayjs().endOf('day')] as [Dayjs, Dayjs], - [$t('utils.rangePicker.lastWeek')]: () => - [dayjs().subtract(1, 'week').startOf('day'), dayjs().endOf('day')] as [ - Dayjs, - Dayjs, - ], - }, - showTime: { - defaultValue: [ - dayjs('00:00:00', 'HH:mm:ss'), - dayjs('23:59:59', 'HH:mm:ss'), - ], - format: 'HH:mm:ss', - }, transformDateFunc: (dates: any) => { + // TODO puhui999: 没起作用后面调试再看看 if (dates && dates.length === 2) { // 格式化为后台支持的时间格式 return [dates.createTime[0], dates.createTime[1]].join(','); } return {}; }, + format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss', }; } diff --git a/apps/web-ele/src/views/system/area/index.vue b/apps/web-ele/src/views/system/area/index.vue index a50469ce..5c586031 100644 --- a/apps/web-ele/src/views/system/area/index.vue +++ b/apps/web-ele/src/views/system/area/index.vue @@ -67,7 +67,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ diff --git a/apps/web-ele/src/views/system/dept/index.vue b/apps/web-ele/src/views/system/dept/index.vue index 74b55aec..abaaf0c6 100644 --- a/apps/web-ele/src/views/system/dept/index.vue +++ b/apps/web-ele/src/views/system/dept/index.vue @@ -142,7 +142,7 @@ onMounted(async () => { @click="onCreate" v-access:code="['system:dept:create']" > - + {{ $t('ui.actionTitle.create', ['部门']) }} diff --git a/apps/web-ele/src/views/system/dict/modules/data-grid.vue b/apps/web-ele/src/views/system/dict/modules/data-grid.vue index 346928fc..f2dc365e 100644 --- a/apps/web-ele/src/views/system/dict/modules/data-grid.vue +++ b/apps/web-ele/src/views/system/dict/modules/data-grid.vue @@ -140,7 +140,7 @@ watch( @click="onCreate" v-access:code="['system:dict:create']" > - + {{ $t('ui.actionTitle.create', ['字典数据']) }} - + {{ $t('ui.actionTitle.export') }} diff --git a/apps/web-ele/src/views/system/dict/modules/type-grid.vue b/apps/web-ele/src/views/system/dict/modules/type-grid.vue index 662bc407..1e540e83 100644 --- a/apps/web-ele/src/views/system/dict/modules/type-grid.vue +++ b/apps/web-ele/src/views/system/dict/modules/type-grid.vue @@ -135,7 +135,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ @click="onCreate" v-access:code="['system:dict:create']" > - + {{ $t('ui.actionTitle.create', ['字典类型']) }} - + {{ $t('ui.actionTitle.export') }} diff --git a/apps/web-ele/src/views/system/loginlog/index.vue b/apps/web-ele/src/views/system/loginlog/index.vue index 1e5b4804..4613dfc2 100644 --- a/apps/web-ele/src/views/system/loginlog/index.vue +++ b/apps/web-ele/src/views/system/loginlog/index.vue @@ -98,7 +98,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ @click="onExport" v-access:code="['system:login-log:export']" > - + {{ $t('ui.actionTitle.export') }} diff --git a/apps/web-ele/src/views/system/mail/account/index.vue b/apps/web-ele/src/views/system/mail/account/index.vue index e58045ab..084d205e 100644 --- a/apps/web-ele/src/views/system/mail/account/index.vue +++ b/apps/web-ele/src/views/system/mail/account/index.vue @@ -118,7 +118,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ @click="onCreate" v-access:code="['system:mail-account:create']" > - + {{ $t('ui.actionTitle.create', ['邮箱账号']) }} diff --git a/apps/web-ele/src/views/system/mail/template/index.vue b/apps/web-ele/src/views/system/mail/template/index.vue index eacfcdd6..d56e4643 100644 --- a/apps/web-ele/src/views/system/mail/template/index.vue +++ b/apps/web-ele/src/views/system/mail/template/index.vue @@ -148,7 +148,7 @@ onMounted(async () => { @click="onCreate" v-access:code="['system:mail-template:create']" > - + {{ $t('ui.actionTitle.create', ['邮件模板']) }} diff --git a/apps/web-ele/src/views/system/menu/data.ts b/apps/web-ele/src/views/system/menu/data.ts index 86369fed..d4c6d971 100644 --- a/apps/web-ele/src/views/system/menu/data.ts +++ b/apps/web-ele/src/views/system/menu/data.ts @@ -323,10 +323,9 @@ export function useGridColumns( { field: 'operation', title: '操作', - align: 'right', minWidth: 200, fixed: 'right', - headerAlign: 'center', + align: 'center', showOverflow: false, cellRender: { attrs: { diff --git a/apps/web-ele/src/views/system/menu/index.vue b/apps/web-ele/src/views/system/menu/index.vue index 097151a1..c24e89b9 100644 --- a/apps/web-ele/src/views/system/menu/index.vue +++ b/apps/web-ele/src/views/system/menu/index.vue @@ -137,7 +137,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ @click="onCreate" v-access:code="['system:menu:create']" > - + {{ $t('ui.actionTitle.create', ['菜单']) }} diff --git a/apps/web-ele/src/views/system/notice/index.vue b/apps/web-ele/src/views/system/notice/index.vue index 697f5fdc..f72fc8eb 100644 --- a/apps/web-ele/src/views/system/notice/index.vue +++ b/apps/web-ele/src/views/system/notice/index.vue @@ -131,7 +131,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ @click="onCreate" v-access:code="['system:notice:create']" > - + {{ $t('ui.actionTitle.create', ['公告']) }} diff --git a/apps/web-ele/src/views/system/notify/template/index.vue b/apps/web-ele/src/views/system/notify/template/index.vue index 42a42e64..2736be06 100644 --- a/apps/web-ele/src/views/system/notify/template/index.vue +++ b/apps/web-ele/src/views/system/notify/template/index.vue @@ -143,7 +143,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ @click="onCreate" v-access:code="['system:notify-template:create']" > - + {{ $t('ui.actionTitle.create', ['站内信模板']) }} - + {{ $t('ui.actionTitle.export') }} diff --git a/apps/web-ele/src/views/system/oauth2/client/index.vue b/apps/web-ele/src/views/system/oauth2/client/index.vue index 8555c366..240ffbde 100644 --- a/apps/web-ele/src/views/system/oauth2/client/index.vue +++ b/apps/web-ele/src/views/system/oauth2/client/index.vue @@ -122,7 +122,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ @click="onCreate" v-access:code="['system:oauth2-client:create']" > - + {{ $t('ui.actionTitle.create', [' OAuth2.0 客户端']) }} diff --git a/apps/web-ele/src/views/system/operatelog/index.vue b/apps/web-ele/src/views/system/operatelog/index.vue index 075eaec3..a073e362 100644 --- a/apps/web-ele/src/views/system/operatelog/index.vue +++ b/apps/web-ele/src/views/system/operatelog/index.vue @@ -98,7 +98,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ @click="onExport" v-access:code="['system:operate-log:export']" > - + {{ $t('ui.actionTitle.export') }} diff --git a/apps/web-ele/src/views/system/post/index.vue b/apps/web-ele/src/views/system/post/index.vue index 27ce36a4..144a277d 100644 --- a/apps/web-ele/src/views/system/post/index.vue +++ b/apps/web-ele/src/views/system/post/index.vue @@ -115,7 +115,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ @click="onCreate" v-access:code="['system:post:create']" > - + {{ $t('ui.actionTitle.create', ['岗位']) }} - + {{ $t('ui.actionTitle.export') }} diff --git a/apps/web-ele/src/views/system/role/index.vue b/apps/web-ele/src/views/system/role/index.vue index d2da208b..f19f2c1b 100644 --- a/apps/web-ele/src/views/system/role/index.vue +++ b/apps/web-ele/src/views/system/role/index.vue @@ -157,7 +157,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ @click="onCreate" v-access:code="['system:role:create']" > - + {{ $t('ui.actionTitle.create', ['角色']) }} - + {{ $t('ui.actionTitle.export') }} diff --git a/apps/web-ele/src/views/system/sms/channel/index.vue b/apps/web-ele/src/views/system/sms/channel/index.vue index bdb8be27..eee98f87 100644 --- a/apps/web-ele/src/views/system/sms/channel/index.vue +++ b/apps/web-ele/src/views/system/sms/channel/index.vue @@ -127,7 +127,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ @click="onCreate" v-access:code="['system:sms-channel:create']" > - + {{ $t('ui.actionTitle.create', ['短信渠道']) }} - + {{ $t('ui.actionTitle.export') }} diff --git a/apps/web-ele/src/views/system/sms/log/index.vue b/apps/web-ele/src/views/system/sms/log/index.vue index 0a5ae9c9..0918c22d 100644 --- a/apps/web-ele/src/views/system/sms/log/index.vue +++ b/apps/web-ele/src/views/system/sms/log/index.vue @@ -98,7 +98,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ @click="onExport" v-access:code="['system:sms-log:export']" > - + {{ $t('ui.actionTitle.export') }} diff --git a/apps/web-ele/src/views/system/sms/template/index.vue b/apps/web-ele/src/views/system/sms/template/index.vue index 1e376d49..1226469c 100644 --- a/apps/web-ele/src/views/system/sms/template/index.vue +++ b/apps/web-ele/src/views/system/sms/template/index.vue @@ -143,7 +143,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ @click="onCreate" v-access:code="['system:sms-template:create']" > - + {{ $t('ui.actionTitle.create', ['短信模板']) }} - + {{ $t('ui.actionTitle.export') }} diff --git a/apps/web-ele/src/views/system/social/client/index.vue b/apps/web-ele/src/views/system/social/client/index.vue index 442657a0..1e46a16c 100644 --- a/apps/web-ele/src/views/system/social/client/index.vue +++ b/apps/web-ele/src/views/system/social/client/index.vue @@ -119,7 +119,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ @click="onCreate" v-access:code="['system:social-client:create']" > - + {{ $t('ui.actionTitle.create', ['社交客户端']) }} diff --git a/apps/web-ele/src/views/system/tenant/index.vue b/apps/web-ele/src/views/system/tenant/index.vue index 0fbbce71..70d9e659 100644 --- a/apps/web-ele/src/views/system/tenant/index.vue +++ b/apps/web-ele/src/views/system/tenant/index.vue @@ -142,7 +142,7 @@ onMounted(async () => { @click="onCreate" v-access:code="['system:tenant:create']" > - + {{ $t('ui.actionTitle.create', ['租户']) }} { @click="onExport" v-access:code="['system:tenant:export']" > - + {{ $t('ui.actionTitle.export') }} diff --git a/apps/web-ele/src/views/system/tenantPackage/index.vue b/apps/web-ele/src/views/system/tenantPackage/index.vue index 239b95d9..71662204 100644 --- a/apps/web-ele/src/views/system/tenantPackage/index.vue +++ b/apps/web-ele/src/views/system/tenantPackage/index.vue @@ -120,7 +120,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ @click="onCreate" v-access:code="['system:tenant-package:create']" > - + {{ $t('ui.actionTitle.create', ['套餐']) }} diff --git a/apps/web-ele/src/views/system/user/data.ts b/apps/web-ele/src/views/system/user/data.ts index 68e73756..91e9649b 100644 --- a/apps/web-ele/src/views/system/user/data.ts +++ b/apps/web-ele/src/views/system/user/data.ts @@ -317,7 +317,7 @@ export function useGridColumns( { field: 'operation', title: '操作', - minWidth: 250, + minWidth: 130, fixed: 'right', align: 'center', cellRender: { diff --git a/apps/web-ele/src/views/system/user/index.vue b/apps/web-ele/src/views/system/user/index.vue index 93f418a9..ed8b01c0 100644 --- a/apps/web-ele/src/views/system/user/index.vue +++ b/apps/web-ele/src/views/system/user/index.vue @@ -221,7 +221,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ @click="onCreate" v-access:code="['system:user:create']" > - + {{ $t('ui.actionTitle.create', ['用户']) }} - + {{ $t('ui.actionTitle.export') }} - + {{ $t('ui.actionTitle.import', ['用户']) }} diff --git a/apps/web-ele/src/views/system/user/modules/reset-password-form.vue b/apps/web-ele/src/views/system/user/modules/reset-password-form.vue index bd6ef27f..8c083571 100644 --- a/apps/web-ele/src/views/system/user/modules/reset-password-form.vue +++ b/apps/web-ele/src/views/system/user/modules/reset-password-form.vue @@ -57,6 +57,7 @@ const [Modal, modalApi] = useVbenModal({ await formApi.setValues(data); }, }); +// TODO @puhui999:重置密码展示不对;