!69 修复升级依赖带来的类型问题

* fix 修复变量问题
* Merge remote-tracking branch 'origin/dev' into dev
* update 依赖升级
* update 依赖升级
* Merge remote-tracking branch 'origin/dev' into dev
* 升级依赖
* Merge remote-tracking branch 'origin/ts' into ts
* 升级依赖
* Merge branch 'dev' of gitee.com:JavaLionLi/plus-ui into ts
* 升级依赖
* !61 fix: 删除重复环境变量ElUploadInstance
* fix: 删除重复环境变量ElUploadInstance
This commit is contained in:
ahaos
2023-12-14 08:17:12 +00:00
parent 031d83828a
commit 1d5133b695
37 changed files with 124 additions and 125 deletions

View File

@ -33,9 +33,9 @@ const isDashboard = (route: RouteLocationMatched) => {
}
return name.trim() === 'Index';
};
const handleLink = (item: RouteLocationMatched) => {
const handleLink = (item) => {
const { redirect, path } = item;
redirect ? router.push(redirect as string) : router.push(path);
redirect ? router.push(redirect) : router.push(path);
};
watchEffect(() => {

View File

@ -27,11 +27,14 @@
</template>
<script setup lang="ts">
import { QuillEditor, Quill } from '@vueup/vue-quill';
import '@vueup/vue-quill/dist/vue-quill.snow.css';
import { QuillEditor, Quill } from '@vueup/vue-quill';
import { propTypes } from '@/utils/propTypes';
import { globalHeaders } from '@/utils/request';
defineEmits(['update:modelValue']);
const props = defineProps({
/* 编辑器的内容 */
modelValue: propTypes.string,
@ -55,7 +58,7 @@ const upload = reactive<UploadOption>({
});
const quillEditorRef = ref();
const options = ref({
const options = ref<any>({
theme: 'snow',
bounds: document.body,
debug: 'warn',

View File

@ -48,7 +48,10 @@ import { propTypes } from '@/utils/propTypes';
import { globalHeaders } from '@/utils/request';
const props = defineProps({
modelValue: [String, Object, Array],
modelValue: {
type: [String, Object, Array],
default: () => []
},
// 数量限制
limit: propTypes.number.def(5),
// 大小限制(MB)
@ -79,11 +82,11 @@ watch(
if (val) {
let temp = 1;
// 首先将值转为数组
let list = [];
let list: any[] = [];
if (Array.isArray(val)) {
list = val;
} else {
const res = await listByIds(val as string);
const res = await listByIds(val);
list = res.data.map((oss) => {
const data = {
name: oss.originalName,

View File

@ -33,7 +33,7 @@ const realSrc = computed(() => {
const realSrcList = computed(() => {
if (!props.src) {
return;
return [];
}
let real_src_list = props.src.split(',');
let srcList: string[] = [];

View File

@ -46,7 +46,10 @@ import { propTypes } from '@/utils/propTypes';
import { globalHeaders } from '@/utils/request';
const props = defineProps({
modelValue: [String, Object, Array],
modelValue: {
type: [String, Object, Array],
default: () => []
},
// 图片数量限制
limit: propTypes.number.def(5),
// 大小限制(MB)