修复 api endpoint

src/components/gFlow/propertySetting/CommonProperty.vue

@@ -262,18 +262,18 @@ onMounted(() => {
 const getSelector = () => {
 	//获取角色岗位选项
 	getParams().then((res) => {
-		const roles = res.data.roleList ?? []
-		const roleAccess = res.data.roleAccess ?? []
+		const roles = res.roleList ?? []
+		const roleAccess = res.roleAccess ?? []
 		roles.map((item: any) => {
 			if (!roleAccess.includes(item.id)) {
 				item.disabled = true
 			}
 		})
 		state.roleList = proxy.handleTree(roles ?? [], 'id', 'pid', 'children', true)
-		state.postList = res.data.posts ?? []
+		state.postList = res.posts ?? []
 	})
 	getDeptTree().then((res) => {
-		state.deptData = res.data.deps
+		state.deptData = res.deps
 	})
 }
 const onSubmit = () => {

src/components/gFlow/showDesign.vue

@@ -108,7 +108,7 @@ const setDonePrevNode = (nodeId:string)=>{
 const $_render = async ()=>{
   //获取节点数据
   return getNodeData(modelId.value).then((res:any)=>{
-    const nodes = (res.data.nodes??[]).map((item:any)=>{
+    const nodes = (res.nodes??[]).map((item:any)=>{
       const node = {
         id: item.nodeId,
         type: item.nodeType,
@@ -128,7 +128,7 @@ const $_render = async ()=>{
       setReceiver(node,item.nodeReceiver)
       return node
     })
-    const edges = (res.data.edges??[]).map((item:any)=>{
+    const edges = (res.edges??[]).map((item:any)=>{
       return {
         id: item.id,
         type: item.lineType,

src/main.ts

@@ -22,6 +22,7 @@ import copy from '/@/components/copy/index.vue'
 //引入json数据展示
 import JsonViewer from "vue3-json-viewer"
 import { parseTime } from '/@/utils/gfast'
+import { getOptionValue, setItems } from '/@/utils/items'
 
 const app = createApp(App);
 
@@ -45,6 +46,8 @@ app.config.globalProperties.useDict = useDict
 app.config.globalProperties.selectDictLabel = selectDictLabel
 app.config.globalProperties.mittBus = mitt();
 app.config.globalProperties.parseTime = parseTime
+app.config.globalProperties.getOptionValue = getOptionValue
+app.config.globalProperties.setItems = setItems
 
 
 const matchMedia = window.matchMedia('(prefers-color-scheme: light)')

src/utils/items.ts

@@ -0,0 +1,54 @@
+// 查询列表
+export function getItems(f: Function, query: Object) {
+	query = query || { pageSize: 10000 };
+	return f(query);
+}
+
+export function setItems(response: any, k: string, v: string,rk:string):Array<ItemOptions> {
+	const data: Array<ItemOptions> = [];
+	k = k || 'id';
+	v = v || 'name';
+	rk = rk || 'list'
+	if (response.data && response['data'][rk] && response['data'][rk].length > 0) {
+		response['data'][rk].forEach((e: any) => {
+			data.push({
+				key: e[k].toString(),
+				value: e[v].toString(),
+			});
+		});
+	}
+	return data;
+}
+
+// 选项类型接口
+export interface ItemOptions {
+	key:string,
+	value:string
+}
+
+/** 通过 options 数组获取 key 对应的 value */
+export function getOptionValue(key: any, options: Array<any>,keyName:string,valName:string) {
+	keyName = keyName??'key'
+	valName = valName??'value'
+	const option = options.find((value) => {
+		return key + '' === value[keyName];
+	});
+	if (option !== undefined) {
+		return option[valName];
+	}
+}
+
+export function isEmpty(v: any) {
+	if (v === '' || v === undefined || v === null) {
+		return true;
+	}
+
+	if (typeof v === 'object') {
+		if (Array.isArray(v)) {
+			return v.length === 0;
+		} else {
+			return Object.keys(v).length === 0;
+		}
+	}
+	return false;
+}

src/views/flow/flowDemo/list/component/detail.vue

@@ -95,7 +95,7 @@
       flowLogRef.value.getLogList()
     }else if(tab.index=="2"){
       getRunStep({formTable:formTable.value,formId:formId.value}).then((res:any)=>{
-        showFlowCheckRef.value.showDesign({flowId:res.data.data?.runFlow||'0',processId:res.data.data?.runFlowNode||''})
+        showFlowCheckRef.value.showDesign({flowId:res.data?.runFlow||'0',processId:res.data?.runFlowNode||''})
       })
     }
   }

src/views/flow/flowForm/center/index.vue

@@ -217,7 +217,7 @@ const getFormDataList = ()=>{
   ListFlowFormData(tableFormParam.value).then((res:any)=>{
     tableFormData.value = res.list
     tableFormParam.value.total = res.total
-    fromFields.value = res.data.fields.filter((item:FormFieldsData)=>{
+    fromFields.value = res.fields.filter((item:FormFieldsData)=>{
       return item.type=='input' && item.display && !item.hidden
     }).slice(0,3)
     formLoading.value = false

src/views/flow/flowForm/list/component/addFormData.vue

@@ -86,7 +86,7 @@ const openDialog = async (row?: FlowFormTableColumns) => {
       dataId.value = row.dataId
       //获取表单数据
       getFlowFormData({formId:row.id,dataId:row.dataId}).then((res:any)=>{
-        formData.value = res.data.data
+        formData.value = res.data
       })
     }
   }

src/views/flow/flowForm/list/component/dataDetail.vue

@@ -56,7 +56,7 @@ const handleClick = (tab: TabsPaneContext) => {
     flowLogRef.value.getLogList()
   }else if(tab.index=="2"){
     getRunStep({formTable:formTable.value,formId:formId.value}).then((res:any)=>{
-      showFlowCheckRef.value.showDesign({flowId:res.data.data?.runFlow||'0',processId:res.data.data?.runFlowNode||''})
+      showFlowCheckRef.value.showDesign({flowId:res.data?.runFlow||'0',processId:res.data?.runFlowNode||''})
     })
   }
 }
@@ -113,7 +113,7 @@ const openDialog = async (row?: FlowFormTableColumns) => {
       dataId.value = row.dataId
       //获取表单数据
       getFlowFormData({formId:row.id,dataId:row.dataId}).then((res:any)=>{
-        formData.value = res.data.data
+        formData.value = res.data
       })
     }
   }

src/views/flow/flowModel/list/component/design.vue

@@ -105,7 +105,7 @@ const initLF=()=>{
 const $_render = ()=>{
   //获取节点数据
   getNodeData(modelId.value).then((res:any)=>{
-    const nodes = (res.data.nodes??[]).map((item:any)=>{
+    const nodes = (res.nodes??[]).map((item:any)=>{
       const node = {
         id: item.nodeId,
         type: item.nodeType,
@@ -125,7 +125,7 @@ const $_render = ()=>{
       setReceiver(node,item.nodeReceiver)
       return node
     })
-    const edges = (res.data.edges??[]).map((item:any)=>{
+    const edges = (res.edges??[]).map((item:any)=>{
       return {
         id: item.id,
         type: item.lineType,
@@ -202,7 +202,7 @@ const $_saveModel = ()=>{
     if(res.code===0){
       ElMessage.success('保存成功');
     }else{
-      ElMessage.error(res.data.message);
+      ElMessage.error(res.message);
     }
   })
 }

src/views/flow/flowModel/list/component/edit.vue

@@ -11,11 +11,12 @@
         </el-form-item>
         <el-form-item label="表单类型" prop="flowType">
           <el-radio-group v-model="formData.flowType">
-            <el-radio
-              v-for="dict in flowTypeOptions"
-              :key="dict.value"
-              :value="dict.value"
-            >{{dict.label }}</el-radio>
+<!--            <el-radio-->
+<!--              v-for="dict in flowTypeOptions"-->
+<!--              :key="dict.value"-->
+<!--              :value="dict.value"-->
+<!--            >{{dict.label }}</el-radio>-->
+						<el-radio v-for="(dict,index) in flowTypeOptions" :label="dict.value" :key="index">{{dict.label }}</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="流程表单类别" prop="flowFormCate" v-if="formData.flowType=='1'">
@@ -46,11 +47,7 @@
         </el-form-item>
         <el-form-item label="流程状态" prop="status">
           <el-radio-group v-model="formData.status">
-            <el-radio
-              v-for="dict in statusOptions"
-              :key="dict.value"
-              :value="dict.value"
-            >{{dict.label }}</el-radio>
+						<el-radio v-for="(dict,index) in statusOptions" :label="dict.value" :key="index">{{dict.label }}</el-radio>
           </el-radio-group>
         </el-form-item>
       </el-form>