diff --git a/src/api/DesignForm/types.ts b/src/api/DesignForm/types.ts index b9440d8..df72444 100644 --- a/src/api/DesignForm/types.ts +++ b/src/api/DesignForm/types.ts @@ -52,6 +52,11 @@ export interface FormData { beforeSubmit?: Function afterSubmit?: Function change?: Function + saveEditFormInfo?: Function + saveDraftPage?: Function + sendDraftSubmit?: Function + submitEdit?: Function + anewSubmit?: Function } styles:{ divStyle:{}, @@ -153,6 +158,8 @@ export interface formOtherData{ } //表单结构体 export interface formStruct{ + tooltip: any + isSearch: any formData:formData; editor: any; loading: boolean; diff --git a/src/api/doc/space.ts b/src/api/doc/space.ts index 3d3a850..381df27 100644 --- a/src/api/doc/space.ts +++ b/src/api/doc/space.ts @@ -356,4 +356,4 @@ export function newShareChat(data: any){ }, data: data }); -} \ No newline at end of file +} diff --git a/src/api/javaRequest.ts b/src/api/javaRequest.ts new file mode 100644 index 0000000..0ab5ae4 --- /dev/null +++ b/src/api/javaRequest.ts @@ -0,0 +1,125 @@ +import request from "@/utils/request"; + +const getAssociatedFormsCurrentFieldTree = (data:any) => { + return request({ + url: "/javasys/lowCode/AssociatedForms/getFieldTree", + method: "post", + data: { + //cfid:'13' + cfid: data, + }, + }); +} + +const getAssociatedFormsOrgAndManTree = () => { + return request({ + url: "/javasys/lowCode/transfer/getOrgAndManTree", + method: "post", + }); +} + +const getCustomerFormList = () => { + return request({ + url: "/javasys/lowCode/AssociatedForms/getCustomerFormList", + method: "post", + }); +} +const getAssociatedFormsRoleTree = () => { + return request({ + url: "/javasys/lowCode/AssociatedForms/getRoleList", + method: "post", + }); +} + +const getAsfasfFieldTree = (data:any) => { + return request({ + url: "/javasys/lowCode/AssociatedForms/getFieldTree", + method: "post", + data: { + //cfid:'13' + cfid: data, + }, + }); +} + +const getAsfasfFieldTreeOptionsValue3 = (data:any) => { + return request({ + url: "/javasys/lowCode/AssociatedForms/getFieldTree", + method: "post", + data: { + //cfid:'13' + cfid: data, + }, + }); +} +const getQrCodeImgInside = (data:any) => { + return request({ + url: "/javasys/lowCode/QrCode/getQrCodeImgInside", + method: "post", + data: { + cfid: data, + }, + }); +} +const getAllRole = () => { + return request({ + url: "/javasys/lowCode/manCont/getAllRole", + method: "get", + }); +} +const getPersonByRoleId = (id:any,pageNum:any,pageSize:any,number:any,names:any) => { + return request({ + url: "/javasys/lowCode/manCont/getPersonByRoleId", + method: "post", + data: { + id: id, + pageNum: pageNum, + pageSize: pageSize, + number:number, + name:names + }, + }); +} +const queryIfOrgOrPerson = (obj: { left: string; operator: string; right: string }) => { + return request({ + url: "/javasys/lowCode/AssociatedForms/queryIfOrgOrPerson", + method: "post", + data: obj, + }); +} +const queryHideRoleCondition = (obj: { left: string; operator: string; right: string }) => { + return request({ + url: "/javasys/lowCode/AssociatedForms/queryHideRoleCondition", + method: "post", + data: obj, + }); +} +const getMainOrgByWorkNumber = (obj: { workNumber: string}) => { + return request({ + url: "/javasys/lowCode/manCont/getMainOrgByWorkNumber", + method: "post", + data: obj, + }); +} +const treeUrl = '/javasys/lowCode/transfer/getOrgAndManTree' +const getOrgAndManTree = () => { + return request({ + url: treeUrl, + method: 'post', + }); +} +export { + getAssociatedFormsCurrentFieldTree, + getAssociatedFormsOrgAndManTree, + getCustomerFormList, + getAssociatedFormsRoleTree, + getAsfasfFieldTree, + getAsfasfFieldTreeOptionsValue3, + getQrCodeImgInside, + getAllRole, + getPersonByRoleId, + queryIfOrgOrPerson, + queryHideRoleCondition, + getMainOrgByWorkNumber, + getOrgAndManTree +} diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue index e29d81a..366605f 100644 --- a/src/components/DesignForm/formControlPropertiNew.vue +++ b/src/components/DesignForm/formControlPropertiNew.vue @@ -8,7 +8,7 @@ import { reactive, computed, toRefs, ref, watch, inject, onBeforeMount, onMounte import { getRequest } from "@/api/DesignForm"; import { useDesignFormStore } from "@/store/DesignForm/designForm"; import validate from "./validate"; -import validateText from "./validateText"; +import { validateTextConfig } from "./validateText"; import validateInt from "./validateInt"; import { ValidateTextTypes } from "@/components/DesignForm/validateText"; import { ElMessage } from "element-plus"; @@ -180,7 +180,7 @@ const ValidateText = reactive({ */ const radioVerify = reactive({}); -const textUinrVerfy = reactive([...validateText]); +const textUinrVerfy = reactive([...validateTextConfig]); const numberUinrVerfy = reactive([...validateInt]); const formAttr = computed(() => { diff --git a/src/components/DesignForm/public/expand/rangedUserTree.vue b/src/components/DesignForm/public/expand/rangedUserTree.vue index 6e01a22..a8e88ed 100644 --- a/src/components/DesignForm/public/expand/rangedUserTree.vue +++ b/src/components/DesignForm/public/expand/rangedUserTree.vue @@ -25,7 +25,7 @@ const treeData = ref([]) // 存储懒加载的数据 const isDataLoaded = ref(false) // 标记数据是否已加载 const loading = ref(false) // 是否正在加载 const treeSelectRef = ref() // 树选择器引用 -const { location, updateLocation } = inject('location') +// const { location, updateLocation } = inject('location') // 上一次选择的值,用于比较 const lastSelectedValue = ref(null) diff --git a/src/components/DesignForm/public/headToolsApp.vue b/src/components/DesignForm/public/headToolsApp.vue index 0ac2b18..b000c49 100644 --- a/src/components/DesignForm/public/headToolsApp.vue +++ b/src/components/DesignForm/public/headToolsApp.vue @@ -23,7 +23,7 @@ const props = withDefaults( } ) const emits = defineEmits<{(e: 'click', value: string): void}>(); -const btnList = computed(() => { +const btnList = computed(() => { const list = [ { icon: 'monitor',iconFont:"fa-desktop", label: 'PC端', key: 101 }, { icon: 'iphone',iconFont:"fa-mobile", label: '手机端', key: 102 }, diff --git a/src/components/DesignForm/validateText.ts b/src/components/DesignForm/validateText.ts index 07e7ce4..3aae31b 100644 --- a/src/components/DesignForm/validateText.ts +++ b/src/components/DesignForm/validateText.ts @@ -57,4 +57,55 @@ const validateTextConfig: ValidateTextTypes[] = [ } ] -export default validateTextConfig +const transferDataSourceOptions = [ + { + value: "数据源", + label: "数据源", + }, + { + value: "固定选项", + label: "固定选项", + }, +]; + +const locationLevelOptions = [ + { + value: "省级", + label: "省级", + }, + { + value: "市级", + label: "市级", + }, + { + value: "区县级", + label: "区县级", + }, + { + value: "详细地址", + label: "详细地址", + }, +] +const scanTypes = [ + { + value: "QrCode", + label: "二维码", + }, + { + value: "OCR", + label: "光学字符识别", + }, +]; +const optionsCss = [ + { label: "无样式", value: "" }, + { label: "每行两列", value: "form-row-2" }, + { label: "每行三列", value: "form-row-3" }, + { label: "每行四列", value: "form-row-4" }, +]; +export { + transferDataSourceOptions, + locationLevelOptions, + validateTextConfig, + scanTypes, + optionsCss +} diff --git a/src/utils/DesignForm/index.ts b/src/utils/DesignForm/index.ts index 5b5eb41..63b8381 100644 --- a/src/utils/DesignForm/index.ts +++ b/src/utils/DesignForm/index.ts @@ -72,7 +72,7 @@ export const randomString = (len: number) => { } export const jsonParseStringify = (val: any) => { - if (typeof val === 'object') { + if (typeof val === 'object') { return JSON.parse(JSON.stringify(val)) } else { return val diff --git a/src/views/dashboard/components/allorgyear.vue b/src/views/dashboard/components/allorgyear.vue index b2053f6..e643e14 100644 --- a/src/views/dashboard/components/allorgyear.vue +++ b/src/views/dashboard/components/allorgyear.vue @@ -38,7 +38,7 @@ const orgChartDrowData = () => { yearsInfo.value = timeYears; let sendInfo = { orgid: curreorgId.value.toString(), - years: timeYears + years: timeYears.toString() }; orgTargetAnnualStatistics(sendInfo).then((data: any) => { // console.log(" props.dlyear.data", data) diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageFormNew.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageFormNew.vue index 51144cb..3e792fc 100644 --- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageFormNew.vue +++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageFormNew.vue @@ -4,7 +4,7 @@ @ 备注: 表单编辑页面 -->