紧急修复了一些bug

This commit is contained in:
张乐
2020-08-17 15:28:28 +08:00
parent f85cfc7ce6
commit ec489d879d
122 changed files with 1235 additions and 3297 deletions

View File

@@ -498,6 +498,7 @@ export const selectComponents = [
__slot__: {
'list-type': true
},
accept: '',
// headers: { 'Authori-zation': getToken() },
// data: { model: 'product', pid: 0 },
// action: SettingMer.apiBaseURL + 'admin/upload/image?model=product&pid=0',
@@ -520,22 +521,22 @@ export const selectComponents = [
required: true,
span: 24,
showTip: false,
buttonText: '点击上传',
buttonText: '',
regList: [],
changeTag: true,
fileSize: 2,
sizeUnit: 'MB',
// fileSize: 2,
// sizeUnit: 'MB',
document: 'https://element.eleme.cn/#/zh-CN/component/upload'
},
__slot__: {
'list-type': true
},
action: 'https://jsonplaceholder.typicode.com/posts/',
// action: 'https://jsonplaceholder.typicode.com/posts/',
disabled: true,
accept: '',
accept: 'image',
name: 'file',
'auto-upload': true,
'list-type': 'text',
// 'auto-upload': true,
// 'list-type': 'text',
multiple: false
},
{

View File

@@ -219,14 +219,16 @@
<el-form-item v-if="activeData.name !== undefined" label="文件字段名">
<el-input v-model="activeData.name" placeholder="请输入上传文件字段名" />
</el-form-item>
<el-form-item v-if="activeData.accept !== undefined" label="文件类型">
<el-form-item v-if="activeData.accept === 'image'" label="文件类型">
<span>图片</span>
</el-form-item>
<el-form-item v-if="activeData.accept !== undefined && activeData.accept !== 'image'" label="文件类型">
<el-select
v-model="activeData.accept"
placeholder="请选择文件类型"
:style="{ width: '100%' }"
clearable
>
<el-option label="图片" value="image/*" />
<el-option label="视频" value="video/*" />
<el-option label="音频" value="audio/*" />
<el-option label="excel" value=".xls,.xlsx" />
@@ -619,6 +621,7 @@ import {
inputComponents, selectComponents, layoutComponents
} from '@/components/FormGenerator/components/generator/config'
import { saveFormConf } from '../utils/db'
import Templates from "../../../views/appSetting/wxAccount/wxTemplate/index";
const dateTimeFormat = {
date: 'yyyy-MM-dd',
@@ -633,6 +636,7 @@ const dateTimeFormat = {
export default {
components: {
Templates,
TreeNodeDialog,
IconsDialog
},