diff --git a/.env.development b/.env.development index 8eeb86d..b383a88 100644 --- a/.env.development +++ b/.env.development @@ -5,5 +5,5 @@ VUE_APP_TITLE=企业级后台管理系统dev # 启用权限管理 VUE_APP_PM_ENABLED = true # 后端接口地址及端口(域名) -VUE_APP_API = "https://x--mo.com:8888/admin" +VUE_APP_API = "https://app.gter.net/admin" diff --git a/src/config/button.js b/src/config/button.js index 2cde397..e07ea67 100644 --- a/src/config/button.js +++ b/src/config/button.js @@ -22,10 +22,8 @@ export function getButtonSettings (objectSettings) { // v2.0.2 中已弃用,改为 vm.dictionary('button_status_bool') // 启用 true/ 禁用 false export const BUTTON_STATUS_BOOL = getButtonSettings([{ label: '启用', value: true }, { label: '禁用', value: false }]) - // 启用 1/ 禁用 0 export const BUTTON_STATUS_NUMBER = getButtonSettings([{ label: '启用', value: 1 }, { label: '禁用', value: 0 }]) - // 是 1/ 否 0 export const BUTTON_WHETHER_NUMBER = getButtonSettings([{ label: '是', value: 1 }, { label: '否', value: 0 }]) // 是 true/ 否 false diff --git a/src/config/d2p-extends/types.js b/src/config/d2p-extends/types.js index 38224e6..c052b87 100644 --- a/src/config/d2p-extends/types.js +++ b/src/config/d2p-extends/types.js @@ -121,7 +121,14 @@ export default { component: { name: 'd2p-images-format' }, align: 'center', view: { - component: { props: { height: 100, width: 100 } } + component: { + props: { height: 100, width: 100 }, + slots:{ //scoped插槽jsx + default:(h,scope)=>{ //默认的scoped插槽 + return ('
{scope.data}
') + } + }, + } }, // 提交时,处理数据 valueResolve (row, col) { diff --git a/src/views/system/user/crud.js b/src/views/system/user/crud.js index 0ddcffa..04d0509 100644 --- a/src/views/system/user/crud.js +++ b/src/views/system/user/crud.js @@ -60,12 +60,20 @@ export const crudOptions = (vm) => { formOptions: { defaultSpan: 12 // 默认的表单 span }, - indexRow: { // 或者直接传true,不显示title,不居中 - title: '序号', - align: 'center', - width: 60 - }, + // indexRow: { // 或者直接传true,不显示title,不居中 + // title: '序号', + // align: 'center', + // width: 60 + // }, columns: [ + { + title: 'UID', + align: 'center', + key: 'uid', + form: { + disabled: true + } + }, { title: '关键词', key: 'search', @@ -85,11 +93,23 @@ export const crudOptions = (vm) => { } }, { - title: 'ID', - key: 'id', - disabled: true, + title: '头像', + key: 'avatar', + type: 'avatar-cropper', + width: 60, + align: 'center', form: { - disabled: true + component: { + props: { + elProps: { // 与el-uploader 配置一致 + multiple: false, + limit: 1 // 限制5个文件 + }, + sizeLimit: 500 * 1024 // 不能超过限制 + }, + span: 24 + }, + helper: '限制文件大小不能超过500k' } }, { @@ -366,26 +386,6 @@ export const crudOptions = (vm) => { } } }, - { - title: '头像', - key: 'avatar', - type: 'avatar-cropper', - width: 60, - align: 'center', - form: { - component: { - props: { - elProps: { // 与el-uploader 配置一致 - multiple: false, - limit: 1 // 限制5个文件 - }, - sizeLimit: 500 * 1024 // 不能超过限制 - }, - span: 24 - }, - helper: '限制文件大小不能超过500k' - } - } ].concat(vm.commonEndColumns({ create_datetime: { showTable: false }, update_datetime: { showTable: false }