manager/orion-visor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

⚡ 优化前端代码语义.

Browse Source
This commit is contained in:
lijiahang
2024-11-07 10:46:17 +08:00
parent 8db677684d
commit 562052b868
34 changed files with 136 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-service-impl.java.vm
View File

@@ -142,8 +142,8 @@ public class ${table.serviceImplName} implements ${table.serviceName} {
// 查询 // 查询
return ${typeLower}DAO.of(wrapper).list(${type}Convert.MAPPER::to); return ${typeLower}DAO.of(wrapper).list(${type}Convert.MAPPER::to);
} }
#if($meta.enableCache) #if($meta.enableCache)
@Override @Override
public List<${type}VO> get${type}ListByCache() { public List<${type}VO> get${type}ListByCache() {
// 查询缓存 // 查询缓存

13
orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-card-list.vue.vm
View File

@@ -180,19 +180,12 @@
}); });
}; };
// 添加后回调 // 重新加载
const addedCallback = () => { const reload = () => {
fetchCardData(); fetchCardData();
}; };
// 更新后回调 defineExpose({ reload });
const updatedCallback = () => {
fetchCardData();
};
defineExpose({
addedCallback, updatedCallback
});
// 重置条件 // 重置条件
const reset = () => { const reset = () => {

17
orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-table.vue.vm
View File

@@ -63,7 +63,7 @@
<a-popconfirm :content="`确认删除选中的 ${selectedKeys.length} 条记录吗?`" <a-popconfirm :content="`确认删除选中的 ${selectedKeys.length} 条记录吗?`"
position="br" position="br"
type="warning" type="warning"
@ok="deleteSelectRows"> @ok="deleteSelectedRows">
<a-button v-permission="['${package.ModuleName}:${typeHyphen}:delete']" <a-button v-permission="['${package.ModuleName}:${typeHyphen}:delete']"
type="secondary" type="secondary"
status="danger" status="danger"
@@ -182,7 +182,7 @@
#if($vue.enableRowSelection) #if($vue.enableRowSelection)
// 删除选中行 // 删除选中行
const deleteSelectRows = async () => { const deleteSelectedRows = async () => {
try { try {
setLoading(true); setLoading(true);
// 调用删除接口 // 调用删除接口
@@ -215,19 +215,12 @@
} }
}; };
// 添加后回调 // 重新加载
const addedCallback = () => { const reload = () => {
fetchTableData(); fetchTableData();
}; };
// 更新后回调 defineExpose({ reload });
const updatedCallback = () => {
fetchTableData();
};
defineExpose({
addedCallback, updatedCallback
});
// 加载数据 // 加载数据
const doFetchTableData = async (request: ${vue.featureEntity}QueryRequest) => { const doFetchTableData = async (request: ${vue.featureEntity}QueryRequest) => {

33
orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-index.vue.vm
View File

@@ -18,15 +18,15 @@
@open-update="(e) =>#if($vue.enableDrawerForm) drawer#else modal#end.openUpdate(e)" /> @open-update="(e) =>#if($vue.enableDrawerForm) drawer#else modal#end.openUpdate(e)" />
#end #end
#if($vue.enableDrawerForm) #if($vue.enableDrawerForm)
<!-- 添加修改模态框 --> <!-- 添加修改抽屉 -->
<${vue.feature}-form-drawer ref="drawer" <${vue.feature}-form-drawer ref="drawer"
@added="modalAddCallback" @added="reload"
@updated="modalUpdateCallback" /> @updated="reload" />
#else #else
<!-- 添加修改模态框 --> <!-- 添加修改模态框 -->
<${vue.feature}-form-modal ref="modal" <${vue.feature}-form-modal ref="modal"
@added="modalAddCallback" @added="reload"
@updated="modalUpdateCallback" /> @updated="reload" />
#end #end
</div> </div>
</template> </template>
@@ -81,29 +81,16 @@
const modal = ref(); const modal = ref();
#end #end
// 添加回调 // 重新加载
const modalAddCallback = () => { const reload = () => {
#if($vue.enableCardView) #if($vue.enableCardView)
if (renderTable.value) { if (renderTable.value) {
table.value.addedCallback(); table.value.reload();
} else { } else {
card.value.addedCallback(); card.value.reload();
} }
#else #else
table.value.addedCallback(); table.value.reload();
#end
};
// 修改回调
const modalUpdateCallback = () => {
#if($vue.enableCardView)
if (renderTable.value) {
table.value.updatedCallback();
} else {
card.value.updatedCallback();
}
#else
table.value.updatedCallback();
#end #end
}; };

16
orion-visor-ui/src/assets/style/global.less
View File

@@ -371,6 +371,22 @@ body {
font-size: 16px; font-size: 16px;
} }
.fs17 {
font-size: 17px;
}
.fs18 {
font-size: 18px;
}
.fs19 {
font-size: 19px;
}
.fs20 {
font-size: 20px;
}
.text-ellipsis { .text-ellipsis {
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;

4
orion-visor-ui/src/views/asset-audit/connect-log/components/connect-log-table.vue
View File

@@ -76,7 +76,7 @@
<a-popconfirm :content="`确认删除选中的 ${selectedKeys.length} 条记录吗?`" <a-popconfirm :content="`确认删除选中的 ${selectedKeys.length} 条记录吗?`"
position="br" position="br"
type="warning" type="warning"
@ok="deleteSelectRows"> @ok="deleteSelectedRows">
<a-button v-permission="['asset:terminal-connect-log:management:delete']" <a-button v-permission="['asset:terminal-connect-log:management:delete']"
type="primary" type="primary"
status="danger" status="danger"
@@ -276,7 +276,7 @@
}; };
// 删除选中行 // 删除选中行
const deleteSelectRows = async () => { const deleteSelectedRows = async () => {
try { try {
setLoading(true); setLoading(true);
// 调用删除接口 // 调用删除接口

4
orion-visor-ui/src/views/asset-audit/sftp-log/components/sftp-log-table.vue
View File

@@ -60,7 +60,7 @@
<a-popconfirm :content="`确认删除选中的 ${selectedKeys.length} 条记录吗?`" <a-popconfirm :content="`确认删除选中的 ${selectedKeys.length} 条记录吗?`"
position="br" position="br"
type="warning" type="warning"
@ok="deleteSelectRows"> @ok="deleteSelectedRows">
<a-button v-permission="['infra:operator-log:delete', 'asset:terminal-sftp-log:management:delete']" <a-button v-permission="['infra:operator-log:delete', 'asset:terminal-sftp-log:management:delete']"
type="primary" type="primary"
status="danger" status="danger"
@@ -240,7 +240,7 @@
}; };
// 删除选中行 // 删除选中行
const deleteSelectRows = async () => { const deleteSelectedRows = async () => {
try { try {
setLoading(true); setLoading(true);
// 调用删除接口 // 调用删除接口

13
orion-visor-ui/src/views/asset/host-identity/components/host-identity-card-list.vue
View File

@@ -209,19 +209,12 @@
}); });
}; };
// 添加后回调 // 重新加载
const addedCallback = () => { const reload = () => {
fetchCardData(); fetchCardData();
}; };
// 更新后回调 defineExpose({ reload });
const updatedCallback = () => {
fetchCardData();
};
defineExpose({
addedCallback, updatedCallback
});
// 重置条件 // 重置条件
const reset = () => { const reset = () => {

17
orion-visor-ui/src/views/asset/host-identity/components/host-identity-table.vue
View File

@@ -78,7 +78,7 @@
<a-popconfirm :content="`确认删除选中的 ${selectedKeys.length} 条记录吗?`" <a-popconfirm :content="`确认删除选中的 ${selectedKeys.length} 条记录吗?`"
position="br" position="br"
type="warning" type="warning"
@ok="deleteSelectRows"> @ok="deleteSelectedRows">
<a-button v-permission="['asset:host-identity:delete']" <a-button v-permission="['asset:host-identity:delete']"
type="primary" type="primary"
status="danger" status="danger"
@@ -224,7 +224,7 @@
}; };
// 删除选中行 // 删除选中行
const deleteSelectRows = async () => { const deleteSelectedRows = async () => {
try { try {
setLoading(true); setLoading(true);
// 调用删除接口 // 调用删除接口
@@ -239,19 +239,12 @@
} }
}; };
// 添加后回调 // 重新加载
const addedCallback = () => { const reload = () => {
fetchTableData(); fetchTableData();
}; };
// 更新后回调 defineExpose({ reload });
const updatedCallback = () => {
fetchTableData();
};
defineExpose({
addedCallback, updatedCallback
});
// 加载数据 // 加载数据
const doFetchTableData = async (request: HostIdentityQueryRequest) => { const doFetchTableData = async (request: HostIdentityQueryRequest) => {

21
orion-visor-ui/src/views/asset/host-identity/index.vue
View File

@@ -14,8 +14,8 @@
@open-key-view="(e) => keyDrawer.openView(e) " /> @open-key-view="(e) => keyDrawer.openView(e) " />
<!-- 添加修改模态框 --> <!-- 添加修改模态框 -->
<host-identity-form-modal ref="modal" <host-identity-form-modal ref="modal"
@added="modalAddCallback" @added="reload"
@updated="modalUpdateCallback" /> @updated="reload" />
<!-- 主机密钥抽屉 --> <!-- 主机密钥抽屉 -->
<host-key-form-drawer ref="keyDrawer" /> <host-key-form-drawer ref="keyDrawer" />
</div> </div>
@@ -45,21 +45,12 @@
const renderTable = computed(() => appStore.hostIdentityView === 'table'); const renderTable = computed(() => appStore.hostIdentityView === 'table');
// 添加回调 // 重新加载
const modalAddCallback = () => { const reload = () => {
if (renderTable.value) { if (renderTable.value) {
table.value.addedCallback(); table.value.reload();
} else { } else {
card.value.addedCallback(); card.value.reload();
}
};
// 修改回调
const modalUpdateCallback = () => {
if (renderTable.value) {
table.value.updatedCallback();
} else {
card.value.updatedCallback();
} }
}; };

13
orion-visor-ui/src/views/asset/host-key/components/host-key-card-list.vue
View File

@@ -126,19 +126,12 @@
}); });
}; };
// 添加后回调 // 重新加载
const addedCallback = () => { const reload = () => {
fetchCardData(); fetchCardData();
}; };
// 更新后回调 defineExpose({ reload });
const updatedCallback = () => {
fetchCardData();
};
defineExpose({
addedCallback, updatedCallback
});
// 重置条件 // 重置条件
const reset = () => { const reset = () => {

17
orion-visor-ui/src/views/asset/host-key/components/host-key-table.vue
View File

@@ -63,7 +63,7 @@
<a-popconfirm :content="`确认删除选中的 ${selectedKeys.length} 条记录吗?`" <a-popconfirm :content="`确认删除选中的 ${selectedKeys.length} 条记录吗?`"
position="br" position="br"
type="warning" type="warning"
@ok="deleteSelectRows"> @ok="deleteSelectedRows">
<a-button v-permission="['asset:host-key:delete']" <a-button v-permission="['asset:host-key:delete']"
type="primary" type="primary"
status="danger" status="danger"
@@ -173,7 +173,7 @@
}; };
// 删除选中行 // 删除选中行
const deleteSelectRows = async () => { const deleteSelectedRows = async () => {
try { try {
setLoading(true); setLoading(true);
// 调用删除接口 // 调用删除接口
@@ -188,19 +188,12 @@
} }
}; };
// 添加后回调 // 重新加载
const addedCallback = () => { const reload = () => {
fetchTableData(); fetchTableData();
}; };
// 更新后回调 defineExpose({ reload });
const updatedCallback = () => {
fetchTableData();
};
defineExpose({
addedCallback, updatedCallback
});
// 加载数据 // 加载数据
const doFetchTableData = async (request: HostKeyQueryRequest) => { const doFetchTableData = async (request: HostKeyQueryRequest) => {

21
orion-visor-ui/src/views/asset/host-key/index.vue
View File

@@ -14,8 +14,8 @@
@open-update="(e) => drawer.openUpdate(e)" /> @open-update="(e) => drawer.openUpdate(e)" />
<!-- 添加修改模态框 --> <!-- 添加修改模态框 -->
<host-key-form-drawer ref="drawer" <host-key-form-drawer ref="drawer"
@added="modalAddCallback" @added="reload"
@updated="modalUpdateCallback" /> @updated="reload" />
</div> </div>
</template> </template>
@@ -39,21 +39,12 @@
const renderTable = computed(() => appStore.hostKeyView === 'table'); const renderTable = computed(() => appStore.hostKeyView === 'table');
// 添加回调 // 重新加载
const modalAddCallback = () => { const reload = () => {
if (renderTable.value) { if (renderTable.value) {
table.value.addedCallback(); table.value.reload();
} else { } else {
card.value.addedCallback(); card.value.reload();
}
};
// 修改回调
const modalUpdateCallback = () => {
if (renderTable.value) {
table.value.updatedCallback();
} else {
card.value.updatedCallback();
} }
}; };

13
orion-visor-ui/src/views/asset/host-list/components/host-card-list.vue
View File

@@ -303,19 +303,12 @@
}); });
}; };
// 添加后回调 // 重新加载
const addedCallback = () => { const reload = () => {
fetchCardData(); fetchCardData();
}; };
// 更新后回调 defineExpose({ reload });
const updatedCallback = () => {
fetchCardData();
};
defineExpose({
addedCallback, updatedCallback
});
// 重置条件 // 重置条件
const reset = () => { const reset = () => {

17
orion-visor-ui/src/views/asset/host-list/components/host-table.vue
View File

@@ -103,7 +103,7 @@
<a-popconfirm :content="`确认删除选中的 ${selectedKeys.length} 条记录吗?`" <a-popconfirm :content="`确认删除选中的 ${selectedKeys.length} 条记录吗?`"
position="br" position="br"
type="warning" type="warning"
@ok="deleteSelectRows"> @ok="deleteSelectedRows">
<a-button v-permission="['asset:host:delete']" <a-button v-permission="['asset:host:delete']"
type="primary" type="primary"
status="danger" status="danger"
@@ -330,7 +330,7 @@
}; };
// 删除选中行 // 删除选中行
const deleteSelectRows = async () => { const deleteSelectedRows = async () => {
try { try {
setLoading(true); setLoading(true);
// 调用删除接口 // 调用删除接口
@@ -345,19 +345,12 @@
} }
}; };
// 添加后回调 // 重新加载
const addedCallback = () => { const reload = () => {
fetchTableData(); fetchTableData();
}; };
// 更新后回调 defineExpose({ reload });
const updatedCallback = () => {
fetchTableData();
};
defineExpose({
addedCallback, updatedCallback
});
// 加载数据 // 加载数据
const doFetchTableData = async (request: HostQueryRequest) => { const doFetchTableData = async (request: HostQueryRequest) => {

21
orion-visor-ui/src/views/asset/host-list/index.vue
View File

@@ -18,8 +18,8 @@
@open-update-config="(e) => hostConfig.open(e)" /> @open-update-config="(e) => hostConfig.open(e)" />
<!-- 添加修改模态框 --> <!-- 添加修改模态框 -->
<host-form-modal ref="modal" <host-form-modal ref="modal"
@added="modalAddCallback" @added="reload"
@updated="modalUpdateCallback" /> @updated="reload" />
<!-- 配置面板 --> <!-- 配置面板 -->
<host-config-drawer ref="hostConfig" /> <host-config-drawer ref="hostConfig" />
<!-- 分组配置 --> <!-- 分组配置 -->
@@ -54,21 +54,12 @@
const renderTable = computed(() => appStore.hostView === 'table'); const renderTable = computed(() => appStore.hostView === 'table');
// 添加回调 // 重新加载
const modalAddCallback = () => { const reload = () => {
if (renderTable.value) { if (renderTable.value) {
table.value.addedCallback(); table.value.reload();
} else { } else {
card.value.addedCallback(); card.value.reload();
}
};
// 修改回调
const modalUpdateCallback = () => {
if (renderTable.value) {
table.value.updatedCallback();
} else {
card.value.updatedCallback();
} }
}; };

4
orion-visor-ui/src/views/exec/exec-command-log/components/exec-command-log-table.vue
View File

@@ -83,7 +83,7 @@
<a-popconfirm :content="`确认删除选中的 ${selectedKeys.length} 条记录吗? 删除后会中断执行!`" <a-popconfirm :content="`确认删除选中的 ${selectedKeys.length} 条记录吗? 删除后会中断执行!`"
position="br" position="br"
type="warning" type="warning"
@ok="deleteSelectRows"> @ok="deleteSelectedRows">
<a-button v-permission="['asset:exec-command-log:delete']" <a-button v-permission="['asset:exec-command-log:delete']"
type="primary" type="primary"
status="danger" status="danger"
@@ -255,7 +255,7 @@
}; };
// 删除选中行 // 删除选中行
const deleteSelectRows = async () => { const deleteSelectedRows = async () => {
try { try {
setLoading(true); setLoading(true);
// 调用删除接口 // 调用删除接口

17
orion-visor-ui/src/views/exec/exec-template/components/exec-template-table.vue
View File

@@ -53,7 +53,7 @@
<a-popconfirm :content="`确认删除选中的 ${selectedKeys.length} 条记录吗?`" <a-popconfirm :content="`确认删除选中的 ${selectedKeys.length} 条记录吗?`"
position="br" position="br"
type="warning" type="warning"
@ok="deleteSelectRows"> @ok="deleteSelectedRows">
<a-button v-permission="['asset:exec-template:delete']" <a-button v-permission="['asset:exec-template:delete']"
type="primary" type="primary"
status="danger" status="danger"
@@ -168,7 +168,7 @@
}; };
// 删除选中行 // 删除选中行
const deleteSelectRows = async () => { const deleteSelectedRows = async () => {
try { try {
setLoading(true); setLoading(true);
// 调用删除接口 // 调用删除接口
@@ -183,19 +183,12 @@
} }
}; };
// 添加后回调 // 重新加载
const addedCallback = () => { const reload = () => {
fetchTableData(); fetchTableData();
}; };
// 更新后回调 defineExpose({ reload });
const updatedCallback = () => {
fetchTableData();
};
defineExpose({
addedCallback, updatedCallback
});
// 加载数据 // 加载数据
const doFetchTableData = async (request: ExecTemplateQueryRequest) => { const doFetchTableData = async (request: ExecTemplateQueryRequest) => {

14
orion-visor-ui/src/views/exec/exec-template/index.vue
View File

@@ -7,8 +7,8 @@
@open-exec="(e) => execModal.open(e)" /> @open-exec="(e) => execModal.open(e)" />
<!-- 添加修改模态框 --> <!-- 添加修改模态框 -->
<exec-template-form-drawer ref="drawer" <exec-template-form-drawer ref="drawer"
@added="modalAddCallback" @added="() => table.reload()"
@updated="modalUpdateCallback" @updated="() => table.reload()"
@open-host="(e) => openHostModal('drawer', e)" /> @open-host="(e) => openHostModal('drawer', e)" />
<!-- 执行模态框 --> <!-- 执行模态框 -->
<exec-template-exec-drawer ref="execModal" <exec-template-exec-drawer ref="execModal"
@@ -40,16 +40,6 @@
const hostModal = ref(); const hostModal = ref();
const lastOpenHostRef = ref(); const lastOpenHostRef = ref();
// 添加回调
const modalAddCallback = () => {
table.value.addedCallback();
};
// 修改回调
const modalUpdateCallback = () => {
table.value.updatedCallback();
};
// 打开主机模态框 // 打开主机模态框
const openHostModal = (openRef: string, data: any) => { const openHostModal = (openRef: string, data: any) => {
lastOpenHostRef.value = openRef; lastOpenHostRef.value = openRef;

4
orion-visor-ui/src/views/exec/upload-task/components/upload-task-table.vue
View File

@@ -83,7 +83,7 @@
<a-popconfirm :content="`确认删除选中的 ${selectedKeys.length} 条记录吗?`" <a-popconfirm :content="`确认删除选中的 ${selectedKeys.length} 条记录吗?`"
position="br" position="br"
type="warning" type="warning"
@ok="deleteSelectRows"> @ok="deleteSelectedRows">
<a-button v-permission="['asset:upload-task:delete']" <a-button v-permission="['asset:upload-task:delete']"
type="primary" type="primary"
status="danger" status="danger"
@@ -231,7 +231,7 @@
}; };
// 删除选中行 // 删除选中行
const deleteSelectRows = async () => { const deleteSelectedRows = async () => {
try { try {
setLoading(true); setLoading(true);
// 调用删除接口 // 调用删除接口

4
orion-visor-ui/src/views/job/exec-job-log/components/exec-job-log-table.vue
View File

@@ -68,7 +68,7 @@
<a-popconfirm :content="`确认删除选中的 ${selectedKeys.length} 条记录吗? 删除后会中断执行!`" <a-popconfirm :content="`确认删除选中的 ${selectedKeys.length} 条记录吗? 删除后会中断执行!`"
position="br" position="br"
type="warning" type="warning"
@ok="deleteSelectRows"> @ok="deleteSelectedRows">
<a-button v-permission="['asset:exec-job-log:delete']" <a-button v-permission="['asset:exec-job-log:delete']"
type="primary" type="primary"
status="danger" status="danger"
@@ -235,7 +235,7 @@
}; };
// 删除选中行 // 删除选中行
const deleteSelectRows = async () => { const deleteSelectedRows = async () => {
try { try {
setLoading(true); setLoading(true);
// 调用删除接口 // 调用删除接口

17
orion-visor-ui/src/views/job/exec-job/components/exec-job-table.vue
View File

@@ -60,7 +60,7 @@
<a-popconfirm :content="`确认删除选中的 ${selectedKeys.length} 条记录吗?`" <a-popconfirm :content="`确认删除选中的 ${selectedKeys.length} 条记录吗?`"
position="br" position="br"
type="warning" type="warning"
@ok="deleteSelectRows"> @ok="deleteSelectedRows">
<a-button v-permission="['asset:exec-job:delete']" <a-button v-permission="['asset:exec-job:delete']"
type="primary" type="primary"
status="danger" status="danger"
@@ -238,7 +238,7 @@
}; };
// 删除选中行 // 删除选中行
const deleteSelectRows = async () => { const deleteSelectedRows = async () => {
try { try {
setLoading(true); setLoading(true);
// 调用删除接口 // 调用删除接口
@@ -253,19 +253,12 @@
} }
}; };
// 添加后回调 // 重新加载
const addedCallback = () => { const reload = () => {
fetchTableData(); fetchTableData();
}; };
// 更新后回调 defineExpose({ reload });
const updatedCallback = () => {
fetchTableData();
};
defineExpose({
addedCallback, updatedCallback
});
// 修改状态 // 修改状态
const updateStatus = async (id: number, status: number) => { const updateStatus = async (id: number, status: number) => {

21
orion-visor-ui/src/views/job/exec-job/index.vue
View File

@@ -8,12 +8,12 @@
@test-cron="openNextCron" /> @test-cron="openNextCron" />
<!-- 添加修改模态框 --> <!-- 添加修改模态框 -->
<exec-job-form-drawer ref="drawer" <exec-job-form-drawer ref="drawer"
@added="modalAddCallback" @added="() => table.reload()"
@updated="modalUpdateCallback" @updated="() => table.reload()"
@open-host="(e) => hostModal.open(e)" @open-host="(e) => hostModal.open(e)"
@open-template="() => templateModal.open()" @open-template="() => templateModal.open()"
@test-cron="openNextCron" @test-cron="openNextCron"
@gen-cron="openGeneratorCron" /> @gen-cron="(e) => genModal.open(e)" />
<!-- 任务详情模态框 --> <!-- 任务详情模态框 -->
<exec-job-detail-drawer ref="detail" /> <exec-job-detail-drawer ref="detail" />
<!-- cron 执行时间模态框 --> <!-- cron 执行时间模态框 -->
@@ -58,26 +58,11 @@
const templateModal = ref(); const templateModal = ref();
const hostModal = ref(); const hostModal = ref();
// 添加回调
const modalAddCallback = () => {
table.value.addedCallback();
};
// 修改回调
const modalUpdateCallback = () => {
table.value.updatedCallback();
};
// 打开下次执行时间 // 打开下次执行时间
const openNextCron = (cron: string) => { const openNextCron = (cron: string) => {
nextCron.value.open({ expression: cron, times: CronNextTimes }); nextCron.value.open({ expression: cron, times: CronNextTimes });
}; };
// 打开生成表达式
const openGeneratorCron = (cron: string) => {
genModal.value.open(cron);
};
onBeforeMount(async () => { onBeforeMount(async () => {
const dictStore = useDictStore(); const dictStore = useDictStore();
await dictStore.loadKeys(dictKeys); await dictStore.loadKeys(dictKeys);

18
orion-visor-ui/src/views/system/dict-key/components/dict-key-table.vue
View File

@@ -67,7 +67,7 @@
<a-popconfirm :content="`确认删除选中的 ${selectedKeys.length} 条记录吗?`" <a-popconfirm :content="`确认删除选中的 ${selectedKeys.length} 条记录吗?`"
position="br" position="br"
type="warning" type="warning"
@ok="deleteSelectRows"> @ok="deleteSelectedRows">
<a-button v-permission="['infra:dict-key:delete']" <a-button v-permission="['infra:dict-key:delete']"
type="primary" type="primary"
status="danger" status="danger"
@@ -206,7 +206,7 @@
}; };
// 删除选中行 // 删除选中行
const deleteSelectRows = async () => { const deleteSelectedRows = async () => {
try { try {
setLoading(true); setLoading(true);
// 调用删除接口 // 调用删除接口
@@ -222,21 +222,13 @@
} }
}; };
// 添加后回调 // 重新加载
const addedCallback = () => { const reload = () => {
fetchTableData(); fetchTableData();
cacheStore.reset('dictKeys'); cacheStore.reset('dictKeys');
}; };
// 更新后回调 defineExpose({ reload });
const updatedCallback = () => {
fetchTableData();
cacheStore.reset('dictKeys');
};
defineExpose({
addedCallback, updatedCallback
});
// 打开查看视图 // 打开查看视图
const openView = async (record: DictKeyQueryResponse) => { const openView = async (record: DictKeyQueryResponse) => {

14
orion-visor-ui/src/views/system/dict-key/index.vue
View File

@@ -7,8 +7,8 @@
@open-view="(v, t) => view.open(v, t)" /> @open-view="(v, t) => view.open(v, t)" />
<!-- 添加修改模态框 --> <!-- 添加修改模态框 -->
<dict-key-form-modal ref="modal" <dict-key-form-modal ref="modal"
@added="modalAddCallback" @added="() => table.reload()"
@updated="modalUpdateCallback" /> @updated="() => table.reload()" />
<!-- json 查看器模态框 --> <!-- json 查看器模态框 -->
<json-editor-modal ref="view" /> <json-editor-modal ref="view" />
</div> </div>
@@ -33,16 +33,6 @@
const modal = ref(); const modal = ref();
const view = ref(); const view = ref();
// 添加回调
const modalAddCallback = () => {
table.value.addedCallback();
};
// 修改回调
const modalUpdateCallback = () => {
table.value.updatedCallback();
};
onBeforeMount(async () => { onBeforeMount(async () => {
const dictStore = useDictStore(); const dictStore = useDictStore();
await dictStore.loadKeys(dictKeys); await dictStore.loadKeys(dictKeys);

17
orion-visor-ui/src/views/system/dict-value/components/dict-value-table.vue
View File

@@ -53,7 +53,7 @@
<a-popconfirm :content="`确认删除选中的 ${selectedKeys.length} 条记录吗?`" <a-popconfirm :content="`确认删除选中的 ${selectedKeys.length} 条记录吗?`"
position="br" position="br"
type="warning" type="warning"
@ok="deleteSelectRows"> @ok="deleteSelectedRows">
<a-button v-permission="['infra:dict-value:delete']" <a-button v-permission="['infra:dict-value:delete']"
type="primary" type="primary"
status="danger" status="danger"
@@ -168,7 +168,7 @@
}); });
// 删除选中行 // 删除选中行
const deleteSelectRows = async () => { const deleteSelectedRows = async () => {
try { try {
setLoading(true); setLoading(true);
// 调用删除接口 // 调用删除接口
@@ -198,19 +198,12 @@
} }
}; };
// 添加后回调 // 重新加载
const addedCallback = () => { const reload = () => {
fetchTableData(); fetchTableData();
}; };
// 更新后回调 defineExpose({ reload });
const updatedCallback = () => {
fetchTableData();
};
defineExpose({
addedCallback, updatedCallback
});
// 修改 key // 修改 key
const changeKey = ({ id, keyName }: { id: number, keyName: string }) => { const changeKey = ({ id, keyName }: { id: number, keyName: string }) => {

16
orion-visor-ui/src/views/system/dict-value/index.vue
View File

@@ -7,13 +7,13 @@
@open-history="(e) => history.open(e.id, e.label)" /> @open-history="(e) => history.open(e.id, e.label)" />
<!-- 添加修改模态框 --> <!-- 添加修改模态框 -->
<dict-value-form-modal ref="modal" <dict-value-form-modal ref="modal"
@added="modalAddCallback" @added="() => table.reload()"
@updated="modalUpdateCallback" /> @updated="() => table.reload()" />
<!-- 历史值模态框 --> <!-- 历史值模态框 -->
<history-value-modal ref="history" <history-value-modal ref="history"
:type="historyType" :type="historyType"
:rollback="rollback" :rollback="rollback"
@updated="modalUpdateCallback" /> @updated="() => table.reload()" />
</div> </div>
</template> </template>
@@ -37,16 +37,6 @@
const history = ref(); const history = ref();
const cacheStore = useCacheStore(); const cacheStore = useCacheStore();
// 添加回调
const modalAddCallback = () => {
table.value.addedCallback();
};
// 修改回调
const modalUpdateCallback = () => {
table.value.updatedCallback();
};
// 回滚 // 回滚
const rollback = async (id: number, valueId: number) => { const rollback = async (id: number, valueId: number) => {
await rollbackDictValue({ id, valueId }); await rollbackDictValue({ id, valueId });

14
orion-visor-ui/src/views/system/menu/components/menu-table.vue
View File

@@ -270,21 +270,13 @@
} }
}; };
// 添加后回调 // 重新加载
const addedCallback = () => { const reload = () => {
formRef.value.resetFields(); formRef.value.resetFields();
loadMenuData(true); loadMenuData(true);
}; };
// 更新后回调 defineExpose({ reload });
const updatedCallback = () => {
formRef.value.resetFields();
loadMenuData(true);
};
defineExpose({
addedCallback, updatedCallback
});
// 加载菜单 // 加载菜单
const loadMenuData = async (all: any = undefined) => { const loadMenuData = async (all: any = undefined) => {

4
orion-visor-ui/src/views/system/menu/index.vue
View File

@@ -6,8 +6,8 @@
@open-update="(e) => modal.openUpdate(e)" /> @open-update="(e) => modal.openUpdate(e)" />
<!-- 添加修改模态框 --> <!-- 添加修改模态框 -->
<menu-form-modal ref="modal" <menu-form-modal ref="modal"
@added="() => table.addedCallback()" @added="() => table.reload()"
@updated="() => table.updatedCallback()" /> @updated="() => table.reload()" />
</div> </div>
</template> </template>

4
orion-visor-ui/src/views/user/operator-log/components/operator-log-table.vue
View File

@@ -31,7 +31,7 @@
<a-popconfirm :content="`确认删除选中的 ${selectedKeys.length} 条记录吗?`" <a-popconfirm :content="`确认删除选中的 ${selectedKeys.length} 条记录吗?`"
position="br" position="br"
type="warning" type="warning"
@ok="deleteSelectRows"> @ok="deleteSelectedRows">
<a-button v-permission="['infra:operator-log:delete']" <a-button v-permission="['infra:operator-log:delete']"
type="primary" type="primary"
status="danger" status="danger"
@@ -174,7 +174,7 @@
}; };
// 删除选中行 // 删除选中行
const deleteSelectRows = async () => { const deleteSelectedRows = async () => {
try { try {
setLoading(true); setLoading(true);
// 调用删除接口 // 调用删除接口

13
orion-visor-ui/src/views/user/role/components/role-table.vue
View File

@@ -181,19 +181,12 @@
} }
}; };
// 添加后回调 // 重新加载
const addedCallback = () => { const reload = () => {
fetchTableData(); fetchTableData();
}; };
// 更新后回调 defineExpose({ reload });
const updatedCallback = () => {
fetchTableData();
};
defineExpose({
addedCallback, updatedCallback
});
// 加载数据 // 加载数据
const doFetchTableData = async (request: RoleQueryRequest) => { const doFetchTableData = async (request: RoleQueryRequest) => {

4
orion-visor-ui/src/views/user/role/index.vue
View File

@@ -7,8 +7,8 @@
@open-grant="(e) => grantModal.open(e)" /> @open-grant="(e) => grantModal.open(e)" />
<!-- 添加修改模态框 --> <!-- 添加修改模态框 -->
<role-form-modal ref="modal" <role-form-modal ref="modal"
@added="() => table.addedCallback()" @added="() => table.reload()"
@updated="() => table.updatedCallback()" /> @updated="() => table.reload()" />
<!-- 分配角色菜单模态框 --> <!-- 分配角色菜单模态框 -->
<role-menu-grant-modal ref="grantModal" /> <role-menu-grant-modal ref="grantModal" />
</div> </div>

17
orion-visor-ui/src/views/user/user/components/user-table.vue
View File

@@ -64,7 +64,7 @@
<a-popconfirm :content="`确认删除选中的 ${selectedKeys.length} 条记录吗?`" <a-popconfirm :content="`确认删除选中的 ${selectedKeys.length} 条记录吗?`"
position="br" position="br"
type="warning" type="warning"
@ok="deleteSelectRows"> @ok="deleteSelectedRows">
<a-button v-permission="['infra:system-user:delete']" <a-button v-permission="['infra:system-user:delete']"
type="primary" type="primary"
status="danger" status="danger"
@@ -226,7 +226,7 @@
}; };
// 删除选中行 // 删除选中行
const deleteSelectRows = async () => { const deleteSelectedRows = async () => {
try { try {
setLoading(true); setLoading(true);
// 调用删除接口 // 调用删除接口
@@ -258,19 +258,12 @@
}); });
}; };
// 添加后回调 // 重新加载
const addedCallback = () => { const reload = () => {
fetchTableData(); fetchTableData();
}; };
// 更新后回调 defineExpose({ reload });
const updatedCallback = () => {
fetchTableData();
};
defineExpose({
addedCallback, updatedCallback
});
// 加载数据 // 加载数据
const doFetchTableData = async (request: UserQueryRequest) => { const doFetchTableData = async (request: UserQueryRequest) => {

4
orion-visor-ui/src/views/user/user/index.vue
View File

@@ -8,8 +8,8 @@
@open-grant-role="(e) => grantRoleModal.open(e)" /> @open-grant-role="(e) => grantRoleModal.open(e)" />
<!-- 添加修改模态框 --> <!-- 添加修改模态框 -->
<user-form-modal ref="modal" <user-form-modal ref="modal"
@added="() => table.addedCallback()" @added="() => table.reload()"
@updated="() => table.updatedCallback()" /> @updated="() => table.reload()" />
<!-- 重置密码模态框 --> <!-- 重置密码模态框 -->
<user-reset-password-form-modal ref="resetModal" /> <user-reset-password-form-modal ref="resetModal" />
<!-- 分配角色模态框 --> <!-- 分配角色模态框 -->