From d7b0c15619e89d31c74f8db7a680b4c6a0009add Mon Sep 17 00:00:00 2001 From: Ben Lin <maobin001@msn.com> Date: 星期五, 09 八月 2024 16:51:34 +0800 Subject: [PATCH] 工艺路线行为上料选择更新 --- src/views/tigerprojects/system/lowcode/composition/index.vue | 164 +++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 118 insertions(+), 46 deletions(-) diff --git a/src/views/tigerprojects/system/lowcode/composition/index.vue b/src/views/tigerprojects/system/lowcode/composition/index.vue index 85d8972..dffeb96 100644 --- a/src/views/tigerprojects/system/lowcode/composition/index.vue +++ b/src/views/tigerprojects/system/lowcode/composition/index.vue @@ -4,25 +4,35 @@ * @version: * @Date: 2024-06-18 23:30:30 * @LastEditors: Ben Lin - * @LastEditTime: 2024-06-27 22:31:13 + * @LastEditTime: 2024-08-06 10:04:20 --> <template> <PageWrapper - :dense="dense" contentFullHeight - fixedHeight contentClass="flex" :title="pageTitle" :content="pageContent" @back="goBack" > <Suspense class="w-1/4 xl:w-1/5"> - <LeftTree @select="NodeSelect"/> + <LeftTree @select="NodeSelect" @deletenode="delCallback" /> </Suspense> <Suspense> <div class="w-3/4 xl:w-4/5 p-5"> - <CarGridNav v-if="showNav" /> - <Config v-if="showConfig" :configType="configType" @success="configSuccess"/> + <CarGridNav v-if="showNav" :configType="configType" :nodes="nodes"> + <template #[item] v-for="item in otherSlots" :key="item"> + <!-- 鑷畾涔夊唴瀹� --> + <div class="h-full" style="height: 400px"> + <FlowChartView :data="routeData" @init="init" /> + </div> + </template> + </CarGridNav> + <Config + v-if="showConfig" + :configType="configType" + :OtherTableName="OtherTableName" + @success="configSuccess" + /> </div> </Suspense> <!-- <BasicTable class="w-3/4 xl:w-4/5" @register="registerTable"> @@ -36,32 +46,35 @@ </template> </BasicTable> --> <!-- <normalDrawer @register="registerDrawer" @success="handleSuccess" /> --> - <CustModal - @register="registerCust" - @success="custSuccess" - :type="cType" - :detailSlots="dtlSlots" - > - <!-- 鐢ㄦ彃妲借嚜瀹氫箟澶氳〃鍗� --> - <template #[item.name] v-for="item in dtlSlots" :key="item.name"> - <BasicForm @register="useFormData[item.name][0]" v-if="useFormData[item.name]"> - <!-- 鐢ㄦ彃妲借嚜瀹氫箟寮瑰嚭閫夋嫨妗� --> - <template #[name]="{ field }" v-for="name in item.slots" :key="name"> - <a-button - class="mt-1 ml-1" - size="small" - @click="handleCustClick(field)" - :preIcon="item.preIcons[name]" - /> - <GeneralModal - @register="useModalData[name][0]" - @success="(d, u) => handleEntSuccess(d, u, item.name)" - /> - </template> - </BasicForm> - <!-- 鑷畾涔夊唴瀹� --> - </template> - </CustModal> + <Suspense> + <CustModal + @register="registerCust" + @success="custSuccess" + :type="cType" + :detailSlots="dtlSlots" + :entityName="entityName" + > + <!-- 鐢ㄦ彃妲借嚜瀹氫箟澶氳〃鍗� --> + <template #[item.name] v-for="item in dtlSlots" :key="item.name"> + <BasicForm @register="useFormData[item.name][0]" v-if="useFormData[item.name]"> + <!-- 鐢ㄦ彃妲借嚜瀹氫箟寮瑰嚭閫夋嫨妗� --> + <template #[name]="{ field }" v-for="name in item.slots" :key="name"> + <a-button + class="mt-1 ml-1" + size="small" + @click="handleCustClick(field)" + :preIcon="item.preIcons[name]" + /> + <GeneralModal + @register="useModalData[name][0]" + @success="(d, u) => handleEntSuccess(d, u, item.name)" + /> + </template> + </BasicForm> + <!-- 鑷畾涔夊唴瀹� --> + </template> + </CustModal> + </Suspense> </PageWrapper> </template> <script lang="ts" setup> @@ -72,42 +85,55 @@ import Config from './Config.vue'; import LeftTree from './LeftTree.vue'; import CustModal from '/@/views/components/CustModal.vue'; - import { OpenCustModal } from '../data'; - import { Ref, onMounted, provide, ref } from 'vue'; + import { OpenCustModal, initRoute } from '../data'; + import { Ref, VNode, onMounted, provide, ref, unref } from 'vue'; + import { FlowChartView } from '/@/components/FlowChart'; import { useRoute } from 'vue-router'; import { BasicForm, useForm } from '/@/components/Form/index'; import { useTabs } from '/@/hooks/web/useTabs'; import { isNullOrUnDef } from '/@/utils/is'; import { useGo } from '/@/hooks/web/usePage'; import { useMessage } from '/@/hooks/web/useMessage'; + import LogicFlow from '@logicflow/core'; defineOptions({ name: 'DeptManagement' }); const { notification, createErrorModal } = useMessage(); const go = useGo(); const route = useRoute(); - const { setTitle } = useTabs(); - const objParams = ref(JSON.parse(decodeURI(route.params?.id as string))); //ref(JSON.parse(history.state.obj)) - const entityName = ref(objParams.value.Name); + const { setTitle, refreshPage } = useTabs(); + // const objParams = ref(JSON.parse(decodeURI(route.params?.id as string))); //ref(JSON.parse(history.state.obj)) + const routeParams = ref(JSON.parse(decodeURI(route.params?.id as string))); + // 浠巗essionStorage涓鍙栧弬鏁板苟杞崲鍥炲璞� + const savedParams = sessionStorage.getItem(`${routeParams.value.sName}_params`); + const objParams = savedParams ? ref(JSON.parse(decodeURI(savedParams))) : ref({}); + const entityName = ref(routeParams.value.Name); const useModalData = ref({}); //琛ㄥ崟涓彃妲芥覆鏌撴寜閽墦寮�妯℃�佹useModal鏂规硶 const useFormData = ref({}); const cType = ref(''); const dtlSlots = ref([] as any[]); + const otherSlots = ref<any[]>([]); const selectVals = ref({}); const dense = isNullOrUnDef(objParams.value.dense) ? ref(false) : ref(objParams.value.dense); const pageTitle = ref(objParams.value.pageTitle); const pageContent = ref(objParams.value.pageContent); - const nodeType = ref(''); + const colSlots = ref<any>(objParams.value.colSlots); const selectedNodes = ref([]); const isMounted = ref(false); const showNav = ref(false); const showConfig = ref(false); + const showOtherTable = ref(false); const configType = ref(''); + const OtherTableName = ref(''); + const nodes = ref([]); + const routeData = ref({ + nodes: [], + edges: [], + }); const custImport = ref<any>(null); const [registerCust, { openModal: openCustomModal, closeModal }] = useModal(); - provide<Ref<string>>('nodeType', nodeType); provide<Ref<any>>('objParams', objParams); - provide<Ref<any>>('selectedNodes', selectedNodes); + provide<Ref<any>>('selectedNodes', nodes); setTitle(objParams.value.Title); //璁剧疆鏍囩椤垫爣棰� /** @@ -118,7 +144,7 @@ if (!isNullOrUnDef(custImport.value)) { const [{ GetHomeUrl }] = custImport.value['default'](); // 鏈緥鐨勬晥鏋滄椂鐐瑰嚮杩斿洖濮嬬粓璺宠浆鍒拌处鍙峰垪琛ㄩ〉锛屽疄闄呭簲鐢ㄦ椂鍙繑鍥炰笂涓�椤� - go(GetHomeUrl(entityName.value)); + go(GetHomeUrl({ colSlots: colSlots.value })); } } @@ -131,25 +157,64 @@ /* 鍔ㄦ�乮mport瀹炰綋鍚�.ts鐨勮嚜瀹氫箟鏂规硶 */ try { custImport.value = await import(`../entityts/${entityName.value}.ts`); + if (custImport.value['default']) { + otherSlots.value = custImport.value['default']()[0]['GetSlots'](); + } isMounted.value = true; - } catch (e) {} + } catch (e) { + console.log(e); + } }); + + const currlf = ref(null) as Ref<LogicFlow | null>; + /** + * @description: 宸ヨ壓璺嚎鍒濆鍖栵紝鐗规畩椤甸潰鑷畾涔夊唴瀹� + * @param {*} lf + * @return {*} + */ + async function init(lf, rotId) { + initRoute(lf, rotId, routeData, currlf, objParams.value.rotType); + } /** * @description: 閫夋嫨鑺傜偣鏃舵牴鎹繑鍥炵殑浜嬩欢鍙傛暟鏄剧ず闅愯棌鐩稿簲缁勪欢 * @param {*} e * @return {*} - */ + */ function NodeSelect(e) { showConfig.value = e.showConfig; + showOtherTable.value = e.showOtherTable; showNav.value = e.showNav; - configType.value = e.type + configType.value = e.type; + OtherTableName.value = objParams.value.OtherTableName; + nodes.value = e.nodes; + routeData.value = { + nodes: [], + edges: [], + }; + /* 鑷畾涔夊唴瀹癸紝鍙湁鏄剧ず宸ヨ壓璺嚎鐨勭粍鍚堥〉闈細杩涙潵 */ + if (e.nodes[0].type == 'Route') { + let _rotId = e.nodes[0].code; + if (objParams.value.rotType == 'Wo') { + _rotId = e.nodes[0].wo; + } + initRoute(currlf, _rotId, routeData, currlf, objParams.value.rotType); + } + } + + /** + * @description: 鍒犻櫎鑺傜偣鍚庡洖璋� + * @param {*} node + * @return {*} + */ + function delCallback(node) { + refreshPage(); } /** * @description: 淇濆瓨閰嶇疆鎴愬姛杩斿洖鏂规硶 * @return {*} - */ + */ function configSuccess() { notification.success({ message: '鎴愬姛淇濆瓨琛屼负閰嶇疆鏁版嵁' }); } @@ -178,7 +243,9 @@ var values = GetSelectSuccess(d, u); selectVals.value = values; //淇濆瓨寮瑰嚭妗嗛�夋嫨鐨勭粨鏋� let _val = {}; - _val[d.returnFieldName] = values[d.returnFieldName]; + d.returnFieldName.map((x) => { + _val[x] = values[x]; + }); useFormData.value[item][1].setFieldsValue(_val); }); } catch (e) {} @@ -199,3 +266,8 @@ ); //[openRvModal], selectVals.value['ID']杩欐槸鑷畾涔夊弬鏁帮紝鎸夊疄闄呴渶姹� } </script> +<style lang="less"> +.vben-page-wrapper .vben-page-wrapper-content { + margin: 1px; +} +</style> -- Gitblit v1.9.3