diff --git a/src/components/DesignForm/app/index.vue b/src/components/DesignForm/app/index.vue index a15ae6d..b3dc17a 100644 --- a/src/components/DesignForm/app/index.vue +++ b/src/components/DesignForm/app/index.vue @@ -1902,123 +1902,7 @@ const readerColumnSun = (column: any) => { {{ item.label }} -
- - - - - - - - - - - - - - - - - - - - - - - - - - -
+
diff --git a/src/components/DesignForm/public/expand/datePicker.vue b/src/components/DesignForm/public/expand/datePicker.vue index 249e9c2..d5c58c4 100644 --- a/src/components/DesignForm/public/expand/datePicker.vue +++ b/src/components/DesignForm/public/expand/datePicker.vue @@ -3,118 +3,111 @@ @ 时间: 2024-09-25 15:01:57 @ 备注: 时间控件 --> - - diff --git a/src/components/DesignForm/public/expand/lowcodeImage.vue b/src/components/DesignForm/public/expand/lowcodeImage.vue index f82d4c8..6bb291d 100644 --- a/src/components/DesignForm/public/expand/lowcodeImage.vue +++ b/src/components/DesignForm/public/expand/lowcodeImage.vue @@ -65,12 +65,12 @@ const beforeAvatarUpload = (rawFile) => { //上传成功回调 const handleAvatarSuccess = (response, uploadFile) => { // imageUrl.value = URL.createObjectURL(uploadFile.raw!) - console.log("上传成功回调", value); + // console.log("上传成功回调", value); emits("update:modelValue", response.data.url); imgPath.value = response.data.url; value.value = response.data.url; - console.log("上传成功回调---------->", value.value); + // console.log("上传成功回调---------->", value.value); // let oldFormSetUp = props.formTableSetUp // if(props.formTableSetUp && props.formTableSetUp.list && props.formTableSetUp.list.length > 0){ // oldFormSetUp.list.forEach((item)=>{ @@ -92,7 +92,7 @@ const handleAvatarSuccess = (response, uploadFile) => { }; const getFormItemInputStyle = (ele: any, sty: number) => { if (ele?.inputStyle) { - console.log("返回栅格宽度4", AnalysisInputCss(ele?.inputStyle, sty)); + // console.log("返回栅格宽度4", AnalysisInputCss(ele?.inputStyle, sty)); return AnalysisInputCss(ele?.inputStyle, sty); } }; diff --git a/src/components/DesignForm/public/form/form.vue b/src/components/DesignForm/public/form/form.vue index be0661f..2950dde 100644 --- a/src/components/DesignForm/public/form/form.vue +++ b/src/components/DesignForm/public/form/form.vue @@ -60,6 +60,8 @@ const props = withDefaults( versionId?: string; // mastesformjson?: string; // isWeb: boolean; // + nodeKey?: string; + purview?: any[]; }>(), { type: 1, // 1新增;2修改;3查看(表单模式) ;4查看; 5设计 @@ -76,7 +78,7 @@ const props = withDefaults( labelStyle: {}, inputStyle: {}, }, - aiConfig:[] + aiConfig: [], }; }, dict: () => { @@ -158,12 +160,18 @@ const resultDict = ref({}); const model = ref({}); // 获取表单初始model值 const getInitModel = () => { - if(props.formData.aiConfig?.length>0){ - props.formData.aiConfig?.forEach(item=>{ - currentAgent.value.push({name:"test",model:false,uuid:item.library,fields:item.title,trigger:item.trigger,params:{}}) - }) + if (props.formData.aiConfig?.length > 0) { + props.formData.aiConfig?.forEach((item) => { + currentAgent.value.push({ + name: "test", + model: false, + uuid: item.library, + fields: item.title, + trigger: item.trigger, + params: {}, + }); + }); } - const obj = {}; forEachGetFormModel(props.formData.list, obj); @@ -495,35 +503,45 @@ watch( //-----------------------AI setting-------------------------- //当前AI智能体,根据form表单的配置来初始化 -const currentAgent=ref<{model:boolean,name:string,uuid:string[],fields:string[],trigger:number,params:{[key: string]: any}}[]>([]) -const aiassistRef=ref() +const currentAgent = ref< + { + model: boolean; + name: string; + uuid: string[]; + fields: string[]; + trigger: number; + params: { [key: string]: any }; + }[] +>([]); +const aiassistRef = ref(); //触发AI查询事件 -provide(constAiEffect, ({ key, value, field}: any) => { +provide(constAiEffect, ({ key, value, field }: any) => { //新建ai_envents 是为了解决前端并发问题 const ai_events: Array<{ uuids: string[]; params: { [key: string]: any } }> = []; - currentAgent.value.forEach(ag=>{ - if(ag.fields.includes(key)){ //trigger: 1:任一 2:半数 3:全部 - ag.params[field]=value;//这个地方把key换成fieldName - switch(ag.trigger){ + currentAgent.value.forEach((ag) => { + if (ag.fields.includes(key)) { + //trigger: 1:任一 2:半数 3:全部 + ag.params[field] = value; //这个地方把key换成fieldName + switch (ag.trigger) { case 2: - if(Object.keys(ag.params).length>=ag.fields.length/2){ - ai_events.push({uuids:ag.uuid,params:ag.params}) + if (Object.keys(ag.params).length >= ag.fields.length / 2) { + ai_events.push({ uuids: ag.uuid, params: ag.params }); } break; case 3: - if(Object.keys(ag.params).length==ag.fields.length){ - ai_events.push({uuids:ag.uuid,params:ag.params}) + if (Object.keys(ag.params).length == ag.fields.length) { + ai_events.push({ uuids: ag.uuid, params: ag.params }); } break; - default: - ai_events.push({uuids:ag.uuid,params:ag.params}) + default: + ai_events.push({ uuids: ag.uuid, params: ag.params }); } } - }) - if(ai_events.length>0){ - aiassistRef.value.onSendParamToAI(props.formData.form.formName,ai_events) - } -}) + }); + if (ai_events.length > 0) { + aiassistRef.value.onSendParamToAI(props.formData.form.formName, ai_events); + } +}); //------------------------------------------------------------ // 表单组件值改变事件 tProp为子表格相关 @@ -535,7 +553,7 @@ provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any) // console.log("表单组件值改变事件----------5--------->", type); // console.log("表单组件值改变事件----------6--------->", attribute); // console.log("表单组件值改变事件----------11--------->", model.value); - + let fieldVal = {}; for (let i in model.value) { if (i == key) { @@ -2183,8 +2201,17 @@ const webPage = computed({ -
- +
+
- - diff --git a/src/views/sysworkflow/lowcodepage/newLowCode/appLayoutEdit/appContainerPage.vue b/src/views/sysworkflow/lowcodepage/newLowCode/appLayoutEdit/appContainerPage.vue index acfb387..9b4e358 100644 --- a/src/views/sysworkflow/lowcodepage/newLowCode/appLayoutEdit/appContainerPage.vue +++ b/src/views/sysworkflow/lowcodepage/newLowCode/appLayoutEdit/appContainerPage.vue @@ -73,7 +73,7 @@ const gainAppContent = () => { id: props.pickAppInfo.signCodeStr, }; gainAppEditPsge(sendInfo).then((data) => { - console.log("获取app信息---》", data); + // console.log("获取app信息---》", data); menusTree.value = data.data.menuTree; appCont.appKey = data.data.appKey; appCont.appName = data.data.appName; @@ -108,7 +108,7 @@ const closeAppDraw = () => { */ const openAppPageForm = (val: appMenuTreeInfo) => { checkedMenu.value = val; - console.log("操作表单页面", val); + // console.log("操作表单页面", val); }; /** @ 作者: 秦东 diff --git a/src/views/sysworkflow/lowcodepage/pageFlow/appTableFlow.vue b/src/views/sysworkflow/lowcodepage/pageFlow/appTableFlow.vue index 1f74889..531cfe0 100644 --- a/src/views/sysworkflow/lowcodepage/pageFlow/appTableFlow.vue +++ b/src/views/sysworkflow/lowcodepage/pageFlow/appTableFlow.vue @@ -64,6 +64,7 @@ const flowMap = ref(); //工作流 const nextStep = ref(0); const currentProgress = ref(1); const nodeKey = ref(""); +const purviewAry = ref([]); //获取工作流条件 const gainFlowChart = reactive({ id: "0", @@ -123,6 +124,8 @@ const getTaskFormData = () => { isFlowTable.value = false; drawbox.value = 800; } + nodeKey.value = data.flowPage.nodeKey; + purviewAry.value = data.tableFormPage.powerAry; gainFlowChart.id = data.tableFormPage.flowkeystr; console.log("表单数据--->1", data.flowPage.flowList); flowMap.value = data.flowPage.flowList; @@ -640,6 +643,8 @@ function optionsValue3Get3(data: any, fieldName: string) { :close-app-submit="closeAppSubmit" :change-key-val="changeKeyVal" :save-draft-page="saveDraftPage" + :node-key="nodeKey" + :purview="purviewAry" /> (); //工作流 const nextStep = ref(0); const currentProgress = ref(1); const nodeKey = ref(""); +const purviewAry = ref([]); //获取工作流条件 const gainFlowChart = reactive({ id: "0", @@ -114,6 +115,9 @@ const getTaskFormData = () => { } else { isFlowTable.value = false; } + nodeKey.value = data.flowPage.nodeKey; + purviewAry.value = data.tableFormPage.powerAry; + gainFlowChart.id = data.tableFormPage.flowkeystr; // console.log("表单数据--->1",data.flowPage.flowList) flowMap.value = data.flowPage.flowList; @@ -550,6 +554,8 @@ function optionsValue3Get3(data: any, fieldName: string) { :close-app-submit="closeAppSubmit" :change-key-val="changeKeyVal" :save-draft-page="saveDraftPage" + :node-key="nodeKey" + :purview="purviewAry" /> - - + diff --git a/src/views/sysworkflow/lowcodepage/runApp/regularPage/myToDoPage.vue b/src/views/sysworkflow/lowcodepage/runApp/regularPage/myToDoPage.vue index d28e576..74e7ae8 100644 --- a/src/views/sysworkflow/lowcodepage/runApp/regularPage/myToDoPage.vue +++ b/src/views/sysworkflow/lowcodepage/runApp/regularPage/myToDoPage.vue @@ -3,230 +3,238 @@ @ 时间: 2024-05-31 10:50:09 @ 备注: 待我处理 --> - - diff --git a/src/views/taskplatform/taskmanagement/lookFlowInfoApp.vue b/src/views/taskplatform/taskmanagement/lookFlowInfoApp.vue index 1fe83ec..931f489 100644 --- a/src/views/taskplatform/taskmanagement/lookFlowInfoApp.vue +++ b/src/views/taskplatform/taskmanagement/lookFlowInfoApp.vue @@ -3,216 +3,273 @@ @ 时间: 2024-06-17 15:30:36 @ 备注: App执行任务 --> - -