diff --git a/src/api/DesignForm/types.ts b/src/api/DesignForm/types.ts index 9868ed09a..454dfcb27 100644 --- a/src/api/DesignForm/types.ts +++ b/src/api/DesignForm/types.ts @@ -8,6 +8,11 @@ export interface FormList { columns?: any // 布局字段 tableData?: any // 子表时 options?: Options[] // radio;checkbox;select选项 + styles:{ + divStyle:{}, + labelStyle:{}, + inputStyle:{} + } } export interface Options { label: string @@ -46,6 +51,11 @@ export interface FormData { afterSubmit?: Function change?: Function } + styles:{ + divStyle:{}, + labelStyle:{}, + inputStyle:{} + } } export interface TableData { diff --git a/src/components/DesignForm/layoutPage/index.vue b/src/components/DesignForm/layoutPage/index.vue index 40f39a2c5..187b934f4 100644 --- a/src/components/DesignForm/layoutPage/index.vue +++ b/src/components/DesignForm/layoutPage/index.vue @@ -54,13 +54,13 @@ const inputUnitTitle = (val:string) => { case "rate": unitIsShow.value = false; break; - case "slider": + case "slider","upload","tinymce": unitIsShow.value = false; break; - case "treeSelect": + case "treeSelect","colorPicker","signaturemap": unitIsShow.value = false; break; - case "txt": + case "txt","table": unitIsShow.value = false; labelIsShow.value = false; break; @@ -72,6 +72,7 @@ const inputUnitTitle = (val:string) => { unitIsShow.value = false; labelIsShow.value = false; break; + default: return "Input布局" break; diff --git a/src/components/DesignForm/public/form/form.vue b/src/components/DesignForm/public/form/form.vue index 6e1197fe2..22a55c200 100644 --- a/src/components/DesignForm/public/form/form.vue +++ b/src/components/DesignForm/public/form/form.vue @@ -59,6 +59,11 @@ const props = withDefaults( form: {}, config: { style:'' + }, + styles:{ + divStyle:{}, + labelStyle:{}, + inputStyle:{} } } }, diff --git a/src/components/DesignForm/public/form/formGroup.vue b/src/components/DesignForm/public/form/formGroup.vue index 317c32850..f2729bf57 100644 --- a/src/components/DesignForm/public/form/formGroup.vue +++ b/src/components/DesignForm/public/form/formGroup.vue @@ -164,6 +164,13 @@ const getGroupName = (item: any) => { } } // 点击激活当前 +/** + * styles:{ + divStyle:{}, + labelStyle:{}, + inputStyle:{} + } + */ const groupClick = (item: any, ele?: string) => { // 设计模式下才执行 if (type.value !== 5) { @@ -172,6 +179,14 @@ const groupClick = (item: any, ele?: string) => { if (ele) { item.type = ele } + if(!item.styles){ + item.styles={ + divStyle:{}, + labelStyle:{}, + inputStyle:{} + } + } + // console.log("点击激活当前--->",item) store.setActiveKey(getGroupName(item)) store.setControlAttr(item) // grid时显示添加列按钮 diff --git a/src/types/components.d.ts b/src/types/components.d.ts index f0bc8ee2a..c212a11c9 100644 --- a/src/types/components.d.ts +++ b/src/types/components.d.ts @@ -59,7 +59,6 @@ declare module '@vue/runtime-core' { ElOption: typeof import('element-plus/es')['ElOption'] ElPagination: typeof import('element-plus/es')['ElPagination'] ElPopover: typeof import('element-plus/es')['ElPopover'] - ElProgress: typeof import('element-plus/es')['ElProgress'] ElRadio: typeof import('element-plus/es')['ElRadio'] ElRadioButton: typeof import('element-plus/es')['ElRadioButton'] ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup'] @@ -109,7 +108,6 @@ declare module '@vue/runtime-core' { IEpRefresh: typeof import('~icons/ep/refresh')['default'] IEpSearch: typeof import('~icons/ep/search')['default'] IEpSetting: typeof import('~icons/ep/setting')['default'] - IEpView: typeof import('~icons/ep/view')['default'] LangSelect: typeof import('./../components/LangSelect/index.vue')['default'] LayoutPage: typeof import('./../components/DesignForm/layoutPage/index.vue')['default'] List: typeof import('./../components/DesignForm/public/form/components/list.vue')['default'] diff --git a/src/views/sysworkflow/codepage/createform.vue b/src/views/sysworkflow/codepage/createform.vue index 05f681ccb..b5545b520 100644 --- a/src/views/sysworkflow/codepage/createform.vue +++ b/src/views/sysworkflow/codepage/createform.vue @@ -60,7 +60,12 @@ const submitButton = { config: { textAlign: "center" - } + }, + styles:{ + divStyle:{}, + labelStyle:{}, + inputStyle:{} + } }] } const cancelButton = { @@ -84,7 +89,12 @@ const cancelButton = { config: { textAlign: "center" - } + }, + styles:{ + divStyle:{}, + labelStyle:{}, + inputStyle:{} + } }] } const submitAndCancelButton = { @@ -108,7 +118,12 @@ const submitAndCancelButton = { config: { span: 0 - } + }, + styles:{ + divStyle:{}, + labelStyle:{}, + inputStyle:{} + } }, { type: "button", @@ -121,7 +136,12 @@ const submitAndCancelButton = { config: { span: 0 - } + }, + styles:{ + divStyle:{}, + labelStyle:{}, + inputStyle:{} + } }] }; @@ -168,7 +188,12 @@ const state = reactive({ name:'', formName: props.formconfigcont.formName }, - config: {} + config: {}, + styles:{ + divStyle:{}, + labelStyle:{}, + inputStyle:{} + } }, editor: {}, loading: false, diff --git a/src/widget/videoupload/videoUploadPlay.vue b/src/widget/videoupload/videoUploadPlay.vue index c262fd80c..58c552258 100644 --- a/src/widget/videoupload/videoUploadPlay.vue +++ b/src/widget/videoupload/videoUploadPlay.vue @@ -1,11 +1,12 @@