From cdd0a28197fb9b432a45bbf9ebc0cfd8db939125 Mon Sep 17 00:00:00 2001 From: Ben Lin <maobin001@msn.com> Date: 星期四, 25 七月 2024 10:34:44 +0800 Subject: [PATCH] websocket更新,配置文件增加websocket地址 --- src/views/tigerprojects/system/lowcode/normal/index.vue | 102 +++++++++------------------------------------------ 1 files changed, 18 insertions(+), 84 deletions(-) diff --git a/src/views/tigerprojects/system/lowcode/normal/index.vue b/src/views/tigerprojects/system/lowcode/normal/index.vue index baac0e5..eed529b 100644 --- a/src/views/tigerprojects/system/lowcode/normal/index.vue +++ b/src/views/tigerprojects/system/lowcode/normal/index.vue @@ -4,63 +4,32 @@ * @version: * @Date: 2024-05-30 13:28:20 * @LastEditors: Ben Lin - * @LastEditTime: 2024-07-17 11:36:57 + * @LastEditTime: 2024-07-24 23:47:07 --> <template> <div> <Suspense> <mainTable /> </Suspense> - <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> </div> </template> <script lang="ts" setup> - import { Ref, h, onMounted, provide, ref, unref } from 'vue'; + import { Ref, defineAsyncComponent, h, onMounted, provide, ref, unref, watch } from 'vue'; import mainTable from './mainTable.vue'; - import GeneralModal from '/@/views/components/GeneralModal.vue'; import { DeleteEntity, GetEnum, getEntity, getListByPage } from '/@/api/tigerapi/system'; import { useRoute, useRouter } from 'vue-router'; import { Tag, Tooltip } from 'ant-design-vue'; - import CustModal from '/@/views/components/CustModal.vue'; - import { BasicForm, useForm } from '/@/components/Form/index'; import { isNullOrEmpty, isNullOrUnDef } from '/@/utils/is'; - import { custOnChange, OpenCustModal, GetUseModalData } from '../data'; - import { useModal } from '/@/components/Modal'; + import { custOnChange, OpenCustModal, GetUseModalData, initRoute } from '../data'; import { useLocale } from '/@/locales/useLocale'; import { uploadApi } from '/@/api/sys/upload'; import { useGo } from '/@/hooks/web/usePage'; import { useI18n } from '/@/hooks/web/useI18n'; import { getRoleButtons } from '/@/api/sys/menu'; + import { useWebSocketStore } from '/@/store/modules/websocket'; const { getLocale } = useLocale(); + const webSocketStore = useWebSocketStore(); const { t } = useI18n(); const route = useRoute(); const { currentRoute } = useRouter(); @@ -79,22 +48,27 @@ const custImport = ref<any>(null); const isMounted = ref(false); const buttons = ref([]); + const readyState = ref<number>(WebSocket.CONNECTING); const AuthOption = ref({ BY_ORG: '', BY_PROD: '', BY_WH: '', }); const keyFieldValues = ref<any>(null); - provide<Ref<any>>('objParams', objParams.value); + provide<Ref<any>>('objParams', objParams); provide<Ref<any[]>>('_columns', _columns); provide<Ref<any[]>>('_searchFormSchema', _searchFormSchema); provide<Ref<any[]>>('_crudFormSchema', _crudFormSchema); provide<Ref<string>>('isExistSql', isExistSql); provide<Ref<{}>>('AuthOption', AuthOption); provide<Ref<any>>('keyFieldValues', keyFieldValues); - - const [registerCust, { openModal: openCustomModal, closeModal }] = useModal(); - + // 鐩戝惉readyState鍙樺寲 + watch(readyState, (newState) => { + if (newState === WebSocket.CLOSED || newState === WebSocket.CLOSING) { + // 灏濊瘯閲嶈繛 + setTimeout(webSocketStore.connectWebSocket, 3000); + } + }); onMounted(async () => { /* 鐢╦son鑾峰彇鍒� */ // _searchFormSchema.value = await fetchJson( @@ -116,6 +90,7 @@ // } // _columns.value = objs; + webSocketStore.connectWebSocket(); isMounted.value = false; /* 鍔ㄦ�乮mport瀹炰綋鍚�.ts鐨勮嚜瀹氫箟鏂规硶 */ try { @@ -130,9 +105,9 @@ entityName: 'SYS_LOW_CODE', order: '', }); - AuthOption.value.BY_ORG = data.Data.Items[0].BY_ORG - AuthOption.value.BY_PROD = data.Data.Items[0].BY_PROD - AuthOption.value.BY_WH = data.Data.Items[0].BY_WH + AuthOption.value.BY_ORG = data.Data.Items[0].BY_ORG; + AuthOption.value.BY_PROD = data.Data.Items[0].BY_PROD; + AuthOption.value.BY_WH = data.Data.Items[0].BY_WH; var searchForms = JSON.parse(data.Data.Items[0].SEARCH_FORM_JSON); for (const i in searchForms) { if ( @@ -222,46 +197,5 @@ }; }; } - } - - //寮瑰嚭妗嗙‘瀹氳繑鍥� - function custSuccess(d) { - // reload(); - } - - /** - * @description: 鍚勮〃鍗曞唴寮瑰嚭閫夋嫨妗嗛�夋嫨鎴愬姛鍚庢柟娉� - * @param {*} d - * @param {*} u - * @param {*} item - * @return {*} - */ - function handleEntSuccess(d, u, item) { - /* 鍔ㄦ�乮mport瀹炰綋鍚�.ts鐨勮嚜瀹氫箟鏂规硶 */ - try { - import(`../entityts/${cType.value}.ts`).then((m) => { - const [{ GetSelectSuccess }] = m.default(); - var values = GetSelectSuccess(d, u); - selectVals.value = values; //淇濆瓨寮瑰嚭妗嗛�夋嫨鐨勭粨鏋� - let _val = {}; - _val[d.returnFieldName] = values[d.returnFieldName]; - useFormData.value[item][1].setFieldsValue(_val); - }); - } catch (e) {} - } - - /** - * @description: 鎵撳紑鑷畾涔夋ā鎬佹 - * @param {*} item - * @return {*} - */ - function handleCustClick(item) { - OpenCustModal( - useModalData.value[item][1].openModal, //甯﹀叆openModal鏂规硶 - cType.value, - item, - [], - // selectVals.value['ROUTE_CODE'], - ); //[openRvModal], selectVals.value['ID']杩欐槸鑷畾涔夊弬鏁帮紝鎸夊疄闄呴渶姹� } </script> -- Gitblit v1.9.3