diff --git a/src/modules/base/views/user/index.vue b/src/modules/base/views/user/index.vue index 4bfdb33..835beb2 100644 --- a/src/modules/base/views/user/index.vue +++ b/src/modules/base/views/user/index.vue @@ -98,23 +98,23 @@ const Table = useTable({ { prop: 'name', label: '姓名', - minWidth: 150 + minWidth: 120 }, { prop: 'nickName', label: '昵称', - minWidth: 150 + minWidth: 120 }, { prop: 'departmentName', label: '部门名称', - minWidth: 150 + minWidth: 120 }, { prop: 'roleName', label: '角色', headerAlign: 'center', - minWidth: 150, + minWidth: 160, dict: [], formatter(row) { return row.roleName?.split(','); @@ -123,7 +123,7 @@ const Table = useTable({ { prop: 'status', label: '状态', - minWidth: 120, + minWidth: 100, component: { name: 'cl-switch' } @@ -131,12 +131,13 @@ const Table = useTable({ { prop: 'phone', label: '手机号码', - minWidth: 150 + minWidth: 120 }, { prop: 'remark', label: '备注', - minWidth: 150 + minWidth: 200, + showOverflowTooltip: true }, { prop: 'createTime', diff --git a/src/plugins/crud/components/render/index.tsx b/src/plugins/crud/components/render/index.tsx index 95248a1..e52626e 100644 --- a/src/plugins/crud/components/render/index.tsx +++ b/src/plugins/crud/components/render/index.tsx @@ -1,17 +1,13 @@ import { defineComponent, } from 'vue'; +import { CrudProps } from '../..'; export default defineComponent({ name: 'cl-render', props: { + ...CrudProps, modelValue: null, - scope: Object, - prop: String, - disabled: Boolean, - isDisabled: Boolean, - row: Object, - column: Object, - placeholder: String + placeholder: String, }, setup(props, { slots, }) { diff --git a/src/plugins/crud/index.ts b/src/plugins/crud/index.ts new file mode 100644 index 0000000..3d83464 --- /dev/null +++ b/src/plugins/crud/index.ts @@ -0,0 +1,10 @@ +export const CrudProps = { + prop: String, // Key + column: Object, // 列数据 + row: Object, // 行数据 + index: Number, // 行索引 + scope: Object, // 表单作用域 + disabled: Boolean, // 是否禁用 + isEdit: Boolean, // 是否编辑 + isDisabled: Boolean // 是否禁用 +}; diff --git a/src/plugins/editor-preview/components/preview.vue b/src/plugins/editor-preview/components/preview.vue index 5a20184..4e30062 100644 --- a/src/plugins/editor-preview/components/preview.vue +++ b/src/plugins/editor-preview/components/preview.vue @@ -10,7 +10,6 @@ :title="title" :scrollbar="isScroll" append-to-body - v-bind="$attrs" >