diff --git a/web/.env.development b/web/.env.development index 60c9086..f7bcb53 100644 --- a/web/.env.development +++ b/web/.env.development @@ -3,6 +3,7 @@ ENV = 'development' # 本地环境接口地址 VITE_API_URL = 'https://demo.dvadmin.com/api' +#VITE_API_URL = 'http://192.168.1.160:8000' # 是否启用按钮权限 VITE_PM_ENABLED = true diff --git a/web/src/assets/style/reset.scss b/web/src/assets/style/reset.scss new file mode 100644 index 0000000..634f4b7 --- /dev/null +++ b/web/src/assets/style/reset.scss @@ -0,0 +1,9 @@ +.fs-crud-container { + .el-table thead { + color: #606266; + } + .el-input__inner::placeholder { + color: #dcdfe6; + font-size: 12px; + } +} diff --git a/web/src/main.ts b/web/src/main.ts index 28d3475..2129246 100644 --- a/web/src/main.ts +++ b/web/src/main.ts @@ -30,7 +30,9 @@ import { scanAndInstallPlugins } from '/@/views/plugins/index'; import VXETable from 'vxe-table' import 'vxe-table/lib/style.css' +import '/@/assets/style/reset.scss'; import 'element-tree-line/dist/style.css' + let forIconfont = analyzingIconForIconfont(iconfont); //解析class iconList.addIcon(forIconfont.list); // 添加iconfont dvadmin3的icon iconList.addIcon(elementPlus); // 添加element plus的图标 diff --git a/web/src/views/system/menu/components/menuButton/crud.tsx b/web/src/views/system/menu/components/menuButton/crud.tsx index c8d2ec8..512952c 100644 --- a/web/src/views/system/menu/components/menuButton/crud.tsx +++ b/web/src/views/system/menu/components/menuButton/crud.tsx @@ -1,27 +1,23 @@ import { - CrudOptions, AddReq, DelReq, EditReq, dict, - CrudExpose, CreateCrudOptionsRet, CreateCrudOptionsProps, UserPageQuery, } from '@fast-crud/fast-crud'; -import _ from 'lodash-es'; import * as api from './api'; import { request } from '/@/utils/service'; //此处为crudOptions配置 export const createCrudOptions = function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet { const pageRequest = async (query: UserPageQuery) => { - if(context!.selectOptions.value.id){ + if (context!.selectOptions.value.id) { return await api.GetList({ menu: context!.selectOptions.value.id } as any); - }else{ - return undefined + } else { + return undefined; } - }; const editRequest = async ({ form, row }: EditReq) => { return await api.UpdateObj({ ...form, menu: row.menu }); @@ -35,15 +31,15 @@ export const createCrudOptions = function ({ crudExpose, context }: CreateCrudOp return { crudOptions: { search: { - container: { - action: { - //按钮栏配置 - col: { - span: 8 - } - } - }, - }, + container: { + action: { + //按钮栏配置 + col: { + span: 8, + }, + }, + }, + }, rowHandle: { //固定右侧 fixed: 'right', @@ -53,12 +49,12 @@ export const createCrudOptions = function ({ crudExpose, context }: CreateCrudOp show: false, }, edit: { - iconRight: 'Edit', - type: 'text', + icon: '', + type: 'primary', }, remove: { - iconRight: 'Delete', - type: 'text', + icon: '', + type: 'primary', }, }, }, diff --git a/web/src/views/system/menu/index.vue b/web/src/views/system/menu/index.vue index 47c1c09..96203c8 100644 --- a/web/src/views/system/menu/index.vue +++ b/web/src/views/system/menu/index.vue @@ -3,25 +3,27 @@ - - -