Merge remote-tracking branch 'yudao/dev' into dev-new
puhui999
commit
96f5108ded
|
|
@ -1,4 +1,5 @@
|
|||
<script lang="ts" setup>
|
||||
// TODO @芋艿：是否有更好的组织形式？！
|
||||
import type { Key } from 'ant-design-vue/es/table/interface';
|
||||
|
||||
import type { SystemDeptApi } from '#/api/system/dept';
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
<script lang="ts" setup>
|
||||
// TODO @xingyu：这个有可能 3 端复用么？想着是把 layouts 下的 components 没有这个目录哈；
|
||||
import { useVbenModal, VbenButton, VbenButtonGroup } from '@vben/common-ui';
|
||||
import { openWindow } from '@vben/utils';
|
||||
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@ const tenantEnable = isTenantEnable();
|
|||
const value = ref<number>(accessStore.visitTenantId ?? undefined); // 当前访问的租户 ID
|
||||
const tenants = ref<SystemTenantApi.Tenant[]>([]); // 租户列表
|
||||
|
||||
// TODO @xingyu：这个有可能 3 端复用么？
|
||||
async function handleChange(id: SelectValue) {
|
||||
// 设置访问租户 ID
|
||||
accessStore.setVisitTenantId(id as number);
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ import type { Recordable } from '@vben/types';
|
|||
|
||||
import { h } from 'vue';
|
||||
|
||||
// TODO @puhui999：搜索的重置按钮，颜色不对；antd 是白色的
|
||||
import { IconifyIcon } from '@vben/icons';
|
||||
import { $te } from '@vben/locales';
|
||||
import {
|
||||
|
|
@ -18,6 +19,7 @@ import { $t } from '#/locales';
|
|||
|
||||
import { useVbenForm } from './form';
|
||||
|
||||
// TODO @puhui999：貌似新增、和导出按钮，和 antd 有点点差别，这个是要写样式哇？
|
||||
setupVbenVxeTable({
|
||||
configVxeTable: (vxeUI) => {
|
||||
vxeUI.setConfig({
|
||||
|
|
@ -165,6 +167,8 @@ setupVbenVxeTable({
|
|||
text: $t('common.edit'),
|
||||
},
|
||||
};
|
||||
// TODO @puhui999：貌似按钮相比 antd 版本，小一点？
|
||||
// TODO @puhui999：貌似按钮之间的间距，大了一点？
|
||||
const operations: Array<Recordable<any>> = (
|
||||
options || ['edit', 'delete']
|
||||
)
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@ const goToUrl = () => {
|
|||
};
|
||||
</script>
|
||||
|
||||
<!-- TODO @puhui999：样式有点问题，间隔没了。可以看下 antd 版本的例子哈 -->
|
||||
<template>
|
||||
<ElAlert
|
||||
v-if="isDocAlertEnable()"
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ interface DictState {
|
|||
dictCache: Dict;
|
||||
}
|
||||
|
||||
// TODO @芋艿：可以共享么？
|
||||
// TODO @xingyu：@芋艿：可以共享么？
|
||||
export const useDictStore = defineStore('dict', {
|
||||
actions: {
|
||||
getDictData(dictType: string, value: any) {
|
||||
|
|
|
|||
|
|
@ -149,6 +149,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
|
|||
options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
|
||||
},
|
||||
},
|
||||
// TODO @puhui999：貌似创建时间，出不来；
|
||||
{
|
||||
fieldName: 'createTime',
|
||||
label: '创建时间',
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ const goToUrl = () => {
|
|||
|
||||
<template>
|
||||
<NAlert v-if="isDocAlertEnable()" type="info" show-icon class="mb-2 rounded">
|
||||
<!-- TODO @xingyu：这里不太对，展示不出来字 -->
|
||||
<template #message>
|
||||
<NText @click="goToUrl"> 【{{ title }}】文档地址：{{ url }} </NText>
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
<script lang="ts" setup>
|
||||
// TODO @xingyu：文件上传，貌似没通
|
||||
import type { UploadFile, UploadProps } from 'naive-ui';
|
||||
import type { UploadRequestOption } from 'naive-ui/lib/vc-upload/interface';
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
<!-- eslint-disable no-useless-escape -->
|
||||
<script setup lang="ts">
|
||||
// TODO @xingyu：跑不通
|
||||
import { onMounted, ref, unref } from 'vue';
|
||||
|
||||
import { Page, useVbenModal } from '@vben/common-ui';
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
<script lang="ts" setup>
|
||||
// TODO @xingyu：跑不通
|
||||
import type {
|
||||
OnActionClickParams,
|
||||
VxeTableGridOptions,
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
<script lang="ts" setup>
|
||||
// TODO @xingyu：文件上传，有点问题；
|
||||
import type { UploadFileInfo } from 'naive-ui';
|
||||
|
||||
import { useVbenModal } from '@vben/common-ui';
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
<script lang="ts" setup>
|
||||
// TODO @xingyu：跑不通
|
||||
import type { SystemUserApi } from '#/api/system/user';
|
||||
|
||||
import { computed, onMounted, ref, watchEffect } from 'vue';
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@ export function useFormSchema(): VbenFormSchema[] {
|
|||
},
|
||||
rules: 'required',
|
||||
},
|
||||
// TODO @xingyu：测试有问题
|
||||
{
|
||||
fieldName: 'content',
|
||||
label: '公告内容',
|
||||
|
|
@ -54,6 +55,7 @@ export function useFormSchema(): VbenFormSchema[] {
|
|||
},
|
||||
rules: z.number().default(CommonStatusEnum.ENABLE),
|
||||
},
|
||||
// TODO @xingyu：测试有问题
|
||||
{
|
||||
fieldName: 'remark',
|
||||
label: '备注',
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
<script lang="ts" setup>
|
||||
// TODO @xingyu：这个展示不出来；从右上角的站内信点进来的
|
||||
import type { SystemNotifyMessageApi } from '#/api/system/notify/message';
|
||||
|
||||
import { ref } from 'vue';
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@ export function useFormSchema(): VbenFormSchema[] {
|
|||
label: '租户套餐',
|
||||
component: 'ApiSelect',
|
||||
componentProps: {
|
||||
// TODO @xingyu：系统租户的情况
|
||||
api: () => getTenantPackageList(),
|
||||
labelField: 'name',
|
||||
valueField: 'id',
|
||||
|
|
@ -149,6 +150,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
|
|||
options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
|
||||
},
|
||||
},
|
||||
// TODO @xingyu：时间检索，有问题
|
||||
{
|
||||
fieldName: 'createTime',
|
||||
label: '创建时间',
|
||||
|
|
|
|||
|
|
@ -333,10 +333,12 @@ export function useGridColumns<T = SystemUserApi.User>(
|
|||
code: 'edit',
|
||||
show: hasAccessByCodes(['system:user:update']),
|
||||
},
|
||||
// TODO @xingyu：删除一直弹出来
|
||||
{
|
||||
code: 'delete',
|
||||
show: hasAccessByCodes(['system:user:delete']),
|
||||
},
|
||||
// TODO @xingyu：后面的按钮，无法展示
|
||||
{
|
||||
code: 'assign-role',
|
||||
text: '分配角色',
|
||||
|
|
|
|||
|
|
@ -49,6 +49,7 @@ onMounted(async () => {
|
|||
loading.value = false;
|
||||
}
|
||||
});
|
||||
// TODO @xingyu：数据没展示
|
||||
</script>
|
||||
|
||||
<template>
|
||||
|
|
|
|||
Loading…
Reference in New Issue