diff --git a/src/views/demo/form-design/components/VFormItem/index.vue b/src/views/demo/form-design/components/VFormItem/index.vue index 4e4c1804..ebe14bfc 100644 --- a/src/views/demo/form-design/components/VFormItem/index.vue +++ b/src/views/demo/form-design/components/VFormItem/index.vue @@ -38,7 +38,7 @@ 图斑组件 + { + props.schema.componentProps.targetKeys = nextTargetKeys; + }; + // 穿梭框-查找 + const transferSearch = (dir: string, value: string) => {}; + // 穿梭框-选中 + const transferSelectChange = (sourceSelectedKeys: string[], targetSelectedKeys: string[]) => { + props.schema.componentProps.selectedKeys = sourceSelectedKeys.concat(targetSelectedKeys); + }; return { ...toRefs(state), componentItem, @@ -269,6 +298,9 @@ colPropsComputed, selectUseOptions, showSelectDictionaryList, + transferChange, + transferSearch, + transferSelectChange, }; }, }); diff --git a/src/views/demo/form-design/core/formItemConfig.ts b/src/views/demo/form-design/core/formItemConfig.ts index 8a02dd4b..90bd82ac 100644 --- a/src/views/demo/form-design/core/formItemConfig.ts +++ b/src/views/demo/form-design/core/formItemConfig.ts @@ -365,8 +365,7 @@ export const commonComponents: IVFormComponent[] = [ field: '', colProps: { span: 24 }, componentProps: { - render: (item) => item.title, - titles: ['Source', 'Target'], + titles: ['', ''], dataSource: [ { key: 'key-1', @@ -387,6 +386,8 @@ export const commonComponents: IVFormComponent[] = [ disabled: false, }, ], + targetKeys: [], + selectedKeys: [], }, }, ]; diff --git a/src/views/demo/onlineform/formCall/index.vue b/src/views/demo/onlineform/formCall/index.vue index eac2b36d..ac40a132 100644 --- a/src/views/demo/onlineform/formCall/index.vue +++ b/src/views/demo/onlineform/formCall/index.vue @@ -810,24 +810,31 @@ } if (columnObj.table.querys) { columnObj.table.querys.forEach((item) => { - if (item.options) { + // if (item.options) { + // searchFormSchema.push({ + // field: item.key, + // component: item.type || 'Input', + // label: item.label, + // colProps: { span: 6 }, + // componentProps: { + // options: item.options, + // }, + // }); + // } else { + // searchFormSchema.push({ + // field: item.key, + // component: item.type || 'Input', + // label: item.label, + // colProps: { span: 6 }, + // }); + // } + if (['Transfer'].includes(item.type)) { searchFormSchema.push({ field: item.key, - component: item.type || 'Input', + component: item.type, label: item.label, - colProps: { span: 6 }, - componentProps: { - options: item.options, - }, - }); - } else { - searchFormSchema.push({ - field: item.key, - component: item.type || 'Input', - label: item.label, - colProps: { span: 6 }, - }); - } + colProps: { span: 12 }, + componentProps: item.componentProps, }); } callColumns.forEach((item) => { diff --git a/src/views/demo/onlineform/formModule/modalDesign.vue b/src/views/demo/onlineform/formModule/modalDesign.vue index 04ad17f7..93979c1a 100644 --- a/src/views/demo/onlineform/formModule/modalDesign.vue +++ b/src/views/demo/onlineform/formModule/modalDesign.vue @@ -281,16 +281,28 @@ !['Upload', 'Uploadimg', 'Password', 'Timerange', 'Datetimerange'].includes(t.component), ) .map((t) => { - if (t.componentProps.options) { - return { - key: t.field, - label: t.label, - type: t.component, - options: t.componentProps.options, - }; - } else { - return { key: t.field, label: t.label, type: t.component }; - } + // if (t.componentProps.options) { + // return { + // key: t.field, + // label: t.label, + // type: t.component, + // options: t.componentProps.options, + // componentProps: t.componentProps, + // }; + // } else { + // return { + // key: t.field, + // label: t.label, + // type: t.component, + // componentProps: t.componentProps, + // }; + // } + return { + key: t.field, + label: t.label, + type: t.component, + componentProps: t.componentProps, + }; }); // 常用按钮-树