Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev
This commit is contained in:
JiangQiming
commit
af4752e349
|
|
@ -91,8 +91,6 @@ const getLevelLabel = (id: number) => {
|
|||
.label {
|
||||
background-color: #fafafa;
|
||||
}
|
||||
.value {
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
<div class="basis-container">
|
||||
<j-form
|
||||
layout="vertical"
|
||||
ref="formBasicRef"
|
||||
ref="formRef"
|
||||
:rules="rulesFrom"
|
||||
:model="formValue"
|
||||
>
|
||||
|
|
@ -73,9 +73,7 @@
|
|||
@change="
|
||||
uploader.handleChangeLogo
|
||||
"
|
||||
:accept="
|
||||
uploader.imageTypes.toString()
|
||||
"
|
||||
:accept="uploader.imageTypes"
|
||||
>
|
||||
<div
|
||||
class="upload-image-content-logo"
|
||||
|
|
@ -130,7 +128,9 @@
|
|||
<div class="upload-tips">
|
||||
推荐尺寸200*200
|
||||
</div>
|
||||
<div class="upload-tips">支持jpg,png</div>
|
||||
<div class="upload-tips">
|
||||
支持jpg,png,jfif,pjp,pjpeg,jpeg
|
||||
</div>
|
||||
</j-form-item>
|
||||
</j-col>
|
||||
<j-col>
|
||||
|
|
@ -163,9 +163,7 @@
|
|||
@change="
|
||||
uploader.changeIconUpload
|
||||
"
|
||||
:accept="
|
||||
uploader.imageTypes.toString()
|
||||
"
|
||||
:accept="uploader.iconTypes"
|
||||
>
|
||||
<div
|
||||
class="upload-image-content-logo"
|
||||
|
|
@ -224,7 +222,7 @@
|
|||
"
|
||||
:showUploadList="false"
|
||||
@change="uploader.changeBackUpload"
|
||||
:accept="uploader.imageTypes.toString()"
|
||||
:accept="uploader.imageTypes"
|
||||
>
|
||||
<div class="upload-image-content-back">
|
||||
<div
|
||||
|
|
@ -260,7 +258,8 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="upload-tips">
|
||||
支持4M以内的图片:支持jpg、png
|
||||
支持4M以内的图片:
|
||||
支持jpg,png,jfif,pjp,pjpeg,jpeg
|
||||
</div>
|
||||
<div class="upload-tips">建议尺寸1400x1080</div>
|
||||
</j-form-item>
|
||||
|
|
@ -294,9 +293,9 @@ import { LocalStore } from '@/utils/comm';
|
|||
import { save_api, getDetails_api } from '@/api/system/basis';
|
||||
import { usePermissionStore } from '@/store/permission';
|
||||
|
||||
const action = ref<string>(`${BASE_API_PATH}/file/static`);
|
||||
const headers = ref({ [TOKEN_KEY]: LocalStore.get(TOKEN_KEY) });
|
||||
const formBasicRef = ref();
|
||||
const action = `${BASE_API_PATH}/file/static`;
|
||||
const headers = { [TOKEN_KEY]: LocalStore.get(TOKEN_KEY) };
|
||||
const formRef = ref();
|
||||
const form = reactive<formType>({
|
||||
formValue: {
|
||||
title: '',
|
||||
|
|
@ -312,17 +311,11 @@ const form = reactive<formType>({
|
|||
{
|
||||
required: true,
|
||||
message: '名称必填',
|
||||
trigger: 'blur',
|
||||
},
|
||||
{
|
||||
max: 64,
|
||||
message: '最多可输入64个字符',
|
||||
},
|
||||
{
|
||||
max: 64,
|
||||
message: '最多可输入64个字符',
|
||||
trigger: 'blur',
|
||||
},
|
||||
],
|
||||
headerTheme: [
|
||||
{
|
||||
|
|
@ -346,8 +339,6 @@ const form = reactive<formType>({
|
|||
getDetails: () => {
|
||||
const params = ['front', 'amap', 'paths'];
|
||||
getDetails_api(params).then((resp: any) => {
|
||||
console.log(resp);
|
||||
|
||||
const basis = resp.result?.filter(
|
||||
(item: any) => item.scope === 'front',
|
||||
);
|
||||
|
|
@ -357,8 +348,6 @@ const form = reactive<formType>({
|
|||
const basePath = resp.result?.filter(
|
||||
(item: any) => item.scope === 'paths',
|
||||
);
|
||||
console.log();
|
||||
|
||||
form.formValue = {
|
||||
...basis[0].properties,
|
||||
apiKey: api[0].properties.apiKey,
|
||||
|
|
@ -377,7 +366,7 @@ const form = reactive<formType>({
|
|||
clickSave: () => {
|
||||
const hasPermission = usePermissionStore().hasPermission;
|
||||
if (hasPermission(`system/Basis:update`)) {
|
||||
formBasicRef.value.validate().then(() => {
|
||||
formRef.value.validate().then(() => {
|
||||
form.saveLoading = true;
|
||||
const params = [
|
||||
{
|
||||
|
|
@ -419,7 +408,14 @@ const form = reactive<formType>({
|
|||
const { formValue, rulesFrom } = toRefs(form);
|
||||
|
||||
const uploader: uploaderType = {
|
||||
imageTypes: ['jpg', 'jpeg', 'png', 'jfif', 'pjp', 'pjpeg'],
|
||||
imageTypes: [
|
||||
'image/jpg',
|
||||
'image/jpeg',
|
||||
'image/png',
|
||||
'image/jfif',
|
||||
'image/pjp',
|
||||
'image/pjpeg',
|
||||
],
|
||||
iconTypes: ['image/x-icon'],
|
||||
// logo格式校验
|
||||
beforeLogoUpload: ({ size, type }: File) => {
|
||||
|
|
@ -427,7 +423,6 @@ const uploader: uploaderType = {
|
|||
uploader.imageTypes.filter((typeStr) => type.includes(typeStr))
|
||||
.length > 0;
|
||||
const sizeBool = size / 1024 / 1024 < 4;
|
||||
|
||||
if (!typeBool) {
|
||||
message.error(`请上传.jpg.png.jfif.pjp.pjpeg.jpeg格式的图片`);
|
||||
} else if (!sizeBool) {
|
||||
|
|
|
|||
|
|
@ -38,7 +38,11 @@
|
|||
:tooltip="{
|
||||
title: '编辑',
|
||||
}"
|
||||
@click="table.clickEdit(slotProps)"
|
||||
@click="
|
||||
jumpPage(`system/Role/Detail`, {
|
||||
id: slotProps.id,
|
||||
})
|
||||
"
|
||||
>
|
||||
<AIcon type="EditOutlined" />
|
||||
</PermissionButton>
|
||||
|
|
@ -48,7 +52,7 @@
|
|||
:tooltip="{ title: '删除' }"
|
||||
:popConfirm="{
|
||||
title: `确定要删除吗`,
|
||||
onConfirm: () => table.clickDel(slotProps),
|
||||
onConfirm: () => clickDel(slotProps),
|
||||
}"
|
||||
>
|
||||
<AIcon type="DeleteOutlined" />
|
||||
|
|
@ -72,7 +76,6 @@ import { useMenuStore } from '@/store/menu';
|
|||
const permission = 'system/Role';
|
||||
const { jumpPage } = useMenuStore();
|
||||
|
||||
const addDialogRef = ref(); // 新增弹窗实例
|
||||
const isSave = !!useRoute().query.save;
|
||||
|
||||
const columns = [
|
||||
|
|
@ -115,22 +118,14 @@ const columns = [
|
|||
];
|
||||
const queryParams = ref({});
|
||||
// 表格
|
||||
const tableRef = ref<Record<string, any>>({});
|
||||
const table = {
|
||||
clickAdd: () => {
|
||||
addDialogRef.value.openDialog(true, {});
|
||||
},
|
||||
clickDel: (row: any) => {
|
||||
delRole_api(row.id).then((resp: any) => {
|
||||
if (resp.status === 200) {
|
||||
tableRef.value?.reload();
|
||||
message.success('操作成功!');
|
||||
}
|
||||
});
|
||||
},
|
||||
clickEdit: ({ id }: { id: string }) => {
|
||||
jumpPage(`system/Role/Detail`, { id });
|
||||
},
|
||||
const tableRef = ref<Record<string, any>>();
|
||||
const clickDel = (row: any) => {
|
||||
delRole_api(row.id).then((resp: any) => {
|
||||
if (resp.status === 200) {
|
||||
tableRef.value?.reload();
|
||||
message.success('操作成功!');
|
||||
}
|
||||
});
|
||||
};
|
||||
const dialogVisible = ref(isSave);
|
||||
</script>
|
||||
|
|
|
|||
Loading…
Reference in New Issue