OMC/fe.ems.vue3
1
0
Fork 0
Code Issues Releases 3 Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

21
src/views/system/config/index.vue
View File

@@ -449,7 +449,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);
}
@@ -698,8 +702,9 @@ onMounted(() => {
</a-card>
<!-- 详情框 -->
<a-modal
width="800px"
<ProModal
:drag="true"
:width="800"
:visible="modalState.visibleByView"
:title="modalState.title"
@cancel="fnModalCancel"
@@ -762,11 +767,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"
@@ -855,7 +862,7 @@ onMounted(() => {
/>
</a-form-item>
</a-form>
</a-modal>
</ProModal>
</PageContainer>
</template>

15
src/views/system/dept/index.vue
View File

@@ -602,8 +602,9 @@ onMounted(() => {
</a-card>
<!-- 详情框 -->
<a-modal
width="800px"
<ProModal
:drag="true"
:width="800"
:visible="modalState.visibleByView"
:title="modalState.title"
@cancel="fnModalCancel"
@@ -691,11 +692,13 @@ onMounted(() => {
t('common.cancel')
}}</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"
@@ -818,7 +821,7 @@ onMounted(() => {
</a-col>
</a-row>
</a-form>
</a-modal>
</ProModal>
</PageContainer>
</template>

21
src/views/system/dict/data.vue
View File

@@ -463,7 +463,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);
}
@@ -714,8 +718,9 @@ onMounted(() => {
</a-card>
<!-- 详情框 -->
<a-modal
width="800px"
<ProModal
:drag="true"
:width="800"
:visible="modalState.visibleByView"
:title="modalState.title"
@cancel="fnModalCancel"
@@ -844,11 +849,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"
@@ -999,7 +1006,7 @@ onMounted(() => {
/>
</a-form-item>
</a-form>
</a-modal>
</ProModal>
</PageContainer>
</template>

21
src/views/system/dict/index.vue
View File

@@ -452,7 +452,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);
}
@@ -718,8 +722,9 @@ onMounted(() => {
</a-card>
<!-- 详情框 -->
<a-modal
width="800px"
<ProModal
:drag="true"
:width="800"
:visible="modalState.visibleByView"
:title="modalState.title"
@cancel="fnModalCancel"
@@ -753,11 +758,13 @@ onMounted(() => {
t('common.cancel')
}}</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"
@@ -810,7 +817,7 @@ onMounted(() => {
/>
</a-form-item>
</a-form>
</a-modal>
</ProModal>
</PageContainer>
</template>

7
src/views/system/log/operate/index.vue
View File

@@ -606,8 +606,9 @@ onMounted(() => {
</a-card>
<!-- 详情框 -->
<a-modal
width="800px"
<ProModal
:drag="true"
:width="800"
:visible="modalState.visibleByView"
:title="modalState.title"
@cancel="fnModalCancel"
@@ -729,7 +730,7 @@ onMounted(() => {
{{ t('common.cancel') }}
</a-button>
</template>
</a-modal>
</ProModal>
</PageContainer>
</template>

15
src/views/system/menu/index.vue
View File

@@ -717,8 +717,9 @@ onMounted(() => {
</a-card>
<!-- 详情框 -->
<a-modal
width="800px"
<ProModal
:drag="true"
:width="800"
:visible="modalState.visibleByView"
:title="modalState.title"
@cancel="fnModalCancel"
@@ -907,11 +908,13 @@ onMounted(() => {
t('common.cancel')
}}</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"
@@ -1182,7 +1185,7 @@ onMounted(() => {
/>
</a-form-item>
</a-form>
</a-modal>
</ProModal>
</PageContainer>
</template>

15
src/views/system/post/index.vue
View File

@@ -631,8 +631,9 @@ onMounted(() => {
</a-card>
<!-- 详情框 -->
<a-modal
width="800px"
<ProModal
:drag="true"
:width="800"
:visible="modalState.visibleByView"
:title="modalState.title"
@cancel="fnModalCancel"
@@ -715,11 +716,13 @@ onMounted(() => {
t('common.cancel')
}}</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"
@@ -804,7 +807,7 @@ onMounted(() => {
/>
</a-form-item>
</a-form>
</a-modal>
</ProModal>
</PageContainer>
</template>

9
src/views/system/quick-start/components/NeInfoSoftwareInstall.vue
View File

@@ -151,7 +151,7 @@ async function fnRecordInstall() {
// 开始安装
let preinput = {};
if (row.neType.toUpperCase() === 'IMS') {
preinput = { pisCSCF: 'y', updateMFetc: 'No', updateMFshare: 'No' }
preinput = { pisCSCF: 'y', updateMFetc: 'No', updateMFshare: 'No' };
}
const installData = {
neType: row.neType,
@@ -315,8 +315,9 @@ onMounted(() => {
></UploadMoreFile>
<!-- 勾选网元版本进行安装框 -->
<a-modal
width="800px"
<ProModal
:drag="true"
:destroyOnClose="true"
:body-style="{ height: '520px', overflowY: 'scroll' }"
:keyboard="false"
:mask-closable="false"
@@ -363,7 +364,7 @@ onMounted(() => {
</template>
</a-alert>
</p>
</a-modal>
</ProModal>
</template>
<style lang="less" scoped>

15
src/views/system/role/components/auth-user-select.vue
View File

@@ -183,7 +183,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);
}
@@ -231,8 +235,11 @@ watch(
</script>
<template>
<a-modal
width="800px"
<ProModal
:drag="true"
:width="800"
:destroyOnClose="true"
:forceFullscreen="true"
:title="props.title"
:visible="props.visible"
:keyboard="false"
@@ -309,7 +316,7 @@ watch(
</template>
</template>
</a-table>
</a-modal>
</ProModal>
</template>
<style lang="less" scoped>

26
src/views/system/role/index.vue
View File

@@ -999,8 +999,10 @@ onMounted(() => {
</a-card>
<!-- 详情框 -->
<a-modal
width="800px"
<ProModal
:drag="true"
:width="800"
:destroyOnClose="false"
:visible="modalState.visibleByView"
:title="modalState.title"
@cancel="fnModalCancel"
@@ -1098,14 +1100,15 @@ onMounted(() => {
t('common.cancel')
}}</a-button>
</template>
</a-modal>
</ProModal>
<!-- 新增框或修改框 -->
<a-modal
width="800px"
<ProModal
:drag="true"
:width="800"
:destroyOnClose="true"
:keyboard="false"
:mask-closable="false"
:destroy-on-close="true"
:visible="modalState.visibleByEdit"
:title="modalState.title"
:confirm-loading="modalState.confirmLoading"
@@ -1242,14 +1245,15 @@ onMounted(() => {
</a-tree>
</a-form-item>
</a-form>
</a-modal>
</ProModal>
<!-- 分配角色数据权限修改框 -->
<a-modal
width="800px"
<ProModal
:drag="true"
:width="800"
:destroyOnClose="true"
:keyboard="false"
:mask-closable="false"
:destroy-on-close="true"
:visible="modalState.visibleByDataScope"
:title="modalState.title"
:confirm-loading="modalState.confirmLoading"
@@ -1388,7 +1392,7 @@ onMounted(() => {
</a-tree>
</a-form-item>
</a-form>
</a-modal>
</ProModal>
</PageContainer>
</template>

8
src/views/system/setting/components/system-reset.vue
View File

@@ -66,7 +66,11 @@ function fnModalCancel() {
{{ t('common.reset') }}
</a-button>
</a-col>
<a-modal
<ProModal
:drag="true"
:width="400"
:minHeight="200"
:destroyOnClose="true"
:mask-closable="false"
v-model:visible="state.visible"
:title="t('common.tipTitle')"
@@ -80,7 +84,7 @@ function fnModalCancel() {
<div style="color: #f5222d">
{{ t('views.system.setting.resetTipContent') }}
</div>
</a-modal>
</ProModal>
<a-col :lg="12" :md="12" :xs="24">
<a-typography>

25
src/views/system/user/index.vue
View File

@@ -434,7 +434,7 @@ function fnModalOk() {
let validateName = ['nickName', 'email', 'phonenumber'];
if (!modalState.from.userId) {
validateName.push('userName', 'password');
}
}
modalStateFrom
.validate(validateName)
.then(() => {
@@ -1070,8 +1070,10 @@ onMounted(() => {
</a-card>
<!-- 详情框 -->
<a-modal
width="800px"
<ProModal
:drag="true"
:width="800"
:destroyOnClose="false"
:visible="modalState.visibleByView"
:title="modalState.title"
@cancel="fnModalCancel"
@@ -1248,11 +1250,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"
@@ -1455,11 +1459,12 @@ onMounted(() => {
/>
</a-form-item>
</a-form>
</a-modal>
</ProModal>
<!-- 重置密码修改框 -->
<a-modal
width="500px"
<ProModal
:drag="true"
:destroyOnClose="true"
:keyboard="false"
:mask-closable="false"
:visible="modalState.visibleByResetPwd"
@@ -1495,7 +1500,7 @@ onMounted(() => {
</a-input-password>
</a-form-item>
</a-form>
</a-modal>
</ProModal>
<!-- 上传导入表格数据文件框 -->
<UploadModal