mirror of
https://github.com/vform666/variant-form3-vite.git
synced 2025-06-21 17:39:57 +08:00
2022.01.29，修复部分bug，准备发布3.0正式版。
This commit is contained in:
vdpAdmin
@ -2,7 +2,7 @@
|
||||
<static-content-wrapper :designer="designer" :field="field" :design-state="designState"
|
||||
:parent-widget="parentWidget" :parent-list="parentList" :index-of-parent-list="indexOfParentList"
|
||||
:sub-form-row-index="subFormRowIndex" :sub-form-col-index="subFormColIndex" :sub-form-row-id="subFormRowId">
|
||||
<el-button ref="fieldEditor" :type="field.options.type" :size="field.options.size"
|
||||
<el-button ref="fieldEditor" :type="field.options.type" :size="widgetSize"
|
||||
:plain="field.options.plain" :round="field.options.round"
|
||||
:circle="field.options.circle" :icon="field.options.icon"
|
||||
:disabled="field.options.disabled"
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<div class="full-width-input">
|
||||
<el-cascader ref="fieldEditor" :options="field.options.optionItems" v-model="fieldModel"
|
||||
:disabled="field.options.disabled"
|
||||
:size="field.options.size"
|
||||
:size="widgetSize"
|
||||
:clearable="field.options.clearable"
|
||||
:filterable="field.options.filterable"
|
||||
:placeholder="field.options.placeholder || i18nt('render.hint.selectPlaceholder')"
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
:parent-widget="parentWidget" :parent-list="parentList" :index-of-parent-list="indexOfParentList"
|
||||
:sub-form-row-index="subFormRowIndex" :sub-form-col-index="subFormColIndex" :sub-form-row-id="subFormRowId">
|
||||
<el-checkbox-group ref="fieldEditor" v-model="fieldModel"
|
||||
:disabled="field.options.disabled" :size="field.options.size"
|
||||
:disabled="field.options.disabled" :size="widgetSize"
|
||||
@change="handleChangeEvent">
|
||||
<template v-if="!!field.options.buttonStyle">
|
||||
<el-checkbox-button v-for="(item, index) in field.options.optionItems" :key="index" :label="item.value"
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
:parent-widget="parentWidget" :parent-list="parentList" :index-of-parent-list="indexOfParentList"
|
||||
:sub-form-row-index="subFormRowIndex" :sub-form-col-index="subFormColIndex" :sub-form-row-id="subFormRowId">
|
||||
<el-color-picker ref="fieldEditor" v-model="fieldModel"
|
||||
:size="field.options.size"
|
||||
:size="widgetSize"
|
||||
:disabled="field.options.disabled"
|
||||
@change="handleChangeEvent">
|
||||
</el-color-picker>
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<div :class="[!!field.options.autoFullWidth ? 'auto-full-width' : '']">
|
||||
<el-date-picker ref="fieldEditor" :type="field.options.type" v-model="fieldModel"
|
||||
:disabled="field.options.disabled" :readonly="field.options.readonly"
|
||||
:size="field.options.size"
|
||||
:size="widgetSize"
|
||||
:clearable="field.options.clearable" :editable="field.options.editable"
|
||||
:format="field.options.format" :value-format="field.options.valueFormat"
|
||||
:start-placeholder="field.options.startPlaceholder || i18nt('render.hint.startDatePlaceholder')"
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<el-date-picker ref="fieldEditor" :type="field.options.type" v-model="fieldModel"
|
||||
:class="[!!field.options.autoFullWidth ? 'auto-full-width' : '']"
|
||||
:readonly="field.options.readonly" :disabled="field.options.disabled"
|
||||
:size="field.options.size"
|
||||
:size="widgetSize"
|
||||
:clearable="field.options.clearable" :editable="field.options.editable"
|
||||
:format="field.options.format" :value-format="field.options.valueFormat"
|
||||
:placeholder="field.options.placeholder || i18nt('render.hint.datePlaceholder')"
|
||||
|
||||
@ -312,7 +312,6 @@ export default {
|
||||
//eventBus.$emit('field-value-changed', [newValue, oldValue]) //此处应该加事件触发组件判断，非本组件（其他组件）触发的事件应该跳过，否则会出现事件无限循环！！
|
||||
|
||||
this.emit$('field-value-changed', [newValue, oldValue])
|
||||
console.log('test', 'ccccccccc')
|
||||
|
||||
// /* 必须用dispatch向指定父组件派发消息！！ */
|
||||
this.dispatch('VFormRender', 'fieldChange',
|
||||
@ -377,9 +376,6 @@ export default {
|
||||
},
|
||||
|
||||
handleOnChange(val, oldVal) { //自定义onChange事件
|
||||
console.log('test', 'aaaaaaaaa')
|
||||
//debugger
|
||||
|
||||
if (!!this.field.options.onChange) {
|
||||
let changeFn = new Function('value', 'oldValue', this.field.options.onChange)
|
||||
changeFn.call(this, val, oldVal)
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
:sub-form-row-index="subFormRowIndex" :sub-form-col-index="subFormColIndex" :sub-form-row-id="subFormRowId">
|
||||
<el-input ref="fieldEditor" v-model="fieldModel"
|
||||
:disabled="field.options.disabled" :readonly="field.options.readonly"
|
||||
:size="field.options.size" class="hide-spin-button"
|
||||
:size="widgetSize" class="hide-spin-button"
|
||||
:type="inputType"
|
||||
:show-password="field.options.showPassword"
|
||||
:placeholder="field.options.placeholder"
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
:parent-widget="parentWidget" :parent-list="parentList" :index-of-parent-list="indexOfParentList"
|
||||
:sub-form-row-index="subFormRowIndex" :sub-form-col-index="subFormColIndex" :sub-form-row-id="subFormRowId">
|
||||
<el-radio-group ref="fieldEditor" v-model="fieldModel"
|
||||
:disabled="field.options.disabled" :size="field.options.size"
|
||||
:disabled="field.options.disabled" :size="widgetSize"
|
||||
@change="handleChangeEvent">
|
||||
<template v-if="!!field.options.buttonStyle">
|
||||
<el-radio-button v-for="(item, index) in field.options.optionItems" :key="index" :label="item.value"
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
:sub-form-row-index="subFormRowIndex" :sub-form-col-index="subFormColIndex" :sub-form-row-id="subFormRowId">
|
||||
<el-select ref="fieldEditor" v-model="fieldModel" class="full-width-input"
|
||||
:disabled="field.options.disabled"
|
||||
:size="field.options.size"
|
||||
:size="widgetSize"
|
||||
:clearable="field.options.clearable"
|
||||
:filterable="field.options.filterable"
|
||||
:allow-create="field.options.allowCreate"
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
:sub-form-row-index="subFormRowIndex" :sub-form-col-index="subFormColIndex" :sub-form-row-id="subFormRowId">
|
||||
<el-input type="textarea" ref="fieldEditor" v-model="fieldModel"
|
||||
:disabled="field.options.disabled" :readonly="field.options.readonly"
|
||||
:size="field.options.size"
|
||||
:size="widgetSize"
|
||||
:placeholder="field.options.placeholder" :rows="field.options.rows"
|
||||
:minlength="field.options.minLength" :maxlength="field.options.maxLength"
|
||||
:show-word-limit="field.options.showWordLimit"
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
<el-time-picker ref="fieldEditor" is-range v-model="fieldModel"
|
||||
:class="[!!field.options.autoFullWidth ? 'full-width-input' : '']"
|
||||
:disabled="field.options.disabled" :readonly="field.options.readonly"
|
||||
:size="field.options.size"
|
||||
:size="widgetSize"
|
||||
:clearable="field.options.clearable" :editable="field.options.editable"
|
||||
:format="field.options.format" value-format="HH:mm:ss"
|
||||
:start-placeholder="field.options.startPlaceholder || i18nt('render.hint.startTimePlaceholder')"
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<el-time-picker ref="fieldEditor" v-model="fieldModel"
|
||||
:class="[!!field.options.autoFullWidth ? 'auto-full-width' : '']"
|
||||
:disabled="field.options.disabled" :readonly="field.options.readonly"
|
||||
:size="field.options.size"
|
||||
:size="widgetSize"
|
||||
:clearable="field.options.clearable" :editable="field.options.editable"
|
||||
:format="field.options.format" value-format="HH:mm:ss"
|
||||
:placeholder="field.options.placeholder || i18nt('render.hint.timePlaceholder')"
|
||||
|
||||
@ -49,7 +49,7 @@ export const createBooleanEditor = function (propName, propLabelKey) {
|
||||
render(h) {
|
||||
return (
|
||||
<el-form-item label={translate(propLabelKey)}>
|
||||
<el-checkbox v-model={this.optionModel[propName]} />
|
||||
<el-switch v-model={this.optionModel[propName]} />
|
||||
</el-form-item>
|
||||
)
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<el-form-item :label="i18nt('designer.setting.allowCreate')">
|
||||
<el-checkbox v-model="optionModel.allowCreate"></el-checkbox>
|
||||
<el-switch v-model="optionModel.allowCreate"></el-switch>
|
||||
</el-form-item>
|
||||
</template>
|
||||
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
<el-divider class="custom-divider">{{i18nt('designer.setting.inputButton')}}</el-divider>
|
||||
</el-form-item>
|
||||
<el-form-item :label="i18nt('designer.setting.appendButton')">
|
||||
<el-checkbox v-model="optionModel.appendButton"></el-checkbox>
|
||||
<el-switch v-model="optionModel.appendButton"></el-switch>
|
||||
</el-form-item>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<el-form-item :label="i18nt('designer.setting.appendButtonDisabled')">
|
||||
<el-checkbox v-model="optionModel.appendButtonDisabled"></el-checkbox>
|
||||
<el-switch v-model="optionModel.appendButtonDisabled"></el-switch>
|
||||
</el-form-item>
|
||||
</template>
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<el-form-item :label="i18nt('designer.setting.autoFullWidth')">
|
||||
<el-checkbox v-model="optionModel.autoFullWidth"></el-checkbox>
|
||||
<el-switch v-model="optionModel.autoFullWidth"></el-switch>
|
||||
</el-form-item>
|
||||
</template>
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<el-form-item :label="i18nt('designer.setting.automaticDropdown')">
|
||||
<el-checkbox v-model="optionModel.automaticDropdown"></el-checkbox>
|
||||
<el-switch v-model="optionModel.automaticDropdown"></el-switch>
|
||||
</el-form-item>
|
||||
</template>
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<el-form-item :label="i18nt('designer.setting.border')">
|
||||
<el-checkbox v-model="optionModel.border"></el-checkbox>
|
||||
<el-switch v-model="optionModel.border"></el-switch>
|
||||
</el-form-item>
|
||||
</template>
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<el-form-item :label="i18nt('designer.setting.buttonStyle')">
|
||||
<el-checkbox v-model="optionModel.buttonStyle"></el-checkbox>
|
||||
<el-switch v-model="optionModel.buttonStyle"></el-switch>
|
||||
</el-form-item>
|
||||
</template>
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<el-form-item :label="i18nt('designer.setting.clearable')">
|
||||
<el-checkbox v-model="optionModel.clearable"></el-checkbox>
|
||||
<el-switch v-model="optionModel.clearable"></el-switch>
|
||||
</el-form-item>
|
||||
</template>
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<el-form-item :label="i18nt('designer.setting.responsive')">
|
||||
<el-checkbox v-model="optionModel.responsive"></el-checkbox>
|
||||
<el-switch v-model="optionModel.responsive"></el-switch>
|
||||
</el-form-item>
|
||||
</template>
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<el-form-item :label="i18nt('designer.setting.showBlankRow')">
|
||||
<el-checkbox v-model="optionModel.showBlankRow"></el-checkbox>
|
||||
<el-switch v-model="optionModel.showBlankRow"></el-switch>
|
||||
</el-form-item>
|
||||
</template>
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<el-form-item :label="i18nt('designer.setting.showRowNumber')">
|
||||
<el-checkbox v-model="optionModel.showRowNumber"></el-checkbox>
|
||||
<el-switch v-model="optionModel.showRowNumber"></el-switch>
|
||||
</el-form-item>
|
||||
</template>
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<el-form-item :label="i18nt('designer.setting.disabled')">
|
||||
<el-checkbox v-model="optionModel.disabled"></el-checkbox>
|
||||
<el-switch v-model="optionModel.disabled"></el-switch>
|
||||
</el-form-item>
|
||||
</template>
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<el-form-item :label="i18nt('designer.setting.editable')">
|
||||
<el-checkbox v-model="optionModel.editable"></el-checkbox>
|
||||
<el-switch v-model="optionModel.editable"></el-switch>
|
||||
</el-form-item>
|
||||
</template>
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<el-form-item :label="i18nt('designer.setting.circle')">
|
||||
<el-checkbox v-model="optionModel.circle"></el-checkbox>
|
||||
<el-switch v-model="optionModel.circle"></el-switch>
|
||||
</el-form-item>
|
||||
</template>
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<el-form-item :label="i18nt('designer.setting.plain')">
|
||||
<el-checkbox v-model="optionModel.plain"></el-checkbox>
|
||||
<el-switch v-model="optionModel.plain"></el-switch>
|
||||
</el-form-item>
|
||||
</template>
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<el-form-item :label="i18nt('designer.setting.round')">
|
||||
<el-checkbox v-model="optionModel.round"></el-checkbox>
|
||||
<el-switch v-model="optionModel.round"></el-switch>
|
||||
</el-form-item>
|
||||
</template>
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<el-form-item :label="i18nt('designer.setting.allowHalf')">
|
||||
<el-checkbox v-model="optionModel.allowHalf"></el-checkbox>
|
||||
<el-switch v-model="optionModel.allowHalf"></el-switch>
|
||||
</el-form-item>
|
||||
</template>
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<el-form-item :label="i18nt('designer.setting.showScore')">
|
||||
<el-checkbox v-model="optionModel.showScore"></el-checkbox>
|
||||
<el-switch v-model="optionModel.showScore"></el-switch>
|
||||
</el-form-item>
|
||||
</template>
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<el-form-item :label="i18nt('designer.setting.showText')">
|
||||
<el-checkbox v-model="optionModel.showText"></el-checkbox>
|
||||
<el-switch v-model="optionModel.showText"></el-switch>
|
||||
</el-form-item>
|
||||
</template>
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<el-form-item :label="i18nt('designer.setting.range')">
|
||||
<el-checkbox v-model="optionModel.range"></el-checkbox>
|
||||
<el-switch v-model="optionModel.range"></el-switch>
|
||||
</el-form-item>
|
||||
</template>
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<el-form-item :label="i18nt('designer.setting.showStops')">
|
||||
<el-checkbox v-model="optionModel.showStops"></el-checkbox>
|
||||
<el-switch v-model="optionModel.showStops"></el-switch>
|
||||
</el-form-item>
|
||||
</template>
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<el-form-item :label="i18nt('designer.setting.vertical')">
|
||||
<el-checkbox v-model="optionModel.vertical"></el-checkbox>
|
||||
<el-switch v-model="optionModel.vertical"></el-switch>
|
||||
</el-form-item>
|
||||
</template>
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<el-form-item :label="i18nt('designer.setting.filterable')">
|
||||
<el-checkbox v-model="optionModel.filterable"></el-checkbox>
|
||||
<el-switch v-model="optionModel.filterable"></el-switch>
|
||||
</el-form-item>
|
||||
</template>
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<el-form-item :label="i18nt('designer.setting.hidden')">
|
||||
<el-checkbox v-model="optionModel.hidden"></el-checkbox>
|
||||
<el-switch v-model="optionModel.hidden"></el-switch>
|
||||
</el-form-item>
|
||||
</template>
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<el-form-item :label="i18nt('designer.setting.labelHidden')">
|
||||
<el-checkbox v-model="optionModel.labelHidden"></el-checkbox>
|
||||
<el-switch v-model="optionModel.labelHidden"></el-switch>
|
||||
</el-form-item>
|
||||
</template>
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<el-form-item :label="i18nt('designer.setting.multiple')">
|
||||
<el-checkbox v-model="optionModel.multiple" @change="onMultipleSelected"></el-checkbox>
|
||||
<el-switch v-model="optionModel.multiple" @change="onMultipleSelected"></el-switch>
|
||||
</el-form-item>
|
||||
</template>
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<el-form-item :label="i18nt('designer.setting.multipleSelect')">
|
||||
<el-checkbox v-model="optionModel.multipleSelect"></el-checkbox>
|
||||
<el-switch v-model="optionModel.multipleSelect"></el-switch>
|
||||
</el-form-item>
|
||||
</template>
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<el-form-item :label="i18nt('designer.setting.readonly')">
|
||||
<el-checkbox v-model="optionModel.readonly"></el-checkbox>
|
||||
<el-switch v-model="optionModel.readonly"></el-switch>
|
||||
</el-form-item>
|
||||
</template>
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<el-form-item :label="i18nt('designer.setting.remote')">
|
||||
<el-checkbox v-model="optionModel.remote" @change="onRemoteChange"></el-checkbox>
|
||||
<el-switch v-model="optionModel.remote" @change="onRemoteChange"></el-switch>
|
||||
</el-form-item>
|
||||
</template>
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<el-form-item :label="i18nt('designer.setting.required')">
|
||||
<el-checkbox v-model="optionModel.required"></el-checkbox>
|
||||
<el-switch v-model="optionModel.required"></el-switch>
|
||||
</el-form-item>
|
||||
</template>
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<el-form-item :label="i18nt('designer.setting.showFileList')">
|
||||
<el-checkbox v-model="optionModel.showFileList"></el-checkbox>
|
||||
<el-switch v-model="optionModel.showFileList"></el-switch>
|
||||
</el-form-item>
|
||||
</template>
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<el-form-item :label="i18nt('designer.setting.showPassword')" v-if="optionModel.type === 'password'">
|
||||
<el-checkbox v-model="optionModel.showPassword"></el-checkbox>
|
||||
<el-switch v-model="optionModel.showPassword"></el-switch>
|
||||
</el-form-item>
|
||||
</template>
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<el-form-item :label="i18nt('designer.setting.showWordLimit')">
|
||||
<el-checkbox v-model="optionModel.showWordLimit"></el-checkbox>
|
||||
<el-switch v-model="optionModel.showWordLimit"></el-switch>
|
||||
</el-form-item>
|
||||
</template>
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<el-form-item :label="i18nt('designer.setting.withCredentials')">
|
||||
<el-checkbox v-model="optionModel.withCredentials"></el-checkbox>
|
||||
<el-switch v-model="optionModel.withCredentials"></el-switch>
|
||||
</el-form-item>
|
||||
</template>
|
||||
|
||||
|
||||
@ -647,11 +647,15 @@
|
||||
}
|
||||
|
||||
.left-toolbar {
|
||||
display: flex;
|
||||
margin-top: 4px;
|
||||
float: left;
|
||||
font-size: 16px;
|
||||
}
|
||||
|
||||
.right-toolbar {
|
||||
display: flex;
|
||||
margin-top: 5px;
|
||||
float: right;
|
||||
|
||||
:deep(.el-button--text) {
|
||||
|
||||
Reference in New Issue
Block a user