diff --git a/src/views/tool/draggable/elements/hw-radio-group.vue b/src/views/tool/draggable/elements/hw-radio-group.vue index da48ecc..14fdab3 100644 --- a/src/views/tool/draggable/elements/hw-radio-group.vue +++ b/src/views/tool/draggable/elements/hw-radio-group.vue @@ -4,9 +4,7 @@ - Option A - Option B - Option C + {{ i.label }} diff --git a/src/views/tool/draggable/index.vue b/src/views/tool/draggable/index.vue index 3091035..60f1178 100644 --- a/src/views/tool/draggable/index.vue +++ b/src/views/tool/draggable/index.vue @@ -149,7 +149,7 @@ const dragList = [ }, { type: 'hw-radio-group', isContainer: false, - options: { name: '单选框组', items: [{ value: '1', label: '1' }, { value: '1', label: '1' }] }, + options: { name: '单选框组', radioItems: [{ value: '1', label: '1' }, { value: '1', label: '1' }] }, name: '单选框组', id: 5 }, @@ -279,7 +279,6 @@ const exportFile = () => { margin: 8px; border: 1px solid #ccc; min-height: 100px; - //user-select: none; } //user-select: none; diff --git a/src/views/tool/draggable/option/optionForm.vue b/src/views/tool/draggable/option/optionForm.vue index 07789f8..b875ef1 100644 --- a/src/views/tool/draggable/option/optionForm.vue +++ b/src/views/tool/draggable/option/optionForm.vue @@ -2,10 +2,11 @@ import inputType from './inputType.vue'; import inputNumberType from './inputNumberType.vue'; -import tableType from './tableType.vue'; +import tableType from './table/tableType.vue'; import inputAreaType from './inputAreaType.vue'; import switchType from './switchType.vue'; import functionType from './functionType.vue'; +import radioItems from './table/radioItem.vue'; export default { name: 'option-form', @@ -15,7 +16,8 @@ export default { tableType, inputAreaType, switchType, - functionType + functionType, + radioItems } }; @@ -38,6 +40,7 @@ const typeEnum = { inputAreaType: [], inputNumberType: ['min', 'max', 'step'], tableType: ['thTdMap'], + radioItems: ['radioItems'], switchType: ['isReset', 'isResetBottom', 'isSubmitBottom', 'disabled', 'isPagination', 'isInLine', 'isOperate', 'controlsPosition'], functionType: ['submitFunction', 'updateFunction', 'deleteFunction', 'addFunction'] }; @@ -67,7 +70,8 @@ const nameEnum = { min: '最小值', max: '最大值', step: '步长', - controlsPosition: '按钮是否位于右侧' + controlsPosition: '按钮是否位于右侧', + radioItems: '单选框数据设置' }; const getType = (e) => { let res = ''; diff --git a/src/views/tool/draggable/option/table/radioItem.vue b/src/views/tool/draggable/option/table/radioItem.vue new file mode 100644 index 0000000..25a632c --- /dev/null +++ b/src/views/tool/draggable/option/table/radioItem.vue @@ -0,0 +1,54 @@ + + + + + + diff --git a/src/views/tool/draggable/option/tableType.vue b/src/views/tool/draggable/option/table/tableType.vue similarity index 100% rename from src/views/tool/draggable/option/tableType.vue rename to src/views/tool/draggable/option/table/tableType.vue diff --git a/src/views/tool/draggable/viewElements/hw-radio-group-view.vue b/src/views/tool/draggable/viewElements/hw-radio-group-view.vue index 40335b1..4ccc046 100644 --- a/src/views/tool/draggable/viewElements/hw-radio-group-view.vue +++ b/src/views/tool/draggable/viewElements/hw-radio-group-view.vue @@ -1,9 +1,7 @@