b2894lxlx/guofu-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增：css样式支持

Browse Source
This commit is contained in:
赵忠林
2024-08-30 17:51:56 +08:00
parent ecf88b04fd
commit 41ad9a474e
33 changed files with 1458 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/views/cms/article/components/search.vue
View File

@@ -22,17 +22,26 @@
allow-clear
:tree-data="navigationList"
tree-default-expand-all
style="width: 230px"
style="width: 280px"
placeholder="请选择栏目"
:value="where.categoryId || undefined"
:dropdown-style="{ maxHeight: '360px', overflow: 'auto' }"
@update:value="(value?: number) => (where.categoryId = value)"
@change="onCategoryId"
/>
<ChooseDictionary
v-if="showChooseDict"
dict-code="NavigationModel"
:placeholder="`选择模型`"
style="width: 120px"
v-model:value="where.model"
@done="chooseModel"
/>
<a-input-search
allow-clear
placeholder="请输入关键词"
v-model:value="where.keywords"
style="width: 280px"
v-model:value="where.userId"
@pressEnter="reload"
@search="reload"
/>
@@ -62,15 +71,18 @@
const type = ref<string>();
// 统计数据
const articleCount = ref<ArticleCount>();
const showChooseDict = ref<boolean>(false);
// 表单数据
const { where, resetFields } = useSearch<ArticleParam>({
articleId: undefined,
model: undefined,
navigationId: undefined,
categoryId: undefined,
merchantId: undefined,
status: undefined,
keywords: ''
keywords: '',
userId: undefined
});
const emit = defineEmits<{
@@ -107,6 +119,13 @@
emit('search', where);
};
// 按模型查找
const chooseModel = (item: Navigation) => {
where.model = `${item.value}`;
where.modelName = `${item.label}`;
emit('search', where);
};
// 按分类查询
const onCategoryId = (id: number) => {
where.categoryId = id;

2
src/views/cms/article/index.vue
View File

@@ -317,7 +317,7 @@
data: res?.map((d) => {
d.value = d.navigationId;
d.label = d.title;
if (d.type != 2) {
if (d.model == 'links' || d.model == 'product' || d.path == '/') {
d.disabled = true;
}
return d;

38
src/views/cms/design/components/search.vue
View File

@@ -7,6 +7,18 @@
</template>
<span>添加</span>
</a-button>
<a-tree-select
allow-clear
:tree-data="navigationList"
tree-default-expand-all
style="width: 230px"
placeholder="请选择栏目"
:value="where.categoryId || undefined"
:dropdown-style="{ maxHeight: '360px', overflow: 'auto' }"
@update:value="(value?: number) => (where.categoryId = value)"
@change="onCategoryId"
/>
<a-button @click="reset">重置</a-button>
</a-space>
</template>
@@ -14,11 +26,14 @@
import { PlusOutlined } from '@ant-design/icons-vue';
import type { GradeParam } from '@/api/user/grade/model';
import { watch } from 'vue';
import useSearch from "@/utils/use-search";
import type { ArticleParam } from "@/api/cms/article/model";
const props = withDefaults(
defineProps<{
// 选中的角色
selection?: [];
navigationList?: Navigator[];
}>(),
{}
);
@@ -35,6 +50,29 @@
emit('add');
};
// 表单数据
const { where, resetFields } = useSearch<ArticleParam>({
articleId: undefined,
navigationId: undefined,
categoryId: undefined,
merchantId: undefined,
status: undefined,
keywords: ''
});
// 按分类查询
const onCategoryId = (id: number) => {
where.categoryId = id;
emit('search', where);
};
/* 重置 */
const reset = () => {
resetFields();
type.value = '';
reload();
};
watch(
() => props.selection,
() => {}

27
src/views/cms/design/index.vue
View File

@@ -15,6 +15,7 @@
<search
@search="reload"
:selection="selection"
:navigationList="navigationList"
@add="openEdit"
@remove="removeBatch"
@batchMove="openMove"
@@ -65,7 +66,7 @@
</template>
<script lang="ts" setup>
import { createVNode, ref, watch } from 'vue';
import { createVNode, ref } from 'vue';
import { message, Modal } from 'ant-design-vue';
import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
import type { EleProTable } from 'ele-admin-pro';
@@ -82,8 +83,11 @@
} from '@/api/cms/design';
import type { Design, DesignParam } from '@/api/cms/design/model';
import { useRouter } from 'vue-router';
import { openPreview, openUrl } from "@/utils/common";
import { toTreeData } from 'ele-admin-pro';
import { openUrl } from '@/utils/common';
import { getSiteDomain } from '@/utils/domain';
import { Navigation } from '@/api/cms/navigation/model';
import { listNavigation } from '@/api/cms/navigation';
// 表格实例
const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
@@ -98,6 +102,8 @@
const showMove = ref(false);
// 网站域名
const domain = getSiteDomain();
// 栏目数据
const navigationList = ref<Navigation[]>();
// 加载状态
const loading = ref(true);
@@ -243,6 +249,23 @@
/* 查询 */
const query = () => {
loading.value = true;
// 加载栏目数据
if (!navigationList.value) {
listNavigation({}).then((res) => {
navigationList.value = toTreeData({
data: res?.map((d) => {
d.value = d.navigationId;
d.label = d.title;
if (d.model != 'custom') {
d.disabled = true;
}
return d;
}),
idField: 'navigationId',
parentIdField: 'parentId'
});
});
}
};
/* 自定义行属性 */

45
src/views/cms/field/components/website-field-edit.vue
View File

@@ -1,7 +1,7 @@
<!-- 用户编辑弹窗 -->
<template>
<ele-modal
:width="500"
:width="600"
:visible="visible"
:maskClosable="false"
:title="isUpdate ? '编辑参数' : '添加参数'"
@@ -13,27 +13,23 @@
ref="formRef"
:model="form"
:rules="rules"
:label-col="{ md: { span: 5 }, sm: { span: 4 }, xs: { span: 24 } }"
:label-col="{ md: { span: 3 }, sm: { span: 4 }, xs: { span: 24 } }"
:wrapper-col="{ md: { span: 21 }, sm: { span: 22 }, xs: { span: 24 } }"
>
<a-form-item label="参数名" name="name">
<SelectWebsiteField
:placeholder="`添加参数`"
:placeholder="`可配置参数`"
class="input-item"
v-model:value="form.name"
@done="chooseData"
/>
</a-form-item>
<a-form-item label="配置值" name="value">
<a-input allow-clear placeholder="淘宝网" v-model:value="form.value" />
</a-form-item>
<a-form-item label="图片">
<SelectFile
:placeholder="`请选择图片`"
:limit="1"
:data="images"
@done="chooseImage"
@del="onDeleteItem"
<a-textarea
:rows="4"
:maxlength="200"
placeholder="网站名称"
v-model:value="form.value"
/>
</a-form-item>
<a-form-item label="描述" name="comments">
@@ -44,6 +40,23 @@
v-model:value="form.comments"
/>
</a-form-item>
<a-form-item label="css样式" name="style">
<a-textarea
:rows="4"
:maxlength="200"
placeholder="css样式"
v-model:value="form.style"
/>
</a-form-item>
<a-form-item label="图片">
<SelectFile
:placeholder="`请选择图片`"
:limit="1"
:data="images"
@done="chooseImage"
@del="onDeleteItem"
/>
</a-form-item>
<a-form-item label="排序" name="sortNumber">
<a-input-number
:min="0"
@@ -97,6 +110,7 @@
modifyRange: undefined,
defaultValue: undefined,
comments: '',
style: '',
status: 0,
sortNumber: 100
});
@@ -149,6 +163,13 @@
const chooseData = (data: WebsiteField) => {
assignFields(data);
form.value = data.defaultValue;
if (data.type == 1) {
images.value.push({
uid: `${data.id}`,
url: data.defaultValue,
status: 'done'
});
}
};
/* 保存编辑 */

5
src/views/cms/navigation/components/design-edit.vue
View File

@@ -69,7 +69,7 @@
:rows="4"
:maxlength="200"
placeholder="Tailwind CSS风格"
v-model:value="form.styles"
v-model:value="form.style"
/>
</a-space>
</a-form-item>
@@ -110,7 +110,6 @@ import TinymceEditor from "@/components/TinymceEditor/index.vue";
import useFormData from "@/utils/use-form-data";
import {removeSiteInfoCache} from "@/api/cms/website";
import {FileRecord} from "@/api/system/file/model";
import category from "@/views/cms/category/index.vue";
// 是否是修改
const isUpdate = ref(false);
@@ -155,7 +154,7 @@ const { form, resetFields, assignFields } = useFormData<Design>({
buyUrl: '',
type: '',
categoryId: undefined,
styles: '',
style: '',
status: 0,
comments: '',
sortNumber: 100,

84
src/views/cms/navigation/components/navigation-edit.vue
View File

@@ -22,6 +22,7 @@
<a-col
v-bind="styleResponsive ? { md: 12, sm: 24, xs: 24 } : { span: 12 }"
>
{{ form.parentId }}
<a-form-item label="上级分类" name="parentId">
<a-tree-select
allow-clear
@@ -44,6 +45,7 @@
<a-form-item
:label="form.type == 9 ? '链接地址' : '路由地址'"
name="path"
v-if="isUpdate"
>
<a-input
allow-clear
@@ -54,11 +56,20 @@
@pressEnter="save"
/>
</a-form-item>
<a-form-item label="组件路径" name="component">
<a-form-item label="组件路径" name="component" v-if="isUpdate">
<a-input
allow-clear
placeholder="/pages/[custom].vue"
placeholder="/pages/product/detail.vue"
v-model:value="form.component"
disabled
@pressEnter="save"
/>
</a-form-item>
<a-form-item label="css样式" name="style" v-if="isUpdate">
<a-input
allow-clear
placeholder="Tailwind CSS风格"
v-model:value="form.style"
@pressEnter="save"
/>
</a-form-item>
@@ -82,40 +93,13 @@
@done="chooseModel"
/>
</a-form-item>
<a-form-item label="位置" name="top">
<a-form-item label="位置" name="top" v-if="isUpdate">
<a-radio-group v-model:value="form.position" @change="onPosition">
<a-radio :value="1">顶部</a-radio>
<a-radio :value="2">底部</a-radio>
<a-radio :value="0">不限</a-radio>
</a-radio-group>
</a-form-item>
<a-form-item label="权限" name="">
<a-radio-group v-model:value="form.permission">
<a-radio :value="0">所有人</a-radio>
<a-radio :value="1">登录可见</a-radio>
<a-radio :value="2">密码可见</a-radio>
</a-radio-group>
</a-form-item>
<a-form-item label="允许评论" name="">
<a-space>
<a-switch
checked-children="是"
un-checked-children="否"
:checked="form.hide === 0"
@update:checked="updateHideValue"
/>
</a-space>
</a-form-item>
<a-form-item label="状态" name="hide">
<a-space>
<a-switch
checked-children="显示"
un-checked-children="隐藏"
:checked="form.hide === 0"
@update:checked="updateHideValue"
/>
</a-space>
</a-form-item>
<a-form-item label="排序" name="sortNumber">
<a-input-number
:min="0"
@@ -136,6 +120,31 @@
@del="onDeleteItem"
/>
</a-form-item>
<a-divider style="margin-bottom: 16px" />
<a-form-item label="状态" name="hide">
<a-space>
<a-switch
checked-children="显示"
un-checked-children="隐藏"
:checked="form.hide === 0"
@update:checked="updateHideValue"
/>
</a-space>
</a-form-item>
<a-form-item label="权限" name="permission" v-if="isUpdate">
<a-radio-group v-model:value="form.permission">
<a-radio :value="0">所有人</a-radio>
<a-radio :value="1">登录可见</a-radio>
<a-radio :value="2">密码可见</a-radio>
</a-radio-group>
</a-form-item>
<a-form-item
label="访问密码"
name="password"
v-if="form.permission == 2"
>
<a-tag>{{ form.password }}</a-tag>
</a-form-item>
</a-col>
</a-row>
</a-form>
@@ -154,7 +163,6 @@
import { removeSiteInfoCache } from '@/api/cms/website';
import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
import { FileRecord } from '@/api/system/file/model';
import { uuid } from 'ele-admin-pro';
// 是否开启响应式布局
const themeStore = useThemeStore();
@@ -190,9 +198,9 @@
// 表单数据
const { form, resetFields, assignFields } = useFormData<Navigation>({
navigationId: undefined,
model: '[custom]',
model: 'custom',
code: undefined,
modelName: '',
modelName: '通用模型',
type: 0,
title: '',
parentId: 0,
@@ -200,10 +208,11 @@
parentPath: undefined,
path: undefined,
component: undefined,
componentPath: '/pages/[custom].vue',
sortNumber: 100,
hide: 0,
permission: 0,
password: uuid(),
password: undefined,
position: 1,
top: 0,
bottom: 1,
@@ -304,9 +313,10 @@
});
const chooseModel = (item: Navigation) => {
console.log(item);
form.model = `${item.value}`;
form.modelName = `${item.label}`;
form.component = `/pages/${item.value}`;
form.componentPath = `${item.component}`;
};
const chooseFile = (data: FileRecord) => {
@@ -379,10 +389,12 @@
(visible) => {
if (visible) {
form.position = props.position;
if (props.parentId) {
form.parentId = props.parentId;
}
if (props.data) {
assignFields({
...props.data,
parentId: props.data.parentId ? props.data.parentId : 0,
tempPath: props.data.path
});
if (props.data.type == 2) {

73
src/views/cms/navigation/index.vue
View File

@@ -59,6 +59,9 @@
<span></span>
</template>
</template>
<template v-if="column.key === 'model'">
<text class="ele-text-placeholder">{{ record.modelName }}</text>
</template>
<template v-if="column.key === 'type'">
<a-tag v-if="isExternalLink(record.path)" color="purple"
>外部链接</a-tag
@@ -68,14 +71,7 @@
内链
</a-tag>
<span v-else-if="isDirectory(record)"></span>
<a-tag v-else-if="record.type === 0">通用模型</a-tag>
<a-tag v-else-if="record.type === 1" color="purple">页面</a-tag>
<a-tag v-else-if="record.type === 2" color="blue">文章列表</a-tag>
<a-tag v-else-if="record.type === 3">文章</a-tag>
<a-tag v-else-if="record.type === 4" color="cyan">表单</a-tag>
<a-tag v-else-if="record.type === 5" color="green">文档</a-tag>
<a-tag v-else-if="record.type === 6" color="pink">图片列表</a-tag>
<a-tag v-else-if="record.type === 9" color="purple">外部链接</a-tag>
<a-tag v-else>{{ record.modelName }}</a-tag>
</template>
<template v-else-if="column.key === 'title'">
<a-avatar
@@ -85,9 +81,15 @@
style="margin-right: 10px"
v-if="record.image"
/>
<a @click="openSpmUrl(record.path, record, record.navigationId)">{{
<span class="cursor-pointer" v-if="isDirectory(record)">{{
record.title
}}</a>
}}</span>
<span
v-else
@click="openSpmUrl(record.path, record, record.navigationId)"
class="cursor-pointer"
>{{ record.title }}</span
>
</template>
<template v-if="column.key === 'showIndex'">
<a-tag v-if="record.showIndex === 1" color="green">显示</a-tag>
@@ -186,16 +188,11 @@
import NavigationEdit from './components/navigation-edit.vue';
import DesignEdit from './components/design-edit.vue';
import Components from './components/components.vue';
import {
listNavigation,
removeNavigation,
updateNavigation
} from '@/api/cms/navigation';
import { listNavigation, removeNavigation } from '@/api/cms/navigation';
import type { Navigation, NavigationParam } from '@/api/cms/navigation/model';
import { openSpmUrl } from '@/utils/common';
import { getSiteInfo } from '@/api/layout';
import { Design } from '@/api/cms/design/model';
import router from '@/router';
// 表格实例
const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
@@ -227,8 +224,8 @@
},
{
title: '模型',
dataIndex: 'type',
key: 'type',
dataIndex: 'model',
key: 'model',
align: 'center',
width: 120
},
@@ -319,17 +316,6 @@
return listNavigation({ ...where });
};
// 上移
const moveUp = (row?: Navigation) => {
updateNavigation({
navigationId: row?.navigationId,
sortNumber: Number(row?.sortNumber) - 1
}).then((msg) => {
message.success(msg);
reload();
});
};
/* 数据转为树形结构 */
const parseData = (data: Navigation[]) => {
return toTreeData({
@@ -360,21 +346,20 @@
const openDesign = (row?: Navigation) => {
categoryId.value = row?.navigationId;
// TODO 通用模型
if (row?.model == '[custom]') {
showDesignEdit.value = true;
return;
}
// TODO 文章列表
if (row?.model === 'article') {
router.push({
path: '/cms/article',
query: { categoryId: row.navigationId, type: row.type }
});
}
console.log(row);
// /cms/article
showDesignEdit.value = true;
// // TODO 通用模型
// if (row?.model == 'custom') {
// showDesignEdit.value = true;
// return;
// }
//
// // TODO 文章列表
// if (row?.model === 'article') {
// router.push({
// path: '/cms/article',
// query: { categoryId: row.navigationId, type: row.type }
// });
// }
};
const openLayout = (row?: Navigation) => {

93
src/views/cms/website/components/websiteEdit.vue
View File

@@ -35,6 +35,14 @@
v-model:value="form.websiteName"
/>
</a-form-item>
<a-form-item label="访问地址" name="domain">
<a-input
v-model:value="form.websiteCode"
placeholder="huawei"
addon-before="https://"
addon-after=".wsdns.cn"
/>
</a-form-item>
<a-form-item label="网站描述" name="comments">
<a-textarea
:rows="4"
@@ -51,46 +59,52 @@
v-model:value="form.keywords"
/>
</a-form-item>
<a-form-item label="网站域名" name="domain">
<a-input v-model:value="form.domain" placeholder="domain.com">
<template #addonBefore>
<a-select v-model:value="form.prefix" style="width: 90px">
<a-select-option value="http://">http://</a-select-option>
<a-select-option value="https://">https://</a-select-option>
</a-select>
</template>
</a-input>
</a-form-item>
<a-form-item label="后台管理" name="adminUrl">
<a-input v-model:value="form.adminUrl" placeholder="admin.domain.com">
<template #addonBefore>
<a-select v-model:value="form.prefix" style="width: 90px">
<a-select-option value="http://">http://</a-select-option>
<a-select-option value="https://">https://</a-select-option>
</a-select>
</template>
</a-input>
</a-form-item>
<a-form-item label="ICP备案号" name="icpNo">
<a-input
allow-clear
placeholder="请输入网站备案"
v-model:value="form.icpNo"
<a-form-item label="全局样式" name="style">
<a-textarea
:rows="4"
:maxlength="200"
placeholder="全局样式(Tailwind CSS风格)"
v-model:value="form.style"
/>
</a-form-item>
<a-form-item label="网站类型" name="websiteType">
<a-select
:options="websiteType"
:value="form.websiteType"
placeholder="请选择主体类型"
@change="onWebsiteType"
/>
</a-form-item>
<a-form-item label="当前版本" name="version">
<span v-if="form.version === 10">免费版</span>
<span v-if="form.version === 20">授权版</span>
<span v-if="form.version === 30">永久授权</span>
</a-form-item>
<!-- <a-form-item label="访问域名" name="domain">-->
<!-- <a-input-->
<!-- v-model:value="form.domain"-->
<!-- placeholder="websoft.top"-->
<!-- addon-before="https://"-->
<!-- addon-after="websoft.top"-->
<!-- />-->
<!-- </a-form-item>-->
<!-- <a-form-item label="后台管理" name="adminUrl">-->
<!-- <a-input v-model:value="form.adminUrl" placeholder="admin.domain.com">-->
<!-- <template #addonBefore>-->
<!-- <a-select v-model:value="form.prefix" style="width: 90px">-->
<!-- <a-select-option value="http://">http://</a-select-option>-->
<!-- <a-select-option value="https://">https://</a-select-option>-->
<!-- </a-select>-->
<!-- </template>-->
<!-- </a-input>-->
<!-- </a-form-item>-->
<!-- <a-form-item label="ICP备案号" name="icpNo">-->
<!-- <a-input-->
<!-- allow-clear-->
<!-- placeholder="请输入网站备案"-->
<!-- v-model:value="form.icpNo"-->
<!-- />-->
<!-- </a-form-item>-->
<!-- <a-form-item label="网站类型" name="websiteType">-->
<!-- <a-select-->
<!-- :options="websiteType"-->
<!-- :value="form.websiteType"-->
<!-- placeholder="请选择主体类型"-->
<!-- @change="onWebsiteType"-->
<!-- />-->
<!-- </a-form-item>-->
<!-- <a-form-item label="当前版本" name="version">-->
<!-- <a-tag color="red" v-if="form.version === 10">免费版</a-tag>-->
<!-- <a-tag color="green" v-if="form.version === 20">授权版</a-tag>-->
<!-- <a-tag color="cyan" v-if="form.version === 30">永久授权</a-tag>-->
<!-- </a-form-item>-->
<a-form-item label="状态" name="status">
<a-radio-group
v-model:value="form.status"
@@ -109,6 +123,7 @@
v-model:value="form.statusText"
/>
</a-form-item>
<!-- <a-divider style="margin-bottom: 24px" />-->
</a-form>
</ele-modal>
</template>
@@ -158,10 +173,12 @@
websiteId: undefined,
websiteLogo: undefined,
websiteName: undefined,
websiteCode: undefined,
keywords: '',
prefix: '',
domain: '',
adminUrl: '',
style: '',
icpNo: undefined,
email: undefined,
version: undefined,

19
src/views/cms/website/index.vue
View File

@@ -28,9 +28,16 @@
<template v-if="column.key === 'domain'">
<a-button
type="link"
@click="openUrl(`${record.prefix}${record.domain}`)"
>{{ record.domain }}</a-button
@click="
openSpmUrl(
`https://${record.websiteCode}.wsdns.cn`,
record,
record.websiteId
)
"
>
{{ record.websiteCode }}.wsdns.cn
</a-button>
</template>
<template v-if="column.key === 'type'">
<a-tag v-if="record.type === 1" color="green">是</a-tag>
@@ -42,9 +49,9 @@
>
</template>
<template v-if="column.key === 'version'">
<a-tag v-if="record.version === 10">免费版</a-tag>
<a-tag v-if="record.version === 20">授权版</a-tag>
<a-tag v-if="record.version === 30">永久授权</a-tag>
<text v-if="record.version === 10">免费版</text>
<text v-if="record.version === 20">授权版</text>
<text v-if="record.version === 30">永久授权</text>
</template>
<template v-if="column.key === 'status'">
<a-tag v-if="record.status === 0" color="red">未开通</a-tag>
@@ -88,7 +95,7 @@
updateWebsite
} from '@/api/cms/website';
import type { Website, WebsiteParam } from '@/api/cms/website/model';
import { openPreview, openUrl } from '@/utils/common';
import { openPreview, openSpmUrl, openUrl } from '@/utils/common';
import { getSiteDomain } from '@/utils/domain';
// 表格实例