xinyin025/soybean-admin
1
0
Fork 0
mirror of https://github.com/soybeanjs/soybean-admin.git synced 2025-10-16 14:43:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore(projects): merge main to v1.1.0

Browse Source
This commit is contained in:
Soybean
2024-05-05 01:34:24 +08:00
parent 1ed2eb5fdd a6b92103a6
commit ebe55af7d5
46 changed files with 1330 additions and 1108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/views/_builtin/iframe-page/[url].vue Normal file
View File

@@ -0,0 +1,25 @@
<script setup lang="ts">
import { onActivated, onMounted } from 'vue';
interface Props {
url: string;
}
defineProps<Props>();
onMounted(() => {
console.log('mounted');
});
onActivated(() => {
console.log('activated');
});
</script>
<template>
<div class="h-full">
<iframe id="iframePage" class="size-full" :src="url"></iframe>
</div>
</template>
<style scoped></style>

38
src/views/manage/menu/modules/menu-operate-drawer.vue
View File

@@ -187,20 +187,18 @@ async function getRoleOptions() {
}
}
function handleUpdateModel() {
if (props.operateType === 'add') {
Object.assign(model, createDefaultModel());
function handleInitModel() {
Object.assign(model, createDefaultModel());
return;
}
if (!props.rowData) return;
if (props.operateType === 'addChild' && props.rowData) {
if (props.operateType === 'addChild') {
const { id } = props.rowData;
Object.assign(model, createDefaultModel(), { parentId: id });
Object.assign(model, { parentId: id });
}
if (props.operateType === 'edit' && props.rowData) {
if (props.operateType === 'edit') {
const { component, query, ...rest } = props.rowData;
const { layout, page } = getLayoutAndPage(component);
@@ -233,7 +231,7 @@ async function handleSubmit() {
watch(visible, () => {
if (visible.value) {
handleUpdateModel();
handleInitModel();
restoreValidation();
getRoleOptions();
}
@@ -241,9 +239,9 @@ watch(visible, () => {
</script>
<template>
<NDrawer v-model:show="visible" display-directive="show" :width="400">
<NDrawerContent :title="title" :native-scrollbar="false" closable>
<NForm ref="formRef" :model="model" :rules="rules" label-placement="left" :label-width="80">
<NModal v-model:show="visible" :title="title" preset="card" class="w-720px">
<NScrollbar class="h-400px">
<NForm ref="formRef" :model="model" :rules="rules" label-placement="left" :label-width="100">
<NGrid>
<NFormItemGi span="12" :label="$t('page.manage.menu.menuType')" path="menuType">
<NRadioGroup v-model:value="model.menuType" :disabled="disabledMenuType">
@@ -384,14 +382,14 @@ watch(visible, () => {
</NFormItemGi>
</NGrid>
</NForm>
<template #footer>
<NSpace :size="16">
<NButton @click="closeDrawer">{{ $t('common.cancel') }}</NButton>
<NButton type="primary" @click="handleSubmit">{{ $t('common.confirm') }}</NButton>
</NSpace>
</template>
</NDrawerContent>
</NDrawer>
</NScrollbar>
<template #footer>
<NSpace justify="end" :size="16">
<NButton @click="closeDrawer">{{ $t('common.cancel') }}</NButton>
<NButton type="primary" @click="handleSubmit">{{ $t('common.confirm') }}</NButton>
</NSpace>
</template>
</NModal>
</template>
<style scoped></style>

11
src/views/manage/role/modules/role-operate-drawer.vue
View File

@@ -68,11 +68,8 @@ const roleId = computed(() => props.rowData?.id || -1);
const isEdit = computed(() => props.operateType === 'edit');
function handleUpdateModelWhenEdit() {
if (props.operateType === 'add') {
Object.assign(model, createDefaultModel());
return;
}
function handleInitModel() {
Object.assign(model, createDefaultModel());
if (props.operateType === 'edit' && props.rowData) {
Object.assign(model, props.rowData);
@@ -93,14 +90,14 @@ async function handleSubmit() {
watch(visible, () => {
if (visible.value) {
handleUpdateModelWhenEdit();
handleInitModel();
restoreValidation();
}
});
</script>
<template>
<NDrawer v-model:show="visible" :title="title" display-directive="show" :width="360">
<NDrawer v-model:show="visible" display-directive="show" :width="360">
<NDrawerContent :title="title" :native-scrollbar="false" closable>
<NForm ref="formRef" :model="model" :rules="rules">
<NFormItem :label="$t('page.manage.role.roleName')" path="roleName">

11
src/views/manage/user/modules/user-operate-drawer.vue
View File

@@ -89,11 +89,8 @@ async function getRoleOptions() {
}
}
function handleUpdateModelWhenEdit() {
if (props.operateType === 'add') {
Object.assign(model, createDefaultModel());
return;
}
function handleInitModel() {
Object.assign(model, createDefaultModel());
if (props.operateType === 'edit' && props.rowData) {
Object.assign(model, props.rowData);
@@ -114,7 +111,7 @@ async function handleSubmit() {
watch(visible, () => {
if (visible.value) {
handleUpdateModelWhenEdit();
handleInitModel();
restoreValidation();
getRoleOptions();
}
@@ -122,7 +119,7 @@ watch(visible, () => {
</script>
<template>
<NDrawer v-model:show="visible" :title="title" display-directive="show" :width="360">
<NDrawer v-model:show="visible" display-directive="show" :width="360">
<NDrawerContent :title="title" :native-scrollbar="false" closable>
<NForm ref="formRef" :model="model" :rules="rules">
<NFormItem :label="$t('page.manage.user.userName')" path="userName">