From e4f79a7e36214e5836cb0e667b3ffbd3db45456d Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期二, 22 十月 2024 23:54:26 +0800
Subject: [PATCH] 工单变量删除优化，预览优化
---
src/views/tigerprojects/system/lowcode/composition/index.vue | 120 +++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 79 insertions(+), 41 deletions(-)
diff --git a/src/views/tigerprojects/system/lowcode/composition/index.vue b/src/views/tigerprojects/system/lowcode/composition/index.vue
index 78cb0db..9ee294e 100644
--- a/src/views/tigerprojects/system/lowcode/composition/index.vue
+++ b/src/views/tigerprojects/system/lowcode/composition/index.vue
@@ -4,20 +4,18 @@
* @version:
* @Date: 2024-06-18 23:30:30
* @LastEditors: Ben Lin
- * @LastEditTime: 2024-07-03 19:21:09
+ * @LastEditTime: 2024-10-21 23:03:27
-->
<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">
@@ -29,7 +27,12 @@
</div>
</template>
</CarGridNav>
- <Config v-if="showConfig" :configType="configType" @success="configSuccess" />
+ <Config
+ v-if="showConfig"
+ :configType="configType"
+ :OtherTableName="OtherTableName"
+ @success="configSuccess"
+ />
</div>
</Suspense>
<!-- <BasicTable class="w-3/4 xl:w-4/5" @register="registerTable">
@@ -43,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>
@@ -90,14 +96,18 @@
import { useMessage } from '/@/hooks/web/useMessage';
import LogicFlow from '@logicflow/core';
- defineOptions({ name: 'DeptManagement' });
+ defineOptions({ name: '宸ュ崟宸ヨ壓缁戝畾' });
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('');
@@ -107,18 +117,21 @@
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 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();
+ const [registerCust] = useModal();
provide<Ref<any>>('objParams', objParams);
provide<Ref<any>>('selectedNodes', nodes);
setTitle(objParams.value.Title); //璁剧疆鏍囩椤垫爣棰�
@@ -131,7 +144,7 @@
if (!isNullOrUnDef(custImport.value)) {
const [{ GetHomeUrl }] = custImport.value['default']();
// 鏈緥鐨勬晥鏋滄椂鐐瑰嚮杩斿洖濮嬬粓璺宠浆鍒拌处鍙峰垪琛ㄩ〉锛屽疄闄呭簲鐢ㄦ椂鍙繑鍥炰笂涓�椤�
- go(GetHomeUrl(entityName.value));
+ go(GetHomeUrl({ colSlots: colSlots.value, sName:objParams.value.firstSessionName }));
}
}
@@ -155,12 +168,12 @@
const currlf = ref(null) as Ref<LogicFlow | null>;
/**
- * @description: 宸ヨ壓璺嚎鍒濆鍖�
+ * @description: 宸ヨ壓璺嚎鍒濆鍖栵紝鐗规畩椤甸潰鑷畾涔夊唴瀹�
* @param {*} lf
* @return {*}
*/
async function init(lf, rotId) {
- initRoute(lf, rotId, routeData, currlf);
+ initRoute(lf, rotId, routeData, currlf, objParams.value.rotType);
}
/**
@@ -170,14 +183,32 @@
*/
function NodeSelect(e) {
showConfig.value = e.showConfig;
+ showOtherTable.value = e.showOtherTable;
showNav.value = e.showNav;
configType.value = e.type;
+ OtherTableName.value = objParams.value.OtherTableName;
nodes.value = e.nodes;
routeData.value = {
nodes: [],
edges: [],
};
- initRoute(currlf, e.nodes[0].id, routeData, currlf);
+ /* 鑷畾涔夊唴瀹癸紝鍙湁鏄剧ず宸ヨ壓璺嚎鐨勭粍鍚堥〉闈細杩涙潵 */
+ 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();
}
/**
@@ -212,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) {}
@@ -233,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