diff --git a/src/api/DesignForm/type.ts b/src/api/DesignForm/type.ts index c3b865a..4c801c8 100644 --- a/src/api/DesignForm/type.ts +++ b/src/api/DesignForm/type.ts @@ -31,8 +31,9 @@ export type CustomerFormPageResult = PageResult; //初始化表单基本信息 export interface customerFormConfig{ - formname:string; + formName:string; formlogo:string; + signCode:string; } //根据Id获取信息 export interface getContForId{ diff --git a/src/api/DesignForm/types.ts b/src/api/DesignForm/types.ts index 22e2461..5c70611 100644 --- a/src/api/DesignForm/types.ts +++ b/src/api/DesignForm/types.ts @@ -118,15 +118,26 @@ export interface formData{ qrCodeOutside:boolean, qrCodePrintStyle:any, qrCodeShowFields:any, + labelPosition:string, + dataSource:string, + dataSourceConfig:{ + id: string, + dataBaseName: string, + tableName: string, + tableKey: string, + dsn: {}, + } }; config: any; events?:any; styles:{ + labelPosition:"", divStyle:{}, labelStyle:{}, inputStyle:{} }; purview?:any[]; + aiConfig?:any[]; } //表单基本信息 export interface formTableInfo{ diff --git a/src/components/DesignForm/public/form/formGroup.vue b/src/components/DesignForm/public/form/formGroup.vue index a40d76c..b218643 100644 --- a/src/components/DesignForm/public/form/formGroup.vue +++ b/src/components/DesignForm/public/form/formGroup.vue @@ -52,7 +52,7 @@ watch( () => props.data, (v: FormList[]) => { dataList.value = v; - console.log("监听表单变化++++++++++>", v); + // console.log("监听表单变化++++++++++>", v); }, { deep: true, @@ -142,11 +142,11 @@ const draggableAdd = (evt: any) => { const key = new Date().getTime().toString(); const obj: any = dataList.value[newIndex]; const isNested = evt.target && evt.target.getAttribute("data-type"); // 不能嵌套 - console.log("设计拖拽事件-----1------->", newIndex); - console.log("设计拖拽事件-----2------->", key); - console.log("设计拖拽事件-----3------->", obj); - console.log("设计拖拽事件-----4------->", isNested); - console.log("设计拖拽事件-----4------->", dataList.value); + // console.log("设计拖拽事件-----1------->", newIndex); + // console.log("设计拖拽事件-----2------->", key); + // console.log("设计拖拽事件-----3------->", obj); + // console.log("设计拖拽事件-----4------->", isNested); + // console.log("设计拖拽事件-----4------->", dataList.value); if ( (isNested === "not-nested" && notNested(obj.type)) || ((isNested === "not-table" || isNested === "not-flex") && @@ -272,7 +272,7 @@ const groupClick = (item: any, ele?: string) => { state.gridAdd = item.type === "grid"; // state.clone = !notNested(item.type) state.clone = !notNestedTableFlex(item.type); - console.log("点击激活当前--->", store); + // console.log("点击激活当前--->", store); }; // 返回栅格宽度 const getFormItemStyle = (ele: FormList) => { @@ -493,7 +493,7 @@ function asfValueChanged(val: any) { fillFieldsChild = fillFieldsChild.filter((element: any) => { if (containsDangerousWords(element.filterCondition.gongShi.mathsFormula)) { //alert("筛选条件非法") - console.log("筛选条件非法===>" + element.filterCondition.conditionHtml); + // console.log("筛选条件非法===>" + element.filterCondition.conditionHtml); } else { return element; } diff --git a/src/views/sysworkflow/lowcodepage/appPage/createAppFormPage.vue b/src/views/sysworkflow/lowcodepage/appPage/createAppFormPage.vue index ba2e78d..6759e3e 100644 --- a/src/views/sysworkflow/lowcodepage/appPage/createAppFormPage.vue +++ b/src/views/sysworkflow/lowcodepage/appPage/createAppFormPage.vue @@ -95,12 +95,18 @@ const state = reactive({ tableKey: "", dsn: {}, }, + qrCodeFlag: false, + qrCodeInside: false, + qrCodeOutside: false, + qrCodePrintStyle: undefined, + qrCodeShowFields: undefined }, config: { groupKey: props.formKey, classify: 4, }, styles: { + labelPosition: "", divStyle: {}, labelStyle: {}, inputStyle: {}, diff --git a/src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue b/src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue index cfb5ecd..6a14b70 100644 --- a/src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue +++ b/src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue @@ -376,7 +376,7 @@ const changeKeyVal = (key: any, val: any, type: any, attribute: any) => { /** @ 作者: 秦东 @ 时间: 2024-04-09 16:41:20 -@ 功能: 提交成功回调 +@ 功能: 提交成功回调 */ const afterSubmit = (type: string, val?: any) => { // console.log("表单提交成功------------------>",type,val)