fix: 移除拖拽组件,全局注册ProModal替换默认AModal

This commit is contained in:
TsMask
2024-06-18 10:26:38 +08:00
parent c74d311537
commit a311f0a09b
57 changed files with 433 additions and 458 deletions

View File

@@ -551,7 +551,11 @@ function fnGetList(pageNum?: number) {
}
tablePagination.total = res.total;
tableState.data = res.rows;
if (tablePagination.total <=(queryParams.pageNum - 1) * tablePagination.pageSize &&queryParams.pageNum !== 1) {
if (
tablePagination.total <=
(queryParams.pageNum - 1) * tablePagination.pageSize &&
queryParams.pageNum !== 1
) {
tableState.loading = false;
fnGetList(queryParams.pageNum - 1);
}
@@ -841,8 +845,9 @@ onMounted(() => {
</a-card>
<!-- 详情框 -->
<a-modal
width="800px"
<ProModal
:drag="true"
:width="800"
:visible="modalState.visibleByView"
:title="modalState.title"
@cancel="fnModalCancel"
@@ -949,11 +954,13 @@ onMounted(() => {
{{ t('common.close') }}
</a-button>
</template>
</a-modal>
</ProModal>
<!-- 新增框或修改框 -->
<a-modal
width="800px"
<ProModal
:drag="true"
:width="800"
:destroyOnClose="true"
:keyboard="false"
:mask-closable="false"
:visible="modalState.visibleByEdit"
@@ -1110,7 +1117,7 @@ onMounted(() => {
/>
</a-form-item>
</a-form>
</a-modal>
</ProModal>
<!-- 生成cron表达式 -->
<CronModal

View File

@@ -373,12 +373,16 @@ function fnGetList(pageNum?: number) {
}
tablePagination.total = res.total;
tableState.data = res.rows;
if (tablePagination.total <=(queryParams.pageNum - 1) * tablePagination.pageSize &&queryParams.pageNum !== 1) {
if (
tablePagination.total <=
(queryParams.pageNum - 1) * tablePagination.pageSize &&
queryParams.pageNum !== 1
) {
tableState.loading = false;
fnGetList(queryParams.pageNum - 1);
}
}
tableState.loading = false;
}
tableState.loading = false;
});
}
@@ -628,8 +632,9 @@ onMounted(() => {
</a-card>
<!-- 详情框 -->
<a-modal
width="800px"
<ProModal
:drag="true"
:width="800"
:visible="modalState.visibleByView"
:title="modalState.title"
@cancel="fnModalCancel"
@@ -728,7 +733,7 @@ onMounted(() => {
{{ t('common.close') }}
</a-button>
</template>
</a-modal>
</ProModal>
</PageContainer>
</template>

View File

@@ -175,8 +175,10 @@ function fnModalCancel() {
</script>
<template>
<DraggableModal
width="800px"
<ProModal
:drag="true"
:width="800"
:destroyOnClose="true"
:body-style="{ maxHeight: '650px', 'overflow-y': 'auto' }"
:keyboard="false"
:mask-closable="false"
@@ -1269,7 +1271,7 @@ function fnModalCancel() {
</a-col>
</a-row>
</a-form>
</DraggableModal>
</ProModal>
</template>
<style lang="less" scoped></style>

View File

@@ -142,7 +142,7 @@ function fnModalOk() {
modalState.confirmLoading = true;
const hide = message.loading(t('common.loading'), 0);
// 根据类型选择函数
const groupName = from.group.trim()
const groupName = from.group.trim();
saveGraphData(groupName, graphG6.value.save())
.then((res: any) => {
if (res.code === RESULT_CODE_SUCCESS) {
@@ -325,8 +325,8 @@ onMounted(() => {
<GraphEditModal></GraphEditModal>
<!-- 图保存图组名修改框 -->
<a-modal
width="500px"
<ProModal
:drag="true"
:keyboard="false"
:mask-closable="false"
:visible="modalState.visible"
@@ -359,7 +359,7 @@ onMounted(() => {
</a-col>
</a-row>
</a-form>
</a-modal>
</ProModal>
</PageContainer>
</template>