!68 修复升级依赖带来的问题

* 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-13 10:35:55 +00:00
parent b06f6a316b
commit f32a7105c3
22 changed files with 172 additions and 203 deletions

View File

@ -18,7 +18,7 @@ const props = withDefaults(defineProps<Props>(), {
isView: false
});
const vFormRef = ref(null);
const vFormRef = ref();
// 获取表单数据-异步
const getFormData = () => {
return vFormRef.value.getFormData();
@ -29,7 +29,7 @@ const getFormData = () => {
* @param {表单配置} formConf
* formConfig{ formTemplate表单模板formData表单数据hiddenField需要隐藏的字段字符串集合disabledField需要禁用的自读字符串集合}
*/
const initForm = (formConf) => {
const initForm = (formConf: any) => {
const { formTemplate, formData, hiddenField, disabledField } = toRaw(formConf);
if (formTemplate) {
vFormRef.value.setFormJson(formTemplate);

View File

@ -1,5 +1,5 @@
<template>
<div class="relative" :style="{ width: width }">
<div class="relative" :style="{ 'width': width }">
<el-input v-model="modelValue" readonly placeholder="点击选择图标" @click="visible = !visible">
<template #prepend>
<svg-icon :icon-class="modelValue" />

View File

@ -37,7 +37,7 @@ const realSrcList = computed(() => {
}
let real_src_list = props.src.split(',');
let srcList: string[] = [];
real_src_list.forEach((item) => {
real_src_list.forEach((item: string) => {
return srcList.push(item);
});
return srcList;

View File

@ -27,7 +27,7 @@ const sizeOptions = ref([
{ label: '稍小', value: 'small' }
]);
const handleSetSize = (size: string) => {
const handleSetSize = (size: 'large' | 'default' | 'small') => {
appStore.setSize(size);
};
</script>